Skip to content

Commit 4e9b453

Browse files
chore: fix conflicts
1 parent 8d93c85 commit 4e9b453

File tree

42 files changed

+311
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+311
-72
lines changed

apps/sim/app/(landing)/blog/[slug]/page.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ export default async function Page({ params }: { params: Promise<{ slug: string
6060
sizes='(max-width: 768px) 100vw, 450px'
6161
priority
6262
itemProp='image'
63-
unoptimized
6463
/>
6564
</div>
6665
</div>
@@ -144,7 +143,6 @@ export default async function Page({ params }: { params: Promise<{ slug: string
144143
className='h-[160px] w-full object-cover'
145144
sizes='(max-width: 640px) 100vw, (max-width: 1024px) 50vw, 33vw'
146145
loading='lazy'
147-
unoptimized
148146
/>
149147
<div className='p-3'>
150148
<div className='mb-1 text-[#999] text-xs'>

apps/sim/app/(landing)/blog/authors/[id]/page.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ export default async function AuthorPage({ params }: { params: Promise<{ id: str
6464
width={600}
6565
height={315}
6666
className='h-[160px] w-full object-cover transition-transform group-hover:scale-[1.02]'
67-
unoptimized
6867
/>
6968
<div className='p-3'>
7069
<div className='mb-1 text-[#999] text-xs'>

apps/sim/app/(landing)/blog/post-grid.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export function PostGrid({ posts }: { posts: Post[] }) {
3232
src={p.ogImage}
3333
alt={p.title}
3434
sizes='(max-width: 768px) 100vw, (max-width: 1024px) 50vw, 33vw'
35-
unoptimized
3635
priority={index < 6}
3736
loading={index < 6 ? undefined : 'lazy'}
3837
fill

apps/sim/app/chat/components/voice-interface/voice-interface.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@
33
import { type RefObject, useCallback, useEffect, useRef, useState } from 'react'
44
import { createLogger } from '@sim/logger'
55
import { Mic, MicOff, Phone } from 'lucide-react'
6+
import dynamic from 'next/dynamic'
67
import { Button } from '@/components/ui/button'
78
import { cn } from '@/lib/core/utils/cn'
8-
import { ParticlesVisualization } from '@/app/chat/components/voice-interface/components/particles'
9+
10+
const ParticlesVisualization = dynamic(
11+
() =>
12+
import('@/app/chat/components/voice-interface/components/particles').then(
13+
(mod) => mod.ParticlesVisualization
14+
),
15+
{ ssr: false }
16+
)
917

1018
const logger = createLogger('VoiceInterface')
1119

apps/sim/app/templates/components/template-card.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
22
import { createLogger } from '@sim/logger'
33
import { Star, User } from 'lucide-react'
4+
import Image from 'next/image'
45
import { useParams, useRouter } from 'next/navigation'
56
import { VerifiedBadge } from '@/components/ui/verified-badge'
67
import { cn } from '@/lib/core/utils/cn'
@@ -281,9 +282,14 @@ function TemplateCardInner({
281282
<div className='mt-[10px] flex items-center justify-between'>
282283
<div className='flex min-w-0 items-center gap-[8px]'>
283284
{authorImageUrl ? (
284-
<div className='h-[20px] w-[20px] flex-shrink-0 overflow-hidden rounded-full'>
285-
<img src={authorImageUrl} alt={author} className='h-full w-full object-cover' />
286-
</div>
285+
<Image
286+
src={authorImageUrl}
287+
alt={author}
288+
width={20}
289+
height={20}
290+
className='flex-shrink-0 rounded-full object-cover'
291+
unoptimized
292+
/>
287293
) : (
288294
<div className='flex h-[20px] w-[20px] flex-shrink-0 items-center justify-center rounded-full bg-[var(--surface-7)]'>
289295
<User className='h-[12px] w-[12px] text-[var(--text-muted)]' />

apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/components/workflows-list/workflows-list.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function WorkflowsListInner({
3636
searchQuery: string
3737
segmentDurationMs: number
3838
}) {
39-
const { workflows } = useWorkflowRegistry()
39+
const workflows = useWorkflowRegistry((s) => s.workflows)
4040

4141
return (
4242
<div className='flex h-full flex-col overflow-hidden rounded-[6px] bg-[var(--surface-2)] dark:bg-[var(--surface-1)]'>

apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/dashboard.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
44
import { Loader2 } from 'lucide-react'
5+
import { useShallow } from 'zustand/react/shallow'
56
import { Skeleton } from '@/components/emcn'
67
import { formatLatency } from '@/app/workspace/[workspaceId]/logs/utils'
78
import type { DashboardStatsResponse, WorkflowStats } from '@/hooks/queries/logs'
@@ -146,7 +147,14 @@ function DashboardInner({ stats, isLoading, error }: DashboardProps) {
146147
const [lastAnchorIndices, setLastAnchorIndices] = useState<Record<string, number>>({})
147148
const lastAnchorIndicesRef = useRef<Record<string, number>>({})
148149

149-
const { workflowIds, searchQuery, toggleWorkflowId, timeRange } = useFilterStore()
150+
const { workflowIds, searchQuery, toggleWorkflowId, timeRange } = useFilterStore(
151+
useShallow((s) => ({
152+
workflowIds: s.workflowIds,
153+
searchQuery: s.searchQuery,
154+
toggleWorkflowId: s.toggleWorkflowId,
155+
timeRange: s.timeRange,
156+
}))
157+
)
150158

151159
const allWorkflows = useWorkflowRegistry((state) => state.workflows)
152160

apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/logs-toolbar.tsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { memo, useCallback, useMemo, useState } from 'react'
44
import { ArrowUp, Bell, Library, MoreHorizontal, RefreshCw } from 'lucide-react'
55
import { useParams } from 'next/navigation'
6+
import { useShallow } from 'zustand/react/shallow'
67
import {
78
Button,
89
Combobox,
@@ -195,7 +196,25 @@ export const LogsToolbar = memo(function LogsToolbar({
195196
setDateRange,
196197
clearDateRange,
197198
resetFilters,
198-
} = useFilterStore()
199+
} = useFilterStore(
200+
useShallow((s) => ({
201+
level: s.level,
202+
setLevel: s.setLevel,
203+
workflowIds: s.workflowIds,
204+
setWorkflowIds: s.setWorkflowIds,
205+
folderIds: s.folderIds,
206+
setFolderIds: s.setFolderIds,
207+
triggers: s.triggers,
208+
setTriggers: s.setTriggers,
209+
timeRange: s.timeRange,
210+
setTimeRange: s.setTimeRange,
211+
startDate: s.startDate,
212+
endDate: s.endDate,
213+
setDateRange: s.setDateRange,
214+
clearDateRange: s.clearDateRange,
215+
resetFilters: s.resetFilters,
216+
}))
217+
)
199218

200219
const [datePickerOpen, setDatePickerOpen] = useState(false)
201220
const [previousTimeRange, setPreviousTimeRange] = useState(timeRange)

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

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react'
44
import { useQueryClient } from '@tanstack/react-query'
55
import { useParams } from 'next/navigation'
6+
import { useShallow } from 'zustand/react/shallow'
67
import {
78
Bell,
89
Button,
@@ -230,7 +231,30 @@ export default function Logs() {
230231
setTimeRange,
231232
setDateRange,
232233
clearDateRange,
233-
} = useFilterStore()
234+
} = useFilterStore(
235+
useShallow((s) => ({
236+
setWorkspaceId: s.setWorkspaceId,
237+
initializeFromURL: s.initializeFromURL,
238+
timeRange: s.timeRange,
239+
startDate: s.startDate,
240+
endDate: s.endDate,
241+
level: s.level,
242+
workflowIds: s.workflowIds,
243+
folderIds: s.folderIds,
244+
setWorkflowIds: s.setWorkflowIds,
245+
setSearchQuery: s.setSearchQuery,
246+
triggers: s.triggers,
247+
viewMode: s.viewMode,
248+
setViewMode: s.setViewMode,
249+
resetFilters: s.resetFilters,
250+
setLevel: s.setLevel,
251+
setFolderIds: s.setFolderIds,
252+
setTriggers: s.setTriggers,
253+
setTimeRange: s.setTimeRange,
254+
setDateRange: s.setDateRange,
255+
clearDateRange: s.clearDateRange,
256+
}))
257+
)
234258

235259
useEffect(() => {
236260
setWorkspaceId(workspaceId)
@@ -1133,7 +1157,25 @@ function LogsFilterPanel({ searchQuery, onSearchQueryChange }: LogsFilterPanelPr
11331157
setDateRange,
11341158
clearDateRange,
11351159
resetFilters,
1136-
} = useFilterStore()
1160+
} = useFilterStore(
1161+
useShallow((s) => ({
1162+
level: s.level,
1163+
setLevel: s.setLevel,
1164+
workflowIds: s.workflowIds,
1165+
setWorkflowIds: s.setWorkflowIds,
1166+
folderIds: s.folderIds,
1167+
setFolderIds: s.setFolderIds,
1168+
triggers: s.triggers,
1169+
setTriggers: s.setTriggers,
1170+
timeRange: s.timeRange,
1171+
setTimeRange: s.setTimeRange,
1172+
startDate: s.startDate,
1173+
endDate: s.endDate,
1174+
setDateRange: s.setDateRange,
1175+
clearDateRange: s.clearDateRange,
1176+
resetFilters: s.resetFilters,
1177+
}))
1178+
)
11371179

11381180
const [datePickerOpen, setDatePickerOpen] = useState(false)
11391181
const [previousTimeRange, setPreviousTimeRange] = useState(timeRange)

apps/sim/app/workspace/[workspaceId]/templates/components/template-card.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
22
import { Star, User } from 'lucide-react'
3+
import Image from 'next/image'
34
import { useParams, useRouter } from 'next/navigation'
45
import { VerifiedBadge } from '@/components/ui/verified-badge'
56
import { cn } from '@/lib/core/utils/cn'
@@ -288,9 +289,14 @@ function TemplateCardInner({
288289
<div className='mt-[10px] flex items-center justify-between'>
289290
<div className='flex min-w-0 flex-1 items-center gap-[6px]'>
290291
{authorImageUrl ? (
291-
<div className='h-[20px] w-[20px] flex-shrink-0 overflow-hidden rounded-full'>
292-
<img src={authorImageUrl} alt={author} className='h-full w-full object-cover' />
293-
</div>
292+
<Image
293+
src={authorImageUrl}
294+
alt={author}
295+
width={20}
296+
height={20}
297+
className='flex-shrink-0 rounded-full object-cover'
298+
unoptimized
299+
/>
294300
) : (
295301
<div className='flex h-[20px] w-[20px] flex-shrink-0 items-center justify-center rounded-full bg-[var(--surface-7)]'>
296302
<User className='h-[12px] w-[12px] text-[var(--text-tertiary)]' />

0 commit comments

Comments
 (0)