repair schema export and import

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>

lib/Controller/ApiTablesController.php

@@ -163,7 +163,7 @@ public function createFromScheme(string $title, string $emoji, string $descripti
 
 					$column['datetimeDefault'],
 
-					$column['usergroupDefault'],
+					$column['usergroupDefault'] || [],
 					$column['usergroupMultipleItems'],
 					$column['usergroupSelectUsers'],
 					$column['usergroupSelectGroups'],

lib/Model/TableScheme.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Model;
+
+use JsonSerializable;
+use OCA\Tables\Db\Column;
+use OCA\Tables\Db\View;
+
+class TableScheme implements JsonSerializable {
+
+	protected ?string $title = null;
+	protected ?string $emoji = null;
+
+	/** @var Column[]|null  */
+	protected ?array $columns = null;
+
+	/** @var View[]|null */
+	protected ?array $views = null;
+	protected ?string $description = null;
+	protected ?string $tablesVersion = null;
+
+	public function __construct(string $title, string $emoji, array $columns, array $view, string $description, string $tablesVersion) {
+		$this->tablesVersion = $tablesVersion;
+		$this->title = $title;
+		$this->emoji = $emoji;
+		$this->columns = $columns;
+		$this->description = $description;
+		$this->views = $view;
+	}
+
+	public function getTitle():string {
+		return $this->title | '';
+	}
+
+	public function jsonSerialize(): array {
+		return [
+			'title' => $this->title ?: '',
+			'emoji' => $this->emoji,
+			'columns' => $this->columns,
+			'views' => $this->views,
+			'description' => $this->description ?:'',
+			'tablesVersion' => $this->tablesVersion,
+		];
+	}
+
+	public function getEmoji(): ?string {
+		return $this->emoji;
+	}
+
+	public function getColumns(): ?array {
+		return $this->columns;
+	}
+
+	public function getDescription(): ?string {
+		return $this->description;
+	}
+}

src/modules/modals/CreateTable.vue

@@ -179,12 +179,12 @@ export default {
 			this.$emit('close')
 		},
 		async submit() {
+			if (this.templateChoice === 'scheme') {
+				emit('tables:modal:scheme', this.title)
+				this.actionCancel()
+				return
+			}
 			if (this.title === '') {
-				if (this.templateChoice === 'scheme') {
-					emit('tables:modal:scheme', {})
-					this.actionCancel()
-					return
-				}
 				showError(t('tables', 'Cannot create new table. Title is missing.'))
 				this.errorTitle = true
 			} else {

src/modules/modals/ImportScheme.vue

@@ -23,6 +23,7 @@
 			class="hidden-visually"
 			:accept="mimeTypes.join(',')"
 			@change="onUploadFileInputChange">
+		<span v-if="selectedUploadFile">{{ selectedUploadFile?.name }}</span>
 		<div class="row">
 			<div class="fix-col-4 end">
 				<NcButton :aria-label="t('tables', 'Import')" type="primary" @click="actionSubmit">
@@ -50,6 +51,10 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		title: {
+			type: String,
+			default: '',
+		},
 	},
 	data() {
 		return {
@@ -77,6 +82,9 @@ export default {
 			reader.readAsText(this.selectedUploadFile, 'UTF-8')
 			reader.onload = (evt) => {
 				const json = JSON.parse(evt.target.result)
+				if (this.title !== '') {
+					json.title = this.title
+				}
 			    axios.post(generateOcsUrl('/apps/tables/api/2/tables/scheme'), json).then(async res => {
 					if (res.status === 200) {
 						await this.$store.dispatch('loadTablesFromBE')

src/modules/modals/Modals.vue

@@ -43,6 +43,7 @@
 
 		<ImportScheme
 			:show-modal="showImportScheme"
+			:title="importSchemeTitle"
 			@close="showImportScheme = false" />
 		<CreateContext :show-modal="showModalCreateContext" @close="showModalCreateContext = false" />
 		<EditContext :context-id="editContext" :show-modal="editContext !== null" @close="editContext = null" />
@@ -108,6 +109,7 @@ export default {
 			showModalCreateContext: false,
 			importToElement: null,
 			showImportScheme: false,
+			importSchemeTitle: '',
 			createViewTableId: null, // if null, no modal open
 			tableToDelete: null,
 			viewToDelete: null,
@@ -152,7 +154,7 @@ export default {
 
 		// misc
 		subscribe('tables:modal:import', element => { this.importToElement = element })
-		subscribe('tables:modal:scheme', () => { this.showImportScheme = true })
+		subscribe('tables:modal:scheme', title => { this.importSchemeTitle = title; this.showImportScheme = true })
 
 		// context
 		subscribe('tables:context:create', () => { this.showModalCreateContext = true })