Skip to content

Commit

Permalink
restores redirects to /analysis page
Browse files Browse the repository at this point in the history
  • Loading branch information
andresgnlez committed Apr 16, 2024
1 parent 4b9015e commit 1dead51
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 16 deletions.
1 change: 0 additions & 1 deletion .github/workflows/testing-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion client/cypress/e2e/sign-in.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
});
14 changes: 2 additions & 12 deletions client/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
{
Expand Down
1 change: 0 additions & 1 deletion client/src/components/tree-select/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/auth/signin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 1dead51

Please sign in to comment.