Fix: navigator: filter is cleared on directory reload

aleksey-hoffman · Aug 7, 2022 · 1a51ada · 1a51ada
1 parent da58ac3
commit 1a51ada
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/components/Workspace/Areas/Navigator/index.vue b/src/components/Workspace/Areas/Navigator/index.vue
@@ -30,9 +30,10 @@ export default {
     WorkspaceAreaSortingToolbar,
     WorkspaceAreaItemList,
   },
-  data () {
-    return {
-    }
+  watch: {
+    'currentDir.path' () {
+      this.$store.dispatch('clearFilterField', 'navigator')
+    },
   },
   async mounted () {
     this.$nextTick(() => {
@@ -46,6 +47,7 @@ export default {
     ...mapFields({
       navigatorRouteIsLoaded: 'navigatorRouteIsLoaded',
       filterQuery: 'filterField.view.navigator.query',
+      currentDir: 'navigatorView.currentDir',
     }),
   },
 }

diff --git a/src/store.js b/src/store.js
@@ -3151,9 +3151,9 @@ export default new Vuex.Store({
         value: state.storageData.workspaces.items
       })
     },
-    CLEAR_FILTER_FIELD ({ state, commit, dispatch, getters }) {
+    clearFilterField ({dispatch}, routeName) {
       dispatch('SET', {
-        key: `filterField.view.${router.history.current.name}.query`,
+        key: `filterField.view.${routeName}.query`,
         value: ''
       })
     },
@@ -3179,7 +3179,6 @@ export default new Vuex.Store({
 
         store.dispatch('SET_NAVIGATOR_STATE')
         store.dispatch('LOAD_ROUTE', 'navigator')
-        store.dispatch('CLEAR_FILTER_FIELD')
         let {dirInfo} = await store.dispatch('LOAD_DIR_ITEMS', options)
         eventHub.$emit('app:method', {
           method: 'postDirWatcherWorker',