Ryan/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost.git synced 2026-07-27 03:24:45 +10:00
Code Issues Packages Projects Releases Wiki Activity

pref

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/components/layouts/global/top-menu.tsx
+1 -1
View File
@@ -44,7 +44,7 @@ export default function TopMenu() {
const workspace = currentUser?.workspace; const workspace = currentUser?.workspace;
const hasPersonalSpaces = useHasFeature(Feature.PERSONAL_SPACES); 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 { data: personalSpace } = usePersonalSpaceQuery(hasPersonalSpaces);
const [ const [
createOpened, createOpened,
apps/client/src/ee/personal-space/components/personal-spaces-setting.tsx
+2 -2
View File
@@ -32,7 +32,7 @@ function PersonalSpacesToggle() {
const { t } = useTranslation(); const { t } = useTranslation();
const [workspace, setWorkspace] = useAtom(workspaceAtom); const [workspace, setWorkspace] = useAtom(workspaceAtom);
const [checked, setChecked] = useState( const [checked, setChecked] = useState(
workspace?.settings?.spaces?.personal === true, workspace?.settings?.spaces?.allowPersonal === true,
); );
const hasPersonalSpaces = useHasFeature(Feature.PERSONAL_SPACES); const hasPersonalSpaces = useHasFeature(Feature.PERSONAL_SPACES);
const upgradeLabel = useUpgradeLabel(); const upgradeLabel = useUpgradeLabel();
@@ -41,7 +41,7 @@ function PersonalSpacesToggle() {
const value = event.currentTarget.checked; const value = event.currentTarget.checked;
try { try {
const updatedWorkspace = await updateWorkspace({ const updatedWorkspace = await updateWorkspace({
enablePersonalSpaces: value, allowPersonalSpaces: value,
}); });
setChecked(value); setChecked(value);
setWorkspace(updatedWorkspace); setWorkspace(updatedWorkspace);
apps/client/src/features/workspace/types/workspace.types.ts
+2 -2
View File
@@ -28,7 +28,7 @@ export interface IWorkspace {
trashRetentionDays?: number; trashRetentionDays?: number;
restrictApiToAdmins?: boolean; restrictApiToAdmins?: boolean;
allowMemberTemplates?: boolean; allowMemberTemplates?: boolean;
enablePersonalSpaces?: boolean; allowPersonalSpaces?: boolean;
isScimEnabled?: boolean; isScimEnabled?: boolean;
} }
@@ -60,7 +60,7 @@ export interface IWorkspaceTemplateSettings {
} }
export interface IWorkspaceSpaceSettings { export interface IWorkspaceSpaceSettings {
personal?: boolean; allowPersonal?: boolean;
} }
export interface ICreateInvite { export interface ICreateInvite {
apps/server/src/core/workspace/dto/update-workspace.dto.ts
+1 -1
View File
@@ -60,5 +60,5 @@ export class UpdateWorkspaceDto extends PartialType(CreateWorkspaceDto) {
@IsOptional() @IsOptional()
@IsBoolean() @IsBoolean()
enablePersonalSpaces: boolean; allowPersonalSpaces: boolean;
} }
apps/server/src/core/workspace/services/workspace.service.ts
+10 -10
View File
@@ -334,7 +334,7 @@ export class WorkspaceService {
typeof updateWorkspaceDto.restrictApiToAdmins !== 'undefined' || typeof updateWorkspaceDto.restrictApiToAdmins !== 'undefined' ||
typeof updateWorkspaceDto.allowMemberTemplates !== 'undefined' || typeof updateWorkspaceDto.allowMemberTemplates !== 'undefined' ||
typeof updateWorkspaceDto.isScimEnabled !== 'undefined' || typeof updateWorkspaceDto.isScimEnabled !== 'undefined' ||
typeof updateWorkspaceDto.enablePersonalSpaces !== 'undefined' typeof updateWorkspaceDto.allowPersonalSpaces !== 'undefined'
) { ) {
const ws = await this.db const ws = await this.db
.selectFrom('workspaces') .selectFrom('workspaces')
@@ -362,7 +362,7 @@ export class WorkspaceService {
} }
} }
if (typeof updateWorkspaceDto.enablePersonalSpaces !== 'undefined') { if (typeof updateWorkspaceDto.allowPersonalSpaces !== 'undefined') {
if ( if (
!this.licenseCheckService.hasFeature( !this.licenseCheckService.hasFeature(
ws.licenseKey, ws.licenseKey,
@@ -513,16 +513,16 @@ export class WorkspaceService {
); );
} }
if (typeof updateWorkspaceDto.enablePersonalSpaces !== 'undefined') { if (typeof updateWorkspaceDto.allowPersonalSpaces !== 'undefined') {
const prev = settingsBefore?.spaces?.personal ?? false; const prev = settingsBefore?.spaces?.allowPersonal ?? false;
if (prev !== updateWorkspaceDto.enablePersonalSpaces) { if (prev !== updateWorkspaceDto.allowPersonalSpaces) {
before.enablePersonalSpaces = prev; before.allowPersonalSpaces = prev;
after.enablePersonalSpaces = updateWorkspaceDto.enablePersonalSpaces; after.allowPersonalSpaces = updateWorkspaceDto.allowPersonalSpaces;
} }
await this.workspaceRepo.updateSpaceSettings( await this.workspaceRepo.updateSpaceSettings(
workspaceId, workspaceId,
'personal', 'allowPersonal',
updateWorkspaceDto.enablePersonalSpaces, updateWorkspaceDto.allowPersonalSpaces,
trx, trx,
); );
} }
@@ -534,7 +534,7 @@ export class WorkspaceService {
delete updateWorkspaceDto.mcpEnabled; delete updateWorkspaceDto.mcpEnabled;
delete updateWorkspaceDto.allowMemberTemplates; delete updateWorkspaceDto.allowMemberTemplates;
delete updateWorkspaceDto.aiChat; delete updateWorkspaceDto.aiChat;
delete updateWorkspaceDto.enablePersonalSpaces; delete updateWorkspaceDto.allowPersonalSpaces;
await this.workspaceRepo.updateWorkspace( await this.workspaceRepo.updateWorkspace(
updateWorkspaceDto, updateWorkspaceDto,