From 59c3b8da3ade3e551495c2956199c41b81263bce Mon Sep 17 00:00:00 2001 From: Nitwel Date: Fri, 16 Oct 2020 11:24:26 +0200 Subject: [PATCH 01/47] hide duplicate on relational fields --- app/package-lock.json | 162 +++++++++--------- .../fields/components/field-select.vue | 18 +- package-lock.json | 16 +- 3 files changed, 106 insertions(+), 90 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 015b67ced1..82c900adc3 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -6601,51 +6601,6 @@ "tslint": "^5.20.1", "webpack": "^4.0.0", "yorkie": "^2.0.0" - }, - "dependencies": { - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "fork-ts-checker-webpack-plugin-v5": { - "version": "npm:fork-ts-checker-webpack-plugin@5.2.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.0.tgz", - "integrity": "sha512-NEKcI0+osT5bBFZ1SFGzJMQETjQWZrSvMO1g0nAR/w0t328Z41eN8BJEIZyFCl2HsuiJpa9AN474Nh2qLVwGLQ==", - "dev": true, - "optional": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@types/json-schema": "^7.0.5", - "chalk": "^4.1.0", - "cosmiconfig": "^6.0.0", - "deepmerge": "^4.2.2", - "fs-extra": "^9.0.0", - "memfs": "^3.1.2", - "minimatch": "^3.0.4", - "schema-utils": "2.7.0", - "semver": "^7.3.2", - "tapable": "^1.0.0" - } - }, - "schema-utils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", - "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", - "dev": true, - "optional": true, - "requires": { - "@types/json-schema": "^7.0.4", - "ajv": "^6.12.2", - "ajv-keywords": "^3.4.1" - } - } } }, "@vue/cli-plugin-unit-jest": { @@ -6785,17 +6740,6 @@ "unique-filename": "^1.1.1" } }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -6879,18 +6823,6 @@ "graceful-fs": "^4.1.6" } }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -7004,18 +6936,6 @@ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.0.0-beta.8", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", - "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - } - }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -11744,6 +11664,51 @@ } } }, + "fork-ts-checker-webpack-plugin-v5": { + "version": "npm:fork-ts-checker-webpack-plugin@5.2.0", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.0.tgz", + "integrity": "sha512-NEKcI0+osT5bBFZ1SFGzJMQETjQWZrSvMO1g0nAR/w0t328Z41eN8BJEIZyFCl2HsuiJpa9AN474Nh2qLVwGLQ==", + "dev": true, + "optional": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@types/json-schema": "^7.0.5", + "chalk": "^4.1.0", + "cosmiconfig": "^6.0.0", + "deepmerge": "^4.2.2", + "fs-extra": "^9.0.0", + "memfs": "^3.1.2", + "minimatch": "^3.0.4", + "schema-utils": "2.7.0", + "semver": "^7.3.2", + "tapable": "^1.0.0" + }, + "dependencies": { + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "schema-utils": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", + "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", + "dev": true, + "optional": true, + "requires": { + "@types/json-schema": "^7.0.4", + "ajv": "^6.12.2", + "ajv-keywords": "^3.4.1" + } + } + } + }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", @@ -20377,6 +20342,43 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.0.0-beta.8", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", + "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } + }, "vue-router": { "version": "3.4.6", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.6.tgz", diff --git a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue index 0fe570585c..8bd81da24f 100644 --- a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue +++ b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue @@ -90,7 +90,7 @@ - + @@ -217,7 +217,15 @@ export default defineComponent({ const editActive = ref(false); const { deleteActive, deleting, deleteField } = useDeleteField(); - const { duplicateActive, duplicateName, collections, duplicateTo, saveDuplicate, duplicating } = useDuplicate(); + const { + duplicateActive, + duplicateName, + collections, + duplicateTo, + saveDuplicate, + duplicating, + duplicateable, + } = useDuplicate(); const interfaceName = computed(() => { return interfaces.value.find((inter) => inter.id === props.field.meta?.interface)?.name; @@ -248,6 +256,7 @@ export default defineComponent({ localType, translationsCollection, translationsFieldsCount, + duplicateable, }; function setWidth(width: string) { @@ -288,6 +297,10 @@ export default defineComponent({ ); const duplicateTo = ref(props.field.collection); + const duplicateable = computed(() => { + return ['o2m', 'm2m', 'm2o', 'files', 'file'].includes(props.field.type) === false; + }); + return { duplicateActive, duplicateName, @@ -295,6 +308,7 @@ export default defineComponent({ duplicateTo, saveDuplicate, duplicating, + duplicateable, }; async function saveDuplicate() { diff --git a/package-lock.json b/package-lock.json index c2954a8d88..a434845797 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16043,6 +16043,14 @@ "supports-color": "^7.1.0" } }, + "knex-schema-inspector": { + "version": "0.0.21", + "resolved": "https://registry.npmjs.org/knex-schema-inspector/-/knex-schema-inspector-0.0.21.tgz", + "integrity": "sha512-hroob7VPZM65ZoYCHrSNBPWFtkJTWa7D1CsqTZiptwenPhYZoNwWxbrUX96W8oZG6bY5xUQ+nyFQv0MdNOjWgA==", + "requires": { + "lodash.flatten": "^4.4.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -26337,14 +26345,6 @@ } } }, - "knex-schema-inspector": { - "version": "0.0.20", - "resolved": "https://registry.npmjs.org/knex-schema-inspector/-/knex-schema-inspector-0.0.20.tgz", - "integrity": "sha512-krkGhAc67NcJv2olwfDeRzrQL2fhVB+NqNOXDLqz/HXAFTqTx2s+GhO42YkJrmCs7uoWC6RtHrwr/fEh6Oc4kQ==", - "requires": { - "lodash.flatten": "^4.4.0" - } - }, "known-css-properties": { "version": "0.19.0", "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz", From 0dad84b31254638c87e5d5b08c2c8c37197a0493 Mon Sep 17 00:00:00 2001 From: Nitwel Date: Fri, 16 Oct 2020 11:28:30 +0200 Subject: [PATCH 02/47] exclude primary key --- .../routes/data-model/fields/components/field-select.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue index 8bd81da24f..5749afaa28 100644 --- a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue +++ b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue @@ -298,7 +298,10 @@ export default defineComponent({ const duplicateTo = ref(props.field.collection); const duplicateable = computed(() => { - return ['o2m', 'm2m', 'm2o', 'files', 'file'].includes(props.field.type) === false; + return ( + ['o2m', 'm2m', 'm2o', 'files', 'file'].includes(props.field.type) === false && + props.field.schema?.is_primary_key === false + ); }); return { From afbbcd89e4de3b3c99375ce63568e5b739849cb7 Mon Sep 17 00:00:00 2001 From: Nitwel Date: Fri, 16 Oct 2020 15:33:03 +0200 Subject: [PATCH 03/47] rename to duplicable --- .../data-model/fields/components/field-select.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue index 5749afaa28..618753e0b1 100644 --- a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue +++ b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue @@ -90,7 +90,7 @@ - + @@ -224,7 +224,7 @@ export default defineComponent({ duplicateTo, saveDuplicate, duplicating, - duplicateable, + duplicable, } = useDuplicate(); const interfaceName = computed(() => { @@ -256,7 +256,7 @@ export default defineComponent({ localType, translationsCollection, translationsFieldsCount, - duplicateable, + duplicable, }; function setWidth(width: string) { @@ -297,9 +297,9 @@ export default defineComponent({ ); const duplicateTo = ref(props.field.collection); - const duplicateable = computed(() => { + const duplicable = computed(() => { return ( - ['o2m', 'm2m', 'm2o', 'files', 'file'].includes(props.field.type) === false && + ['o2m', 'm2m', 'm2o', 'files', 'file', 'm2a'].includes(props.field.type) === false && props.field.schema?.is_primary_key === false ); }); @@ -311,7 +311,7 @@ export default defineComponent({ duplicateTo, saveDuplicate, duplicating, - duplicateable, + duplicable, }; async function saveDuplicate() { From e8bee549a2907839399d5039438f6c91627a5daf Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Fri, 16 Oct 2020 11:53:20 -0400 Subject: [PATCH 04/47] Rename drawer to sidebar --- app/src/app.vue | 6 +- app/src/components/register.ts | 8 +-- app/src/layouts/cards/cards.vue | 4 +- app/src/layouts/tabular/tabular.vue | 4 +- .../modules/activity/routes/collection.vue | 16 ++--- .../modules/collections/routes/collection.vue | 20 +++--- app/src/modules/collections/routes/item.vue | 26 +++---- .../modules/collections/routes/overview.vue | 6 +- app/src/modules/docs/routes/static.vue | 6 +- ...etail.vue => file-info-sidebar-detail.vue} | 0 app/src/modules/files/routes/collection.vue | 16 ++--- app/src/modules/files/routes/item.vue | 28 ++++---- .../data-model/collections/collections.vue | 10 +-- .../components/collections-filter.vue | 4 +- .../routes/data-model/fields/fields.vue | 6 +- .../routes/presets/collection/collection.vue | 8 +-- ...il.vue => presets-info-sidebar-detail.vue} | 4 +- .../modules/settings/routes/presets/item.vue | 20 +++--- ...il.vue => project-info-sidebar-detail.vue} | 4 +- .../settings/routes/project/project.vue | 8 +-- .../settings/routes/roles/collection.vue | 6 +- ...etail.vue => role-info-sidebar-detail.vue} | 4 +- .../settings/routes/roles/item/item.vue | 12 ++-- .../settings/routes/webhooks/collection.vue | 14 ++-- .../modules/settings/routes/webhooks/item.vue | 12 ++-- ...etail.vue => user-info-sidebar-detail.vue} | 4 +- app/src/modules/users/routes/collection.vue | 14 ++-- app/src/modules/users/routes/item.vue | 24 +++---- app/src/stores/app.ts | 2 +- .../comments-drawer-detail/index.ts | 4 -- .../comments-drawer-detail/readme.md | 9 --- .../comment-input.vue | 0 .../comment-item-header.vue | 0 .../comment-item.vue | 0 .../comments-sidebar-detail.vue} | 6 +- .../comments-sidebar-detail/index.ts | 4 ++ .../comments-sidebar-detail/readme.md | 9 +++ .../types.ts | 0 .../private/components/drawer-button/index.ts | 4 -- .../components/drawer-detail-group/index.ts | 4 -- .../components/drawer-detail-group/readme.md | 39 ----------- .../private/components/drawer-detail/index.ts | 4 -- .../components/export-drawer-detail/index.ts | 4 -- .../export-sidebar-detail.vue} | 20 +++--- .../components/export-sidebar-detail/index.ts | 4 ++ .../components/filter-drawer-detail/index.ts | 4 -- .../field-filter.vue | 0 .../field-list-item.vue | 0 .../filter-input.vue | 0 .../filter-sidebar-detail.vue} | 4 +- .../get-available-operators-for-type.ts | 0 .../components/filter-sidebar-detail/index.ts | 4 ++ .../types.ts | 0 .../header-bar-actions/header-bar-actions.vue | 7 +- .../components/header-bar-actions/readme.md | 2 +- .../components/header-bar/header-bar.story.ts | 70 +++++++++---------- .../components/header-bar/header-bar.test.ts | 6 +- .../components/header-bar/header-bar.vue | 4 +- .../private/components/header-bar/readme.md | 2 +- .../components/layout-drawer-detail/index.ts | 4 -- .../components/layout-sidebar-detail/index.ts | 4 ++ .../layout-sidebar-detail.vue} | 4 +- .../notifications-preview.story.ts | 6 +- .../notifications-preview.vue | 12 ++-- .../revisions-drawer-detail/index.ts | 4 -- .../revisions-drawer-detail/readme.md | 9 --- .../revisions-sidebar-detail/index.ts | 4 ++ .../revisions-sidebar-detail/readme.md | 9 +++ .../revision-item.vue | 0 .../revisions-modal-current.vue | 0 .../revisions-modal-picker.vue | 0 .../revisions-modal-preview.vue | 0 .../revisions-modal-updates-change.vue | 0 .../revisions-modal-updates.vue | 0 .../revisions-modal.vue | 0 .../revisions-sidebar-detail.vue} | 6 +- .../types.ts | 0 .../components/sidebar-button/index.ts | 4 ++ .../readme.md | 6 +- .../sidebar-button.story.ts} | 18 ++--- .../sidebar-button.test.ts} | 10 +-- .../sidebar-button.vue} | 10 +-- .../components/sidebar-detail-group/index.ts | 4 ++ .../components/sidebar-detail-group/readme.md | 39 +++++++++++ .../sidebar-detail-group.story.ts} | 30 ++++---- .../sidebar-detail-group.test.ts} | 12 ++-- .../sidebar-detail-group.vue} | 10 +-- .../components/sidebar-detail/index.ts | 4 ++ .../readme.md | 12 ++-- .../sidebar-detail.story.ts} | 14 ++-- .../sidebar-detail.test.ts} | 14 ++-- .../sidebar-detail.vue} | 32 ++++----- app/src/views/private/private-view.vue | 46 ++++++------ 93 files changed, 421 insertions(+), 416 deletions(-) rename app/src/modules/files/components/{file-info-drawer-detail.vue => file-info-sidebar-detail.vue} (100%) rename app/src/modules/settings/routes/presets/collection/components/{presets-info-drawer-detail.vue => presets-info-sidebar-detail.vue} (93%) rename app/src/modules/settings/routes/project/components/{project-info-drawer-detail.vue => project-info-sidebar-detail.vue} (94%) rename app/src/modules/settings/routes/roles/item/components/{role-info-drawer-detail.vue => role-info-sidebar-detail.vue} (87%) rename app/src/modules/users/components/{user-info-drawer-detail.vue => user-info-sidebar-detail.vue} (94%) delete mode 100644 app/src/views/private/components/comments-drawer-detail/index.ts delete mode 100644 app/src/views/private/components/comments-drawer-detail/readme.md rename app/src/views/private/components/{comments-drawer-detail => comments-sidebar-detail}/comment-input.vue (100%) rename app/src/views/private/components/{comments-drawer-detail => comments-sidebar-detail}/comment-item-header.vue (100%) rename app/src/views/private/components/{comments-drawer-detail => comments-sidebar-detail}/comment-item.vue (100%) rename app/src/views/private/components/{comments-drawer-detail/comments-drawer-detail.vue => comments-sidebar-detail/comments-sidebar-detail.vue} (97%) create mode 100644 app/src/views/private/components/comments-sidebar-detail/index.ts create mode 100644 app/src/views/private/components/comments-sidebar-detail/readme.md rename app/src/views/private/components/{comments-drawer-detail => comments-sidebar-detail}/types.ts (100%) delete mode 100644 app/src/views/private/components/drawer-button/index.ts delete mode 100644 app/src/views/private/components/drawer-detail-group/index.ts delete mode 100644 app/src/views/private/components/drawer-detail-group/readme.md delete mode 100644 app/src/views/private/components/drawer-detail/index.ts delete mode 100644 app/src/views/private/components/export-drawer-detail/index.ts rename app/src/views/private/components/{export-drawer-detail/export-drawer-detail.vue => export-sidebar-detail/export-sidebar-detail.vue} (83%) create mode 100644 app/src/views/private/components/export-sidebar-detail/index.ts delete mode 100644 app/src/views/private/components/filter-drawer-detail/index.ts rename app/src/views/private/components/{filter-drawer-detail => filter-sidebar-detail}/field-filter.vue (100%) rename app/src/views/private/components/{filter-drawer-detail => filter-sidebar-detail}/field-list-item.vue (100%) rename app/src/views/private/components/{filter-drawer-detail => filter-sidebar-detail}/filter-input.vue (100%) rename app/src/views/private/components/{filter-drawer-detail/filter-drawer-detail.vue => filter-sidebar-detail/filter-sidebar-detail.vue} (99%) rename app/src/views/private/components/{filter-drawer-detail => filter-sidebar-detail}/get-available-operators-for-type.ts (100%) create mode 100644 app/src/views/private/components/filter-sidebar-detail/index.ts rename app/src/views/private/components/{filter-drawer-detail => filter-sidebar-detail}/types.ts (100%) delete mode 100644 app/src/views/private/components/layout-drawer-detail/index.ts create mode 100644 app/src/views/private/components/layout-sidebar-detail/index.ts rename app/src/views/private/components/{layout-drawer-detail/layout-drawer-detail.vue => layout-sidebar-detail/layout-sidebar-detail.vue} (94%) delete mode 100644 app/src/views/private/components/revisions-drawer-detail/index.ts delete mode 100644 app/src/views/private/components/revisions-drawer-detail/readme.md create mode 100644 app/src/views/private/components/revisions-sidebar-detail/index.ts create mode 100644 app/src/views/private/components/revisions-sidebar-detail/readme.md rename app/src/views/private/components/{revisions-drawer-detail => revisions-sidebar-detail}/revision-item.vue (100%) rename app/src/views/private/components/{revisions-drawer-detail => revisions-sidebar-detail}/revisions-modal-current.vue (100%) rename app/src/views/private/components/{revisions-drawer-detail => revisions-sidebar-detail}/revisions-modal-picker.vue (100%) rename app/src/views/private/components/{revisions-drawer-detail => revisions-sidebar-detail}/revisions-modal-preview.vue (100%) rename app/src/views/private/components/{revisions-drawer-detail => revisions-sidebar-detail}/revisions-modal-updates-change.vue (100%) rename app/src/views/private/components/{revisions-drawer-detail => revisions-sidebar-detail}/revisions-modal-updates.vue (100%) rename app/src/views/private/components/{revisions-drawer-detail => revisions-sidebar-detail}/revisions-modal.vue (100%) rename app/src/views/private/components/{revisions-drawer-detail/revisions-drawer-detail.vue => revisions-sidebar-detail/revisions-sidebar-detail.vue} (99%) rename app/src/views/private/components/{revisions-drawer-detail => revisions-sidebar-detail}/types.ts (100%) create mode 100644 app/src/views/private/components/sidebar-button/index.ts rename app/src/views/private/components/{drawer-button => sidebar-button}/readme.md (81%) rename app/src/views/private/components/{drawer-button/drawer-button.story.ts => sidebar-button/sidebar-button.story.ts} (63%) rename app/src/views/private/components/{drawer-button/drawer-button.test.ts => sidebar-button/sidebar-button.test.ts} (61%) rename app/src/views/private/components/{drawer-button/drawer-button.vue => sidebar-button/sidebar-button.vue} (87%) create mode 100644 app/src/views/private/components/sidebar-detail-group/index.ts create mode 100644 app/src/views/private/components/sidebar-detail-group/readme.md rename app/src/views/private/components/{drawer-detail-group/drawer-detail-group.story.ts => sidebar-detail-group/sidebar-detail-group.story.ts} (55%) rename app/src/views/private/components/{drawer-detail-group/drawer-detail-group.test.ts => sidebar-detail-group/sidebar-detail-group.test.ts} (59%) rename app/src/views/private/components/{drawer-detail-group/drawer-detail-group.vue => sidebar-detail-group/sidebar-detail-group.vue} (75%) create mode 100644 app/src/views/private/components/sidebar-detail/index.ts rename app/src/views/private/components/{drawer-detail => sidebar-detail}/readme.md (67%) rename app/src/views/private/components/{drawer-detail/drawer-detail.story.ts => sidebar-detail/sidebar-detail.story.ts} (78%) rename app/src/views/private/components/{drawer-detail/drawer-detail.test.ts => sidebar-detail/sidebar-detail.test.ts} (86%) rename app/src/views/private/components/{drawer-detail/drawer-detail.vue => sidebar-detail/sidebar-detail.vue} (76%) diff --git a/app/src/app.vue b/app/src/app.vue index 1af46b55dd..aac919bf04 100644 --- a/app/src/app.vue +++ b/app/src/app.vue @@ -48,7 +48,7 @@ export default defineComponent({ const userStore = useUserStore(); const settingsStore = useSettingsStore(); - const { hydrating, drawerOpen } = toRefs(appStore.state); + const { hydrating, sidebarOpen } = toRefs(appStore.state); const brandStyle = computed(() => { return { @@ -73,9 +73,9 @@ export default defineComponent({ if (newWidth === oldWidth) return; if (newWidth >= 1424) { - if (drawerOpen.value === false) drawerOpen.value = true; + if (sidebarOpen.value === false) sidebarOpen.value = true; } else { - if (drawerOpen.value === true) drawerOpen.value = false; + if (sidebarOpen.value === true) sidebarOpen.value = false; } }, { immediate: true } diff --git a/app/src/components/register.ts b/app/src/components/register.ts index f7a3d66826..01b1ba079e 100644 --- a/app/src/components/register.ts +++ b/app/src/components/register.ts @@ -104,14 +104,14 @@ Vue.component('transition-expand', TransitionExpand); import RenderDisplay from '@/views/private/components/render-display'; import RenderTemplate from '@/views/private/components/render-template'; -import DrawerDetail from '@/views/private/components/drawer-detail/'; -import FilterDrawerDetail from '@/views/private/components/filter-drawer-detail'; +import SidebarDetail from '@/views/private/components/sidebar-detail/'; +import FilterSidebarDetail from '@/views/private/components/filter-sidebar-detail'; import UserPopover from '@/views/private/components/user-popover'; import ValueNull from '@/views/private/components/value-null'; Vue.component('render-display', RenderDisplay); Vue.component('render-template', RenderTemplate); -Vue.component('filter-drawer-detail', FilterDrawerDetail); -Vue.component('drawer-detail', DrawerDetail); +Vue.component('filter-sidebar-detail', FilterSidebarDetail); +Vue.component('sidebar-detail', SidebarDetail); Vue.component('user-popover', UserPopover); Vue.component('value-null', ValueNull); diff --git a/app/src/layouts/cards/cards.vue b/app/src/layouts/cards/cards.vue index 07f6e46ed4..6075f8b781 100644 --- a/app/src/layouts/cards/cards.vue +++ b/app/src/layouts/cards/cards.vue @@ -46,8 +46,8 @@ - - + + diff --git a/app/src/layouts/tabular/tabular.vue b/app/src/layouts/tabular/tabular.vue index ea4f236ef1..5b44c8e8ea 100644 --- a/app/src/layouts/tabular/tabular.vue +++ b/app/src/layouts/tabular/tabular.vue @@ -49,8 +49,8 @@ - - + + diff --git a/app/src/modules/activity/routes/collection.vue b/app/src/modules/activity/routes/collection.vue index 88db83f952..295a2b47fd 100644 --- a/app/src/modules/activity/routes/collection.vue +++ b/app/src/modules/activity/routes/collection.vue @@ -31,12 +31,12 @@ - @@ -47,8 +47,8 @@ import ActivityNavigation from '../components/navigation.vue'; import { i18n } from '@/lang'; import usePreset from '@/composables/use-preset'; import marked from 'marked'; -import FilterDrawerDetail from '@/views/private/components/filter-drawer-detail'; -import LayoutDrawerDetail from '@/views/private/components/layout-drawer-detail'; +import FilterSidebarDetail from '@/views/private/components/filter-sidebar-detail'; +import LayoutSidebarDetail from '@/views/private/components/layout-sidebar-detail'; import SearchInput from '@/views/private/components/search-input'; import { nanoid } from 'nanoid'; @@ -58,7 +58,7 @@ type Item = { export default defineComponent({ name: 'activity-collection', - components: { ActivityNavigation, FilterDrawerDetail, LayoutDrawerDetail, SearchInput }, + components: { ActivityNavigation, FilterSidebarDetail, LayoutSidebarDetail, SearchInput }, props: { primaryKey: { type: String, diff --git a/app/src/modules/collections/routes/collection.vue b/app/src/modules/collections/routes/collection.vue index c6eea2e940..5d59d4de16 100644 --- a/app/src/modules/collections/routes/collection.vue +++ b/app/src/modules/collections/routes/collection.vue @@ -203,8 +203,8 @@ -