@@ -106,7 +107,7 @@ export function InvitesSent() {
)
}
- if (!activeWorkspaceId) {
+ if (!workspaceId) {
return null
}
diff --git a/apps/sim/app/w/components/sidebar/components/nav-section/nav-section.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/nav-section/nav-section.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/nav-section/nav-section.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/nav-section/nav-section.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/account/account.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/account/account.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/components/account/account.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/account/account.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/api-keys/api-keys.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/api-keys/api-keys.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/components/api-keys/api-keys.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/api-keys/api-keys.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
similarity index 99%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
index da4faef5dc4..21ad99b186b 100644
--- a/apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
@@ -172,10 +172,10 @@ export function Credentials({ onOpenChange }: CredentialsProps) {
}
// Clear the URL parameters
- router.replace('/w')
+ router.replace('/workspace')
} else if (error) {
logger.error('OAuth error:', { error })
- router.replace('/w')
+ router.replace('/workspace')
}
}, [searchParams, router, userId])
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/environment/environment.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/environment/environment.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/components/environment/environment.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/environment/environment.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/general/general.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/general/general.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/components/general/general.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/general/general.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/privacy/privacy.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/privacy/privacy.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/components/privacy/privacy.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/privacy/privacy.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/settings-navigation/settings-navigation.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/settings-navigation/settings-navigation.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/components/settings-navigation/settings-navigation.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/settings-navigation/settings-navigation.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/subscription/components/team-seats-dialog.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/components/team-seats-dialog.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/components/subscription/components/team-seats-dialog.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/components/team-seats-dialog.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/subscription/subscription.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/subscription.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/components/subscription/subscription.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/subscription.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/team-management/team-management.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/team-management/team-management.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/components/team-management/team-management.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/team-management/team-management.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/settings-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/settings-modal.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/settings-modal/settings-modal.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/settings-modal.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/sidebar-control/sidebar-control.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-control/sidebar-control.tsx
similarity index 100%
rename from apps/sim/app/w/components/sidebar/components/sidebar-control/sidebar-control.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-control/sidebar-control.tsx
diff --git a/apps/sim/app/w/components/sidebar/components/workflow-list/workflow-list.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/workflow-list.tsx
similarity index 87%
rename from apps/sim/app/w/components/sidebar/components/workflow-list/workflow-list.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/workflow-list.tsx
index bf4e067eb8f..c54e7d73e94 100644
--- a/apps/sim/app/w/components/sidebar/components/workflow-list/workflow-list.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/workflow-list.tsx
@@ -3,10 +3,9 @@
import { useMemo } from 'react'
import clsx from 'clsx'
import Link from 'next/link'
-import { usePathname } from 'next/navigation'
+import { useParams, usePathname } from 'next/navigation'
import { Skeleton } from '@/components/ui/skeleton'
import { useSession } from '@/lib/auth-client'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
import type { WorkflowMetadata } from '@/stores/workflows/registry/types'
interface WorkflowItemProps {
@@ -17,9 +16,12 @@ interface WorkflowItemProps {
}
function WorkflowItem({ workflow, active, isMarketplace, isCollapsed }: WorkflowItemProps) {
+ const params = useParams()
+ const workspaceId = params.workspaceId as string
+
return (
))}
@@ -121,7 +124,7 @@ export function WorkflowList({
@@ -132,8 +135,8 @@ export function WorkflowList({
{/* Empty state */}
{showEmptyState && !isCollapsed && (
- No workflows in {activeWorkspaceId ? 'this workspace' : 'your account'}. Create one to
- get started.
+ No workflows in {workspaceId ? 'this workspace' : 'your account'}. Create one to get
+ started.
)}
diff --git a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
similarity index 93%
rename from apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
index 4f9351d0154..3d67c0087d6 100644
--- a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
@@ -3,7 +3,7 @@
import React, { useCallback, useEffect, useMemo, useState } from 'react'
import { ChevronDown, Pencil, Trash2, X } from 'lucide-react'
import Link from 'next/link'
-import { useRouter } from 'next/navigation'
+import { useParams, useRouter } from 'next/navigation'
import { AgentIcon } from '@/components/icons'
import {
AlertDialog,
@@ -28,11 +28,14 @@ import {
import { Input } from '@/components/ui/input'
import { Skeleton } from '@/components/ui/skeleton'
import { useSession } from '@/lib/auth-client'
+import { createLogger } from '@/lib/logs/console-logger'
import { cn } from '@/lib/utils'
-import { useUserPermissionsContext } from '@/app/w/components/providers/workspace-permissions-provider'
+import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/w/components/providers/workspace-permissions-provider'
import { useSidebarStore } from '@/stores/sidebar/store'
import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+const logger = createLogger('WorkspaceHeader')
+
interface Workspace {
id: string
name: string
@@ -254,7 +257,9 @@ export const WorkspaceHeader = React.memo(
const router = useRouter()
// Get workflowRegistry state and actions
- const { activeWorkspaceId, switchToWorkspace, setActiveWorkspaceId } = useWorkflowRegistry()
+ const { switchToWorkspace } = useWorkflowRegistry()
+ const params = useParams()
+ const currentWorkspaceId = params.workspaceId as string
// Get user permissions for the active workspace
const userPermissions = useUserPermissionsContext()
@@ -275,7 +280,7 @@ export const WorkspaceHeader = React.memo(
const data = await response.json()
setPlan(data.isPro ? 'Pro Plan' : 'Free Plan')
} catch (err) {
- console.error('Error fetching subscription status:', err)
+ logger.error('Error fetching subscription status:', err)
}
}, [])
@@ -289,30 +294,36 @@ export const WorkspaceHeader = React.memo(
const fetchedWorkspaces = data.workspaces as Workspace[]
setWorkspaces(fetchedWorkspaces)
- // Only update workspace if we have a valid activeWorkspaceId from registry
- if (activeWorkspaceId) {
+ // Only update workspace if we have a valid currentWorkspaceId from URL
+ if (currentWorkspaceId) {
const matchingWorkspace = fetchedWorkspaces.find(
- (workspace) => workspace.id === activeWorkspaceId
+ (workspace) => workspace.id === currentWorkspaceId
)
if (matchingWorkspace) {
setActiveWorkspace(matchingWorkspace)
} else {
- // Active workspace not found, fallback to first workspace
- const fallbackWorkspace = fetchedWorkspaces[0]
- if (fallbackWorkspace) {
+ // Log the mismatch for debugging
+ logger.warn(`Workspace ${currentWorkspaceId} not found in user's workspaces`)
+
+ // Current workspace not found, fallback to first workspace
+ if (fetchedWorkspaces.length > 0) {
+ const fallbackWorkspace = fetchedWorkspaces[0]
setActiveWorkspace(fallbackWorkspace)
- setActiveWorkspaceId(fallbackWorkspace.id)
+ // Navigate to the fallback workspace
+ router.push(`/workspace/${fallbackWorkspace.id}/w`)
+ } else {
+ // No workspaces available - handle this edge case
+ logger.error('No workspaces available for user')
}
}
}
- // If no activeWorkspaceId, let loadWorkspaceFromWorkflowId handle workspace selection
}
} catch (err) {
- console.error('Error fetching workspaces:', err)
+ logger.error('Error fetching workspaces:', err)
} finally {
setIsWorkspacesLoading(false)
}
- }, [activeWorkspaceId, setActiveWorkspaceId])
+ }, [currentWorkspaceId, router])
useEffect(() => {
// Fetch subscription status if user is logged in
@@ -337,7 +348,7 @@ export const WorkspaceHeader = React.memo(
switchToWorkspace(workspace.id)
// Update URL to include workspace ID
- router.push(`/w/${workspace.id}`)
+ router.push(`/workspace/${workspace.id}/w`)
},
[activeWorkspace?.id, switchToWorkspace, router]
)
@@ -367,10 +378,10 @@ export const WorkspaceHeader = React.memo(
switchToWorkspace(newWorkspace.id)
// Update URL to include new workspace ID
- router.push(`/w/${newWorkspace.id}`)
+ router.push(`/workspace/${newWorkspace.id}/w`)
}
} catch (err) {
- console.error('Error creating workspace:', err)
+ logger.error('Error creating workspace:', err)
} finally {
setIsWorkspacesLoading(false)
}
@@ -396,7 +407,7 @@ export const WorkspaceHeader = React.memo(
if (!response.ok) {
if (response.status === 403) {
- console.error(
+ logger.error(
'Permission denied: Only users with admin permissions can update workspaces'
)
}
@@ -420,7 +431,7 @@ export const WorkspaceHeader = React.memo(
})
}
} catch (err) {
- console.error('Error updating workspace:', err)
+ logger.error('Error updating workspace:', err)
} finally {
setIsWorkspacesLoading(false)
}
@@ -442,7 +453,7 @@ export const WorkspaceHeader = React.memo(
if (!response.ok) {
if (response.status === 403) {
- console.error(
+ logger.error(
'Permission denied: Only users with admin permissions can delete workspaces'
)
}
@@ -463,7 +474,7 @@ export const WorkspaceHeader = React.memo(
setIsOpen(false)
} catch (err) {
- console.error('Error deleting workspace:', err)
+ logger.error('Error deleting workspace:', err)
} finally {
setIsDeleting(false)
}
@@ -486,7 +497,7 @@ export const WorkspaceHeader = React.memo(
// Determine URL for workspace links
const workspaceUrl = useMemo(
- () => (activeWorkspace ? `/w/${activeWorkspace.id}` : '/w'),
+ () => (activeWorkspace ? `/workspace/${activeWorkspace.id}/w` : '/workspace'),
[activeWorkspace]
)
diff --git a/apps/sim/app/w/components/sidebar/sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
similarity index 91%
rename from apps/sim/app/w/components/sidebar/sidebar.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
index e8485572e82..f1557a64796 100644
--- a/apps/sim/app/w/components/sidebar/sidebar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
@@ -3,12 +3,15 @@
import { useEffect, useMemo, useState } from 'react'
import clsx from 'clsx'
import { HelpCircle, LibraryBig, ScrollText, Send, Settings } from 'lucide-react'
-import { usePathname, useRouter } from 'next/navigation'
+import { useParams, usePathname, useRouter } from 'next/navigation'
import { Skeleton } from '@/components/ui/skeleton'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import { useSession } from '@/lib/auth-client'
import { createLogger } from '@/lib/logs/console-logger'
-import { getKeyboardShortcutText, useGlobalShortcuts } from '@/app/w/hooks/use-keyboard-shortcuts'
+import {
+ getKeyboardShortcutText,
+ useGlobalShortcuts,
+} from '@/app/workspace/[workspaceId]/w/hooks/use-keyboard-shortcuts'
import { useSidebarStore } from '@/stores/sidebar/store'
import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
import type { WorkflowMetadata } from '@/stores/workflows/registry/types'
@@ -31,16 +34,13 @@ export function Sidebar() {
useRegistryLoading()
useGlobalShortcuts()
- const {
- workflows,
- activeWorkspaceId,
- createWorkflow,
- isLoading: workflowsLoading,
- } = useWorkflowRegistry()
+ const { workflows, createWorkflow, isLoading: workflowsLoading } = useWorkflowRegistry()
const { isPending: sessionLoading } = useSession()
const userPermissions = useUserPermissionsContext()
const isLoading = workflowsLoading || sessionLoading
const router = useRouter()
+ const params = useParams()
+ const workspaceId = params.workspaceId as string
const pathname = usePathname()
const [showSettings, setShowSettings] = useState(false)
@@ -66,7 +66,7 @@ export function Sidebar() {
if (!isLoading) {
Object.values(workflows).forEach((workflow) => {
- if (workflow.workspaceId === activeWorkspaceId || !workflow.workspaceId) {
+ if (workflow.workspaceId === workspaceId || !workflow.workspaceId) {
if (workflow.marketplaceData?.status === 'temp') {
temp.push(workflow)
} else {
@@ -93,16 +93,16 @@ export function Sidebar() {
}
return { regularWorkflows: regular, tempWorkflows: temp }
- }, [workflows, isLoading, activeWorkspaceId])
+ }, [workflows, isLoading, workspaceId])
// Create workflow handler
const handleCreateWorkflow = async (folderId?: string) => {
try {
const id = await createWorkflow({
- workspaceId: activeWorkspaceId || undefined,
+ workspaceId: workspaceId || undefined,
folderId: folderId || undefined,
})
- router.push(`/w/${id}`)
+ router.push(`/workspace/${workspaceId}/w/${id}`)
} catch (error) {
logger.error('Error creating workflow:', error)
}
@@ -154,10 +154,10 @@ export function Sidebar() {
{/* Workflows Section */}
{isLoading ? : 'Workflows'}
@@ -179,18 +179,18 @@ export function Sidebar() {
}
- href='/w/logs'
+ href={`/workspace/${workspaceId}/logs`}
label='Logs'
- active={pathname === '/w/logs'}
+ active={pathname === `/workspace/${workspaceId}/logs`}
isCollapsed={isCollapsed}
shortcutCommand={getKeyboardShortcutText('L', true, true)}
shortcutCommandPosition='below'
/>
}
- href='/w/knowledge'
+ href={`/workspace/${workspaceId}/knowledge`}
label='Knowledge'
- active={pathname === '/w/knowledge'}
+ active={pathname === `/workspace/${workspaceId}/knowledge`}
isCollapsed={isCollapsed}
shortcutCommand={getKeyboardShortcutText('K', true, true)}
shortcutCommandPosition='below'
diff --git a/apps/sim/app/w/components/workflow-preview/workflow-preview.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/workflow-preview/workflow-preview.tsx
similarity index 93%
rename from apps/sim/app/w/components/workflow-preview/workflow-preview.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/workflow-preview/workflow-preview.tsx
index 79abac5ab47..ff6a7c2e97a 100644
--- a/apps/sim/app/w/components/workflow-preview/workflow-preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/workflow-preview/workflow-preview.tsx
@@ -15,10 +15,10 @@ import 'reactflow/dist/style.css'
import { createLogger } from '@/lib/logs/console-logger'
import { cn } from '@/lib/utils'
-import { LoopNodeComponent } from '@/app/w/[id]/components/loop-node/loop-node'
-import { ParallelNodeComponent } from '@/app/w/[id]/components/parallel-node/parallel-node'
-import { WorkflowBlock } from '@/app/w/[id]/components/workflow-block/workflow-block'
-import { WorkflowEdge } from '@/app/w/[id]/components/workflow-edge/workflow-edge'
+import { LoopNodeComponent } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/loop-node/loop-node'
+import { ParallelNodeComponent } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/parallel-node/parallel-node'
+import { WorkflowBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block'
+import { WorkflowEdge } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge'
import { getBlock } from '@/blocks'
import type { WorkflowState } from '@/stores/workflows/workflow/types'
diff --git a/apps/sim/app/w/hooks/use-keyboard-shortcuts.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-keyboard-shortcuts.ts
similarity index 89%
rename from apps/sim/app/w/hooks/use-keyboard-shortcuts.ts
rename to apps/sim/app/workspace/[workspaceId]/w/hooks/use-keyboard-shortcuts.ts
index 9f49d8a1818..70d418eb620 100644
--- a/apps/sim/app/w/hooks/use-keyboard-shortcuts.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-keyboard-shortcuts.ts
@@ -95,7 +95,16 @@ export function useGlobalShortcuts() {
((isMac && event.metaKey) || (!isMac && event.ctrlKey))
) {
event.preventDefault()
- router.push('/w/logs')
+
+ const pathParts = window.location.pathname.split('/')
+ const workspaceIndex = pathParts.indexOf('workspace')
+
+ if (workspaceIndex !== -1 && pathParts[workspaceIndex + 1]) {
+ const workspaceId = pathParts[workspaceIndex + 1]
+ router.push(`/workspace/${workspaceId}/logs`)
+ } else {
+ router.push('/workspace')
+ }
}
}
diff --git a/apps/sim/app/w/hooks/use-registry-loading.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-registry-loading.ts
similarity index 69%
rename from apps/sim/app/w/hooks/use-registry-loading.ts
rename to apps/sim/app/workspace/[workspaceId]/w/hooks/use-registry-loading.ts
index 207514e18fd..239a7148dbe 100644
--- a/apps/sim/app/w/hooks/use-registry-loading.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-registry-loading.ts
@@ -1,7 +1,7 @@
'use client'
import { useEffect } from 'react'
-import { usePathname, useRouter } from 'next/navigation'
+import { useParams, usePathname, useRouter } from 'next/navigation'
import { createLogger } from '@/lib/logs/console-logger'
import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
@@ -34,44 +34,41 @@ function extractWorkflowIdFromPathname(pathname: string): string | null {
* Custom hook to manage workflow registry loading state and handle first-time navigation
*
* This hook initializes the loading state and automatically clears it
- * when workflows are loaded. It also handles smart workspace selection
- * and navigation for first-time users.
+ * when workflows are loaded. It also handles navigation for first-time users.
*/
export function useRegistryLoading() {
- const { workflows, setLoading, isLoading, activeWorkspaceId, loadWorkspaceFromWorkflowId } =
- useWorkflowRegistry()
+ const { workflows, setLoading, isLoading, loadWorkflows } = useWorkflowRegistry()
const pathname = usePathname()
const router = useRouter()
+ const params = useParams()
+ const workspaceId = params.workspaceId as string
- // Handle workspace selection from URL
+ // Load workflows for current workspace
useEffect(() => {
- if (!activeWorkspaceId) {
- const workflowIdFromUrl = extractWorkflowIdFromPathname(pathname)
- if (workflowIdFromUrl) {
- loadWorkspaceFromWorkflowId(workflowIdFromUrl).catch((error) => {
- logger.warn('Failed to load workspace from workflow ID:', error)
- })
- }
+ if (workspaceId) {
+ loadWorkflows(workspaceId).catch((error) => {
+ logger.warn('Failed to load workflows for workspace:', error)
+ })
}
- }, [activeWorkspaceId, pathname, loadWorkspaceFromWorkflowId])
+ }, [workspaceId, loadWorkflows])
// Handle first-time navigation: if we're at /w and have workflows, navigate to first one
useEffect(() => {
- if (!isLoading && activeWorkspaceId && Object.keys(workflows).length > 0) {
- const workflowCount = Object.keys(workflows).length
+ if (!isLoading && workspaceId && Object.keys(workflows).length > 0) {
const currentWorkflowId = extractWorkflowIdFromPathname(pathname)
- // If we're at a generic workspace URL (/w, /w/, or /w/workspaceId) without a specific workflow
+ // Check if we're on the workspace root and need to redirect to first workflow
if (
- !currentWorkflowId &&
- (pathname === '/w' || pathname === '/w/' || pathname === `/w/${activeWorkspaceId}`)
+ (pathname === `/workspace/${workspaceId}/w` ||
+ pathname === `/workspace/${workspaceId}/w/`) &&
+ Object.keys(workflows).length > 0
) {
const firstWorkflowId = Object.keys(workflows)[0]
logger.info('First-time navigation: redirecting to first workflow:', firstWorkflowId)
- router.replace(`/w/${firstWorkflowId}`)
+ router.replace(`/workspace/${workspaceId}/w/${firstWorkflowId}`)
}
}
- }, [isLoading, activeWorkspaceId, workflows, pathname, router])
+ }, [isLoading, workspaceId, workflows, pathname, router])
// Handle loading states
useEffect(() => {
diff --git a/apps/sim/app/w/page.tsx b/apps/sim/app/workspace/[workspaceId]/w/page.tsx
similarity index 70%
rename from apps/sim/app/w/page.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/page.tsx
index fea6f1d2df9..998bd9a27b8 100644
--- a/apps/sim/app/w/page.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/page.tsx
@@ -1,12 +1,15 @@
'use client'
import { useEffect } from 'react'
-import { useRouter } from 'next/navigation'
+import { useParams, useRouter } from 'next/navigation'
+import { LoadingAgent } from '@/components/ui/loading-agent'
import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
export default function WorkflowsPage() {
const router = useRouter()
const { workflows, isLoading } = useWorkflowRegistry()
+ const params = useParams()
+ const workspaceId = params.workspaceId
useEffect(() => {
// Wait for workflows to load
@@ -16,7 +19,7 @@ export default function WorkflowsPage() {
// If we have workflows, redirect to the first one
if (workflowIds.length > 0) {
- router.replace(`/w/${workflowIds[0]}`)
+ router.replace(`/workspace/${workspaceId}/w/${workflowIds[0]}`)
return
}
@@ -24,14 +27,15 @@ export default function WorkflowsPage() {
// or the user doesn't have any workspaces. Redirect to home to let the system
// handle workspace/workflow creation properly.
router.replace('/')
- }, [workflows, isLoading, router])
+ }, [workflows, isLoading, router, workspaceId])
// Show loading state while determining where to redirect
return (
-
-
Loading workflows...
+
+
+
)
diff --git a/apps/sim/app/workspace/page.tsx b/apps/sim/app/workspace/page.tsx
new file mode 100644
index 00000000000..d6d6b54e62b
--- /dev/null
+++ b/apps/sim/app/workspace/page.tsx
@@ -0,0 +1,134 @@
+'use client'
+
+import { useEffect } from 'react'
+import { useRouter } from 'next/navigation'
+import { LoadingAgent } from '@/components/ui/loading-agent'
+import { useSession } from '@/lib/auth-client'
+import { createLogger } from '@/lib/logs/console-logger'
+
+const logger = createLogger('WorkspacePage')
+
+export default function WorkspacePage() {
+ const router = useRouter()
+ const { data: session, isPending } = useSession()
+
+ useEffect(() => {
+ const redirectToFirstWorkspace = async () => {
+ // Wait for session to load
+ if (isPending) {
+ return
+ }
+
+ // If user is not authenticated, redirect to login
+ if (!session?.user) {
+ logger.info('User not authenticated, redirecting to login')
+ router.replace('/login')
+ return
+ }
+
+ try {
+ // Check if we need to redirect a specific workflow from old URL format
+ const urlParams = new URLSearchParams(window.location.search)
+ const redirectWorkflowId = urlParams.get('redirect_workflow')
+
+ if (redirectWorkflowId) {
+ // Try to get the workspace for this workflow
+ try {
+ const workflowResponse = await fetch(`/api/workflows/${redirectWorkflowId}`)
+ if (workflowResponse.ok) {
+ const workflowData = await workflowResponse.json()
+ const workspaceId = workflowData.data?.workspaceId
+
+ if (workspaceId) {
+ logger.info(
+ `Redirecting workflow ${redirectWorkflowId} to workspace ${workspaceId}`
+ )
+ router.replace(`/workspace/${workspaceId}/w/${redirectWorkflowId}`)
+ return
+ }
+ }
+ } catch (error) {
+ logger.error('Error fetching workflow for redirect:', error)
+ }
+ }
+
+ // Fetch user's workspaces
+ const response = await fetch('/api/workspaces')
+
+ if (!response.ok) {
+ throw new Error('Failed to fetch workspaces')
+ }
+
+ const data = await response.json()
+ const workspaces = data.workspaces || []
+
+ if (workspaces.length === 0) {
+ logger.warn('No workspaces found for user, creating default workspace')
+
+ try {
+ const createResponse = await fetch('/api/workspaces', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({ name: 'My Workspace' }),
+ })
+
+ if (createResponse.ok) {
+ const createData = await createResponse.json()
+ const newWorkspace = createData.workspace
+
+ if (newWorkspace?.id) {
+ logger.info(`Created default workspace: ${newWorkspace.id}`)
+ router.replace(`/workspace/${newWorkspace.id}/w`)
+ return
+ }
+ }
+
+ logger.error('Failed to create default workspace')
+ } catch (createError) {
+ logger.error('Error creating default workspace:', createError)
+ }
+
+ // If we can't create a workspace, redirect to login to reset state
+ router.replace('/login')
+ return
+ }
+
+ // Get the first workspace (they should be ordered by most recent)
+ const firstWorkspace = workspaces[0]
+ logger.info(`Redirecting to first workspace: ${firstWorkspace.id}`)
+
+ // Redirect to the first workspace
+ router.replace(`/workspace/${firstWorkspace.id}/w`)
+ } catch (error) {
+ logger.error('Error fetching workspaces for redirect:', error)
+ // Don't redirect if there's an error - let the user stay on the page
+ }
+ }
+
+ // Only run this logic when we're at the root /workspace path
+ // If we're already in a specific workspace, the children components will handle it
+ if (typeof window !== 'undefined' && window.location.pathname === '/workspace') {
+ redirectToFirstWorkspace()
+ }
+ }, [session, isPending, router])
+
+ // Show loading state while we determine where to redirect
+ if (isPending) {
+ return (
+
+
+
+
+
+ )
+ }
+
+ // If user is not authenticated, show nothing (redirect will happen)
+ if (!session?.user) {
+ return null
+ }
+
+ return null
+}
diff --git a/apps/sim/components/ui/loading-agent.tsx b/apps/sim/components/ui/loading-agent.tsx
index 582d2ae609f..5f87b57f17d 100644
--- a/apps/sim/components/ui/loading-agent.tsx
+++ b/apps/sim/components/ui/loading-agent.tsx
@@ -11,7 +11,6 @@ export interface LoadingAgentProps {
export function LoadingAgent({ size = 'md' }: LoadingAgentProps) {
const pathLength = 120
- // Size mappings for width and height
const sizes = {
sm: { width: 16, height: 18 },
md: { width: 21, height: 24 },
diff --git a/apps/sim/components/ui/tag-dropdown.tsx b/apps/sim/components/ui/tag-dropdown.tsx
index 78c9bf0a146..cb3c15b9f00 100644
--- a/apps/sim/components/ui/tag-dropdown.tsx
+++ b/apps/sim/components/ui/tag-dropdown.tsx
@@ -2,7 +2,10 @@ import type React from 'react'
import { useCallback, useEffect, useMemo, useState } from 'react'
import { createLogger } from '@/lib/logs/console-logger'
import { cn } from '@/lib/utils'
-import { type ConnectedBlock, useBlockConnections } from '@/app/w/[id]/hooks/use-block-connections'
+import {
+ type ConnectedBlock,
+ useBlockConnections,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-connections'
import { getBlock } from '@/blocks'
import { useVariablesStore } from '@/stores/panel/variables/store'
import type { Variable } from '@/stores/panel/variables/types'
diff --git a/apps/sim/hooks/use-workspace-permissions.ts b/apps/sim/hooks/use-workspace-permissions.ts
index fb5ec21ba67..c4b4941ea60 100644
--- a/apps/sim/hooks/use-workspace-permissions.ts
+++ b/apps/sim/hooks/use-workspace-permissions.ts
@@ -5,7 +5,6 @@ import { API_ENDPOINTS } from '@/stores/constants'
const logger = createLogger('useWorkspacePermissions')
-// Use the enum from the database schema for type safety
export type PermissionType = (typeof permissionTypeEnum.enumValues)[number]
export interface WorkspaceUser {
diff --git a/apps/sim/lib/logs/trace-spans.ts b/apps/sim/lib/logs/trace-spans.ts
index eed9418a59f..02ef418f954 100644
--- a/apps/sim/lib/logs/trace-spans.ts
+++ b/apps/sim/lib/logs/trace-spans.ts
@@ -1,4 +1,4 @@
-import type { TraceSpan } from '@/app/w/logs/stores/types'
+import type { TraceSpan } from '@/app/workspace/[workspaceId]/logs/stores/types'
import type { ExecutionResult } from '@/executor/types'
// Helper function to build a tree of trace spans from execution logs
diff --git a/apps/sim/middleware.ts b/apps/sim/middleware.ts
index 6e958c91d16..286620c31b1 100644
--- a/apps/sim/middleware.ts
+++ b/apps/sim/middleware.ts
@@ -44,13 +44,24 @@ export async function middleware(request: NextRequest) {
return NextResponse.rewrite(new URL(`/chat/${subdomain}${url.pathname}`, request.url))
}
- // Check if the path is exactly /w
- if (url.pathname === '/w') {
- return NextResponse.redirect(new URL('/w/1', request.url))
+ // Legacy redirect: /w -> /workspace (will be handled by workspace layout)
+ if (url.pathname === '/w' || url.pathname.startsWith('/w/')) {
+ // Extract workflow ID if present
+ const pathParts = url.pathname.split('/')
+ if (pathParts.length >= 3 && pathParts[1] === 'w') {
+ const workflowId = pathParts[2]
+ // Redirect old workflow URLs to new format
+ // We'll need to resolve the workspace ID for this workflow
+ return NextResponse.redirect(
+ new URL(`/workspace?redirect_workflow=${workflowId}`, request.url)
+ )
+ }
+ // Simple /w redirect to workspace root
+ return NextResponse.redirect(new URL('/workspace', request.url))
}
// Handle protected routes that require authentication
- if (url.pathname.startsWith('/w/') || url.pathname === '/w') {
+ if (url.pathname.startsWith('/workspace')) {
if (!hasActiveSession) {
return NextResponse.redirect(new URL('/login', request.url))
}
@@ -137,8 +148,9 @@ export async function middleware(request: NextRequest) {
// Update matcher to include invitation routes
export const config = {
matcher: [
- '/w', // Match exactly /w
- '/w/:path*', // Match protected routes
+ '/w', // Legacy /w redirect
+ '/w/:path*', // Legacy /w/* redirects
+ '/workspace/:path*', // New workspace routes
'/login',
'/signup',
'/invite/:path*', // Match invitation routes
diff --git a/apps/sim/stores/folders/store.ts b/apps/sim/stores/folders/store.ts
index efa25f2ef79..57ad937eb4f 100644
--- a/apps/sim/stores/folders/store.ts
+++ b/apps/sim/stores/folders/store.ts
@@ -71,7 +71,7 @@ interface FolderState {
color?: string
}) => Promise
updateFolderAPI: (id: string, updates: Partial) => Promise
- deleteFolder: (id: string) => Promise
+ deleteFolder: (id: string, workspaceId: string) => Promise
// Helper functions
isWorkflowInDeletedSubfolder: (workflow: Workflow, deletedFolderId: string) => boolean
@@ -304,7 +304,7 @@ export const useFolderStore = create()(
return processedFolder
},
- deleteFolder: async (id: string) => {
+ deleteFolder: async (id: string, workspaceId: string) => {
const response = await fetch(`/api/folders/${id}`, { method: 'DELETE' })
if (!response.ok) {
@@ -346,9 +346,9 @@ export const useFolderStore = create()(
}
}
- if (workflowRegistry.activeWorkspaceId) {
+ if (workspaceId) {
// Trigger workflow refresh through registry store
- await workflowRegistry.switchToWorkspace(workflowRegistry.activeWorkspaceId)
+ await workflowRegistry.switchToWorkspace(workspaceId)
}
},
diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index 347685dce12..8c265e03452 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -9,7 +9,6 @@ import { useNotificationStore } from './notifications/store'
import { useConsoleStore } from './panel/console/store'
import { useVariablesStore } from './panel/variables/store'
import { useEnvironmentStore } from './settings/environment/store'
-// Removed sync system imports - Socket.IO handles real-time sync
import { useWorkflowRegistry } from './workflows/registry/store'
import { useSubBlockStore } from './workflows/subblock/store'
import { useWorkflowStore } from './workflows/workflow/store'
@@ -41,12 +40,6 @@ async function initializeApplication(): Promise {
// Load custom tools from server
await useCustomToolsStore.getState().loadCustomTools()
- // Extract workflow ID from URL for smart workspace selection
- const workflowIdFromUrl = extractWorkflowIdFromUrl()
-
- // Load workspace based on workflow ID in URL, with fallback to last active workspace
- await useWorkflowRegistry.getState().loadWorkspaceFromWorkflowId(workflowIdFromUrl)
-
// Load workflows from database (replaced sync system)
await useWorkflowRegistry.getState().loadWorkflows()
diff --git a/apps/sim/stores/workflows/index.ts b/apps/sim/stores/workflows/index.ts
index 161957de7c7..5fe909c51f6 100644
--- a/apps/sim/stores/workflows/index.ts
+++ b/apps/sim/stores/workflows/index.ts
@@ -88,7 +88,7 @@ export function getBlockWithValues(blockId: string): BlockState | null {
* @returns An object containing workflows, with state only for the active workflow
*/
export function getAllWorkflowsWithValues() {
- const { workflows, activeWorkspaceId } = useWorkflowRegistry.getState()
+ const { workflows } = useWorkflowRegistry.getState()
const result: Record = {}
const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
const currentState = useWorkflowStore.getState()
@@ -97,14 +97,6 @@ export function getAllWorkflowsWithValues() {
if (activeWorkflowId && workflows[activeWorkflowId]) {
const metadata = workflows[activeWorkflowId]
- // Skip if workflow doesn't belong to the active workspace
- if (activeWorkspaceId && metadata.workspaceId !== activeWorkspaceId) {
- logger.debug(
- `Skipping active workflow ${activeWorkflowId} - belongs to workspace ${metadata.workspaceId}, not active workspace ${activeWorkspaceId}`
- )
- return result
- }
-
// Get deployment status from registry
const deploymentStatus = useWorkflowRegistry
.getState()
@@ -157,17 +149,10 @@ export function getAllWorkflowsWithValues() {
return result
}
-// Removed syncWorkflows - Socket.IO handles real-time sync automatically
-
-// Workflows store exports - localStorage persistence removed
-
export { useWorkflowRegistry } from './registry/store'
export type { WorkflowMetadata } from './registry/types'
export { useSubBlockStore } from './subblock/store'
export type { SubBlockStore } from './subblock/types'
-// Re-export utilities
export { mergeSubblockState } from './utils'
-// Re-export store hooks
export { useWorkflowStore } from './workflow/store'
-// Re-export types
export type { WorkflowState } from './workflow/types'
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 0ce08f959d5..4968c2dac29 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -4,7 +4,6 @@ import { createLogger } from '@/lib/logs/console-logger'
import { clearWorkflowVariablesTracking } from '@/stores/panel/variables/store'
import { API_ENDPOINTS } from '../../constants'
import { useSubBlockStore } from '../subblock/store'
-// Removed fetchWorkflowsFromDB import - moved to local function
import { useWorkflowStore } from '../workflow/store'
import type { BlockState } from '../workflow/types'
import type { DeploymentStatus, WorkflowMetadata, WorkflowRegistry } from './types'
@@ -12,11 +11,10 @@ import { generateUniqueName, getNextWorkflowColor } from './utils'
const logger = createLogger('WorkflowRegistry')
-// Simplified function to fetch workflows from DB (moved from sync.ts)
let isFetching = false
let lastFetchTimestamp = 0
-async function fetchWorkflowsFromDB(): Promise {
+async function fetchWorkflowsFromDB(workspaceId?: string): Promise {
if (typeof window === 'undefined') return
// Prevent concurrent fetch operations
@@ -31,11 +29,10 @@ async function fetchWorkflowsFromDB(): Promise {
try {
useWorkflowRegistry.getState().setLoading(true)
- const activeWorkspaceId = useWorkflowRegistry.getState().activeWorkspaceId
const url = new URL(API_ENDPOINTS.SYNC, window.location.origin)
- if (activeWorkspaceId) {
- url.searchParams.append('workspaceId', activeWorkspaceId)
+ if (workspaceId) {
+ url.searchParams.append('workspaceId', workspaceId)
}
const response = await fetch(url.toString(), { method: 'GET' })
@@ -99,10 +96,7 @@ async function fetchWorkflowsFromDB(): Promise {
apiKey,
} = workflow
- // Skip if workflow doesn't belong to active workspace
- if (activeWorkspaceId && workspaceId !== activeWorkspaceId) {
- return
- }
+ // No need to filter by workspace since we're already fetching for specific workspace
// Add to registry
registryWorkflows[id] = {
@@ -256,7 +250,6 @@ export const useWorkflowRegistry = create()(
// Store state
workflows: {},
activeWorkflowId: null,
- activeWorkspaceId: null, // No longer persisted in localStorage
isLoading: true,
error: null,
// Initialize deployment statuses
@@ -270,24 +263,17 @@ export const useWorkflowRegistry = create()(
},
// Simple method to load workflows (replaces sync system)
- loadWorkflows: async () => {
- await fetchWorkflowsFromDB()
+ loadWorkflows: async (workspaceId?: string) => {
+ await fetchWorkflowsFromDB(workspaceId)
},
// Handle cleanup on workspace deletion
handleWorkspaceDeletion: async (newWorkspaceId: string) => {
- const currentWorkspaceId = get().activeWorkspaceId
-
- if (!newWorkspaceId || newWorkspaceId === currentWorkspaceId) {
- logger.error('Cannot switch to invalid workspace after deletion')
- return
- }
-
// Set transition state
setWorkspaceTransitioning(true)
try {
- logger.info(`Switching from deleted workspace ${currentWorkspaceId} to ${newWorkspaceId}`)
+ logger.info(`Switching to new workspace after deletion: ${newWorkspaceId}`)
// Reset all workflow state
resetWorkflowStores()
@@ -296,12 +282,11 @@ export const useWorkflowRegistry = create()(
set({
isLoading: true,
workflows: {},
- activeWorkspaceId: newWorkspaceId,
activeWorkflowId: null,
})
// Properly await workflow fetching to prevent race conditions
- await fetchWorkflowsFromDB()
+ await fetchWorkflowsFromDB(newWorkspaceId)
set({ isLoading: false })
logger.info(`Successfully switched to workspace after deletion: ${newWorkspaceId}`)
@@ -327,29 +312,17 @@ export const useWorkflowRegistry = create()(
return
}
- const { activeWorkspaceId: currentWorkspaceId } = get()
-
- // Early return if switching to the same workspace (before setting flag)
- if (currentWorkspaceId === workspaceId) {
- logger.info(`Already in workspace ${workspaceId}`)
- return
- }
-
- // Only set transition flag AFTER validating the switch is needed
+ // Set transition flag
setWorkspaceTransitioning(true)
try {
- logger.info(`Switching workspace from ${currentWorkspaceId || 'none'} to ${workspaceId}`)
-
- // Save to localStorage first before any async operations
- get().setActiveWorkspaceId(workspaceId)
+ logger.info(`Switching to workspace: ${workspaceId}`)
// Clear current workspace state
resetWorkflowStores()
- // Update workspace in state
+ // Update state
set({
- activeWorkspaceId: workspaceId,
activeWorkflowId: null,
workflows: {},
isLoading: true,
@@ -357,7 +330,7 @@ export const useWorkflowRegistry = create()(
})
// Fetch workflows for the new workspace
- await fetchWorkflowsFromDB()
+ await fetchWorkflowsFromDB(workspaceId)
logger.info(`Successfully switched to workspace: ${workspaceId}`)
} catch (error) {
@@ -371,128 +344,6 @@ export const useWorkflowRegistry = create()(
}
},
- // Load user's last active workspace from localStorage
- loadLastActiveWorkspace: async () => {
- try {
- const savedWorkspaceId = localStorage.getItem('lastActiveWorkspaceId')
- if (!savedWorkspaceId || savedWorkspaceId === get().activeWorkspaceId) {
- return // No saved workspace or already active
- }
-
- logger.info(`Attempting to restore last active workspace: ${savedWorkspaceId}`)
-
- // Validate that the workspace exists by making a simple API call
- try {
- const response = await fetch('/api/workspaces')
- if (response.ok) {
- const data = await response.json()
- const workspaces = data.workspaces || []
- const workspaceExists = workspaces.some((ws: any) => ws.id === savedWorkspaceId)
-
- if (workspaceExists) {
- // Set the validated workspace ID
- set({ activeWorkspaceId: savedWorkspaceId })
- logger.info(`Restored last active workspace from localStorage: ${savedWorkspaceId}`)
- } else {
- logger.warn(
- `Saved workspace ${savedWorkspaceId} no longer exists, clearing from localStorage`
- )
- localStorage.removeItem('lastActiveWorkspaceId')
- }
- }
- } catch (apiError) {
- logger.warn('Failed to validate saved workspace, will use default:', apiError)
- // Don't remove from localStorage in case it's a temporary network issue
- }
- } catch (error) {
- logger.warn('Failed to load last active workspace from localStorage:', error)
- // This is non-critical, so we continue with default behavior
- }
- },
-
- // Load workspace based on workflow ID from URL, with fallback to last active workspace
- loadWorkspaceFromWorkflowId: async (workflowId: string | null) => {
- try {
- logger.info(`Loading workspace for workflow ID: ${workflowId}`)
-
- // If workflow ID provided, try to get its workspace
- if (workflowId) {
- try {
- const response = await fetch(`/api/workflows/${workflowId}`)
- if (response.ok) {
- const data = await response.json()
- const workflow = data.data
-
- if (workflow?.workspaceId) {
- // Validate workspace access
- const workspacesResponse = await fetch('/api/workspaces')
- if (workspacesResponse.ok) {
- const workspacesData = await workspacesResponse.json()
- const workspaces = workspacesData.workspaces || []
- const workspaceExists = workspaces.some(
- (ws: any) => ws.id === workflow.workspaceId
- )
-
- if (workspaceExists) {
- set({ activeWorkspaceId: workflow.workspaceId })
- localStorage.setItem('lastActiveWorkspaceId', workflow.workspaceId)
- logger.info(`Set active workspace from workflow: ${workflow.workspaceId}`)
- return
- }
- }
- }
- }
- } catch (error) {
- logger.warn('Error fetching workflow:', error)
- }
- }
-
- // Fallback: use last active workspace or first available
- const savedWorkspaceId = localStorage.getItem('lastActiveWorkspaceId')
- const response = await fetch('/api/workspaces')
-
- if (response.ok) {
- const data = await response.json()
- const workspaces = data.workspaces || []
-
- if (workspaces.length === 0) {
- logger.warn('No workspaces found')
- return
- }
-
- // Try saved workspace first
- let targetWorkspace = savedWorkspaceId
- ? workspaces.find((ws: any) => ws.id === savedWorkspaceId)
- : null
-
- // Fall back to first workspace
- if (!targetWorkspace) {
- targetWorkspace = workspaces[0]
- if (savedWorkspaceId) {
- localStorage.removeItem('lastActiveWorkspaceId')
- }
- }
-
- set({ activeWorkspaceId: targetWorkspace.id })
- localStorage.setItem('lastActiveWorkspaceId', targetWorkspace.id)
- logger.info(`Set active workspace: ${targetWorkspace.id}`)
- }
- } catch (error) {
- logger.error('Error in loadWorkspaceFromWorkflowId:', error)
- }
- },
-
- // Simple method to set active workspace ID without triggering full switch
- setActiveWorkspaceId: (id: string) => {
- set({ activeWorkspaceId: id })
- // Save to localStorage as well
- try {
- localStorage.setItem('lastActiveWorkspaceId', id)
- } catch (error) {
- logger.warn('Failed to save workspace to localStorage:', error)
- }
- },
-
// Method to get deployment status for a specific workflow
getWorkflowDeploymentStatus: (workflowId: string | null): DeploymentStatus | null => {
if (!workflowId) {
@@ -735,14 +586,19 @@ export const useWorkflowRegistry = create()(
* @returns The ID of the newly created workflow
*/
createWorkflow: async (options = {}) => {
- const { workflows, activeWorkspaceId } = get()
+ const { workflows } = get()
const id = crypto.randomUUID()
- // Use provided workspace ID or fall back to active workspace ID
- const workspaceId = options.workspaceId || activeWorkspaceId || undefined
+ // Use provided workspace ID (must be provided since we no longer track active workspace)
+ const workspaceId = options.workspaceId
- logger.info(`Creating new workflow in workspace: ${workspaceId || 'none'}`)
+ if (!workspaceId) {
+ logger.error('Cannot create workflow without workspaceId')
+ set({ error: 'Workspace ID is required to create a workflow' })
+ throw new Error('Workspace ID is required to create a workflow')
+ }
+ logger.info(`Creating new workflow in workspace: ${workspaceId || 'none'}`)
// Generate workflow metadata with appropriate name and color
const newWorkflow: WorkflowMetadata = {
id,
@@ -1153,7 +1009,7 @@ export const useWorkflowRegistry = create()(
* Duplicates an existing workflow
*/
duplicateWorkflow: async (sourceId: string) => {
- const { workflows, activeWorkspaceId } = get()
+ const { workflows } = get()
const sourceWorkflow = workflows[sourceId]
if (!sourceWorkflow) {
@@ -1161,8 +1017,8 @@ export const useWorkflowRegistry = create()(
return null
}
- // Get the workspace ID from the source workflow or fall back to active workspace
- const workspaceId = sourceWorkflow.workspaceId || activeWorkspaceId || undefined
+ // Get the workspace ID from the source workflow (required)
+ const workspaceId = sourceWorkflow.workspaceId
// Call the server to duplicate the workflow - server generates all IDs
let duplicatedWorkflow
@@ -1594,7 +1450,6 @@ export const useWorkflowRegistry = create()(
set({
workflows: {},
activeWorkflowId: null,
- activeWorkspaceId: null,
isLoading: true,
error: null,
})
diff --git a/apps/sim/stores/workflows/registry/types.ts b/apps/sim/stores/workflows/registry/types.ts
index efc854b835b..5e9234b28bb 100644
--- a/apps/sim/stores/workflows/registry/types.ts
+++ b/apps/sim/stores/workflows/registry/types.ts
@@ -24,7 +24,6 @@ export interface WorkflowMetadata {
export interface WorkflowRegistryState {
workflows: Record
activeWorkflowId: string | null
- activeWorkspaceId: string | null
isLoading: boolean
error: string | null
deploymentStatuses: Record
@@ -34,10 +33,7 @@ export interface WorkflowRegistryActions {
setLoading: (loading: boolean) => void
setActiveWorkflow: (id: string) => Promise
switchToWorkspace: (id: string) => void
- setActiveWorkspaceId: (id: string) => void
- loadLastActiveWorkspace: () => Promise
- loadWorkspaceFromWorkflowId: (workflowId: string | null) => Promise
- loadWorkflows: () => Promise
+ loadWorkflows: (workspaceId?: string) => Promise
handleWorkspaceDeletion: (newWorkspaceId: string) => void
removeWorkflow: (id: string) => Promise
updateWorkflow: (id: string, metadata: Partial) => Promise
diff --git a/apps/sim/stores/workflows/workflow/types.ts b/apps/sim/stores/workflows/workflow/types.ts
index 3ad2725f0cd..65ef3624515 100644
--- a/apps/sim/stores/workflows/workflow/types.ts
+++ b/apps/sim/stores/workflows/workflow/types.ts
@@ -2,24 +2,17 @@ import type { Edge } from 'reactflow'
import type { BlockOutput, SubBlockType } from '@/blocks/types'
import type { DeploymentStatus } from '../registry/types'
-// Centralized subflow type system - easy to extend without database changes
export const SUBFLOW_TYPES = {
LOOP: 'loop',
PARALLEL: 'parallel',
- // Future types can be added here:
- // CONDITIONAL: 'conditional',
- // RETRY: 'retry',
- // BATCH: 'batch',
} as const
export type SubflowType = (typeof SUBFLOW_TYPES)[keyof typeof SUBFLOW_TYPES]
-// Type guard for runtime validation
export function isValidSubflowType(type: string): type is SubflowType {
return Object.values(SUBFLOW_TYPES).includes(type as SubflowType)
}
-// Subflow configuration interfaces
export interface LoopConfig {
nodes: string[]
iterations: number