resource resolver

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx

@@ -1050,13 +1050,12 @@ export function DeployModal({
 
 interface StatusBadgeProps {
   isWarning: boolean
-  isSyncing?: boolean
 }
 
-function StatusBadge({ isWarning, isSyncing = false }: StatusBadgeProps) {
-  const label = isSyncing ? 'Syncing changes' : isWarning ? 'Update deployment' : 'Live'
+function StatusBadge({ isWarning }: StatusBadgeProps) {
+  const label = isWarning ? 'Update deployment' : 'Live'
   return (
-    <Badge variant={isSyncing || isWarning ? 'amber' : 'green'} size='lg' dot>
+    <Badge variant={isWarning ? 'amber' : 'green'} size='lg' dot>
       {label}
     </Badge>
   )
@@ -1111,7 +1110,7 @@ function GeneralFooter({
   const isDeployBlocked =
     deployReadiness.isBlocked || isDeploymentSettling || isSubmitting || isUndeploying
   const blockedMessage =
-    deployReadiness.isBlocked && !isDeploymentSettling && !isSubmitting && !isUndeploying
+    deployReadiness.isBlocked && !deployReadiness.isSyncing && !isSubmitting && !isUndeploying
       ? deployReadiness.tooltip
       : null
   const deployActionLoading = isSubmitting || isDeploymentSettling
@@ -1133,7 +1132,7 @@ function GeneralFooter({
   return (
     <ModalFooter className='items-center justify-between'>
       <div className='flex min-w-0 flex-col gap-1'>
-        <StatusBadge isWarning={needsRedeployment} isSyncing={isDeploymentSettling} />
+        <StatusBadge isWarning={needsRedeployment} />
         {blockedMessage && (
           <div className='max-w-[300px] text-muted-foreground text-xs'>{blockedMessage}</div>
         )}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/deploy.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import { useState } from 'react'
-import { Button, Loader, Tooltip } from '@/components/emcn'
+import { Button, Tooltip } from '@/components/emcn'
 import { DeployModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal'
 import {
   useChangeDetection,
@@ -65,12 +65,16 @@ export function Deploy({
     isDeploying ||
     !canDeploy ||
     isEmpty ||
-    isDeploymentSettling ||
-    (!isDeployed && deployReadiness.isBlocked)
+    (!isDeployed && deployReadiness.isBlocked && !deployReadiness.isSyncing)
 
   const onDeployClick = async () => {
     if (disabled || !canDeploy || !activeWorkflowId) return
 
+    if (isDeploymentSettling) {
+      setIsModalOpen(true)
+      return
+    }
+
     const result = await handleDeployClick()
     if (result.shouldOpenModal) {
       setIsModalOpen(true)
@@ -106,9 +110,6 @@ export function Deploy({
   }
 
   const getButtonLabel = () => {
-    if (isDeployed && (changeDetected || isDeploymentSettling)) {
-      return 'Update'
-    }
     if (changeDetected) {
       return 'Update'
     }
@@ -126,18 +127,11 @@ export function Deploy({
             <Button
               className='h-[30px] gap-1.5 px-2.5'
               variant={
-                isRegistryLoading || isDeploymentSettling
-                  ? 'active'
-                  : changeDetected || !isDeployed
-                    ? 'tertiary'
-                    : 'active'
+                isRegistryLoading ? 'active' : changeDetected || !isDeployed ? 'tertiary' : 'active'
               }
               onClick={onDeployClick}
               disabled={isRegistryLoading || isDisabled}
             >
-              {(isDeploying || isDeploymentSettling) && (
-                <Loader className='h-[13px] w-[13px]' animate />
-              )}
               {getButtonLabel()}
             </Button>
           </span>

apps/sim/lib/workflows/search-replace/indexer.test.ts

@@ -34,14 +34,30 @@ describe('indexWorkflowSearchMatches', () => {
   it('does not index internal row metadata in structured subblock values', () => {
     const workflow = createSearchReplaceWorkflowFixture()
 
-    const matches = indexWorkflowSearchMatches({
+    const rowMatches = indexWorkflowSearchMatches({
       workflow,
       query: 'row-1',
       mode: 'text',
       blockConfigs: SEARCH_REPLACE_BLOCK_CONFIGS,
     })
+    workflow.blocks['api-1'].subBlocks.body.value = {
+      filtersById: {
+        'filter-1': {
+          id: 'filter-2',
+          collapsed: false,
+          value: '',
+        },
+      },
+    }
+    const objectMatches = indexWorkflowSearchMatches({
+      workflow,
+      query: 'filter-2',
+      mode: 'text',
+      blockConfigs: SEARCH_REPLACE_BLOCK_CONFIGS,
+    })
 
-    expect(matches).toEqual([])
+    expect(rowMatches).toEqual([])
+    expect(objectMatches).toEqual([])
   })
 
   it('indexes non-string scalar values as searchable but not editable', () => {
@@ -210,6 +226,63 @@ describe('indexWorkflowSearchMatches', () => {
     ).toBe(true)
   })
 
+  it('does not match opaque structured resource ids during display-label filtering', () => {
+    const workflow = createSearchReplaceWorkflowFixture()
+    workflow.blocks['knowledge-1'].subBlocks.knowledgeBaseIds.value = 'kb-2-opaque-id'
+
+    const matches = indexWorkflowSearchMatches({
+      workflow,
+      query: '2',
+      mode: 'all',
+      includeResourceMatchesWithoutQuery: true,
+      blockConfigs: SEARCH_REPLACE_BLOCK_CONFIGS,
+    })
+    const knowledgeMatch = matches.find(
+      (match) => match.kind === 'knowledge-base' && match.rawValue === 'kb-2-opaque-id'
+    )
+
+    expect(knowledgeMatch).toBeDefined()
+    expect(
+      workflowSearchMatchMatchesQuery({ ...knowledgeMatch!, displayLabel: 'Support Articles' }, '2')
+    ).toBe(false)
+    expect(
+      workflowSearchMatchMatchesQuery(
+        { ...knowledgeMatch!, displayLabel: 'Support Articles 2' },
+        '2'
+      )
+    ).toBe(true)
+  })
+
+  it('does not index structured resource ids as plain text matches', () => {
+    const workflow = createSearchReplaceWorkflowFixture()
+    workflow.blocks['knowledge-1'].subBlocks.knowledgeBaseIds.value = 'kb-2-opaque-id'
+
+    const matches = indexWorkflowSearchMatches({
+      workflow,
+      query: '2',
+      mode: 'all',
+      includeResourceMatchesWithoutQuery: true,
+      blockConfigs: SEARCH_REPLACE_BLOCK_CONFIGS,
+    })
+
+    expect(
+      matches.some(
+        (match) =>
+          match.kind === 'text' &&
+          match.blockId === 'knowledge-1' &&
+          match.subBlockId === 'knowledgeBaseIds'
+      )
+    ).toBe(false)
+    expect(
+      matches.some(
+        (match) =>
+          match.kind === 'knowledge-base' &&
+          match.blockId === 'knowledge-1' &&
+          match.subBlockId === 'knowledgeBaseIds'
+      )
+    ).toBe(true)
+  })
+
   it('captures selector context for selector-backed resources', () => {
     const workflow = createSearchReplaceWorkflowFixture()
 

apps/sim/lib/workflows/search-replace/indexer.ts

@@ -1,5 +1,6 @@
 import type { SubBlockType } from '@sim/workflow-types/blocks'
 import {
+  getResourceKindForSubBlock,
   matchesSearchText,
   parseInlineReferences,
   parseStructuredResourceReferences,
@@ -66,8 +67,7 @@ const STRUCTURED_METADATA_LEAF_KEYS = new Set(['id', 'collapsed'])
 
 function isSearchableLeafPath(path: Array<string | number>): boolean {
   const lastSegment = path.at(-1)
-  const parentSegment = path.at(-2)
-  if (typeof parentSegment !== 'number' || typeof lastSegment !== 'string') return true
+  if (typeof lastSegment !== 'string') return true
   return !STRUCTURED_METADATA_LEAF_KEYS.has(lastSegment)
 }
 
@@ -254,8 +254,9 @@ export function indexWorkflowSearchMatches(
         subBlockId
       const value = subBlockState?.value
       const stringLeaves = getSearchableStringLeaves(value)
+      const structuredResourceKind = getResourceKindForSubBlock(subBlockConfig)
 
-      if (mode !== 'resource') {
+      if (mode !== 'resource' && !structuredResourceKind) {
         for (const leaf of stringLeaves) {
           const leafEditable = editable && typeof leaf.originalValue === 'string'
           addTextMatches({

apps/sim/lib/workflows/search-replace/resource-resolvers.ts

@@ -98,17 +98,11 @@ export function workflowSearchMatchMatchesQuery(
   if (match.kind === 'text') return true
 
   const normalize = (value: string) => (caseSensitive ? value : value.toLowerCase())
-  const searchable = [
-    match.displayLabel,
-    match.rawValue,
-    match.searchText,
-    match.fieldTitle,
-    match.blockName,
-    match.resource?.kind,
-    match.resource?.selectorKey,
-  ]
-    .filter(Boolean)
-    .join(' ')
+  const searchable =
+    match.resource?.kind === 'workflow-reference' || match.resource?.kind === 'environment'
+      ? [match.displayLabel, match.rawValue, match.searchText, match.fieldTitle, match.blockName]
+      : [match.displayLabel, match.fieldTitle, match.blockName]
+  const searchableText = searchable.filter(Boolean).join(' ')
 
-  return normalize(searchable).includes(normalize(trimmedQuery))
+  return normalize(searchableText).includes(normalize(trimmedQuery))
 }