Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 00:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge remote-tracking branch 'origin/main' into test/appbuilder-gh-workflow

Browse source
This commit is contained in:
emidhun 2025-04-25 15:24:16 +05:30
commit c24db8ca68
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/ee

@ -1 +1 @@
Subproject commit b83575a36da2f7e44f5c1bdf35928018bb951014
Subproject commit 518f3334b12a83785fd37dd53b0245d72848211a

4
server/data-migrations/1742369617678-EnforceNewBasicPlanLimits.ts
View file

@ -1,12 +1,11 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
import { AppModule } from '@modules/app/module';
import { NestFactory } from '@nestjs/core';
import { LicenseCountsService } from '@ee/licensing/services/count.service';
import { USER_STATUS, USER_TYPE, WORKSPACE_USER_STATUS } from '@modules/users/constants/lifecycle';
import { USER_ROLE } from '@modules/group-permissions/constants';
import { LicenseInitService } from '@modules/licensing/interfaces/IService';
import { getTooljetEdition } from '@helpers/utils.helper';
import { TOOLJET_EDITIONS } from '@modules/app/constants';
import { getImportPath, TOOLJET_EDITIONS } from '@modules/app/constants';
export class EnforceNewBasicPlanLimits1742369617678 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
@ -17,6 +16,7 @@ export class EnforceNewBasicPlanLimits1742369617678 implements MigrationInterfac
}
const manager = queryRunner.manager;
const nestApp = await NestFactory.createApplicationContext(await AppModule.register({ IS_GET_CONTEXT: true }));
const { LicenseCountsService } = await import(`${await getImportPath(true, edition)}/licensing/services/count.service`);
const licenseInitService = nestApp.get(LicenseInitService);
const { isValid } = await licenseInitService.initForMigration(manager);

2
server/ee

@ -1 +1 @@
Subproject commit b1f4bb6a8c5d6e4543452580b7d1cdf03e7c954c
Subproject commit 1d493b090aa95eb37de8004a36baf8c976afbd45