Skip to content

Commit 97ffff1

Browse files
committed
Merge remote-tracking branch 'origin/staging' into feat/func-cli-resolver
# Conflicts: # apps/sim/lib/content/mdx.tsx
2 parents 4eb1436 + bf5abc9 commit 97ffff1

16 files changed

Lines changed: 731 additions & 117 deletions

File tree

apps/sim/app/workspace/[workspaceId]/files/files.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1796,6 +1796,7 @@ export function Files() {
17961796
? [
17971797
{
17981798
label: 'Rename',
1799+
icon: Pencil,
17991800
disabled: !canEdit,
18001801
onClick: () => breadcrumbRenameRef.current.startRename(folder.id, folder.name),
18011802
},

apps/sim/app/workspace/[workspaceId]/knowledge/knowledge.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
44
import type { ChipDropdownOption } from '@sim/emcn'
55
import { Button, ChipConfirmModal, ChipDropdown, Plus, Tooltip, toast } from '@sim/emcn'
6-
import { Database, FolderPlus } from '@sim/emcn/icons'
6+
import { Database, FolderPlus, Pencil, Trash } from '@sim/emcn/icons'
77
import { createLogger } from '@sim/logger'
88
import { getErrorMessage } from '@sim/utils/errors'
99
import { useParams, useRouter } from 'next/navigation'
@@ -925,13 +925,15 @@ export function Knowledge() {
925925
? [
926926
{
927927
label: 'Rename',
928+
icon: Pencil,
928929
onClick: () => {
929930
const folder = breadcrumbs[breadcrumbs.length - 1]
930931
breadcrumbRenameRef.current.startRename(folder.id, folder.name)
931932
},
932933
},
933934
{
934935
label: 'Delete',
936+
icon: Trash,
935937
onClick: () => setFolderPendingDelete(breadcrumbs[breadcrumbs.length - 1]),
936938
},
937939
]

apps/sim/app/workspace/[workspaceId]/tables/tables.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
44
import type { ComboboxOption } from '@sim/emcn'
55
import { ChipCombobox, ChipConfirmModal, Plus, toast, Upload } from '@sim/emcn'
6-
import { Columns3, FolderPlus, Rows3, Table as TableIcon } from '@sim/emcn/icons'
6+
import { Columns3, FolderPlus, Pencil, Rows3, Table as TableIcon, Trash } from '@sim/emcn/icons'
77
import { createLogger } from '@sim/logger'
88
import { getErrorMessage } from '@sim/utils/errors'
99
import { generateId } from '@sim/utils/id'
@@ -467,11 +467,13 @@ export function Tables() {
467467
return [
468468
{
469469
label: 'Rename',
470+
icon: Pencil,
470471
disabled: !canEdit,
471472
onClick: () => breadcrumbRename.startRename(folder.id, folder.name),
472473
},
473474
{
474475
label: 'Delete',
476+
icon: Trash,
475477
disabled: !canEdit,
476478
/**
477479
* The only way to delete the folder you are inside — its own row is not in the list.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ export const Panel = memo(function Panel() {
693693
<DropdownMenu open={isMenuOpen} onOpenChange={setIsMenuOpen}>
694694
<DropdownMenuTrigger asChild>
695695
<Button className='size-[30px] rounded-[5px]'>
696-
<MoreHorizontal />
696+
<MoreHorizontal className='size-[14px]' />
697697
</Button>
698698
</DropdownMenuTrigger>
699699
<DropdownMenuContent align='start' side='bottom' sideOffset={8}>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ const SidebarChatItem = memo(function SidebarChatItem({
271271
isMenuOpen && 'opacity-100'
272272
)}
273273
>
274-
<MoreHorizontal className='size-[9px] text-[var(--text-icon)]' />
274+
<MoreHorizontal className='size-[14px] text-[var(--text-icon)]' />
275275
</button>
276276
</div>
277277
)}
@@ -1612,7 +1612,7 @@ export const Sidebar = memo(function Sidebar({
16121612
{isImporting || isCreatingFolder ? (
16131613
<Loader className='h-[16px] w-[16px]' animate />
16141614
) : (
1615-
<MoreHorizontal className='size-[9px]' />
1615+
<MoreHorizontal className='size-[14px]' />
16161616
)}
16171617
</Button>
16181618
</DropdownMenuTrigger>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { AgentPeerDemo } from './components/agent-peer-demo'

0 commit comments

Comments
 (0)