From 4d7e260d7b3e987f6adad83acc3fdc705d7883f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Tue, 7 Nov 2023 16:54:30 +0100 Subject: [PATCH] fix(files): fix default sorting direction MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ --- apps/files/src/mixins/filesSorting.ts | 5 +++-- apps/files/src/views/FilesList.vue | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/files/src/mixins/filesSorting.ts b/apps/files/src/mixins/filesSorting.ts index 2ec3d94d67e74..d7e331dd9d762 100644 --- a/apps/files/src/mixins/filesSorting.ts +++ b/apps/files/src/mixins/filesSorting.ts @@ -19,11 +19,11 @@ * along with this program. If not, see . * */ +import type { Navigation, View } from '@nextcloud/files' import Vue from 'vue' import { mapState } from 'pinia' import { useViewConfigStore } from '../store/viewConfig' -import { Navigation, View } from '@nextcloud/files' export default Vue.extend({ computed: { @@ -46,7 +46,8 @@ export default Vue.extend({ * Get the sorting direction for the current view */ isAscSorting(): boolean { - const sortingDirection = this.getConfig(this.currentView.id)?.sorting_direction + const sortingDirection = this.getConfig(this.currentView.id)?.sorting_direction as string + || 'asc' return sortingDirection === 'asc' }, }, diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue index 89ce6aeb7b03d..ccaee87a1f03e 100644 --- a/apps/files/src/views/FilesList.vue +++ b/apps/files/src/views/FilesList.vue @@ -127,7 +127,6 @@ import { usePathsStore } from '../store/paths.ts' import { useSelectionStore } from '../store/selection.ts' import { useUploaderStore } from '../store/uploader.ts' import { useUserConfigStore } from '../store/userconfig.ts' -import { useViewConfigStore } from '../store/viewConfig.ts' import BreadCrumbs from '../components/BreadCrumbs.vue' import FilesListVirtual from '../components/FilesListVirtual.vue' import filesListWidthMixin from '../mixins/filesListWidth.ts' @@ -165,14 +164,12 @@ export default Vue.extend({ const selectionStore = useSelectionStore() const uploaderStore = useUploaderStore() const userConfigStore = useUserConfigStore() - const viewConfigStore = useViewConfigStore() return { filesStore, pathsStore, selectionStore, uploaderStore, userConfigStore, - viewConfigStore, } },