Merge pull request #1445 from IFRCGo/feature/uat-requested-changes

Update Operational Learning and PER Pages

Author: samshara

.changeset/green-crews-marry.md

@@ -0,0 +1,5 @@
+---
+"go-web-app": patch
+---
+
+Updated PER terminology and add PER logo in PER PDF export.

.changeset/loud-wombats-breathe.md

@@ -0,0 +1,5 @@
+---
+"go-web-app": patch
+---
+
+Add link to GO UI storybook in resources page

.changeset/twenty-paws-happen.md

@@ -0,0 +1,5 @@
+---
+"go-web-app": patch
+---
+
+Add beta tag, URL redirect, and link to old dashboard on Ops Learning

app/src/App/routes/index.tsx

@@ -344,7 +344,6 @@ const preparednessIndex = customWrapRoute({
                 '#global-summary': 'global-summary',
                 '#global-performance': 'global-performance',
                 '#resources-catalogue': 'resources-catalogue',
-                '#operational-learning': 'operational-learning',
             },
         },
     },
@@ -396,21 +395,6 @@ const preparednessGlobalCatalogue = customWrapRoute({
     },
 });
 
-// FIXME: update name to `preparednessOperationalLearning`
-const preparednessGlobalOperational = customWrapRoute({
-    parent: preparednessLayout,
-    path: 'operational-learning',
-    component: {
-        render: () => import('#views/PreparednessOperationalLearning'),
-        props: {},
-    },
-    wrapperComponent: Auth,
-    context: {
-        title: 'Preparedness - Operational Learning',
-        visibility: 'anything',
-    },
-});
-
 const globalThreeW = customWrapRoute({
     parent: rootLayout,
     path: 'three-w/projects',
@@ -1186,6 +1170,22 @@ const perWorkPlanForm = customWrapRoute({
 });
 
 // Redirect Routes
+const preparednessOperationalLearning = customWrapRoute({
+    parent: preparednessLayout,
+    path: 'operational-learning',
+    component: {
+        eagerLoad: true,
+        render: Navigate,
+        props: {
+            to: operationalLearning.absolutePath,
+        },
+    },
+    wrapperComponent: Auth,
+    context: {
+        title: 'Operational Learning',
+        visibility: 'anything',
+    },
+});
 
 const wrappedRoutes = {
     fourHundredFour,
@@ -1214,7 +1214,6 @@ const wrappedRoutes = {
     preparednessGlobalSummary,
     preparednessGlobalPerformance,
     preparednessGlobalCatalogue,
-    preparednessGlobalOperational,
     preparednessIndex,
     perProcessFormIndex,
     globalThreeW,
@@ -1272,6 +1271,8 @@ const wrappedRoutes = {
     ...countryRoutes,
     ...surgeRoutes,
 
+    // Redirects
+    preparednessOperationalLearning,
 };
 
 export const unwrappedRoutes = unwrapRoute(Object.values(wrappedRoutes));

app/src/assets/icons/per_logo.png

@@ -31,7 +31,6 @@
         "userMenuGlobalSummary":"Global Summary",
         "userMenuGlobalPerformance":"Global Performance",
         "userMenuCatalogueResources":"Catalogue of Resources",
-        "userMenuOperationalLearning":"Operational Learning",
         "userMenuStartPER":"Start PER Process",
         "userMenuGlobal3WProjectDescription":"The \"Who does What, Where\" or 3W aims to map the global footprint of the Red Cross Red Crescent Movement, as reported by the National Societies.",
         "userMenuSubmit3WProject":"Submit 3W Project",

app/src/components/Navbar/i18n.json

@@ -212,13 +212,6 @@ function Navbar(props: Props) {
                                 >
                                     {strings.userMenuCatalogueResources}
                                 </DropdownMenuItem>
-                                <DropdownMenuItem
-                                    type="link"
-                                    to="preparednessGlobalOperational"
-                                    variant="tertiary"
-                                >
-                                    {strings.userMenuOperationalLearning}
-                                </DropdownMenuItem>
                                 <DropdownMenuItem
                                     type="link"
                                     to="perProcessLayout"

app/src/components/Navbar/index.tsx

@@ -28,7 +28,7 @@
         "lastUpdatedLabel": "Last update",
         "perExport": "Export",
         "upload": "Upload",
-        "typeOfOperation": "Type of Operation",
+        "perAreas": "PER Areas",
         "relevantDocumentHeader": "Relevant Documents",
         "uploadLimitDisclaimer": "Note: You can only upload upto 10 documents.",
         "perArea": "Area {areaNumber}: {title}"

app/src/views/CountryPreparedness/PrivateCountryPreparedness/i18n.json

@@ -637,7 +637,7 @@ function PrivateCountryPreparedness() {
                             <Heading
                                 level={5}
                             >
-                                {strings.typeOfOperation}
+                                {strings.perAreas}
                             </Heading>
                             <div className={styles.separator} />
                             {perFormAreaResponse?.results?.map((perFormArea) => {

app/src/views/CountryPreparedness/PrivateCountryPreparedness/index.tsx

@@ -89,7 +89,7 @@ function EventDetail(props: Props) {
     }, [setFieldValue]);
 
     const operationalLearningUrl = useLink({
-        to: 'preparednessGlobalOperational',
+        to: 'operationalLearning',
         external: false,
     });