Skip to content

Commit eec121a

Browse files
authored
Navigate to help page according to work type (#2119)
* Navigate to help page according to work type * use prod help page links
1 parent e10bfbc commit eec121a

File tree

11 files changed

+104
-23
lines changed

11 files changed

+104
-23
lines changed

epictrack-web/src/components/AppHelpButton/HelpPageMap.json

Lines changed: 76 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,103 @@
2121
{
2222
"epicTrackPath": "/work-plan",
2323
"helpPage": "https://intranet.gov.bc.ca/intranet/content?id=A35C49D2D60144F594F8C1DDB5F0EA10#workplan",
24-
"tags": ["workplan"]
24+
"tags": ["Workplan"]
2525
},
2626
{
2727
"epicTrackPath": "/work-plan",
2828
"helpPage": "https://intranet.gov.bc.ca/intranet/content?id=A35C49D2D60144F594F8C1DDB5F0EA10#status",
29-
"tags": ["status"]
29+
"tags": ["Status"]
3030
},
3131
{
3232
"epicTrackPath": "/work-plan",
3333
"helpPage": "https://intranet.gov.bc.ca/intranet/content?id=A35C49D2D60144F594F8C1DDB5F0EA10#issues",
34-
"tags": ["issues"]
34+
"tags": ["Issues"]
3535
},
3636
{
3737
"epicTrackPath": "/work-plan",
3838
"helpPage": "https://intranet.gov.bc.ca/intranet/content?id=A35C49D2D60144F594F8C1DDB5F0EA10#about",
39-
"tags": ["about"]
39+
"tags": ["About"]
4040
},
4141
{
4242
"epicTrackPath": "/work-plan",
4343
"helpPage": "https://intranet.gov.bc.ca/intranet/content?id=A35C49D2D60144F594F8C1DDB5F0EA10#teams",
44-
"tags": ["team"]
44+
"tags": ["Team"]
4545
},
4646
{
4747
"epicTrackPath": "/work-plan",
4848
"helpPage": "https://intranet.gov.bc.ca/intranet/content?id=A35C49D2D60144F594F8C1DDB5F0EA10#firstnations",
49-
"tags": ["firstnations"]
49+
"tags": ["First Nations"]
50+
},
51+
{
52+
"epicTrackPath": "/work-plan",
53+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/project-notification",
54+
"tags": ["Project Notification"]
55+
},
56+
{
57+
"epicTrackPath": "/work-plan",
58+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/minister-s-designation",
59+
"tags": ["Minister's Designation"]
60+
},
61+
{
62+
"epicTrackPath": "/work-plan",
63+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/ceao-s-designation",
64+
"tags": ["CEAO's Designation"]
65+
},
66+
{
67+
"epicTrackPath": "/work-plan",
68+
"helpPage": "",
69+
"tags": ["Intake (Pre-EA)"]
70+
},
71+
{
72+
"epicTrackPath": "/work-plan",
73+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/exemption-request",
74+
"tags": ["Exemption Order"]
75+
},
76+
{
77+
"epicTrackPath": "/work-plan",
78+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/eac-assessment",
79+
"tags": ["Assessment"]
80+
},
81+
{
82+
"epicTrackPath": "/work-plan",
83+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/amendment-complex",
84+
"tags": ["Amendment"]
85+
},
86+
{
87+
"epicTrackPath": "/work-plan",
88+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/document-review",
89+
"tags": ["Post-EAC Document Review"]
90+
},
91+
{
92+
"epicTrackPath": "/work-plan",
93+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/eac-extension",
94+
"tags": ["EAC Extension"]
95+
},
96+
{
97+
"epicTrackPath": "/work-plan",
98+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/substantial-start-decision",
99+
"tags": ["Substantial Start Decision"]
100+
},
101+
{
102+
"epicTrackPath": "/work-plan",
103+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/eac-order-transfer",
104+
"tags": ["EAC/Order Transfer"]
105+
},
106+
{
107+
"epicTrackPath": "/work-plan",
108+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/eac-order-suspension",
109+
"tags": ["EAC/Order Suspension"]
110+
},
111+
{
112+
"epicTrackPath": "/work-plan",
113+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/eac-order-cancellation",
114+
"tags": ["EAC/Order Cancellation"]
115+
},
116+
{
117+
"epicTrackPath": "/work-plan",
118+
"helpPage": "https://intranet.gov.bc.ca/eao/digital-services/support-for-epic-system/support-for-epic-track/milestone-definitions/other",
119+
"tags": ["Other"]
50120
},
51-
52121
{
53122
"epicTrackPath": "/reports/referral-schedule",
54123
"helpPage": "https://intranet.gov.bc.ca/intranet/content?id=FE54F5EFE92B4CF0AC74490E2D03FD4A"

epictrack-web/src/components/AppHelpButton/SupportCenterMenuItem.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,14 @@ const SupportCenterMenuItem = () => {
4545

4646
const findLinkWithTagsOrAny = (matchingLinks: HelpPageLink[]) => {
4747
const helpPageTags = location.state?.helpPageTags || [];
48-
console.log("helpPageTags", helpPageTags);
49-
console.log("matchingLinks", matchingLinks);
5048
if (helpPageTags.length === 0) {
5149
return matchingLinks[0];
5250
}
5351

5452
return matchingLinks.find((link: HelpPageLink) => {
53+
const linkTags = new Set(link.tags);
5554
return helpPageTags.every((tag: string) => {
56-
const formattedTag = tag.toLocaleLowerCase().replace(" ", "");
57-
return link.tags?.includes(formattedTag);
55+
return linkTags.has(tag);
5856
});
5957
});
6058
};

epictrack-web/src/components/user/UserList.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ const UserList = () => {
7676
.filter((p) => userDetails.groups.includes(p.path))
7777
.sort((a, b) => b.level - a.level)[0];
7878
}, [userDetails, groups]);
79-
console.log(currentUserGroup);
8079
const columns = React.useMemo<MRT_ColumnDef<User>[]>(
8180
() => [
8281
{

epictrack-web/src/components/workPlan/WorkPlanContainer.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useContext, useEffect } from "react";
1+
import React, { useContext } from "react";
22
import { ETCaption3, ETHeading2, ETPageContainer } from "../shared";
33
import { Palette } from "../../styles/theme";
44
import { Box } from "@mui/system";
@@ -43,13 +43,6 @@ const WorkPlanContainer = () => {
4343
setSelectedTabIndex(index);
4444
};
4545

46-
useRouterLocationStateForHelpPage(() => {
47-
const currentSelectedTabLabel = Object.values(WORKPLAN_TAB).find(
48-
(tab) => tab.index === selectedTabIndex
49-
)?.label;
50-
return currentSelectedTabLabel;
51-
}, [selectedTabIndex]);
52-
5346
if (ctx.loading) {
5447
return <WorkPlanSkeleton />;
5548
}

epictrack-web/src/components/workPlan/about/AboutContext.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import React from "react";
2+
import useRouterLocationStateForHelpPage from "hooks/useRouterLocationStateForHelpPage";
23
import { createContext } from "react";
4+
import { WORKPLAN_TAB } from "../constants";
35

46
// eslint-disable-next-line @typescript-eslint/no-empty-interface
57
interface AboutContextProps {}
@@ -11,5 +13,6 @@ export const AboutProvider = ({
1113
}: {
1214
children: JSX.Element | JSX.Element[];
1315
}) => {
16+
useRouterLocationStateForHelpPage(() => WORKPLAN_TAB.ABOUT.label, []);
1417
return <AboutContext.Provider value={{}}>{children}</AboutContext.Provider>;
1518
};

epictrack-web/src/components/workPlan/firstNations/FirstNationContainer.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import debounce from "lodash/debounce";
1414
import workService from "../../../services/workService/workService";
1515
import { Work } from "../../../models/work";
1616
import { showNotification } from "../../shared/notificationProvider";
17+
import useRouterLocationStateForHelpPage from "hooks/useRouterLocationStateForHelpPage";
18+
import { WORKPLAN_TAB } from "../constants";
1719

1820
const LinkIcon: React.FC<IconProps> = Icons["LinkIcon"];
1921

@@ -74,6 +76,8 @@ const FirstNationContainer = () => {
7476
}
7577
};
7678

79+
useRouterLocationStateForHelpPage(() => WORKPLAN_TAB.FIRST_NATIONS.label, []);
80+
7781
return (
7882
<Grid container columnSpacing={1.5}>
7983
<Grid item xs={8}>

epictrack-web/src/components/workPlan/issues/IssuesContext.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import { WorkIssue, WorkIssueUpdate } from "../../../models/Issue";
66
import { CloneForm, CreateIssueForm, EditIssueForm } from "./types";
77
import { showNotification } from "components/shared/notificationProvider";
88
import { getErrorMessage } from "utils/axiosUtils";
9+
import useRouterLocationStateForHelpPage from "hooks/useRouterLocationStateForHelpPage";
10+
import { WORKPLAN_TAB } from "../constants";
911

1012
interface IssuesContextProps {
1113
isIssuesLoading: boolean;
@@ -246,6 +248,8 @@ export const IssuesProvider = ({
246248
}
247249
};
248250

251+
useRouterLocationStateForHelpPage(() => WORKPLAN_TAB.ISSUES.label, []);
252+
249253
return (
250254
<IssuesContext.Provider
251255
value={{

epictrack-web/src/components/workPlan/phase/PhaseContainer.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import { CustomSwitch } from "../../shared/CustomSwitch";
77
import { Palette } from "../../../styles/theme";
88
import { WorkPhaseAdditionalInfo } from "../../../models/work";
99
import { When } from "react-if";
10+
import useRouterLocationStateForHelpPage from "hooks/useRouterLocationStateForHelpPage";
11+
import { WORKPLAN_TAB } from "../constants";
1012

1113
const PhaseContainer = () => {
1214
const ctx = useContext(WorkplanContext);
@@ -42,6 +44,11 @@ const PhaseContainer = () => {
4244
setCompletedPhases(completedPhases);
4345
setCurrentAndFuturePhases(currentAndFuturePhases);
4446
}, [showCompletedPhases, ctx.workPhases]);
47+
48+
useRouterLocationStateForHelpPage(() => {
49+
return ctx.work?.work_type?.name ?? undefined;
50+
}, [ctx.work?.work_type_id]);
51+
4552
if (ctx.workPhases.length === 0) {
4653
return (
4754
<Box sx={{ display: "flex", flexDirection: "column", gap: "1rem" }}>

epictrack-web/src/components/workPlan/status/StatusContext.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import statusService from "../../../services/statusService/statusService";
88
import { useSearchParams } from "../../../hooks/useSearchParams";
99
import { WorkplanContext } from "../WorkPlanContext";
1010
import { getErrorMessage } from "../../../utils/axiosUtils";
11+
import useRouterLocationStateForHelpPage from "hooks/useRouterLocationStateForHelpPage";
12+
import { WORKPLAN_TAB } from "../constants";
1113

1214
interface StatusContextProps {
1315
setShowStatusForm: Dispatch<SetStateAction<boolean>>;
@@ -126,6 +128,8 @@ export const StatusProvider = ({
126128
}
127129
};
128130

131+
useRouterLocationStateForHelpPage(() => WORKPLAN_TAB.STATUS.label, []);
132+
129133
return (
130134
<StatusContext.Provider
131135
value={{

epictrack-web/src/components/workPlan/team/TeamContainer.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ import { ETHeading3 } from "../../shared";
44
import { Palette } from "../../../styles/theme";
55
import TeamList from "./TeamList";
66
import TeamInfo from "./TeamInfo";
7+
import useRouterLocationStateForHelpPage from "hooks/useRouterLocationStateForHelpPage";
8+
import { WORKPLAN_TAB } from "../constants";
79

810
const title: SxProps = {
911
borderBottom: `2px solid ${Palette.primary.main}`,
1012
paddingBottom: "0.5rem",
1113
};
1214

1315
const TeamContainer = () => {
16+
useRouterLocationStateForHelpPage(() => WORKPLAN_TAB.TEAM.label, []);
1417
return (
1518
<Grid container columnSpacing={1.5}>
1619
<Grid item xs={8}>

epictrack-web/src/hooks/useRouterLocationStateForHelpPage.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ const useRouterLocationStateForHelpPage = (
99
const location = useLocation();
1010

1111
useEffect(() => {
12-
console.log("ran");
1312
const callBackValue = callback();
1413

1514
let newtags: string[] = [];
@@ -19,8 +18,6 @@ const useRouterLocationStateForHelpPage = (
1918
newtags = [callBackValue];
2019
}
2120

22-
console.log(newtags);
23-
2421
navigate(`${location.pathname}${location.search}`, {
2522
state: { helpPageTags: newtags },
2623
});

0 commit comments

Comments
 (0)