Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restores redirects to /analysis page #1163

Merged
merged 1 commit into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading