From b21c838700417140c8d3f3aa54d03a69a9fe85f9 Mon Sep 17 00:00:00 2001 From: taiebot Date: Fri, 5 Jun 2026 21:17:31 +0200 Subject: [PATCH 1/4] Fix column filter in public sharing --- src/store/data.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/store/data.js b/src/store/data.js index 59d40cf590..7fe10a81ca 100644 --- a/src/store/data.js +++ b/src/store/data.js @@ -118,12 +118,15 @@ export const useDataStore = defineStore('data', { displayError(e, t('tables', 'Could not load columns.')) return [] } - - const columns = res.data.ocs.data.map(col => parseCol(col)) - .sort((a, b) => a.id - b.id) - // Fix up columns to match expected structure if needed - // Public API might return slightly different structure, but parseCol should handle it if it's standard TableColumn - + + const columns = [...res.data.ocs.data] + .sort((a, b) => { + const orderA = a.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER + const orderB = b.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER + return orderA - orderB + }) + .map(col => parseCol(col)) + set(this.columns, stateId, columns) this.loading[stateId] = false return columns From 1b3cb62fbed6521812301af4bf890e86008fae7e Mon Sep 17 00:00:00 2001 From: taiebot Date: Mon, 15 Jun 2026 22:15:23 +0200 Subject: [PATCH 2/4] Fix eslint issue Signed-off-by: taiebot --- src/store/data.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/store/data.js b/src/store/data.js index 7fe10a81ca..06d765487a 100644 --- a/src/store/data.js +++ b/src/store/data.js @@ -118,15 +118,13 @@ export const useDataStore = defineStore('data', { displayError(e, t('tables', 'Could not load columns.')) return [] } - const columns = [...res.data.ocs.data] - .sort((a, b) => { - const orderA = a.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER - const orderB = b.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER - return orderA - orderB - }) - .map(col => parseCol(col)) - + .sort((a, b) => { + const orderA = a.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER + const orderB = b.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER + return orderA - orderB + }) + .map(col => parseCol(col)) set(this.columns, stateId, columns) this.loading[stateId] = false return columns From 61f7f28b546b9a57c93eef8c8722699574c58047 Mon Sep 17 00:00:00 2001 From: taiebot Date: Tue, 16 Jun 2026 14:22:13 +0200 Subject: [PATCH 3/4] Fix eslint again Signed-off-by: taiebot --- src/store/data.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/store/data.js b/src/store/data.js index 06d765487a..fe94ecf5c7 100644 --- a/src/store/data.js +++ b/src/store/data.js @@ -119,12 +119,12 @@ export const useDataStore = defineStore('data', { return [] } const columns = [...res.data.ocs.data] - .sort((a, b) => { - const orderA = a.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER - const orderB = b.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER - return orderA - orderB - }) - .map(col => parseCol(col)) + .sort((a, b) => { + const orderA = a.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER + const orderB = b.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER + return orderA - orderB + }) + .map(col => parseCol(col)) set(this.columns, stateId, columns) this.loading[stateId] = false return columns From 006aebfef9fbb637cb3cbbc4362c351d05f2a364 Mon Sep 17 00:00:00 2001 From: taiebot Date: Wed, 17 Jun 2026 08:37:51 +0200 Subject: [PATCH 4/4] Fix eslint Had to force the indentation by resetting everything to zero. Looks like it is working now. I had some errors yesterday but did not think of doing this Signed-off-by: taiebot --- src/store/data.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/store/data.js b/src/store/data.js index fe94ecf5c7..3a7d46351f 100644 --- a/src/store/data.js +++ b/src/store/data.js @@ -119,10 +119,10 @@ export const useDataStore = defineStore('data', { return [] } const columns = [...res.data.ocs.data] - .sort((a, b) => { - const orderA = a.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER - const orderB = b.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER - return orderA - orderB + .sort((a, b) => { + const orderA = a.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER + const orderB = b.viewColumnInformation?.order ?? Number.MAX_SAFE_INTEGER + return orderA - orderB }) .map(col => parseCol(col)) set(this.columns, stateId, columns)