This commit is contained in:
Philipinho
2026-06-20 14:03:50 +01:00
parent 9d19a3269f
commit 94845eac41
5 changed files with 16 additions and 16 deletions
@@ -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,
@@ -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);
@@ -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 {
@@ -60,5 +60,5 @@ export class UpdateWorkspaceDto extends PartialType(CreateWorkspaceDto) {
@IsOptional()
@IsBoolean()
enablePersonalSpaces: boolean;
allowPersonalSpaces: boolean;
}
@@ -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,