From a37b3389d69c0c17008e25196ec7ad6b6bc4fdd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Steinhagen?= <steinhagen.bjoern@gmail.com>
Date: Wed, 25 Feb 2026 10:23:19 +0200
Subject: [PATCH 1/3] fix(dui): prevents empty publish selection state

---
 components/model/Sender.vue | 29 ++++++++++++++++++++++-------
 components/send/Wizard.vue  | 20 +++++++++++++++++---
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/components/model/Sender.vue b/components/model/Sender.vue
index 9f5c0f3..0210e84 100644
--- a/components/model/Sender.vue
+++ b/components/model/Sender.vue
@@ -32,13 +32,18 @@
       <FilterListSelect :filter="modelCard.sendFilter" @update:filter="updateFilter" />
 
       <div class="mt-4 flex justify-end items-center space-x-2">
-        <FormButton size="sm" color="outline" @click.stop="saveFilter()">
+        <FormButton
+          size="sm"
+          color="outline"
+          :disabled="isSaveDisabled"
+          @click.stop="saveFilter()"
+        >
           Save
         </FormButton>
         <div v-tippy="!canCreateVersionPerm ? canCreateVersionMessage : ''">
           <FormButton
             size="sm"
-            :disabled="!canCreateVersionPerm"
+            :disabled="!canCreateVersionPerm || isSaveDisabled"
             @click.stop="saveFilterAndSend()"
           >
             Save & Publish
@@ -206,22 +211,32 @@ const sendOrCancel = () => {
   hasSetVersionMessage.value = false
 }
 
-let newFilter: ISendFilter
+const newFilter = ref<ISendFilter>()
+
 const updateFilter = (filter: ISendFilter) => {
-  newFilter = filter
+  newFilter.value = filter
 }
 
