Skip to content

Commit b5bec55

Browse files
committed
improvement(workspace): remove tip + simplify modal header text
1 parent 0bcf64a commit b5bec55

3 files changed

Lines changed: 4 additions & 68 deletions

File tree

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/create-workspace-modal/create-workspace-modal.test.ts

Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,13 @@ import {
1111
} from '@sim/emcn'
1212
import { getErrorMessage } from '@sim/utils/errors'
1313

14-
export type CreateWorkspaceTarget =
15-
| { type: 'personal' }
16-
| { type: 'organization'; organizationName: string }
17-
18-
export function getCreateWorkspaceCopy(target: CreateWorkspaceTarget) {
19-
if (target.type === 'organization') {
20-
return {
21-
title: `Create workspace in ${target.organizationName}`,
22-
description: `This workspace will belong to ${target.organizationName} and use its workspace policy.`,
23-
}
24-
}
25-
26-
return {
27-
title: 'Create personal workspace',
28-
description: 'This workspace will belong to your personal account.',
29-
}
30-
}
14+
const TITLE = 'Create workspace'
3115

3216
interface CreateWorkspaceModalProps {
3317
open: boolean
3418
onOpenChange: (open: boolean) => void
3519
onConfirm: (name: string) => Promise<void>
3620
isCreating: boolean
37-
target: CreateWorkspaceTarget
3821
}
3922

4023
/**
@@ -45,7 +28,6 @@ export function CreateWorkspaceModal({
4528
onOpenChange,
4629
onConfirm,
4730
isCreating,
48-
target,
4931
}: CreateWorkspaceModalProps) {
5032
const [name, setName] = useState('')
5133
const [error, setError] = useState<string | null>(null)
@@ -74,13 +56,10 @@ export function CreateWorkspaceModal({
7456
setError(null)
7557
}
7658

77-
const copy = getCreateWorkspaceCopy(target)
78-
7959
return (
80-
<ChipModal open={open} onOpenChange={onOpenChange} srTitle={copy.title}>
81-
<ChipModalHeader onClose={() => onOpenChange(false)}>{copy.title}</ChipModalHeader>
60+
<ChipModal open={open} onOpenChange={onOpenChange} srTitle={TITLE}>
61+
<ChipModalHeader onClose={() => onOpenChange(false)}>{TITLE}</ChipModalHeader>
8262
<ChipModalBody>
83-
<p className='px-2 text-[var(--text-muted)] text-sm'>{copy.description}</p>
8463
<ChipModalField
8564
type='input'
8665
title='Name'

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@ import { ManageWorkspace, PanelLeft } from '@sim/emcn/icons'
2222
import { createLogger } from '@sim/logger'
2323
import { useQueryClient } from '@tanstack/react-query'
2424
import { MoreHorizontal, Search } from 'lucide-react'
25-
import { useActiveOrganization } from '@/lib/auth/auth-client'
2625
import { isBillingEnabled } from '@/lib/core/config/env-flags'
2726
import { InviteModal } from '@/app/workspace/[workspaceId]/components/invite-modal'
2827
import { useWorkspacePermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
2928
import { ContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu'
3029
import { DeleteModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal'
31-
import {
32-
CreateWorkspaceModal,
33-
type CreateWorkspaceTarget,
34-
} from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/create-workspace-modal/create-workspace-modal'
30+
import { CreateWorkspaceModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/create-workspace-modal/create-workspace-modal'
3531
import { ViewInvitationsMenuItem } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/pending-invitations/view-invitations-menu-item'
3632
import { ViewInvitationsModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/pending-invitations/view-invitations-modal'
3733
import { invitationKeys } from '@/hooks/queries/invitations'
@@ -249,7 +245,6 @@ function WorkspaceHeaderImpl({
249245
setIsMounted(true)
250246
}, [])
251247

252-
const { data: viewerActiveOrganization } = useActiveOrganization()
253248
const { navigateToSettings } = useSettingsNavigation()
254249
const queryClient = useQueryClient()
255250

@@ -268,17 +263,6 @@ function WorkspaceHeaderImpl({
268263
const { userPermissions } = useWorkspacePermissionsContext()
269264
const inviteDisabledReason = activeWorkspaceFull?.inviteDisabledReason ?? null
270265
const isInvitationsDisabled = isInvitationsDisabledByConfig || inviteDisabledReason !== null
271-
const createWorkspaceTarget: CreateWorkspaceTarget =
272-
workspaceCreationPolicy?.workspaceMode === 'organization' &&
273-
workspaceCreationPolicy.organizationId
274-
? {
275-
type: 'organization',
276-
organizationName:
277-
viewerActiveOrganization?.id === workspaceCreationPolicy.organizationId
278-
? viewerActiveOrganization.name
279-
: 'your organization',
280-
}
281-
: { type: 'personal' }
282266

283267
/**
284268
* Save and exit edit mode when popover closes
@@ -902,7 +886,6 @@ function WorkspaceHeaderImpl({
902886
setIsCreateModalOpen(false)
903887
}}
904888
isCreating={isCreatingWorkspace}
905-
target={createWorkspaceTarget}
906889
/>
907890

908891
<InviteModal

0 commit comments

Comments
 (0)