@conduction/nextcloud-vue 2.68.0 → 2.69.0

package/dist/esm/components/CnDashboardPage/CnDashboardPage.vue2.js

@@ -6,6 +6,7 @@ import Check from 'vue-material-design-icons/Check.vue';
 import Cog from 'vue-material-design-icons/Cog.vue';
 import Download from 'vue-material-design-icons/Download.vue';
 import Pencil from 'vue-material-design-icons/Pencil.vue';
+import Restore from 'vue-material-design-icons/Restore.vue';
 import ViewDashboardOutline from 'vue-material-design-icons/ViewDashboardOutline.vue';
 import __sfc_main$c from '../../dialogs/CnWidgetStyleEditorModal.vue.js';
 import __sfc_main$7 from '../CnBodySections/CnBodySections.vue.js';
@@ -20,9 +21,8 @@ import __sfc_main$6 from '../CnWidgetRefItem/CnWidgetRefItem.vue.js';
 import __sfc_main$2 from '../CnWidgetRenderer/CnWidgetRenderer.vue.js';
 import __sfc_main$1 from '../CnWidgetWrapper/CnWidgetWrapper.vue.js';
 import { useIntegrationRegistry } from '../../composables/useIntegrationRegistry.js';
-import { readUserPreference, writeUserPreference } from '../../composables/useUserPreferences.js';
 import { pageViews } from '../../mixins/pageViews.js';
-import { mergeUserLayout, dashboardLayoutKey } from '../../store/plugins/dashboardLayouts.js';
+import { mergeUserLayout, resolveUserLayoutApi } from '../../store/plugins/dashboardLayouts.js';
 import { isAppInstalled } from '../../utils/appInstalled.js';
 import { readVisibleWhenValue, compareVisibleWhen } from '../../utils/visibleWhen.js';
 import { canonicalWidgetType } from '../../utils/widgetTypeAliases.js';
@@ -158,6 +158,7 @@ var script = {
 		NcLoadingIcon,
 		NcSelect,
 		Pencil,
+		Restore,
 		Check,
 		Cog,
 		CalendarRange,
@@ -1211,7 +1212,7 @@ var script = {
 		 * @spec openspec/changes/view-switch-containers/specs/view-switch-containers/spec.md#requirement-a-view-with-nothing-to-draw-says-so
 		 */
 		viewDisplayLayout() {
-			const items = this.activeView ? this.activeView.layout : [];
+			const items = this.activeViewLayout;
 			if (this.gridEditable) {
 				return items
 			}
@@ -1253,8 +1254,9 @@ var script = {
 					key: `view-${this.activeViewId}`,
 					view: true,
 					layout: this.viewDisplayLayout,
-					// A user arrangement covers the page's own layout only.
-					editable: this.gridEditable && !this.userLayout,
+					// With `userLayout` the user arranges the view too; the
+					// arrangement is kept per view (pageViews mixin).
+					editable: this.gridEditable,
 					attrs: {
 						id: this.viewRegionId,
 						role: 'region',
@@ -1974,6 +1976,7 @@ var script = {
 			// the user's arrangement is finished when they say it is.
 			if (leaving) {
 				this.saveUserLayout();
+				this.saveViewUserLayouts();
 			}
 
 			/**
@@ -2033,6 +2036,17 @@ var script = {
 			}
 		},
 
+		/**
+		 * The edit-mode reset: the page's own grid and the chosen view return
+		 * to the manifest layout. Other views keep this user's arrangement.
+		 *
+		 * @return {Promise<void>}
+		 * @spec openspec/changes/page-view-user-layouts/specs/view-switch-containers/spec.md#requirement-resetting-a-view-restores-its-manifest-layout
+		 */
+		async resetLayout() {
+			await Promise.all([this.resetUserLayout(), this.resetViewUserLayout()]);
+		},
+
 		/**
 		 * Drop this user's arrangement and return to the manifest.
 		 *
@@ -2085,35 +2099,7 @@ var script = {
 		 * @return {{ load: (appId: string, pageId: string) => Promise<object|null>, save: (appId: string, pageId: string, layout: Array<object>) => Promise<boolean>, reset: (appId: string, pageId: string) => Promise<boolean> }} The api.
 		 */
 		userLayoutApi() {
-			const store = this.userLayoutStore;
-			if (store && typeof store.loadDashboardLayout === 'function') {
-				return {
-					load: (...a) => store.loadDashboardLayout(...a),
-					save: (...a) => store.saveDashboardLayout(...a),
-					reset: (...a) => store.resetDashboardLayout(...a),
-				}
-			}
-
-			return {
-				load: (appId, pageId) => readUserPreference(appId, dashboardLayoutKey(pageId), null),
-				save: (appId, pageId, layout) => writeUserPreference(
-					appId,
-					dashboardLayoutKey(pageId),
-					{ items: (layout || []).map((i) => ({
-						widgetId: i.widgetId,
-						gridX: i.gridX,
-						gridY: i.gridY,
-						gridWidth: i.gridWidth,
-						gridHeight: i.gridHeight,
-					})) },
-				),
-
-				reset: (appId, pageId) => writeUserPreference(
-					appId,
-					dashboardLayoutKey(pageId),
-					{ items: [] },
-				),
-			}
+			return resolveUserLayoutApi(this.userLayoutStore)
 		},
 
 		onLayoutChange(updated) {
@@ -3159,7 +3145,7 @@ var script = {
 			// library's own defaults, so a manifest need not set them — but a
 			// manifest that DOES set them must reach the component, or the
 			// declaration is a silent no-op that reads like configuration.
-			for (const key of ['countLabel', 'variant', 'showZeroCount', 'horizontal', 'vertical', 'filled', 'route', 'iconClass']) {
+			for (const key of ['countLabel', 'variant', 'showZeroCount', 'horizontal', 'vertical', 'filled', 'route', 'iconClass', 'format']) {
 				if (props[key] !== undefined) {
 					out[key] = props[key];
 				}