Merge branch 'main' into julien/fix-multilanguage

.eslintignore

@@ -9,3 +9,4 @@ tmp/
 
 # Ignore certain project files
 docs/assets/js/
+apps/dsp-app/cypress/

.gitignore

@@ -59,4 +59,4 @@ Thumbs.db
 
 #E2E
 /.nx
-apps/dsp-app-e2e/cypress/screenshots
+apps/dsp-app/cypress/screenshots

apps/dsp-app/cypress/e2e/logged-out-user/dashboard.cy.ts

@@ -0,0 +1,15 @@
+describe('Visual Check for Projects on Home Page', () => {
+  it.skip('should load clickable projects on the home page', () => {
+    cy.visit('/');
+
+    cy.get('[data-cy=accept-cookies]').click();
+
+    const projectTileSelector = '[data-cy=tile]';
+
+    cy.get(projectTileSelector).should('be.visible').should('have.length.greaterThan', 0);
+
+    cy.get(projectTileSelector).first().find('[data-cy=navigate-to-project-button]').click();
+
+    cy.url().should('include', '/project'); // Update with the expected URL
+  });
+});

apps/dsp-app/cypress/e2e/system-admin/dashboard.cy.ts

@@ -0,0 +1,15 @@
+const MY_TOKEN = '';
+localStorage.setItem('ACCESS_TOKEN', MY_TOKEN);
+
+describe('ADMIN TEST', () => {
+  it('should load clickable projects on the home page', () => {
+    cy.visit('/');
+    const projectTileSelector = '[data-cy=tile]';
+
+    cy.get(projectTileSelector).should('be.visible').should('have.length.greaterThan', 0);
+
+    cy.get(projectTileSelector).first().find('[data-cy=navigate-to-project-button]').click();
+
+    cy.url().should('include', '/project'); // Update with the expected URL
+  });
+});

apps/dsp-app/cypress/support/commands/login.ts

@@ -0,0 +1,25 @@
+import { User } from '../../models/user-profiles';
+
+Cypress.Commands.add('login', (user: User) => {
+  cy.session(
+    user,
+    () => {
+      cy.request({
+        method: 'POST',
+        url: `${Cypress.env('apiUrl')}/v2/authentication`,
+        body: {
+          username: user.username,
+          password: user.password,
+        },
+      }).then(response => {
+        localStorage.setItem('cookieBanner', 'false');
+        localStorage.setItem('ACCESS_TOKEN', response.body.token);
+      });
+    },
+    {
+      validate: () => {
+        expect(localStorage.getItem('ACCESS_TOKEN')).to.exist;
+      },
+    }
+  );
+});

apps/dsp-app-e2e/cypress/support/e2e.ts → apps/dsp-app/cypress/support/e2e.ts

@@ -9,14 +9,14 @@ beforeEach(() => {
     // read JSON data file
     users = json;
 
-    if (Cypress.spec.relative.startsWith('cypress/e2e/System_Admin')) {
+    if (Cypress.spec.relative.startsWith('cypress/e2e/system-admin')) {
       cy.login({
         username: users.systemAdmin_username_root,
         password: users.systemAdmin_password_root,
       });
     }
 
-    if (Cypress.spec.relative.startsWith('cypress/e2e/Project_Member')) {
+    if (Cypress.spec.relative.startsWith('cypress/e2e/project-member')) {
       cy.login({
         username: users.projectMember_username,
         password: users.projectMember_password,

apps/dsp-app/cypress/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "include": [
+    "**/*.ts"
+  ],
+  "exclude": [],
+  "compilerOptions": {
+    "sourceMap": false,
+    "types": [
+      "cypress"
+    ]
+  }
+}

apps/dsp-app/project.json

@@ -190,8 +190,8 @@
       "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": ["apps/dsp-app/**/*.ts", "apps/dsp-app/**/*.html"]
-      }
+        "lintFilePatterns": ["apps/dsp-app/**/*.{ts,html}"]
+          }
     },
     "test": {
       "executor": "@angular-devkit/build-angular:karma",
@@ -221,6 +221,26 @@
           "browsers": "ChromeHeadless"
         }
       }
+    },
+    "e2e": {
+      "executor": "@nx/cypress:cypress",
+      "options": {
+        "cypressConfig": "apps/dsp-app/cypress.config.ts"
+      },
+      "configurations": {
+        "production": {
+          "devServerTarget": "dsp-app:serve:production",
+          "env": {
+            "API_URL": "http://0.0.0.0:3333/api"
+          }
+        },
+        "development": {
+          "devServerTarget": "dsp-app:serve:development",
+          "env": {
+            "API_URL": "http://0.0.0.0:3333/api"
+          }
+        }
+      }
     }
   }
 }

apps/dsp-app/src/app/app.component.html

@@ -15,7 +15,7 @@
       <span class="link" (click)="goToCookiePolicy()">use of cookies</span>.
     </p>
     <div class="action">
-      <button mat-flat-button color="primary" (click)="closeCookieBanner()">ACCEPT</button>
+      <button mat-flat-button color="primary" (click)="closeCookieBanner()" data-cy="accept-cookies">ACCEPT</button>
     </div>
   </div>
 </div>

apps/dsp-app/src/app/system/project-tile/project-tile.component.html

@@ -1,4 +1,4 @@
-<div class="project-tile">
+<div class="project-tile" data-cy="tile">
   <div class="project-tile-content">
     <div class="top-bar">
       <div class="status">
@@ -25,7 +25,12 @@
     </div>
 
     <div class="workspace-button-container">
-      <button class="workspace-button" mat-flat-button [color]="'primary'" (click)="navigateToProject(project.id)">
+      <button
+        class="workspace-button"
+        mat-flat-button
+        [color]="'primary'"
+        (click)="navigateToProject(project.id)"
+        data-cy="navigate-to-project-button">
         Browse Data
       </button>
     </div>

apps/dsp-app/tsconfig.json

@@ -21,6 +21,9 @@
     },
     {
       "path": "./tsconfig.editor.json"
+    },
+    {
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../tsconfig.base.json",

cypress.config.ts

@@ -0,0 +1,9 @@
+import { defineConfig } from "cypress";
+
+export default defineConfig({
+  e2e: {
+    setupNodeEvents(on, config) {
+      // implement node event listeners here
+    },
+  },
+});

package.json

@@ -14,9 +14,9 @@
     "start-with-ls-test-server": "nx run dsp-app:serve:ls-test-server",
     "start-with-0845-test-server": "nx run dsp-app:serve:0845-test-server",
     "start-with-staging-server": "nx run dsp-app:serve:staging-server",
-    "e2e-local": "cd apps/dsp-app-e2e && npx cypress open",
-    "e2e-ci-dev": "nx run dsp-app-e2e:e2e:development",
-    "e2e-ci": "nx run dsp-app-e2e:e2e:production",
+    "e2e-local": "cd apps/dsp-app && npx cypress open",
+    "e2e-ci-dev": "nx run dsp-app:e2e:development",
+    "e2e-ci": "nx run dsp-app:e2e:production",
     "build": "nx run dsp-app:build",
     "build-prod": "nx run dsp-app:build:production",
     "test-ci": "nx run dsp-app:test:ci",