From 5ef9cd969f45e240dbf81a1a59dee43b2af5f84a Mon Sep 17 00:00:00 2001
From: Peter Muriuki <pmuriuki98@gmail.com>
Date: Fri, 20 Dec 2024 18:58:44 +0300
Subject: [PATCH] Fix test regressions

---
 app/src/App/tests/App.test.tsx                |  4 +-
 .../tests/__snapshots__/index.test.tsx.snap   | 40 +++++++++++++++
 .../containers/pages/Home/tests/Home.test.tsx |  1 +
 .../tests/__snapshots__/Home.test.tsx.snap    | 11 ++++
 app/src/routes/tests/index.test.tsx           | 51 +++++++++++++++++--
 5 files changed, 102 insertions(+), 5 deletions(-)

diff --git a/app/src/App/tests/App.test.tsx b/app/src/App/tests/App.test.tsx
index d788c6c23..2a8a491dd 100644
--- a/app/src/App/tests/App.test.tsx
+++ b/app/src/App/tests/App.test.tsx
@@ -60,7 +60,7 @@ describe('App - unauthenticated', () => {
       </ContextProvider>
     );
     // before resolving get oauth state request, the user is logged out
-    expect(wrapper.text()).toMatchInlineSnapshot(`"AdministrationLogin"`);
+    expect(wrapper.text()).toMatchInlineSnapshot(`"AdministrationData ImportsLogin"`);
 
     await act(async () => {
       await flushPromises();
@@ -175,7 +175,7 @@ describe('App - authenticated', () => {
     );
     // before resolving get oauth state request, the user is logged out
     expect(wrapper.text()).toMatchInlineSnapshot(
-      `"AdministrationdemoWelcome to OpenSRPUser ManagementQuestionnaire Management"`
+      `"AdministrationData ImportsdemoWelcome to OpenSRPUser ManagementQuestionnaire ManagementData Imports"`
     );
 
     await act(async () => {
diff --git a/app/src/containers/ConnectedSidebar/tests/__snapshots__/index.test.tsx.snap b/app/src/containers/ConnectedSidebar/tests/__snapshots__/index.test.tsx.snap
index 2fd2bec0b..8800dcb24 100644
--- a/app/src/containers/ConnectedSidebar/tests/__snapshots__/index.test.tsx.snap
+++ b/app/src/containers/ConnectedSidebar/tests/__snapshots__/index.test.tsx.snap
@@ -83,6 +83,16 @@ Array [
       </Link>
     </MenuItem>
   </SubMenu>,
+  <MenuItem
+    icon={<UploadIcon />}
+  >
+    <Link
+      className="admin-link"
+      to="/import"
+    >
+      Data Imports
+    </Link>
+  </MenuItem>,
 ]
 `;
 
@@ -169,6 +179,16 @@ Array [
       </Link>
     </MenuItem>
   </SubMenu>,
+  <MenuItem
+    icon={<UploadIcon />}
+  >
+    <Link
+      className="admin-link"
+      to="/import"
+    >
+      Data Imports
+    </Link>
+  </MenuItem>,
 ]
 `;
 
@@ -300,6 +320,16 @@ Object {
             </Link>
           </MenuItem>
         </SubMenu>
+        <MenuItem
+          icon={<UploadIcon />}
+        >
+          <Link
+            className="admin-link"
+            to="/import"
+          >
+            Data Imports
+          </Link>
+        </MenuItem>
       </Menu>
     </div>,
     null,
@@ -389,5 +419,15 @@ Array [
       </Link>
     </MenuItem>
   </SubMenu>,
+  <MenuItem
+    icon={<UploadIcon />}
+  >
+    <Link
+      className="admin-link"
+      to="/import"
+    >
+      Data Imports
+    </Link>
+  </MenuItem>,
 ]
 `;
diff --git a/app/src/containers/pages/Home/tests/Home.test.tsx b/app/src/containers/pages/Home/tests/Home.test.tsx
index a6898b014..1363d3c60 100644
--- a/app/src/containers/pages/Home/tests/Home.test.tsx
+++ b/app/src/containers/pages/Home/tests/Home.test.tsx
@@ -66,6 +66,7 @@ describe('containers/pages/Home', () => {
       'Location Management',
       'Organization Management',
       'Questionnaire Management',
+      'Data Imports',
     ]);
     links.forEach((link) => {
       expect(link).toMatchSnapshot(link.textContent ?? undefined);
diff --git a/app/src/containers/pages/Home/tests/__snapshots__/Home.test.tsx.snap b/app/src/containers/pages/Home/tests/__snapshots__/Home.test.tsx.snap
index d9c45804b..1c2f9da1a 100644
--- a/app/src/containers/pages/Home/tests/__snapshots__/Home.test.tsx.snap
+++ b/app/src/containers/pages/Home/tests/__snapshots__/Home.test.tsx.snap
@@ -1,5 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`containers/pages/Home renders Home correctly & changes Title of page 2: Data Imports 1`] = `
+<button
+  class="ant-btn css-dev-only-do-not-override-k7429z ant-btn-link admin-link btn-links"
+  type="button"
+>
+  <span>
+    Data Imports
+  </span>
+</button>
+`;
+
 exports[`containers/pages/Home renders Home correctly & changes Title of page 2: Location Management 1`] = `
 <button
   class="ant-btn css-dev-only-do-not-override-k7429z ant-btn-link admin-link btn-links"
diff --git a/app/src/routes/tests/index.test.tsx b/app/src/routes/tests/index.test.tsx
index b1b3f5828..69c6e4bcd 100644
--- a/app/src/routes/tests/index.test.tsx
+++ b/app/src/routes/tests/index.test.tsx
@@ -1,9 +1,10 @@
+import React from 'react';
 import { store } from '@opensrp/store';
 import { authenticateUser } from '@onaio/session-reducer';
 import { filterFalsyRoutes, getRoutes } from '..';
 import { DashboardOutlined } from '@ant-design/icons';
-import React from 'react';
 import { superUserRole } from '@opensrp/react-utils';
+import UploadIcon from '@2fd/ant-design-icons/lib/Upload';
 
 jest.mock('../../configs/env');
 jest.mock('../../configs/settings');
@@ -124,67 +125,111 @@ describe('routes', () => {
               {
                 key: 'users',
                 title: 'Users',
+                permissions: ['iam_user.read'],
+
                 url: '/admin/users',
               },
               {
                 key: 'user-groups',
+                permissions: ['iam_group.read'],
+
                 title: 'User Groups',
                 url: '/admin/users/groups',
               },
               {
                 key: 'user-roles',
+                permissions: ['iam_role.read'],
                 title: 'User Roles',
                 url: '/admin/users/roles',
               },
             ],
             enabled: true,
+            isHomePageLink: true,
             key: 'user-management',
+            permissions: ['iam_user.read'],
             title: 'User Management',
+            url: '/admin/users',
           },
           {
             children: [
               {
                 key: 'location-unit',
+                permissions: ['Location.read'],
+
                 title: 'Hierarchy',
                 url: '/admin/location/unit',
               },
               {
                 key: 'all-locations',
+                permissions: ['Location.read'],
+
                 title: 'All Locations',
                 url: '/admin/location/all',
               },
             ],
             enabled: true,
+            isHomePageLink: true,
             key: 'location-management',
+            permissions: ['Location.read'],
+
             title: 'Location Management',
+            url: '/admin/location/unit',
           },
           {
             children: [
               {
                 key: 'ORGS',
+                permissions: ['Organization.read'],
+
                 title: 'Organizations',
                 url: '/admin/teams',
               },
               {
                 enabled: true,
                 key: 'org-assignment',
+                permissions: ['OrganizationAffiliation.read', 'Location.read'],
+
                 title: 'Organization Assignment',
                 url: '/admin/teams/team-assignment',
               },
             ],
             enabled: true,
+            isHomePageLink: true,
             key: 'org-management',
+            permissions: ['Organization.read'],
+
             title: 'Organization Management',
+            url: '/admin/teams',
+          },
+          {
+            enabled: true,
+            isHomePageLink: true,
+            key: 'fhir-quest',
+            permissions: ['Questionnaire.read'],
+
+            title: 'Questionnaire Management',
+            url: '/quest',
           },
-          { enabled: true, key: 'fhir-quest', title: 'Questionnaire Management', url: '/quest' },
         ],
         enabled: true,
         key: 'admin',
         otherProps: {
           icon: <DashboardOutlined />,
         },
+        permissions: [],
         title: 'Administration',
       },
+      {
+        enabled: true,
+        isHomePageLink: true,
+        key: 'data-import',
+        otherProps: {
+          icon: <UploadIcon />,
+        },
+        permissions: ['DataImport.read'],
+        title: 'Data Imports',
+        url: '/import',
+      },
     ]);
   });
 
@@ -201,7 +246,7 @@ describe('routes', () => {
       (t: string) => t,
       superUserRole
     );
-    const parentKeys = routes.flatMap((x) => x.children).map((x) => x.key);
+    const parentKeys = routes.flatMap((x) => x.children).map((x) => (x ? x.key ?? '' : ''));
     expect(parentKeys).toContain('org-management');
     expect(parentKeys).toContain('user-management');
     expect(parentKeys).toContain('location-management');