From 77d760c07f9e97c3788737dfd59243cae4186751 Mon Sep 17 00:00:00 2001 From: andrewwallacespeckle <139135120+andrewwallacespeckle@users.noreply.github.com> Date: Fri, 15 Dec 2023 13:23:15 +0000 Subject: [PATCH] FE2 UI minor improvements (#1905) * FE2 Fixes. WIP Description * Reorder Options. Fix cookie expiry * added ability to edit model description in backend * Add Description to "Add Model" WIP * Update Radio component so icons are part of label * Fix to disable measure mode when user navigates to another control * Add Description WIP * Fix description returning null * Add Header to versions page * Checks for PR * Fix build error * Changes from CR * Use ProjectPageProjectHeaderFragment * Remove description from handleSubmit --------- Co-authored-by: Kristaps Fabians Geikins --- .../components/project/CardImportFileArea.vue | 3 +- .../project/model-page/Versions.vue | 4 +- .../model-page/versions/CardActions.vue | 47 +++++++++------ .../project/page/models/Actions.vue | 40 ++++++++----- .../components/project/page/models/Card.vue | 1 - .../project/page/models/NewDialog.vue | 21 +++++-- .../page/models/NewModelStructureItem.vue | 3 +- .../card/{RenameDialog.vue => EditDialog.vue} | 30 +++++++--- .../frontend-2/components/viewer/Controls.vue | 29 +++++----- .../lib/common/generated/gql/gql.ts | 13 +++-- .../lib/common/generated/gql/graphql.ts | 57 ++++++++++--------- .../projects/composables/modelManagement.ts | 5 +- .../core/typedefs/modelsAndVersions.graphql | 4 +- .../modules/core/graph/generated/graphql.ts | 4 +- .../core/services/branch/management.ts | 8 +-- .../graph/generated/graphql.ts | 4 +- .../server/test/graphql/generated/graphql.ts | 4 +- .../src/components/form/Radio.vue | 20 +++---- .../src/components/layout/GridListToggle.vue | 30 +++++++--- .../src/components/layout/Menu.stories.ts | 8 ++- .../src/components/layout/Menu.vue | 30 +++++++--- .../src/helpers/layout/components.ts | 4 ++ 22 files changed, 240 insertions(+), 129 deletions(-) rename packages/frontend-2/components/project/page/models/card/{RenameDialog.vue => EditDialog.vue} (72%) diff --git a/packages/frontend-2/components/project/CardImportFileArea.vue b/packages/frontend-2/components/project/CardImportFileArea.vue index 4dec94c8d..f3dd08d11 100644 --- a/packages/frontend-2/components/project/CardImportFileArea.vue +++ b/packages/frontend-2/components/project/CardImportFileArea.vue @@ -40,7 +40,8 @@ Use our connectors to publish a {{ modelName ? '' : 'new model' }} version to - {{ modelName || 'this project' }}, or drag and drop a IFC/OBJ/STL file here. + {{ modelName ? 'this model' : 'this project' }}, or drag and drop a IFC/OBJ/STL + file here. diff --git a/packages/frontend-2/components/project/model-page/Versions.vue b/packages/frontend-2/components/project/model-page/Versions.vue index 174171b9b..c071bf0ad 100644 --- a/packages/frontend-2/components/project/model-page/Versions.vue +++ b/packages/frontend-2/components/project/model-page/Versions.vue @@ -1,5 +1,6 @@