From 7d9d2f4f00379acff70bb525a3c961d319df40ba Mon Sep 17 00:00:00 2001
From: andrewwallacespeckle <andrew@speckle.systems>
Date: Tue, 7 Oct 2025 23:14:27 +0100
Subject: [PATCH] feat(fe): improved reset isolations/hidden button

---
 .../components/viewer/AnchoredPoints.vue      |  7 ++-
 .../viewer/GlobalIsolationHiddenReset.vue     | 53 +++++++++++++++++++
 .../viewer/GlobalIsolationReset.vue           | 22 --------
 .../viewer/composables/filtering/filtering.ts | 20 +++++++
 4 files changed, 78 insertions(+), 24 deletions(-)
 create mode 100644 packages/frontend-2/components/viewer/GlobalIsolationHiddenReset.vue
 delete mode 100644 packages/frontend-2/components/viewer/GlobalIsolationReset.vue

diff --git a/packages/frontend-2/components/viewer/AnchoredPoints.vue b/packages/frontend-2/components/viewer/AnchoredPoints.vue
index dcffc66cd..36f6c013f 100644
--- a/packages/frontend-2/components/viewer/AnchoredPoints.vue
+++ b/packages/frontend-2/components/viewer/AnchoredPoints.vue
@@ -124,7 +124,9 @@
       :class="showFollowerMessage ? 'top-24' : 'top-14'"
     >
       <ViewerGlobalFilterReset v-if="hasAnyFiltersApplied" />
-      <ViewerGlobalIsolationReset v-else-if="hasAnyIsolationsApplied" />
+      <ViewerGlobalIsolationHiddenReset
+        v-else-if="hasAnyIsolationsApplied || hasAnyHiddenApplied"
+      />
     </div>
   </div>
 </template>
@@ -163,7 +165,8 @@ const { users } = useViewerUserActivityTracking({ anchoredPointsParentEl: parent
 const { isOpenThread, open, closeAllThreads } = useThreadUtilities()
 const {
   filters: { hasAnyFiltersApplied },
-  hasAnyIsolationsApplied
+  hasAnyIsolationsApplied,
+  hasAnyHiddenApplied
 } = useFilterUtilities({ state: viewerState })
 const canPostComment = useCheckViewerCommentingAccess()
 const breakpoints = useBreakpoints(TailwindBreakpoints)
diff --git a/packages/frontend-2/components/viewer/GlobalIsolationHiddenReset.vue b/packages/frontend-2/components/viewer/GlobalIsolationHiddenReset.vue
new file mode 100644
index 000000000..967d8bfa2
--- /dev/null
+++ b/packages/frontend-2/components/viewer/GlobalIsolationHiddenReset.vue
@@ -0,0 +1,53 @@
+<template>
+  <FormButton
+    size="sm"
+    color="outline"
+    class="pointer-events-auto"
+    @click="trackAndReset"
+  >
+    {{ buttonText }}
+  </FormButton>
+</template>
+<script setup lang="ts">
+import { useMixpanel } from '~~/lib/core/composables/mp'
+import { useFilterUtilities } from '~/lib/viewer/composables/filtering/filtering'
+import { useInjectedViewerState } from '~/lib/viewer/composables/setup'
+
+const viewerState = useInjectedViewerState()
+const { resetHiddenAndIsolations, hasAnyIsolationsApplied, hasAnyHiddenApplied } =
+  useFilterUtilities({ state: viewerState })
+
+const buttonText = computed(() => {
+  const hasIsolations = hasAnyIsolationsApplied.value
+  const hasHidden = hasAnyHiddenApplied.value
+
+  if (hasIsolations && hasHidden) {
+    return 'Reset isolations/hidden'
+  } else if (hasIsolations) {
+    return 'Reset isolations'
+  } else if (hasHidden) {
+    return 'Reset hidden'
+  }
+  return 'Reset'
+})
+
+const mp = useMixpanel()
+const trackAndReset = () => {
+  const hasIsolations = hasAnyIsolationsApplied.value
+  const hasHidden = hasAnyHiddenApplied.value
+
+  resetHiddenAndIsolations()
+
+  if (hasIsolations && hasHidden) {
+    mp.track('Viewer Action', {
+      type: 'action',
+      name: 'isolations-hidden',
+      action: 'reset'
+    })
+  } else if (hasIsolations) {
+    mp.track('Viewer Action', { type: 'action', name: 'isolations', action: 'reset' })
+  } else if (hasHidden) {
+    mp.track('Viewer Action', { type: 'action', name: 'hidden', action: 'reset' })
+  }
+}
+</script>
diff --git a/packages/frontend-2/components/viewer/GlobalIsolationReset.vue b/packages/frontend-2/components/viewer/GlobalIsolationReset.vue
deleted file mode 100644
index 78ec93e95..000000000
--- a/packages/frontend-2/components/viewer/GlobalIsolationReset.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-  <FormButton
-    size="sm"
-    color="outline"
-    class="pointer-events-auto"
-    @click="trackAndResetIsolations"
-  >
-    Reset isolations
-  </FormButton>
-</template>
-<script setup lang="ts">
-import { useMixpanel } from '~~/lib/core/composables/mp'
-import { useFilterUtilities } from '~/lib/viewer/composables/filtering/filtering'
-
-const { resetIsolations } = useFilterUtilities()
-
-const mp = useMixpanel()
-const trackAndResetIsolations = () => {
-  resetIsolations()
-  mp.track('Viewer Action', { type: 'action', name: 'isolations', action: 'reset' })
-}
-</script>
diff --git a/packages/frontend-2/lib/viewer/composables/filtering/filtering.ts b/packages/frontend-2/lib/viewer/composables/filtering/filtering.ts
index 83adab352..879d45b83 100644
--- a/packages/frontend-2/lib/viewer/composables/filtering/filtering.ts
+++ b/packages/frontend-2/lib/viewer/composables/filtering/filtering.ts
@@ -86,6 +86,13 @@ export function useFilterUtilities(
     filters.isolatedObjectIds.value = []
   }
 
+  const resetHiddenAndIsolations = () => {
+    clearHighlightedObjects()
+    clearSelection()
+    filters.isolatedObjectIds.value = []
+    filters.hiddenObjectIds.value = []
+  }
+
   const hasAnyIsolationsApplied = computed(() => {
     return filters.isolatedObjectIds.value.length > 0
   })
@@ -111,6 +118,16 @@ export function useFilterUtilities(
     filters.hiddenObjectIds.value = difference(filters.hiddenObjectIds.value, objectIds)
   }
 
+  const resetHidden = () => {
+    clearHighlightedObjects()
+    clearSelection()
+    filters.hiddenObjectIds.value = []
+  }
+
+  const hasAnyHiddenApplied = computed(() => {
+    return filters.hiddenObjectIds.value.length > 0
+  })
+
   /**
    * Gets ALL values for a property using pre-computed data (used for filtering logic)
    */
@@ -928,9 +945,12 @@ export function useFilterUtilities(
     isolateObjects,
     unIsolateObjects,
     resetIsolations,
+    resetHiddenAndIsolations,
     hideObjects,
     showObjects,
+    resetHidden,
     hasAnyIsolationsApplied,
+    hasAnyHiddenApplied,
     filters,
     addActiveFilter,
     updateFilterProperty,