fix: rename environmentEnabled to enviromentsEnabled

Luigi31415 · Dec 27, 2024 · d327587 · d327587
1 parent 2e13920
commit d327587
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/react-ui/src/app/components/flow-actions-menu.tsx b/packages/react-ui/src/app/components/flow-actions-menu.tsx
@@ -73,7 +73,7 @@ const FlowActionMenu: React.FC<FlowActionMenuProps> = ({
   const openNewWindow = useNewWindow();
   const { gitSync } = gitSyncHooks.useGitSync(
     authenticationSession.getProjectId()!,
-    platform.environmentEnabled,
+    platform.environmentsEnabled,
   );
   const { checkAccess } = useAuthorization();
   const userHasPermissionToUpdateFlow = checkAccess(Permission.WRITE_FLOW);

diff --git a/packages/react-ui/src/app/routes/flows/index.tsx b/packages/react-ui/src/app/routes/flows/index.tsx
@@ -95,7 +95,7 @@ const FlowsPage = () => {
   const { platform } = platformHooks.useCurrentPlatform();
   const { gitSync } = gitSyncHooks.useGitSync(
     authenticationSession.getProjectId()!,
-    platform.environmentEnabled,
+    platform.environmentsEnabled,
   );
   const userHasPermissionToUpdateFlow = checkAccess(Permission.WRITE_FLOW);
   const userHasPermissionToPushToGit = checkAccess(Permission.WRITE_GIT_REPO);

diff --git a/packages/react-ui/src/app/routes/project-release/create-release-dialog/index.tsx b/packages/react-ui/src/app/routes/project-release/create-release-dialog/index.tsx
@@ -54,7 +54,7 @@ const CreateReleaseDialog = ({
   const { platform } = platformHooks.useCurrentPlatform();
   const { gitSync } = gitSyncHooks.useGitSync(
     authenticationSession.getProjectId()!,
-    platform.environmentEnabled,
+    platform.environmentsEnabled,
   );
 
   const form = useForm<FormData>({

diff --git a/packages/react-ui/src/app/routes/settings/environment/index.tsx b/packages/react-ui/src/app/routes/settings/environment/index.tsx
@@ -20,7 +20,7 @@ const EnvironmentPage = () => {
 
   const { gitSync, isLoading, refetch } = gitSyncHooks.useGitSync(
     authenticationSession.getProjectId()!,
-    platform.environmentEnabled,
+    platform.environmentsEnabled,
   );
 
   const { mutate } = useMutation({
@@ -44,7 +44,7 @@ const EnvironmentPage = () => {
   return (
     <LockedFeatureGuard
       featureKey="ENVIRONMENT"
-      locked={!platform.environmentEnabled}
+      locked={!platform.environmentsEnabled}
       lockTitle={t('Unlock Environment')}
       lockDescription={t(
         "Streamline your team's workflow for a seamless experience to build and deploy flows across your environments",

diff --git a/packages/react-ui/src/features/git-sync/components/connect-git-dialog.tsx b/packages/react-ui/src/features/git-sync/components/connect-git-dialog.tsx
@@ -62,7 +62,7 @@ const ConnectGitDialog = ({ open, setOpen, showButton }: ConnectGitProps) => {
 
   const { refetch } = gitSyncHooks.useGitSync(
     projectId,
-    platform.environmentEnabled,
+    platform.environmentsEnabled,
   );
 
   const { mutate, isPending } = useMutation({

diff --git a/packages/react-ui/src/features/git-sync/components/push-to-git-dialog.tsx b/packages/react-ui/src/features/git-sync/components/push-to-git-dialog.tsx
@@ -46,7 +46,7 @@ const PushToGitDialog = ({ children, flowIds }: PushToGitDialogProps) => {
   const { platform } = platformHooks.useCurrentPlatform();
   const { gitSync } = gitSyncHooks.useGitSync(
     authenticationSession.getProjectId()!,
-    platform.environmentEnabled,
+    platform.environmentsEnabled,
   );
 
   const form = useForm<PushGitRepoRequest>({

diff --git a/...es/server/api/src/app/database/migration/postgres/1735267452262-AddEnvironmentsEnabled.ts b/...es/server/api/src/app/database/migration/postgres/1735267452262-AddEnvironmentsEnabled.ts
@@ -0,0 +1,27 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class AddEnvironmentsEnabled1735267452262 implements MigrationInterface {
+    name = 'AddEnvironmentsEnabled1735267452262'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`
+            ALTER TABLE "platform"
+                RENAME COLUMN "gitSyncEnabled" TO "environmentsEnabled"
+        `)
+        await queryRunner.query(`
+            ALTER TABLE "project"
+            ADD "releasesEnabled" boolean NOT NULL DEFAULT false
+        `)
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`
+            ALTER TABLE "project" DROP COLUMN "releasesEnabled"
+        `)
+        await queryRunner.query(`
+            ALTER TABLE "platform"
+                RENAME COLUMN "environmentsEnabled" TO "gitSyncEnabled"
+        `)
+    }
+
+}
diff --git a/.../server/api/src/app/database/migration/sqlite/1735262810939-AddExternalIdForFlowSqlite.ts b/.../server/api/src/app/database/migration/sqlite/1735262810939-AddExternalIdForFlowSqlite.ts
@@ -22,7 +22,7 @@ export class AddExternalIdForFlowSqlite1735262810939 implements MigrationInterfa
                 "filteredPieceBehavior" varchar CHECK(
                     "filteredPieceBehavior" IN ('ALLOWED', 'BLOCKED')
                 ) NOT NULL,
-                "environmentEnabled" boolean NOT NULL,
+                "environmentsEnabled" boolean NOT NULL,
                 "defaultLocale" varchar CHECK(
                     "defaultLocale" IN (
                         'nl',
@@ -83,7 +83,7 @@ export class AddExternalIdForFlowSqlite1735262810939 implements MigrationInterfa
                     "embeddingEnabled",
                     "filteredPieceNames",
                     "filteredPieceBehavior",
-                    "environmentEnabled",
+                    "environmentsEnabled",
                     "defaultLocale",
                     "allowedAuthDomains",
                     "enforceAllowedAuthDomains",
@@ -512,7 +512,7 @@ export class AddExternalIdForFlowSqlite1735262810939 implements MigrationInterfa
                 "embeddingEnabled",
                 "filteredPieceNames",
                 "filteredPieceBehavior",
-                "environmentEnabled",
+                "environmentsEnabled",
                 "defaultLocale",
                 "allowedAuthDomains",
                 "enforceAllowedAuthDomains",

diff --git a/packages/server/api/src/app/database/postgres-connection.ts b/packages/server/api/src/app/database/postgres-connection.ts
@@ -170,6 +170,7 @@ import { CreateProjectReleaseTable1734418823028 } from './migration/postgres/173
 import { RemoveWorkerType1734439097357 } from './migration/postgres/1734439097357-RemoveWorkerType'
 import { AddCopilotSettings1734479886363 } from './migration/postgres/1734479886363-AddCopilotSettings'
 import { AddExternalIdForFlow1735262417593 } from './migration/postgres/1735262417593-AddExternalIdForFlow'
+import { AddEnvironmentsEnabled1735267452262 } from './migration/postgres/1735267452262-AddEnvironmentsEnabled'
 
 const getSslConfig = (): boolean | TlsOptions => {
     const useSsl = system.get(AppSystemProp.POSTGRES_USE_SSL)
@@ -284,6 +285,7 @@ const getMigrations = (): (new () => MigrationInterface)[] => {
         RemoveWorkerType1734439097357,
         AddCopilotSettings1734479886363,
         AddExternalIdForFlow1735262417593,
+        AddEnvironmentsEnabled1735267452262,
     ]
 
     const edition = system.getEdition()

diff --git a/packages/server/api/src/app/ee/license-keys/license-keys-service.ts b/packages/server/api/src/app/ee/license-keys/license-keys-service.ts
@@ -103,7 +103,7 @@ export const licenseKeysService = (log: FastifyBaseLogger) => ({
         await platformService.update({
             id: platformId,
             ssoEnabled: key.ssoEnabled,
-            environmentEnabled: key.environmentEnabled,
+            environmentsEnabled: key.environmentsEnabled,
             showPoweredBy: key.showPoweredBy,
             embeddingEnabled: key.embeddingEnabled,
             auditLogEnabled: key.auditLogEnabled,
@@ -161,7 +161,7 @@ const deletePrivatePieces = async (platformId: string, log: FastifyBaseLogger):
 const turnedOffFeatures: Omit<LicenseKeyEntity, 'id' | 'createdAt' | 'expiresAt' | 'activatedAt' | 'isTrial' | 'email' | 'customerName' | 'key'> = {
     ssoEnabled: false,
     analyticsEnabled: false,
-    environmentEnabled: false,
+    environmentsEnabled: false,
     showPoweredBy: false,
     embeddingEnabled: false,
     auditLogEnabled: false,

diff --git a/packages/server/api/src/app/ee/project-release/git-sync/git-sync.module.ts b/packages/server/api/src/app/ee/project-release/git-sync/git-sync.module.ts
@@ -16,7 +16,7 @@ import { gitRepoService } from './git-sync.service'
 
 export const gitRepoModule: FastifyPluginAsync = async (app) => {
     app.addHook('preSerialization', entitiesMustBeOwnedByCurrentProject)
-    app.addHook('preHandler', platformMustHaveFeatureEnabled((platform) => platform.environmentEnabled))
+    app.addHook('preHandler', platformMustHaveFeatureEnabled((platform) => platform.environmentsEnabled))
     await app.register(gitRepoController, { prefix: '/v1/git-repos' })
 }
 

diff --git a/packages/server/api/src/app/platform/platform.entity.ts b/packages/server/api/src/app/platform/platform.entity.ts
@@ -104,7 +104,7 @@ export const PlatformEntity = new EntitySchema<PlatformSchema>({
             enum: FilteredPieceBehavior,
             nullable: false,
         },
-        environmentEnabled: {
+        environmentsEnabled: {
             type: Boolean,
             nullable: false,
         },

diff --git a/packages/server/api/src/app/platform/platform.service.ts b/packages/server/api/src/app/platform/platform.service.ts
@@ -57,7 +57,7 @@ export const platformService = {
             federatedAuthProviders: {},
             cloudAuthEnabled: true,
             flowIssuesEnabled: false,
-            environmentEnabled: false,
+            environmentsEnabled: false,
             managePiecesEnabled: false,
             manageTemplatesEnabled: false,
             manageProjectsEnabled: false,
@@ -111,7 +111,7 @@ export const platformService = {
             ...spreadIfDefined('cloudAuthEnabled', params.cloudAuthEnabled),
             ...spreadIfDefined('defaultLocale', params.defaultLocale),
             ...spreadIfDefined('showPoweredBy', params.showPoweredBy),
-            ...spreadIfDefined('environmentEnabled', params.environmentEnabled),
+            ...spreadIfDefined('environmentsEnabled', params.environmentsEnabled),
             ...spreadIfDefined('embeddingEnabled', params.embeddingEnabled),
             ...spreadIfDefined('globalConnectionsEnabled', params.globalConnectionsEnabled),
             ...spreadIfDefined('customRolesEnabled', params.customRolesEnabled),
@@ -181,7 +181,7 @@ type UpdateParams = UpdatePlatformRequestBody & {
     auditLogEnabled?: boolean
     showPoweredBy?: boolean
     ssoEnabled?: boolean
-    environmentEnabled?: boolean
+    environmentsEnabled?: boolean
     embeddingEnabled?: boolean
     globalConnectionsEnabled?: boolean
     customRolesEnabled?: boolean

diff --git a/packages/server/api/test/helpers/mocks/index.ts b/packages/server/api/test/helpers/mocks/index.ts
@@ -208,7 +208,7 @@ export const createMockPlatform = (platform?: Partial<Platform>): Platform => {
             faker.helpers.enumValue(FilteredPieceBehavior),
         smtp: platform?.smtp,
         flowIssuesEnabled: platform?.flowIssuesEnabled ?? faker.datatype.boolean(),
-        environmentEnabled: platform?.environmentEnabled ?? faker.datatype.boolean(),
+        environmentsEnabled: platform?.environmentsEnabled ?? faker.datatype.boolean(),
         embeddingEnabled: platform?.embeddingEnabled ?? faker.datatype.boolean(),
         cloudAuthEnabled: platform?.cloudAuthEnabled ?? faker.datatype.boolean(),
         showPoweredBy: platform?.showPoweredBy ?? faker.datatype.boolean(),
@@ -573,7 +573,7 @@ export const createMockProjectRelease = (projectRelease?: Partial<ProjectRelease
 export const mockEnvironment = async () => {
     const { mockPlatform, mockOwner, mockProject } = await mockBasicSetup({
         platform: {
-            environmentEnabled: true,
+            environmentsEnabled: true,
         },
     })
 

diff --git a/packages/shared/src/lib/license-keys/index.ts b/packages/shared/src/lib/license-keys/index.ts
@@ -26,7 +26,7 @@ export const LicenseKeyEntity = Type.Object({
     isTrial: Type.Boolean(),
     key: Type.String(),
     ssoEnabled: Type.Boolean(),
-    environmentEnabled: Type.Boolean(),
+    environmentsEnabled: Type.Boolean(),
     showPoweredBy: Type.Boolean(),
     embeddingEnabled: Type.Boolean(),
     auditLogEnabled: Type.Boolean(),

diff --git a/packages/shared/src/lib/platform/platform.model.ts b/packages/shared/src/lib/platform/platform.model.ts
@@ -77,7 +77,7 @@ export const Platform = Type.Object({
     filteredPieceBehavior: Type.Enum(FilteredPieceBehavior),
     smtp: Type.Optional(SMTPInformation),
     cloudAuthEnabled: Type.Boolean(),
-    environmentEnabled: Type.Boolean(),
+    environmentsEnabled: Type.Boolean(),
     analyticsEnabled: Type.Boolean(),
     showPoweredBy: Type.Boolean(),
     auditLogEnabled: Type.Boolean(),
@@ -128,7 +128,7 @@ export const PlatformWithoutSensitiveData = Type.Composite([Type.Object({
     'gitSyncEnabled',
     'analyticsEnabled',
     'showPoweredBy',
-    'environmentEnabled',
+    'environmentsEnabled',
     'auditLogEnabled',
     'embeddingEnabled',
     'managePiecesEnabled',