Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-04-21 21:47:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Archived workspace re-loading Fix (#14427)

Browse source
This commit is contained in:
Rohan Lahori 2025-10-31 17:07:52 +05:30 committed by GitHub
parent a53d1eca69
commit 1b9e30d082
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/src/modules/login-configs/util.service.ts
View file

@ -44,11 +44,13 @@ export class LoginConfigsUtilService implements ILoginConfigsUtilService {
organizationIdOrSlug: string,
statusList?: Array<boolean>,
isHideSensitiveData?: boolean,
addInstanceLevelSSO?: boolean
addInstanceLevelSSO?: boolean,
allowArchivedWorkspace: boolean = false
): Promise<DeepPartial<Organization>> {
const result: Organization = await this.organizationRepository.fetchOrganizationWithSSOConfigs(
organizationIdOrSlug,
statusList
statusList,
allowArchivedWorkspace
);
if (!result) return;

8
server/src/modules/organizations/repository.ts
View file

@ -19,7 +19,11 @@ export class OrganizationRepository extends Repository<Organization> {
return await this.findOne({ where: { id }, relations: ['ssoConfigs'] });
}
async fetchOrganizationWithSSOConfigs(slug: string, statusList?: Array<boolean>): Promise<Organization> {
async fetchOrganizationWithSSOConfigs(
slug: string,
statusList?: Array<boolean>,
allowArchivedWorkspace: boolean = false
): Promise<Organization> {
const conditions: any = {
relations: ['ssoConfigs', 'ssoConfigs.oidcGroupSyncs'],
where: {
@ -40,7 +44,7 @@ export class OrganizationRepository extends Repository<Organization> {
where: { ...conditions.where, id: slug },
});
}
if (organization && organization.status !== WORKSPACE_STATUS.ACTIVE)
if (organization && organization.status !== WORKSPACE_STATUS.ACTIVE && !allowArchivedWorkspace)
throw new BadRequestException('Organization is Archived');
return organization;
}

2
server/src/modules/users/repositories/repository.ts
View file

@ -233,7 +233,7 @@ export class UserRepository extends Repository<User> {
organizationUsers: {
organizationId: organizationId,
status: In(statusList),
organization: { status: WORKSPACE_STATUS.ACTIVE },
organization: { status: In([WORKSPACE_STATUS.ACTIVE, WORKSPACE_STATUS.ARCHIVE]) },
},
},
relations: ['organizationUsers', 'organizationUsers.organization'],