From 4a95cb42cdb4bba623302bfa4aa2db106a9dab96 Mon Sep 17 00:00:00 2001
From: mae <mae@bsbo.com.au>
Date: Wed, 31 Mar 2021 14:51:08 +0800
Subject: [PATCH] fixed sort reset

---
 client/components/boards/boardHeader.js |  4 ----
 config/router.js                        | 11 +++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 8de3c73ba..ed22ac0d2 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -54,10 +54,6 @@ Template.boardChangeTitlePopup.events({
 });
 
 BlazeComponent.extendComponent({
-  onCreated(){
-    // set sort to default
-    Session.set('sortBy','')
-  },
   watchLevel() {
     const currentBoard = Boards.findOne(Session.get('currentBoard'));
     return currentBoard && currentBoard.getWatchLevel(Meteor.userId());
diff --git a/config/router.js b/config/router.js
index 6aca98570..644d33dd1 100644
--- a/config/router.js
+++ b/config/router.js
@@ -14,6 +14,7 @@ FlowRouter.route('/', {
     Session.set('currentCard', null);
 
     Filter.reset();
+    Session.set('sortBy', '')
     EscapeActions.executeAll();
 
     Utils.manageCustomUI();
@@ -35,6 +36,7 @@ FlowRouter.route('/public', {
     Session.set('currentCard', null);
 
     Filter.reset();
+    Session.set('sortBy', '')
     EscapeActions.executeAll();
 
     Utils.manageCustomUI();
@@ -59,6 +61,7 @@ FlowRouter.route('/b/:id/:slug', {
     // want to excape every current actions (filters, etc.)
     if (previousBoard !== currentBoard) {
       Filter.reset();
+      Session.set('sortBy', '')
       EscapeActions.executeAll();
     } else {
       EscapeActions.executeUpTo('popup-close');
@@ -117,6 +120,7 @@ FlowRouter.route('/my-cards', {
   name: 'my-cards',
   action() {
     Filter.reset();
+    Session.set('sortBy', '')
     // EscapeActions.executeAll();
     EscapeActions.executeUpTo('popup-close');
 
@@ -135,6 +139,7 @@ FlowRouter.route('/due-cards', {
   name: 'due-cards',
   action() {
     Filter.reset();
+    Session.set('sortBy', '')
     // EscapeActions.executeAll();
     EscapeActions.executeUpTo('popup-close');
 
@@ -153,6 +158,7 @@ FlowRouter.route('/global-search', {
   name: 'global-search',
   action() {
     Filter.reset();
+    Session.set('sortBy', '')
     // EscapeActions.executeAll();
     EscapeActions.executeUpTo('popup-close');
 
@@ -179,6 +185,7 @@ FlowRouter.route('/broken-cards', {
     const brokenCardsTemplate = 'brokenCards';
 
     Filter.reset();
+    Session.set('sortBy', '')
     // EscapeActions.executeAll();
     EscapeActions.executeUpTo('popup-close');
 
@@ -205,6 +212,7 @@ FlowRouter.route('/import/:source', {
     Session.set('importSource', params.source);
 
     Filter.reset();
+    Session.set('sortBy', '')
     EscapeActions.executeAll();
     BlazeLayout.render('defaultLayout', {
       headerBar: 'importHeaderBar',
@@ -223,6 +231,7 @@ FlowRouter.route('/setting', {
       Session.set('currentCard', null);
 
       Filter.reset();
+      Session.set('sortBy', '')
       EscapeActions.executeAll();
     },
   ],
@@ -245,6 +254,7 @@ FlowRouter.route('/information', {
       Session.set('currentCard', null);
 
       Filter.reset();
+      Session.set('sortBy', '')
       EscapeActions.executeAll();
     },
   ],
@@ -266,6 +276,7 @@ FlowRouter.route('/people', {
       Session.set('currentCard', null);
 
       Filter.reset();
+      Session.set('sortBy', '')
       EscapeActions.executeAll();
     },
   ],