mirror of
https://github.com/docmost/docmost.git
synced 2026-07-15 06:46:47 +10:00
feat: workspace default edit preference (#2319)
This commit is contained in:
@@ -4,6 +4,8 @@ import { WorkspaceService } from '../../workspace/services/workspace.service';
|
||||
import { CreateWorkspaceDto } from '../../workspace/dto/create-workspace.dto';
|
||||
import { CreateAdminUserDto } from '../dto/create-admin-user.dto';
|
||||
import { UserRepo } from '@docmost/db/repos/user/user.repo';
|
||||
import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
|
||||
import { getWorkspaceDefaultPageEditMode } from '../../workspace/workspace.util';
|
||||
import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
|
||||
import { executeTx } from '@docmost/db/utils';
|
||||
import { InjectKysely } from 'nestjs-kysely';
|
||||
@@ -20,6 +22,7 @@ import {
|
||||
export class SignupService {
|
||||
constructor(
|
||||
private userRepo: UserRepo,
|
||||
private workspaceRepo: WorkspaceRepo,
|
||||
private workspaceService: WorkspaceService,
|
||||
private groupUserRepo: GroupUserRepo,
|
||||
@InjectKysely() private readonly db: KyselyDB,
|
||||
@@ -46,12 +49,16 @@ export class SignupService {
|
||||
this.db,
|
||||
async (trx) => {
|
||||
// create user
|
||||
const workspace = await this.workspaceRepo.findById(workspaceId, {
|
||||
trx,
|
||||
});
|
||||
const user = await this.userRepo.insertUser(
|
||||
{
|
||||
...createUserDto,
|
||||
workspaceId: workspaceId,
|
||||
},
|
||||
trx,
|
||||
{ pageEditMode: getWorkspaceDefaultPageEditMode(workspace) },
|
||||
);
|
||||
|
||||
// add user to workspace
|
||||
|
||||
@@ -3,8 +3,10 @@ import { CreateWorkspaceDto } from './create-workspace.dto';
|
||||
import {
|
||||
IsArray,
|
||||
IsBoolean,
|
||||
IsIn,
|
||||
IsInt,
|
||||
IsOptional,
|
||||
IsString,
|
||||
Min,
|
||||
} from 'class-validator';
|
||||
|
||||
@@ -61,4 +63,9 @@ export class UpdateWorkspaceDto extends PartialType(CreateWorkspaceDto) {
|
||||
@IsOptional()
|
||||
@IsBoolean()
|
||||
allowPersonalSpaces: boolean;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@IsIn(['read', 'edit'])
|
||||
defaultPageEditMode: string;
|
||||
}
|
||||
|
||||
@@ -41,7 +41,10 @@ import {
|
||||
AUDIT_SERVICE,
|
||||
IAuditService,
|
||||
} from '../../../integrations/audit/audit.service';
|
||||
import { isAdminActingOnOwner } from '../workspace.util';
|
||||
import {
|
||||
getWorkspaceDefaultPageEditMode,
|
||||
isAdminActingOnOwner,
|
||||
} from '../workspace.util';
|
||||
|
||||
@Injectable()
|
||||
export class WorkspaceInvitationService {
|
||||
@@ -257,6 +260,7 @@ export class WorkspaceInvitationService {
|
||||
workspaceId: workspace.id,
|
||||
},
|
||||
trx,
|
||||
{ pageEditMode: getWorkspaceDefaultPageEditMode(workspace) },
|
||||
);
|
||||
|
||||
// add user to default group
|
||||
|
||||
@@ -527,6 +527,20 @@ export class WorkspaceService {
|
||||
);
|
||||
}
|
||||
|
||||
if (typeof updateWorkspaceDto.defaultPageEditMode !== 'undefined') {
|
||||
const prev = settingsBefore?.defaultPageEditMode ?? null;
|
||||
const next = updateWorkspaceDto.defaultPageEditMode.toLowerCase();
|
||||
if (prev !== next) {
|
||||
before.defaultPageEditMode = prev;
|
||||
after.defaultPageEditMode = next;
|
||||
}
|
||||
await this.workspaceRepo.updateDefaultPageEditMode(
|
||||
workspaceId,
|
||||
next,
|
||||
trx,
|
||||
);
|
||||
}
|
||||
|
||||
delete updateWorkspaceDto.restrictApiToAdmins;
|
||||
delete updateWorkspaceDto.aiSearch;
|
||||
delete updateWorkspaceDto.generativeAi;
|
||||
@@ -535,6 +549,7 @@ export class WorkspaceService {
|
||||
delete updateWorkspaceDto.allowMemberTemplates;
|
||||
delete updateWorkspaceDto.aiChat;
|
||||
delete updateWorkspaceDto.allowPersonalSpaces;
|
||||
delete updateWorkspaceDto.defaultPageEditMode;
|
||||
|
||||
await this.workspaceRepo.updateWorkspace(
|
||||
updateWorkspaceDto,
|
||||
|
||||
@@ -6,3 +6,18 @@ export function isAdminActingOnOwner(
|
||||
): boolean {
|
||||
return authUserRole === UserRole.ADMIN && targetRole === UserRole.OWNER;
|
||||
}
|
||||
|
||||
export type PageEditMode = 'read' | 'edit';
|
||||
|
||||
export function getWorkspaceDefaultPageEditMode(
|
||||
workspace: { settings?: unknown } | null | undefined,
|
||||
): PageEditMode | undefined {
|
||||
const settings = (workspace?.settings ?? {}) as {
|
||||
defaultPageEditMode?: unknown;
|
||||
};
|
||||
const mode = settings.defaultPageEditMode;
|
||||
if (mode === 'read' || mode === 'edit') {
|
||||
return mode;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
@@ -112,6 +112,7 @@ export class UserRepo {
|
||||
async insertUser(
|
||||
insertableUser: InsertableUser,
|
||||
trx?: KyselyTransaction,
|
||||
opts?: { pageEditMode?: string },
|
||||
): Promise<User> {
|
||||
const user: InsertableUser = {
|
||||
name:
|
||||
@@ -126,7 +127,17 @@ export class UserRepo {
|
||||
const db = dbOrTx(this.db, trx);
|
||||
return db
|
||||
.insertInto('users')
|
||||
.values({ ...insertableUser, ...user })
|
||||
.values({
|
||||
...insertableUser,
|
||||
...user,
|
||||
...(opts?.pageEditMode
|
||||
? {
|
||||
settings: sql`${JSON.stringify({
|
||||
preferences: { pageEditMode: opts.pageEditMode },
|
||||
})}::text::jsonb`,
|
||||
}
|
||||
: {}),
|
||||
})
|
||||
.returning(this.baseFields)
|
||||
.executeTakeFirst();
|
||||
}
|
||||
|
||||
@@ -271,4 +271,22 @@ export class WorkspaceRepo {
|
||||
.executeTakeFirst();
|
||||
}
|
||||
|
||||
async updateDefaultPageEditMode(
|
||||
workspaceId: string,
|
||||
pageEditMode: string,
|
||||
trx?: KyselyTransaction,
|
||||
) {
|
||||
const db = dbOrTx(this.db, trx);
|
||||
return db
|
||||
.updateTable('workspaces')
|
||||
.set({
|
||||
settings: sql`COALESCE(settings, '{}'::jsonb)
|
||||
|| jsonb_build_object('defaultPageEditMode', ${sql.lit(pageEditMode)})`,
|
||||
updatedAt: new Date(),
|
||||
})
|
||||
.where('id', '=', workspaceId)
|
||||
.returning(this.baseFields)
|
||||
.executeTakeFirst();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+1
-1
Submodule apps/server/src/ee updated: 224d73f925...4669109a18
Reference in New Issue
Block a user