diff --git a/apps/client/src/components/layouts/global/top-menu.tsx b/apps/client/src/components/layouts/global/top-menu.tsx index f4cdf50e8..9ee13e9c9 100644 --- a/apps/client/src/components/layouts/global/top-menu.tsx +++ b/apps/client/src/components/layouts/global/top-menu.tsx @@ -44,7 +44,7 @@ export default function TopMenu() { const workspace = currentUser?.workspace; const hasPersonalSpaces = useHasFeature(Feature.PERSONAL_SPACES); - const settingEnabled = workspace?.settings?.spaces?.personal === true; + const settingEnabled = workspace?.settings?.spaces?.allowPersonal === true; const { data: personalSpace } = usePersonalSpaceQuery(hasPersonalSpaces); const [ createOpened, diff --git a/apps/client/src/ee/personal-space/components/personal-spaces-setting.tsx b/apps/client/src/ee/personal-space/components/personal-spaces-setting.tsx index 8babd72ee..ba393df8f 100644 --- a/apps/client/src/ee/personal-space/components/personal-spaces-setting.tsx +++ b/apps/client/src/ee/personal-space/components/personal-spaces-setting.tsx @@ -32,7 +32,7 @@ function PersonalSpacesToggle() { const { t } = useTranslation(); const [workspace, setWorkspace] = useAtom(workspaceAtom); const [checked, setChecked] = useState( - workspace?.settings?.spaces?.personal === true, + workspace?.settings?.spaces?.allowPersonal === true, ); const hasPersonalSpaces = useHasFeature(Feature.PERSONAL_SPACES); const upgradeLabel = useUpgradeLabel(); @@ -41,7 +41,7 @@ function PersonalSpacesToggle() { const value = event.currentTarget.checked; try { const updatedWorkspace = await updateWorkspace({ - enablePersonalSpaces: value, + allowPersonalSpaces: value, }); setChecked(value); setWorkspace(updatedWorkspace); diff --git a/apps/client/src/features/workspace/types/workspace.types.ts b/apps/client/src/features/workspace/types/workspace.types.ts index 6a227b78b..eb927e789 100644 --- a/apps/client/src/features/workspace/types/workspace.types.ts +++ b/apps/client/src/features/workspace/types/workspace.types.ts @@ -28,7 +28,7 @@ export interface IWorkspace { trashRetentionDays?: number; restrictApiToAdmins?: boolean; allowMemberTemplates?: boolean; - enablePersonalSpaces?: boolean; + allowPersonalSpaces?: boolean; isScimEnabled?: boolean; } @@ -60,7 +60,7 @@ export interface IWorkspaceTemplateSettings { } export interface IWorkspaceSpaceSettings { - personal?: boolean; + allowPersonal?: boolean; } export interface ICreateInvite { diff --git a/apps/server/src/core/workspace/dto/update-workspace.dto.ts b/apps/server/src/core/workspace/dto/update-workspace.dto.ts index 91f802950..4d0a650b3 100644 --- a/apps/server/src/core/workspace/dto/update-workspace.dto.ts +++ b/apps/server/src/core/workspace/dto/update-workspace.dto.ts @@ -60,5 +60,5 @@ export class UpdateWorkspaceDto extends PartialType(CreateWorkspaceDto) { @IsOptional() @IsBoolean() - enablePersonalSpaces: boolean; + allowPersonalSpaces: boolean; } diff --git a/apps/server/src/core/workspace/services/workspace.service.ts b/apps/server/src/core/workspace/services/workspace.service.ts index d6c84560d..8f5e3c993 100644 --- a/apps/server/src/core/workspace/services/workspace.service.ts +++ b/apps/server/src/core/workspace/services/workspace.service.ts @@ -334,7 +334,7 @@ export class WorkspaceService { typeof updateWorkspaceDto.restrictApiToAdmins !== 'undefined' || typeof updateWorkspaceDto.allowMemberTemplates !== 'undefined' || typeof updateWorkspaceDto.isScimEnabled !== 'undefined' || - typeof updateWorkspaceDto.enablePersonalSpaces !== 'undefined' + typeof updateWorkspaceDto.allowPersonalSpaces !== 'undefined' ) { const ws = await this.db .selectFrom('workspaces') @@ -362,7 +362,7 @@ export class WorkspaceService { } } - if (typeof updateWorkspaceDto.enablePersonalSpaces !== 'undefined') { + if (typeof updateWorkspaceDto.allowPersonalSpaces !== 'undefined') { if ( !this.licenseCheckService.hasFeature( ws.licenseKey, @@ -513,16 +513,16 @@ export class WorkspaceService { ); } - if (typeof updateWorkspaceDto.enablePersonalSpaces !== 'undefined') { - const prev = settingsBefore?.spaces?.personal ?? false; - if (prev !== updateWorkspaceDto.enablePersonalSpaces) { - before.enablePersonalSpaces = prev; - after.enablePersonalSpaces = updateWorkspaceDto.enablePersonalSpaces; + if (typeof updateWorkspaceDto.allowPersonalSpaces !== 'undefined') { + const prev = settingsBefore?.spaces?.allowPersonal ?? false; + if (prev !== updateWorkspaceDto.allowPersonalSpaces) { + before.allowPersonalSpaces = prev; + after.allowPersonalSpaces = updateWorkspaceDto.allowPersonalSpaces; } await this.workspaceRepo.updateSpaceSettings( workspaceId, - 'personal', - updateWorkspaceDto.enablePersonalSpaces, + 'allowPersonal', + updateWorkspaceDto.allowPersonalSpaces, trx, ); } @@ -534,7 +534,7 @@ export class WorkspaceService { delete updateWorkspaceDto.mcpEnabled; delete updateWorkspaceDto.allowMemberTemplates; delete updateWorkspaceDto.aiChat; - delete updateWorkspaceDto.enablePersonalSpaces; + delete updateWorkspaceDto.allowPersonalSpaces; await this.workspaceRepo.updateWorkspace( updateWorkspaceDto,