fix: file system filters reactivity

Signed-off-by: Pedro Lamas <[email protected]>
fluidd-core · Oct 4, 2023 · 5734323 · 5734323
1 parent d27aa03
commit 5734323
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/src/components/widgets/filesystem/FileSystem.vue b/src/components/widgets/filesystem/FileSystem.vue
@@ -222,11 +222,7 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
   }
 
   set filters (value: FileFilterType[]) {
-    this.$store.dispatch('config/saveByPath', {
-      path: `uiSettings.fileSystem.activeFilters.${this.currentRoot}`,
-      value,
-      server: true
-    })
+    this.$store.dispatch('config/updateFileSystemActiveFilters', { root: this.currentRoot, value })
   }
 
   // Maintains content menu state.

diff --git a/src/store/config/actions.ts b/src/store/config/actions.ts
@@ -6,6 +6,7 @@ import { SocketActions } from '@/api/socketActions'
 import { loadLocaleMessagesAsync, getStartingLocale } from '@/plugins/i18n'
 import { Waits } from '@/globals'
 import { AppTableHeader } from '@/types'
+import { FileFilterType } from '../files/types'
 
 export const actions: ActionTree<ConfigState, RootState> = {
   /**
@@ -142,6 +143,11 @@ export const actions: ActionTree<ConfigState, RootState> = {
     SocketActions.serverWrite('uiSettings.dashboard.tempPresets', state.uiSettings.dashboard.tempPresets)
   },
 
+  async updateFileSystemActiveFilters ({ commit, state }, payload: { root: string, value: FileFilterType[] }) {
+    commit('setFileSystemActiveFilters', payload)
+    SocketActions.serverWrite(`uiSettings.fileSystem.activeFilters.${payload.root}`, state.uiSettings.fileSystem.activeFilters[payload.root])
+  },
+
   /**
    * Toggle a tables header state based on its name and key.
    */

diff --git a/src/store/config/mutations.ts b/src/store/config/mutations.ts
@@ -7,6 +7,7 @@ import { merge, set } from 'lodash-es'
 import { v4 as uuidv4 } from 'uuid'
 import { AppTableHeader } from '@/types'
 import { AppTablePartialHeader } from '@/types/tableheaders'
+import { FileFilterType } from '../files/types'
 
 export const mutations: MutationTree<ConfigState> = {
   /**
@@ -37,6 +38,10 @@ export const mutations: MutationTree<ConfigState> = {
         Vue.set(processed.editor, 'autoEditExtensions', payload.editor.autoEditExtensions)
       }
 
+      if (payload.fileSystem && payload.fileSystem.activeFilters) {
+        Vue.set(processed.fileSystem, 'activeFilters', payload.fileSystem.activeFilters)
+      }
+
       Vue.set(state, 'uiSettings', processed)
     }
   },
@@ -154,6 +159,10 @@ export const mutations: MutationTree<ConfigState> = {
     state.uiSettings.dashboard.tempPresets.splice(i, 1)
   },
 
+  setFileSystemActiveFilters (state, payload: { root: string, value: FileFilterType[] }) {
+    Vue.set(state.uiSettings.fileSystem.activeFilters, payload.root, payload.value)
+  },
+
   /**
    * Puts us into layout mode
    */

diff --git a/src/store/config/state.ts b/src/store/config/state.ts
@@ -133,11 +133,7 @@ export const defaultState = (): ConfigState => {
         }
       },
       fileSystem: {
-        activeFilters: {
-          gcodes: [],
-          config: [],
-          logs: []
-        }
+        activeFilters: {}
       },
       toolhead: {
         forceMove: false,

diff --git a/src/store/config/types.ts b/src/store/config/types.ts
@@ -205,5 +205,5 @@ export interface GcodePreviewConfig {
 }
 
 export interface FileSystemConfig {
-  activeFilters: Partial<Record<string, FileFilterType[]>>
+  activeFilters: Record<string, FileFilterType[]>
 }