From 786c2a166468342f3164c20d1ccbad3a7aa92bf8 Mon Sep 17 00:00:00 2001
From: taiebot <13300652+taiebot@users.noreply.github.com>
Date: Fri, 31 Jul 2026 22:25:01 +0200
Subject: [PATCH 1/2] Fix: column order for embedded table

Signed-off-by: taiebot <13300652+taiebot@users.noreply.github.com>
---
 src/store/data.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/data.js b/src/store/data.js
index 75fc23a92f..9587ceab29 100644
--- a/src/store/data.js
+++ b/src/store/data.js
@@ -104,8 +104,8 @@ export const useDataStore = defineStore('data', {
 				allColumns = allColumns.concat(MetaColumns.filter(col => columnSettingsMap[col.id]))
 				if (view.columnSettings) {
 					allColumns = allColumns.sort((a, b) => {
-						const orderA = columnSettingsMap[a.id]?.order ?? Number.MAX_SAFE_INTEGER
-						const orderB = columnSettingsMap[b.id]?.order ?? Number.MAX_SAFE_INTEGER
+						const orderA = a.viewColumnInformation?.order ?? columnSettingsMap[a.id]?.order ?? Number.MAX_SAFE_INTEGER
+						const orderB = b.viewColumnInformation?.order ?? columnSettingsMap[b.id]?.order ?? Number.MAX_SAFE_INTEGER
 						return orderA - orderB
 					})
 				}

From 3c7b1e848870d5dea7a635ab2ca674c39ea067c2 Mon Sep 17 00:00:00 2001
From: taiebot <13300652+taiebot@users.noreply.github.com>
Date: Sat, 1 Aug 2026 13:57:39 +0200
Subject: [PATCH 2/2] fix(widget): use fresh store data for rows/columns in
 ContentReferenceWidget

Signed-off-by: taiebot <13300652+taiebot@users.noreply.github.com>
---
 src/views/ContentReferenceWidget.vue | 100 +++++++++++++++++----------
 1 file changed, 64 insertions(+), 36 deletions(-)

diff --git a/src/views/ContentReferenceWidget.vue b/src/views/ContentReferenceWidget.vue
index f4749867d1..20a7c0c4f1 100644
--- a/src/views/ContentReferenceWidget.vue
+++ b/src/views/ContentReferenceWidget.vue
@@ -1,3 +1,4 @@
+
 <!--
   - SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
   - SPDX-License-Identifier: AGPL-3.0-or-later
@@ -19,17 +20,17 @@
 		<div v-if="rows && rows.length > 0" class="nc-table">
 			<NcTable
 				:rows="filteredRows"
-				:columns="richObject.columns"
+				:columns="columns"
 				:element-id="richObject.id"
-				:is-view="Boolean(richObject.type)"
+				:is-view="isView"
 				v-bind="tablePermissions"
 				@edit-row="editRow"
 				@copy-row="copyRow"
 				@delete-row="deleteRow" />
 		</div>
 		<CreateRow
-			:columns="richObject.columns"
-			:is-view="Boolean(richObject.type)"
+			:columns="columns"
+			:is-view="isView"
 			:element-id="richObject.id"
 			:show-modal="showCopyRow"
 			:prefill-data="copyPrefillData"
@@ -38,11 +39,11 @@
 			v-if="rowToDelete !== null"
 			:rows-to-delete="[rowToDelete]"
 			:element-id="richObject.id"
-			:is-view="Boolean(richObject.type)"
+			:is-view="isView"
 			@cancel="rowToDelete = null" />
 	</div>
 </template>
-
+ 
 <script>
 import NcTable from '../shared/components/ncTable/NcTable.vue'
 import Options from '../shared/components/ncTable/sections/Options.vue'
@@ -54,9 +55,9 @@ import { useResizeObserver } from '@vueuse/core'
 import { spawnDialog } from '@nextcloud/vue/functions/dialog'
 import { useTablesStore } from '../store/store.js'
 import { useDataStore } from '../store/data.js'
-
+ 
 export default {
-
+ 
 	components: {
 		NcTable,
 		Options,
@@ -64,9 +65,9 @@ export default {
 		DeleteRows,
 		NcLoadingIcon,
 	},
-
+ 
 	mixins: [permissionsMixin],
-
+ 
 	props: {
 		richObjectType: {
 			type: String,
@@ -81,7 +82,7 @@ export default {
 			default: true,
 		},
 	},
-
+ 
 	data() {
 		return {
 			searchExp: null,
@@ -93,8 +94,11 @@ export default {
 			dataStore: null,
 		}
 	},
-
+ 
 	computed: {
+		isView() {
+			return Boolean(this.richObject?.type)
+		},
 		tablePermissions() {
 			return {
 				canCreateRows: this.canCreateRowInElement(this.richObject),
@@ -124,7 +128,7 @@ export default {
 			}
 		},
 		getRows() {
-			return this.dataStore ? this.dataStore.getRows(false, this.richObject.id) : []
+			return this.dataStore ? this.dataStore.getRows(this.isView, this.richObject.id) : []
 		},
 		// Use computed property to get rows from store or richObject
 		rows() {
@@ -136,8 +140,19 @@ export default {
 			// Fallback to richObject rows or local rows
 			return this.richObject?.rows || this.localRows
 		},
+		getColumns() {
+			return this.dataStore ? this.dataStore.getColumns(this.isView, this.richObject.id) : []
+		},
+		// Prefer fresh store data over the (possibly stale) richObject snapshot
+		columns() {
+			const storeColumns = this.getColumns
+			if (storeColumns && storeColumns.length > 0) {
+				return storeColumns
+			}
+			return this.richObject?.columns || []
+		},
 	},
-
+ 
 	watch: {
 		richObject: {
 			deep: true,
@@ -161,7 +176,7 @@ export default {
 			},
 		},
 	},
-
+ 
 	async mounted() {
 		useResizeObserver(this.$el, (entries) => {
 			const entry = entries[0]
@@ -169,14 +184,20 @@ export default {
 			// In Vue 3 $el can be a fragment/comment node (no style), so guard it.
 			this.$el?.style?.setProperty?.('--widget-content-width', `${width}px`)
 		})
-
+ 
 		this.tablesStore = useTablesStore()
 		this.dataStore = useDataStore()
-
-		await this.loadRows()
+ 
+		await Promise.all([this.loadRows(), this.loadColumns()])
 	},
-
+ 
 	methods: {
+		// { tableId } or { viewId } payload for loadRowsFromBE
+		elementIdPayload() {
+			return this.isView
+				? { viewId: this.richObject.id }
+				: { tableId: this.richObject.id }
+		},
 		search(searchString) {
 			this.searchExp = (searchString !== '')
 				? new RegExp(searchString.trim(), 'ig')
@@ -186,28 +207,24 @@ export default {
 			const { default: CreateRow } = await import('../modules/modals/CreateRow.vue')
 			spawnDialog(CreateRow, {
 				showModal: true,
-				columns: this.richObject.columns,
-				isView: Boolean(this.richObject.type),
+				columns: this.columns,
+				isView: this.isView,
 				elementId: this.richObject.id,
 			}, async () => {
 				// Reload rows from the backend to get the latest data
-				await this.dataStore.loadRowsFromBE({
-					tableId: this.richObject.id,
-				})
+				await this.dataStore.loadRowsFromBE(this.elementIdPayload())
 			})
 		},
 		async editRow(rowId) {
 			const { default: EditRow } = await import('../modules/modals/EditRow.vue')
 			spawnDialog(EditRow, {
 				showModal: true,
-				columns: this.richObject.columns,
+				columns: this.columns,
 				row: this.getRow(rowId),
-				isView: Boolean(this.richObject.type),
+				isView: this.isView,
 				element: this.richObject,
 			}, async () => {
-				await this.dataStore.loadRowsFromBE({
-					tableId: this.richObject.id,
-				})
+				await this.dataStore.loadRowsFromBE(this.elementIdPayload())
 			})
 		},
 		copyRow(rowId) {
@@ -222,26 +239,37 @@ export default {
 		},
 		async loadRows() {
 			if (!this.dataStore) return
-
+ 
+			// Paint from cached snapshot immediately, but it can be stale --
+			// always reconcile with the backend below.
 			if (this.richObject.rows) {
 				this.localRows = this.richObject.rows
 				this.dataStore.seedRows({
-					isView: Boolean(this.richObject.type),
+					isView: this.isView,
 					elementId: this.richObject.id,
 					rows: this.richObject.rows,
 				})
-				return
 			}
-
+ 
 			try {
-				await this.dataStore.loadRowsFromBE({
-					tableId: this.richObject.id,
-				})
+				await this.dataStore.loadRowsFromBE(this.elementIdPayload())
 				// No need to set local rows as the computed property will use store data
 			} catch (error) {
 				console.error('Error loading rows:', error)
 			}
 		},
+		async loadColumns() {
+			if (!this.dataStore) return
+			try {
+				if (this.isView) {
+					await this.dataStore.loadColumnsFromBE({ view: this.richObject })
+				} else {
+					await this.dataStore.loadColumnsFromBE({ tableId: this.richObject.id })
+				}
+			} catch (error) {
+				console.error('Error loading columns:', error)
+			}
+		},
 	},
 }
 </script>