feat(spoolman): remember spool selection dialog sort key/order (#1305)

Signed-off-by: Mathis Mensing <github@matmen.dev> Co-authored-by: Pedro Lamas <pedrolamas@gmail.com>
fluidd-core · Jan 11, 2024 · 3843701 · 3843701
1 parent ebfd5bc
commit 3843701
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/src/components/widgets/spoolman/SpoolSelectionDialog.vue b/src/components/widgets/spoolman/SpoolSelectionDialog.vue
@@ -93,12 +93,14 @@
             :custom-filter="filterResults"
             :no-data-text="$t('app.file_system.msg.not_found')"
             :no-results-text="$t('app.file_system.msg.not_found')"
-            sort-by="last_used"
-            sort-desc
+            :sort-by="sortOrder.key ?? undefined"
+            :sort-desc="sortOrder.desc ?? undefined"
             mobile-breakpoint="0"
             class="file-system spool-table"
             hide-default-footer
             disable-pagination
+            @update:sort-by="handleSortOrderKeyChange"
+            @update:sort-desc="handleSortOrderDescChange"
           >
             <template #item="{ item }">
               <tr
@@ -469,6 +471,26 @@ export default class SpoolSelectionDialog extends Mixins(StateMixin, BrowserMixi
   get warnOnFilamentTypeMismatch (): boolean {
     return this.$store.state.config.uiSettings.spoolman.warnOnFilamentTypeMismatch
   }
+
+  get sortOrder () {
+    return this.$store.state.config.uiSettings.spoolman.selectionDialogSortOrder
+  }
+
+  handleSortOrderKeyChange (value?: string) {
+    this.$store.dispatch('config/saveByPath', {
+      path: 'uiSettings.spoolman.selectionDialogSortOrder.key',
+      value: value ?? null,
+      server: true
+    })
+  }
+
+  handleSortOrderDescChange (value?: boolean) {
+    this.$store.dispatch('config/saveByPath', {
+      path: 'uiSettings.spoolman.selectionDialogSortOrder.desc',
+      value: value ?? null,
+      server: true
+    })
+  }
 }
 </script>
 

diff --git a/src/store/config/state.ts b/src/store/config/state.ts
@@ -149,7 +149,11 @@ export const defaultState = (): ConfigState => {
         autoSelectSpoolOnMatch: false,
         preferDeviceCamera: false,
         warnOnNotEnoughFilament: true,
-        warnOnFilamentTypeMismatch: true
+        warnOnFilamentTypeMismatch: true,
+        selectionDialogSortOrder: {
+          key: 'last_used',
+          desc: false
+        }
       }
     }
   }

diff --git a/src/store/config/types.ts b/src/store/config/types.ts
@@ -37,6 +37,10 @@ export interface SpoolmanConfig {
   preferDeviceCamera: boolean;
   warnOnNotEnoughFilament: boolean;
   warnOnFilamentTypeMismatch: boolean;
+  selectionDialogSortOrder: {
+    key: string | null;
+    desc: boolean | null;
+  }
 }
 
 export interface HostConfig {