{{ n('tables', '%n selected row', '%n selected rows', selectedRows.length, {}) }}
@@ -73,6 +104,11 @@ import TrayArrowDown from 'vue-material-design-icons/TrayArrowDown.vue'
import viewportHelper from '../../../mixins/viewportHelper.js'
import SearchForm from '../partials/SearchForm.vue'
import PaginationBlock from './PaginationBlock.vue'
+import ViewListOutline from 'vue-material-design-icons/ViewListOutline.vue'
+import ViewGridOutline from 'vue-material-design-icons/ViewGridOutline.vue'
+import ViewGalleryOutline from 'vue-material-design-icons/ViewGalleryOutline.vue'
+import { CARD_LAYOUTS, LAYOUT_GALLERY, LAYOUT_TABLE, LAYOUT_TILES } from '../../../constants.ts'
+import { resolveLayout } from '../../../utils/viewSetting.js'
import { translate as t, translatePlural as n } from '@nextcloud/l10n'
export default {
@@ -88,6 +124,9 @@ export default {
Delete,
TrayArrowDown,
PaginationBlock,
+ ViewListOutline,
+ ViewGridOutline,
+ ViewGalleryOutline,
},
mixins: [viewportHelper],
@@ -121,6 +160,18 @@ export default {
type: Array,
default: null,
},
+ layout: {
+ type: String,
+ default: null,
+ },
+ canSwitchLayout: {
+ type: Boolean,
+ default: true,
+ },
+ viewSettings: {
+ type: Object,
+ default: null,
+ },
viewSetting: {
type: Object,
default: null,
@@ -132,6 +183,7 @@ export default {
},
emits: [
+ 'update:viewSetting',
'create-row',
'delete-selected-rows',
'download-filtered-csv',
@@ -144,6 +196,27 @@ export default {
},
computed: {
+ LAYOUT_TABLE: () => LAYOUT_TABLE,
+ LAYOUT_TILES: () => LAYOUT_TILES,
+ LAYOUT_GALLERY: () => LAYOUT_GALLERY,
+ // What the view itself is saved with, ignoring any local switch.
+ savedLayout() {
+ return resolveLayout(null, this.layout)
+ },
+ activeLayout() {
+ return resolveLayout(this.viewSetting, this.layout)
+ },
+ // Switching layout is a reading preference anyone may use, but it is only offered
+ // where the view was set up for cards: without a title source the cards would carry
+ // nothing but row numbers.
+ showLayoutToggle() {
+ if (!this.canSwitchLayout || !this.isView || !(this.columns?.length > 0)) {
+ return false
+ }
+
+ return (this.viewSettings?.cardTitleSource ?? null) !== null
+ || CARD_LAYOUTS.includes(this.layout)
+ },
getSelectedRows() {
const rows = []
this.selectedRows.forEach(id => {
@@ -172,6 +245,21 @@ export default {
},
methods: {
+ // The choice stays in the local view setting, so it is never persisted and is
+ // dropped again by "Reset local adjustments".
+ setLayout(layout) {
+ const viewSetting = { ...(this.viewSetting ?? {}) }
+
+ // Picking the layout the view is already saved with is not an adjustment, so it
+ // leaves nothing behind for "Reset local adjustments" to offer.
+ if (layout === this.savedLayout) {
+ delete viewSetting.layout
+ } else {
+ viewSetting.layout = layout
+ }
+
+ this.$emit('update:viewSetting', viewSetting)
+ },
t,
n,
updateOptionsDivWidth() {
@@ -278,4 +366,8 @@ export default {
}
}
+.layout-toggle {
+ margin-inline-start: auto;
+ align-self: center;
+}
diff --git a/src/shared/components/ncTable/sections/PaginationBlock.vue b/src/shared/components/ncTable/sections/PaginationBlock.vue
index 14416ac628..8189edf49d 100644
--- a/src/shared/components/ncTable/sections/PaginationBlock.vue
+++ b/src/shared/components/ncTable/sections/PaginationBlock.vue
@@ -52,7 +52,8 @@ import ChevronRightIcon from 'vue-material-design-icons/ChevronRight.vue'
import ChevronLeftIcon from 'vue-material-design-icons/ChevronLeft.vue'
import { NcButton, NcSelect, NcTextField } from '@nextcloud/vue'
import { translate as t } from '@nextcloud/l10n'
-import { emit } from '@nextcloud/event-bus'
+import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
+import { PAGINATION_CHANGED, isSamePaginationTarget } from '../mixins/paginationScope.js'
export default {
name: 'PaginationBlock',
@@ -72,12 +73,21 @@ export default {
type: Array,
default: () => [],
},
+ elementId: {
+ type: Number,
+ default: null,
+ },
+ isView: {
+ type: Boolean,
+ default: true,
+ },
},
data() {
return {
pageNumber: 1,
rowsPerPage: 100,
+ lastSyncedPagination: null,
}
},
@@ -90,19 +100,65 @@ export default {
watch: {
pageNumber() {
this.validatePageInput()
- emit('tables:pagination-changed', { pageNumber: this.pageNumber, rowsPerPage: this.rowsPerPage })
+ this.emitPaginationChanged()
},
rowsPerPage() {
this.validatePageInput()
- emit('tables:pagination-changed', { pageNumber: this.pageNumber, rowsPerPage: this.rowsPerPage })
+ this.emitPaginationChanged()
},
rows() {
this.validatePageInput()
},
},
+ mounted() {
+ subscribe(PAGINATION_CHANGED, this.adoptPagination)
+ },
+
+ beforeUnmount() {
+ unsubscribe(PAGINATION_CHANGED, this.adoptPagination)
+ },
+
methods: {
t,
+ emitPaginationChanged() {
+ // A value that was just adopted is not echoed back, so two controls of the same
+ // table cannot keep answering each other.
+ if (this.lastSyncedPagination?.pageNumber === this.pageNumber
+ && this.lastSyncedPagination?.rowsPerPage === this.rowsPerPage) {
+ return
+ }
+
+ this.lastSyncedPagination = { pageNumber: this.pageNumber, rowsPerPage: this.rowsPerPage }
+ emit(PAGINATION_CHANGED, {
+ pageNumber: this.pageNumber,
+ rowsPerPage: this.rowsPerPage,
+ elementId: this.elementId,
+ isView: this.isView,
+ })
+ },
+ // Keeps several pagination controls of the same table in sync.
+ adoptPagination(payload) {
+ if (!isSamePaginationTarget(this, payload)) {
+ return
+ }
+
+ const { pageNumber, rowsPerPage } = payload
+ if (rowsPerPage === this.rowsPerPage && pageNumber === this.pageNumber) {
+ return
+ }
+
+ this.lastSyncedPagination = {
+ pageNumber: pageNumber ?? this.pageNumber,
+ rowsPerPage: rowsPerPage ?? this.rowsPerPage,
+ }
+ if (rowsPerPage) {
+ this.rowsPerPage = rowsPerPage
+ }
+ if (pageNumber) {
+ this.pageNumber = pageNumber
+ }
+ },
validatePageInput() {
// Ensure page number is within valid range
if (this.pageNumber < 1) {
diff --git a/src/shared/constants.ts b/src/shared/constants.ts
index 6a981de1fd..5b9b21339c 100644
--- a/src/shared/constants.ts
+++ b/src/shared/constants.ts
@@ -55,3 +55,10 @@ export const COLUMN_WIDTH_MAX = 1000
export const IMAGE_PREVIEW_SIZE_MIN = 32
export const IMAGE_PREVIEW_SIZE_MAX = 192
export const IMAGE_PREVIEW_SIZE_DEFAULT = 64
+
+// from ViewLayout.php
+export const LAYOUT_TABLE = 'table'
+export const LAYOUT_TILES = 'tiles'
+export const LAYOUT_GALLERY = 'gallery'
+// The layouts that render rows as cards rather than as table rows.
+export const CARD_LAYOUTS = [LAYOUT_TILES, LAYOUT_GALLERY]
diff --git a/src/shared/utils/filePreview.js b/src/shared/utils/filePreview.js
new file mode 100644
index 0000000000..9adc06683c
--- /dev/null
+++ b/src/shared/utils/filePreview.js
@@ -0,0 +1,79 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { generateUrl } from '@nextcloud/router'
+
+// The query parameters a link may carry the file id in, compared lowercased: the server
+// writes fileId, while the Files app and older links write fileid or openfile.
+const FILE_ID_PARAMETERS = ['fileid', 'openfile']
+
+/**
+ * Whether the given value can be used as a file id.
+ *
+ * @param {unknown} value a candidate id, as a string or a number
+ * @return {boolean} true when it is a positive whole number
+ */
+export function isFileId(value) {
+ if (typeof value === 'number') {
+ return Number.isInteger(value) && value > 0
+ }
+
+ return typeof value === 'string' && /^\d+$/.test(value)
+}
+
+/**
+ * The id of a file on this server that the given link names, or null.
+ *
+ * A link is user supplied, so a foreign host is never followed: the preview would be
+ * requested by everyone who sees the row. Only the id is taken out of the link and the
+ * request is rebuilt from it, so no attacker chosen path or query string is ever sent.
+ *
+ * @param {unknown} value a link, absolute or relative to this server
+ * @return {string|null} the file id, or null when the link names no local file
+ */
+export function findLocalFileId(value) {
+ if (typeof value !== 'string' || value === '') {
+ return null
+ }
+
+ let url
+ try {
+ // A cell may hold the link with JSON escaped slashes.
+ url = new URL(value.replace(/\\\//g, '/'), window.location.origin)
+ } catch (error) {
+ return null
+ }
+
+ if (url.origin !== window.location.origin) {
+ return null
+ }
+
+ for (const [name, parameter] of url.searchParams) {
+ if (FILE_ID_PARAMETERS.includes(name.toLowerCase()) && isFileId(parameter)) {
+ return parameter
+ }
+ }
+
+ // The id may be followed by more path, as in /f/1/preview.
+ return url.pathname.match(/\/f\/(\d+)(?:\/|$)/)?.[1] ?? null
+}
+
+/**
+ * A preview request for the given file, at the given edge length.
+ *
+ * @param {string|number} fileId the file to render
+ * @param {number} size the edge length in pixels
+ * @return {string} the preview URL
+ */
+export function buildPreviewUrl(fileId, size) {
+ const parameters = new URLSearchParams({
+ fileId: String(fileId),
+ x: String(size),
+ y: String(size),
+ a: '1',
+ })
+
+ return generateUrl('/core/preview') + '?' + parameters.toString()
+}
diff --git a/src/shared/utils/viewSetting.js b/src/shared/utils/viewSetting.js
new file mode 100644
index 0000000000..ad38e69a2c
--- /dev/null
+++ b/src/shared/utils/viewSetting.js
@@ -0,0 +1,44 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { CARD_LAYOUTS, LAYOUT_TABLE } from '../constants.ts'
+
+/**
+ * The layout to render with.
+ *
+ * A viewer may switch layout for themselves; that choice lives in the local view
+ * setting and is never saved, so it falls back to the layout of the view itself.
+ * A value this version does not know renders as a table rather than as nothing.
+ *
+ * @param {object|null} viewSetting the local view setting of a table or view
+ * @param {string|null} savedLayout the layout the view is stored with
+ * @return {string} one of the known layouts
+ */
+export function resolveLayout(viewSetting, savedLayout) {
+ const layout = viewSetting?.layout ?? savedLayout
+
+ return CARD_LAYOUTS.includes(layout) ? layout : LAYOUT_TABLE
+}
+
+/**
+ * Whether the viewer has adjusted the view for themselves.
+ *
+ * These are the unsaved tweaks that "Reset local adjustments" clears, the layout a
+ * viewer switched to included. Several components show a cue for this state, so they
+ * all have to agree on what counts.
+ *
+ * @param {object|null} viewSetting the local view setting of a table or view
+ * @return {boolean} true when anything is set
+ */
+export function hasLocalViewAdjustments(viewSetting) {
+ if (!viewSetting) {
+ return false
+ }
+
+ return viewSetting.hiddenColumns?.length > 0
+ || !!viewSetting.sorting
+ || viewSetting.filter?.length > 0
+ || !!viewSetting.layout
+}
diff --git a/src/store/store.js b/src/store/store.js
index 3bfa80586c..c6d9e213df 100644
--- a/src/store/store.js
+++ b/src/store/store.js
@@ -125,6 +125,13 @@ export const useTablesStore = defineStore('store', {
},
setContext(context) {
const index = this.contexts.findIndex(c => c.id === context.id)
+ if (index === -1) {
+ // Loading one application by its URL fetches it before the list is there, and
+ // contexts[-1] would name a property rather than append: the getters iterate,
+ // so they would never see it and the page would render empty.
+ this.contexts.push(context)
+ return
+ }
this.contexts[index] = context
},
setActiveRowId(rowId) {
@@ -152,13 +159,7 @@ export const useTablesStore = defineStore('store', {
try {
const res = await axios.get(generateUrl('/apps/tables/table'))
this.setTables(res.data)
- let views = []
- res.data.forEach(table => {
- if (table.views) {
- views = views.concat(table.views)
- }
- })
- this.setViews(views)
+ this.replaceViewsOfListedTables(res.data)
} catch (e) {
displayError(e, t('tables', 'Could not load tables.'))
showError(t('tables', 'Could not fetch tables'))
@@ -168,6 +169,22 @@ export const useTablesStore = defineStore('store', {
return true
},
+ /**
+ * We have two sources of views, this coming from tables endpoint, and those
+ * that were shared directly or through contexts.
+ */
+ replaceViewsOfListedTables(tables) {
+ const tableIdsShippingViews = new Set(
+ tables
+ .filter(table => !table.isShared || table.onSharePermissions?.manage)
+ .map(table => table.id),
+ )
+ const viewsOfOtherTables = this.views.filter(view => !tableIdsShippingViews.has(view.tableId))
+ const viewsOfListedTables = tables.flatMap(table => table.views ?? [])
+
+ this.setViews([...viewsOfListedTables, ...viewsOfOtherTables])
+ },
+
async loadViewsSharedWithMeFromBE() {
this.setLoading({ key: 'viewsShared', value: true })
diff --git a/src/types/openapi/openapi.ts b/src/types/openapi/openapi.ts
index e8d5e3a0c9..867ae05227 100644
--- a/src/types/openapi/openapi.ts
+++ b/src/types/openapi/openapi.ts
@@ -1360,7 +1360,7 @@ export type components = {
readonly technicalName: string | null;
readonly emoji: string | null;
/** Format: int64 */
- readonly tableId: number;
+ readonly tableId: number | null;
readonly ownership: string;
readonly ownerDisplayName: string | null;
readonly createdBy: string;
@@ -1401,6 +1401,14 @@ export type components = {
readonly uuid?: string;
}[];
}[])[];
+ /** @enum {string} */
+ readonly layout: "table" | "tiles" | "gallery";
+ readonly viewSettings: {
+ /** Format: int64 */
+ readonly cardBackgroundSource: number | null;
+ /** Format: int64 */
+ readonly cardTitleSource: number | null;
+ };
readonly isShared: boolean;
readonly favorite: boolean;
readonly onSharePermissions: {
@@ -1416,6 +1424,8 @@ export type components = {
readonly isFederated: boolean;
/** Format: int64 */
readonly sidebarOrder: number | null;
+ /** @enum {string} */
+ readonly type: "table" | "grid";
};
};
responses: never;
@@ -1917,6 +1927,12 @@ export interface operations {
* @default null
*/
readonly technicalName?: string | null;
+ /**
+ * @description Layout for the view
+ * @default null
+ * @enum {string|null}
+ */
+ readonly layout?: "table" | "tiles" | "gallery" | null;
};
};
};
@@ -2085,6 +2101,14 @@ export interface operations {
/** @enum {string} */
readonly mode: "ASC" | "DESC";
}[];
+ /** @enum {string|null} */
+ readonly layout?: "table" | "tiles" | "gallery" | null;
+ readonly viewSettings?: {
+ /** Format: int64 */
+ readonly cardBackgroundSource?: number | null;
+ /** Format: int64 */
+ readonly cardTitleSource?: number | null;
+ };
readonly filter?: readonly (readonly {
/** Format: int64 */
readonly columnId: number;
diff --git a/src/views/ContentReferenceWidget.vue b/src/views/ContentReferenceWidget.vue
index 6d9671258f..c37494b2ce 100644
--- a/src/views/ContentReferenceWidget.vue
+++ b/src/views/ContentReferenceWidget.vue
@@ -12,13 +12,20 @@
+
createMock(IManager::class);
+ $activityApi->expects($this->never())->method('publish');
+ $tableMapper = $this->createMock(TableMapper::class);
+ $tableMapper->expects($this->never())->method('find');
+
+ $manager = new ActivityManager(
+ $activityApi,
+ $this->createMock(IFactory::class),
+ $tableMapper,
+ $this->createMock(ViewMapper::class),
+ $this->createMock(ColumnMapper::class),
+ $this->createMock(ShareService::class),
+ new CappedMemoryCache(),
+ 'alice',
+ );
+ $view = new View();
+ $view->setId(6);
+ $view->setTitle('Intake home');
+ $view->setTableId(null);
+ $view->setCreatedBy('alice');
+
+ $manager->triggerEvent(ActivityManager::TABLES_OBJECT_VIEW, $view, ActivityManager::SUBJECT_VIEW_CREATE, [], 'alice');
+ }
+}
diff --git a/tests/unit/Constants/ViewLayoutTest.php b/tests/unit/Constants/ViewLayoutTest.php
new file mode 100644
index 0000000000..84371cc135
--- /dev/null
+++ b/tests/unit/Constants/ViewLayoutTest.php
@@ -0,0 +1,54 @@
+assertSame(ViewLayout::GALLERY, ViewLayout::tryFromMixed('gallery'));
+ }
+
+ /**
+ * @dataProvider provideValuesThatNameNoLayout
+ */
+ public function testTryFromMixedDropsWhatNamesNoLayout(mixed $value): void {
+ $this->assertNull(ViewLayout::tryFromMixed($value));
+ }
+
+ /**
+ * @dataProvider provideValuesThatNameNoLayout
+ */
+ public function testNormalizeFallsBackToTheTableLayout(mixed $value): void {
+ $this->assertSame(ViewLayout::TABLE, ViewLayout::normalize($value));
+ }
+
+ public function testNormalizeKeepsAKnownLayout(): void {
+ $this->assertSame(ViewLayout::TILES, ViewLayout::normalize('tiles'));
+ }
+
+ /**
+ * A layout reaches us from a scheme, a federated instance and a stored row alike, so
+ * everything a newer version or a hand written payload may put there has to be handled.
+ *
+ * @return array
+ */
+ public static function provideValuesThatNameNoLayout(): array {
+ return [
+ 'null' => [null],
+ 'empty string' => [''],
+ 'unknown name' => ['carousel'],
+ 'integer' => [1],
+ 'boolean' => [true],
+ 'array' => [['gallery']],
+ ];
+ }
+}
diff --git a/tests/unit/Db/Row2MapperViewWithoutTableTest.php b/tests/unit/Db/Row2MapperViewWithoutTableTest.php
new file mode 100644
index 0000000000..21092fb0d8
--- /dev/null
+++ b/tests/unit/Db/Row2MapperViewWithoutTableTest.php
@@ -0,0 +1,59 @@
+createMock(IDBConnection::class);
+ $db->expects($this->never())->method('getQueryBuilder');
+ $rowSleeveMapper = $this->createMock(RowSleeveMapper::class);
+ $rowSleeveMapper->expects($this->never())->method('countRows');
+
+ $this->mapper = new Row2Mapper(
+ 'alice',
+ $db,
+ $this->createMock(LoggerInterface::class),
+ $this->createMock(UserHelper::class),
+ $rowSleeveMapper,
+ $this->createMock(ColumnsHelper::class),
+ $this->createMock(ColumnMapper::class),
+ );
+ }
+
+ private function viewWithoutTable(): View {
+ $view = new View();
+ $view->setId(6);
+ $view->setTableId(null);
+ $view->setType(View::TYPE_GRID);
+ return $view;
+ }
+
+ public function testNoRowIsPresentInAViewWithoutATable(): void {
+ $this->assertFalse($this->mapper->isRowInViewPresent(12, $this->viewWithoutTable(), 'alice'));
+ }
+
+ public function testAViewWithoutATableCountsNoRows(): void {
+ $this->assertSame(0, $this->mapper->countRowsForView($this->viewWithoutTable(), 'alice'));
+ }
+}
diff --git a/tests/unit/Db/ViewTest.php b/tests/unit/Db/ViewTest.php
new file mode 100644
index 0000000000..ab1403dd3e
--- /dev/null
+++ b/tests/unit/Db/ViewTest.php
@@ -0,0 +1,135 @@
+assertSame(View::TYPE_TABLE, $view->getTypeOrDefault());
+
+ $view->setType('something-else');
+ $this->assertSame(View::TYPE_TABLE, $view->getTypeOrDefault());
+
+ $view->setType(View::TYPE_GRID);
+ $this->assertSame(View::TYPE_GRID, $view->getTypeOrDefault());
+ }
+
+ public function testOwnershipFallsBackToCreatorForViewsWithoutTable(): void {
+ $view = new View();
+ $view->setCreatedBy('alice');
+ $this->assertSame('alice', $view->getOwnership());
+
+ $view->setOwnership('table-owner');
+ $this->assertSame('table-owner', $view->getOwnership());
+ }
+
+ public function testOwnershipDoesNotFallBackToCreatorForAViewWithATable(): void {
+ $view = new View();
+ $view->setTableId(4);
+ $view->setCreatedBy('alice');
+
+ $this->assertNull($view->getOwnership(), 'without the joined table owner the creator must not become the owner');
+ }
+
+ public function testOwnershipDoesNotFallBackToCreatorForAFederatedView(): void {
+ $view = new View();
+ $view->setExternalId(17);
+ $view->setCreatedBy('remote-sharer');
+
+ $this->assertNull($view->getOwnership());
+ }
+
+ public function testOnlyAViewWithoutTableAndExternalIdIsStandalone(): void {
+ $view = new View();
+ $this->assertTrue($view->isStandalone());
+
+ $view->setExternalId(17);
+ $this->assertFalse($view->isStandalone(), 'a federated view has no local table but is not standalone');
+
+ $view->setExternalId(null);
+ $view->setTableId(4);
+ $this->assertFalse($view->isStandalone());
+ }
+
+ public function testJsonSerializeCarriesTypeAndTechnicalName(): void {
+ $view = new View();
+ $view->setType(View::TYPE_GRID);
+ $view->setTechnicalName('home');
+ $view->setCreatedBy('alice');
+
+ $json = $view->jsonSerialize();
+
+ $this->assertSame('grid', $json['type']);
+ $this->assertSame('home', $json['technicalName']);
+ $this->assertSame(-1, $json['tableId']);
+ $this->assertSame('alice', $json['ownership']);
+ }
+
+ public function testAViewWithoutALayoutRendersAsATable(): void {
+ $this->assertSame('table', (new View())->getLayoutNormalized());
+ }
+
+ public function testAStoredLayoutIsKept(): void {
+ $view = new View();
+ $view->setLayout('gallery');
+
+ $this->assertSame('gallery', $view->getLayoutNormalized());
+ }
+
+ /**
+ * A row may hold a layout only a newer version knows, so it renders as a table rather
+ * than as nothing at all.
+ */
+ public function testAnUnknownStoredLayoutRendersAsATable(): void {
+ $view = new View();
+ $view->setLayout('carousel');
+
+ $this->assertSame('table', $view->getLayoutNormalized());
+ }
+
+ public function testStoredCardSourcesAreRead(): void {
+ $view = new View();
+ $view->setViewSettings(json_encode(['cardBackgroundSource' => 3, 'cardTitleSource' => 4]));
+
+ $viewSettings = $view->getViewSettingsObject();
+ $this->assertSame(3, $viewSettings->getCardBackgroundSource());
+ $this->assertSame(4, $viewSettings->getCardTitleSource());
+ }
+
+ /**
+ * @dataProvider provideUnusableViewSettings
+ */
+ public function testUnusableViewSettingsReadAsNoSources(?string $stored): void {
+ // One malformed row must not fail every endpoint that serialises the view.
+ $view = new View();
+ $view->setViewSettings($stored);
+
+ $viewSettings = $view->getViewSettingsObject();
+ $this->assertNull($viewSettings->getCardBackgroundSource());
+ $this->assertNull($viewSettings->getCardTitleSource());
+ }
+
+ /**
+ * @return array
+ */
+ public static function provideUnusableViewSettings(): array {
+ return [
+ 'never written' => [null],
+ 'empty' => [''],
+ 'json null' => ['null'],
+ 'a scalar rather than an object' => ['5'],
+ 'a string rather than an object' => ['"gallery"'],
+ 'sources of the wrong type' => ['{"cardBackgroundSource":"3","cardTitleSource":[]}'],
+ ];
+ }
+}
diff --git a/tests/unit/Db/ViewUuidIndexTest.php b/tests/unit/Db/ViewUuidIndexTest.php
new file mode 100644
index 0000000000..8525c9de2a
--- /dev/null
+++ b/tests/unit/Db/ViewUuidIndexTest.php
@@ -0,0 +1,52 @@
+cleanupTablesData();
+ }
+
+ public function testASecondViewWithoutATableCannotReuseAUuid(): void {
+ $this->insertViewWithoutTable('First');
+
+ try {
+ $this->insertViewWithoutTable('Second');
+ $this->fail('A second view with the same uuid was stored');
+ } catch (Exception $e) {
+ $this->assertSame(Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION, $e->getReason());
+ }
+ }
+
+ private function insertViewWithoutTable(string $title): void {
+ $qb = $this->connection->getQueryBuilder();
+ $qb->insert('tables_views')
+ ->values([
+ 'uuid' => $qb->createNamedParameter(self::UUID),
+ 'title' => $qb->createNamedParameter($title),
+ 'description' => $qb->createNamedParameter(''),
+ 'type' => $qb->createNamedParameter('grid'),
+ 'created_by' => $qb->createNamedParameter('user1'),
+ 'created_at' => $qb->createNamedParameter(date('Y-m-d H:i:s')),
+ 'last_edit_by' => $qb->createNamedParameter('user1'),
+ 'last_edit_at' => $qb->createNamedParameter(date('Y-m-d H:i:s')),
+ ])
+ ->executeStatement();
+ }
+}
diff --git a/tests/unit/Federation/FederationProviderTest.php b/tests/unit/Federation/FederationProviderTest.php
index 07336a3d1e..0bdb3bfa06 100644
--- a/tests/unit/Federation/FederationProviderTest.php
+++ b/tests/unit/Federation/FederationProviderTest.php
@@ -104,7 +104,7 @@ public function testShareReceivedCreatesView(): void {
$share->method('getOwner')->willReturn('admin@nextcloud.local');
$share->method('getShareSecret')->willReturn('secret456');
$share->method('getSharedBy')->willReturn('admin@nextcloud.local');
- $share->method('getDescription')->willReturn(json_encode(['emoji' => '🦆', 'nodeType' => 'view']));
+ $share->method('getDescription')->willReturn(json_encode(['emoji' => '🦆', 'nodeType' => 'view', 'layout' => 'gallery']));
$this->viewMapper->expects($this->once())
->method('insert')
@@ -113,6 +113,7 @@ public function testShareReceivedCreatesView(): void {
$this->assertEquals('Federation View', $view->getTitle());
$this->assertEquals(5, $view->getExternalId());
$this->assertEquals('🦆', $view->getEmoji());
+ $this->assertEquals('gallery', $view->getLayout());
return $view;
});
@@ -127,6 +128,30 @@ public function testShareReceivedCreatesView(): void {
$this->assertEquals('99', $result);
}
+ public function testAProxyViewGetsItsOwnUuidAndAProxyTableKeepsTheSourceOne(): void {
+ $sourceUuid = '0199c8a0-1a2b-7c3d-8e4f-123456789abc';
+ $stored = [];
+ foreach (['view' => $this->viewMapper, 'table' => $this->tableMapper] as $nodeType => $mapper) {
+ $share = $this->createMock(ICloudFederationShare::class);
+ $share->method('getShareWith')->willReturn('admin');
+ $share->method('getResourceName')->willReturn('Federated ' . $nodeType);
+ $share->method('getProviderId')->willReturn('5');
+ $share->method('getShareSecret')->willReturn('secret-' . $nodeType);
+ $share->method('getDescription')->willReturn(json_encode(['nodeType' => $nodeType, 'uuid' => $sourceUuid]));
+ $mapper->method('insert')->willReturnCallback(static function (Table|View $node) use (&$stored, $nodeType): Table|View {
+ $node->setId(7);
+ $stored[$nodeType] = $node->getUuid();
+ return $node;
+ });
+ $this->provider->shareReceived($share);
+ }
+
+ // Two proxies of one view on this instance would otherwise clash on the uuid index of views
+ $this->assertNotNull($stored['view']);
+ $this->assertNotSame($sourceUuid, $stored['view']);
+ $this->assertSame($sourceUuid, $stored['table']);
+ }
+
public function testNotificationReceivedPermissionUpdate(): void {
$share = new Share();
$share->setNodeId(1);
@@ -179,6 +204,39 @@ public function testNotificationReceivedNodeUpdate(): void {
$this->assertEquals('🦆', $table->getEmoji());
}
+ public function testNotificationReceivedNodeUpdateAppliesLayout(): void {
+ $view = new View();
+ $view->setId(1);
+ $view->setExternalId(2);
+ $view->setShareToken('abcdefghijklmnop');
+ $view->setLayout('table');
+
+ $this->viewMapper->method('findByExternalIdAndToken')->willReturn($view);
+ $this->viewMapper->expects($this->exactly(2))->method('update')->with($view);
+
+ $this->provider->notificationReceived(
+ FederationProvider::NOTIFICATION_UPDATE_NODE,
+ '2',
+ [
+ 'sharedSecret' => 'abcdefghijklmnop',
+ 'nodeType' => 'view',
+ 'layout' => 'tiles',
+ ]
+ );
+ $this->assertEquals('tiles', $view->getLayout());
+
+ $this->provider->notificationReceived(
+ FederationProvider::NOTIFICATION_UPDATE_NODE,
+ '2',
+ [
+ 'sharedSecret' => 'abcdefghijklmnop',
+ 'nodeType' => 'view',
+ 'layout' => 'carousel',
+ ]
+ );
+ $this->assertEquals('tiles', $view->getLayout(), 'an unknown layout is ignored');
+ }
+
public function testNotificationReceiveNodeDelete(): void {
$table = new Table();
$table->setId(1);
diff --git a/tests/unit/Model/ViewSettingsTest.php b/tests/unit/Model/ViewSettingsTest.php
new file mode 100644
index 0000000000..b0745f98f5
--- /dev/null
+++ b/tests/unit/Model/ViewSettingsTest.php
@@ -0,0 +1,88 @@
+ 3, 'cardTitleSource' => 4]);
+
+ $this->assertSame(3, $settings->getCardBackgroundSource());
+ $this->assertSame(4, $settings->getCardTitleSource());
+ }
+
+ public function testInputArrayRejectsNonIntegerSource(): void {
+ $this->expectException(InvalidArgumentException::class);
+
+ ViewSettings::createFromInputArray(['cardBackgroundSource' => '3']);
+ }
+
+ public function testInputArrayResolvesUuidThroughTheColumnsMap(): void {
+ // Only getId() is read from the map, and a real Column needs the server to load.
+ $column = new class {
+ public function getId(): int {
+ return 42;
+ }
+ };
+
+ $settings = ViewSettings::createFromInputArray(
+ ['cardBackgroundSourceUuid' => 'uuid-a', 'cardTitleSourceUuid' => 'uuid-missing'],
+ ['uuid-a' => $column],
+ );
+
+ $this->assertSame(42, $settings->getCardBackgroundSource());
+ $this->assertNull($settings->getCardTitleSource(), 'a uuid that does not resolve is dropped');
+ }
+
+ public function testInputArrayDropsABareIdWhenReadingAScheme(): void {
+ // A scheme id belongs to the instance it was exported from, so only the uuid form counts.
+ $settings = ViewSettings::createFromInputArray(['cardBackgroundSource' => 3, 'cardTitleSource' => 4], []);
+
+ $this->assertNull($settings->getCardBackgroundSource());
+ $this->assertNull($settings->getCardTitleSource());
+ }
+
+ public function testStoredArrayToleratesWhatItCannotUse(): void {
+ $settings = ViewSettings::createFromStoredArray(['cardBackgroundSource' => 'garbage', 'cardTitleSource' => 7]);
+
+ $this->assertNull($settings->getCardBackgroundSource());
+ $this->assertSame(7, $settings->getCardTitleSource());
+ $this->assertSame(
+ ['cardBackgroundSource' => null, 'cardTitleSource' => 7],
+ $settings->jsonSerialize(),
+ );
+ }
+
+ public function testRemapSourcesFollowsTheMapAndDropsTheRest(): void {
+ $remapped = ViewSettings::remapSources(
+ ['cardBackgroundSource' => 1, 'cardTitleSource' => 2, 'other' => 'kept'],
+ [1 => 10],
+ );
+
+ $this->assertSame(10, $remapped['cardBackgroundSource']);
+ $this->assertNull($remapped['cardTitleSource'], 'an id without a mapping must not survive');
+ $this->assertSame('kept', $remapped['other']);
+ }
+
+ public function testRemapSourcesLeavesUnsetAndNullAlone(): void {
+ $this->assertSame(['cardTitleSource' => null], ViewSettings::remapSources(['cardTitleSource' => null], [1 => 10]));
+ $this->assertSame([], ViewSettings::remapSources([], [1 => 10]));
+ }
+
+ public function testRemapSourcesDropsANonPositiveOrNonIntegerId(): void {
+ $remapped = ViewSettings::remapSources(['cardBackgroundSource' => '1', 'cardTitleSource' => 0], [1 => 10, 0 => 5]);
+
+ $this->assertNull($remapped['cardBackgroundSource']);
+ $this->assertNull($remapped['cardTitleSource']);
+ }
+}
diff --git a/tests/unit/Model/ViewUpdateInputTest.php b/tests/unit/Model/ViewUpdateInputTest.php
index 8df9e05705..a48d7de59e 100644
--- a/tests/unit/Model/ViewUpdateInputTest.php
+++ b/tests/unit/Model/ViewUpdateInputTest.php
@@ -9,7 +9,9 @@
namespace OCA\Tables\Tests\Unit\Model;
+use InvalidArgumentException;
use OCA\Tables\Constants\ViewUpdatableParameters;
+use OCA\Tables\Model\ViewSettings;
use OCA\Tables\Model\ViewUpdateInput;
use PHPUnit\Framework\TestCase;
@@ -37,4 +39,104 @@ public function testUpdateDetailIncludesEmptyDescription(): void {
$this->assertArrayHasKey(ViewUpdatableParameters::DESCRIPTION->value, $updates);
$this->assertSame('', $updates[ViewUpdatableParameters::DESCRIPTION->value]);
}
+
+ public function testUpdateDetailIncludesTypeAndTechnicalName(): void {
+ $input = ViewUpdateInput::fromInputArray(['type' => 'grid', 'technicalName' => 'home']);
+ $updates = [];
+
+ foreach ($input->updateDetail() as $parameter => $value) {
+ $updates[$parameter->value] = $value;
+ }
+
+ $this->assertSame('grid', $updates[ViewUpdatableParameters::TYPE->value]);
+ $this->assertSame('home', $updates[ViewUpdatableParameters::TECHNICAL_NAME->value]);
+ }
+
+ public function testUpdateDetailSkipsTypeWhenAbsent(): void {
+ $input = ViewUpdateInput::fromInputArray(['title' => 'Only a title']);
+ $updates = [];
+
+ foreach ($input->updateDetail() as $parameter => $value) {
+ $updates[$parameter->value] = $value;
+ }
+
+ $this->assertArrayNotHasKey(ViewUpdatableParameters::TYPE->value, $updates);
+ $this->assertArrayNotHasKey(ViewUpdatableParameters::TECHNICAL_NAME->value, $updates);
+ }
+
+ public function testATypeThatIsNotAStringIsRejected(): void {
+ $this->expectException(InvalidArgumentException::class);
+ $this->expectExceptionMessage('"type" must be a string');
+ ViewUpdateInput::fromInputArray(['type' => ['grid']]);
+ }
+
+ public function testAnUnknownTypeIsRejected(): void {
+ $this->expectException(InvalidArgumentException::class);
+ $this->expectExceptionMessage('Unknown view type "kanban"');
+ ViewUpdateInput::fromInputArray(['type' => 'kanban']);
+ }
+
+ public function testUpdateDetailCarriesAKnownLayout(): void {
+ $input = ViewUpdateInput::fromInputArray(['layout' => 'gallery']);
+
+ $this->assertSame('gallery', $this->updates($input)[ViewUpdatableParameters::LAYOUT->value]);
+ }
+
+ public function testUpdateDetailOmitsAnAbsentLayout(): void {
+ $this->assertArrayNotHasKey(
+ ViewUpdatableParameters::LAYOUT->value,
+ $this->updates(ViewUpdateInput::fromInputArray(['layout' => ''])),
+ );
+ }
+
+ public function testAnUnknownLayoutIsRejected(): void {
+ $this->expectException(InvalidArgumentException::class);
+
+ ViewUpdateInput::fromInputArray(['layout' => 'carousel']);
+ }
+
+ public function testALayoutThatIsNotAStringIsRejected(): void {
+ $this->expectException(InvalidArgumentException::class);
+
+ ViewUpdateInput::fromInputArray(['layout' => 1]);
+ }
+
+ public function testViewSettingsArriveAsJsonFromTheClient(): void {
+ $input = ViewUpdateInput::fromInputArray([
+ 'viewSettings' => json_encode(['cardBackgroundSource' => 3, 'cardTitleSource' => null]),
+ ]);
+
+ $viewSettings = $this->updates($input)[ViewUpdatableParameters::VIEW_SETTINGS->value];
+ $this->assertInstanceOf(ViewSettings::class, $viewSettings);
+ $this->assertSame(3, $viewSettings->getCardBackgroundSource());
+ $this->assertNull($viewSettings->getCardTitleSource());
+ }
+
+ public function testNullViewSettingsClearTheStoredSources(): void {
+ // A cleared setting still has to reach the view, so it is an empty value object
+ // rather than the absent case that updateDetail() skips.
+ $input = ViewUpdateInput::fromInputArray(['viewSettings' => null]);
+
+ $viewSettings = $this->updates($input)[ViewUpdatableParameters::VIEW_SETTINGS->value];
+ $this->assertNull($viewSettings->getCardBackgroundSource());
+ $this->assertNull($viewSettings->getCardTitleSource());
+ }
+
+ public function testViewSettingsThatAreNotAStructureAreRejected(): void {
+ $this->expectException(InvalidArgumentException::class);
+
+ ViewUpdateInput::fromInputArray(['viewSettings' => 5]);
+ }
+
+ /**
+ * @return array
+ */
+ private function updates(ViewUpdateInput $input): array {
+ $updates = [];
+ foreach ($input->updateDetail() as $parameter => $value) {
+ $updates[$parameter->value] = $value;
+ }
+
+ return $updates;
+ }
}
diff --git a/tests/unit/Service/PermissionsServiceTest.php b/tests/unit/Service/PermissionsServiceTest.php
index 7d1dfe8468..9b7d620c28 100644
--- a/tests/unit/Service/PermissionsServiceTest.php
+++ b/tests/unit/Service/PermissionsServiceTest.php
@@ -12,6 +12,7 @@
use OCA\Tables\Db\ContextMapper;
use OCA\Tables\Db\ShareMapper;
use OCA\Tables\Db\TableMapper;
+use OCA\Tables\Db\View;
use OCA\Tables\Db\ViewMapper;
use OCA\Tables\Errors\InternalError;
use OCA\Tables\Helper\CircleHelper;
@@ -71,4 +72,25 @@ public function testPreCheckUserIdNoUserAllowed() {
self::assertEquals($userId, $permissionsService->preCheckUserId($userId));
}
+
+ private function tablelessView(string $createdBy): View {
+ $view = new View();
+ $view->setId(6);
+ $view->setTableId(null);
+ $view->setCreatedBy($createdBy);
+ $view->setType(View::TYPE_GRID);
+ return $view;
+ }
+
+ public function testTheCreatorManagesAViewWithoutTable(): void {
+ $permissionsService = $this->getPermissionServiceWithUserId('alice');
+
+ $this->assertTrue($permissionsService->canManageView($this->tablelessView('alice'), 'alice'));
+ }
+
+ public function testOthersDoNotInheritAnythingOnAViewWithoutTable(): void {
+ $permissionsService = $this->getPermissionServiceWithUserId('bob');
+
+ $this->assertFalse($permissionsService->canManageView($this->tablelessView('alice'), 'bob'));
+ }
}
diff --git a/tests/unit/Service/RowServiceViewWithoutTableTest.php b/tests/unit/Service/RowServiceViewWithoutTableTest.php
new file mode 100644
index 0000000000..d1024d6c45
--- /dev/null
+++ b/tests/unit/Service/RowServiceViewWithoutTableTest.php
@@ -0,0 +1,82 @@
+createMock(Row2Mapper::class);
+ $row2Mapper->method('getTableIdForRow')->willReturn(4);
+ $row2Mapper->method('find')->willReturn($this->createMock(Row2::class));
+ $row2Mapper->expects($this->never())->method('isRowInViewPresent');
+
+ $permissionsService = $this->createMock(PermissionsService::class);
+ $permissionsService->method('canReadRowsByElementId')->willReturn(true);
+ $permissionsService->method('canUpdateRowsByViewId')->willReturn(true);
+ $permissionsService->method('canDeleteRowsByViewId')->willReturn(true);
+
+ $view = new View();
+ $view->setId(6);
+ $view->setTableId(null);
+ $view->setType(View::TYPE_GRID);
+ $viewMapper = $this->createMock(ViewMapper::class);
+ $viewMapper->method('find')->with(6)->willReturn($view);
+
+ $this->service = new RowService(
+ $this->createMock(LoggerInterface::class),
+ 'alice',
+ $permissionsService,
+ $this->createMock(ColumnMapper::class),
+ $viewMapper,
+ $this->createMock(TableMapper::class),
+ $row2Mapper,
+ $this->createMock(IEventDispatcher::class),
+ $this->createMock(ColumnsHelper::class),
+ $this->createMock(ActivityManager::class),
+ $this->createMock(NotificationHelper::class),
+ $this->createMock(IDBConnection::class),
+ );
+ }
+
+ public function testUpdatingARowThroughAViewWithoutATableIsNotFound(): void {
+ $this->expectException(NotFoundError::class);
+ $this->expectExceptionMessage('has no rows to update');
+ $this->service->updateSet(12, 6, [], 'alice', null);
+ }
+
+ public function testDeletingARowThroughAViewWithoutATableIsNotFound(): void {
+ $this->expectException(NotFoundError::class);
+ $this->expectExceptionMessage('has no rows to delete');
+ $this->service->delete(12, 6, 'alice');
+ }
+}
diff --git a/tests/unit/Service/StructureServiceTest.php b/tests/unit/Service/StructureServiceTest.php
index d5104ace92..5ab69361e7 100644
--- a/tests/unit/Service/StructureServiceTest.php
+++ b/tests/unit/Service/StructureServiceTest.php
@@ -32,4 +32,54 @@ public function testNoChanges() {
$this->assertSame([], $this->service->removedColumns());
$this->assertSame([], $this->service->modifiedColumns());
}
+
+ /**
+ * The current state comes from View::jsonSerialize(), which always carries layout and
+ * viewSettings; a scheme written before they existed carries neither.
+ */
+ public function testViewsWithoutLayoutKeysAreNotModified(): void {
+ $current = $this->originalSchema;
+ foreach ($current['views'] as &$view) {
+ $view['layout'] = 'table';
+ $view['viewSettings'] = ['cardBackgroundSource' => null, 'cardTitleSource' => null];
+ }
+ unset($view);
+
+ $this->service->resolveChanges($current, $this->originalSchema);
+
+ $this->assertSame([], $this->service->modifiedViews());
+ }
+
+ public function testAChangedCardSourceMarksTheViewModified(): void {
+ $current = $this->originalSchema;
+ $update = $this->originalSchema;
+ $current['views'][0]['viewSettings'] = ['cardBackgroundSource' => null, 'cardTitleSource' => $this->originalSchema['columns'][0]['id']];
+ $update['views'][0]['viewSettings'] = ['cardBackgroundSource' => null, 'cardTitleSource' => $this->originalSchema['columns'][1]['id']];
+
+ $this->service->resolveChanges($current, $update);
+
+ $this->assertCount(1, $this->service->modifiedViews());
+ }
+
+ public function testASchemeWithoutViewSettingsKeepsTheStoredCardSources(): void {
+ $current = $this->originalSchema;
+ foreach ($current['views'] as &$view) {
+ $view['layout'] = 'table';
+ $view['viewSettings'] = ['cardBackgroundSource' => null, 'cardTitleSource' => $this->originalSchema['columns'][0]['id']];
+ }
+ unset($view);
+
+ $this->service->resolveChanges($current, $this->originalSchema);
+
+ $this->assertSame([], $this->service->modifiedViews());
+ }
+
+ public function testAChangedLayoutMarksTheViewModified(): void {
+ $update = $this->originalSchema;
+ $update['views'][0]['layout'] = 'gallery';
+
+ $this->service->resolveChanges($this->originalSchema, $update);
+
+ $this->assertCount(1, $this->service->modifiedViews());
+ }
}
diff --git a/tests/unit/Service/ViewServiceTest.php b/tests/unit/Service/ViewServiceTest.php
new file mode 100644
index 0000000000..a4813e3af6
--- /dev/null
+++ b/tests/unit/Service/ViewServiceTest.php
@@ -0,0 +1,248 @@
+permissionsService = $this->createMock(PermissionsService::class);
+ $this->permissionsService->method('preCheckUserId')->willReturnCallback(static fn (?string $userId) => $userId ?? 'alice');
+ $this->mapper = $this->createMock(ViewMapper::class);
+ $this->activityManager = $this->createMock(ActivityManager::class);
+ $l10n = $this->createMock(IL10N::class);
+ $l10n->method('t')->willReturnCallback(static fn (string $text): string => $text);
+
+ $this->service = new ViewService(
+ $this->permissionsService,
+ $this->createMock(LoggerInterface::class),
+ 'alice',
+ $this->mapper,
+ $this->createMock(ShareService::class),
+ $this->createMock(RowService::class),
+ $this->createMock(UserHelper::class),
+ $this->createMock(FavoritesService::class),
+ $this->createMock(IEventDispatcher::class),
+ $this->createMock(ContextService::class),
+ $l10n,
+ $this->createMock(FederationService::class),
+ $this->activityManager,
+ );
+ }
+
+ private function storedView(?int $tableId = 4): View {
+ $view = new View();
+ $view->setId(6);
+ $view->setTitle('Intake home');
+ $view->setTableId($tableId);
+ $view->setCreatedBy('alice');
+ $view->setType($tableId === null ? View::TYPE_GRID : View::TYPE_TABLE);
+ $view->resetUpdatedFields();
+ return $view;
+ }
+
+ private function expectUpdateOf(View $view): void {
+ $this->permissionsService->method('canManageView')->willReturn(true);
+ $this->mapper->method('find')->with(6)->willReturn($view);
+ $this->mapper->method('update')->willReturnArgument(0);
+ }
+
+ public function testUpdateWritesEveryParameterToItsOwnColumn(): void {
+ $this->expectUpdateOf($this->storedView(4));
+
+ $updated = $this->service->update(6, ViewUpdateInput::fromInputArray([
+ 'sort' => [['columnId' => 3, 'mode' => 'ASC']],
+ 'type' => 'table',
+ ]), 'alice', true);
+
+ $this->assertSame('table', $updated->getType());
+ $this->assertSame([['columnId' => 3, 'mode' => 'ASC']], $updated->getSortArray());
+ }
+
+ public function testUpdateRefusesToTurnATablelessViewIntoATableView(): void {
+ $this->expectUpdateOf($this->storedView(null));
+
+ $this->expectException(BadRequestError::class);
+ $this->expectExceptionMessage('cannot become a table view');
+ $this->service->update(6, ViewUpdateInput::fromInputArray(['type' => 'table']), 'alice', true);
+ }
+
+ public function testUpdateRejectsAMalformedTechnicalName(): void {
+ $this->expectUpdateOf($this->storedView());
+
+ $this->expectException(BadRequestError::class);
+ $this->expectExceptionMessage('Technical name');
+ $this->service->update(6, ViewUpdateInput::fromInputArray(['technicalName' => 'Not A Name']), 'alice', true);
+ }
+
+ public function testUpdateStoresAValidTechnicalNameAndType(): void {
+ $view = $this->storedView();
+ $this->expectUpdateOf($view);
+
+ $updated = $this->service->update(6, ViewUpdateInput::fromInputArray(['technicalName' => 'intake_2', 'type' => 'table']), 'alice', true);
+
+ $this->assertSame('intake_2', $updated->getTechnicalName());
+ $this->assertSame('table', $updated->getType());
+ }
+
+ public function testUpdateRefusesToTurnAViewWithATableIntoAGridView(): void {
+ $this->expectUpdateOf($this->storedView(4));
+
+ $this->expectException(BadRequestError::class);
+ $this->expectExceptionMessage('cannot become a grid view');
+ $this->service->update(6, ViewUpdateInput::fromInputArray(['type' => 'grid']), 'alice', true);
+ }
+
+ public function testCreateWithATableRefusesAGridType(): void {
+ $table = new Table();
+ $table->setId(4);
+ $this->mapper->expects($this->never())->method('insert');
+
+ $this->expectException(BadRequestError::class);
+ $this->expectExceptionMessage('cannot have a table');
+ $this->service->create('Home', null, $table, 'alice', null, null, View::TYPE_GRID);
+ }
+
+ public function testDeleteAllStandaloneOwnedByDeletesEachOfTheUsersViewsWithoutTable(): void {
+ $this->mapper->method('findAllStandaloneOwnedBy')->with('alice')->willReturn([$this->storedView(null), $this->storedView(null)]);
+ $this->permissionsService->method('canManageView')->willReturn(true);
+
+ $this->mapper->expects($this->exactly(2))->method('delete');
+
+ $this->service->deleteAllStandaloneOwnedBy('alice');
+ }
+
+ public function testImportKeepsTheSourceUuidWhenItIsFree(): void {
+ $this->mapper->method('findByUuid')->willReturn(null);
+ $this->expectImportInsert();
+
+ $imported = $this->service->importView(null, $this->importData('0199c8a0-1a2b-7c3d-8e4f-123456789abc'), 'alice');
+
+ $this->assertSame('0199c8a0-1a2b-7c3d-8e4f-123456789abc', $imported->getUuid());
+ }
+
+ public function testImportGivesAViewWhoseUuidIsTakenAFreshOne(): void {
+ $this->mapper->method('findByUuid')->willReturn($this->storedView(null));
+ $this->expectImportInsert();
+
+ $imported = $this->service->importView(null, $this->importData('0199c8a0-1a2b-7c3d-8e4f-123456789abc'), 'alice');
+
+ $this->assertNotSame('0199c8a0-1a2b-7c3d-8e4f-123456789abc', $imported->getUuid());
+ $this->assertNotNull($imported->getUuid());
+ }
+
+ private function expectImportInsert(): void {
+ $this->mapper->method('insert')->willReturnCallback(static function (View $view): View {
+ $view->setId(9);
+ return $view;
+ });
+ $this->mapper->method('update')->willReturnArgument(0);
+ }
+
+ private function importData(string $uuid): array {
+ return [
+ 'uuid' => $uuid, 'title' => 'Home', 'emoji' => null, 'description' => '', 'type' => View::TYPE_GRID,
+ 'createdAt' => '2026-10-12 10:00:00', 'lastEditAt' => '2026-10-12 10:00:00', 'columnSettings' => [], 'sort' => [], 'filter' => [],
+ ];
+ }
+
+ public function testCreateWithoutTableNeedsAGridType(): void {
+ $this->expectException(BadRequestError::class);
+ $this->expectExceptionMessage('needs a table');
+ $this->service->create('Home', null, null, 'alice', null, null, View::TYPE_TABLE);
+ }
+
+ public function testCreateWithoutTableNeedsAUser(): void {
+ $this->expectException(PermissionError::class);
+ $this->service->create('Home', null, null, '', null, null, View::TYPE_GRID);
+ }
+
+ public function testCreateWithoutTableIsOwnedByItsCreator(): void {
+ $this->mapper->method('insert')->willReturnCallback(static function (View $view): View {
+ $view->setId(6);
+ return $view;
+ });
+ $this->mapper->method('update')->willReturnArgument(0);
+
+ $created = $this->service->create('Home', '🧩', null, 'alice', null, null, View::TYPE_GRID, 'Start here');
+
+ $this->assertNull($created->getTableId());
+ $this->assertSame('alice', $created->getOwnership());
+ $this->assertSame('grid', $created->getType());
+ $this->assertSame('Start here', $created->getDescription());
+ $this->assertSame('view_6', $created->getTechnicalName(), 'named by its id, so it is unique on every database');
+ }
+
+ public function testCreateWithoutTableRefusesAChosenTechnicalName(): void {
+ $this->mapper->expects($this->never())->method('insert');
+
+ $this->expectException(BadRequestError::class);
+ $this->expectExceptionMessage('named by its id');
+ $this->service->create('Home', null, null, 'alice', 'home', null, View::TYPE_GRID);
+ }
+
+ public function testUpdateRefusesATechnicalNameOnAViewWithoutTable(): void {
+ $this->expectUpdateOf($this->storedView(null));
+
+ $this->expectException(BadRequestError::class);
+ $this->expectExceptionMessage('named by its id');
+ $this->service->update(6, ViewUpdateInput::fromInputArray(['technicalName' => 'home']), 'alice', true);
+ }
+
+ public function testImportWithoutTableIgnoresTheSourceTechnicalName(): void {
+ $this->mapper->method('insert')->willReturnCallback(static function (View $view): View {
+ $view->setId(9);
+ return $view;
+ });
+ $this->mapper->method('update')->willReturnArgument(0);
+
+ $imported = $this->service->importView(null, [
+ 'title' => 'Home', 'emoji' => null, 'description' => '', 'technicalName' => 'home', 'type' => View::TYPE_GRID,
+ 'createdAt' => '2026-10-12 10:00:00', 'lastEditAt' => '2026-10-12 10:00:00', 'columnSettings' => [], 'sort' => [], 'filter' => [],
+ ], 'alice');
+
+ $this->assertSame('view_9', $imported->getTechnicalName());
+ }
+
+ public function testCreateWithATableStillChecksTheTablePermission(): void {
+ $table = new Table();
+ $table->setId(4);
+ $this->permissionsService->method('canManageTable')->willReturn(false);
+
+ $this->expectException(PermissionError::class);
+ $this->service->create('Home', null, $table, 'alice');
+ }
+}
diff --git a/tests/unit/TablesMigratorTest.php b/tests/unit/TablesMigratorTest.php
index 8dd0eb54f3..c68dcf0198 100644
--- a/tests/unit/TablesMigratorTest.php
+++ b/tests/unit/TablesMigratorTest.php
@@ -286,4 +286,85 @@ public function rollBack(): void {
$newTable->getSort()
);
}
+
+ public function testImportRemapsViewCardSources(): void {
+ $user = $this->createMock(IUser::class);
+ $importSource = $this->createMock(IImportSource::class);
+ $output = new NullOutput();
+
+ $user->method('getUID')->willReturn('user1');
+ $importSource->method('getMigratorVersion')->willReturn(1);
+
+ $tableData = [
+ 'id' => 1,
+ 'title' => 'Test',
+ ];
+ $columns = [
+ ['id' => 10, 'tableId' => 1],
+ ['id' => 11, 'tableId' => 1],
+ ];
+ $views = [
+ [
+ 'tableId' => 1,
+ 'title' => 'Nested settings',
+ 'columnSettings' => [['columnId' => 10, 'order' => 0]],
+ 'viewSettings' => [
+ 'cardBackgroundSource' => 10,
+ 'cardTitleSource' => 11,
+ ],
+ ],
+ [
+ 'tableId' => 1,
+ 'title' => 'Without settings',
+ 'columnSettings' => [['columnId' => 11, 'order' => 0]],
+ ],
+ ];
+
+ $importSource->method('getFileContents')->willReturnCallback(static fn (string $file): string => match ($file) {
+ 'tables.json' => json_encode([$tableData]),
+ 'columns.json' => json_encode($columns),
+ 'views.json' => json_encode($views),
+ default => json_encode([]),
+ });
+
+ $newTable = new Table();
+ $newTable->setId(100);
+ $this->tableService->method('importTable')->willReturn($newTable);
+ $this->columnService->method('importColumn')->willReturnOnConsecutiveCalls(20, 21);
+ $this->rowService->method('importRow')->willReturn(1);
+
+ $this->tableMapper->method('getDBConnection')->willReturn(new class {
+ public function beginTransaction(): void {
+ }
+ public function commit(): void {
+ }
+ public function rollBack(): void {
+ }
+ });
+
+ $importedViews = [];
+ $this->viewService->expects($this->exactly(2))
+ ->method('importView')
+ ->with(
+ $this->identicalTo(100),
+ $this->callback(static function (array $view) use (&$importedViews): bool {
+ $importedViews[] = $view;
+ return true;
+ }),
+ $this->identicalTo('user1'),
+ );
+
+ $this->migrator->import($user, $importSource, $output);
+
+ $this->assertSame(
+ [
+ 'cardBackgroundSource' => 20,
+ 'cardTitleSource' => 21,
+ ],
+ $importedViews[0]['viewSettings']
+ );
+ $this->assertSame(20, $importedViews[0]['columnSettings'][0]['columnId']);
+ $this->assertArrayNotHasKey('viewSettings', $importedViews[1]);
+ $this->assertSame(21, $importedViews[1]['columnSettings'][0]['columnId']);
+ }
}