mirror of
https://github.com/docmost/docmost.git
synced 2026-06-22 10:21:46 +10:00
feat: on-demand only
This commit is contained in:
@@ -1087,7 +1087,7 @@
|
||||
"Page menu for {{name}}": "Page menu for {{name}}",
|
||||
"Create subpage of {{name}}": "Create subpage of {{name}}",
|
||||
"Allow personal spaces": "Allow personal spaces",
|
||||
"Members can create their own personal space. New members get one automatically.": "Members can create their own personal space. New members get one automatically.",
|
||||
"Members can create their own personal space.": "Members can create their own personal space.",
|
||||
"Toggle allow personal spaces": "Toggle allow personal spaces",
|
||||
"Create personal space": "Create personal space",
|
||||
"Personal space": "Personal space",
|
||||
|
||||
@@ -17,9 +17,7 @@ export default function PersonalSpacesSetting() {
|
||||
<div>
|
||||
<Text size="md">{t("Allow personal spaces")}</Text>
|
||||
<Text size="sm" c="dimmed">
|
||||
{t(
|
||||
"Members can create their own personal space. New members get one automatically.",
|
||||
)}
|
||||
{t("Members can create their own personal space.")}
|
||||
</Text>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
import { ModuleRef } from '@nestjs/core';
|
||||
|
||||
export async function provisionPersonalSpaceForNewUser(
|
||||
moduleRef: ModuleRef,
|
||||
userId: string,
|
||||
workspaceId: string,
|
||||
): Promise<void> {
|
||||
try {
|
||||
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
||||
const personalSpaceModule = require('../../ee/personal-space/services/personal-space.service');
|
||||
const personalSpaceService = moduleRef.get(
|
||||
personalSpaceModule.PersonalSpaceService,
|
||||
{ strict: false },
|
||||
);
|
||||
await personalSpaceService.provisionForNewUser(userId, workspaceId);
|
||||
} catch {
|
||||
// module not found
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,4 @@
|
||||
import { BadRequestException, Inject, Injectable } from '@nestjs/common';
|
||||
import { ModuleRef } from '@nestjs/core';
|
||||
import { provisionPersonalSpaceForNewUser } from '../../../common/helpers/personal-space-provisioning';
|
||||
import { CreateUserDto } from '../dto/create-user.dto';
|
||||
import { WorkspaceService } from '../../workspace/services/workspace.service';
|
||||
import { CreateWorkspaceDto } from '../../workspace/dto/create-workspace.dto';
|
||||
@@ -24,7 +22,6 @@ export class SignupService {
|
||||
private userRepo: UserRepo,
|
||||
private workspaceService: WorkspaceService,
|
||||
private groupUserRepo: GroupUserRepo,
|
||||
private moduleRef: ModuleRef,
|
||||
@InjectKysely() private readonly db: KyselyDB,
|
||||
@Inject(AUDIT_SERVICE) private readonly auditService: IAuditService,
|
||||
) {}
|
||||
@@ -92,14 +89,6 @@ export class SignupService {
|
||||
},
|
||||
});
|
||||
|
||||
if (!trx) {
|
||||
await provisionPersonalSpaceForNewUser(
|
||||
this.moduleRef,
|
||||
user.id,
|
||||
workspaceId,
|
||||
);
|
||||
}
|
||||
|
||||
return user;
|
||||
}
|
||||
|
||||
|
||||
@@ -6,8 +6,6 @@ import {
|
||||
Logger,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import { ModuleRef } from '@nestjs/core';
|
||||
import { provisionPersonalSpaceForNewUser } from '../../../common/helpers/personal-space-provisioning';
|
||||
import { AcceptInviteDto, InviteUserDto } from '../dto/invitation.dto';
|
||||
import { UserRepo } from '@docmost/db/repos/user/user.repo';
|
||||
import { InjectKysely } from 'nestjs-kysely';
|
||||
@@ -55,7 +53,6 @@ export class WorkspaceInvitationService {
|
||||
private domainService: DomainService,
|
||||
private tokenService: TokenService,
|
||||
private sessionService: SessionService,
|
||||
private moduleRef: ModuleRef,
|
||||
@InjectKysely() private readonly db: KyselyDB,
|
||||
@InjectQueue(QueueName.BILLING_QUEUE) private billingQueue: Queue,
|
||||
private readonly environmentService: EnvironmentService,
|
||||
@@ -313,12 +310,6 @@ export class WorkspaceInvitationService {
|
||||
return;
|
||||
}
|
||||
|
||||
await provisionPersonalSpaceForNewUser(
|
||||
this.moduleRef,
|
||||
newUser.id,
|
||||
workspace.id,
|
||||
);
|
||||
|
||||
// notify the inviter
|
||||
const invitedByUser = await this.userRepo.findById(
|
||||
invitation.invitedById,
|
||||
|
||||
+1
-1
Submodule apps/server/src/ee updated: 83316d0ba6...d20a3931cf
Reference in New Issue
Block a user