From 92b6d2e6d5c82144f52561078af8499442ffa131 Mon Sep 17 00:00:00 2001
From: Charles Driesler <chuck@speckle.systems>
Date: Wed, 4 Sep 2024 22:00:49 +0100
Subject: [PATCH 1/2] fix(workspaces): dismissable join banners

---
 packages/frontend-2/components/invite/Banner.vue   |  6 ++++--
 .../components/workspace/invite/Banners.vue        | 14 +++++++++++++-
 .../invite/DiscoverableWorkspaceBanner.vue         | 10 +++++++++-
 .../frontend-2/lib/common/helpers/constants.ts     |  3 ++-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/packages/frontend-2/components/invite/Banner.vue b/packages/frontend-2/components/invite/Banner.vue
index 2ca75aa349..49b788d8a8 100644
--- a/packages/frontend-2/components/invite/Banner.vue
+++ b/packages/frontend-2/components/invite/Banner.vue
@@ -22,7 +22,7 @@
           :disabled="loading"
           @click="onDeclineClick(token)"
         >
-          Decline
+          {{ declineMessage }}
         </FormButton>
         <FormButton
           :full-width="block"
@@ -33,7 +33,7 @@
           :disabled="loading"
           @click="onAcceptClick(token)"
         >
-          Accept
+          {{ acceptMessage }}
         </FormButton>
       </div>
       <template v-else>
