Skip to content

feat: Add redirect for dashboards #431

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 3, 2023
Merged

feat: Add redirect for dashboards #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13165ae
feat: Add redirect for dashboards
d-beezee Feb 1, 2023
bc46b2f
feat: Use new urls for dashboard links
d-beezee Feb 1, 2023
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
34 changes: 34 additions & 0 deletions src/common/Pages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import Service from 'src/pages/Service';
import Campaign from 'src/pages/Campaign';
import Bugs from 'src/pages/Bugs';
import { useTranslation } from 'react-i18next';
import { Redirect } from './Redirect';

const Pages = () => {
const { i18n } = useTranslation();
Expand Down Expand Up @@ -51,6 +52,39 @@ const Pages = () => {
<Route index element={<Dashboard />} />
</Route>
))}

<Route
path="/it/dashboard-campagne-funzionali"
element={
<Redirect
url={({ searchParams }) => {
if (!searchParams || !searchParams.get('cid'))
return '/it/oops';
if (!searchParams.get('bid'))
return `/it/campaigns/${searchParams.get('cid')}`;
return `/it/campaigns/${searchParams.get(
'cid'
)}/bugs/${searchParams.get('bid')}`;
}}
/>
}
/>
<Route
path="/functional-customer-dashboard"
element={
<Redirect
url={({ searchParams }) => {
if (!searchParams || !searchParams.get('cid'))
return '/oops';
if (!searchParams.get('bid'))
return `/campaigns/${searchParams.get('cid')}`;
return `/campaigns/${searchParams.get(
'cid'
)}/bugs/${searchParams.get('bid')}`;
}}
/>
}
/>
<Route path="*" element={<Navigate replace to="/oops" />} />
</>
)
Expand Down
15 changes: 15 additions & 0 deletions src/common/Redirect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { useNavigate, useSearchParams } from 'react-router-dom';
import { useEffect } from 'react';

export const Redirect = ({
url,
}: {
url: ({ searchParams }: { searchParams?: URLSearchParams }) => string;
}) => {
const navigate = useNavigate();
const [searchParams] = useSearchParams();
useEffect(() => {
navigate(url({ searchParams }));
}, [searchParams, navigate]);
return null;
};
8 changes: 4 additions & 4 deletions src/hooks/useLocalizeDashboardUrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ export const getLocalizedFunctionalDashboardUrl = (
aLanguage === 'en'
? `${
process.env.REACT_APP_CROWD_WP_URL ?? ''
}/functional-customer-dashboard/?cid=${aCampaignId}`
}/campaigns/${aCampaignId}/bugs`
: `${
process.env.REACT_APP_CROWD_WP_URL ?? ''
}/it/dashboard-campagne-funzionali/?cid=${aCampaignId}`;
}/it/campaigns/${aCampaignId}/bugs`;

export const getLocalizedUXDashboardUrl = (
aCampaignId: number,
Expand Down Expand Up @@ -54,7 +54,7 @@ export const getLocalizedBugUrl = (
aLanguage === 'en'
? `${
process.env.REACT_APP_CROWD_WP_URL ?? ''
}/functional-customer-dashboard/?cid=${aCampaignId}&bug_id=${aBugId}`
}/campaigns/${aCampaignId}/bugs/${aBugId}`
: `${
process.env.REACT_APP_CROWD_WP_URL ?? ''
}/it/dashboard-campagne-funzionali/?cid=${aCampaignId}&bug_id=${aBugId}`;
}/it/campaigns/${aCampaignId}/bugs/${aBugId}`;