feat: 🔥 remove organization feature

cloud-pi-native · Jan 9, 2025 · c416e25 · c416e25
1 parent 0eaeede
commit c416e25
Show file tree

Hide file tree

Showing 81 changed files with 693 additions and 608 deletions.
diff --git a/apps/client/cypress/components/specs/repo-form.ct.ts b/apps/client/cypress/components/specs/repo-form.ct.ts
@@ -27,8 +27,8 @@ describe('RepoForm.vue', () => {
 
     const randomDbSetup = createRandomDbSetup({})
     const projectStore = useProjectStore()
-    projectStore.myProjectsById = {
-      [randomDbSetup.project.id]: randomDbSetup.project.id,
+    projectStore.myProjectsBySlug = {
+      [randomDbSetup.project.slug]: randomDbSetup.project,
     }
 
     cy.mount(RepoForm, { props })
@@ -97,8 +97,8 @@ describe('RepoForm.vue', () => {
 
     const randomDbSetup = createRandomDbSetup({})
     const projectStore = useProjectStore()
-    projectStore.myProjectsById = {
-      [randomDbSetup.project.id]: randomDbSetup.project.id,
+    projectStore.myProjectsBySlug = {
+      [randomDbSetup.project.slug]: randomDbSetup.project,
     }
 
     cy.mount(RepoForm, { props })
@@ -189,8 +189,8 @@ describe('RepoForm.vue', () => {
 
     const randomDbSetup = createRandomDbSetup({})
     const projectStore = useProjectStore()
-    projectStore.myProjectsById = {
-      [randomDbSetup.project.id]: randomDbSetup.project.id,
+    projectStore.myProjectsBySlug = {
+      [randomDbSetup.project.slug]: randomDbSetup.project,
     }
 
     cy.mount(RepoForm, { props })
@@ -236,8 +236,8 @@ describe('RepoForm.vue', () => {
 
     const randomDbSetup = createRandomDbSetup({})
     const projectStore = useProjectStore()
-    projectStore.myProjectsById = {
-      [randomDbSetup.project.id]: randomDbSetup.project.id,
+    projectStore.myProjectsBySlug = {
+      [randomDbSetup.project.slug]: randomDbSetup.project,
     }
 
     cy.mount(RepoForm, { props })
@@ -277,8 +277,8 @@ describe('RepoForm.vue', () => {
 
     const randomDbSetup = createRandomDbSetup({})
     const projectStore = useProjectStore()
-    projectStore.myProjectsById = {
-      [randomDbSetup.project.id]: randomDbSetup.project.id,
+    projectStore.myProjectsBySlug = {
+      [randomDbSetup.project.slug]: randomDbSetup.project,
     }
 
     cy.mount(RepoForm, { props })

diff --git a/apps/client/cypress/e2e/specs/01-logs.e2e.ts b/apps/client/cypress/e2e/specs/01-logs.e2e.ts
@@ -14,7 +14,7 @@ describe('Project Logs', () => {
     cy.intercept('PUT', `/api/v1/projects/${betaapp.id}/hooks`).as('replayHooks')
 
     cy.goToProjects()
-    cy.getByDataTestid(`projectTile-${betaapp.name}`).click()
+    cy.getByDataTestid(`projectTile-${betaapp.slug}`).click()
     cy.getByDataTestid('displayLogsPanel')
       .should('not.be.visible')
     cy.getByDataTestid('displayLogsBtn')
@@ -47,7 +47,7 @@ describe('Project Logs', () => {
 
     // as owner
     cy.goToProjects()
-    cy.getByDataTestid(`projectTile-${betaapp.name}`).click()
+    cy.getByDataTestid(`projectTile-${betaapp.slug}`).click()
     cy.wait('@listLogs')
     cy.getByDataTestid('displayLogsPanel')
       .should('not.be.visible')
@@ -68,7 +68,7 @@ describe('Project Logs', () => {
 
     // as member
     cy.goToProjects()
-    cy.getByDataTestid(`projectTile-candilib`).click()
+    cy.getByDataTestid(`projectTile-mi-candilib`).click()
     cy.wait('@listLogs')
     cy.getByDataTestid('displayLogsPanel')
       .should('not.be.visible')

diff --git a/apps/client/cypress/e2e/specs/admin/organizations.e2e.ts b/apps/client/cypress/e2e/specs/admin/organizations.e2e.ts
@@ -160,14 +160,14 @@ describe('Administration organizations', () => {
 
     cy.getByDataTestid('menuMyProjects').click()
       .wait('@listProjects')
-    cy.getByDataTestid(`projectTile-${projectFailed.name}`)
+    cy.getByDataTestid(`projectTile-${projectFailed.slug}`)
       .click()
     cy.getByDataTestid(`${projectFailed.id}-locked-badge`)
       .should('exist')
 
     cy.getByDataTestid('menuMyProjects').click()
       .wait('@listProjects')
-    cy.getByDataTestid(`projectTile-${projectSucceed.name}`)
+    cy.getByDataTestid(`projectTile-${projectSucceed.slug}`)
       .click()
     cy.getByDataTestid(`${projectSucceed.id}-locked-badge`)
       .should('exist')
@@ -194,13 +194,13 @@ describe('Administration organizations', () => {
     cy.getByDataTestid('snackbar').should('contain', `Organisation ${organization.name} mise à jour`)
 
     cy.getByDataTestid('menuMyProjects').click()
-    cy.getByDataTestid(`projectTile-${projectFailed.name}`)
+    cy.getByDataTestid(`projectTile-${projectFailed.slug}`)
       .click()
     cy.getByDataTestid(`${projectFailed.id}-locked-badge`)
       .should('not.exist')
 
     cy.getByDataTestid('menuMyProjects').click()
-    cy.getByDataTestid(`projectTile-${projectSucceed.name}`)
+    cy.getByDataTestid(`projectTile-${projectSucceed.slug}`)
       .click()
     cy.getByDataTestid(`${projectSucceed.id}-locked-badge`)
       .should('not.exist')

diff --git a/apps/client/cypress/e2e/specs/admin/quotas.e2e.ts b/apps/client/cypress/e2e/specs/admin/quotas.e2e.ts
@@ -115,7 +115,7 @@ describe('Administration quotas', () => {
     cy.kcLogin('test')
     cy.goToProjects()
       .wait('@listProjects')
-      .getByDataTestid(`projectTile-${project?.name}`).click()
+      .getByDataTestid(`projectTile-${project?.slug}`).click()
       .getByDataTestid('menuEnvironments').click()
     cy.wait('@getClusters')
     cy.url().should('contain', '/environments')
@@ -279,7 +279,7 @@ describe('Administration quotas', () => {
     cy.kcLogin('test')
     cy.goToProjects()
       .wait('@listProjects')
-      .getByDataTestid(`projectTile-${project?.name}`).click()
+      .getByDataTestid(`projectTile-${project?.slug}`).click()
       .getByDataTestid('menuEnvironments').click()
       .url().should('contain', '/environments')
     cy.wait('@getClusters')
@@ -396,7 +396,7 @@ describe('Administration quotas', () => {
     cy.kcLogin('test')
     cy.goToProjects()
       .wait('@listProjects')
-      .getByDataTestid(`projectTile-${project?.name}`).click()
+      .getByDataTestid(`projectTile-${project?.slug}`).click()
       .getByDataTestid('menuEnvironments').click()
       .url().should('contain', '/environments')
     cy.wait('@getClusters')

diff --git a/apps/client/cypress/e2e/specs/admin/stages.e2e.ts b/apps/client/cypress/e2e/specs/admin/stages.e2e.ts
@@ -105,7 +105,7 @@ describe('Administration stages', () => {
     cy.kcLogin('test')
     cy.goToProjects()
       .wait('@listProjects')
-      .getByDataTestid(`projectTile-${project?.name}`).click()
+      .getByDataTestid(`projectTile-${project?.slug}`).click()
       .getByDataTestid('menuEnvironments').click()
       .url().should('contain', '/environments')
     cy.wait('@getClusters')
@@ -216,7 +216,7 @@ describe('Administration stages', () => {
     cy.kcLogin('test')
     cy.goToProjects()
       .wait('@listProjects')
-      .getByDataTestid(`projectTile-${project?.name}`).click()
+      .getByDataTestid(`projectTile-${project?.slug}`).click()
       .getByDataTestid('menuEnvironments').click()
       .url().should('contain', '/environments')
     cy.wait('@getClusters')

diff --git a/apps/client/cypress/e2e/specs/create-project.e2e.ts b/apps/client/cypress/e2e/specs/create-project.e2e.ts
@@ -7,7 +7,9 @@ const orgMi = organizations.find(({ name }) => name === 'mi') as Organization
 describe('Create Project', () => {
   const project = {
     orgId: orgMi.id,
+    orgName: orgMi.name,
     name: 'project01',
+    slug: 'mi-project01',
     description: 'Application de prise de rendez-vous en préfécture.',
   }
 
@@ -37,23 +39,23 @@ describe('Create Project', () => {
     cy.getByDataTestid('createProjectBtn').should('be.enabled').click()
 
     cy.wait('@postProject').its('response.statusCode').should('match', /^20\d$/)
-    cy.url().should('match', /projects\/.*\/dashboard/)
+    cy.url().should('contain', `/projects/${project.orgName}-${project.name}/dashboard`)
 
     cy.wait('@listProjects').its('response.statusCode').should('match', /^20\d$/)
 
-    cy.assertCreateProjects([project.name])
+    cy.assertCreateProjects([project.slug])
   })
 
-  it('Should not create a project if name is already taken', () => {
+  it('Should create a project even if name is already taken', () => {
     cy.intercept('POST', '/api/v1/projects').as('postProject')
     cy.intercept('GET', '/api/v1/projects?filter=member&statusNotIn=archived').as('listProjects')
 
     cy.goToProjects()
       .getByDataTestid('createProjectLink').click()
       .get('select#organizationId-select').select(project.orgId)
-      .getByDataTestid('nameInput').type(`${project.name}`)
+      .getByDataTestid('nameInput').type(project.name)
     cy.getByDataTestid('createProjectBtn').should('be.enabled').click()
-    cy.wait('@postProject').its('response.statusCode').should('not.match', /^20\d$/)
-    cy.getByDataTestid('snackbar').should('contain', `Le projet "${project.name}" existe déjà`)
+    cy.wait('@postProject').its('response.statusCode').should('match', /^20\d$/)
+    cy.url().should('contain', `/projects/${project.orgName}-${project.name}-0/dashboard`)
   })
 })
diff --git a/apps/client/cypress/e2e/specs/dashboard.e2e.ts b/apps/client/cypress/e2e/specs/dashboard.e2e.ts
@@ -12,7 +12,7 @@ describe('Dashboard', () => {
   before(() => {
     cy.kcLogin('test')
 
-    cy.assertCreateProjects([projectToKeep.name, projectCreated.name, projectFailed.name])
+    cy.assertCreateProjects([projectToKeep.slug, projectCreated.slug, projectFailed.slug])
   })
 
   it('Should display project statuses', () => {
@@ -22,7 +22,7 @@ describe('Dashboard', () => {
     cy.kcLogin('test')
     projects.forEach((project) => {
       cy.goToProjects()
-        .getByDataTestid(`projectTile-${project.name}`).click()
+        .getByDataTestid(`projectTile-${project.slug}`).click()
         .getByDataTestid('menuDashboard').click()
       cy.wait('@listStages')
         .getByDataTestid(`${project.id}-${project.status}-badge`)
@@ -40,7 +40,7 @@ describe('Dashboard', () => {
 
     cy.kcLogin('test')
       .goToProjects()
-      .getByDataTestid(`projectTile-${projectToKeep.name}`).click()
+      .getByDataTestid(`projectTile-${projectToKeep.slug}`).click()
       .getByDataTestid('menuDashboard').click()
     cy.wait('@listStages')
       .getByDataTestid('setDescriptionBtn').click()
@@ -65,7 +65,7 @@ describe('Dashboard', () => {
     cy.kcLogin('test')
 
     cy.goToProjects()
-      .getByDataTestid(`projectTile-${projectCreated.name}`).click()
+      .getByDataTestid(`projectTile-${projectCreated.slug}`).click()
       .getByDataTestid('menuDashboard').click()
 
     cy.url().should('contain', 'dashboard')
@@ -85,7 +85,7 @@ describe('Dashboard', () => {
     cy.kcLogin('test')
 
     cy.goToProjects()
-      .getByDataTestid(`projectTile-${projectCreated.name}`).click()
+      .getByDataTestid(`projectTile-${projectCreated.slug}`).click()
       .getByDataTestid('menuDashboard').click()
 
     cy.url().should('contain', 'dashboard')
@@ -101,7 +101,7 @@ describe('Dashboard', () => {
     cy.kcLogin((user.firstName.slice(0, 1) + user.lastName).toLowerCase())
 
     cy.goToProjects()
-      .getByDataTestid(`projectTile-${projectCreated.name}`).click()
+      .getByDataTestid(`projectTile-${projectCreated.slug}`).click()
       .getByDataTestid('menuDashboard').click()
 
     cy.url().should('contain', 'dashboard')
@@ -115,7 +115,7 @@ describe('Dashboard', () => {
     cy.kcLogin((user.firstName.slice(0, 1) + user.lastName).toLowerCase())
 
     cy.goToProjects()
-      .getByDataTestid(`projectTile-${projectCreated.name}`).click()
+      .getByDataTestid(`projectTile-${projectCreated.slug}`).click()
       .getByDataTestid('menuDashboard').click()
 
     cy.url().should('contain', 'dashboard')
@@ -126,7 +126,7 @@ describe('Dashboard', () => {
   it('Should archive project as owner without impacting other projects', () => {
     cy.kcLogin('test')
     cy.archiveProject(projectToArchive)
-    cy.assertCreateProjects([projectToKeep.name, projectCreated.name, projectFailed.name])
+    cy.assertCreateProjects([projectToKeep.slug, projectCreated.slug, projectFailed.slug])
     cy.assertAddRepo(projectToKeep, projectToKeep.repositories)
     cy.assertUsers(projectToKeep, [owner.email, user.email])
     cy.assertAddEnvironment(projectToKeep, projectToKeep.environments, false)

diff --git a/apps/client/cypress/e2e/specs/environments.e2e.ts b/apps/client/cypress/e2e/specs/environments.e2e.ts
@@ -52,7 +52,7 @@ describe('Manage project environments', () => {
     cy.intercept('GET', '/api/v1/projects?filter=member&statusNotIn=archived').as('listProjects')
 
     cy.goToProjects()
-      .getByDataTestid(`projectTile-${project0?.name}`).click()
+      .getByDataTestid(`projectTile-${project0?.slug}`).click()
       .getByDataTestid('menuEnvironments').click()
       .url().should('contain', '/environments')
     cy.wait('@getClusters')
@@ -97,7 +97,7 @@ describe('Manage project environments', () => {
     cy.intercept('GET', 'api/v1/quotas').as('listStages')
 
     cy.goToProjects()
-      .getByDataTestid(`projectTile-${project0?.name}`)
+      .getByDataTestid(`projectTile-${project0?.slug}`)
       .click()
     cy.getByDataTestid('menuEnvironments')
       .click()
@@ -159,7 +159,7 @@ describe('Manage project environments', () => {
     cy.intercept('GET', 'api/v1/quotas').as('listStages')
 
     cy.goToProjects()
-      .getByDataTestid(`projectTile-${project1?.name}`).click()
+      .getByDataTestid(`projectTile-${project1?.slug}`).click()
       .getByDataTestid('menuEnvironments').click()
       .url().should('contain', '/environments')
     cy.wait('@getClusters')
@@ -203,7 +203,7 @@ describe('Manage project environments', () => {
 
     cy.kcLogin('test')
     cy.goToProjects()
-      .getByDataTestid(`projectTile-${project1.name}`).click()
+      .getByDataTestid(`projectTile-${project1.slug}`).click()
       .getByDataTestid('menuEnvironments').click()
       .url().should('contain', '/environments')
     cy.wait('@listEnvironments').its('response.statusCode').should('match', /^20\d$/)
@@ -254,7 +254,7 @@ describe('Manage project environments', () => {
     cy.intercept('GET', '/api/v1/stages').as('listStages')
     cy.kcLogin((user.firstName.slice(0, 1) + user.lastName).toLowerCase())
       .goToProjects()
-      .getByDataTestid(`projectTile-${project1.name}`).click()
+      .getByDataTestid(`projectTile-${project1.slug}`).click()
       .getByDataTestid('menuEnvironments').click()
     cy.wait('@getClusters')
     cy.getByDataTestid(`environmentTile-${project1FirstEnvironment?.name}`)
@@ -270,7 +270,7 @@ describe('Manage project environments', () => {
 
     cy.kcLogin('test')
     cy.goToProjects()
-      .getByDataTestid(`projectTile-${projectFailed.name}`).click()
+      .getByDataTestid(`projectTile-${projectFailed.slug}`).click()
       .getByDataTestid('menuEnvironments').click()
       .url().should('contain', '/environments')
     cy.getByDataTestid(`environmentTile-${projectFailed.environments[0].name}`).click()

diff --git a/apps/client/cypress/e2e/specs/projects.e2e.ts b/apps/client/cypress/e2e/specs/projects.e2e.ts
@@ -16,8 +16,8 @@ describe('Projects view', () => {
           .get('[data-testid^="projectTile-"]')
           .should('have.length', `${response?.body.length}`)
       })
-      .getByDataTestid(`projectTile-${project.name}`).click()
-      .url().should('contain', `projects/${project.id}/dashboard`)
+      .getByDataTestid(`projectTile-${project.slug}`).click()
+      .url().should('contain', `projects/${project.slug}/dashboard`)
     cy.wait('@listStages')
     cy.getByDataTestid('descriptionP')
     cy.should('contain', project.description)

diff --git a/apps/client/cypress/e2e/specs/redirection.e2e.ts b/apps/client/cypress/e2e/specs/redirection.e2e.ts
@@ -19,12 +19,12 @@ describe('Redirection', () => {
     cy.wait('@listProjects').its('response').then((response) => {
       cy.get('[data-testid^="projectTile-"]')
       cy.should('have.length', `${response?.body.length}`)
-      cy.getByDataTestid(`projectTile-${project.name}`).click()
-      cy.url().should('contain', `/projects/${project.id}/dashboard`)
+      cy.getByDataTestid(`projectTile-${project.slug}`).click()
+      cy.url().should('contain', `/projects/${project.slug}/dashboard`)
     })
     cy.reload()
     cy.wait('@postToken')
-    cy.url().should('contain', `/projects/${project.id}/dashboard`)
+    cy.url().should('contain', `/projects/${project.slug}/dashboard`)
     cy.wait('@listProjects').its('response').then((_response) => {
       cy.getByDataTestid('descriptionP')
       cy.should('contain', project.description)
@@ -36,13 +36,13 @@ describe('Redirection', () => {
     cy.intercept('POST', '/realms/cloud-pi-native/protocol/openid-connect/token').as('postToken')
     cy.intercept('GET', '/realms/cloud-pi-native/account').as('getAccount')
 
-    cy.visit(`/projects/${project.id}/dashboard`)
-    cy.url().should('not.contain', `/projects/${project.id}/dashboard`)
+    cy.visit(`/projects/${project.slug}/dashboard`)
+    cy.url().should('not.contain', `/projects/${project.slug}/dashboard`)
     cy.get('input#username').type('test')
     cy.get('input#password').type('test')
     cy.get('input#kc-login').click()
     cy.wait('@postToken')
-    cy.url().should('contain', `/projects/${project.id}/dashboard`)
+    cy.url().should('contain', `/projects/${project.slug}/dashboard`)
     cy.wait('@listProjects', { timeout: 5_000 }).its('response').then((_response) => {
       cy.getByDataTestid('descriptionP')
       cy.should('contain', project.description)