From 577733311eaa0469c6d83ece3cd3726f59bc872d Mon Sep 17 00:00:00 2001 From: enjeck Date: Wed, 13 Dec 2023 20:05:17 +0100 Subject: [PATCH 01/14] feat: transfer table ownership backend Signed-off-by: Cleopatra Enjeck M --- appinfo/routes.php | 1 + lib/Controller/Api1Controller.php | 27 ++++++++++++++++++++++ lib/Service/TableService.php | 37 +++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/appinfo/routes.php b/appinfo/routes.php index 2a09cd157..1b8ee9e35 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -18,6 +18,7 @@ ['name' => 'api1#index', 'url' => '/api/1/tables', 'verb' => 'GET'], ['name' => 'api1#createTable', 'url' => '/api/1/tables', 'verb' => 'POST'], ['name' => 'api1#updateTable', 'url' => '/api/1/tables/{tableId}', 'verb' => 'PUT'], + ['name' => 'api1#transferTable', 'url' => '/api/1/tables/{tableId}', 'verb' => 'PUT'], ['name' => 'api1#getTable', 'url' => '/api/1/tables/{tableId}', 'verb' => 'GET'], ['name' => 'api1#deleteTable', 'url' => '/api/1/tables/{tableId}', 'verb' => 'DELETE'], // -> views diff --git a/lib/Controller/Api1Controller.php b/lib/Controller/Api1Controller.php index 13d1f7bff..1c8ef25a5 100644 --- a/lib/Controller/Api1Controller.php +++ b/lib/Controller/Api1Controller.php @@ -196,6 +196,33 @@ public function updateTable(int $tableId, string $title = null, string $emoji = } } + /** + * Transfer table from one user to another + * + * @NoAdminRequired + * @CORS + * @NoCSRFRequired + * + * @param int $tableId Table ID + * @param string $newOwnerUserId New user ID + * @param string $userId Current user ID + * @return DataResponse|DataResponse + * + */ + public function transferTable(int $tableId, int $newOwnerUserId, int $userId): DataResponse { + try { + return new DataResponse($this->tableService->transfer($tableId, $newOwnerUserId, $userId)->jsonSerialize()); + } catch (PermissionError $e) { + $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $message = ['message' => $e->getMessage()]; + return new DataResponse($message, Http::STATUS_FORBIDDEN); + } catch (InternalError|Exception $e) { + $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $message = ['message' => $e->getMessage()]; + return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); + } + } + /** * Delete a table * diff --git a/lib/Service/TableService.php b/lib/Service/TableService.php index 3f5e8df9e..bb9f08482 100644 --- a/lib/Service/TableService.php +++ b/lib/Service/TableService.php @@ -328,6 +328,43 @@ public function setOwner(int $id, string $newOwnerUserId, ?string $userId = null } } + /** + * @param int $id + * @param null|string $userId + * @return Table + * @throws InternalError + * @throws NotFoundError + * @throws PermissionError + */ + public function transfer(int $id, string $newOwnerUserId, string $userId): Table { + $userId = $this->permissionsService->preCheckUserId($userId); + + try { + $table = $this->mapper->find($id); + } catch (DoesNotExistException $e) { + $this->logger->error($e->getMessage(), ['exception' => $e]); + throw new NotFoundError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage()); + } catch (MultipleObjectsReturnedException|OcpDbException $e) { + $this->logger->error($e->getMessage(), ['exception' => $e]); + throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage()); + } + + try { + $this->setOwner($id, $newOwnerUserId, $userId); + } + catch(PermissionError|InternalError $e){ + throw new PermissionError('PermissionError: can not transfer table with id '.$id); + } + catch (DoesNotExistException $e) { + $this->logger->error($e->getMessage(), ['exception' => $e]); + throw new NotFoundError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage()); + } catch (MultipleObjectsReturnedException|OcpDbException $e) { + $this->logger->error($e->getMessage(), ['exception' => $e]); + throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage()); + } + return $table; + } + /** * @param int $id * @param null|string $userId From e422055982439ffadd0c3792d427d9fff5108046 Mon Sep 17 00:00:00 2001 From: enjeck Date: Wed, 13 Dec 2023 20:07:02 +0100 Subject: [PATCH 02/14] feat: transfer table ownership frontend Signed-off-by: Cleopatra Enjeck M --- src/modules/main/sections/DataTable.vue | 16 ++ src/modules/modals/Modals.vue | 6 + src/modules/modals/TransferTable.vue | 107 ++++++++++ .../partials/NavigationTableItem.vue | 8 + src/modules/sidebar/partials/TransferForm.vue | 187 ++++++++++++++++++ .../ncTable/mixins/permissionsMixin.js | 3 + src/store/store.js | 2 + 7 files changed, 329 insertions(+) create mode 100644 src/modules/modals/TransferTable.vue create mode 100644 src/modules/sidebar/partials/TransferForm.vue diff --git a/src/modules/main/sections/DataTable.vue b/src/modules/main/sections/DataTable.vue index bd7632cd3..cf7fb4a26 100644 --- a/src/modules/main/sections/DataTable.vue +++ b/src/modules/main/sections/DataTable.vue @@ -17,6 +17,14 @@ {{ t('tables', 'Edit table') }} + + + {{ t('tables', 'Transfer table') }} + @@ -92,6 +100,14 @@ {{ t('tables', 'Edit table') }} + + + {{ t('tables', 'Transfer table') }} + diff --git a/src/modules/modals/Modals.vue b/src/modules/modals/Modals.vue index 63987d1f2..b6377dc99 100644 --- a/src/modules/modals/Modals.vue +++ b/src/modules/modals/Modals.vue @@ -32,6 +32,7 @@ @close="importToElement = null" /> + @@ -50,6 +51,7 @@ import DeleteTable from './DeleteTable.vue' import CreateTable from './CreateTable.vue' import DeleteView from './DeleteView.vue' import EditTable from './EditTable.vue' +import TransferTable from './TransferTable.vue' export default { components: { @@ -65,6 +67,7 @@ export default { DeleteColumn, CreateRow, DeleteTable, + TransferTable, }, data() { @@ -82,6 +85,7 @@ export default { tableToDelete: null, viewToDelete: null, editTable: null, + tableToTransfer: null, } }, @@ -90,6 +94,7 @@ export default { subscribe('tables:table:create', () => { this.showModalCreateTable = true }) subscribe('tables:table:delete', table => { this.tableToDelete = table }) subscribe('tables:table:edit', tableId => { this.editTable = tableId }) + subscribe('tables:table:transfer', table => { this.tableToTransfer = table }) // views subscribe('tables:view:reload', () => { this.reload(true) }) @@ -136,6 +141,7 @@ export default { unsubscribe('tables:modal:import', element => { this.importToElement = element }) unsubscribe('tables:table:delete', table => { this.tableToDelete = table }) unsubscribe('tables:table:edit', tableId => { this.editTable = tableId }) + unsubscribe('tables:table:transfer', table => { this.tableToTransfer = table }) }, } diff --git a/src/modules/modals/TransferTable.vue b/src/modules/modals/TransferTable.vue new file mode 100644 index 000000000..7a63fd892 --- /dev/null +++ b/src/modules/modals/TransferTable.vue @@ -0,0 +1,107 @@ + + + diff --git a/src/modules/navigation/partials/NavigationTableItem.vue b/src/modules/navigation/partials/NavigationTableItem.vue index 799fe0f85..620dc78f2 100644 --- a/src/modules/navigation/partials/NavigationTableItem.vue +++ b/src/modules/navigation/partials/NavigationTableItem.vue @@ -34,6 +34,14 @@ {{ t('tables', 'Edit table') }} + + + {{ t('tables', 'Transfer table') }} + diff --git a/src/modules/sidebar/partials/TransferForm.vue b/src/modules/sidebar/partials/TransferForm.vue new file mode 100644 index 000000000..cc1ec1ed4 --- /dev/null +++ b/src/modules/sidebar/partials/TransferForm.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/src/shared/components/ncTable/mixins/permissionsMixin.js b/src/shared/components/ncTable/mixins/permissionsMixin.js index 72b4cbdd5..ed3d6801f 100644 --- a/src/shared/components/ncTable/mixins/permissionsMixin.js +++ b/src/shared/components/ncTable/mixins/permissionsMixin.js @@ -2,6 +2,9 @@ import { getCurrentUser } from '@nextcloud/auth' export default { methods: { + ownsTable(element) { + return element?.ownership === getCurrentUser().uid + }, // views have the flag manageTable set if the user has manage rights for the corresponding table canManageTable(element) { if (!element.isShared) { diff --git a/src/store/store.js b/src/store/store.js index e1338d604..d7101cdd4 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -234,6 +234,8 @@ export default new Vuex.Store({ commit('setTables', [...tables]) return true }, + async transferTable({ state, commit, dispatch }, { tableId, newOwnerUserId, userId}) { + }, async removeTable({ state, commit }, { tableId }) { try { await axios.delete(generateUrl('/apps/tables/table/' + tableId)) From 11b50d69c0e09d48e5db5b83691fc27c8d998c8b Mon Sep 17 00:00:00 2001 From: Florian Steffens Date: Thu, 14 Dec 2023 10:53:22 +0100 Subject: [PATCH 03/14] Fix unrelated bugs and update dependencies Signed-off-by: Florian Steffens --- composer.lock | 2 +- src/shared/components/ncTable/mixins/columnClass.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 395139c4c..c35495786 100644 --- a/composer.lock +++ b/composer.lock @@ -2864,4 +2864,4 @@ "php": "8.0" }, "plugin-api-version": "2.6.0" -} +} \ No newline at end of file diff --git a/src/shared/components/ncTable/mixins/columnClass.js b/src/shared/components/ncTable/mixins/columnClass.js index 76074f4ec..f106de6a8 100644 --- a/src/shared/components/ncTable/mixins/columnClass.js +++ b/src/shared/components/ncTable/mixins/columnClass.js @@ -54,7 +54,7 @@ export class AbstractColumn { /** * parse an input value * - * @param value + * @param {*} value Value to parse * @return {*} */ parseValue(value) { From 0e33075a016999cb412ff521498afe3347782759 Mon Sep 17 00:00:00 2001 From: Florian Steffens Date: Thu, 14 Dec 2023 10:55:44 +0100 Subject: [PATCH 04/14] Cleanup and restructure vue components - add suggestion for UI - move user lookup to a shared component as it could be used elsewhere - logic to request users and groups is missing, should be exchanged with new api endpoint Signed-off-by: Florian Steffens --- src/modules/modals/EditTable.vue | 67 +++++++++++++++---- src/modules/modals/TransferTable.vue | 25 +++---- .../NcUserAndGroupPicker.vue} | 30 +++++++-- src/store/store.js | 3 +- 4 files changed, 89 insertions(+), 36 deletions(-) rename src/{modules/sidebar/partials/TransferForm.vue => shared/components/ncUserAndGroupPicker/NcUserAndGroupPicker.vue} (91%) diff --git a/src/modules/modals/EditTable.vue b/src/modules/modals/EditTable.vue index c8a73d44f..35d7d9bf7 100644 --- a/src/modules/modals/EditTable.vue +++ b/src/modules/modals/EditTable.vue @@ -28,19 +28,36 @@
-
- - {{ t('tables', 'Delete') }} - - - {{ t('tables', 'I really want to delete this table!') }} - - - {{ t('tables', 'Save') }} - +
+ {{ t('tables', 'Owner') }} +
+
+ +
+
+
+ + {{ t('tables', 'Delete') }} + + + {{ t('tables', 'I really want to delete this table!') }} + +
+ + {{ t('tables', 'Change owner') }} + + + {{ t('tables', 'Save') }} + +
+
@@ -48,10 +65,12 @@ + diff --git a/src/modules/modals/TransferTable.vue b/src/modules/modals/TransferTable.vue index 7a63fd892..5d85ce137 100644 --- a/src/modules/modals/TransferTable.vue +++ b/src/modules/modals/TransferTable.vue @@ -5,11 +5,14 @@
-

