diff --git a/.circleci/config.yml b/.circleci/config.yml index 548b7b6c8..d08f707f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -996,7 +996,7 @@ jobs: - run: echo "export KUBECONFIG=$(pwd)/.kube/config" >> "${BASH_ENV}" - run: echo "${KUBECONFIG}" - run: - name: Template Helm Chart + name: Template Speckle Server Helm Chart command: | nix-shell \ --run "helm template speckle-server ./utils/helm/speckle-server" \ diff --git a/packages/frontend-2/components/projects/AddDialog.vue b/packages/frontend-2/components/projects/AddDialog.vue index 232e0b7c2..7711d85fd 100644 --- a/packages/frontend-2/components/projects/AddDialog.vue +++ b/packages/frontend-2/components/projects/AddDialog.vue @@ -27,39 +27,8 @@
Workspace
-- Workspaces offer better project management and higher data security. -
-- You're not a member of any workspaces. -
-+ You're not a member of any workspaces. +
+
- Move
- {{ project.name }}
- to
-
- {{ selectedWorkspace?.name }}
+
+ Move
+ {{ project.name }}
+ to
+
+ {{ selectedWorkspace?.name ?? workspace?.name }}
+
+
+ {{ project.modelCount.totalCount }} {{ modelText }},
+ {{ project.versions.totalCount }} {{ versionsText }}
+
+ The project, including models and versions, will be moved to the
+ workspace, where all existing members and admins will have access.
+
+ The project's collaborators will become workspace members and keep their
+ project roles.
- {{ project.modelCount.totalCount }} {{ modelText }},
- {{ project.versions.totalCount }} {{ versionsText }}
-
- The project, including models and versions, will be moved to the workspace,
- where all existing members and admins will have access.
-
- The project's collaborators will become workspace members and keep their
- project roles.
-
-
- This user can only have the guest role due to the workspace policy. -
-- {{ message }} -
-
- Your workspace is currently billed for {{ memberSeatText
- }}{{ hasGuestSeats ? ` and ${guestSeatText}` : '' }}.
-
- Changing a user's role may add a seat to your current billing cycle.
-
- Unused seats will be adjusted at the start of your next billing cycle:
-
- {{ nextBillingCycleEnd }}
-