Skip to content

Commit

Permalink
Merge pull request #1421 from IFRCGo/feature/unhide-operational-learning
Browse files Browse the repository at this point in the history
Unhide Ops Learning page
  • Loading branch information
frozenhelium authored Oct 24, 2024
2 parents 572d218 + a5bbd5c commit 5cf7888
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 26 deletions.
8 changes: 2 additions & 6 deletions app/.unimportedrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@
"entry": ["./src/index.tsx"],
"ignorePatterns": ["**/node_modules/**", "build/**", "**/parked/**"],
"ignoreUnimported": [
"src/views/CountryNsOverviewCapacity/CountryNsOrganisationalCapacity/index.tsx",
"**/*.d.ts",
"**/*.test.*",
"src/views/CountryNsOverviewCapacity/CountryNsOrganisationalCapacity/index.tsx",
"src/views/OperationalLearning/*",
"src/views/OperationalLearning/**/*",
"src/hooks/domain/usePerComponent.ts",
"src/hooks/domain/useSecondarySector.ts"
"**/*.test.*"
],
"ignoreUnresolved": [
"#assets/content/operational_timeline_title.svg?react",
Expand Down
7 changes: 1 addition & 6 deletions app/src/App/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -752,9 +752,6 @@ const resources = customWrapRoute({
visibility: 'anything',
},
});

// TODO: unhide operational learning
/*
const operationalLearning = customWrapRoute({
parent: rootLayout,
path: 'operational-learning',
Expand All @@ -768,7 +765,6 @@ const operationalLearning = customWrapRoute({
visibility: 'anything',
},
});
*/

const search = customWrapRoute({
parent: rootLayout,
Expand Down Expand Up @@ -1271,8 +1267,7 @@ const wrappedRoutes = {
perWorkPlanForm,
threeWProjectDetail,
termsAndConditions,
// TODO: unhide operational learning
// operationalLearning,
operationalLearning,
...regionRoutes,
...countryRoutes,
...surgeRoutes,
Expand Down
10 changes: 2 additions & 8 deletions app/src/components/Navbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ function Navbar(props: Props) {
type RespondOptionKey = 'emergencies' | 'early-warning' | 'dref-process' | 'surge';
const [activeRespondOption, setActiveRespondOption] = useState<RespondOptionKey>('emergencies');

// TODO: unhide operational learning
// type LearnOptionKey = 'tools' | 'resources' | 'operational-learning';
type LearnOptionKey = 'tools' | 'resources';
const [activeLearnOption, setActiveLearnOption] = useState<LearnOptionKey>('tools');
type LearnOptionKey = 'tools' | 'resources' | 'operational-learning';
const [activeLearnOption, setActiveLearnOption] = useState<LearnOptionKey>('operational-learning');

return (
<nav className={_cs(styles.navbar, className)}>
Expand Down Expand Up @@ -416,14 +414,12 @@ function Navbar(props: Props) {
className={styles.optionList}
contentClassName={styles.optionListContent}
>
{/* TODO: unhide operational learning
<Tab
name="operational-learning"
className={styles.option}
>
{strings.userMenuOperationalLearning}
</Tab>
*/}
<Tab
name="tools"
className={styles.option}
Expand All @@ -448,7 +444,6 @@ function Navbar(props: Props) {
</DropdownMenuItem>
</TabList>
<div className={styles.optionBorder} />
{/* TODO: unhide operational learning
<TabPanel
name="operational-learning"
className={styles.optionDetail}
Expand All @@ -464,7 +459,6 @@ function Navbar(props: Props) {
{strings.userMenuOperationalLearningDescription}
</div>
</TabPanel>
*/}
<TabPanel
name="tools"
className={styles.optionDetail}
Expand Down
7 changes: 1 addition & 6 deletions app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,5 @@
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true
},
"include": ["src", "env.ts"],

/* TODO: unhide operational learning */
"exclude": [
"src/views/OperationalLearning/*"
]
"include": ["src", "env.ts"]
}

0 comments on commit 5cf7888

Please sign in to comment.