{{ t('tables', 'Transfer table') }}

+

{{ t('tables', 'Transfer tables ownership') }}

- + // TODO: add actual owner +
+
+
@@ -30,22 +33,20 @@ diff --git a/src/modules/sidebar/partials/TransferForm.vue b/src/shared/components/ncUserAndGroupPicker/NcUserAndGroupPicker.vue similarity index 91% rename from src/modules/sidebar/partials/TransferForm.vue rename to src/shared/components/ncUserAndGroupPicker/NcUserAndGroupPicker.vue index cc1ec1ed4..d6fd47ff1 100644 --- a/src/modules/sidebar/partials/TransferForm.vue +++ b/src/shared/components/ncUserAndGroupPicker/NcUserAndGroupPicker.vue @@ -21,21 +21,28 @@ import debounce from 'debounce' import { NcSelect } from '@nextcloud/vue' import { mapState } from 'vuex' import formatting from '../../../shared/mixins/formatting.js' -import ShareTypes from '../mixins/shareTypesMixin.js' export default { - name: 'TransferForm', + components: { NcSelect, }, - mixins: [ShareTypes, formatting], + mixins: [formatting], props: { - newOwnerUserId: { + value: { type: String, - default: '', + default: null, }, + userSelect: { + type: Boolean, + default: true, + }, + groups: { + type: Boolean, + default: false, + }, }, data() { @@ -52,6 +59,16 @@ export default { computed: { ...mapState(['tables', 'tablesLoading']), + localValue: { + get() { + return this.value + }, + set(v) { + console.debug('set new value to', v) + this.$emit('update:value', v) + }, + }, + isValidQuery() { return this.query && this.query.trim() !== '' && this.query.length > this.minSearchStringLength }, @@ -122,7 +139,7 @@ export default { console.info('suggestions', this.suggestions) }, - debounceGetSuggestions: debounce(function (...args) { + debounceGetSuggestions: debounce(function(...args) { this.getSuggestions(...args) }, 300), @@ -148,7 +165,6 @@ export default { console.info('recommendations', this.recommendations) }, - filterOutCurrentUser(shares) { return shares.reduce((arr, share) => { if (typeof share !== 'object') { diff --git a/src/store/store.js b/src/store/store.js index d7101cdd4..51de49756 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -234,7 +234,8 @@ export default new Vuex.Store({ commit('setTables', [...tables]) return true }, - async transferTable({ state, commit, dispatch }, { tableId, newOwnerUserId, userId}) { + async transferTable({ state, commit, dispatch }, { tableId, newOwnerUserId, userId }) { + // TODO add business }, async removeTable({ state, commit }, { tableId }) { try { From 4095a82e26f15adea314dc0a7092739ea4fa13d1 Mon Sep 17 00:00:00 2001 From: Florian Steffens Date: Thu, 14 Dec 2023 10:57:59 +0100 Subject: [PATCH 05/14] Setup new API endpoint to change ownership of a table - make use of API v2 structure - add route - add controller method and API description - update API docs Signed-off-by: Florian Steffens --- appinfo/routes.php | 2 +- lib/Controller/Api1Controller.php | 27 -- lib/Controller/ApiTablesController.php | 28 ++ openapi.json | 564 ++++++++++++++++++++++--- 4 files changed, 525 insertions(+), 96 deletions(-) diff --git a/appinfo/routes.php b/appinfo/routes.php index 1b8ee9e35..5df857fd7 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -18,7 +18,6 @@ ['name' => 'api1#index', 'url' => '/api/1/tables', 'verb' => 'GET'], ['name' => 'api1#createTable', 'url' => '/api/1/tables', 'verb' => 'POST'], ['name' => 'api1#updateTable', 'url' => '/api/1/tables/{tableId}', 'verb' => 'PUT'], - ['name' => 'api1#transferTable', 'url' => '/api/1/tables/{tableId}', 'verb' => 'PUT'], ['name' => 'api1#getTable', 'url' => '/api/1/tables/{tableId}', 'verb' => 'GET'], ['name' => 'api1#deleteTable', 'url' => '/api/1/tables/{tableId}', 'verb' => 'DELETE'], // -> views @@ -116,6 +115,7 @@ ['name' => 'ApiTables#create', 'url' => '/api/2/tables', 'verb' => 'POST'], ['name' => 'ApiTables#update', 'url' => '/api/2/tables/{id}', 'verb' => 'PUT'], ['name' => 'ApiTables#destroy', 'url' => '/api/2/tables/{id}', 'verb' => 'DELETE'], + ['name' => 'ApiTables#transfer', 'url' => '/api/2/tables/{id}/transfer', 'verb' => 'PUT'], ['name' => 'ApiColumns#index', 'url' => '/api/2/columns/{nodeType}/{nodeId}', 'verb' => 'GET'], ['name' => 'ApiColumns#show', 'url' => '/api/2/columns/{id}', 'verb' => 'GET'], diff --git a/lib/Controller/Api1Controller.php b/lib/Controller/Api1Controller.php index 1c8ef25a5..13d1f7bff 100644 --- a/lib/Controller/Api1Controller.php +++ b/lib/Controller/Api1Controller.php @@ -196,33 +196,6 @@ public function updateTable(int $tableId, string $title = null, string $emoji = } } - /** - * Transfer table from one user to another - * - * @NoAdminRequired - * @CORS - * @NoCSRFRequired - * - * @param int $tableId Table ID - * @param string $newOwnerUserId New user ID - * @param string $userId Current user ID - * @return DataResponse|DataResponse - * - */ - public function transferTable(int $tableId, int $newOwnerUserId, int $userId): DataResponse { - try { - return new DataResponse($this->tableService->transfer($tableId, $newOwnerUserId, $userId)->jsonSerialize()); - } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); - $message = ['message' => $e->getMessage()]; - return new DataResponse($message, Http::STATUS_FORBIDDEN); - } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); - $message = ['message' => $e->getMessage()]; - return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); - } - } - /** * Delete a table * diff --git a/lib/Controller/ApiTablesController.php b/lib/Controller/ApiTablesController.php index 366935814..60db21cc9 100644 --- a/lib/Controller/ApiTablesController.php +++ b/lib/Controller/ApiTablesController.php @@ -141,4 +141,32 @@ public function destroy(int $id): DataResponse { return $this->handleNotFoundError($e); } } + + /** + * [api v2] Transfer table + * + * Transfer table from one user to another + * + * @NoAdminRequired + * + * @param int $id Table ID + * @param string $newOwnerUserId New user ID + * + * @return DataResponse|DataResponse + * + * 200: Ownership changed + * 403: No permissions + * 404: Not found + */ + public function transfer(int $id, string $newOwnerUserId): DataResponse { + try { + return new DataResponse($this->service->setOwner($id, $newOwnerUserId)->jsonSerialize()); + } catch (PermissionError $e) { + return $this->handlePermissionError($e); + } catch (InternalError $e) { + return $this->handleError($e); + } catch (NotFoundError $e) { + return $this->handleNotFoundError($e); + } + } } diff --git a/openapi.json b/openapi.json index d0eaa9f4c..3fbaad0ea 100644 --- a/openapi.json +++ b/openapi.json @@ -382,7 +382,8 @@ "onSharePermissions", "hasShares", "rowsCount", - "views" + "views", + "columnsCount" ], "properties": { "id": { @@ -393,7 +394,8 @@ "type": "string" }, "emoji": { - "type": "string" + "type": "string", + "nullable": true }, "ownership": { "type": "string" @@ -456,6 +458,10 @@ "items": { "$ref": "#/components/schemas/View" } + }, + "columnsCount": { + "type": "integer", + "format": "int64" } } }, @@ -490,7 +496,8 @@ "type": "string" }, "emoji": { - "type": "string" + "type": "string", + "nullable": true }, "tableId": { "type": "integer", @@ -500,7 +507,8 @@ "type": "string" }, "ownerDisplayName": { - "type": "string" + "type": "string", + "nullable": true }, "createdBy": { "type": "string" @@ -515,11 +523,11 @@ "type": "string" }, "description": { - "type": "string" + "type": "string", + "nullable": true }, "columns": { "type": "array", - "nullable": true, "items": { "type": "integer", "format": "int64" @@ -528,65 +536,71 @@ "sort": { "type": "object", "nullable": true, - "required": [ - "columnId", - "mode" - ], - "properties": { - "columnId": { - "type": "integer", - "format": "int64" - }, - "mode": { - "type": "string", - "enum": [ - "ASC", - "DESC" - ] + "additionalProperties": { + "type": "object", + "required": [ + "columnId", + "mode" + ], + "properties": { + "columnId": { + "type": "integer", + "format": "int64" + }, + "mode": { + "type": "string", + "enum": [ + "ASC", + "DESC" + ] + } } } }, "filter": { "type": "object", "nullable": true, - "required": [ - "columnId", - "operator", - "value" - ], - "properties": { - "columnId": { - "type": "integer", - "format": "int64" - }, - "operator": { - "type": "string", - "enum": [ - "begins-with", - "ends-with", - "contains", - "is-equal", - "is-greater-than", - "is-greater-than-or-equal", - "is-lower-than", - "is-lower-than-or-equal", - "is-empty" - ] - }, - "value": { - "oneOf": [ - { - "type": "string" - }, - { - "type": "integer", - "format": "int64" - }, - { - "type": "number", - "format": "float" - } - ] + "additionalProperties": { + "type": "object", + "required": [ + "columnId", + "operator", + "value" + ], + "properties": { + "columnId": { + "type": "integer", + "format": "int64" + }, + "operator": { + "type": "string", + "enum": [ + "begins-with", + "ends-with", + "contains", + "is-equal", + "is-greater-than", + "is-greater-than-or-equal", + "is-lower-than", + "is-lower-than-or-equal", + "is-empty" + ] + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "type": "integer", + "format": "int64" + }, + { + "type": "number", + "format": "float" + } + ] + } } } }, @@ -1353,7 +1367,143 @@ "description": "key-value pairs", "required": true, "schema": { - "type": "string" + "oneOf": [ + { + "type": "object", + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "type": "string", + "enum": [ + "title", + "emoji", + "description" + ] + }, + "value": { + "type": "string" + } + } + }, + { + "type": "object", + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "type": "string", + "enum": [ + "columns" + ] + }, + "value": { + "type": "array", + "items": { + "type": "integer", + "format": "int64" + } + } + } + }, + { + "type": "object", + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "type": "string", + "enum": [ + "sort" + ] + }, + "value": { + "type": "object", + "required": [ + "columnId", + "mode" + ], + "properties": { + "columnId": { + "type": "integer", + "format": "int64" + }, + "mode": { + "type": "string", + "enum": [ + "ASC", + "DESC" + ] + } + } + } + } + }, + { + "type": "object", + "required": [ + "key", + "value" + ], + "properties": { + "key": { + "type": "string", + "enum": [ + "filter" + ] + }, + "value": { + "type": "object", + "required": [ + "columnId", + "operator", + "value" + ], + "properties": { + "columnId": { + "type": "integer", + "format": "int64" + }, + "operator": { + "type": "string", + "enum": [ + "begins-with", + "ends-with", + "contains", + "is-equal", + "is-greater-than", + "is-greater-than-or-equal", + "is-lower-than", + "is-lower-than-or-equal", + "is-empty" + ] + }, + "value": { + "oneOf": [ + { + "type": "string" + }, + { + "type": "integer", + "format": "int64" + }, + { + "type": "number", + "format": "float" + } + ] + } + } + } + } + } + ] } }, { @@ -3630,7 +3780,27 @@ "description": "Data as key - value store", "required": true, "schema": { - "type": "string" + "oneOf": [ + { + "type": "string" + }, + { + "type": "object", + "required": [ + "columnId", + "value" + ], + "properties": { + "columnId": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "object" + } + } + } + ] } }, { @@ -3826,7 +3996,27 @@ "description": "Data as key - value store", "required": true, "schema": { - "type": "string" + "oneOf": [ + { + "type": "string" + }, + { + "type": "object", + "required": [ + "columnId", + "value" + ], + "properties": { + "columnId": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "object" + } + } + } + ] } }, { @@ -4009,7 +4199,27 @@ "description": "Data as key - value store", "required": true, "schema": { - "type": "string" + "oneOf": [ + { + "type": "string" + }, + { + "type": "object", + "required": [ + "columnId", + "value" + ], + "properties": { + "columnId": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "object" + } + } + } + ] } }, { @@ -5398,6 +5608,201 @@ } } }, + "/ocs/v2.php/apps/tables/api/2/tables/{id}/transfer": { + "put": { + "operationId": "api_tables-transfer", + "summary": "[api v2] Transfer table", + "description": "Transfer table from one user to another", + "tags": [ + "api_tables" + ], + "security": [ + { + "bearer_auth": [] + }, + { + "basic_auth": [] + } + ], + "parameters": [ + { + "name": "newOwnerUserId", + "in": "query", + "description": "New user ID", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "id", + "in": "path", + "description": "Table ID", + "required": true, + "schema": { + "type": "integer", + "format": "int64" + } + }, + { + "name": "OCS-APIRequest", + "in": "header", + "description": "Required to be true for the API request to pass", + "required": true, + "schema": { + "type": "boolean", + "default": true + } + } + ], + "responses": { + "200": { + "description": "Ownership changed", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "ocs" + ], + "properties": { + "ocs": { + "type": "object", + "required": [ + "meta", + "data" + ], + "properties": { + "meta": { + "$ref": "#/components/schemas/OCSMeta" + }, + "data": { + "$ref": "#/components/schemas/Table" + } + } + } + } + } + } + } + }, + "403": { + "description": "No permissions", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "ocs" + ], + "properties": { + "ocs": { + "type": "object", + "required": [ + "meta", + "data" + ], + "properties": { + "meta": { + "$ref": "#/components/schemas/OCSMeta" + }, + "data": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + } + } + } + } + }, + "500": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "ocs" + ], + "properties": { + "ocs": { + "type": "object", + "required": [ + "meta", + "data" + ], + "properties": { + "meta": { + "$ref": "#/components/schemas/OCSMeta" + }, + "data": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + } + } + } + } + }, + "404": { + "description": "Not found", + "content": { + "application/json": { + "schema": { + "type": "object", + "required": [ + "ocs" + ], + "properties": { + "ocs": { + "type": "object", + "required": [ + "meta", + "data" + ], + "properties": { + "meta": { + "$ref": "#/components/schemas/OCSMeta" + }, + "data": { + "type": "object", + "required": [ + "message" + ], + "properties": { + "message": { + "type": "string" + } + } + } + } + } + } + } + } + } + } + } + } + }, "/ocs/v2.php/apps/tables/api/2/columns/{nodeType}/{nodeId}": { "get": { "operationId": "api_columns-list", @@ -5885,7 +6290,11 @@ "description": "Subtype for the new column", "schema": { "type": "string", - "nullable": true + "nullable": true, + "enum": [ + "progress", + "stars" + ] } }, { @@ -5904,6 +6313,7 @@ "schema": { "type": "array", "nullable": true, + "default": [], "items": { "type": "integer", "format": "int64" @@ -6166,7 +6576,11 @@ "description": "Subtype for the new column", "schema": { "type": "string", - "nullable": true + "nullable": true, + "enum": [ + "progress", + "stars" + ] } }, { @@ -6185,6 +6599,7 @@ "schema": { "type": "array", "nullable": true, + "default": [], "items": { "type": "integer", "format": "int64" @@ -6437,7 +6852,11 @@ "description": "Subtype for the new column", "schema": { "type": "string", - "nullable": true + "nullable": true, + "enum": [ + "progress", + "stars" + ] } }, { @@ -6691,7 +7110,11 @@ "description": "For a subtype 'date' you can set 'today'. For a main type or subtype 'time' you can set to 'now'.", "schema": { "type": "string", - "nullable": true + "nullable": true, + "enum": [ + "today", + "now" + ] } }, { @@ -6700,7 +7123,11 @@ "description": "Subtype for the new column", "schema": { "type": "string", - "nullable": true + "nullable": true, + "enum": [ + "progress", + "stars" + ] } }, { @@ -6719,6 +7146,7 @@ "schema": { "type": "array", "nullable": true, + "default": [], "items": { "type": "integer", "format": "int64" From 96f0c56e29ef1c44b8d146e9a90af17aa5fcd17b Mon Sep 17 00:00:00 2001 From: Florian Steffens Date: Thu, 14 Dec 2023 10:59:17 +0100 Subject: [PATCH 06/14] Adjust business logic to change tables ownership - reuse and adjust from occ command - adjust occ command logic to fit to the new business - adjust permission service to allow those changes Signed-off-by: Florian Steffens --- lib/Command/ChangeOwnershipTable.php | 14 ++++- lib/Service/PermissionsService.php | 9 +++- lib/Service/TableService.php | 77 +++++++++------------------- 3 files changed, 43 insertions(+), 57 deletions(-) diff --git a/lib/Command/ChangeOwnershipTable.php b/lib/Command/ChangeOwnershipTable.php index cf421a3c7..d0b8a2217 100644 --- a/lib/Command/ChangeOwnershipTable.php +++ b/lib/Command/ChangeOwnershipTable.php @@ -24,6 +24,8 @@ namespace OCA\Tables\Command; use OCA\Tables\Errors\InternalError; +use OCA\Tables\Errors\NotFoundError; +use OCA\Tables\Errors\PermissionError; use OCA\Tables\Service\TableService; use Psr\Log\LoggerInterface; use Symfony\Component\Console\Command\Command; @@ -68,12 +70,20 @@ protected function execute(InputInterface $input, OutputInterface $output): int $newOwnerUserId = $input->getArgument('user-id'); try { - $arr = $this->tableService->setOwner($id, $newOwnerUserId, ''); - $output->writeln(json_encode($arr, JSON_PRETTY_PRINT)); + $table = $this->tableService->setOwner($id, $newOwnerUserId, ''); + $output->writeln(json_encode($table->jsonSerialize(), JSON_PRETTY_PRINT)); } catch (InternalError $e) { $output->writeln('Error occurred: '.$e->getMessage()); $this->logger->warning('Following error occurred during executing occ command "'.self::class.'"', ['exception' => $e]); return 1; + } catch (NotFoundError $e) { + $output->writeln('Not found error occurred: '.$e->getMessage()); + $this->logger->warning('Following error occurred during executing occ command "'.self::class.'"', ['exception' => $e]); + return 1; + } catch (PermissionError $e) { + $output->writeln('Permission error occurred: '.$e->getMessage()); + $this->logger->warning('Following error occurred during executing occ command "'.self::class.'"', ['exception' => $e]); + return 1; } return 0; } diff --git a/lib/Service/PermissionsService.php b/lib/Service/PermissionsService.php index d6941dc27..36c1fa054 100644 --- a/lib/Service/PermissionsService.php +++ b/lib/Service/PermissionsService.php @@ -508,7 +508,12 @@ private function userIsElementOwner($element, string $userId = null): bool { return $element->getOwnership() === $userId; } - public function canChangeElementOwner(string $userId): bool { - return $userId === ''; + /** + * @param View|Table $element + * @param string $userId + * @return bool + */ + public function canChangeElementOwner($element, string $userId): bool { + return $userId === '' || $this->userIsElementOwner($element, $userId); } } diff --git a/lib/Service/TableService.php b/lib/Service/TableService.php index bb9f08482..aa41e0d23 100644 --- a/lib/Service/TableService.php +++ b/lib/Service/TableService.php @@ -5,7 +5,6 @@ namespace OCA\Tables\Service; use DateTime; -use Exception; use OCA\Tables\Db\Table; use OCA\Tables\Db\TableMapper; @@ -287,56 +286,19 @@ public function create(string $title, string $template, ?string $emoji, ?string } /** - * @throws InternalError - */ - public function setOwner(int $id, string $newOwnerUserId, ?string $userId = null): array { - $userId = $this->permissionsService->preCheckUserId($userId); - - try { - $table = $this->mapper->find($id); - - // security - if (!$this->permissionsService->canChangeElementOwner($userId)) { - throw new PermissionError('PermissionError: can not change table owner with table id '.$id); - } - - $table->setOwnership($newOwnerUserId); - $table = $this->mapper->update($table); - - // also change owners of related shares - $updatedShares = $this->shareService->changeSenderForNode('table', $id, $newOwnerUserId, $userId); - $updatesSharesOutput = []; - foreach ($updatedShares as $share) { - $updatesSharesOutput[] = [ - 'shareId' => $share->getId(), - 'nodeType' => $share->getNodeType(), - 'sender' => $share->getSender(), - 'receiverType' => $share->getReceiverType(), - 'receiver' => $share->getReceiver() - ]; - } - - return [ - 'tableId' => $table->getId(), - 'title' => $table->getTitle(), - 'ownership' => $table->getOwnership(), - 'updatedShares' => $updatesSharesOutput - ]; - } catch (Exception $e) { - $this->logger->error($e->getMessage(), ['exception' => $e]); - throw new InternalError($e->getMessage()); - } - } - - /** + * Set a new owner for a table and adjust all related ressources + * * @param int $id - * @param null|string $userId + * @param string $newOwnerUserId + * @param string|null $userId + * * @return Table + * * @throws InternalError * @throws NotFoundError * @throws PermissionError */ - public function transfer(int $id, string $newOwnerUserId, string $userId): Table { + public function setOwner(int $id, string $newOwnerUserId, ?string $userId = null): Table { $userId = $this->permissionsService->preCheckUserId($userId); try { @@ -349,19 +311,28 @@ public function transfer(int $id, string $newOwnerUserId, string $userId): Table throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage()); } - try { - $this->setOwner($id, $newOwnerUserId, $userId); + // security + if (!$this->permissionsService->canChangeElementOwner($table, $userId)) { + throw new PermissionError('PermissionError: can not change table owner with table id '.$id); } - catch(PermissionError|InternalError $e){ - throw new PermissionError('PermissionError: can not transfer table with id '.$id); - } - catch (DoesNotExistException $e) { + + $table->setOwnership($newOwnerUserId); + try { + $table = $this->mapper->update($table); + } catch (OcpDbException $e) { $this->logger->error($e->getMessage(), ['exception' => $e]); - throw new NotFoundError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage()); - } catch (MultipleObjectsReturnedException|OcpDbException $e) { + throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage()); + } + + // change owners of related shares + try { + $this->shareService->changeSenderForNode('table', $id, $newOwnerUserId, $userId); + } catch (InternalError $e) { + $this->logger->error('Could not update related shares for a table transfer!'); $this->logger->error($e->getMessage(), ['exception' => $e]); throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage()); } + return $table; } From b5484a41e5ec6e7bbaf2e947020b0d6550a39a74 Mon Sep 17 00:00:00 2001 From: Florian Steffens Date: Thu, 14 Dec 2023 10:59:36 +0100 Subject: [PATCH 07/14] add integration test for new API endpoint Signed-off-by: Florian Steffens --- tests/integration/features/APIv2.feature | 96 ++++++++++--------- .../features/bootstrap/FeatureContext.php | 45 +++++++++ 2 files changed, 97 insertions(+), 44 deletions(-) diff --git a/tests/integration/features/APIv2.feature b/tests/integration/features/APIv2.feature index 843f4d685..7afbabba7 100644 --- a/tests/integration/features/APIv2.feature +++ b/tests/integration/features/APIv2.feature @@ -1,6 +1,7 @@ Feature: APIv2 Background: Given user "participant1-v2" exists + Given user "participant2-v2" exists @api2 Scenario: Test initial setup @@ -19,48 +20,55 @@ Feature: APIv2 | updated title | Then user "participant1-v2" deletes table "t1" via v2 - @api2 - Scenario: Basic column actions - Given table "Table 2" with emoji "👋" exists for user "participant1-v2" as "t2" via v2 - Then column from main type "text" for node type "table" and node name "t2" exists with name "c1" and following properties via v2 - | subtype | line | - | title | Beautiful text column | - | mandatory | 0 | - | description | This is a description! | - Then column from main type "text" for node type "table" and node name "t2" exists with name "c2" and following properties via v2 - | subtype | rich | - | title | Rich is cool | - | mandatory | 1 | - | description | Another description | - Then column from main type "number" for node type "table" and node name "t2" exists with name "c3" and following properties via v2 - | title | Counter | - | mandatory | 0 | - Then column from main type "number" for node type "table" and node name "t2" exists with name "c4" and following properties via v2 - | subtype | progress | - | title | Progress | - Then column from main type "number" for node type "table" and node name "t2" exists with name "c5" and following properties via v2 - | subtype | check | - | title | Checking | - Then column from main type "datetime" for node type "table" and node name "t2" exists with name "c6" and following properties via v2 - | subtype | date | - | title | A single date | - | datetimeDefault | today | - Then node with node type "table" and node name "t2" has the following columns via v2 - | Beautiful text column | Rich is cool | Counter | Progress | Checking | A single date | - Then print register + @api2 + Scenario: Basic column actions + Given table "Table 2" with emoji "👋" exists for user "participant1-v2" as "t2" via v2 + Then column from main type "text" for node type "table" and node name "t2" exists with name "c1" and following properties via v2 + | subtype | line | + | title | Beautiful text column | + | mandatory | 0 | + | description | This is a description! | + Then column from main type "text" for node type "table" and node name "t2" exists with name "c2" and following properties via v2 + | subtype | rich | + | title | Rich is cool | + | mandatory | 1 | + | description | Another description | + Then column from main type "number" for node type "table" and node name "t2" exists with name "c3" and following properties via v2 + | title | Counter | + | mandatory | 0 | + Then column from main type "number" for node type "table" and node name "t2" exists with name "c4" and following properties via v2 + | subtype | progress | + | title | Progress | + Then column from main type "number" for node type "table" and node name "t2" exists with name "c5" and following properties via v2 + | subtype | check | + | title | Checking | + Then column from main type "datetime" for node type "table" and node name "t2" exists with name "c6" and following properties via v2 + | subtype | date | + | title | A single date | + | datetimeDefault | today | + Then node with node type "table" and node name "t2" has the following columns via v2 + | Beautiful text column | Rich is cool | Counter | Progress | Checking | A single date | + Then print register + + @api2selection + Scenario: Create selection columns + Given table "Table 3" with emoji "👋" exists for user "participant1-v2" as "t3" via v2 + Then column from main type "selection" for node type "table" and node name "t3" exists with name "sel-c1" and following properties via v2 + | title | sel single | + | selectionOptions | [{"id": 1, "label": "first"},{"id": 2, "label": "second"}] | + | selectionDefault | 2 | + Then column from main type "selection" for node type "table" and node name "t3" exists with name "sel-c2" and following properties via v2 + | title | sel multi | + | subtype | multi | + | selectionOptions | [{"id": 1, "label": "first"},{"id": 2, "label": "second"}] | + | selectionDefault | ["1","2"] | + Then node with node type "table" and node name "t3" has the following columns via v2 + | sel single | sel multi | + Then print register - @api2selection - Scenario: Create selection columns - Given table "Table 3" with emoji "👋" exists for user "participant1-v2" as "t3" via v2 - Then column from main type "selection" for node type "table" and node name "t3" exists with name "sel-c1" and following properties via v2 - | title | sel single | - | selectionOptions | [{"id": 1, "label": "first"},{"id": 2, "label": "second"}] | - | selectionDefault | 2 | - Then column from main type "selection" for node type "table" and node name "t3" exists with name "sel-c2" and following properties via v2 - | title | sel multi | - | subtype | multi | - | selectionOptions | [{"id": 1, "label": "first"},{"id": 2, "label": "second"}] | - | selectionDefault | ["1","2"] | - Then node with node type "table" and node name "t3" has the following columns via v2 - | sel single | sel multi | - Then print register + @api2transfer + Scenario: Create selection columns + Given table "Table 4" with emoji "👋" exists for user "participant1-v2" as "t4" via v2 + Then table "t4" is owned by "participant1-v2" + Then change owner for table "t4" from user "participant1-v2" to user "participant2-v2" + Then table "t4" is owned by "participant2-v2" diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php index de9ea4f76..959cbc870 100644 --- a/tests/integration/features/bootstrap/FeatureContext.php +++ b/tests/integration/features/bootstrap/FeatureContext.php @@ -263,6 +263,51 @@ public function updateTableV2(string $user, string $title, ?string $emoji, strin Assert::assertEquals($tableToVerify['ownership'], $user); } + /** + * @Then change owner for table :tableName from user :user to user :newUser + * + * @param string $user + * @param string $newUser + * @param string $tableName + */ + public function transferTableV2(string $user, string $newUser, string $tableName): void { + $this->setCurrentUser($user); + + $data = ['newOwnerUserId' => $newUser]; + + $this->sendOcsRequest( + 'PUT', + '/apps/tables/api/2/tables/'.$this->tableIds[$tableName].'/transfer', + $data + ); + + $updatedTable = $this->getDataFromResponse($this->response)['ocs']['data']; + + Assert::assertEquals(200, $this->response->getStatusCode()); + Assert::assertEquals($updatedTable['ownership'], $newUser); + } + + /** + * @Then table :tableName is owned by :user + * + * @param string $user + * @param string $tableName + * @throws Exception + */ + public function checkTableOwnershipV2(string $user, string $tableName): void { + $this->setCurrentUser($user); + + $this->sendOcsRequest( + 'GET', + '/apps/tables/api/2/tables/'.$this->tableIds[$tableName] + ); + + $table = $this->getDataFromResponse($this->response)['ocs']['data']; + + Assert::assertEquals(200, $this->response->getStatusCode()); + Assert::assertEquals($table['ownership'], $user); + } + /** * @Then user :user deletes table :tableName via v2 * From 785c11007ce99321026a064329b707bd3e17a2d2 Mon Sep 17 00:00:00 2001 From: enjeck Date: Sat, 23 Dec 2023 20:13:02 +0100 Subject: [PATCH 08/14] Adjust logic and UI to change tables ownership Signed-off-by: Cleopatra Enjeck M --- src/modules/main/sections/DataTable.vue | 16 -- src/modules/modals/TransferTable.vue | 60 ++++--- .../partials/NavigationTableItem.vue | 8 - src/modules/sidebar/partials/ShareForm.vue | 2 +- .../NcUserAndGroupPicker.vue | 169 ++++++++---------- .../mixins/shareTypesMixin.js | 0 src/store/store.js | 17 +- 7 files changed, 128 insertions(+), 144 deletions(-) rename src/{modules/sidebar => shared}/mixins/shareTypesMixin.js (100%) diff --git a/src/modules/main/sections/DataTable.vue b/src/modules/main/sections/DataTable.vue index cf7fb4a26..bd7632cd3 100644 --- a/src/modules/main/sections/DataTable.vue +++ b/src/modules/main/sections/DataTable.vue @@ -17,14 +17,6 @@ {{ t('tables', 'Edit table') }} - - - {{ t('tables', 'Transfer table') }} - @@ -100,14 +92,6 @@ {{ t('tables', 'Edit table') }} - - - {{ t('tables', 'Transfer table') }} - diff --git a/src/modules/modals/TransferTable.vue b/src/modules/modals/TransferTable.vue index 5d85ce137..79bff6a2b 100644 --- a/src/modules/modals/TransferTable.vue +++ b/src/modules/modals/TransferTable.vue @@ -2,29 +2,34 @@ -
+
-

{{ t('tables', 'Transfer tables ownership') }}

+

{{ t('tables', 'Transfer table') }}

- // TODO: add actual owner +
+ {{ t('tables', 'Owner') }} +
+ + +
+ +
- +
- + {{ t('tables', 'Transfer') }} - - {{ t('tables', 'I really want to transfer this table!') }} -
@@ -32,12 +37,13 @@ diff --git a/src/modules/sidebar/mixins/shareTypesMixin.js b/src/shared/mixins/shareTypesMixin.js similarity index 100% rename from src/modules/sidebar/mixins/shareTypesMixin.js rename to src/shared/mixins/shareTypesMixin.js diff --git a/src/store/store.js b/src/store/store.js index 51de49756..1d2a862ae 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -1,7 +1,7 @@ import Vue from 'vue' import Vuex from 'vuex' import axios from '@nextcloud/axios' -import { generateUrl } from '@nextcloud/router' +import { generateUrl, generateOcsUrl } from '@nextcloud/router' import { showError } from '@nextcloud/dialogs' import '@nextcloud/dialogs/dist/index.css' import data from './data.js' @@ -234,8 +234,19 @@ export default new Vuex.Store({ commit('setTables', [...tables]) return true }, - async transferTable({ state, commit, dispatch }, { tableId, newOwnerUserId, userId }) { - // TODO add business + async transferTable({ state, commit, dispatch }, { id, data }) { + try { + await axios.put(generateOcsUrl('/apps/tables/api/2/tables/' + id + '/transfer'), data) + } catch (e) { + displayError(e, t('tables', 'Could not transfer table.')) + return false + } + + const tables = state.tables + const index = tables.findIndex(t => t.id === id) + tables.splice(index, 1) + commit('setTables', [...tables]) + return true }, async removeTable({ state, commit }, { tableId }) { try { From 5db16818fbd2fe57680fe7c5fc81c96d6cb10a02 Mon Sep 17 00:00:00 2001 From: enjeck Date: Wed, 27 Dec 2023 09:23:59 +0100 Subject: [PATCH 09/14] Add Cypress tests for table transfer Signed-off-by: Cleopatra Enjeck M --- cypress/e2e/tables-table.cy.js | 27 +++++++++++++++++++++++++++ src/modules/modals/EditTable.vue | 2 +- src/modules/modals/TransferTable.vue | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/tables-table.cy.js b/cypress/e2e/tables-table.cy.js index c4e78bd0b..a5aab2ebf 100644 --- a/cypress/e2e/tables-table.cy.js +++ b/cypress/e2e/tables-table.cy.js @@ -1,4 +1,5 @@ let localUser +let user1 describe('Manage a table', () => { @@ -6,6 +7,9 @@ describe('Manage a table', () => { cy.createRandomUser().then(user => { localUser = user }) + cy.createRandomUser().then(user => { + user1 = user + }) }) beforeEach(function() { @@ -51,4 +55,27 @@ describe('Manage a table', () => { cy.wait(10).get('.toastify.toast-success').should('be.visible') cy.get('.app-navigation__list').contains('to do list').should('not.exist') }) + + it('Transfer', () => { + cy.contains('.app-menu-entry--label', 'Tables').click() + cy.contains('button', 'Create new table').click() + cy.get('.tile').contains('ToDo').click({ force: true }) + cy.get('.modal__content').should('be.visible') + cy.get('.modal__content input[type="text"]').clear().type('test table') + cy.contains('button', 'Create table').click() + + cy.get('.app-navigation__list').contains('test table').click({ force: true }) + cy.get('[data-cy="customTableAction"] button').click() + cy.get('.action-button__text').contains('Edit table').click() + + cy.get('[data-cy="editTableModal"]').should('be.visible') + cy.get('[data-cy="editTableModal"] button').contains('Change owner').click() + cy.get('[data-cy="editTableModal"]').should('not.exist') + cy.get('[data-cy="transferTableModal"]').should('be.visible') + cy.get('[data-cy="transferTableModal"] input[type="search"]').clear().type(user1.userId) + cy.get(`.vs__dropdown-menu [user="${user1.userId}"]`).click() + cy.get('[data-cy="transferTableButton"]').should('be.enabled').click() + cy.wait(10).get('.toastify.toast-success').should('be.visible') + cy.get('.app-navigation__list').contains('test table').should('not.exist') + }) }) diff --git a/src/modules/modals/EditTable.vue b/src/modules/modals/EditTable.vue index 35d7d9bf7..5119f07a3 100644 --- a/src/modules/modals/EditTable.vue +++ b/src/modules/modals/EditTable.vue @@ -2,7 +2,7 @@ -
+

{{ t('tables', 'Edit table') }}

diff --git a/src/modules/modals/TransferTable.vue b/src/modules/modals/TransferTable.vue index 79bff6a2b..036667462 100644 --- a/src/modules/modals/TransferTable.vue +++ b/src/modules/modals/TransferTable.vue @@ -27,7 +27,7 @@
- + {{ t('tables', 'Transfer') }}
From 739d14f715d0c69b6fc4ec26109ba76d1275c266 Mon Sep 17 00:00:00 2001 From: Cleopatra Enjeck M Date: Fri, 29 Dec 2023 09:48:55 +0100 Subject: [PATCH 10/14] clean up Signed-off-by: Cleopatra Enjeck M --- cypress/e2e/tables-table.cy.js | 13 ++-- src/modules/modals/TransferTable.vue | 20 +----- .../NcUserAndGroupPicker.vue | 69 +++++++++---------- 3 files changed, 41 insertions(+), 61 deletions(-) diff --git a/cypress/e2e/tables-table.cy.js b/cypress/e2e/tables-table.cy.js index a5aab2ebf..7e5faaa92 100644 --- a/cypress/e2e/tables-table.cy.js +++ b/cypress/e2e/tables-table.cy.js @@ -1,5 +1,5 @@ let localUser -let user1 +let targetUserTransfer describe('Manage a table', () => { @@ -8,7 +8,7 @@ describe('Manage a table', () => { localUser = user }) cy.createRandomUser().then(user => { - user1 = user + targetUserTransfer = user }) }) @@ -72,10 +72,13 @@ describe('Manage a table', () => { cy.get('[data-cy="editTableModal"] button').contains('Change owner').click() cy.get('[data-cy="editTableModal"]').should('not.exist') cy.get('[data-cy="transferTableModal"]').should('be.visible') - cy.get('[data-cy="transferTableModal"] input[type="search"]').clear().type(user1.userId) - cy.get(`.vs__dropdown-menu [user="${user1.userId}"]`).click() + cy.get('[data-cy="transferTableModal"] input[type="search"]').clear().type(targetUserTransfer.userId) + cy.get(`.vs__dropdown-menu [user="${targetUserTransfer.userId}"]`).click() cy.get('[data-cy="transferTableButton"]').should('be.enabled').click() - cy.wait(10).get('.toastify.toast-success').should('be.visible') + cy.get('.toastify.toast-success').should('be.visible') cy.get('.app-navigation__list').contains('test table').should('not.exist') + cy.login(targetUserTransfer) + cy.visit('apps/tables') + cy.get('.app-navigation__list').contains('test table') }) }) diff --git a/src/modules/modals/TransferTable.vue b/src/modules/modals/TransferTable.vue index 036667462..200245c5c 100644 --- a/src/modules/modals/TransferTable.vue +++ b/src/modules/modals/TransferTable.vue @@ -9,24 +9,11 @@
-
- {{ t('tables', 'Owner') }} -
- - -
- -
-
-
+

{{ t('tables', 'Transfer this table to another user') }}

-
+
{{ t('tables', 'Transfer') }} @@ -90,11 +77,8 @@ export default { }, methods: { actionCancel() { - this.reset() this.$emit('close') }, - reset() { - }, async transferMe() { const transferId = this.table.id let activeTableId diff --git a/src/shared/components/ncUserAndGroupPicker/NcUserAndGroupPicker.vue b/src/shared/components/ncUserAndGroupPicker/NcUserAndGroupPicker.vue index 62774c7c7..345c0c9d9 100644 --- a/src/shared/components/ncUserAndGroupPicker/NcUserAndGroupPicker.vue +++ b/src/shared/components/ncUserAndGroupPicker/NcUserAndGroupPicker.vue @@ -1,7 +1,6 @@