New setting: save navigator sorting type

aleksey-hoffman · Aug 7, 2022 · dabaa2e · dabaa2e
1 parent 3d904b7
commit dabaa2e
Show file tree

Hide file tree

Showing 7 changed files with 121 additions and 94 deletions.
diff --git a/src/components/ActionToolbar.vue b/src/components/ActionToolbar.vue
@@ -414,9 +414,9 @@ export default {
       shortcuts: 'storageData.settings.shortcuts',
       groupDirItems: 'storageData.settings.groupDirItems',
       currentNotesList: 'currentNotesList',
-      sortingOrder: 'sorting.order',
-      selectedSortingType: 'sorting.selectedType',
-      sortingTypes: 'sorting.types',
+      sortingOrder: 'storageData.settings.sorting.order',
+      selectedSortingType: 'storageData.settings.sorting.selectedType',
+      sortingTypes: 'storageData.settings.sorting.types',
       homeBannerValue: 'storageData.settings.homeBanner.value',
       currentDir: 'navigatorView.currentDir',
       navigatorViewInfoPanel: 'storageData.settings.infoPanels.navigatorView',

diff --git a/src/components/DirItem.vue b/src/components/DirItem.vue
@@ -398,9 +398,9 @@ export default {
       dirItemHoverEffect: 'storageData.settings.dirItemHoverEffect',
       visibleDirItems: 'navigatorView.visibleDirItems',
       dirItemsInfoIsFetched: 'navigatorView.dirItemsInfoIsFetched',
-      selectedSortingType: 'sorting.selectedType',
+      selectedSortingType: 'storageData.settings.sorting.selectedType',
       fsClipboard: 'navigatorView.clipboard.fs',
-      sortingTypes: 'sorting.types',
+      sortingTypes: 'storageData.settings.sorting.types',
       navigatorNameColumnMaxWidth: 'storageData.settings.navigator.nameColumnMaxWidth',
     }),
     specifiedNavigatorLayout () {

diff --git a/src/components/SortingToolbar/SortingColumnMenu.vue b/src/components/SortingToolbar/SortingColumnMenu.vue
@@ -58,9 +58,9 @@ export default {
   },
   computed: {
     ...mapFields({
-      sortingOrder: 'sorting.order',
-      selectedSortingType: 'sorting.selectedType',
-      sortingTypes: 'sorting.types',
+      sortingOrder: 'storageData.settings.sorting.order',
+      selectedSortingType: 'storageData.settings.sorting.selectedType',
+      sortingTypes: 'storageData.settings.sorting.types',
     }),
   },
   methods: {

diff --git a/src/components/SortingToolbar/SortingMenu.vue b/src/components/SortingToolbar/SortingMenu.vue
@@ -84,9 +84,9 @@ import {mapFields} from 'vuex-map-fields'
 export default {
   computed: {
     ...mapFields({
-      sortingOrder: 'sorting.order',
-      selectedSortingType: 'sorting.selectedType',
-      sortingTypes: 'sorting.types',
+      sortingOrder: 'storageData.settings.sorting.order',
+      selectedSortingType: 'storageData.settings.sorting.selectedType',
+      sortingTypes: 'storageData.settings.sorting.types',
     }),
   }
 }

diff --git a/src/components/SortingToolbar/index.vue b/src/components/SortingToolbar/index.vue
@@ -123,9 +123,9 @@ export default {
   },
   computed: {
     ...mapFields({
-      sortingOrder: 'sorting.order',
-      selectedSortingType: 'sorting.selectedType',
-      sortingTypes: 'sorting.types',
+      sortingOrder: 'storageData.settings.sorting.order',
+      selectedSortingType: 'storageData.settings.sorting.selectedType',
+      sortingTypes: 'storageData.settings.sorting.types',
       navigatorLayout: 'storageData.settings.navigatorLayout',
       navigatorSortingElementDisplayType: 'storageData.settings.navigator.sorting.elementDisplayType',
     }),

diff --git a/src/store.js b/src/store.js
@@ -259,69 +259,6 @@ export default new Vuex.Store({
         }
       }
     },
-    sorting: {
-      order: 'ascending',
-      selectedType: {
-        name: 'name', 
-        title: 'name',
-        shortTitle: 'name',
-        width: 'minmax(64px, 2fr)',
-        isChecked: true,
-      },
-      types: [
-        {
-          name: 'name',
-          title: 'name',
-          shortTitle: 'name',
-          width: 'minmax(64px, 2fr)',
-          isChecked: true,
-        },
-        {
-          name: 'date-modified-contents', 
-          title: 'date modified contents',
-          shortTitle: 'modified contents',
-          width: 'minmax(64px, 1.6fr)',
-          isChecked: true,
-        },
-        {
-          name: 'date-modified-meta', 
-          title: 'date modified meta',
-          shortTitle: 'modified meta',
-          width: 'minmax(64px, 1.6fr)',
-          isChecked: false,
-        },
-        {
-          name: 'date-created', 
-          title: 'date created',
-          shortTitle: 'created',
-          width: 'minmax(64px, 1.6fr)',
-          isChecked: false,
-        },
-        {
-          name: 'size',
-          title: 'items / size',
-          shortTitle: 'items / size',
-          width: 'minmax(64px, 0.8fr)',
-          isChecked: true,
-        },
-        // TODO: finish in v1.2.0
-        // Should request to turn on the 'storeDirItemOpenCount'
-        // { 
-        //   name: 'popularity', 
-        //   title: 'popularity',
-        //   shortTitle: 'popularity',
-        //   width: 'minmax(64px, 1fr)',
-        //   isChecked: false,
-        // },
-        {
-          name: 'status', 
-          title: 'status',
-          shortTitle: 'status',
-          width: '64px',
-          isChecked: true,
-        },
-      ]
-    },
     settingsView: {
       settingsDataMap: []
     },
@@ -934,6 +871,70 @@ export default new Vuex.Store({
             ]
           },
         },
+        sorting: {
+          saveNavigatorSorting: false,
+          order: 'ascending',
+          selectedType: {
+            name: 'name',
+            title: 'name',
+            shortTitle: 'name',
+            width: 'minmax(64px, 2fr)',
+            isChecked: true,
+          },
+          types: [
+            {
+              name: 'name',
+              title: 'name',
+              shortTitle: 'name',
+              width: 'minmax(64px, 2fr)',
+              isChecked: true,
+            },
+            {
+              name: 'date-modified-contents',
+              title: 'date modified contents',
+              shortTitle: 'modified contents',
+              width: 'minmax(64px, 1.6fr)',
+              isChecked: true,
+            },
+            {
+              name: 'date-modified-meta',
+              title: 'date modified meta',
+              shortTitle: 'modified meta',
+              width: 'minmax(64px, 1.6fr)',
+              isChecked: false,
+            },
+            {
+              name: 'date-created',
+              title: 'date created',
+              shortTitle: 'created',
+              width: 'minmax(64px, 1.6fr)',
+              isChecked: false,
+            },
+            {
+              name: 'size',
+              title: 'items / size',
+              shortTitle: 'items / size',
+              width: 'minmax(64px, 0.8fr)',
+              isChecked: true,
+            },
+            // TODO: finish in v1.2.0
+            // Should request to turn on the 'storeDirItemOpenCount'
+            // {
+            //   name: 'popularity',
+            //   title: 'popularity',
+            //   shortTitle: 'popularity',
+            //   width: 'minmax(64px, 1fr)',
+            //   isChecked: false,
+            // },
+            {
+              name: 'status',
+              title: 'status',
+              shortTitle: 'status',
+              width: '64px',
+              isChecked: true,
+            },
+          ]
+        },
       }
     },
     navigationPanel: {
@@ -1382,7 +1383,7 @@ export default new Vuex.Store({
     },
     sortingHeaderGridColumnTemplate: state => {
       let menuIconWidth = '48px'
-      let gridColumnTemplate = state.sorting.types
+      let gridColumnTemplate = state.storageData.settings.sorting.types
         .filter(item => item.isChecked)
         .map(item => item.width)
       gridColumnTemplate.unshift(menuIconWidth)
@@ -1748,19 +1749,9 @@ export default new Vuex.Store({
       note.dateTrashed = null
       note.dateWillBeDeleted = null
     },
-    SET_SORTING_TYPE (state, sortingType) {
-      const types = state.sorting.types
-      state.sorting.selectedType = sortingType
-    },
-    TOGGLE_SORTING_ORDER (state) {
-      const order = state.sorting.order
-      state.sorting.order = order === 'ascending'
-        ? 'descending'
-        : 'ascending'
-    },
     SORT_DIR_ITEMS (state) {
-      const order = state.sorting.order
-      const sortingType = state.sorting.selectedType
+      const order = state.storageData.settings.sorting.order
+      const sortingType = state.storageData.settings.sorting.selectedType
 
       if (sortingType.name === 'name') {
         state.navigatorView.dirItems = order === 'ascending'
@@ -4423,12 +4414,33 @@ export default new Vuex.Store({
     SORT_DIR_ITEMS ({ state, commit, dispatch, getters }) {
       commit('SORT_DIR_ITEMS')
     },
-    SET_SORTING_TYPE ({ state, commit, dispatch, getters }, sortingType) {
-      commit('SET_SORTING_TYPE', sortingType)
+    SET_SORTING_TYPE ({state, dispatch}, sortingType) {
+      if (state.storageData.settings.sorting.saveNavigatorSorting) {
+        dispatch('SET', {
+          key: 'storageData.settings.sorting.selectedType',
+          value: sortingType
+        })
+      }
+      else {
+        state.storageData.settings.sorting.selectedType = sortingType
+      }
       dispatch('SORT_DIR_ITEMS')
     },
-    TOGGLE_SORTING_ORDER ({ state, commit, dispatch, getters }) {
-      commit('TOGGLE_SORTING_ORDER')
+    TOGGLE_SORTING_ORDER ({state, dispatch}) {
+      const order = state.storageData.settings.sorting.order
+      if (state.storageData.settings.sorting.saveNavigatorSorting) {
+        dispatch('SET', {
+          key: 'storageData.settings.sorting.order',
+          value: order === 'ascending'
+            ? 'descending'
+            : 'ascending'
+        })
+      }
+      else {
+        state.storageData.settings.sorting.order = order === 'ascending'
+          ? 'descending'
+          : 'ascending'
+      }
       dispatch('SORT_DIR_ITEMS')
     },
     UPDATE_DIR_ITEM_SELECTION_HISTORY (store) {

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -1094,6 +1094,20 @@ Copyright © 2021 - present Aleksey Hoffman. All rights reserved.
                     hide-details
                   />
 
+                  <div class="text--sub-title-1 mt-2">
+                    Sorting type
+                  </div>
+                  <div class="mb-2">
+                    If enabled, the selected sorting type will be applied after app reload
+                  </div>
+
+                  <v-switch
+                    v-model="saveNavigatorSorting"
+                    class="mt-0 pt-0"
+                    label="Save sorting type"
+                    hide-details
+                  />
+
                   <div class="text--sub-title-1 mt-4">
                     Sorting element display type
                   </div>
@@ -2098,6 +2112,7 @@ export default {
       windowCloseButtonAction: 'storageData.settings.windowCloseButtonAction',
       themeType: 'storageData.settings.theme.type',
       showDirItemKindDividers: 'storageData.settings.navigator.showDirItemKindDividers',
+      saveNavigatorSorting: 'storageData.settings.sorting.saveNavigatorSorting',
       navigatorSortingElementDisplayType: 'storageData.settings.navigator.sorting.elementDisplayType',
       navigatorLayout: 'storageData.settings.navigatorLayout',
       showWorkspaceTitleInToolbar: 'storageData.settings.navigator.workspaces.showTitleInToolbar',