From e46facf79f23f52a5cc2f892bbf9c47e8fbc0012 Mon Sep 17 00:00:00 2001
From: Mike Tasset <mike.tasset@gmail.com>
Date: Wed, 30 Jul 2025 14:55:04 +0200
Subject: [PATCH] Fix: Update discussion settings

---
 .../viewer/anchored-point/Thread.vue          | 83 +++++++++++++------
 .../components/viewer/comments/Panel.vue      |  1 -
 2 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/packages/frontend-2/components/viewer/anchored-point/Thread.vue b/packages/frontend-2/components/viewer/anchored-point/Thread.vue
index a004f1634..6cf193e72 100644
--- a/packages/frontend-2/components/viewer/anchored-point/Thread.vue
+++ b/packages/frontend-2/components/viewer/anchored-point/Thread.vue
@@ -63,26 +63,26 @@
                   @click="emit('next', modelValue)"
                 />
               </div>
-              <FormButton
-                v-show="isDragged"
-                v-tippy="'Pop in'"
-                :icon-left="ArrowTopRightOnSquareIcon"
-                hide-text
-                class="rotate-180"
-                color="subtle"
-                size="sm"
-                @click="isDragged = false"
-              />
             </div>
             <div class="flex gap-x-0.5">
-              <FormButton
-                v-tippy="'Copy link'"
-                :icon-left="LinkIcon"
-                hide-text
-                color="subtle"
-                size="sm"
-                @click="onCopyLink"
-              />
+              <div class="cursor-pointer">
+                <LayoutMenu
+                  v-model:open="showMenu"
+                  :menu-id="menuId"
+                  :items="actionsItems"
+                  mount-menu-on-body
+                  @click.stop.prevent
+                  @chosen="onActionChosen"
+                >
+                  <FormButton
+                    hide-text
+                    size="sm"
+                    color="subtle"
+                    :icon-left="iconThreeDots"
+                    @click="showMenu = !showMenu"
+                  />
+                </LayoutMenu>
+              </div>
               <FormButton
                 v-tippy="modelValue.archived ? 'Unresolve' : 'Resolve'"
                 :icon-left="IconCircleCheck"
@@ -172,10 +172,8 @@
 </template>
 <script setup lang="ts">
 import {
-  LinkIcon,
   ChevronLeftIcon,
   ChevronRightIcon,
-  ArrowTopRightOnSquareIcon,
   ArrowLeftIcon,
   ArrowUpRightIcon
 } from '@heroicons/vue/24/outline'
@@ -202,6 +200,12 @@ import { useThreadUtilities } from '~~/lib/viewer/composables/ui'
 import { useEmbed } from '~/lib/viewer/composables/setup/embed'
 import { graphql } from '~/lib/common/generated/gql'
 import type { ConcreteComponent } from 'vue'
+import type { LayoutMenuItem } from '~~/lib/layout/helpers/components'
+
+enum ActionTypes {
+  CopyLink = 'copy-link',
+  PopIn = 'pop-in'
+}
 
 graphql(`
   fragment ViewerCommentThreadData on Comment {
@@ -235,7 +239,6 @@ const { copy } = useClipboard()
 const { isLoggedIn } = useActiveUser()
 const archiveComment = useArchiveComment()
 const { triggerNotification } = useGlobalToast()
-
 const { projectId } = useInjectedViewerState()
 const canReply = useCheckViewerCommentingAccess()
 const { disableTextSelection } = useDisableGlobalTextSelection()
@@ -246,10 +249,13 @@ const { threadResourceStatus, hasClickedFullContext, goBack, handleContextClick
   useCommentContext()
 const { isOpenThread, open, closeAllThreads } = useThreadUtilities()
 const router = useRouter()
+const menuId = useId()
 
+const showMenu = ref(false)
 const commentsContainer = ref(null as Nullable<HTMLElement>)
 const threadContainer = ref(null as Nullable<HTMLElement>)
 const threadActivator = ref(null as Nullable<HTMLElement>)
+const iconThreeDots = resolveComponent('IconThreeDots') as ConcreteComponent
 
 onClickOutside(threadContainer, (event) => {
   const viewerElement = document.getElementById('viewer')
@@ -382,6 +388,37 @@ const threadAuthors = computed(() => {
   return authors
 })
 
+const actionsItems = computed<LayoutMenuItem[][]>(() => [
+  [
+    {
+      title: 'Copy link',
+      id: ActionTypes.CopyLink
+    },
+    {
+      title: 'Pop in',
+      id: ActionTypes.PopIn,
+      disabled: !isDragged.value
+    }
+  ]
+])
+
+const canArchiveOrUnarchive = computed(
+  () => props.modelValue.permissions.canArchive.authorized
+)
+
+const onActionChosen = (params: { item: LayoutMenuItem; event: MouseEvent }) => {
+  const { item } = params
+
+  switch (item.id) {
+    case ActionTypes.CopyLink:
+      onCopyLink()
+      break
+    case ActionTypes.PopIn:
+      isDragged.value = false
+      break
+  }
+}
+
 const changeExpanded = async (newVal: boolean) => {
   if (newVal) {
     await open(props.modelValue.id)
@@ -398,10 +435,6 @@ const changeExpanded = async (newVal: boolean) => {
   })
 }
 
-const canArchiveOrUnarchive = computed(
-  () => props.modelValue.permissions.canArchive.authorized
-)
-
 const toggleCommentResolvedStatus = async () => {
   // Remove thread ID from URL when resolving
   if (!props.modelValue.archived) {
diff --git a/packages/frontend-2/components/viewer/comments/Panel.vue b/packages/frontend-2/components/viewer/comments/Panel.vue
index 0577c8c80..30e538970 100644
--- a/packages/frontend-2/components/viewer/comments/Panel.vue
+++ b/packages/frontend-2/components/viewer/comments/Panel.vue
@@ -17,7 +17,6 @@
           @chosen="onActionChosen"
         >
           <FormButton
-            ref="settingsButtonRef"
             hide-text
             size="sm"
             color="subtle"