From 1a43cb34b1401e49cc0cc994b2b307039afb8457 Mon Sep 17 00:00:00 2001 From: Muhsin Shah C P Date: Fri, 25 Apr 2025 14:46:11 +0530 Subject: [PATCH 1/2] Migration path fix for ce --- frontend/ee | 2 +- .../1742369617678-EnforceNewBasicPlanLimits.ts | 4 ++-- server/ee | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/ee b/frontend/ee index b83575a36d..518f3334b1 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit b83575a36da2f7e44f5c1bdf35928018bb951014 +Subproject commit 518f3334b12a83785fd37dd53b0245d72848211a diff --git a/server/data-migrations/1742369617678-EnforceNewBasicPlanLimits.ts b/server/data-migrations/1742369617678-EnforceNewBasicPlanLimits.ts index 12ee14964e..7bc644b4c4 100644 --- a/server/data-migrations/1742369617678-EnforceNewBasicPlanLimits.ts +++ b/server/data-migrations/1742369617678-EnforceNewBasicPlanLimits.ts @@ -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 { @@ -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); diff --git a/server/ee b/server/ee index b1f4bb6a8c..70591fe858 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit b1f4bb6a8c5d6e4543452580b7d1cdf03e7c954c +Subproject commit 70591fe858641df030d50499b897c557c11000bd From 8137cab986a35eb7062bca38ac45350ae3d1433b Mon Sep 17 00:00:00 2001 From: Muhsin Shah C P Date: Fri, 25 Apr 2025 14:47:03 +0530 Subject: [PATCH 2/2] Added server file --- server/ee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/ee b/server/ee index 70591fe858..1d493b090a 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 70591fe858641df030d50499b897c557c11000bd +Subproject commit 1d493b090aa95eb37de8004a36baf8c976afbd45