fix: resolve test feedbacks

Signed-off-by: Rello <github@scherello.de>

Author: Rello

lib/Service/ViewService.php

@@ -609,12 +609,24 @@ public function deleteColumnDataFromViews(int $columnId, Table $table): void {
 				columnSettings: new ColumnSettings($applicableViewColumnInformationRecords),
 				filterSet: FilterSet::createFromInputArray($applicableFilterArray),
 				sortRuleSet: SortRuleSet::createFromInputArray($filteredSortingRules),
+				viewSettings: $this->removeColumnFromViewSettings($view->getViewSettingsObject(), $columnId),
 			);
 
 			$this->update($view->getId(), $viewUpdateInput);
 		}
 	}
 
+	private function removeColumnFromViewSettings(ViewSettings $viewSettings, int $columnId): ViewSettings {
+		return new ViewSettings(
+			cardBackgroundSource: $viewSettings->getCardBackgroundSource() === $columnId
+				? null
+				: $viewSettings->getCardBackgroundSource(),
+			cardTitleSource: $viewSettings->getCardTitleSource() === $columnId
+				? null
+				: $viewSettings->getCardTitleSource(),
+		);
+	}
+
 	protected function removeColumnFromFilters(array $originalFilterSetArray, int $columnId): array {
 		$applicableFilterSetArray = [];
 		foreach ($originalFilterSetArray as $filterGroupArray) {

lib/UserMigration/TablesMigrator.php

@@ -356,11 +356,35 @@ private function importViews(IImportSource $importSource, array $tableIdMap, arr
 					}
 					unset($setting);
 				}
+				$view = $this->remapViewCardSources($view, $columnIdMap);
 				$this->viewService->importView($newTableId, $view, $userId);
 			}
 		}
 	}
 
+	private function remapViewCardSources(array $view, array $columnIdMap): array {
+		if (isset($view['viewSettings']) && is_array($view['viewSettings'])) {
+			foreach (['cardBackgroundSource', 'cardTitleSource'] as $sourceKey) {
+				$view['viewSettings'] = $this->remapViewCardSource($view['viewSettings'], $sourceKey, $columnIdMap);
+			}
+			return $view;
+		}
+
+		foreach (['cardBackgroundSource', 'cardTitleSource'] as $sourceKey) {
+			$view = $this->remapViewCardSource($view, $sourceKey, $columnIdMap);
+		}
+
+		return $view;
+	}
+
+	private function remapViewCardSource(array $data, string $sourceKey, array $columnIdMap): array {
+		if (isset($data[$sourceKey]) && isset($columnIdMap[$data[$sourceKey]])) {
+			$data[$sourceKey] = $columnIdMap[$data[$sourceKey]];
+		}
+
+		return $data;
+	}
+
 	/**
 	 * @param IImportSource $importSource
 	 * @param Table $newTable

src/pages/Context.vue

@@ -23,14 +23,14 @@
 				<div v-for="resource in contextResources" :key="resource.key">
 					<div v-if="!resource.isView" class="resource">
 						<TableWrapper :table="resource" :columns="columns[resource.key]" :rows="rows[resource.key]"
-							:view-setting="viewSetting" @create-column="createColumn(false, resource)"
+							:view-setting.sync="resourceViewSettings[resource.key]" @create-column="createColumn(false, resource)"
 							@import-scheme="openImportSchemeModal(resource)"
 							@import="openImportModal(resource, false)" @download-csv="downloadCSV(resource, false)"
 							@download-filtered-csv="rows => downloadFilteredCSV(rows, resource, false)" />
 					</div>
 					<div v-else-if="resource.isView" class="resource">
 						<CustomView :view="resource" :columns="columns[resource.key]" :rows="rows[resource.key]"
-							:view-setting="viewSetting" @create-column="createColumn(true, resource)"
+							:view-setting.sync="resourceViewSettings[resource.key]" @create-column="createColumn(true, resource)"
 							@import="openImportModal(resource, true)" @download-csv="downloadCSV(resource, true)"
 							@download-filtered-csv="rows => downloadFilteredCSV(rows, resource, true)" />
 					</div>
@@ -80,7 +80,7 @@ export default {
 		return {
 			loading: true,
 			icon: null,
-			viewSetting: {},
+			resourceViewSettings: {},
 			context: null,
 			contextResources: [],
 			errorMessage: null,
@@ -175,6 +175,7 @@ export default {
 			this.isReloading = true
 			this.loading = true
 			this.contextResources = []
+			this.resourceViewSettings = {}
 
 			try {
 				await this.loadContext({ id: this.activeContextId })
@@ -220,6 +221,7 @@ export default {
 										})
 										table.key = (table.id).toString()
 										table.isView = false
+										this.$set(this.resourceViewSettings, table.key, this.createViewSetting(false, table))
 										this.contextResources.push(table)
 									}
 
@@ -236,6 +238,7 @@ export default {
 										})
 										view.key = 'view-' + (view.id).toString()
 										view.isView = true
+										this.$set(this.resourceViewSettings, view.key, this.createViewSetting(true, view))
 										this.contextResources.push(view)
 									}
 								}
@@ -265,6 +268,24 @@ export default {
 		createColumn(isView, element) {
 			emit('tables:column:create', { isView, element })
 		},
+		createViewSetting(isView, element) {
+			const viewSetting = {
+				layout: isView ? (element?.layout ?? 'table') : 'table',
+			}
+
+			if (isView) {
+				viewSetting.viewSettings = {
+					cardBackgroundSource: element?.viewSettings?.cardBackgroundSource ?? null,
+					cardTitleSource: element?.viewSettings?.cardTitleSource ?? null,
+				}
+			}
+
+			if (element?.sort?.length) {
+				viewSetting.presetSorting = [...element.sort]
+			}
+
+			return viewSetting
+		},
 		async downloadCSV(element, isView) {
 			const access = await this.validateExportAccess({
 				id: element.id,

tests/unit/TablesMigratorTest.php

@@ -286,4 +286,90 @@ 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' => 'Legacy settings',
+				'columnSettings' => [['columnId' => 11, 'order' => 0]],
+				'cardBackgroundSource' => 11,
+				'cardTitleSource' => 10,
+			],
+		];
+
+		$importSource->method('getFileContents')->willReturnCallback(static function (string $file) use ($tableData, $columns, $views): string {
+			return 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->assertSame(21, $importedViews[1]['cardBackgroundSource']);
+		$this->assertSame(20, $importedViews[1]['cardTitleSource']);
+		$this->assertSame(21, $importedViews[1]['columnSettings'][0]['columnId']);
+	}
 }