From b3b31be65575810c295c6928723d795802ff48b7 Mon Sep 17 00:00:00 2001
From: David Inga <david.inga@vizzuality.com>
Date: Tue, 19 Sep 2023 13:53:38 +0200
Subject: [PATCH 1/6] removing fixtures for a real e2e based on api data

removing fixtures gradually
---
 client/cypress/e2e/analysis/charts.cy.ts      |   2 +-
 client/cypress/e2e/analysis/comparison.cy.ts  |   2 +-
 .../{map.cy.ts => contextual-layer.cy.ts}     |   2 +-
 client/cypress/e2e/analysis/filters.cy.ts     | 157 ++++++++++--------
 .../cypress/e2e/analysis/impact-layer.cy.ts   |  31 ++++
 client/cypress/e2e/analysis/scenarios.cy.ts   |   2 +-
 client/cypress/e2e/analysis/table.cy.ts       |   2 +-
 client/cypress/e2e/analysis/ui.cy.ts          |   2 +-
 client/cypress/e2e/data.cy.ts                 |   2 +-
 .../cypress/e2e/data/download-template.cy.ts  |  32 ++++
 client/cypress/e2e/data/table.cy.ts           |  23 +++
 .../cypress/e2e/intervention-creation.cy.ts   |   2 +-
 client/cypress/e2e/intervention-edition.cy.ts |   2 +-
 client/cypress/e2e/scenario-creation.cy.ts    |   2 +-
 client/cypress/e2e/scenarios.cy.ts            |   2 +-
 client/cypress/e2e/sign-in.cy.ts              |   2 +-
 client/cypress/support/commands.ts            |  20 +++
 client/cypress/support/index.d.ts             |   1 +
 .../containers/admin/data-table/component.tsx |   5 +-
 19 files changed, 207 insertions(+), 86 deletions(-)
 rename client/cypress/e2e/analysis/{map.cy.ts => contextual-layer.cy.ts} (98%)
 create mode 100644 client/cypress/e2e/analysis/impact-layer.cy.ts
 create mode 100644 client/cypress/e2e/data/download-template.cy.ts
 create mode 100644 client/cypress/e2e/data/table.cy.ts

