mirror of
https://github.com/ToolJet/ToolJet
synced 2026-04-21 21:47:17 +00:00
* added all pending cloud migration * restrict cloud migrations * added cloud data-migrations * Added cloud entities * keep tables across all * cloud licensing initial changes * fix * payments module * license counts updates * update * Added all pending cloud migration to pre-release + Payments module (#13006) * added all pending cloud migration * restrict cloud migrations * added cloud data-migrations * Added cloud entities * keep tables across all * payments module * license counts updates * update * migration fixes * pass orgId * movement * added cloud instance settings * org id to license terms * before merge * dockerfile changes for cloud * migration fixes * subscription * merge main * posthog-js package * fix * selhostcustomer migration timestamp update * fix * fixes * fix * fix * Adding cloud dockerfile changes * migration fix * fix * fix * fix * fixes * added migration progress * fix * added migration files for cloud * fix * added migrations for cloud * add organizationId for pages controller * fixes for plugins script * fix * final * added cloud licensing envs * UI WRAPPER BUG * fix * orgId groups fix * lint check fixes * Refactor Dockerfiles to use dynamic branch names for builds * Feature/promote release permission management (#13020) * migration and entity changes * removed extra migration * added default group permissions * basic ui changes * added promote and release permissions * fixed tooltips for promote and release buttons * fix * fixed app promote ability check * ce compatibility ui change * ui fixes * removed console.log * removed comments * updated ee-preview.Dockerile * using base img node:22.15.1-bullseye * fix for ce render * Update ce-preview.Dockerfile * Update ee-preview.Dockerfile * ui fix * fix * fixes * fixes * fixes * fixes * minor fixes * fix --------- Co-authored-by: Souvik <psouvik260@gmail.com> Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com> * Bugfix/git sync pre release (#13098) * bugfixes * ui fixes for disabled states in version creation * minor fixes * removed unused imports * fixes * removed comments * module file fixes * module fixes * white-labelling fixes * login-configs * fix for migration for ce * Fix for app count guard (#13131) * fix for app count guard * added check * for debug * license key * Modules : Platform Functionality (#12994) * init * mod * app import-export * licensing and UI * review and permissions * update * updates * update * update * fix breadcrumb * fix app builder error * remove launch button for modules * fixed homepage * fix permission check --------- Co-authored-by: platform-ops123 <platformops545@gmail.com> Co-authored-by: gsmithun4 <gsmithun4@gmail.com> * reverted logs * tjdb guard and dark mode (#13137) * ui fixes * added modules module * removed unused imports * fix * fix * Cypress fix * fixes for cloud instance level licensing (#13146) --------- Co-authored-by: platform-ops123 <platformops545@gmail.com> Co-authored-by: Rudra deep Biswas <rudra21ultra@gmail.com> Co-authored-by: Adish M <adish.madhu@gmail.com> Co-authored-by: Rudhra Deep Biswas <98055396+rudeUltra@users.noreply.github.com> Co-authored-by: Vijaykant Yadav <vjy239@gmail.com> Co-authored-by: Rohan Lahori <64496391+rohanlahori@users.noreply.github.com> Co-authored-by: Souvik <psouvik260@gmail.com> Co-authored-by: Adish M <44204658+adishM98@users.noreply.github.com> Co-authored-by: rohanlahori <rohanlahori99@gmail.com> Co-authored-by: ajith-k-v <ajith.jaban@gmail.com>
85 lines
3.4 KiB
TypeScript
85 lines
3.4 KiB
TypeScript
import { DataSourceOptions } from '@entities/data_source_options.entity';
|
|
import { Organization } from '@entities/organization.entity';
|
|
import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
import { NestFactory } from '@nestjs/core';
|
|
import { AppModule } from '@modules/app/module';
|
|
import { filterEncryptedFromOptions } from '@helpers/migration.helper';
|
|
import { TOOLJET_EDITIONS, getImportPath } from '@modules/app/constants';
|
|
import { getTooljetEdition } from '@helpers/utils.helper';
|
|
|
|
export class environmentDataSourceMappingFix1683022868045 implements MigrationInterface {
|
|
// This is to fix apps having only single environment option values (Imported from CE)
|
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
const edition: TOOLJET_EDITIONS = getTooljetEdition() as TOOLJET_EDITIONS;
|
|
if (edition !== TOOLJET_EDITIONS.EE) {
|
|
console.log('Skipping migration as it is not EE edition');
|
|
return;
|
|
}
|
|
|
|
const entityManager = queryRunner.manager;
|
|
const organizations = await entityManager.find(Organization, {
|
|
relations: ['appEnvironments'],
|
|
});
|
|
if (organizations?.length === 0) {
|
|
console.log('No organizations found, skipping migration.');
|
|
return;
|
|
}
|
|
|
|
const nestApp = await NestFactory.createApplicationContext(await AppModule.register({ IS_GET_CONTEXT: true }));
|
|
|
|
const { EncryptionService } = await import(`${await getImportPath(true, edition)}/encryption/service`);
|
|
const encryptionService = nestApp.get(EncryptionService);
|
|
|
|
for (const organization of organizations) {
|
|
const appEnvironments = organization.appEnvironments;
|
|
const defaultEnv = appEnvironments.find((e) => e.isDefault).id;
|
|
const nonDefaultEnvs = appEnvironments.filter((ae) => !ae.isDefault);
|
|
const defaultEnvOption = await entityManager.find(DataSourceOptions, {
|
|
where: { environmentId: defaultEnv },
|
|
});
|
|
|
|
if (defaultEnvOption?.length) {
|
|
for (const nonDefaultEnv of nonDefaultEnvs) {
|
|
const envOptionCount = await entityManager.count(DataSourceOptions, {
|
|
where: { environmentId: nonDefaultEnv.id },
|
|
});
|
|
|
|
if (defaultEnvOption?.length !== envOptionCount) {
|
|
const envOption = await entityManager.find(DataSourceOptions, {
|
|
where: { environmentId: nonDefaultEnv.id },
|
|
select: ['dataSourceId'],
|
|
});
|
|
|
|
const envOptionDS = envOption.map((options) => options.dataSourceId);
|
|
|
|
const dataSourcesOptionsToAdd = defaultEnvOption.filter(
|
|
(dsOptions) => !envOptionDS?.includes(dsOptions.dataSourceId)
|
|
);
|
|
|
|
for (const dataSourcesOptionToAdd of dataSourcesOptionsToAdd) {
|
|
//copy the options and remove secrets, then create new one for new environments
|
|
const newOptions = await filterEncryptedFromOptions(
|
|
dataSourcesOptionToAdd.options,
|
|
encryptionService,
|
|
null,
|
|
false,
|
|
entityManager
|
|
);
|
|
|
|
await entityManager.save(
|
|
entityManager.create(DataSourceOptions, {
|
|
environmentId: nonDefaultEnv.id,
|
|
options: newOptions,
|
|
dataSourceId: dataSourcesOptionToAdd.dataSourceId,
|
|
})
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
await nestApp.close();
|
|
}
|
|
|
|
public async down(queryRunner: QueryRunner): Promise<void> {}
|
|
}
|