Feat: Only show workspaces menu item when no workspaces (#3540)

specklesystems · Nov 21, 2024 · b0ff431 · b0ff431
1 parent a37a7fc
commit b0ff431
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/packages/frontend-2/components/dashboard/Sidebar.vue b/packages/frontend-2/components/dashboard/Sidebar.vue
@@ -63,9 +63,9 @@
             >
               <NuxtLink :to="workspacesRoute" @click="handleIntroducingWorkspacesClick">
                 <LayoutSidebarMenuGroupItem
+                  v-if="!hasWorkspaces || route.path === workspacesRoute"
                   label="Introducing workspaces"
                   :active="isActive(workspacesRoute)"
-                  tag="BETA"
                 >
                   <template #icon>
                     <IconWorkspaces class="size-4 text-foreground-2" />
@@ -221,7 +221,6 @@ const isActive = (...routes: string[]): boolean => {
 const isNotGuest = computed(
   () => Roles.Server.Admin || user.value?.role === Roles.Server.User
 )
-
 const workspacesItems = computed(() =>
   workspaceResult.value?.activeUser
     ? workspaceResult.value.activeUser.workspaces.items.map((workspace) => ({
@@ -236,6 +235,7 @@ const workspacesItems = computed(() =>
       }))
     : []
 )
+const hasWorkspaces = computed(() => workspacesItems.value.length > 0)
 
 onWorkspaceResult((result) => {
   if (result.data?.activeUser) {

diff --git a/packages/frontend-2/components/settings/Dialog.vue b/packages/frontend-2/components/settings/Dialog.vue
@@ -79,7 +79,6 @@
                   "
                   :tooltip-text="workspaceMenuItem.tooltipText"
                   :disabled="workspaceMenuItem.disabled"
-                  :tag="workspaceMenuItem.disabled ? 'Coming soon' : undefined"
                   extra-padding
                   @click="
                     onWorkspaceMenuItemClick(

diff --git a/packages/frontend-2/components/workspaces/Promo/Banner.vue b/packages/frontend-2/components/workspaces/Promo/Banner.vue
@@ -25,7 +25,6 @@
     <div class="relative z-10 text-foreground max-w-sm lg:max-w-md xl:max-w-lg">
       <div class="flex gap-2 items-center">
         <h3 class="text-heading-lg">Introducing workspaces</h3>
-        <CommonBadge rounded class="">BETA</CommonBadge>
       </div>
       <p class="text-body-sm mt-4">
         You are one click away from reaching higher data security, more data control,

diff --git a/packages/frontend-2/components/workspaces/Promo/Page.vue b/packages/frontend-2/components/workspaces/Promo/Page.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="flex flex-col gap-12">
     <WorkspacesPromoBanner @create="openWorkspaceCreateDialog" />
-
     <section>
       <div class="flex justify-between mb-2">
         <h4 class="text-foreground-2 text-heading-sm">In a nutshell</h4>
@@ -29,7 +28,6 @@
 
         <CommonCard
           title="SSO"
-          badge="Coming soon"
           description="Ensure compliance and security with workspace based SSO."
         >
           <template #icon>
@@ -39,7 +37,6 @@
 
         <CommonCard
           title="Data residency"
-          badge="Coming soon"
           description="Store your workspace projects in the geographical region of your choice."
         >
           <template #icon>