+const isSaveDisabled = computed(() => {
+  const f = newFilter.value || props.modelCard.sendFilter
+  return (
+    f?.name === 'Selection' &&
+    (!f.selectedObjectIds || f.selectedObjectIds.length === 0)
+  )
+})
+
 const saveFilter = async () => {
+  if (!newFilter.value) return
   void trackEvent('DUI3 Action', {
     name: 'Publish Card Filter Change',
-    filter: newFilter.typeDiscriminator
+    filter: newFilter.value.typeDiscriminator
   })
 
   // do not reset idmap while creating a new one because it is managed by host app
-  newFilter.idMap = props.modelCard.sendFilter?.idMap
+  newFilter.value.idMap = props.modelCard.sendFilter?.idMap
 
   await store.patchModel(props.modelCard.modelCardId, {
-    sendFilter: newFilter,
+    sendFilter: newFilter.value,
     expired: true
   })
   openFilterDialog.value = false
diff --git a/components/send/Wizard.vue b/components/send/Wizard.vue
index 646b049..c177fdc 100644
--- a/components/send/Wizard.vue
+++ b/components/send/Wizard.vue
@@ -48,7 +48,7 @@
       >
         <FormButton
           full-width
-          :disabled="!canPublish || isLoadingPermissions"
+          :disabled="isPublishDisabled"
           :loading="isLoadingPermissions"
           @click="addModel"
         >
@@ -62,6 +62,7 @@
   </CommonDialog>
 </template>
 <script setup lang="ts">
+import { computed, ref, watch } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useSubscription } from '@vue/apollo-composable'
 import type {
@@ -72,6 +73,7 @@ import type { ISendFilter } from '~/lib/models/card/send'
 import { SenderModelCard } from '~/lib/models/card/send'
 import { useHostAppStore } from '~/store/hostApp'
 import { useAccountStore } from '~/store/accounts'
+import { useSelectionStore } from '~/store/selection'
 import { useMixpanel } from '~/lib/core/composables/mixpanel'
 import { useSettingsTracking } from '~/lib/core/composables/trackSettings'
 import type { CardSetting } from '~/lib/models/card/setting'
@@ -103,6 +105,19 @@ const { canCreateModelIngestion, canCreateVersion } = useCheckGraphql()
 const canPublish = ref(false)
 const publishLimitMessage = ref<string | undefined>(undefined)
 const isLoadingPermissions = ref(false)
+const hostAppStore = useHostAppStore()
+const selectionStore = useSelectionStore()
+
+const isSelectionEmpty = computed(() => {
+  return (
+    filter.value?.name === 'Selection' &&
+    (!selectionStore.selectionInfo.selectedObjectIds ||
+      selectionStore.selectionInfo.selectedObjectIds.length === 0)
+  )
+})
+const isPublishDisabled = computed(() => {
+  return !canPublish.value || isLoadingPermissions.value || isSelectionEmpty.value
+})
 
 const updateSearchText = (text: string | undefined) => {
   urlParseError.value = undefined
@@ -119,6 +134,7 @@ watch(urlParsedData, (newVal) => {
 watch(showSendDialog, (newVal) => {
   if (newVal) {
     urlParseError.value = undefined
+    void selectionStore.refreshSelectionFromHostApp()
   }
 })
 
@@ -204,8 +220,6 @@ const selectModel = (model: ModelListModelItemFragment) => {
   void trackEvent('DUI3 Action', { name: 'Publish Wizard', step: 'model selected' })
 }
 
-const hostAppStore = useHostAppStore()
-
 // accountId, serverUrl, projectId, modelId, sendFilter, settings
 const addModel = async () => {
   void trackEvent('DUI3 Action', {

From 35ddce1f908417c332c6f77d5096f27ffbdb991c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Steinhagen?= <steinhagen.bjoern@gmail.com>
Date: Wed, 25 Feb 2026 11:01:30 +0200
Subject: [PATCH 2/3] fix(dui): prevents invalidate selection filter across not
 just selection

---
 components/model/Sender.vue | 11 +++-------
 components/send/Wizard.vue  | 22 +++++++++----------
 store/hostApp.ts            | 44 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/components/model/Sender.vue b/components/model/Sender.vue
index 0210e84..6c39dab 100644
--- a/components/model/Sender.vue
+++ b/components/model/Sender.vue
@@ -119,7 +119,7 @@
   </ModelCardBase>
 </template>
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, computed } from 'vue'
 import ModelCardBase from '~/components/model/CardBase.vue'
 import { Square3Stack3DIcon } from '@heroicons/vue/20/solid'
 import type { ModelCardNotification } from '~/lib/models/card/notification'
@@ -212,21 +212,16 @@ const sendOrCancel = () => {
 }
 
 const newFilter = ref<ISendFilter>()
-
 const updateFilter = (filter: ISendFilter) => {
   newFilter.value = filter
 }
 
 const isSaveDisabled = computed(() => {
-  const f = newFilter.value || props.modelCard.sendFilter
-  return (
-    f?.name === 'Selection' &&
-    (!f.selectedObjectIds || f.selectedObjectIds.length === 0)
-  )
+  return !store.validateSendFilter(newFilter.value || props.modelCard.sendFilter).valid
 })
 
 const saveFilter = async () => {
-  if (!newFilter.value) return
+  if (!newFilter.value) return // Safety check
   void trackEvent('DUI3 Action', {
     name: 'Publish Card Filter Change',
     filter: newFilter.value.typeDiscriminator
diff --git a/components/send/Wizard.vue b/components/send/Wizard.vue
index c177fdc..ad07354 100644
--- a/components/send/Wizard.vue
+++ b/components/send/Wizard.vue
@@ -42,10 +42,7 @@
           }
         "
       />
-      <div
-        v-tippy="!canPublish && !isLoadingPermissions ? publishLimitMessage : ''"
-        class="mt-2"
-      >
+      <div v-tippy="publishTooltipMessage" class="mt-2">
         <FormButton
           full-width
           :disabled="isPublishDisabled"
@@ -62,7 +59,6 @@
   </CommonDialog>
 </template>
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useSubscription } from '@vue/apollo-composable'
 import type {
@@ -108,15 +104,19 @@ const isLoadingPermissions = ref(false)
 const hostAppStore = useHostAppStore()
 const selectionStore = useSelectionStore()
 
-const isSelectionEmpty = computed(() => {
+const publishValidation = computed(() => hostAppStore.validateSendFilter(filter.value))
+
+const isPublishDisabled = computed(() => {
   return (
-    filter.value?.name === 'Selection' &&
-    (!selectionStore.selectionInfo.selectedObjectIds ||
-      selectionStore.selectionInfo.selectedObjectIds.length === 0)
+    !canPublish.value || isLoadingPermissions.value || !publishValidation.value.valid
   )
 })
-const isPublishDisabled = computed(() => {
-  return !canPublish.value || isLoadingPermissions.value || isSelectionEmpty.value
+
+const publishTooltipMessage = computed(() => {
+  if (!publishValidation.value.valid) return publishValidation.value.reason
+  if (!canPublish.value && !isLoadingPermissions.value)
+    return publishLimitMessage.value || ''
+  return ''
 })
 
 const updateSearchText = (text: string | undefined) => {
diff --git a/store/hostApp.ts b/store/hostApp.ts
index 32677cc..6618446 100644
--- a/store/hostApp.ts
+++ b/store/hostApp.ts
@@ -11,6 +11,7 @@ import type {
   ISendFilterSelectItem,
   ISenderModelCard,
   RevitViewsSendFilter,
+  RevitCategoriesSendFilter,
   SendFilterSelect
 } from '~/lib/models/card/send'
 import type { ToastNotification } from '@speckle/ui-components'
@@ -22,6 +23,7 @@ import { defineStore } from 'pinia'
 import type { CardSetting } from '~/lib/models/card/setting'
 import type { DUIAccount } from '~/store/accounts'
 import { useAccountStore } from '~/store/accounts'
+import { useSelectionStore } from '~/store/selection'
 import {
   useUpdateConnector,
   type Version
@@ -366,6 +368,45 @@ export const useHostAppStore = defineStore('hostAppStore', () => {
    */
   app.$sendBinding?.on('refreshSendFilters', () => void refreshSendFilters())
 
+  const validateSendFilter = (
+    filter?: ISendFilter
+  ): { valid: boolean; reason?: string } => {
+    if (!filter) return { valid: false, reason: 'No filter selected' }
+
+    if (filter.name === 'Selection' || filter.id === 'selection') {
+      const selectionStore = useSelectionStore()
+      if (
+        !selectionStore.selectionInfo.selectedObjectIds ||
+        selectionStore.selectionInfo.selectedObjectIds.length === 0
+      ) {
+        return { valid: false, reason: 'No objects selected to publish' }
+      }
+    }
+
+    if (filter.type === 'Select' || filter.id === 'navisworksSavedSets') {
+      const f = filter as SendFilterSelect
+      if (!f.selectedItems || f.selectedItems.length === 0) {
+        return { valid: false, reason: 'No items selected to publish' }
+      }
+    }
+
+    if (filter.id === 'revitCategories' || filter.id === 'archicadLayers') {
+      const f = filter as RevitCategoriesSendFilter
+      if (!f.selectedCategories || f.selectedCategories.length === 0) {
+        return { valid: false, reason: 'No categories selected to publish' }
+      }
+    }
+
+    if (filter.id === 'revitViews') {
+      const f = filter as RevitViewsSendFilter
+      if (!f.selectedView || f.selectedView.trim() === '') {
+        return { valid: false, reason: 'No view selected to publish' }
+      }
+    }
+
+    return { valid: true }
+  }
+
   /**
    * Send functionality
    */
@@ -924,6 +965,7 @@ export const useHostAppStore = defineStore('hostAppStore', () => {
     getSendSettings,
     setModelSendResult,
     setModelReceiveResult,
-    handleModelProgressEvents
+    handleModelProgressEvents,
+    validateSendFilter
   }
 })

From 6fc3df4a0d1fdaae5f0319e9af48d656be9c5edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Steinhagen?=
 <88777268+bjoernsteinhagen@users.noreply.github.com>
Date: Mon, 2 Mar 2026 15:34:36 +0200
Subject: [PATCH 3/3] refactor: centralized filter validation and generalized
 'empty selection' checks

---
 components/model/Sender.vue |  3 +-
 lib/validation.ts           | 57 +++++++++++++++++++++++++++++++++++++
 store/hostApp.ts            | 45 +++++------------------------
 3 files changed, 66 insertions(+), 39 deletions(-)

diff --git a/components/model/Sender.vue b/components/model/Sender.vue
index 6c39dab..aecf82a 100644
--- a/components/model/Sender.vue
+++ b/components/model/Sender.vue
@@ -217,7 +217,8 @@ const updateFilter = (filter: ISendFilter) => {
 }
 
 const isSaveDisabled = computed(() => {
-  return !store.validateSendFilter(newFilter.value || props.modelCard.sendFilter).valid
+  const filterToCheck = newFilter.value || props.modelCard.sendFilter
+  return !store.validateSendFilter(filterToCheck).valid
 })
 
 const saveFilter = async () => {
diff --git a/lib/validation.ts b/lib/validation.ts
index 491b4d4..ebd419a 100644
--- a/lib/validation.ts
+++ b/lib/validation.ts
@@ -1,6 +1,24 @@
+import { computed } from 'vue'
+import type {
+  ISendFilter,
+  SendFilterSelect,
+  RevitCategoriesSendFilter,
+  RevitViewsSendFilter
+} from '~/lib/models/card/send'
 import { ValidationHelpers } from '@speckle/ui-components'
 import type { GenericValidateFunction } from 'vee-validate'
 
+export const isSelectFilter = (f: ISendFilter): f is SendFilterSelect =>
+  f.type === 'Select' || 'selectedItems' in f
+
+export const isRevitCategoriesFilter = (
+  f: ISendFilter
+): f is RevitCategoriesSendFilter =>
+  f.id === 'revitCategories' || f.id === 'archicadLayers'
+
+export const isRevitViewsFilter = (f: ISendFilter): f is RevitViewsSendFilter =>
+  f.id === 'revitViews'
+
 export const isEmail = ValidationHelpers.isEmail
 
 export const isOneOrMultipleEmails = ValidationHelpers.isOneOrMultipleEmails
@@ -42,3 +60,42 @@ export function useModelNameValidationRules() {
     isValidModelName
   ])
 }
+
+export type FilterValidationResult = { valid: boolean; reason?: string }
+
+export function validateFilter(
+  filter: ISendFilter | undefined,
+  context: { selectionCount: number }
+): FilterValidationResult {
+  if (!filter) return { valid: false, reason: 'No filter selected' }
+
+  // Selection Filter check
+  if (filter.name === 'Selection' || filter.id === 'selection') {
+    return context.selectionCount > 0
+      ? { valid: true }
+      : { valid: false, reason: 'No objects selected to publish' }
+  }
+
+  // List-based filters (Rhino Layers, etc.)
+  if (isSelectFilter(filter)) {
+    return (filter.selectedItems?.length ?? 0) > 0
+      ? { valid: true }
+      : { valid: false, reason: 'No items selected to publish' }
+  }
+
+  // Category-based filters
+  if (isRevitCategoriesFilter(filter)) {
+    return (filter.selectedCategories?.length ?? 0) > 0
+      ? { valid: true }
+      : { valid: false, reason: 'No categories selected to publish' }
+  }
+
+  // View-based filters
+  if (isRevitViewsFilter(filter)) {
+    return filter.selectedView?.trim()
+      ? { valid: true }
+      : { valid: false, reason: 'No view selected to publish' }
+  }
+
+  return { valid: true }
+}
diff --git a/store/hostApp.ts b/store/hostApp.ts
index 9f40b98..235e954 100644
--- a/store/hostApp.ts
+++ b/store/hostApp.ts
@@ -11,9 +11,10 @@ import type {
   ISendFilterSelectItem,
   ISenderModelCard,
   RevitViewsSendFilter,
-  RevitCategoriesSendFilter,
   SendFilterSelect
 } from '~/lib/models/card/send'
+import { useSelectionStore } from '~/store/selection'
+import { validateFilter } from '~/lib/validation'
 import type { ToastNotification } from '@speckle/ui-components'
 import { ToastNotificationType } from '@speckle/ui-components'
 import type { Nullable } from '@speckle/shared'
@@ -23,7 +24,6 @@ import { defineStore } from 'pinia'
 import type { CardSetting } from '~/lib/models/card/setting'
 import type { DUIAccount } from '~/store/accounts'
 import { useAccountStore } from '~/store/accounts'
-import { useSelectionStore } from '~/store/selection'
 import {
   useUpdateConnector,
   type Version
@@ -370,43 +370,12 @@ export const useHostAppStore = defineStore('hostAppStore', () => {
    */
   app.$sendBinding?.on('refreshSendFilters', () => void refreshSendFilters())
 
-  const validateSendFilter = (
-    filter?: ISendFilter
-  ): { valid: boolean; reason?: string } => {
-    if (!filter) return { valid: false, reason: 'No filter selected' }
+  const validateSendFilter = (filter?: ISendFilter) => {
+    const selectionStore = useSelectionStore()
 
-    if (filter.name === 'Selection' || filter.id === 'selection') {
-      const selectionStore = useSelectionStore()
-      if (
-        !selectionStore.selectionInfo.selectedObjectIds ||
-        selectionStore.selectionInfo.selectedObjectIds.length === 0
-      ) {
-        return { valid: false, reason: 'No objects selected to publish' }
-      }
-    }
-
-    if (filter.type === 'Select' || filter.id === 'navisworksSavedSets') {
-      const f = filter as SendFilterSelect
-      if (!f.selectedItems || f.selectedItems.length === 0) {
-        return { valid: false, reason: 'No items selected to publish' }
-      }
-    }
-
-    if (filter.id === 'revitCategories' || filter.id === 'archicadLayers') {
-      const f = filter as RevitCategoriesSendFilter
-      if (!f.selectedCategories || f.selectedCategories.length === 0) {
-        return { valid: false, reason: 'No categories selected to publish' }
-      }
-    }
-
-    if (filter.id === 'revitViews') {
-      const f = filter as RevitViewsSendFilter
-      if (!f.selectedView || f.selectedView.trim() === '') {
-        return { valid: false, reason: 'No view selected to publish' }
-      }
-    }
-
-    return { valid: true }
+    return validateFilter(filter, {
+      selectionCount: selectionStore.selectionInfo.selectedObjectIds?.length ?? 0
+    })
   }
 
   /**