diff --git a/client/cypress/e2e/analysis/charts.cy.ts b/client/cypress/e2e/analysis/charts.cy.ts
index 1964e4f91..b80e1f806 100644
--- a/client/cypress/e2e/analysis/charts.cy.ts
+++ b/client/cypress/e2e/analysis/charts.cy.ts
@@ -1,7 +1,7 @@
 describe('Analysis charts', () => {
   beforeEach(() => {
     cy.interceptAllRequests();
-    cy.login();
+    cy.loginWithFixtures();
     cy.visit('/analysis/chart');
   });
 
diff --git a/client/cypress/e2e/analysis/comparison.cy.ts b/client/cypress/e2e/analysis/comparison.cy.ts
index eeff79683..937ce5c5e 100644
--- a/client/cypress/e2e/analysis/comparison.cy.ts
+++ b/client/cypress/e2e/analysis/comparison.cy.ts
@@ -1,7 +1,7 @@
 describe('Analysis comparison', () => {
   beforeEach(() => {
     cy.interceptAllRequests();
-    cy.login();
+    cy.loginWithFixtures();
   });
 
   afterEach(() => {
diff --git a/client/cypress/e2e/analysis/map.cy.ts b/client/cypress/e2e/analysis/contextual-layer.cy.ts
similarity index 98%
rename from client/cypress/e2e/analysis/map.cy.ts
rename to client/cypress/e2e/analysis/contextual-layer.cy.ts
index 06dea946f..f48702edc 100644
--- a/client/cypress/e2e/analysis/map.cy.ts
+++ b/client/cypress/e2e/analysis/contextual-layer.cy.ts
@@ -1,7 +1,7 @@
 describe('Analysis contextual layers', () => {
   beforeEach(() => {
     cy.interceptAllRequests();
-    cy.login();
+    cy.loginWithFixtures();
     cy.visit('/analysis/map');
     cy.wait(['@fetchIndicators', '@fetchContextualLayerCategories']);
     cy.get('[data-testid="contextual-layer-modal-toggle"]').click();
diff --git a/client/cypress/e2e/analysis/filters.cy.ts b/client/cypress/e2e/analysis/filters.cy.ts
index db65502ee..456e08c24 100644
--- a/client/cypress/e2e/analysis/filters.cy.ts
+++ b/client/cypress/e2e/analysis/filters.cy.ts
@@ -1,7 +1,7 @@
 describe('Analysis filters', () => {
   beforeEach(() => {
-    cy.interceptAllRequests();
-    cy.login();
+    // cy.interceptAllRequests();
+    cy.loginWithFixtures();
     cy.visit('/analysis/table');
   });
 
@@ -9,90 +9,103 @@ describe('Analysis filters', () => {
     cy.logout();
   });
 
-  it('should be able to select all indicator', () => {
-    cy.wait('@fetchIndicators').then((interception) => {
-      expect(interception.response.body?.data).have.length(5);
-    });
+  // it('should be able to select all indicator', () => {
+  //   cy.wait('@fetchIndicators').then((interception) => {
+  //     expect(interception.response.body?.data).have.length(5);
+  //   });
 
-    cy.url().should('not.include', 'indicator');
+  //   cy.url().should('not.include', 'indicator');
 
-    // select indicator
-    cy.get('[data-testid="select-indicators-filter"]').find('button').click();
-    cy.get('[data-testid="select-indicators-filter"] ul li:first').click();
+  //   // select indicator
+  //   cy.get('[data-testid="select-indicators-filter"]').find('button').click();
+  //   cy.get('[data-testid="select-indicators-filter"] ul li:first').click();
 
-    cy.url().should('include', 'indicator=all');
-  });
+  //   cy.url().should('include', 'indicator=all');
+  // });
 
-  it('should be able to select Land use indicator', () => {
-    cy.wait('@fetchIndicators').then((interception) => {
-      expect(interception.response.body?.data).have.length(5);
-    });
+  // it('should be able to filter by Land use indicator', () => {
+  //   cy.wait('@fetchIndicators').then((interception) => {
+  //     expect(interception.response.body?.data).have.length(5);
+  //   });
 
-    cy.url().should('not.include', 'indicator');
+  //   cy.url().should('not.include', 'indicator');
 
-    cy.get('[data-testid="select-indicators-filter"]').find('button').click();
-    cy.get('[data-testid="select-indicators-filter"] ul li:first').next().click();
+  //   cy.get('[data-testid="select-indicators-filter"]').find('button').click();
+  //   cy.get('[data-testid="select-indicators-filter"] ul li:first').next().click();
 
-    cy.url().should('include', 'indicator=5c595ac7-f144-485f-9f32-601f6faae9fe'); // Land use
-  });
+  //   cy.url().should('include', 'indicator=5c595ac7-f144-485f-9f32-601f6faae9fe'); // Land use
+  // });
+
+  it('should be able to filter by a material', () => {
+    cy.intercept('GET', '/api/v1/materials/trees*').as('materialsTrees');
 
-  it('should update the params playing with the filters', () => {
-    // Step 1: open more filters
     cy.get('[data-testid="more-filters-button"]').click();
-    cy.wait(['@materialsTrees', '@originsTrees', '@t1Suppliers', '@fetchImpactTable']);
-
-    // Adding new interceptors after selecting a filter
-    cy.intercept(
-      'GET',
-      '/api/v1/suppliers/types?*originIds[]=8bd7e578-f64f-4042-8a3a-2a7652ce850b*',
-      {
-        fixture: 'trees/suppliers-filtered.json',
-      },
-    ).as('t1SuppliersFiltered');
-
-    cy.intercept(
-      {
-        method: 'GET',
-        pathname: '/api/v1/materials/trees',
-        query: {
-          'supplierIds[]': 'c8bca40d-1aec-44e3-b82b-8170898800ad',
-        },
-      },
-      {
-        fixture: 'trees/materials-filtered.json',
-      },
-    ).as('materialsTreesFiltered');
-    cy.wait('@locationTypes');
-
-    // Step 2: Selecting Angola in the admin regions selector
-    cy.get('[data-testid="tree-select-origins-filter"]').find('div[role="combobox"]').click();
-    cy.get('[data-testid="tree-select-origins-filter"]')
-      .find('div[role="listbox"]')
-      .find('.rc-tree-treenode')
-      .eq(1)
-      .click();
-    cy.get('[data-testid="tree-select-origins-filter"]')
-      .find('input:visible:first')
-      .type('{enter}');
-    cy.wait('@locationTypes');
-    // Step 3: Selecting Moll in the material selector
-    cy.wait('@t1SuppliersFiltered');
+    cy.wait('@materialsTrees');
     cy.get('[data-testid="tree-select-t1-suppliers-filter"]').find('div[role="combobox"]').click();
     cy.get('[data-testid="tree-select-t1-suppliers-filter"]')
       .find('div[role="listbox"]')
       .find('.rc-tree-treenode')
       .eq(1)
       .click();
-    cy.wait('@locationTypes');
-    // Step 4: Checking material selector
-    cy.wait('@materialsTreesFiltered')
-      .its('request.url')
-      .should('include', '8bd7e578-f64f-4042-8a3a-2a7652ce850b');
-
-    cy.get('[data-testid="tree-select-materials-filter"]').find('div[role="combobox"]').click();
-    cy.get('[data-testid="tree-select-materials-filter"]')
-      .find('div[role="listbox"]')
-      .find('.rc-tree-treenode:visible')
-      .should('have.length', 1); // first treenode is empty
   });
+
+  // it('should update the URL params selecting multiple filters', () => {
+  //   // Step 1: open more filters
+  //   cy.get('[data-testid="more-filters-button"]').click();
+  //   cy.wait(['@materialsTrees', '@originsTrees', '@t1Suppliers', '@fetchImpactTable']);
+
+  //   // Adding new interceptors after selecting a filter
+  //   cy.intercept(
+  //     'GET',
+  //     '/api/v1/suppliers/types?*originIds[]=8bd7e578-f64f-4042-8a3a-2a7652ce850b*',
+  //     {
+  //       fixture: 'trees/suppliers-filtered.json',
+  //     },
+  //   ).as('t1SuppliersFiltered');
+
+  //   cy.intercept(
+  //     {
+  //       method: 'GET',
+  //       pathname: '/api/v1/materials/trees',
+  //       query: {
+  //         'supplierIds[]': 'c8bca40d-1aec-44e3-b82b-8170898800ad',
+  //       },
+  //     },
+  //     {
+  //       fixture: 'trees/materials-filtered.json',
+  //     },
+  //   ).as('materialsTreesFiltered');
+  //   cy.wait('@locationTypes');
+
+  //   // Step 2: Selecting Angola in the admin regions selector
+  //   cy.get('[data-testid="tree-select-origins-filter"]').find('div[role="combobox"]').click();
+  //   cy.get('[data-testid="tree-select-origins-filter"]')
+  //     .find('div[role="listbox"]')
+  //     .find('.rc-tree-treenode')
+  //     .eq(1)
+  //     .click();
+  //   cy.get('[data-testid="tree-select-origins-filter"]')
+  //     .find('input:visible:first')
+  //     .type('{enter}');
+  //   cy.wait('@locationTypes');
+  //   // Step 3: Selecting Moll in the material selector
+  //   cy.wait('@t1SuppliersFiltered');
+  //   cy.get('[data-testid="tree-select-t1-suppliers-filter"]').find('div[role="combobox"]').click();
+  //   cy.get('[data-testid="tree-select-t1-suppliers-filter"]')
+  //     .find('div[role="listbox"]')
+  //     .find('.rc-tree-treenode')
+  //     .eq(1)
+  //     .click();
+  //   cy.wait('@locationTypes');
+  //   // Step 4: Checking material selector
+  //   cy.wait('@materialsTreesFiltered')
+  //     .its('request.url')
+  //     .should('include', '8bd7e578-f64f-4042-8a3a-2a7652ce850b');
+
+  //   cy.get('[data-testid="tree-select-materials-filter"]').find('div[role="combobox"]').click();
+  //   cy.get('[data-testid="tree-select-materials-filter"]')
+  //     .find('div[role="listbox"]')
+  //     .find('.rc-tree-treenode:visible')
+  //     .should('have.length', 1); // first treenode is empty
+  // });
 });
diff --git a/client/cypress/e2e/analysis/impact-layer.cy.ts b/client/cypress/e2e/analysis/impact-layer.cy.ts
new file mode 100644
index 000000000..583c86016
--- /dev/null
+++ b/client/cypress/e2e/analysis/impact-layer.cy.ts
@@ -0,0 +1,31 @@
+describe('Analysis: map impact layer', () => {
+  beforeEach(() => {
+    cy.intercept('GET', '/api/v1/h3/map/impact*', {
+      fixture: 'layers/impact-layer.json',
+    }).as('fetchImpactMap');
+    cy.login();
+  });
+
+  afterEach(() => {
+    cy.logout();
+  });
+
+  /**
+   * We're assuming mapbox is working as expected, and we'll just check that the request is made
+   */
+  it('request the impact layer', () => {
+    cy.visit('/analysis/map');
+
+    cy.get('canvas.mapboxgl-canvas').should('be.visible');
+
+    cy.wait('@fetchImpactMap').then((interception) => {
+      cy.wrap(JSON.stringify(interception.response.body.data[0])).should(
+        'be.equal',
+        JSON.stringify({
+          h: '84df6b7ffffffff',
+          v: '26924145.89',
+        }),
+      );
+    });
+  });
+});
diff --git a/client/cypress/e2e/analysis/scenarios.cy.ts b/client/cypress/e2e/analysis/scenarios.cy.ts
index 9bce1dc8a..11eede9db 100644
--- a/client/cypress/e2e/analysis/scenarios.cy.ts
+++ b/client/cypress/e2e/analysis/scenarios.cy.ts
@@ -1,7 +1,7 @@
 describe('Analysis scenarios', () => {
   beforeEach(() => {
     cy.interceptAllRequests();
-    cy.login();
+    cy.loginWithFixtures();
   });
 
   afterEach(() => {
diff --git a/client/cypress/e2e/analysis/table.cy.ts b/client/cypress/e2e/analysis/table.cy.ts
index 96bba1d12..49a1c1936 100644
--- a/client/cypress/e2e/analysis/table.cy.ts
+++ b/client/cypress/e2e/analysis/table.cy.ts
@@ -6,7 +6,7 @@ import {
 describe('Analysis table', () => {
   beforeEach(() => {
     cy.interceptAllRequests();
-    cy.login();
+    cy.loginWithFixtures();
     cy.visit('/analysis/table');
   });
 
diff --git a/client/cypress/e2e/analysis/ui.cy.ts b/client/cypress/e2e/analysis/ui.cy.ts
index b8c6114f1..2f3dfbb5d 100644
--- a/client/cypress/e2e/analysis/ui.cy.ts
+++ b/client/cypress/e2e/analysis/ui.cy.ts
@@ -1,7 +1,7 @@
 describe('Analysis tab', () => {
   beforeEach(() => {
     cy.interceptAllRequests();
-    cy.login();
+    cy.loginWithFixtures();
     cy.visit('/analysis');
   });
 
diff --git a/client/cypress/e2e/data.cy.ts b/client/cypress/e2e/data.cy.ts
index 2f16fac39..af0febad3 100644
--- a/client/cypress/e2e/data.cy.ts
+++ b/client/cypress/e2e/data.cy.ts
@@ -43,7 +43,7 @@ describe('Data page - admin', () => {
 describe('Data page - user', () => {
   beforeEach(() => {
     cy.interceptAllRequests();
-    cy.login();
+    cy.loginWithFixtures();
     cy.visit('/data');
     cy.wait('@sourcingLocations');
   });
diff --git a/client/cypress/e2e/data/download-template.cy.ts b/client/cypress/e2e/data/download-template.cy.ts
new file mode 100644
index 000000000..464aaa9cf
--- /dev/null
+++ b/client/cypress/e2e/data/download-template.cy.ts
@@ -0,0 +1,32 @@
+describe('Download data template', () => {
+  beforeEach(() => {
+    cy.login();
+  });
+
+  afterEach(() => {
+    cy.logout();
+  });
+
+  it('clicking on Download template in the upload modal', () => {
+    cy.intercept('/files/data-template.xlsx').as('downloadDataTemplate');
+
+    cy.visit('/data');
+
+    // Opening upload modal
+    cy.get('[data-testid="upload-data-source-btn"]').click();
+    cy.get('[data-testid="modal-upload-data-source"]').should('be.visible');
+
+    cy.get('[data-testid="download-template-btn"]').should('have.attr', 'download');
+    cy.get('[data-testid="download-template-btn"]')
+      .should('have.attr', 'href')
+      .and('equal', '/files/data-template.xlsx');
+    cy.get('[data-testid="download-template-btn"]').click();
+
+    cy.wait('@downloadDataTemplate').then((interception) => {
+      expect(interception.response.statusCode).to.equal(200);
+      expect(interception.response.headers['content-type']).to.equal(
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      );
+    });
+  });
+});
diff --git a/client/cypress/e2e/data/table.cy.ts b/client/cypress/e2e/data/table.cy.ts
new file mode 100644
index 000000000..6a1ef9988
--- /dev/null
+++ b/client/cypress/e2e/data/table.cy.ts
@@ -0,0 +1,23 @@
+describe('Data ingestion: table visualization', () => {
+  beforeEach(() => {
+    cy.intercept('GET', '/api/v1/sourcing-locations/materials*').as('sourcingLocationsMaterials');
+    cy.login();
+    cy.visit('/data');
+  });
+
+  afterEach(() => {
+    cy.logout();
+  });
+
+  it('see data ingested in a table', () => {
+    cy.wait('@sourcingLocationsMaterials').then((interception) => {
+      cy.get('table').should('be.visible');
+      // based on data and pagination, there should be more than 50 rows in the table
+      cy.get('tr.group').should('have.length', interception.response.body?.meta.size);
+    });
+  });
+
+  it('no filters in the table', () => {
+    cy.get('[data-testid="search-name-scenario"]').should('be.disabled');
+  });
+});
diff --git a/client/cypress/e2e/intervention-creation.cy.ts b/client/cypress/e2e/intervention-creation.cy.ts
index 1375af529..a5483bdd8 100644
--- a/client/cypress/e2e/intervention-creation.cy.ts
+++ b/client/cypress/e2e/intervention-creation.cy.ts
@@ -11,7 +11,7 @@ beforeEach(() => {
     fixture: 'scenario/scenario-materials',
   }).as('materialsTrees');
 
-  cy.login();
+  cy.loginWithFixtures();
   cy.createScenario();
   cy.visit('/data/scenarios/some-random-id/interventions/new');
 });
diff --git a/client/cypress/e2e/intervention-edition.cy.ts b/client/cypress/e2e/intervention-edition.cy.ts
index 521f611d6..dfa319781 100644
--- a/client/cypress/e2e/intervention-edition.cy.ts
+++ b/client/cypress/e2e/intervention-edition.cy.ts
@@ -1,7 +1,7 @@
 beforeEach(() => {
   cy.interceptAllRequests();
 
-  cy.login();
+  cy.loginWithFixtures();
   cy.visit('/data/scenarios/some-random-id/interventions/random-intervention-id/edit');
 });
 
diff --git a/client/cypress/e2e/scenario-creation.cy.ts b/client/cypress/e2e/scenario-creation.cy.ts
index 17b8343f0..2e7c301b9 100644
--- a/client/cypress/e2e/scenario-creation.cy.ts
+++ b/client/cypress/e2e/scenario-creation.cy.ts
@@ -1,6 +1,6 @@
 beforeEach(() => {
   cy.interceptAllRequests();
-  cy.login();
+  cy.loginWithFixtures();
   cy.visit('/data/scenarios/new');
 });
 
diff --git a/client/cypress/e2e/scenarios.cy.ts b/client/cypress/e2e/scenarios.cy.ts
index 3a488695c..3d89a42a9 100644
--- a/client/cypress/e2e/scenarios.cy.ts
+++ b/client/cypress/e2e/scenarios.cy.ts
@@ -24,7 +24,7 @@ beforeEach(() => {
   //   statusCode: 200,
   // }).as('deleteScenario');
 
-  cy.login();
+  cy.loginWithFixtures();
   cy.visit('/data/scenarios');
 });
 
diff --git a/client/cypress/e2e/sign-in.cy.ts b/client/cypress/e2e/sign-in.cy.ts
index 1a9fc996a..dbf955da7 100644
--- a/client/cypress/e2e/sign-in.cy.ts
+++ b/client/cypress/e2e/sign-in.cy.ts
@@ -8,7 +8,7 @@ describe('Sign in', () => {
     cy.visit('/auth/signin');
     cy.get('[name="email"]').type(Cypress.env('USERNAME'));
     cy.get('[name="password"]').type(Cypress.env('PASSWORD'));
-    cy.get('#signInForm').submit();
+    cy.get('button[type="submit"]').click();
     cy.wait('@signInRequest');
     cy.url().should('contain', 'analysis');
   });
diff --git a/client/cypress/support/commands.ts b/client/cypress/support/commands.ts
index f1f416366..4c1e6b095 100644
--- a/client/cypress/support/commands.ts
+++ b/client/cypress/support/commands.ts
@@ -18,6 +18,26 @@ Cypress.Commands.add(
   } = {}): Cypress.Chainable => {
     cy.log('🔐 Sign in with Next Auth');
 
+    return cy.session(['login', username, password], () => {
+      cy.wrap(
+        signIn('credentials', {
+          redirect: false,
+          username,
+          password,
+        }),
+      );
+    });
+  },
+);
+
+Cypress.Commands.add(
+  'loginWithFixtures',
+  ({
+    username = Cypress.env('USERNAME'),
+    password = Cypress.env('PASSWORD'),
+  } = {}): Cypress.Chainable => {
+    cy.log('🔐 Sign in with Next Auth');
+
     cy.intercept('GET', '/api/auth/session', {
       fixture: 'auth/session.json',
     }).as('session');
diff --git a/client/cypress/support/index.d.ts b/client/cypress/support/index.d.ts
index 279008554..984b03212 100644
--- a/client/cypress/support/index.d.ts
+++ b/client/cypress/support/index.d.ts
@@ -10,6 +10,7 @@ declare global {
        * @example cy.login()
        */
       login(credentials?: { username?: string; password?: string }): Chainable<null>;
+      loginWithFixtures(credentials?: { username?: string; password?: string }): Chainable<null>;
       logout(): Chainable<null>;
       createScenario(): Chainable<null>;
       interceptAllRequests(): Chainable<null>;
diff --git a/client/src/containers/admin/data-table/component.tsx b/client/src/containers/admin/data-table/component.tsx
index cc781f988..9e691759f 100644
--- a/client/src/containers/admin/data-table/component.tsx
+++ b/client/src/containers/admin/data-table/component.tsx
@@ -168,7 +168,7 @@ const AdminDataPage: React.FC<{ task: Task }> = ({ task }) => {
           </Button>
         </div>
 
-        {task?.user?.email === session.user?.email && <DataUploadError task={task} />}
+        {task?.user?.email === session?.user?.email && <DataUploadError task={task} />}
 
         {!isSourcingLocationsLoading && (
           <div className="flex justify-end w-full">
@@ -214,7 +214,7 @@ const AdminDataPage: React.FC<{ task: Task }> = ({ task }) => {
         onDismiss={closeUploadDataSourceModal}
         theme="default"
       >
-        <div>
+        <div data-testid="modal-upload-data-source">
           <div>
             <p className="text-sm text-gray-500">
               Uploading a new file will replace all the current data.
@@ -233,6 +233,7 @@ const AdminDataPage: React.FC<{ task: Task }> = ({ task }) => {
                 rel="noopener noreferrer"
                 icon={<DownloadIcon aria-hidden="true" />}
                 variant="white"
+                data-testid="download-template-btn"
               >
                 Download template
               </Anchor>

From adf9e9ed00f05c7530c6dce9d0c88f12f2fa5fcf Mon Sep 17 00:00:00 2001
From: David Inga <david.inga@vizzuality.com>
Date: Tue, 19 Sep 2023 14:33:39 +0200
Subject: [PATCH 2/6] upgrade cypress

---
 client/cypress.config.ts |   1 -
 client/package.json      |   2 +-
 client/yarn.lock         | 136 +++++++++++++++++++++++++++------------
 3 files changed, 96 insertions(+), 43 deletions(-)

diff --git a/client/cypress.config.ts b/client/cypress.config.ts
index 20b52799a..a20e6159f 100644
--- a/client/cypress.config.ts
+++ b/client/cypress.config.ts
@@ -9,7 +9,6 @@ export default defineConfig({
     baseUrl: 'http://localhost:3000',
     screenshotOnRunFailure: true,
     video: false,
-    videoUploadOnPasses: false,
     viewportWidth: 1280,
     viewportHeight: 920,
   },
diff --git a/client/package.json b/client/package.json
index f21216c43..966131f5d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -98,7 +98,7 @@
     "@types/react": "18.0.28",
     "@typescript-eslint/eslint-plugin": "5.13.0",
     "@typescript-eslint/parser": "5.13.0",
-    "cypress": "12.5.0",
+    "cypress": "13.2.0",
     "eslint": "8.23.1",
     "eslint-config-next": "13.2.4",
     "eslint-config-prettier": "8.6.0",
diff --git a/client/yarn.lock b/client/yarn.lock
index 3ad20c0dd..7b114394b 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1600,9 +1600,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cypress/request@npm:^2.88.10":
-  version: 2.88.10
-  resolution: "@cypress/request@npm:2.88.10"
+"@cypress/request@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "@cypress/request@npm:3.0.1"
   dependencies:
     aws-sign2: ~0.7.0
     aws4: ^1.8.0
@@ -1617,12 +1617,12 @@ __metadata:
     json-stringify-safe: ~5.0.1
     mime-types: ~2.1.19
     performance-now: ^2.1.0
-    qs: ~6.5.2
+    qs: 6.10.4
     safe-buffer: ^5.1.2
-    tough-cookie: ~2.5.0
+    tough-cookie: ^4.1.3
     tunnel-agent: ^0.6.0
     uuid: ^8.3.2
-  checksum: 69c3e3b332e9be4866a900f6bcca5d274d8cea6c99707fbcce061de8dbab11c9b1e39f4c017f6e83e6e682717781d4f6106fd6b7cf9546580fcfac353b6676cf
+  checksum: 7175522ebdbe30e3c37973e204c437c23ce659e58d5939466615bddcd58d778f3a8ea40f087b965ae8b8138ea8d102b729c6eb18c6324f121f3778f4a2e8e727
   languageName: node
   linkType: hard
 
@@ -5587,6 +5587,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:^14.0.10":
+  version: 14.18.24
+  resolution: "@types/node@npm:14.18.24"
+  checksum: 631b86787a2110048bcd45d2555e6b9265594a6c65bcdc9947004cbdf1b4b9c8f84b7f0c4f03e4b0b1d24fd821c8d39b931073e21832c8c29dc74de060efd11d
+  languageName: node
+  linkType: hard
+
 "@types/node@npm:^14.0.10 || ^16.0.0":
   version: 16.11.62
   resolution: "@types/node@npm:16.11.62"
@@ -5594,10 +5601,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^14.0.10, @types/node@npm:^14.14.31":
-  version: 14.18.24
-  resolution: "@types/node@npm:14.18.24"
-  checksum: 631b86787a2110048bcd45d2555e6b9265594a6c65bcdc9947004cbdf1b4b9c8f84b7f0c4f03e4b0b1d24fd821c8d39b931073e21832c8c29dc74de060efd11d
+"@types/node@npm:^18.17.5":
+  version: 18.17.17
+  resolution: "@types/node@npm:18.17.17"
+  checksum: ff28f347c77723780836f9bb2ffa6db0cd72490bfd7604397c03db31db34f1f2899e82f0aaf3e825efeb09c15bd94d076ea9aca19a1407e1b56cb4603318936c
   languageName: node
   linkType: hard
 
@@ -8419,13 +8426,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "commander@npm:5.1.0"
-  checksum: 0b7fec1712fbcc6230fcb161d8d73b4730fa91a21dc089515489402ad78810547683f058e2a9835929c212fead1d6a6ade70db28bbb03edbc2829a9ab7d69447
-  languageName: node
-  linkType: hard
-
 "commander@npm:^6.2.1":
   version: 6.2.1
   resolution: "commander@npm:6.2.1"
@@ -8900,13 +8900,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cypress@npm:12.5.0":
-  version: 12.5.0
-  resolution: "cypress@npm:12.5.0"
+"cypress@npm:13.2.0":
+  version: 13.2.0
+  resolution: "cypress@npm:13.2.0"
   dependencies:
-    "@cypress/request": ^2.88.10
+    "@cypress/request": ^3.0.0
     "@cypress/xvfb": ^1.2.4
-    "@types/node": ^14.14.31
+    "@types/node": ^18.17.5
     "@types/sinonjs__fake-timers": 8.1.1
     "@types/sizzle": ^2.3.2
     arch: ^2.2.0
@@ -8918,10 +8918,10 @@ __metadata:
     check-more-types: ^2.24.0
     cli-cursor: ^3.1.0
     cli-table3: ~0.6.1
-    commander: ^5.1.0
+    commander: ^6.2.1
     common-tags: ^1.8.0
     dayjs: ^1.10.4
-    debug: ^4.3.2
+    debug: ^4.3.4
     enquirer: ^2.3.6
     eventemitter2: 6.4.7
     execa: 4.1.0
@@ -8936,19 +8936,20 @@ __metadata:
     listr2: ^3.8.3
     lodash: ^4.17.21
     log-symbols: ^4.0.0
-    minimist: ^1.2.6
+    minimist: ^1.2.8
     ospath: ^1.2.2
     pretty-bytes: ^5.6.0
+    process: ^0.11.10
     proxy-from-env: 1.0.0
     request-progress: ^3.0.0
-    semver: ^7.3.2
+    semver: ^7.5.3
     supports-color: ^8.1.1
     tmp: ~0.2.1
     untildify: ^4.0.0
     yauzl: ^2.10.0
   bin:
     cypress: bin/cypress
-  checksum: 36d5e21f7ade654be42bdcb5a3808da71bb81e8827826e17a36113fd98d2470f66e5a18efa8a014080c9b4179833ef914f767b881dde64775f5e639fdc1bc732
+  checksum: 7647814f07626bd63e7b8dc4d066179fa40bf492c588bbc2626d983a2baab6cb77c29958dc92442f277e0a8e94866decc51c4de306021739c47e32baf5970219
   languageName: node
   linkType: hard
 
@@ -13598,7 +13599,7 @@ __metadata:
     axios: 1.3.4
     chroma-js: 2.1.2
     classnames: 2.3.1
-    cypress: 12.5.0
+    cypress: 13.2.0
     d3-array: 3.0.2
     d3-format: 3.0.1
     d3-scale: 4.0.2
@@ -14460,6 +14461,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimist@npm:^1.2.8":
+  version: 1.2.8
+  resolution: "minimist@npm:1.2.8"
+  checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0
+  languageName: node
+  linkType: hard
+
 "minipass-collect@npm:^1.0.2":
   version: 1.0.2
   resolution: "minipass-collect@npm:1.0.2"
@@ -16521,7 +16529,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"psl@npm:^1.1.28":
+"psl@npm:^1.1.33":
   version: 1.9.0
   resolution: "psl@npm:1.9.0"
   checksum: 20c4277f640c93d393130673f392618e9a8044c6c7bf61c53917a0fddb4952790f5f362c6c730a9c32b124813e173733f9895add8d26f566ed0ea0654b2e711d
@@ -16603,6 +16611,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"qs@npm:6.10.4":
+  version: 6.10.4
+  resolution: "qs@npm:6.10.4"
+  dependencies:
+    side-channel: ^1.0.4
+  checksum: 31e4fedd759d01eae52dde6692abab175f9af3e639993c5caaa513a2a3607b34d8058d3ae52ceeccf37c3025f22ed5e90e9ddd6c2537e19c0562ddd10dc5b1eb
+  languageName: node
+  linkType: hard
+
 "qs@npm:^6.10.0":
   version: 6.11.0
   resolution: "qs@npm:6.11.0"
@@ -16612,13 +16629,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:~6.5.2":
-  version: 6.5.3
-  resolution: "qs@npm:6.5.3"
-  checksum: 6f20bf08cabd90c458e50855559539a28d00b2f2e7dddcb66082b16a43188418cb3cb77cbd09268bcef6022935650f0534357b8af9eeb29bf0f27ccb17655692
-  languageName: node
-  linkType: hard
-
 "query-string@npm:8.1.0":
   version: 8.1.0
   resolution: "query-string@npm:8.1.0"
@@ -16644,6 +16654,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"querystringify@npm:^2.1.1":
+  version: 2.2.0
+  resolution: "querystringify@npm:2.2.0"
+  checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15
+  languageName: node
+  linkType: hard
+
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
@@ -17702,6 +17719,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"requires-port@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "requires-port@npm:1.0.0"
+  checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff
+  languageName: node
+  linkType: hard
+
 "reselect@npm:^4.1.5":
   version: 4.1.6
   resolution: "reselect@npm:4.1.6"
@@ -18125,6 +18149,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.5.3":
+  version: 7.5.4
+  resolution: "semver@npm:7.5.4"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
+  languageName: node
+  linkType: hard
+
 "send@npm:0.18.0":
   version: 0.18.0
   resolution: "send@npm:0.18.0"
@@ -19629,13 +19664,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:~2.5.0":
-  version: 2.5.0
-  resolution: "tough-cookie@npm:2.5.0"
+"tough-cookie@npm:^4.1.3":
+  version: 4.1.3
+  resolution: "tough-cookie@npm:4.1.3"
   dependencies:
-    psl: ^1.1.28
+    psl: ^1.1.33
     punycode: ^2.1.1
-  checksum: 16a8cd090224dd176eee23837cbe7573ca0fa297d7e468ab5e1c02d49a4e9a97bb05fef11320605eac516f91d54c57838a25864e8680e27b069a5231d8264977
+    universalify: ^0.2.0
+    url-parse: ^1.5.3
+  checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
   languageName: node
   linkType: hard
 
@@ -20072,6 +20109,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"universalify@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "universalify@npm:0.2.0"
+  checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
+  languageName: node
+  linkType: hard
+
 "universalify@npm:^2.0.0":
   version: 2.0.0
   resolution: "universalify@npm:2.0.0"
@@ -20157,6 +20201,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"url-parse@npm:^1.5.3":
+  version: 1.5.10
+  resolution: "url-parse@npm:1.5.10"
+  dependencies:
+    querystringify: ^2.1.1
+    requires-port: ^1.0.0
+  checksum: fbdba6b1d83336aca2216bbdc38ba658d9cfb8fc7f665eb8b17852de638ff7d1a162c198a8e4ed66001ddbf6c9888d41e4798912c62b4fd777a31657989f7bdf
+  languageName: node
+  linkType: hard
+
 "url@npm:^0.11.0":
   version: 0.11.0
   resolution: "url@npm:0.11.0"

From 01410d0f3a5eb758e2bd5fa24d089a479c309758 Mon Sep 17 00:00:00 2001
From: David Inga <david.inga@vizzuality.com>
Date: Wed, 20 Sep 2023 12:31:38 +0200
Subject: [PATCH 3/6] better test for filters

---
 client/cypress/e2e/analysis/filters-map.cy.ts | 145 ++++++++++++++++++
 .../cypress/e2e/analysis/filters-table.cy.ts  |  86 +++++++++++
 client/cypress/e2e/analysis/filters.cy.ts     | 111 --------------
 client/src/containers/years/component.tsx     |   1 +
 4 files changed, 232 insertions(+), 111 deletions(-)
 create mode 100644 client/cypress/e2e/analysis/filters-map.cy.ts
 create mode 100644 client/cypress/e2e/analysis/filters-table.cy.ts
 delete mode 100644 client/cypress/e2e/analysis/filters.cy.ts

diff --git a/client/cypress/e2e/analysis/filters-map.cy.ts b/client/cypress/e2e/analysis/filters-map.cy.ts
new file mode 100644
index 000000000..f1b2178fd
--- /dev/null
+++ b/client/cypress/e2e/analysis/filters-map.cy.ts
@@ -0,0 +1,145 @@
+describe('Analysis filters', () => {
+  beforeEach(() => {
+    cy.intercept('GET', '/api/v1/indicators?sort=name').as('fetchIndicators');
+    cy.intercept('GET', '/api/v1/indicators?filter[status]=active').as('fetchActiveIndicators');
+    cy.intercept('GET', '/api/v1/h3/years*').as('fetchYears');
+    cy.intercept('GET', '/api/v1/materials/trees*').as('fetchMaterialsTrees');
+    cy.intercept('GET', '/api/v1/admin-regions/trees*').as('fetchOriginsTrees');
+    cy.intercept('GET', '/api/v1/suppliers/types?type=t1supplier').as('fetchT1Suppliers');
+    cy.intercept('GET', '/api/v1/suppliers/types?type=producer').as('fetchProducers');
+    cy.intercept('GET', '/api/v1/sourcing-locations/location-types?sort=DESC').as(
+      'fetchLocationTypes',
+    );
+
+    cy.login();
+    cy.visit('/analysis/map');
+  });
+
+  afterEach(() => {
+    cy.logout();
+  });
+
+  // Indicators
+  it('not to filter by a disabled indicator', () => {
+    cy.wait('@fetchIndicators').then((interception) => {
+      const firstDisabledIndicator = interception.response.body?.data.find(
+        ({ attributes }) => attributes.status === 'inactive',
+      );
+      // opens the select
+      cy.get('[data-testid="select-indicators-filter"]').find('button').click();
+      cy.get('[data-testid="select-indicators-filter"]')
+        .find('li[data-headlessui-state="disabled"]')
+        .first()
+        .should('contain', firstDisabledIndicator?.attributes.name)
+        .should('have.attr', 'aria-disabled', 'true');
+      // url should not include the disabled indicator
+      cy.url().should('not.include', `indicator=${firstDisabledIndicator?.id}`); // Land use
+    });
+  });
+
+  it('filter by an active indicator', () => {
+    cy.wait('@fetchIndicators').then((interception) => {
+      const activeIndicators = interception.response.body?.data.filter(
+        ({ attributes }) => attributes.status === 'active',
+      );
+      // opens the select
+      cy.get('[data-testid="select-indicators-filter"]').find('button').click();
+      cy.get('[data-testid="select-indicators-filter"]')
+        .find('li:not([data-headlessui-state="disabled"])')
+        .eq(1)
+        .should('contain', activeIndicators[1]?.attributes.name)
+        .click();
+      // url should include the active indicator
+      cy.url().should('include', `indicator=${activeIndicators[1]?.id}`);
+    });
+  });
+
+  // Years
+  it('filter by a year', () => {
+    cy.wait('@fetchYears').then((interception) => {
+      const secondYear = interception.response.body?.data[1];
+      cy.get('[data-testid="select-year-filter"]').find('button').click();
+      cy.get('[data-testid="select-year-filter"]')
+        .find('li')
+        .eq(1)
+        .should('have.text', secondYear)
+        .click();
+    });
+  });
+
+  // Other filters: Materials
+  it('filter by a material and/or some of them', () => {
+    cy.get('[data-testid="more-filters-button"]').click();
+    cy.wait('@fetchMaterialsTrees').then((interception) => {
+      const firstItem = interception.response.body?.data[0];
+      cy.get('[data-testid="tree-select-materials-filter"]').find('div[role="combobox"]').click();
+      cy.get('[data-testid="tree-select-materials-filter"]')
+        .find('div[role="listbox"]')
+        .find('.rc-tree-treenode')
+        .eq(1)
+        .should('have.text', firstItem.attributes.name)
+        .click();
+    });
+  });
+
+  // Other filters: Regions
+  it('filter by an origin and/or some of them', () => {
+    cy.get('[data-testid="more-filters-button"]').click();
+    cy.wait('@fetchOriginsTrees').then((interception) => {
+      const firstItem = interception.response.body?.data[0];
+      cy.get('[data-testid="tree-select-origins-filter"]').find('div[role="combobox"]').click();
+      cy.get('[data-testid="tree-select-origins-filter"]')
+        .find('div[role="listbox"]')
+        .find('.rc-tree-treenode')
+        .eq(1)
+        .should('have.text', firstItem.attributes.name)
+        .click();
+    });
+  });
+
+  // Other filters: T1 suppliers
+  it('filter by a T1 supplier', () => {
+    cy.get('[data-testid="more-filters-button"]').click();
+    cy.wait('@fetchT1Suppliers').then((interception) => {
+      const firstItem = interception.response.body?.data[0];
+      cy.get('[data-testid="tree-select-t1-suppliers-filter"]')
+        .find('div[role="combobox"]')
+        .click();
+      cy.get('[data-testid="tree-select-t1-suppliers-filter"]')
+        .find('div[role="listbox"]')
+        .find('.rc-tree-treenode')
+        .eq(1)
+        .should('have.text', firstItem.attributes.name)
+        .click();
+    });
+  });
+
+  // Other filters: Producers
+  it('filter by a producer', () => {
+    cy.get('[data-testid="more-filters-button"]').click();
+    cy.wait('@fetchProducers').then((interception) => {
+      const firstItem = interception.response.body?.data[0];
+      cy.get('[data-testid="tree-select-producers-filter"]').find('div[role="combobox"]').click();
+      cy.get('[data-testid="tree-select-producers-filter"]')
+        .find('div[role="listbox"]')
+        .find('.rc-tree-treenode')
+        .eq(1)
+        .should('have.text', firstItem.attributes.name)
+        .click();
+    });
+  });
+
+  // Other filters: Location types
+  it('filter by a location type', () => {
+    cy.get('[data-testid="more-filters-button"]').click();
+    cy.wait('@fetchLocationTypes').then((interception) => {
+      const firstItem = interception.response.body?.data[0];
+      cy.get('[data-testid="select-location-type-filter"]').find('button').click();
+      cy.get('[data-testid="select-location-type-filter"]')
+        .find('li')
+        .first()
+        .should('have.text', firstItem.label)
+        .click();
+    });
+  });
+});
diff --git a/client/cypress/e2e/analysis/filters-table.cy.ts b/client/cypress/e2e/analysis/filters-table.cy.ts
new file mode 100644
index 000000000..89bad0b8c
--- /dev/null
+++ b/client/cypress/e2e/analysis/filters-table.cy.ts
@@ -0,0 +1,86 @@
+describe('Analysis filters', () => {
+  beforeEach(() => {
+    cy.intercept('GET', '/api/v1/indicators?sort=name').as('fetchIndicators');
+    cy.intercept('GET', '/api/v1/indicators?filter[status]=active').as('fetchActiveIndicators');
+    cy.intercept('GET', '/api/v1/h3/years*').as('fetchYears');
+    cy.intercept('GET', '/api/v1/materials/trees*').as('fetchMaterialsTrees');
+
+    cy.login();
+    cy.visit('/analysis/table');
+  });
+
+  afterEach(() => {
+    cy.logout();
+  });
+
+  // Indicators
+  it('filter by All indicator', () => {
+    // select indicator
+    cy.get('[data-testid="select-indicators-filter"]').find('button').click();
+    cy.get('[data-testid="select-indicators-filter"] ul li:first').click();
+
+    cy.url().should('include', 'indicator=all');
+  });
+
+  it('not to filter by a disabled indicator', () => {
+    cy.wait('@fetchIndicators').then((interception) => {
+      const firstDisabledIndicator = interception.response.body?.data.find(
+        ({ attributes }) => attributes.status === 'inactive',
+      );
+      // opens the select
+      cy.get('[data-testid="select-indicators-filter"]').find('button').click();
+      cy.get('[data-testid="select-indicators-filter"]')
+        .find('li[data-headlessui-state="disabled"]')
+        .first()
+        .should('contain', firstDisabledIndicator?.attributes.name)
+        .should('have.attr', 'aria-disabled', 'true');
+      // url should not include the disabled indicator
+      cy.url().should('not.include', `indicator=${firstDisabledIndicator?.id}`); // Land use
+    });
+  });
+
+  it('filter by an active indicator', () => {
+    cy.wait('@fetchIndicators').then((interception) => {
+      const firstActiveIndicator = interception.response.body?.data.find(
+        ({ attributes }) => attributes.status === 'active',
+      );
+      // opens the select
+      cy.get('[data-testid="select-indicators-filter"]').find('button').click();
+      cy.get('[data-testid="select-indicators-filter"]')
+        .find('li:not([data-headlessui-state="disabled"])')
+        .eq(1)
+        .should('contain', firstActiveIndicator?.attributes.name)
+        .click();
+      // url should include the active indicator
+      cy.url().should('include', `indicator=${firstActiveIndicator?.id}`);
+    });
+  });
+
+  // Group by filters
+  it('filter by a group', () => {
+    cy.get('[data-testid="select-group-filters"]').find('button').click();
+    cy.get('[data-testid="select-group-filters"]')
+      .find('li')
+      .eq(2)
+      .should('have.text', 'Region')
+      .click();
+    cy.url().should('include', 'by=region');
+  });
+
+  // Years
+  it('filter by a range of years', () => {
+    cy.wait('@fetchYears').then((interception) => {
+      const firstYear = interception.response.body?.data[0];
+      const lastYear =
+        interception.response.body?.data[interception.response.body?.data.length - 1];
+      cy.get('[data-testid="years-range-btn"]')
+        .should('have.text', `from${firstYear} - ${lastYear + 5}`)
+        .click();
+      // cy.get('[data-testid="select-year-filter"]')
+      //   .find('li')
+      //   .eq(1)
+      //   .should('have.text', lastYear)
+      //   .click();
+    });
+  });
+});
diff --git a/client/cypress/e2e/analysis/filters.cy.ts b/client/cypress/e2e/analysis/filters.cy.ts
deleted file mode 100644
index 456e08c24..000000000
--- a/client/cypress/e2e/analysis/filters.cy.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-describe('Analysis filters', () => {
-  beforeEach(() => {
-    // cy.interceptAllRequests();
-    cy.loginWithFixtures();
-    cy.visit('/analysis/table');
-  });
-
-  afterEach(() => {
-    cy.logout();
-  });
-
-  // it('should be able to select all indicator', () => {
-  //   cy.wait('@fetchIndicators').then((interception) => {
-  //     expect(interception.response.body?.data).have.length(5);
-  //   });
-
-  //   cy.url().should('not.include', 'indicator');
-
-  //   // select indicator
-  //   cy.get('[data-testid="select-indicators-filter"]').find('button').click();
-  //   cy.get('[data-testid="select-indicators-filter"] ul li:first').click();
-
-  //   cy.url().should('include', 'indicator=all');
-  // });
-
-  // it('should be able to filter by Land use indicator', () => {
-  //   cy.wait('@fetchIndicators').then((interception) => {
-  //     expect(interception.response.body?.data).have.length(5);
-  //   });
-
-  //   cy.url().should('not.include', 'indicator');
-
-  //   cy.get('[data-testid="select-indicators-filter"]').find('button').click();
-  //   cy.get('[data-testid="select-indicators-filter"] ul li:first').next().click();
-
-  //   cy.url().should('include', 'indicator=5c595ac7-f144-485f-9f32-601f6faae9fe'); // Land use
-  // });
-
-  it('should be able to filter by a material', () => {
-    cy.intercept('GET', '/api/v1/materials/trees*').as('materialsTrees');
-
-    cy.get('[data-testid="more-filters-button"]').click();
-    cy.wait('@materialsTrees');
-    cy.get('[data-testid="tree-select-t1-suppliers-filter"]').find('div[role="combobox"]').click();
-    cy.get('[data-testid="tree-select-t1-suppliers-filter"]')
-      .find('div[role="listbox"]')
-      .find('.rc-tree-treenode')
-      .eq(1)
-      .click();
-  });
-
-  // it('should update the URL params selecting multiple filters', () => {
-  //   // Step 1: open more filters
-  //   cy.get('[data-testid="more-filters-button"]').click();
-  //   cy.wait(['@materialsTrees', '@originsTrees', '@t1Suppliers', '@fetchImpactTable']);
-
-  //   // Adding new interceptors after selecting a filter
-  //   cy.intercept(
-  //     'GET',
-  //     '/api/v1/suppliers/types?*originIds[]=8bd7e578-f64f-4042-8a3a-2a7652ce850b*',
-  //     {
-  //       fixture: 'trees/suppliers-filtered.json',
-  //     },
-  //   ).as('t1SuppliersFiltered');
-
-  //   cy.intercept(
-  //     {
-  //       method: 'GET',
-  //       pathname: '/api/v1/materials/trees',
-  //       query: {
-  //         'supplierIds[]': 'c8bca40d-1aec-44e3-b82b-8170898800ad',
-  //       },
-  //     },
-  //     {
-  //       fixture: 'trees/materials-filtered.json',
-  //     },
-  //   ).as('materialsTreesFiltered');
-  //   cy.wait('@locationTypes');
-
-  //   // Step 2: Selecting Angola in the admin regions selector
-  //   cy.get('[data-testid="tree-select-origins-filter"]').find('div[role="combobox"]').click();
-  //   cy.get('[data-testid="tree-select-origins-filter"]')
-  //     .find('div[role="listbox"]')
-  //     .find('.rc-tree-treenode')
-  //     .eq(1)
-  //     .click();
-  //   cy.get('[data-testid="tree-select-origins-filter"]')
-  //     .find('input:visible:first')
-  //     .type('{enter}');
-  //   cy.wait('@locationTypes');
-  //   // Step 3: Selecting Moll in the material selector
-  //   cy.wait('@t1SuppliersFiltered');
-  //   cy.get('[data-testid="tree-select-t1-suppliers-filter"]').find('div[role="combobox"]').click();
-  //   cy.get('[data-testid="tree-select-t1-suppliers-filter"]')
-  //     .find('div[role="listbox"]')
-  //     .find('.rc-tree-treenode')
-  //     .eq(1)
-  //     .click();
-  //   cy.wait('@locationTypes');
-  //   // Step 4: Checking material selector
-  //   cy.wait('@materialsTreesFiltered')
-  //     .its('request.url')
-  //     .should('include', '8bd7e578-f64f-4042-8a3a-2a7652ce850b');
-
-  //   cy.get('[data-testid="tree-select-materials-filter"]').find('div[role="combobox"]').click();
-  //   cy.get('[data-testid="tree-select-materials-filter"]')
-  //     .find('div[role="listbox"]')
-  //     .find('.rc-tree-treenode:visible')
-  //     .should('have.length', 1); // first treenode is empty
-  // });
-});
diff --git a/client/src/containers/years/component.tsx b/client/src/containers/years/component.tsx
index a19b069e6..08c667985 100644
--- a/client/src/containers/years/component.tsx
+++ b/client/src/containers/years/component.tsx
@@ -59,6 +59,7 @@ const YearsFilter: React.FC = () => {
       options={yearOptions}
       placeholder="Select a year"
       onChange={handleChange}
+      data-testid="year-filter"
     />
   );
 };

From 592e791ee6225b5557bc2d2329642382355c2b3f Mon Sep 17 00:00:00 2001
From: David Inga <david.inga@vizzuality.com>
Date: Wed, 20 Sep 2023 15:35:55 +0200
Subject: [PATCH 4/6] upgrade to next 13.5.1

---
 client/package.json |   2 +-
 client/yarn.lock    | 137 ++++++++++++++++++++++----------------------
 2 files changed, 71 insertions(+), 68 deletions(-)

diff --git a/client/package.json b/client/package.json
index 966131f5d..f9a3cd0d2 100644
--- a/client/package.json
+++ b/client/package.json
@@ -56,7 +56,7 @@
     "lodash-es": "4.17.21",
     "lottie-react": "2.2.1",
     "mapbox-gl": "2.13.0",
-    "next": "13.3.0",
+    "next": "13.5.1",
     "next-auth": "4.19.2",
     "pino": "8.1.0",
     "postcss": "8.3.6",
diff --git a/client/yarn.lock b/client/yarn.lock
index 7b114394b..91c671c10 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -2727,10 +2727,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/env@npm:13.3.0":
-  version: 13.3.0
-  resolution: "@next/env@npm:13.3.0"
-  checksum: 17dbea6d019df98f8abebadcaed635d792c69368389c7869ca023acfba240294368a58eda761fb8047403b84e82edf25ea2af45afe06cc1807a25de42e256dd3
+"@next/env@npm:13.5.1":
+  version: 13.5.1
+  resolution: "@next/env@npm:13.5.1"
+  checksum: 251859d90a953d88692129b72a1c09e9f44b2981ccab1c2d9ad67898634f8999c15b290dd6b341be9fc710cc2d25ceb9229a40de90ab0946fa2c6997144fe13f
   languageName: node
   linkType: hard
 
@@ -2743,65 +2743,65 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-darwin-arm64@npm:13.3.0":
-  version: 13.3.0
-  resolution: "@next/swc-darwin-arm64@npm:13.3.0"
+"@next/swc-darwin-arm64@npm:13.5.1":
+  version: 13.5.1
+  resolution: "@next/swc-darwin-arm64@npm:13.5.1"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@next/swc-darwin-x64@npm:13.3.0":
-  version: 13.3.0
-  resolution: "@next/swc-darwin-x64@npm:13.3.0"
+"@next/swc-darwin-x64@npm:13.5.1":
+  version: 13.5.1
+  resolution: "@next/swc-darwin-x64@npm:13.5.1"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm64-gnu@npm:13.3.0":
-  version: 13.3.0
-  resolution: "@next/swc-linux-arm64-gnu@npm:13.3.0"
+"@next/swc-linux-arm64-gnu@npm:13.5.1":
+  version: 13.5.1
+  resolution: "@next/swc-linux-arm64-gnu@npm:13.5.1"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm64-musl@npm:13.3.0":
-  version: 13.3.0
-  resolution: "@next/swc-linux-arm64-musl@npm:13.3.0"
+"@next/swc-linux-arm64-musl@npm:13.5.1":
+  version: 13.5.1
+  resolution: "@next/swc-linux-arm64-musl@npm:13.5.1"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@next/swc-linux-x64-gnu@npm:13.3.0":
-  version: 13.3.0
-  resolution: "@next/swc-linux-x64-gnu@npm:13.3.0"
+"@next/swc-linux-x64-gnu@npm:13.5.1":
+  version: 13.5.1
+  resolution: "@next/swc-linux-x64-gnu@npm:13.5.1"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@next/swc-linux-x64-musl@npm:13.3.0":
-  version: 13.3.0
-  resolution: "@next/swc-linux-x64-musl@npm:13.3.0"
+"@next/swc-linux-x64-musl@npm:13.5.1":
+  version: 13.5.1
+  resolution: "@next/swc-linux-x64-musl@npm:13.5.1"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@next/swc-win32-arm64-msvc@npm:13.3.0":
-  version: 13.3.0
-  resolution: "@next/swc-win32-arm64-msvc@npm:13.3.0"
+"@next/swc-win32-arm64-msvc@npm:13.5.1":
+  version: 13.5.1
+  resolution: "@next/swc-win32-arm64-msvc@npm:13.5.1"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@next/swc-win32-ia32-msvc@npm:13.3.0":
-  version: 13.3.0
-  resolution: "@next/swc-win32-ia32-msvc@npm:13.3.0"
+"@next/swc-win32-ia32-msvc@npm:13.5.1":
+  version: 13.5.1
+  resolution: "@next/swc-win32-ia32-msvc@npm:13.5.1"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@next/swc-win32-x64-msvc@npm:13.3.0":
-  version: 13.3.0
-  resolution: "@next/swc-win32-x64-msvc@npm:13.3.0"
+"@next/swc-win32-x64-msvc@npm:13.5.1":
+  version: 13.5.1
+  resolution: "@next/swc-win32-x64-msvc@npm:13.5.1"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -5170,12 +5170,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/helpers@npm:0.4.14":
-  version: 0.4.14
-  resolution: "@swc/helpers@npm:0.4.14"
+"@swc/helpers@npm:0.5.2":
+  version: 0.5.2
+  resolution: "@swc/helpers@npm:0.5.2"
   dependencies:
     tslib: ^2.4.0
-  checksum: 273fd3f3fc461a92f3790cc551ea054745c6d6959afbe1232e6d7aa1c722bbc114d308aab96bef5c78fc0303c85c7b472ef00e2253251cc89737f3b1af56e5a5
+  checksum: 51d7e3d8bd56818c49d6bfbd715f0dbeedc13cf723af41166e45c03e37f109336bbcb57a1f2020f4015957721aeb21e1a7fff281233d797ff7d3dd1f447fa258
   languageName: node
   linkType: hard
 
@@ -13617,7 +13617,7 @@ __metadata:
     lodash-es: 4.17.21
     lottie-react: 2.2.1
     mapbox-gl: 2.13.0
-    next: 13.3.0
+    next: 13.5.1
     next-auth: 4.19.2
     nyc: 15.1.0
     nyc-report-lcov-absolute: 1.0.0
@@ -14776,29 +14776,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"next@npm:13.3.0":
-  version: 13.3.0
-  resolution: "next@npm:13.3.0"
+"next@npm:13.5.1":
+  version: 13.5.1
+  resolution: "next@npm:13.5.1"
   dependencies:
-    "@next/env": 13.3.0
-    "@next/swc-darwin-arm64": 13.3.0
-    "@next/swc-darwin-x64": 13.3.0
-    "@next/swc-linux-arm64-gnu": 13.3.0
-    "@next/swc-linux-arm64-musl": 13.3.0
-    "@next/swc-linux-x64-gnu": 13.3.0
-    "@next/swc-linux-x64-musl": 13.3.0
-    "@next/swc-win32-arm64-msvc": 13.3.0
-    "@next/swc-win32-ia32-msvc": 13.3.0
-    "@next/swc-win32-x64-msvc": 13.3.0
-    "@swc/helpers": 0.4.14
+    "@next/env": 13.5.1
+    "@next/swc-darwin-arm64": 13.5.1
+    "@next/swc-darwin-x64": 13.5.1
+    "@next/swc-linux-arm64-gnu": 13.5.1
+    "@next/swc-linux-arm64-musl": 13.5.1
+    "@next/swc-linux-x64-gnu": 13.5.1
+    "@next/swc-linux-x64-musl": 13.5.1
+    "@next/swc-win32-arm64-msvc": 13.5.1
+    "@next/swc-win32-ia32-msvc": 13.5.1
+    "@next/swc-win32-x64-msvc": 13.5.1
+    "@swc/helpers": 0.5.2
     busboy: 1.6.0
     caniuse-lite: ^1.0.30001406
     postcss: 8.4.14
     styled-jsx: 5.1.1
+    watchpack: 2.4.0
+    zod: 3.21.4
   peerDependencies:
     "@opentelemetry/api": ^1.1.0
-    fibers: ">= 3.1.0"
-    node-sass: ^6.0.0 || ^7.0.0
     react: ^18.2.0
     react-dom: ^18.2.0
     sass: ^1.3.0
@@ -14824,15 +14824,11 @@ __metadata:
   peerDependenciesMeta:
     "@opentelemetry/api":
       optional: true
-    fibers:
-      optional: true
-    node-sass:
-      optional: true
     sass:
       optional: true
   bin:
     next: dist/bin/next
-  checksum: 24e0e013e867a825ff7d1f49587e696147ea8f9ff42946121fe0dce25f9bcc9b1d5941425fa7cef3b8c0e6f1c3daa7f09f758ac5a8aa15aa66c3b31a07465081
+  checksum: a54aaeadb68d324107ddd2bd0c12967f06b844ef321aae4aba99f7a79406bab4ab85d51e3430106f1bc2831c55c8bf408a2352f702590d9bedb88fbdb60b2955
   languageName: node
   linkType: hard
 
@@ -20474,6 +20470,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"watchpack@npm:2.4.0, watchpack@npm:^2.2.0, watchpack@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "watchpack@npm:2.4.0"
+  dependencies:
+    glob-to-regexp: ^0.4.1
+    graceful-fs: ^4.1.2
+  checksum: 23d4bc58634dbe13b86093e01c6a68d8096028b664ab7139d58f0c37d962d549a940e98f2f201cecdabd6f9c340338dc73ef8bf094a2249ef582f35183d1a131
+  languageName: node
+  linkType: hard
+
 "watchpack@npm:^1.7.4":
   version: 1.7.5
   resolution: "watchpack@npm:1.7.5"
@@ -20491,16 +20497,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"watchpack@npm:^2.2.0, watchpack@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "watchpack@npm:2.4.0"
-  dependencies:
-    glob-to-regexp: ^0.4.1
-    graceful-fs: ^4.1.2
-  checksum: 23d4bc58634dbe13b86093e01c6a68d8096028b664ab7139d58f0c37d962d549a940e98f2f201cecdabd6f9c340338dc73ef8bf094a2249ef582f35183d1a131
-  languageName: node
-  linkType: hard
-
 "web-namespaces@npm:^1.0.0":
   version: 1.1.4
   resolution: "web-namespaces@npm:1.1.4"
@@ -20981,6 +20977,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"zod@npm:3.21.4":
+  version: 3.21.4
+  resolution: "zod@npm:3.21.4"
+  checksum: f185ba87342ff16f7a06686767c2b2a7af41110c7edf7c1974095d8db7a73792696bcb4a00853de0d2edeb34a5b2ea6a55871bc864227dace682a0a28de33e1f
+  languageName: node
+  linkType: hard
+
 "zwitch@npm:^1.0.0":
   version: 1.0.5
   resolution: "zwitch@npm:1.0.5"

From 5cf32d4a58bb21f43b9008daaaae15da0fcb03b6 Mon Sep 17 00:00:00 2001
From: David Inga <david.inga@vizzuality.com>
Date: Wed, 20 Sep 2023 16:13:21 +0200
Subject: [PATCH 5/6] added test for forgotten password

---
 client/cypress/e2e/forgot-password.cy.ts      | 49 +++++++++++++++++++
 .../src/pages/auth/reset-password/[token].tsx |  4 +-
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 client/cypress/e2e/forgot-password.cy.ts

diff --git a/client/cypress/e2e/forgot-password.cy.ts b/client/cypress/e2e/forgot-password.cy.ts
new file mode 100644
index 000000000..e248819ad
--- /dev/null
+++ b/client/cypress/e2e/forgot-password.cy.ts
@@ -0,0 +1,49 @@
+describe('Forgot password', () => {
+  afterEach(() => {
+    cy.logout();
+  });
+
+  it('request recover password', () => {
+    cy.intercept('POST', '/api/v1/users/me/password/recover', {
+      statusCode: 201,
+      body: {},
+    }).as('recoverPasswordRequest');
+
+    cy.visit('/auth/forgot-password');
+    // Input the email
+    cy.get('[name="email"]').type(Cypress.env('USERNAME'));
+    cy.get('button[type="submit"]').click();
+
+    // Show success message
+    cy.wait('@recoverPasswordRequest').then(() => {
+      cy.get('h2').should('have.text', 'Check your email');
+    });
+  });
+
+  it('reset password', () => {
+    const fakeToken = 'nyancat';
+
+    cy.intercept('POST', '/api/v1/users/me/password/reset', {
+      statusCode: 201,
+      fixture: 'auth/me.json',
+    }).as('resetPasswordRequest');
+
+    cy.intercept('GET', '/api/auth/session', {
+      fixture: 'auth/session.json',
+    }).as('session');
+
+    cy.intercept('GET', '/api/v1/users/me', {
+      fixture: 'auth/me.json',
+    });
+
+    cy.visit(`/auth/reset-password/${fakeToken}`);
+
+    // Input the new password
+    cy.get('[name="password"]').type(Cypress.env('PASSWORD'));
+    cy.get('[name="passwordConfirmation"]').type(Cypress.env('PASSWORD'));
+    cy.get('button[type="submit"]').click();
+
+    // Redirect to the map once the password is reset
+    cy.wait(['@resetPasswordRequest', '@session']);
+  });
+});
diff --git a/client/src/pages/auth/reset-password/[token].tsx b/client/src/pages/auth/reset-password/[token].tsx
index 6b371a097..2b3ba7263 100644
--- a/client/src/pages/auth/reset-password/[token].tsx
+++ b/client/src/pages/auth/reset-password/[token].tsx
@@ -37,7 +37,7 @@ const ResetPassword: NextPageWithLayout = () => {
   const { mutate: resetPassword, isLoading } = useResetPassword();
   const [isRedirecting, setIsRedirecting] = useState<boolean>(false);
 
-  const handleResetPassord = useCallback(
+  const handleResetPassword = useCallback(
     ({ password }: yup.InferType<typeof schemaValidation>) => {
       const token = query?.token as string;
       if (!token) {
@@ -89,7 +89,7 @@ const ResetPassword: NextPageWithLayout = () => {
             noValidate
             className="space-y-6"
             id="signInForm"
-            onSubmit={handleSubmit(handleResetPassord)}
+            onSubmit={handleSubmit(handleResetPassword)}
           >
             <div>
               <Label htmlFor="password">New Password</Label>

From 78edadf5361e402039d3ce0f5f1a83c8d8799640 Mon Sep 17 00:00:00 2001
From: David Inga <david.inga@vizzuality.com>
Date: Thu, 21 Sep 2023 09:30:03 +0200
Subject: [PATCH 6/6] fixed profile form updated password

---
 client/CHANGELOG.md                           |  8 +++++-
 client/cypress/e2e/profile.cy.ts              | 22 +++++++++++++++
 .../update-password-form/component.tsx        | 28 +++++++++++++------
 3 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 client/cypress/e2e/profile.cy.ts

diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md
index d813a8537..8be1fc18a 100644
--- a/client/CHANGELOG.md
+++ b/client/CHANGELOG.md
@@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
-## [v0.6.0 Unreleased]
+## [Unreleased]
+
+### Fixed
+
+- Update password in profile form was not working as expected [LANDGRIF-1479](https://vizzuality.atlassian.net/browse/LANDGRIF-1479)
+
+## [v1.0.0]
 
 ### Added
 
diff --git a/client/cypress/e2e/profile.cy.ts b/client/cypress/e2e/profile.cy.ts
new file mode 100644
index 000000000..4ea791705
--- /dev/null
+++ b/client/cypress/e2e/profile.cy.ts
@@ -0,0 +1,22 @@
+describe('Profile', () => {
+  beforeEach(() => {
+    cy.login();
+  });
+
+  afterEach(() => {
+    cy.logout();
+  });
+
+  it('change password', () => {
+    cy.intercept('PATCH', '/api/v1/users/me/password', {
+      statusCode: 200,
+      body: {},
+    }).as('updatePasswordRequest');
+    cy.visit('/profile');
+
+    cy.get('[name="currentPassword"]').type(Cypress.env('PASSWORD'));
+    cy.get('[name="newPassword"]').type(Cypress.env('PASSWORD'));
+    cy.get('[name="passwordConfirmation"]').type(Cypress.env('PASSWORD'));
+    cy.get('button[data-testid="submit-update-password"]').click();
+  });
+});
diff --git a/client/src/containers/update-password-form/component.tsx b/client/src/containers/update-password-form/component.tsx
index 887244029..fcf82e653 100644
--- a/client/src/containers/update-password-form/component.tsx
+++ b/client/src/containers/update-password-form/component.tsx
@@ -32,15 +32,22 @@ const UserPasswordForm: React.FC = () => {
 
   const handleEditPassword = useCallback(
     (data: PasswordPayload) => {
-      updatePassword.mutate(data, {
-        onSuccess: () => {
-          toast.success('Your changes were successfully saved.');
+      updatePassword.mutate(
+        {
+          // avoid passing passwordConfirmation to the API
+          currentPassword: data.currentPassword,
+          newPassword: data.newPassword,
         },
-        onError: (error: ErrorResponse) => {
-          const { errors } = error.response?.data;
-          errors.forEach(({ title }) => toast.error(title));
+        {
+          onSuccess: () => {
+            toast.success('Your changes were successfully saved.');
+          },
+          onError: (error: ErrorResponse) => {
+            const { errors } = error.response?.data;
+            errors.forEach(({ title }) => toast.error(title));
+          },
         },
-      });
+      );
     },
     [updatePassword],
   );
@@ -83,7 +90,12 @@ const UserPasswordForm: React.FC = () => {
               </div>
             </div>
             <div className="flex justify-end h-16 py-3 pr-6 rounded-md bg-gray-50">
-              <Button type="submit" variant="primary" loading={updatePassword.isLoading}>
+              <Button
+                type="submit"
+                variant="primary"
+                loading={updatePassword.isLoading}
+                data-testid="submit-update-password"
+              >
                 Save
               </Button>
             </div>