chore: merge main and resolve generated graphql conflicts

2026-03-04 17:24:52 +02:00
parent 9ab8f311c8 a8b802b7e3
commit 0f7c902711
8 changed files with 231 additions and 45 deletions
@@ -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 () => {
@@ -26,6 +26,7 @@ export interface ISendBindingEvents
    modelCardId: string
    versionId: string
    sendConversionResults: ConversionResult[]
+    ingestionId?: string
  }) => void
  setIdMap: (args: {
    modelCardId: string
@@ -61,6 +61,7 @@ type Documents = {
    "\n  mutation FailModelIngestionWithError($input: ModelIngestionFailedInput!) {\n    projectMutations {\n      modelIngestionMutations {\n        failWithError(input: $input) {\n          id\n        }\n      }\n    }\n  }\n": typeof types.FailModelIngestionWithErrorDocument,
    "\n  mutation FailModelIngestionWithCancel($input: ModelIngestionCancelledInput!) {\n    projectMutations {\n      modelIngestionMutations {\n        failWithCancel(input: $input) {\n          id\n        }\n      }\n    }\n  }\n": typeof types.FailModelIngestionWithCancelDocument,
    "\n  query CanCreateIngestion($modelId: String!, $projectId: String!) {\n    project(id: $projectId) {\n      model(id: $modelId) {\n        permissions {\n          canCreateIngestion {\n            authorized\n            code\n            message\n          }\n        }\n      }\n    }\n  }\n": typeof types.CanCreateIngestionDocument,
+    "\n  subscription ProjectModelIngestionUpdated(\n    $input: ProjectModelIngestionSubscriptionInput!\n  ) {\n    projectModelIngestionUpdated(input: $input) {\n      type\n      modelIngestion {\n        id\n        statusData {\n          __typename\n          ... on ModelIngestionSuccessStatus {\n            status\n            versionId\n          }\n          ... on ModelIngestionProcessingStatus {\n            status\n            progressMessage\n            progress\n          }\n          ... on ModelIngestionFailedStatus {\n            status\n            errorReason\n          }\n          ... on ModelIngestionCancelledStatus {\n            status\n            cancellationMessage\n          }\n          ... on ModelIngestionQueuedStatus {\n            status\n            progressMessage\n          }\n        }\n      }\n    }\n  }\n": typeof types.ProjectModelIngestionUpdatedDocument,
    "\n  fragment IssuesItem on Issue {\n    id\n    status\n    title\n    priority\n    viewerState\n    identifier\n    resourceIdString\n    activities(input: { limit: 1, sortDirection: asc }) {\n      totalCount\n      items {\n        actor {\n          id\n          user {\n            name\n            id\n            avatar\n          }\n        }\n        eventType\n        createdAt\n      }\n    }\n    replies {\n      totalCount\n      items {\n        id\n        author {\n          id\n          user {\n            name\n            id\n            avatar\n          }\n        }\n        createdAt\n        description {\n          doc\n        }\n      }\n    }\n    description {\n      doc\n    }\n    labels {\n      hexColor\n      id\n      name\n    }\n    author {\n      id\n      user {\n        id\n        name\n        avatar\n      }\n    }\n    dueDate\n    assignee {\n      id\n      user {\n        id\n        avatar\n        name\n      }\n    }\n  }\n": typeof types.IssuesItemFragmentDoc,
    "\n  query IssuesList($projectId: String!) {\n    project(id: $projectId) {\n      id\n      issues {\n        totalCount\n        items {\n          ...IssuesItem\n        }\n      }\n    }\n  }\n": typeof types.IssuesListDocument,
    "\n  query IssueResourceMetaSearch(\n    $workspaceId: String!\n    $resourceType: ResourceMetaType!\n    $resourceId: String!\n    $projectId: String\n    $metaType: String\n  ) {\n    resourceMetaSearch(\n      workspaceId: $workspaceId\n      resourceType: $resourceType\n      resourceId: $resourceId\n      projectId: $projectId\n      metaType: $metaType\n    ) {\n      data\n    }\n  }\n": typeof types.IssueResourceMetaSearchDocument,
@@ -114,6 +115,7 @@ const documents: Documents = {
    "\n  mutation FailModelIngestionWithError($input: ModelIngestionFailedInput!) {\n    projectMutations {\n      modelIngestionMutations {\n        failWithError(input: $input) {\n          id\n        }\n      }\n    }\n  }\n": types.FailModelIngestionWithErrorDocument,
    "\n  mutation FailModelIngestionWithCancel($input: ModelIngestionCancelledInput!) {\n    projectMutations {\n      modelIngestionMutations {\n        failWithCancel(input: $input) {\n          id\n        }\n      }\n    }\n  }\n": types.FailModelIngestionWithCancelDocument,
    "\n  query CanCreateIngestion($modelId: String!, $projectId: String!) {\n    project(id: $projectId) {\n      model(id: $modelId) {\n        permissions {\n          canCreateIngestion {\n            authorized\n            code\n            message\n          }\n        }\n      }\n    }\n  }\n": types.CanCreateIngestionDocument,
+    "\n  subscription ProjectModelIngestionUpdated(\n    $input: ProjectModelIngestionSubscriptionInput!\n  ) {\n    projectModelIngestionUpdated(input: $input) {\n      type\n      modelIngestion {\n        id\n        statusData {\n          __typename\n          ... on ModelIngestionSuccessStatus {\n            status\n            versionId\n          }\n          ... on ModelIngestionProcessingStatus {\n            status\n            progressMessage\n            progress\n          }\n          ... on ModelIngestionFailedStatus {\n            status\n            errorReason\n          }\n          ... on ModelIngestionCancelledStatus {\n            status\n            cancellationMessage\n          }\n          ... on ModelIngestionQueuedStatus {\n            status\n            progressMessage\n          }\n        }\n      }\n    }\n  }\n": types.ProjectModelIngestionUpdatedDocument,
    "\n  fragment IssuesItem on Issue {\n    id\n    status\n    title\n    priority\n    viewerState\n    identifier\n    resourceIdString\n    activities(input: { limit: 1, sortDirection: asc }) {\n      totalCount\n      items {\n        actor {\n          id\n          user {\n            name\n            id\n            avatar\n          }\n        }\n        eventType\n        createdAt\n      }\n    }\n    replies {\n      totalCount\n      items {\n        id\n        author {\n          id\n          user {\n            name\n            id\n            avatar\n          }\n        }\n        createdAt\n        description {\n          doc\n        }\n      }\n    }\n    description {\n      doc\n    }\n    labels {\n      hexColor\n      id\n      name\n    }\n    author {\n      id\n      user {\n        id\n        name\n        avatar\n      }\n    }\n    dueDate\n    assignee {\n      id\n      user {\n        id\n        avatar\n        name\n      }\n    }\n  }\n": types.IssuesItemFragmentDoc,
    "\n  query IssuesList($projectId: String!) {\n    project(id: $projectId) {\n      id\n      issues {\n        totalCount\n        items {\n          ...IssuesItem\n        }\n      }\n    }\n  }\n": types.IssuesListDocument,
    "\n  query IssueResourceMetaSearch(\n    $workspaceId: String!\n    $resourceType: ResourceMetaType!\n    $resourceId: String!\n    $projectId: String\n    $metaType: String\n  ) {\n    resourceMetaSearch(\n      workspaceId: $workspaceId\n      resourceType: $resourceType\n      resourceId: $resourceId\n      projectId: $projectId\n      metaType: $metaType\n    ) {\n      data\n    }\n  }\n": types.IssueResourceMetaSearchDocument,
@@ -322,6 +324,10 @@ export function graphql(source: "\n  mutation FailModelIngestionWithCancel($inpu
 * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
 */
 export function graphql(source: "\n  query CanCreateIngestion($modelId: String!, $projectId: String!) {\n    project(id: $projectId) {\n      model(id: $modelId) {\n        permissions {\n          canCreateIngestion {\n            authorized\n            code\n            message\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query CanCreateIngestion($modelId: String!, $projectId: String!) {\n    project(id: $projectId) {\n      model(id: $modelId) {\n        permissions {\n          canCreateIngestion {\n            authorized\n            code\n            message\n          }\n        }\n      }\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  subscription ProjectModelIngestionUpdated(\n    $input: ProjectModelIngestionSubscriptionInput!\n  ) {\n    projectModelIngestionUpdated(input: $input) {\n      type\n      modelIngestion {\n        id\n        statusData {\n          __typename\n          ... on ModelIngestionSuccessStatus {\n            status\n            versionId\n          }\n          ... on ModelIngestionProcessingStatus {\n            status\n            progressMessage\n            progress\n          }\n          ... on ModelIngestionFailedStatus {\n            status\n            errorReason\n          }\n          ... on ModelIngestionCancelledStatus {\n            status\n            cancellationMessage\n          }\n          ... on ModelIngestionQueuedStatus {\n            status\n            progressMessage\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  subscription ProjectModelIngestionUpdated(\n    $input: ProjectModelIngestionSubscriptionInput!\n  ) {\n    projectModelIngestionUpdated(input: $input) {\n      type\n      modelIngestion {\n        id\n        statusData {\n          __typename\n          ... on ModelIngestionSuccessStatus {\n            status\n            versionId\n          }\n          ... on ModelIngestionProcessingStatus {\n            status\n            progressMessage\n            progress\n          }\n          ... on ModelIngestionFailedStatus {\n            status\n            errorReason\n          }\n          ... on ModelIngestionCancelledStatus {\n            status\n            cancellationMessage\n          }\n          ... on ModelIngestionQueuedStatus {\n            status\n            progressMessage\n          }\n        }\n      }\n    }\n  }\n"];
 /**
 * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
 */
@@ -1,4 +1,8 @@
-import { provideApolloClient, useMutation } from '@vue/apollo-composable'
+import {
+  provideApolloClient,
+  useMutation,
+  useSubscription
+} from '@vue/apollo-composable'
 import { useAccountStore } from '~/store/accounts'
 import { useHostAppStore } from '~/store/hostApp'
 import {
@@ -8,7 +12,11 @@ import {
  failModelIngestionWithError,
  failModelIngestionWithCancel
 } from '../graphql/mutations'
-import type { SourceDataInput } from '~~/lib/common/generated/gql/graphql'
+import { projectModelIngestionUpdatedSubscription } from '../graphql/subscriptions'
+import type {
+  SourceDataInput,
+  ProjectModelIngestionUpdatedSubscription
+} from '~~/lib/common/generated/gql/graphql'
 import type { ISenderModelCard } from '~/lib/models/card/send'
 import { storeToRefs } from 'pinia'
 import { ToastNotificationType } from '@speckle/ui-components'
@@ -217,11 +225,95 @@ export const useModelIngestion = () => {
    return res?.data?.projectMutations.modelIngestionMutations.completeWithVersion
  }

+  // Tracks active ingestion subscriptions so they can be stopped on cancel or terminal state
+  const activeSubscriptions: Record<string, () => void> = {}
+
+  /**
+   * Subscribes to ingestion status updates for a given ingestionId.
+   * Used when the connector (.NET SDK) handles the ingestion and passes the ingestionId
+   * back to the DUI via setModelSendResult. The DUI then subscribes to track
+   * the server-side processing state until a terminal status is reached.
+   *
+   * Manages model card state directly: updates progress, sets versionId on success,
+   * sets error on failure, and clears progress on terminal states.
+   */
+  const subscribeToIngestion = (
+    senderModelCard: ISenderModelCard,
+    ingestionId: string
+  ) => {
+    const client = accountStore.getAccountClient(senderModelCard.accountId)
+
+    senderModelCard.progress = { status: 'Remote processing...' }
+
+    const { onResult, onError, stop } = provideApolloClient(client)(() =>
+      useSubscription(projectModelIngestionUpdatedSubscription, () => ({
+        input: {
+          projectId: senderModelCard.projectId,
+          ingestionReference: { ingestionId }
+        }
+      }))
+    )
+
+    activeSubscriptions[senderModelCard.modelCardId] = stop
+
+    onResult((result) => {
+      const data = result.data as ProjectModelIngestionUpdatedSubscription | undefined
+      const statusData = data?.projectModelIngestionUpdated?.modelIngestion?.statusData
+      if (!statusData) return
+
+      switch (statusData.__typename) {
+        case 'ModelIngestionSuccessStatus':
+          senderModelCard.latestCreatedVersionId = statusData.versionId
+          senderModelCard.progress = undefined
+          unsubscribeFromIngestion(senderModelCard.modelCardId)
+          break
+        case 'ModelIngestionProcessingStatus':
+          senderModelCard.progress = {
+            status: statusData.progressMessage,
+            progress: statusData.progress ?? undefined
+          }
+          break
+        case 'ModelIngestionFailedStatus':
+          senderModelCard.error = {
+            errorMessage: statusData.errorReason,
+            dismissible: true
+          }
+          senderModelCard.progress = undefined
+          unsubscribeFromIngestion(senderModelCard.modelCardId)
+          break
+        case 'ModelIngestionCancelledStatus':
+          senderModelCard.progress = undefined
+          unsubscribeFromIngestion(senderModelCard.modelCardId)
+          break
+        case 'ModelIngestionQueuedStatus':
+          senderModelCard.progress = {
+            status: statusData.progressMessage
+          }
+          break
+      }
+    })
+
+    onError((err) => {
+      console.error('Ingestion subscription error:', err)
+      unsubscribeFromIngestion(senderModelCard.modelCardId)
+    })
+  }
+
+  const unsubscribeFromIngestion = (modelCardId: string) => {
+    const stop = activeSubscriptions[modelCardId]
+    if (stop) {
+      stop()
+      delete activeSubscriptions[modelCardId]
+    }
+  }
+
  return {
    startIngestion,
    updateIngestion,
    failIngestion,
    cancelIngestion,
-    completeIngestionWithVersion
+    completeIngestionWithVersion,
+    subscribeToIngestion,
+    unsubscribeFromIngestion
  }
 }
@@ -0,0 +1,38 @@
+import { graphql } from '~~/lib/common/generated/gql'
+
+export const projectModelIngestionUpdatedSubscription = graphql(`
+  subscription ProjectModelIngestionUpdated(
+    $input: ProjectModelIngestionSubscriptionInput!
+  ) {
+    projectModelIngestionUpdated(input: $input) {
+      type
+      modelIngestion {
+        id
+        statusData {
+          __typename
+          ... on ModelIngestionSuccessStatus {
+            status
+            versionId
+          }
+          ... on ModelIngestionProcessingStatus {
+            status
+            progressMessage
+            progress
+          }
+          ... on ModelIngestionFailedStatus {
+            status
+            errorReason
+          }
+          ... on ModelIngestionCancelledStatus {
+            status
+            cancellationMessage
+          }
+          ... on ModelIngestionQueuedStatus {
+            status
+            progressMessage
+          }
+        }
+      }
+    }
+  }
+`)
@@ -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 }
+}
@@ -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
@@ -53,7 +53,9 @@ export const useHostAppStore = defineStore('hostAppStore', () => {
    updateIngestion,
    failIngestion,
    cancelIngestion,
-    completeIngestionWithVersion
+    completeIngestionWithVersion,
+    subscribeToIngestion,
+    unsubscribeFromIngestion
  } = useModelIngestion()
  const isDistributedBySpeckle = ref<boolean>(true)
  const latestAvailableVersion = ref<Version | null>(null)
@@ -368,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
+    })
  }

  /**
@@ -518,6 +489,9 @@ export const useHostAppStore = defineStore('hostAppStore', () => {
    void trackEvent('DUI3 Action', { name: 'Send Cancel' }, model.accountId)
    model.latestCreatedVersionId = undefined

+    // Clean up any active ingestion subscription from SDK-based connectors
+    unsubscribeFromIngestion(modelCardId)
+
    // Cancel the ingestion if applicable
    if (shouldHandleIngestion.value) {
      const ingestionId = activeIngestions.value[modelCardId]
@@ -541,13 +515,22 @@ export const useHostAppStore = defineStore('hostAppStore', () => {
    modelCardId: string
    versionId: string
    sendConversionResults: ConversionResult[]
+    ingestionId?: string
  }) => {
    const model = documentModelStore.value.models.find(
      (m) => m.modelCardId === args.modelCardId
    ) as ISenderModelCard
-    model.latestCreatedVersionId = args.versionId
+    // Conversion results are always valid regardless of ingestion state
    model.report = args.sendConversionResults
-    model.progress = undefined
+
+    if (args.ingestionId) {
+      // Connector handled ingestion via SDK — composable subscribes and manages model card state to 'Version created' bla bla
+      subscribeToIngestion(model, args.ingestionId)
+    } else {
+      // Legacy path or no ingestion — behave as before
+      model.latestCreatedVersionId = args.versionId
+      model.progress = undefined
+    }
  }

  app.$sendBinding?.on('setModelSendResult', setModelSendResult)