fix: views respect sorting

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
nextcloud · Mar 8, 2024 · 89ca0f6 · 89ca0f6
1 parent aeda9cd
commit 89ca0f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/modules/main/sections/MainWrapper.vue b/src/modules/main/sections/MainWrapper.vue
@@ -111,6 +111,9 @@ export default {
 				this.localLoading = true
 
 				this.viewSetting = {}
+				if (this.isView && this.element?.sort?.length) {
+					this.viewSetting.sorting = [...this.element.sort]
+				}
 
 				await this.$store.dispatch('loadColumnsFromBE', {
 					view: this.isView ? this.element : null,

diff --git a/src/shared/components/ncTable/sections/CustomTable.vue b/src/shared/components/ncTable/sections/CustomTable.vue
@@ -93,8 +93,8 @@ export default {
 		getSearchedAndFilteredAndSortedRows() {
 			// if we have to sort
 			if (this.viewSetting?.sorting) {
-				const sortColumn = this.columns.find(item => item.id === this.viewSetting.sorting[0].columnId)
-				return [...this.getSearchedAndFilteredRows].sort(sortColumn.sort(this.viewSetting.sorting[0].mode))
+				const sortColumn = this.columns.find(item => item.id === this.viewSetting.sorting?.[0].columnId)
+				return [...this.getSearchedAndFilteredRows].sort(sortColumn?.sort?.(this.viewSetting.sorting[0].mode))
 			}
 			return this.getSearchedAndFilteredRows
 		},