Skip to content

Commit 8ef440b

Browse files
committed
fix(search): address PR feedback — drop files/jobs, add onSelect to memo
1 parent 4d0f7f0 commit 8ef440b

File tree

5 files changed

+6
-50
lines changed

5 files changed

+6
-50
lines changed

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/_components/command-items.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,5 +185,9 @@ export const MemoizedIconItem = memo(
185185
</Command.Item>
186186
)
187187
},
188-
(prev, next) => prev.value === next.value && prev.name === next.name && prev.icon === next.icon
188+
(prev, next) =>
189+
prev.value === next.value &&
190+
prev.name === next.name &&
191+
prev.icon === next.icon &&
192+
prev.onSelect === next.onSelect
189193
)

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/_components/search-groups.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import type { ComponentType } from 'react'
44
import { memo } from 'react'
55
import { Command } from 'cmdk'
6-
import { Calendar, Database, File, Table } from '@/components/emcn/icons'
6+
import { Database, Table } from '@/components/emcn/icons'
77
import type {
88
SearchBlockItem,
99
SearchDocItem,
@@ -244,9 +244,7 @@ export const PagesGroup = memo(function PagesGroup({
244244
})
245245

246246
export const TablesGroup = createIconGroup('Tables', 'table', Table)
247-
export const FilesGroup = createIconGroup('Files', 'file', File)
248247
export const KnowledgeBasesGroup = createIconGroup('Knowledge Bases', 'knowledge-base', Database)
249-
export const JobsGroup = createIconGroup('Jobs', 'job', Calendar)
250248

251249
function createIconGroup(
252250
heading: string,

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import type {
2121
import {
2222
BlocksGroup,
2323
DocsGroup,
24-
FilesGroup,
25-
JobsGroup,
2624
KnowledgeBasesGroup,
2725
PagesGroup,
2826
TablesGroup,
@@ -45,9 +43,7 @@ export function SearchModal({
4543
workspaces = [],
4644
tasks = [],
4745
tables = [],
48-
files = [],
4946
knowledgeBases = [],
50-
jobs = [],
5147
isOnWorkflowPage = false,
5248
}: SearchModalProps) {
5349
const params = useParams()
@@ -296,19 +292,11 @@ export function SearchModal({
296292
() => filterAndSort(tables, (t) => `${t.name} table-${t.id}`, deferredSearch),
297293
[tables, deferredSearch]
298294
)
299-
const filteredFiles = useMemo(
300-
() => filterAndSort(files, (f) => `${f.name} file-${f.id}`, deferredSearch),
301-
[files, deferredSearch]
302-
)
303295
const filteredKnowledgeBases = useMemo(
304296
() =>
305297
filterAndSort(knowledgeBases, (kb) => `${kb.name} knowledge-base-${kb.id}`, deferredSearch),
306298
[knowledgeBases, deferredSearch]
307299
)
308-
const filteredJobs = useMemo(
309-
() => filterAndSort(jobs, (j) => `${j.name} job-${j.id}`, deferredSearch),
310-
[jobs, deferredSearch]
311-
)
312300

313301
const filteredWorkflows = useMemo(
314302
() => filterAndSort(workflows, (w) => `${w.name} workflow-${w.id}`, deferredSearch),
@@ -373,9 +361,7 @@ export function SearchModal({
373361
<WorkflowsGroup items={filteredWorkflows} onSelect={handleWorkflowSelect} />
374362
<TasksGroup items={filteredTasks} onSelect={handleTaskSelect} />
375363
<TablesGroup items={filteredTables} onSelect={handleTaskSelect} />
376-
<FilesGroup items={filteredFiles} onSelect={handleTaskSelect} />
377364
<KnowledgeBasesGroup items={filteredKnowledgeBases} onSelect={handleTaskSelect} />
378-
<JobsGroup items={filteredJobs} onSelect={handleTaskSelect} />
379365
<ToolOpsGroup items={filteredToolOps} onSelect={handleToolOperationSelect} />
380366
<WorkspacesGroup items={filteredWorkspaces} onSelect={handleWorkspaceSelect} />
381367
<DocsGroup items={filteredDocs} onSelect={handleDocSelect} />

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/utils.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ export interface SearchModalProps {
3838
workspaces?: WorkspaceItem[]
3939
tasks?: TaskItem[]
4040
tables?: TaskItem[]
41-
files?: TaskItem[]
4241
knowledgeBases?: TaskItem[]
43-
jobs?: TaskItem[]
4442
isOnWorkflowPage?: boolean
4543
}
4644

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ import {
7878
import { getBrandConfig } from '@/ee/whitelabeling'
7979
import { useFolders } from '@/hooks/queries/folders'
8080
import { useKnowledgeBasesQuery } from '@/hooks/queries/kb/knowledge'
81-
import { useWorkspaceSchedules } from '@/hooks/queries/schedules'
8281
import { useTablesList } from '@/hooks/queries/tables'
8382
import {
8483
useDeleteTask,
@@ -88,7 +87,6 @@ import {
8887
useRenameTask,
8988
useTasks,
9089
} from '@/hooks/queries/tasks'
91-
import { useWorkspaceFiles } from '@/hooks/queries/workspace-files'
9290
import { usePermissionConfig } from '@/hooks/use-permission-config'
9391
import { useSettingsNavigation } from '@/hooks/use-settings-navigation'
9492
import { useTaskEvents } from '@/hooks/use-task-events'
@@ -750,9 +748,7 @@ export const Sidebar = memo(function Sidebar() {
750748
)
751749

752750
const { data: fetchedTables = [] } = useTablesList(workspaceId)
753-
const { data: fetchedFiles = [] } = useWorkspaceFiles(workspaceId)
754751
const { data: fetchedKnowledgeBases = [] } = useKnowledgeBasesQuery(workspaceId)
755-
const { data: fetchedSchedules = [] } = useWorkspaceSchedules(workspaceId)
756752

757753
const searchModalTables = useMemo(
758754
() =>
@@ -766,18 +762,6 @@ export const Sidebar = memo(function Sidebar() {
766762
[fetchedTables, workspaceId, permissionConfig.hideTablesTab]
767763
)
768764

769-
const searchModalFiles = useMemo(
770-
() =>
771-
permissionConfig.hideFilesTab
772-
? []
773-
: fetchedFiles.map((f) => ({
774-
id: f.id,
775-
name: f.name,
776-
href: `/workspace/${workspaceId}/files`,
777-
})),
778-
[fetchedFiles, workspaceId, permissionConfig.hideFilesTab]
779-
)
780-
781765
const searchModalKnowledgeBases = useMemo(
782766
() =>
783767
permissionConfig.hideKnowledgeBaseTab
@@ -790,18 +774,6 @@ export const Sidebar = memo(function Sidebar() {
790774
[fetchedKnowledgeBases, workspaceId, permissionConfig.hideKnowledgeBaseTab]
791775
)
792776

793-
const searchModalJobs = useMemo(
794-
() =>
795-
fetchedSchedules
796-
.filter((s) => s.sourceType === 'job')
797-
.map((s) => ({
798-
id: s.id,
799-
name: s.jobTitle || 'Untitled Job',
800-
href: `/workspace/${workspaceId}/scheduled-tasks`,
801-
})),
802-
[fetchedSchedules, workspaceId]
803-
)
804-
805777
const taskIds = useMemo(() => tasks.map((t) => t.id).filter((id) => id !== 'new'), [tasks])
806778

807779
const { selectedTasks, handleTaskClick } = useTaskSelection({ taskIds })
@@ -1729,9 +1701,7 @@ export const Sidebar = memo(function Sidebar() {
17291701
workspaces={searchModalWorkspaces}
17301702
tasks={tasks}
17311703
tables={searchModalTables}
1732-
files={searchModalFiles}
17331704
knowledgeBases={searchModalKnowledgeBases}
1734-
jobs={searchModalJobs}
17351705
isOnWorkflowPage={!!workflowId}
17361706
/>
17371707

0 commit comments

Comments
 (0)