From e08f57cb80f244caed5b6243df539515699bb4ec Mon Sep 17 00:00:00 2001 From: mrswastik-robot Date: Mon, 20 Jan 2025 17:58:58 +0530 Subject: [PATCH 1/3] env check --- apps/api/src/project/service/project.service.ts | 4 ++-- .../dashboard/project/createProjectDialogue/index.tsx | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/api/src/project/service/project.service.ts b/apps/api/src/project/service/project.service.ts index ab14e9c26..7cfb2a919 100644 --- a/apps/api/src/project/service/project.service.ts +++ b/apps/api/src/project/service/project.service.ts @@ -162,9 +162,9 @@ export class ProjectService { createEnvironmentOps.push( this.prisma.environment.create({ data: { - name: 'Default', + name: 'default', slug: await generateEntitySlug( - 'Default', + 'default', 'ENVIRONMENT', this.prisma ), diff --git a/apps/platform/src/components/dashboard/project/createProjectDialogue/index.tsx b/apps/platform/src/components/dashboard/project/createProjectDialogue/index.tsx index 40343d2da..a9152b220 100644 --- a/apps/platform/src/components/dashboard/project/createProjectDialogue/index.tsx +++ b/apps/platform/src/components/dashboard/project/createProjectDialogue/index.tsx @@ -57,11 +57,16 @@ export default function CreateProjectDialogue(): JSX.Element { // Function to create a new project const createNewProject = useCallback(async () => { if (selectedWorkspace) { - newProjectData.workspaceSlug = selectedWorkspace.slug + // Filter out environments with empty names + const projectData = { + ...newProjectData, + workspaceSlug: selectedWorkspace.slug, + environments: newProjectData.environments?.filter(env => env.name.trim() !== '') || [] + } const { data, error, success } = await ControllerInstance.getInstance().projectController.createProject( - newProjectData, + projectData, {} ) From df0503520460b9d49c65d1f2d1893947b6f016c5 Mon Sep 17 00:00:00 2001 From: mrswastik-robot Date: Mon, 20 Jan 2025 18:02:45 +0530 Subject: [PATCH 2/3] env check --- .../dashboard/project/createProjectDialogue/index.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/platform/src/components/dashboard/project/createProjectDialogue/index.tsx b/apps/platform/src/components/dashboard/project/createProjectDialogue/index.tsx index a9152b220..7cc4aca3d 100644 --- a/apps/platform/src/components/dashboard/project/createProjectDialogue/index.tsx +++ b/apps/platform/src/components/dashboard/project/createProjectDialogue/index.tsx @@ -61,7 +61,10 @@ export default function CreateProjectDialogue(): JSX.Element { const projectData = { ...newProjectData, workspaceSlug: selectedWorkspace.slug, - environments: newProjectData.environments?.filter(env => env.name.trim() !== '') || [] + environments: + newProjectData.environments?.filter( + (env) => env.name.trim() !== '' + ) || [] } const { data, error, success } = From 0ffcab931c83fcaed34cc6dab7e072148630c823 Mon Sep 17 00:00:00 2001 From: mrswastik-robot Date: Mon, 20 Jan 2025 20:06:28 +0530 Subject: [PATCH 3/3] modify test case --- apps/api/src/project/project.e2e.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/src/project/project.e2e.spec.ts b/apps/api/src/project/project.e2e.spec.ts index 09194156f..a5fbc5efc 100644 --- a/apps/api/src/project/project.e2e.spec.ts +++ b/apps/api/src/project/project.e2e.spec.ts @@ -1416,7 +1416,7 @@ describe('Project Controller Tests', () => { expect(devEnvironment.name).toBe(environment.name) expect(defaultEnvironment).toBeDefined() - expect(defaultEnvironment.name).toBe('Default') + expect(defaultEnvironment.name).toBe('default') }) it('should only copy new environments, secrets and variables if sync is not hard', async () => {