@@ -127,6 +127,8 @@ const mainInfoBlockClasses = computed(() => {
 const avatarSize = computed(() => (props.block ? 'xxl' : 'base'))
 const buttonSize = computed(() => (props.block ? 'lg' : 'sm'))
 const isForRegisteredUser = computed(() => !!props.invite.user?.id)
+const acceptMessage = computed(() => (props.invite.workspace ? 'Join' : 'Accept'))
+const declineMessage = computed(() => (props.invite.workspace ? 'Dismiss' : 'Decline'))
 
 const onLoginSignupClick = async () => {
   postAuthRedirect.setCurrentRoute()
diff --git a/packages/frontend-2/components/workspace/invite/Banners.vue b/packages/frontend-2/components/workspace/invite/Banners.vue
index 36408de98d..62a2a047df 100644
--- a/packages/frontend-2/components/workspace/invite/Banners.vue
+++ b/packages/frontend-2/components/workspace/invite/Banners.vue
@@ -13,6 +13,8 @@
   </div>
 </template>
 <script setup lang="ts">
+import { useSynchronizedCookie } from '~/lib/common/composables/reactiveCookie'
+import { CookieKeys } from '~/lib/common/helpers/constants'
 import { graphql } from '~~/lib/common/generated/gql'
 import type { WorkspaceInviteBanners_UserFragment } from '~~/lib/common/generated/gql/graphql'
 
@@ -35,8 +37,18 @@ const props = defineProps<{
   invites: WorkspaceInviteBanners_UserFragment
 }>()
 
+const dismissedDiscoverableWorkspaces = useSynchronizedCookie<string[]>(
+  CookieKeys.DismissedDiscoverableWorkspaces,
+  {
+    default: () => []
+  }
+)
+
 const invites = computed(() => props.invites.workspaceInvites || [])
 const discoverableWorkspaces = computed(
-  () => props.invites.discoverableWorkspaces || []
+  () =>
+    props.invites.discoverableWorkspaces?.filter(
+      (workspace) => !dismissedDiscoverableWorkspaces.value.includes(workspace.id)
+    ) || []
 )
 </script>
diff --git a/packages/frontend-2/components/workspace/invite/DiscoverableWorkspaceBanner.vue b/packages/frontend-2/components/workspace/invite/DiscoverableWorkspaceBanner.vue
index d5780f7eb1..aa9e778a96 100644
--- a/packages/frontend-2/components/workspace/invite/DiscoverableWorkspaceBanner.vue
+++ b/packages/frontend-2/components/workspace/invite/DiscoverableWorkspaceBanner.vue
@@ -10,11 +10,13 @@
 
 <script setup lang="ts">
 import { useApolloClient } from '@vue/apollo-composable'
+import { useSynchronizedCookie } from '~/lib/common/composables/reactiveCookie'
 import { graphql } from '~/lib/common/generated/gql'
 import {
   DashboardJoinWorkspaceDocument,
   type WorkspaceInviteDiscoverableWorkspaceBanner_DiscoverableWorkspaceFragment
 } from '~/lib/common/generated/gql/graphql'
+import { CookieKeys } from '~/lib/common/helpers/constants'
 import { getCacheId, getFirstErrorMessage } from '~/lib/common/helpers/graphql'
 
 graphql(`
@@ -45,6 +47,12 @@ const props = defineProps<{
 const { client: apollo } = useApolloClient()
 const { triggerNotification } = useGlobalToast()
 const router = useRouter()
+const isDismissed = useSynchronizedCookie<string[]>(
+  CookieKeys.DismissedDiscoverableWorkspaces,
+  {
+    default: () => []
+  }
+)
 
 const invite = computed(() => ({
   workspace: {
@@ -56,7 +64,7 @@ const invite = computed(() => ({
 
 const processJoin = async (accept: boolean) => {
   if (!accept) {
-    // TODO: Use cookies to enable dismissing the discoverable workspace invite
+    isDismissed.value = [...isDismissed.value]
     return
   }
 
diff --git a/packages/frontend-2/lib/common/helpers/constants.ts b/packages/frontend-2/lib/common/helpers/constants.ts
index 67bba27370..e12c7edca2 100644
--- a/packages/frontend-2/lib/common/helpers/constants.ts
+++ b/packages/frontend-2/lib/common/helpers/constants.ts
@@ -4,7 +4,8 @@
 export enum CookieKeys {
   AuthToken = 'authn',
   Theme = 'theme',
-  PostAuthRedirect = 'postAuthRedirect'
+  PostAuthRedirect = 'postAuthRedirect',
+  DismissedDiscoverableWorkspaces = 'dismissedDiscoverableWorkspaces'
 }
 
 /**

From 96f47558fa27f9af94b3a4eb61aaf2b2d795c459 Mon Sep 17 00:00:00 2001
From: Chuck Driesler <chuck@speckle.systems>
Date: Thu, 5 Sep 2024 15:43:36 +0100
Subject: [PATCH 2/2] fix(workspaces): correctly update cookie

---
 packages/frontend-2/components/invite/Banner.vue       |  1 -
 .../workspace/invite/DiscoverableWorkspaceBanner.vue   | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/frontend-2/components/invite/Banner.vue b/packages/frontend-2/components/invite/Banner.vue
index aa9ad80c90..8d397c070b 100644
--- a/packages/frontend-2/components/invite/Banner.vue
+++ b/packages/frontend-2/components/invite/Banner.vue
@@ -14,7 +14,6 @@
     <div class="flex space-x-2 w-full sm:w-auto shrink-0">
       <div v-if="isLoggedIn" class="flex items-center justify-end w-full space-x-2">
         <FormButton
-          v-if="!invite.workspace"
           :size="buttonSize"
           color="subtle"
           text
diff --git a/packages/frontend-2/components/workspace/invite/DiscoverableWorkspaceBanner.vue b/packages/frontend-2/components/workspace/invite/DiscoverableWorkspaceBanner.vue
index aa9e778a96..3e93338b8f 100644
--- a/packages/frontend-2/components/workspace/invite/DiscoverableWorkspaceBanner.vue
+++ b/packages/frontend-2/components/workspace/invite/DiscoverableWorkspaceBanner.vue
@@ -47,7 +47,7 @@ const props = defineProps<{
 const { client: apollo } = useApolloClient()
 const { triggerNotification } = useGlobalToast()
 const router = useRouter()
-const isDismissed = useSynchronizedCookie<string[]>(
+const dismissedDiscoverableWorkspaces = useSynchronizedCookie<string[]>(
   CookieKeys.DismissedDiscoverableWorkspaces,
   {
     default: () => []
@@ -64,7 +64,13 @@ const invite = computed(() => ({
 
 const processJoin = async (accept: boolean) => {
   if (!accept) {
-    isDismissed.value = [...isDismissed.value]
+    dismissedDiscoverableWorkspaces.value = [
+      ...dismissedDiscoverableWorkspaces.value,
+      props.workspace.id
+    ]
+    apollo.cache.evict({
+      id: getCacheId('DiscoverableWorkspace', props.workspace.id)
+    })
     return
   }