From 926a6a03c76b30317f5116480f6c2107a0ddba95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Gonz=C3=A1lez?=
 <andres.gonzalez@vizzuality.com>
Date: Tue, 16 Apr 2024 09:05:21 +0200
Subject: [PATCH] restores redirects to /analysis page

---
 .github/workflows/testing-client.yml       |  1 -
 client/cypress/e2e/sign-in.cy.ts           |  2 +-
 client/next.config.js                      | 14 ++------------
 client/src/components/tree-select/utils.ts |  1 -
 client/src/pages/auth/signin.tsx           |  2 +-
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/testing-client.yml b/.github/workflows/testing-client.yml
index 301501310..d13e8bf7b 100644
--- a/.github/workflows/testing-client.yml
+++ b/.github/workflows/testing-client.yml
@@ -16,7 +16,6 @@ jobs:
     name: Running client tests
     runs-on: ubuntu-22.04
     timeout-minutes: 30
-    if: ${{ github.ref_name != 'test'  }}
     strategy:
       fail-fast: false
     defaults:
diff --git a/client/cypress/e2e/sign-in.cy.ts b/client/cypress/e2e/sign-in.cy.ts
index 26b37b638..dbf955da7 100644
--- a/client/cypress/e2e/sign-in.cy.ts
+++ b/client/cypress/e2e/sign-in.cy.ts
@@ -10,6 +10,6 @@ describe('Sign in', () => {
     cy.get('[name="password"]').type(Cypress.env('PASSWORD'));
     cy.get('button[type="submit"]').click();
     cy.wait('@signInRequest');
-    cy.url().should('contain', 'eudr');
+    cy.url().should('contain', 'analysis');
   });
 });
diff --git a/client/next.config.js b/client/next.config.js
index 00a6b0d18..7583cd3a3 100644
--- a/client/next.config.js
+++ b/client/next.config.js
@@ -8,22 +8,12 @@ const nextConfig = {
     return [
       {
         source: '/',
-        destination: '/eudr',
+        destination: '/analysis/map',
         permanent: false,
       },
       {
         source: '/analysis',
-        destination: '/eudr',
-        permanent: false,
-      },
-      {
-        source: '/analysis/:id',
-        destination: '/eudr',
-        permanent: false,
-      },
-      {
-        source: '/data',
-        destination: '/eurd',
+        destination: '/analysis/map',
         permanent: false,
       },
       {
diff --git a/client/src/components/tree-select/utils.ts b/client/src/components/tree-select/utils.ts
index 3fab069b7..60a0e4e36 100644
--- a/client/src/components/tree-select/utils.ts
+++ b/client/src/components/tree-select/utils.ts
@@ -155,7 +155,6 @@ const optionToTreeData = (
   const children = option.children?.map((option) => optionToTreeData(option, render, depth + 1));
   return render({
     ...option,
-    disabled: true, // added to prevent the node from being selectable only for EUDR demo
     style: { paddingLeft: 16 * depth },
     children,
   });
diff --git a/client/src/pages/auth/signin.tsx b/client/src/pages/auth/signin.tsx
index e76c015b4..ddcce85aa 100644
--- a/client/src/pages/auth/signin.tsx
+++ b/client/src/pages/auth/signin.tsx
@@ -44,7 +44,7 @@ const SignIn: NextPageWithLayout = () => {
       });
 
       if (ok) {
-        router.push((router.query?.callbackUrl as string) || '/eudr', undefined, {
+        router.push((router.query?.callbackUrl as string) || '/analysis/map', undefined, {
           shallow: true,
         });
       } else {