Merge branch 'main' into organization-admin

uselagoon · Jul 4, 2024 · a948383 · a948383
2 parents abce929 + 3f01f91
commit a948383
Show file tree

Hide file tree

Showing 21 changed files with 733 additions and 513 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
 # Node builder image
-FROM uselagoon/node-20-builder:latest as builder
+FROM uselagoon/node-20-builder:latest AS builder
 
 COPY . /app/
 
-RUN yarn install
+RUN yarn install --network-timeout 300000
 
 
 # Node service image
@@ -28,4 +28,4 @@ ENV GRAPHQL_API=$GRAPHQL_API
 RUN yarn run build
 
 EXPOSE 3000
-CMD ["yarn", "start"]
+CMD ["yarn", "start"]
diff --git a/cypress/cypress.config.ts b/cypress/cypress.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'cypress';
 
 export default defineConfig({
   requestTimeout: 15000,
+  defaultCommandTimeout: 8000,
   e2e: {
     env: {
       api: 'http://0.0.0.0:33000/graphql',

diff --git a/cypress/e2e/organizations/overview.cy.ts b/cypress/e2e/organizations/overview.cy.ts
@@ -23,7 +23,7 @@ describe('Organization overview page', () => {
     overview.doQuotaFieldCheck();
   });
 
-  it.only('Changes org friendly name/description', () => {
+  it('Changes org friendly name/description', () => {
     registerIdleHandler('idle');
 
     overview.changeOrgFriendlyname(testData.organizations.overview.friendlyName);

diff --git a/cypress/e2e/rbac/developer.cy.ts b/cypress/e2e/rbac/developer.cy.ts
@@ -114,7 +114,7 @@ describe('DEVELOPER permission test suites', () => {
       environmentOverview.doDeleteEnvironmentError('main');
     });
 
-    it('Deletes stating environment', () => {
+    it('Deletes staging environment', () => {
       cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/lagoon-demo-staging`);
 
       cy.intercept('POST', Cypress.env('api'), req => {
@@ -147,7 +147,7 @@ describe('DEVELOPER permission test suites', () => {
     });
 
     it('Fails to cancel any deployment - no permission to CANCEL for DEVELOPER', () => {
-      cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/lagoon-demo-staging/deployments`);
+      cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/lagoon-demo-main/deployments`);
 
       registerIdleHandler('idle');
 

diff --git a/cypress/e2e/rbac/guest.cy.ts b/cypress/e2e/rbac/guest.cy.ts
@@ -146,7 +146,7 @@ describe('GUEST permission test suites', () => {
     });
 
     it('Fails to do cancel a deployment - no permission for GUEST', () => {
-      cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/lagoon-demo-staging/deployments`);
+      cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/lagoon-demo-main/deployments`);
       registerIdleHandler('idle');
 
       cy.intercept('POST', Cypress.env('api'), req => {

diff --git a/cypress/e2e/rbac/maintainer.cy.ts b/cypress/e2e/rbac/maintainer.cy.ts
@@ -136,7 +136,7 @@ describe('MAINTAINER permission test suites', () => {
       environmentOverview.doDeleteEnvironmentError('main');
     });
 
-    it('Deletes stating environment', () => {
+    it('Deletes staging environment', () => {
       cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/lagoon-demo-staging`);
 
       cy.intercept('POST', Cypress.env('api'), req => {
@@ -169,7 +169,7 @@ describe('MAINTAINER permission test suites', () => {
     });
 
     it('Cancels a staging deployment', () => {
-      cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/lagoon-demo-staging/deployments`);
+      cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/lagoon-demo-main/deployments`);
 
       registerIdleHandler('idle');
 

diff --git a/cypress/e2e/rbac/reporter.cy.ts b/cypress/e2e/rbac/reporter.cy.ts
@@ -143,7 +143,7 @@ describe('REPORTER permission test suites', () => {
     });
 
     it('Fails to do cancel a deployment - no permission for REPORTER', () => {
-      cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/lagoon-demo-staging/deployments`);
+      cy.visit(`${Cypress.env('url')}/projects/lagoon-demo/lagoon-demo-main/deployments`);
 
       registerIdleHandler('idle');
 
@@ -168,6 +168,8 @@ describe('REPORTER permission test suites', () => {
       cy.waitForNetworkIdle('@idle', 500);
 
       deployment.navigateToRunningDeployment();
+
+      cy.waitForNetworkIdle('@idle', 500);
       deployment.doFailedCancelDeployment();
     });
   });

diff --git a/cypress/support/actions/organizations/OverviewAction.ts b/cypress/support/actions/organizations/OverviewAction.ts
@@ -34,7 +34,8 @@ export default class OverviewAction {
 
   changeOrgFriendlyname(friendlyName: string) {
     overviewRepo.getNameEditButton('edit-name').click();
-    overviewRepo.getEditField().type(friendlyName);
+
+    overviewRepo.getEditField().clear().type(friendlyName);
     overviewRepo.getSubmitButton().click();
 
     cy.wait('@gqlupdateOrganizationFriendlyNameMutation');
@@ -53,7 +54,7 @@ export default class OverviewAction {
   }
   doFailedChangeOrgFriendlyname(friendlyName: string) {
     overviewRepo.getNameEditButton('edit-name').click();
-    overviewRepo.getEditField().type(friendlyName);
+    overviewRepo.getEditField().clear().type(friendlyName);
     overviewRepo.getSubmitButton().click();
 
     cy.wait('@gqlupdateOrganizationFriendlyNameMutation').then(interception => {
@@ -68,7 +69,7 @@ export default class OverviewAction {
 
   changeOrgDescription(description: string) {
     overviewRepo.getDescEditButton('edit-description').click();
-    overviewRepo.getEditField().type(description);
+    overviewRepo.getEditField().clear().type(description);
     overviewRepo.getSubmitButton().click();
 
     cy.wait('@gqlupdateOrganizationFriendlyNameMutation');
@@ -85,7 +86,7 @@ export default class OverviewAction {
   }
   doFailedChangeOrgDescription(description: string) {
     overviewRepo.getDescEditButton('edit-description').click();
-    overviewRepo.getEditField().type(description);
+    overviewRepo.getEditField().clear().type(description);
     overviewRepo.getSubmitButton().click();
 
     cy.wait('@gqlupdateOrganizationFriendlyNameMutation').then(interception => {

diff --git a/cypress/support/actions/organizations/ProjectsActions.ts b/cypress/support/actions/organizations/ProjectsActions.ts
@@ -17,7 +17,7 @@ export default class ProjectsActions {
 
     projects.selectTarget();
 
-    projects.getAddConfirm().click();
+    projects.getAddConfirm().click({ force: true });
 
     cy.wait('@gqladdProjectToOrganizationMutation');
 
@@ -32,7 +32,7 @@ export default class ProjectsActions {
 
     projects.selectTarget();
 
-    projects.getAddConfirm().click();
+    projects.getAddConfirm().click({ force: true });
 
     cy.wait('@gqladdProjectToOrganizationMutation').then(interception => {
       expect(interception.response?.statusCode).to.eq(200);

diff --git a/src/components/DeploymentsByFilter/index.js b/src/components/DeploymentsByFilter/index.js
@@ -118,10 +118,12 @@ const DeploymentsByFilter = ({ deployments }) => {
     });
   };
 
+  const sortedFilteredItems = sortedItems.filter(deployment => filterResults(deployment));
+
   return (
     <Deployments>
       <div className="filters">
-        <label>{sortedItems.length == 1 ? `1 deployment` : `${sortedItems.length} deployments`}</label>
+        <label>{sortedItems.length == 1 ? `1 deployment` : `${sortedFilteredItems.length} deployments`}</label>
         <label></label>
         <input
           type="text"
@@ -162,58 +164,54 @@ const DeploymentsByFilter = ({ deployments }) => {
           <label>Duration</label>
           <label></label>
         </DeploymentsHeader>
-        {!sortedItems.filter(deployment => filterResults(deployment)).length && (
-          <div className="data-none">No deployments</div>
-        )}
-        {sortedItems
-          .filter(deployment => filterResults(deployment))
-          .map(deployment => {
-            return (
-              <div className="data-row row-heading" key={deployment.id}>
-                <div className="project">
-                  <ProjectLink projectSlug={deployment.environment.project.name}>
-                    {formatString(deployment.environment.project.name, 'project')}
-                  </ProjectLink>
-                </div>
-                <div className="environment">
-                  <DeploymentsLink
-                    environmentSlug={deployment.environment.openshiftProjectName}
-                    projectSlug={deployment.environment.project.name}
-                  >
-                    {formatString(deployment.environment.name, 'environment')}
-                  </DeploymentsLink>
-                </div>
-                <div className="cluster">{formatString(deployment.environment.openshift.name, 'cluster')}</div>
-                <div className="name">
-                  <DeploymentLink
-                    deploymentSlug={deployment.name}
-                    environmentSlug={deployment.environment.openshiftProjectName}
-                    projectSlug={deployment.environment.project.name}
-                    key={deployment.id}
-                  >
-                    {deployment.name}
-                  </DeploymentLink>
-                </div>
-                <div className="priority">{deployment.priority}</div>
-                <div className="started">
-                  {moment.utc(deployment.created).local().format('DD MMM YYYY, HH:mm:ss (Z)')}
-                </div>
-                <div className={`status buildstep ${deployment.status}`}>
-                  {deployment.status.charAt(0).toUpperCase() + deployment.status.slice(1)}
-
-                  {!['complete', 'cancelled', 'failed'].includes(deployment.status) && deployment.buildStep && (
-                    <HoverTag text={deployment.buildStep} maxWidth="160px" tooltipPosition="bottom" />
-                  )}
-                </div>
-                <div className="duration">{getDeploymentDuration(deployment)}</div>
-                <div>
-                  {['new', 'pending', 'queued', 'running'].includes(deployment.status) && (
-                    <CancelDeployment deployment={deployment} afterText="Cancelled" beforeText="Cancel" />
-                  )}
-                </div>
+        {!sortedFilteredItems.length && <div className="data-none">No deployments</div>}
+        {sortedFilteredItems.map(deployment => {
+          return (
+            <div className="data-row row-heading" key={deployment.id}>
+              <div className="project">
+                <ProjectLink projectSlug={deployment.environment.project.name}>
+                  {formatString(deployment.environment.project.name, 'project')}
+                </ProjectLink>
+              </div>
+              <div className="environment">
+                <DeploymentsLink
+                  environmentSlug={deployment.environment.openshiftProjectName}
+                  projectSlug={deployment.environment.project.name}
+                >
+                  {formatString(deployment.environment.name, 'environment')}
+                </DeploymentsLink>
+              </div>
+              <div className="cluster">{formatString(deployment.environment.openshift.name, 'cluster')}</div>
+              <div className="name">
+                <DeploymentLink
+                  deploymentSlug={deployment.name}
+                  environmentSlug={deployment.environment.openshiftProjectName}
+                  projectSlug={deployment.environment.project.name}
+                  key={deployment.id}
+                >
+                  {deployment.name}
+                </DeploymentLink>
+              </div>
+              <div className="priority">{deployment.priority}</div>
+              <div className="started">
+                {moment.utc(deployment.created).local().format('DD MMM YYYY, HH:mm:ss (Z)')}
+              </div>
+              <div className={`status buildstep ${deployment.status}`}>
+                {deployment.status.charAt(0).toUpperCase() + deployment.status.slice(1)}
+
+                {!['complete', 'cancelled', 'failed'].includes(deployment.status) && deployment.buildStep && (
+                  <HoverTag text={deployment.buildStep} maxWidth="160px" tooltipPosition="bottom" />
+                )}
+              </div>
+              <div className="duration">{getDeploymentDuration(deployment)}</div>
+              <div>
+                {['new', 'pending', 'queued', 'running'].includes(deployment.status) && (
+                  <CancelDeployment deployment={deployment} afterText="Cancelled" beforeText="Cancel" />
+                )}
               </div>
-            );
-          })}
+            </div>
+          );
+        })}
       </DeploymentsDataTable>
     </Deployments>
   );

diff --git a/src/components/Organizations/NewProject/StyledNewProject.tsx b/src/components/Organizations/NewProject/StyledNewProject.tsx
@@ -20,6 +20,9 @@ export const StyledNewProject = styled.div`
 
   .form-box {
     margin-bottom: 1rem;
+    &.spacetop {
+      margin-top: 1rem;
+    }
   }
 
   .docs-link {