Update test regressions

onaio · Sep 27, 2024 · e9a8f0d · e9a8f0d
1 parent 254f9bc
commit e9a8f0d
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 218 deletions.
diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/ListView/index.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/ListView/index.tsx
@@ -6,6 +6,8 @@ import {
   TableLayout,
   BrokenPage,
   searchQuery,
+  useSearchParams,
+  viewDetailsQuery,
 } from '@opensrp/react-utils';
 import { PlusOutlined } from '@ant-design/icons';
 import { URL_USER_CREATE, KEYCLOAK_URL_USERS } from '@opensrp/user-management';
@@ -40,6 +42,8 @@ export const UserList = (props: OrganizationListProps) => {
   const extraData = useSelector(getExtraData);
   const { t } = useTranslation();
   const userRole = useUserRole();
+  const { sParams } = useSearchParams();
+  const resourceId = sParams.get(viewDetailsQuery) ?? undefined;
 
   const { isLoading, data, error, isFetching } = useQuery([KEYCLOAK_URL_USERS], () =>
     loadKeycloakResources(keycloakBaseURL, KEYCLOAK_URL_USERS)
@@ -125,7 +129,11 @@ export const UserList = (props: OrganizationListProps) => {
             <div className="dataGridWithOverview-table">
               <TableLayout {...tableProps} />
             </div>
-            <UserDetailsOverview keycloakBaseURL={keycloakBaseURL} />
+            {resourceId ? (
+              <div className="view-details-content dataGridWithOverview-overview">
+                <UserDetailsOverview keycloakBaseURL={keycloakBaseURL} resourceId={resourceId} />
+              </div>
+            ) : null}
           </div>
         </Col>
       </Row>

diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tests/index.test.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tests/index.test.tsx
@@ -13,11 +13,7 @@ import userEvents from '@testing-library/user-event';
 import { URL_USER, URL_USER_CREDENTIALS, UserCredentials } from '@opensrp/user-management';
 import { practitioner, userFixtures, group } from './fixtures';
 import fetch from 'jest-fetch-mock';
-import {
-  USER_DETAILS_URL,
-  practitionerResourceType,
-  practitionerRoleResourceType,
-} from '../../../../constants';
+import { practitionerResourceType, practitionerRoleResourceType } from '../../../../constants';
 import flushPromises from 'flush-promises';
 import { practitionerRoleBundle } from '../../../CreateEditUser/tests/fixtures';
 import { RoleContext } from '@opensrp/rbac';
@@ -114,6 +110,10 @@ afterEach(() => {
   cleanup();
 });
 
+beforeEach(() => {
+  fetch.mockClear();
+});
+
 afterAll(() => {
   nock.enableNetConnect();
 });
@@ -336,7 +336,6 @@ test('View details navigates correctly', async () => {
     </span>
   `);
   fireEvent.click(viewDetailsLink);
-  expect(history.location.pathname).toEqual(
-    `${USER_DETAILS_URL}/081724e8-5fc1-47dd-8d0c-fa0c6ae6ddf0`
-  );
+  expect(history.location.pathname).toEqual('/admin/users');
+  expect(history.location.search).toEqual('?viewDetails=081724e8-5fc1-47dd-8d0c-fa0c6ae6ddf0');
 });
diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/index.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/index.tsx
@@ -162,6 +162,7 @@ export const UserDetails = (props: UserDetailProps) => {
         <title>{pageTitle} </title>
       </Helmet>
       <div
+        data-testid="user-profile"
         style={{
           display: 'flex',
           flexDirection: 'column',

diff --git a/...es/fhir-keycloak-user-management/src/components/UserList/Viewdetails/tests/index.test.tsx b/...es/fhir-keycloak-user-management/src/components/UserList/Viewdetails/tests/index.test.tsx
@@ -149,7 +149,7 @@ test('Renders without crashing', async () => {
   const userProfile = screen.getByTestId('user-profile');
   const textContent = userProfile.textContent;
   expect(textContent).toEqual(
-    '1147EnabledDeleteEditId9f72c646-dc1e-4f24-98df-6f04373b9ec6First Nametest1147Last Name1147Username1147Emailmejay2303@gmail.comVerifiedFalseAttributesfhir_core_app_id["ecbis"]'
+    '1147EnabledDeleteEditID: 9f72c646-dc1e-4f24-98df-6f04373b9ec6Verified: FalseDate Created1/31/2023, 3:44:49 PMFirst Nametest1147Last Name1147Username1147Emailmejay2303@gmail.comFHIR Core App IdecbisUser groupsUser rolesPractitionersCareTeamsOrganizationsNamePathActionsNo data'
   );
 
   // have a look at the tabs
@@ -304,7 +304,7 @@ test('Edit button works correctly', async () => {
 
   expect(screen.queryByTitle(/View details/i)).toBeInTheDocument();
 
-  const editBtn = screen.getByRole('button', { name: 'Edit' });
+  const editBtn = screen.getByRole('link', { name: 'Edit' });
   fireEvent.click(editBtn);
 
   expect(history.location.pathname).toEqual('/admin/users/edit/userId');
@@ -348,7 +348,7 @@ test('Renders extra user fields correctly', async () => {
   const userProfile = screen.getByTestId('user-profile');
   const textContent = userProfile.textContent;
   expect(textContent).toEqual(
-    '1147EnabledDeleteEditId9f72c646-dc1e-4f24-98df-6f04373b9ec6First Nametest1147Last Name1147National ID1234567891011121Phone Number0101345678Username1147Emailmejay2303@gmail.comVerifiedFalseAttributesfhir_core_app_id["giz"]'
+    '1147EnabledDeleteEditID: 9f72c646-dc1e-4f24-98df-6f04373b9ec6Verified: FalseDate Created1/31/2023, 3:44:49 PMFirst Nametest1147Last Name1147Username1147Emailmejay2303@gmail.comNational ID1234567891011121Phone Number0101345678FHIR Core App IdgizUser groupsUser rolesPractitionersCareTeamsOrganizationsNamePathActionsNo data'
   );
 
   // have a look at the tabs

diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/ViewdetailsOverview/index.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/ViewdetailsOverview/index.tsx
@@ -17,14 +17,14 @@ import { Link } from 'react-router-dom';
 // remove onclose from type and export the rest
 interface UserDetailsOverViewProps {
   keycloakBaseURL: string;
+  resourceId: string;
 }
 
 export const UserDetailsOverview = (props: UserDetailsOverViewProps) => {
-  const { keycloakBaseURL: keycloakBaseUrl } = props;
+  const { keycloakBaseURL: keycloakBaseUrl, resourceId } = props;
   const { t } = useTranslation();
 
-  const { removeParam, sParams } = useSearchParams();
-  const resourceId = sParams.get(viewDetailsQuery) ?? undefined;
+  const { removeParam } = useSearchParams();
 
   const {
     data: user,
@@ -57,7 +57,7 @@ export const UserDetailsOverview = (props: UserDetailsOverViewProps) => {
         if (userIsLoading) {
           return (
             <Alert
-              description={t('Fetching Patient details')}
+              description={t('Fetching user details')}
               type="info"
               showIcon
               icon={<SyncOutlined spin />}
@@ -69,11 +69,7 @@ export const UserDetailsOverview = (props: UserDetailsOverViewProps) => {
       },
     };
 
-    return (
-      <div className="view-details-content dataGridWithOverview-overview">
-        <ResourceDetails {...resourceDetailsProp} />
-      </div>
-    );
+    return <ResourceDetails {...resourceDetailsProp} />;
   }
 
   const { id, firstName, lastName, username, email, enabled, emailVerified } = user;
@@ -124,9 +120,5 @@ export const UserDetailsOverview = (props: UserDetailsOverViewProps) => {
     ),
   };
 
-  return (
-    <div className="view-details-content dataGridWithOverview-overview">
-      <ResourceDetails {...resourceDetailsProp} />
-    </div>
-  );
+  return <ResourceDetails {...resourceDetailsProp} />;
 };