diff --git a/app/package.json b/app/package.json index 5163622b0..76abec9d3 100644 --- a/app/package.json +++ b/app/package.json @@ -5,6 +5,7 @@ "dependencies": { "@2fd/ant-design-icons": "^2.6.0", "@ant-design/icons": "^4.7.0", + "@ant-design/pro-components": "^2.6.32", "@onaio/connected-private-route": "^0.0.11", "@onaio/connected-reducer-registry": "^0.0.3", "@onaio/gatekeeper": "1.0.0", diff --git a/app/src/App/fhir-apps.tsx b/app/src/App/fhir-apps.tsx index 7e05e1926..3df5289a7 100644 --- a/app/src/App/fhir-apps.tsx +++ b/app/src/App/fhir-apps.tsx @@ -63,6 +63,8 @@ import { import { CreateEditUser as FHIRConnectedCreateEditUser, UserList as FhirUserList, + USER_DETAILS_URL, + UserDetailsV2, } from '@opensrp/fhir-user-management'; import { Home } from '../containers/pages/Home/Home'; import { @@ -224,6 +226,14 @@ const FHIRApps = () => { permissions={['iam_user.read']} component={FhirUserList} /> + void; + keycloakBaseUrl: string; + fhirBaseUrl: string; + resourceId: string; +} + +export const UserDeleteBtn = (props: UserDeleteBtnProp) => { + const { afterActions, keycloakBaseUrl, fhirBaseUrl, resourceId } = props; + const { t } = useTranslation(); + const queryClient = useQueryClient(); + + return ( + { + await deleteUser(keycloakBaseUrl, fhirBaseUrl, resourceId, t); + try { + return await queryClient.invalidateQueries({ + queryKey: [KEYCLOAK_URL_USERS], + exact: true, + }); + } catch { + return sendErrorNotification( + t('Failed to update data, please refresh the page to see the most recent changes') + ); + } finally { + afterActions?.(); + } + }} + > + + + ); +}; 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 index e9aee11be..da7450196 100644 --- 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,8 +6,6 @@ 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'; @@ -20,8 +18,6 @@ import { PageHeader } from '@opensrp/react-utils'; import { getExtraData } from '@onaio/session-reducer'; import { KeycloakUser } from '@opensrp/user-management'; import { useSelector } from 'react-redux'; -import { ViewDetailsWrapper } from '../ViewDetails'; -import { useQueryClient } from 'react-query'; import { useTranslation } from '@opensrp/i18n'; import { RbacCheck, useUserRole } from '@opensrp/rbac'; @@ -41,13 +37,9 @@ export const UserList = (props: OrganizationListProps) => { const history = useHistory(); const match = useRouteMatch(); const extraData = useSelector(getExtraData); - const queryClient = useQueryClient(); const { t } = useTranslation(); const userRole = useUserRole(); - const { sParams, addParam } = useSearchParams(); - const resourceId = sParams.get(viewDetailsQuery) ?? undefined; - const { isLoading, data, error, isFetching } = useQuery([KEYCLOAK_URL_USERS], () => loadKeycloakResources(keycloakBaseURL, KEYCLOAK_URL_USERS) ); @@ -77,17 +69,7 @@ export const UserList = (props: OrganizationListProps) => { }; }); - const onViewDetails = (resourceId: string) => addParam(viewDetailsQuery, resourceId); - const columns = getTableColumns( - keycloakBaseURL, - fhirBaseURL, - extraData, - queryClient, - t, - onViewDetails, - userRole, - history - ); + const columns = getTableColumns(keycloakBaseURL, fhirBaseURL, extraData, t, userRole, history); const searchFormProps = { defaultValue: getQueryParams(location)[searchQuery], @@ -134,11 +116,6 @@ export const UserList = (props: OrganizationListProps) => { - ); diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tableColumns.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tableColumns.tsx index ea57d13ae..613c67f1d 100644 --- a/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tableColumns.tsx +++ b/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tableColumns.tsx @@ -1,22 +1,16 @@ import * as React from 'react'; -import { Popconfirm, Divider, Dropdown, Button } from 'antd'; +import { Divider, Dropdown, Button } from 'antd'; import type { MenuProps } from 'antd'; import { MoreOutlined } from '@ant-design/icons'; -import { deleteUser } from './utils'; import { Link } from 'react-router-dom'; -import { - KeycloakUser, - URL_USER_EDIT, - KEYCLOAK_URL_USERS, - URL_USER_CREDENTIALS, -} from '@opensrp/user-management'; +import { KeycloakUser, URL_USER_EDIT, URL_USER_CREDENTIALS } from '@opensrp/user-management'; import { Dictionary } from '@onaio/utils'; import { Column } from '@opensrp/react-utils'; -import { sendErrorNotification } from '@opensrp/notifications'; -import { QueryClient } from 'react-query'; import type { TFunction } from '@opensrp/i18n'; import { RbacCheck, UserRole } from '@opensrp/rbac'; import { History } from 'history'; +import { UserDeleteBtn } from '../../UserDeleteBtn'; +import { USER_DETAILS_URL } from '../../../constants'; /** * Get table columns for user list @@ -24,9 +18,7 @@ import { History } from 'history'; * @param keycloakBaseUrl - keycloak base url * @param baseUrl - server base url * @param extraData - session data about logged in user - * @param queryClient - react query client * @param t - translator function - * @param onViewDetails - callback when view details is clicked. * @param userRole - role of logged in user. * @param history - history object for managing navigation */ @@ -34,9 +26,7 @@ export const getTableColumns = ( keycloakBaseUrl: string, baseUrl: string, extraData: Dictionary, - queryClient: QueryClient, t: TFunction, - onViewDetails: (recordId: string) => void, userRole: UserRole, history: History ): Column[] => { @@ -61,44 +51,16 @@ export const getTableColumns = ( }); const getItems = (record: KeycloakUser): MenuProps['items'] => { - return [ + const items = [ { key: '1', - permissions: [], + permissions: ['iam_user.read'], label: ( - ), }, - { - key: '2', - permissions: ['iam_user.delete'], - label: ( - { - await deleteUser(keycloakBaseUrl, baseUrl, record.id, t); - try { - return await queryClient.invalidateQueries([KEYCLOAK_URL_USERS]); - } catch { - return sendErrorNotification( - t('Failed to update data, please refresh the page to see the most recent changes') - ); - } - }} - > - {user_id && - (record.id === user_id ? null : ( - - ))} - - ), - }, { key: '3', permissions: ['iam_user.update'], @@ -114,7 +76,22 @@ export const getTableColumns = ( ), }, - ] + ]; + // don't show delete for the current logged in user - back compatibility reasons. + if (user_id && record.id !== user_id) { + items.push({ + key: '2', + permissions: ['iam_user.delete'], + label: ( + + ), + }); + } + return items .filter((item) => userRole.hasPermissions(item.permissions)) .map((item) => { const { permissions, ...rest } = item; diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tests/__snapshots__/index.test.tsx.snap b/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tests/__snapshots__/index.test.tsx.snap index e94011a45..683c4ba37 100644 --- a/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tests/__snapshots__/index.test.tsx.snap +++ b/packages/fhir-keycloak-user-management/src/components/UserList/ListView/tests/__snapshots__/index.test.tsx.snap @@ -1,5 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`View details navigates correctly: Header title 1`] = ` +

+ User Management +

+`; + exports[`renders correctly when listing resources: Header title 1`] = `

`; -exports[`renders correctly when listing resources: user details 1`] = ` -
-
-
-
- - Keycloak UUID - -
-
- - 081724e8-5fc1-47dd-8d0c-fa0c6ae6ddf0 - -
-
-
-
-`; - -exports[`renders correctly when listing resources: user details 2`] = ` -
-
-
-
- - Username - -
-
- - april4petertest - -
-
-
-
-`; - -exports[`renders correctly when listing resources: user details 3`] = ` -
-
-
-
- - Practitioner ID - -
-
- - 206 - -
-
-
-
-`; - -exports[`renders correctly when listing resources: user details 4`] = ` -
-
-
-
- - Practitioner UUID - -
-
- - c1d36d9a-b771-410b-959e-af2c04d132a2 - -
-
-
-
-`; - -exports[`renders correctly when listing resources: user details 5`] = ` -
-
-
-
- - Practitioner status - -
-
- - inactive - -
-
-
-
-`; - -exports[`renders correctly when listing resources: user details 6`] = ` -
-
-
-
- - User Type - -
-
- -
    -
  • - practitioner -
    • -
- -
-
-
-
-`; - exports[`renders correctly when listing resources: yes button 1`] = ` + + ), + }, + ]; + + const tableProps = { + datasource: data ?? [], + columns, + loading: isLoading, + size: 'small' as const, + }; + + return ; +}; + +export const removeGroupFromUser = async ( + baseUrl: string, + groupId: string, + userId: string, + query: QueryClient, + t: TFunction +) => { + const endpoint = `${KEYCLOAK_URL_USERS}/${userId}${KEYCLOAK_URL_USER_GROUPS}/${groupId}`; + const server = new KeycloakService(endpoint, baseUrl); + return server.delete().then(() => { + query.refetchQueries([KEYCLOAK_URL_USERS, KEYCLOAK_URL_USER_GROUPS]).catch(() => { + sendInfoNotification(t('Failed to refresh data, please refresh the page')); + }); + sendSuccessNotification(t('User has been successfully removed from the keycloak group')); + }); +}; diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/OrganizationDetailsView.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/OrganizationDetailsView.tsx new file mode 100644 index 000000000..d9d091c7e --- /dev/null +++ b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/OrganizationDetailsView.tsx @@ -0,0 +1,72 @@ +import React from 'react'; +import { useTranslation } from '../../../../mls'; +import { TableLayout, CodeableConcept as CodeableConceptJsx } from '@opensrp/react-utils'; +import { PractitionerDetail } from '../types'; +import { CodeableConcept } from '@smile-cdr/fhirts/dist/FHIR-R4/classes/codeableConcept'; +import { Alert } from 'antd'; + +export interface OrganizationDetailsViewProp { + loading: boolean; + practitionerDetails: PractitionerDetail['fhir']; + error: Error | null; +} + +export const OrganizationDetailsView = ({ + loading, + practitionerDetails, + error, +}: OrganizationDetailsViewProp) => { + const { t } = useTranslation(); + + if (error) { + return ( + + {t('An error occurred while trying to fetch the practitioner details.')} + + ); + } + + // get organization Affiliation - use it tag the codings for the organizations. + const organizations = practitionerDetails.teams ?? []; + const tableData = organizations.map((resource) => { + const { id, active, type, name } = resource; + return { + id, + active, + type: type ?? [], + name, + }; + }); + + // identifier, status, + const columns = [ + { + title: t('Id'), + dataIndex: 'id' as const, + }, + { + title: t('Name'), + dataIndex: 'name' as const, + }, + { + title: t('Active'), + dataIndex: 'active' as const, + render: (isActive: string) => (isActive ? 'Active' : 'Inactive'), + }, + { + title: t('Type'), + dataIndex: 'type' as const, + render: (concepts: CodeableConcept[]) => + concepts.map((concept, index) => ), + }, + ]; + + const tableProps = { + datasource: tableData, + columns, + loading, + size: 'small' as const, + }; + + return ; +}; diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/PractitionerDetails.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/PractitionerDetails.tsx new file mode 100644 index 000000000..a2909775d --- /dev/null +++ b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/PractitionerDetails.tsx @@ -0,0 +1,158 @@ +import React from 'react'; +import { useTranslation } from '../../../../mls'; +import { + TableLayout, + parseFhirHumanName, + CodeableConcept as CodeableConceptJsx, +} from '@opensrp/react-utils'; +import { practitionerResourceType } from '../../../../constants'; +import { IPractitionerRole } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IPractitionerRole'; +import { IPractitioner } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IPractitioner'; +import { CodeableConcept } from '@smile-cdr/fhirts/dist/FHIR-R4/classes/codeableConcept'; +import { PractitionerDetail } from '../types'; +import { Alert } from 'antd'; +import { + PRACTITIONER_USER_TYPE_CODE, + SUPERVISOR_USER_TYPE_CODE, + getUserType, + getUserTypeCode, +} from '@opensrp/user-management'; + +export interface PractitionerDetailViewsProps { + loading: boolean; + practitionerDetails: PractitionerDetail['fhir']; + error: Error | null; +} + +export const PractitionerDetailsView = (props: PractitionerDetailViewsProps) => { + const { loading, practitionerDetails, error } = props; + const { t } = useTranslation(); + + if (error) { + return ( + + {t('An error occurred while trying to fetch the practitioner details.')} + + ); + } + + const practitioners = practitionerDetails.practitioner ?? []; + const practitionerRoles = practitionerDetails.practitionerRoles ?? []; + const tableData = processPractitionerDetails(practitioners, practitionerRoles); + + const columns = [ + { + title: t('Id'), + dataIndex: 'id' as const, + }, + { + title: t('Name'), + dataIndex: 'name' as const, + }, + { + title: t('Active'), + dataIndex: 'active' as const, + render: (value: boolean) => (value === true ? 'Active' : 'Inactive'), + }, + { + title: t('User Type'), + dataIndex: 'userType' as const, + }, + { + title: t('Practitioner Role Coding'), + dataIndex: 'concepts' as const, + render: (concepts: CodeableConcept[]) => { + return concepts.map((concept, index) => ( + + )); + }, + }, + ]; + + const tableProps = { + datasource: tableData, + columns, + loading, + size: 'small' as const, + }; + + return ; +}; + +/** + * Get practitioner table data by combining practitioners and practitioner roles + * returned in the practitioner details endpoint + * + * @param practitioners - practitioner resources + * @param practitionerRoles - practitioner role resources + */ +function processPractitionerDetails( + practitioners: IPractitioner[], + practitionerRoles: IPractitionerRole[] +) { + interface TableData { + id?: string; + name?: string; + active?: boolean; + concepts: CodeableConcept[]; + userType?: string; + } + const tableData: Record = {}; + const tempPractitionerRoleCodings: Record< + string, + { concepts: CodeableConcept[]; userType?: string } + > = {}; + + for (const res of practitioners) { + const typedRes = res; + const resName = typedRes.name?.[0]; // TODO - use get official name + // add to store + tableData[`${practitionerResourceType}/${typedRes.id}`] = { + id: res.id, + name: parseFhirHumanName(resName), + active: res.active, + concepts: [], + userType: undefined, + }; + } + + for (const res of practitionerRoles) { + // practitionerRole resource + const typedRes = res as IPractitionerRole; + const practitionerId = typedRes.practitioner?.reference as string; + + // extract the coding + const concepts = typedRes.code ?? []; + let userType: string | undefined = undefined; + const userTypeCode = getUserTypeCode(res); + if (userTypeCode) { + userType = getUserType( + userTypeCode as typeof PRACTITIONER_USER_TYPE_CODE | typeof SUPERVISOR_USER_TYPE_CODE + ); + } + + // have we encountered a corresponding practitioner for this role + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + if (tableData[practitionerId] === undefined) { + tableData[practitionerId].concepts = [...tableData[practitionerId].concepts, ...concepts]; + tableData[practitionerId].userType = userType; + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + } else if (tempPractitionerRoleCodings[practitionerId] === undefined) { + tempPractitionerRoleCodings[practitionerId] = { concepts: [] }; + tempPractitionerRoleCodings[practitionerId].concepts = []; + tempPractitionerRoleCodings[practitionerId].userType = userType; + } + tempPractitionerRoleCodings[practitionerId].concepts = [ + ...tempPractitionerRoleCodings[practitionerId].concepts, + ...concepts, + ]; + } + + for (const [key, value] of Object.entries(tempPractitionerRoleCodings)) { + // invariant: we should have encountered all possible practitioners whose practitioner Roles records are in tempPractitionerRoleCodings + tableData[key].concepts = [...tableData[key].concepts, ...value.concepts]; + tableData[key].userType = value.userType; + } + + return Object.values(tableData); +} diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/RoleDetailView.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/RoleDetailView.tsx new file mode 100644 index 000000000..903939a05 --- /dev/null +++ b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/RoleDetailView.tsx @@ -0,0 +1,116 @@ +import React from 'react'; +import { Alert, Typography } from 'antd'; +import { useTranslation } from '../../../../mls'; +import { TableLayout } from '@opensrp/react-utils'; +import { KEYCLOAK_URL_USERS } from '@opensrp/user-management'; +import { KeycloakService } from '@opensrp/keycloak-service'; +import { useQuery } from 'react-query'; +import { keycloakRoleMappingsEndpoint } from '../../../../constants'; +import { KeycloakUserRoleMappings } from '../types'; + +const { Text } = Typography; + +export interface KeycloakRoleDetailsProps { + keycloakBaseUrl: string; + resourceId: string; +} + +export const KeycloakRoleDetails = (props: KeycloakRoleDetailsProps) => { + const { t } = useTranslation(); + const { keycloakBaseUrl, resourceId } = props; + + const { data, error, isLoading } = useQuery([], () => + new KeycloakService( + `${KEYCLOAK_URL_USERS}/${resourceId}/${keycloakRoleMappingsEndpoint}`, + keycloakBaseUrl + ).list() + ); + + if (error && !data) { + return {t("An error occurred while fetching the user's roles")}; + } + + const { realmMappings, clientMappings } = data ?? {}; + const realmRoles = realmMappings ?? []; + const clientRoles = flattenClientRoles(clientMappings); + + const realmRoleTableColumn = [ + { + title: t('Name'), + dataIndex: 'name' as const, + }, + + { + title: t('Description'), + dataIndex: 'description' as const, + }, + ]; + + const clientRoleTableColumn = [ + { + title: t('Client'), + dataIndex: 'client' as const, + }, + { + title: t('Name'), + dataIndex: 'name' as const, + }, + + { + title: t('Description'), + dataIndex: 'description' as const, + }, + ]; + + const realmRolesTableProps = { + datasource: realmRoles, + columns: realmRoleTableColumn, + loading: isLoading, + size: 'small' as const, + key: 'realms', + }; + + const clientRolesTableProps = { + datasource: clientRoles, + columns: clientRoleTableColumn, + loading: isLoading, + size: 'small' as const, + key: 'client', + }; + + return ( + <> +
+
+ Realm Roles + +
+
+ Client Roles + +
+
+ + ); +}; + +const flattenClientRoles = (clientRoleMapping: KeycloakUserRoleMappings['clientMappings']) => { + const mapping = clientRoleMapping ?? {}; + const rtv = []; + for (const roleObj of Object.values(mapping)) { + const client = roleObj.client; + for (const role of roleObj.mappings) { + rtv.push({ + ...role, + client, + }); + } + } + return rtv; +}; diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/tests/fixtures.ts b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/tests/fixtures.ts new file mode 100644 index 000000000..1d543f159 --- /dev/null +++ b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/tests/fixtures.ts @@ -0,0 +1,282 @@ +import { IBundle } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IBundle'; + +/* eslint-disable no-template-curly-in-string */ + +export const practitionerDetailsBundle = { + resourceType: 'Bundle', + id: '993066c6-1fda-4f91-a30f-96ab57573e87', + meta: { + lastUpdated: '2023-10-30T14:30:12.383+00:00', + }, + type: 'searchset', + total: 1, + link: [ + { + relation: 'self', + url: 'https://fhir.labs.smartregister.org/fhir/practitioner-details/_search?keycloak-uuid=9f72c646-dc1e-4f24-98df-6f04373b9ec6', + }, + ], + entry: [ + { + fullUrl: + 'https://fhir.labs.smartregister.org/fhir/practitioner-details/3a801d6e-7bd3-4a5f-bc9c-64758fbb3dad', + resource: { + resourceType: 'practitioner-details', + id: '3a801d6e-7bd3-4a5f-bc9c-64758fbb3dad', + meta: { + profile: ['http://hl7.org/fhir/profiles/custom-resource'], + }, + fhir: { + id: '3a801d6e-7bd3-4a5f-bc9c-64758fbb3dad', + teams: [ + { + resourceType: 'Organization', + id: '0d7ae048-9b84-4f0c-ba37-8d6c0b97dc84', + meta: { + versionId: '1', + lastUpdated: '2023-10-13T09:59:23.717+00:00', + source: '#b7fa59921069f37e', + }, + identifier: [ + { + use: 'official', + value: '7712bfdd-83e3-43cf-b5f0-c8d6a99ed96b', + }, + ], + active: true, + type: [ + { + coding: [ + { + system: 'http://terminology.hl7.org/CodeSystem/organization-type', + code: 'team', + }, + ], + }, + ], + name: 'e2e-corporation', + alias: ['e2e-misty'], + }, + ], + practitionerRoles: [ + { + resourceType: 'PractitionerRole', + id: 'dea42f3c-7bc5-4a19-a398-d89f198558ad', + meta: { + versionId: '21', + lastUpdated: '2023-10-13T09:59:24.990+00:00', + source: '#0f75b3dadea9fe99', + }, + identifier: [ + { + use: 'official', + value: 'dea42f3c-7bc5-4a19-a398-d89f198558ad', + }, + { + use: 'secondary', + value: '9f72c646-dc1e-4f24-98df-6f04373b9ec6', + }, + ], + active: true, + practitioner: { + reference: 'Practitioner/3a801d6e-7bd3-4a5f-bc9c-64758fbb3dad', + display: 'test1147 1147', + }, + organization: { + reference: 'Organization/0d7ae048-9b84-4f0c-ba37-8d6c0b97dc84', + display: 'e2e-corporation', + }, + code: [ + { + coding: [ + { + system: 'http://snomed.info/sct', + code: '405623001', + display: 'Assigned practitioner', + }, + ], + }, + ], + }, + ], + groups: [ + { + resourceType: 'Group', + id: '848abc05-33ea-45f7-b909-b3ce465c67da', + meta: { + versionId: '3', + lastUpdated: '2023-08-29T09:21:06.420+00:00', + source: '#046812ad18d6a6c3', + }, + identifier: [ + { + use: 'official', + value: '848abc05-33ea-45f7-b909-b3ce465c67da', + }, + { + use: 'secondary', + value: '9f72c646-dc1e-4f24-98df-6f04373b9ec6', + }, + ], + active: true, + type: 'practitioner', + actual: true, + code: { + coding: [ + { + system: 'http://snomed.info/sct', + code: '405623001', + display: 'Assigned practitioner', + }, + ], + }, + name: 'test1147 1147', + member: [ + { + entity: { + reference: 'Practitioner/3a801d6e-7bd3-4a5f-bc9c-64758fbb3dad', + }, + }, + ], + }, + ], + practitioner: [ + { + resourceType: 'Practitioner', + id: '3a801d6e-7bd3-4a5f-bc9c-64758fbb3dad', + meta: { + versionId: '4', + lastUpdated: '2023-08-29T09:21:05.863+00:00', + source: '#8886a1e2a6059631', + }, + identifier: [ + { + use: 'official', + value: '3a801d6e-7bd3-4a5f-bc9c-64758fbb3dad', + }, + { + use: 'secondary', + value: '9f72c646-dc1e-4f24-98df-6f04373b9ec6', + }, + ], + active: true, + name: [ + { + use: 'official', + family: '1147', + given: ['test1147'], + }, + ], + telecom: [ + { + system: 'email', + value: 'mejay2303@gmail.com', + }, + ], + }, + ], + }, + }, + }, + ], +} as unknown as IBundle; + +export const user1147 = { + id: '9f72c646-dc1e-4f24-98df-6f04373b9ec6', + createdTimestamp: 1675179889477, + username: '1147', + enabled: true, + totp: false, + emailVerified: false, + firstName: 'test1147', + lastName: '1147', + email: 'mejay2303@gmail.com', + attributes: { + fhir_core_app_id: ['ecbis'], + }, + disableableCredentialTypes: [], + requiredActions: [], + notBefore: 1681810919, + access: { + manageGroupMembership: true, + view: true, + mapRoles: true, + impersonate: true, + manage: true, + }, +}; + +export const user1147Groups = [ + { + id: 'b68e2590-c2ee-4b3c-9184-c4b35a69a271', + name: 'SuperUser', + path: '/SuperUser', + }, +]; + +export const user1147Roles = { + realmMappings: [ + { + id: '2637bf64-5b3b-4e63-8849-d5b876c4e661', + name: 'POST_LOCATION', + description: '', + composite: false, + clientRole: false, + containerId: 'a9103f9f-4759-47a3-9c22-c2398f9f5e21', + }, + { + id: '2cf50188-55a6-4143-b293-f009bc25356f', + name: 'GET_LOCATION', + description: '', + composite: false, + clientRole: false, + containerId: 'a9103f9f-4759-47a3-9c22-c2398f9f5e21', + }, + { + id: '674c5a60-9ed6-478f-9836-290945b40def', + name: 'offline_access', + description: '${role_offline-access}', + composite: false, + clientRole: false, + containerId: 'a9103f9f-4759-47a3-9c22-c2398f9f5e21', + }, + ], + clientMappings: { + 'realm-management': { + id: '9d9637dc-d86c-4669-bc0d-6600c22090f7', + client: 'realm-management', + mappings: [ + { + id: '43218a35-baf4-45fd-b926-5923996e9eb7', + name: 'manage-realm', + description: '${role_manage-realm}', + composite: false, + clientRole: true, + containerId: '9d9637dc-d86c-4669-bc0d-6600c22090f7', + }, + { + id: 'bcf4874f-760d-45d4-881e-eda109ecf033', + name: 'manage-users', + description: '${role_manage-users}', + composite: false, + clientRole: true, + containerId: '9d9637dc-d86c-4669-bc0d-6600c22090f7', + }, + ], + }, + account: { + id: '7b3904aa-2394-4940-8981-03262642f047', + client: 'account', + mappings: [ + { + id: 'c0dcef4f-eb0d-49f0-9389-96dc4d7316a2', + name: 'manage-account', + description: '${role_manage-account}', + composite: true, + clientRole: true, + containerId: '7b3904aa-2394-4940-8981-03262642f047', + }, + ], + }, + }, +}; diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/tests/practitionerDetails.test.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/tests/practitionerDetails.test.tsx new file mode 100644 index 000000000..65f5e98e0 --- /dev/null +++ b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/ViewDetailResources/tests/practitionerDetails.test.tsx @@ -0,0 +1,24 @@ +import { PractitionerDetailsView } from '../PractitionerDetails'; +import { render } from '@testing-library/react'; +import { practitionerDetailsBundle } from './fixtures'; +import React from 'react'; +import { getResourcesFromBundle } from '@opensrp/react-utils'; +import { PractitionerDetail } from '../../types'; + +const practitionerDetails = + getResourcesFromBundle(practitionerDetailsBundle)[0].fhir; + +test('renders without crashing', () => { + const props = { + loading: false, + practitionerDetails, + }; + render(); + + const tableRows = document.querySelectorAll('table tr'); + const text = [...tableRows].map((tr) => tr.textContent); + expect(text).toEqual([ + 'IdNameActiveUser TypePractitioner Role Coding', + '3a801d6e-7bd3-4a5f-bc9c-64758fbb3dadtest1147 1147ActivepractitionerAssigned practitioner(http://snomed.info/sct|405623001), ', + ]); +}); diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/index.css b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/index.css new file mode 100644 index 000000000..fc38443d6 --- /dev/null +++ b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/index.css @@ -0,0 +1,24 @@ +.details-full-view { + background: #f5f5f5; +} + +.details-full-view .site-page-header { + padding: 24px; + background: #fff; +} + +.details-full-view .content-body { + margin: 24px; + display: flex; + gap: 16px; + flex-direction: column; +} + +.details-full-view .content-box { + background-color: #fff; +} + +.details-full-view .details-tab { + background: #fff; + padding: 16px; +} 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 new file mode 100644 index 000000000..b232a35fc --- /dev/null +++ b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/index.tsx @@ -0,0 +1,268 @@ +import React from 'react'; +import { Alert, Breadcrumb, Button, Descriptions, Divider, Tabs, Tag } from 'antd'; +import { Spin } from 'antd'; +import { useTranslation } from '../../../mls'; +import { useHistory, useParams } from 'react-router'; +import { + BrokenPage, + FHIRServiceClass, + Resource404, + getResourcesFromBundle, +} from '@opensrp/react-utils'; +import { PageHeader } from '@ant-design/pro-layout'; +import { + KEYCLOAK_URL_USERS, + KeycloakUser, + URL_USER, + URL_USER_EDIT, +} from '@opensrp/user-management'; +import { KeycloakService } from '@opensrp/keycloak-service'; +import { useQuery } from 'react-query'; +import { IBundle } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IBundle'; +import { KeycloakGroupDetails } from './ViewDetailResources/GroupDetailView'; +import { PractitionerDetailsView } from './ViewDetailResources/PractitionerDetails'; +import { CareTeamDetailsView } from './ViewDetailResources/CareTeamDetails'; +import { OrganizationDetailsView } from './ViewDetailResources/OrganizationDetailsView'; +import { PractitionerDetail } from './types'; +import { Link } from 'react-router-dom'; +import { practitionerDetailsResourceType } from '../../../constants'; +import './index.css'; +import { UserDeleteBtn } from '../../UserDeleteBtn'; +import { KeycloakRoleDetails } from './ViewDetailResources/RoleDetailView'; +import { RbacCheck } from '@opensrp/rbac'; + +// remove onclose from type and export the rest +interface UserDetailProps { + fhirBaseURL: string; + keycloakBaseURL: string; +} + +export const UserDetails = (props: UserDetailProps) => { + const { keycloakBaseURL: keycloakBaseUrl, fhirBaseURL: fhirBaseUrl } = props; + const params = useParams<{ id: string }>(); + const { id: resourceId } = params; + const { t } = useTranslation(); + const history = useHistory(); + + const userDeleteAfterAction = () => { + history.push(URL_USER); + }; + + const { + data: user, + isLoading: userIsLoading, + error: userError, + } = useQuery([KEYCLOAK_URL_USERS, resourceId], () => + new KeycloakService(`${KEYCLOAK_URL_USERS}`, keycloakBaseUrl).read(resourceId) + ); + + const extraQueryFilters = { + 'keycloak-uuid': resourceId, + }; + + const { + data: practitionerDetails, + isLoading: detailsLoading, + error: detailsError, + } = useQuery( + [practitionerDetailsResourceType, resourceId], + () => + new FHIRServiceClass(fhirBaseUrl, practitionerDetailsResourceType).list( + extraQueryFilters + ), + { + select: (res) => { + // invariant : expect practitioner-details will always ever be a single record per keycloak user. + return getResourcesFromBundle(res)[0]; + }, + } + ); + const practDetailsByResName: PractitionerDetail['fhir'] = practitionerDetails?.fhir ?? {}; + + if (userIsLoading) { + return ; + } + + if (userError && !user) { + return ( + + ); + } + + if (user === undefined) { + return ; + } + + const { id, firstName, lastName, username, email, emailVerified, enabled, attributes } = user; + const userDetails = { + [t('Id')]: id, + [t('First Name')]: firstName, + [t('Last Name')]: lastName, + [t('Username')]: username, + [t('Email')]: email, + [t('Verified')]: emailVerified ? t('True') : t('False'), + }; + const attributesArray = Object.entries(attributes ?? {}); + + return ( +
+ history.goBack()} + title={t('View details')} + breadcrumbRender={() => } + subTitle={user.username} + /> +
+
+ {t('Enabled')} + ) : ( + {t('Disabled')} + ) + } + extra={[ + + + , + + + , + ]} + > + + {Object.entries(userDetails).map(([key, value]) => { + return ( + + {value} + + ); + })} + + Attributes + {attributesArray.length === 0 ? ( + + ) : ( + + {attributesArray.map(([key, value]) => { + return ( + + {JSON.stringify(value)} + + ); + })} + + )} + +
+ +
+ + ), + }, + { + label: t('User roles'), + key: 'Roles', + children: ( + + ), + }, + { + label: t('Practitioners'), + key: 'Practitioners', + children: ( + + ), + }, + { + label: t('CareTeams'), + key: 'CareTeams', + children: ( + + ), + }, + { + label: t('Organizations'), + key: 'Organizations', + children: ( + + ), + }, + ]} + /> +
+ +
+
+ ); +}; + +const UserProfileBreadCrumb = () => { + const { t } = useTranslation(); + const breadCrumbItems = [ + { + title: t('Users'), + path: URL_USER, + }, + { + title: t('View details'), + }, + ]; + + return ( + { + const last = items.indexOf(route) === items.length - 1; + return last ? ( + {route.title} + ) : ( + {route.title} + ); + }} + > + ); +}; diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/tests/index.test.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/tests/index.test.tsx new file mode 100644 index 000000000..8d5f7469d --- /dev/null +++ b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/tests/index.test.tsx @@ -0,0 +1,310 @@ +import { UserDetails } from '../'; +import { + cleanup, + fireEvent, + render, + screen, + waitFor, + waitForElementToBeRemoved, +} from '@testing-library/react'; +import nock from 'nock'; +import { QueryClient, QueryClientProvider } from 'react-query'; +import { authenticateUser } from '@onaio/session-reducer'; +import { RoleContext } from '@opensrp/rbac'; +import { superUserRole } from '@opensrp/react-utils'; +import { store } from '@opensrp/store'; +import { URL_USER, KEYCLOAK_URL_USERS, KEYCLOAK_URL_USER_GROUPS } from '@opensrp/user-management'; +import React from 'react'; +import { Provider } from 'react-redux'; +import { Switch, Route, Router } from 'react-router'; +import { createMemoryHistory } from 'history'; +import { + keycloakRoleMappingsEndpoint, + practitionerDetailsResourceType, +} from '../../../../constants'; +import { + practitionerDetailsBundle, + user1147, + user1147Groups, + user1147Roles, +} from '../ViewDetailResources/tests/fixtures'; +import * as notifications from '@opensrp/notifications'; + +/* eslint-disable no-template-curly-in-string */ + +jest.mock('@opensrp/notifications', () => ({ + __esModule: true, + ...Object.assign({}, jest.requireActual('@opensrp/notifications')), +})); + +// eslint-disable-next-line @typescript-eslint/no-var-requires +const fetch = require('node-fetch'); +global.fetch = fetch; + +jest.mock('fhirclient', () => { + return jest.requireActual('fhirclient/lib/entry/browser'); +}); + +nock.disableNetConnect(); + +const queryClient = new QueryClient({ + defaultOptions: { + queries: { + retry: false, + cacheTime: 0, + }, + }, +}); + +const props = { + fhirBaseURL: 'http://test.server.org', + keycloakBaseURL: 'http://test-keycloak.server.org', +}; + +// eslint-disable-next-line @typescript-eslint/no-explicit-any +const AppWrapper = (props: any) => { + return ( + + + + + + {(routeProps) => } + + + + + + ); +}; + +beforeAll(() => { + store.dispatch( + authenticateUser( + true, + { + email: 'bob@example.com', + name: 'Bobbie', + username: 'RobertBaratheon', + }, + { + api_token: 'hunter2', + oAuth2Data: { + access_token: 'sometoken', + state: 'abcde', + }, + user_id: 'userFixtures[0].id', + } + ) + ); +}); + +afterEach(() => { + nock.cleanAll(); + cleanup(); +}); + +afterAll(() => { + nock.enableNetConnect(); +}); + +/*** + * End of setup. + */ +const userId = 'userId'; +test('Renders without crashing', async () => { + const history = createMemoryHistory(); + history.push(`${URL_USER}/${userId}`); + + const successMock = jest + .spyOn(notifications, 'sendSuccessNotification') + .mockImplementation(() => { + return; + }); + + nock(props.fhirBaseURL) + .get(`/${practitionerDetailsResourceType}/_search`) + .query({ 'keycloak-uuid': userId }) + .reply(200, practitionerDetailsBundle); + + nock(props.keycloakBaseURL).get(`${KEYCLOAK_URL_USERS}/${userId}`).reply(200, user1147); + + nock(props.keycloakBaseURL) + .get(`${KEYCLOAK_URL_USERS}/${userId}${KEYCLOAK_URL_USER_GROUPS}`) + .reply(200, user1147Groups); + + render( + + + + ); + + // this only await the first call to get the users. + await waitForElementToBeRemoved(document.querySelector('.ant-spin')); + + expect(screen.queryByTitle(/View details/i)).toBeInTheDocument(); + + // second page header details. + 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"]' + ); + + // have a look at the tabs + + // start with group + const groupTab = screen.getByText('User groups'); + fireEvent.click(groupTab); + + await waitForElementToBeRemoved(document.querySelector('.ant-spin')); + + // check table has correct number of rows. and try removing user from one group + let detailsTabSection = document.querySelector('.details-tab'); + const groupsTable = detailsTabSection?.querySelector('table'); + + const tableData = [...(groupsTable?.querySelectorAll('tr') ?? [])].map((tr) => tr.textContent); + expect(tableData).toEqual(['NamePathActions', 'SuperUser/SuperUserLeave']); + + const leaveBtn = screen.getByText('Leave'); + expect(leaveBtn).toMatchInlineSnapshot(` + + Leave + + `); + + nock(props.keycloakBaseURL) + .delete(`${KEYCLOAK_URL_USERS}/${userId}${KEYCLOAK_URL_USER_GROUPS}/${user1147Groups[0].id}`) + .reply(200, user1147Groups); + + fireEvent.click(leaveBtn); + + await waitFor(() => { + expect(successMock).toHaveBeenCalledWith( + 'User has been successfully removed from the keycloak group' + ); + }); + + // go to practitioners + const practTab = screen.getByText('Practitioners'); + fireEvent.click(practTab); + + // Check that practitioner-details has finished loading. + await waitFor(() => { + expect(screen.getByText('3a801d6e-7bd3-4a5f-bc9c-64758fbb3dad')).toBeInTheDocument(); + }); + + // practitioner records + detailsTabSection = document.querySelector('div.ant-tabs-tabpane-active'); + const practitionerTable = detailsTabSection?.querySelector('table'); + + const practitionerData = [...(practitionerTable?.querySelectorAll('tr') ?? [])].map( + (tr) => tr.textContent + ); + expect(practitionerData).toEqual([ + 'IdNameActiveUser TypePractitioner Role Coding', + '3a801d6e-7bd3-4a5f-bc9c-64758fbb3dadtest1147 1147ActivepractitionerAssigned practitioner(http://snomed.info/sct|405623001), ', + ]); + + // go to roles + nock(props.keycloakBaseURL) + .get(`${KEYCLOAK_URL_USERS}/${userId}/${keycloakRoleMappingsEndpoint}`) + .reply(200, user1147Roles); + + const rolesTab = screen.getByText('User roles'); + fireEvent.click(rolesTab); + + // Check that practitioner-details has finished loading. + await waitFor(() => { + expect(screen.getByText('GET_LOCATION')).toBeInTheDocument(); + }); + + // practitioner records + detailsTabSection = document.querySelector('div.ant-tabs-tabpane-active'); + const realmRolesTable = detailsTabSection?.querySelectorAll('table')[0]; + const clientRolesTable = detailsTabSection?.querySelectorAll('table')[1]; + const realmRolesData = [...(realmRolesTable?.querySelectorAll('tr') ?? [])].map( + (tr) => tr.textContent + ); + const clientRolesData = [...(clientRolesTable?.querySelectorAll('tr') ?? [])].map( + (tr) => tr.textContent + ); + expect(realmRolesData).toEqual([ + 'NameDescription', + 'POST_LOCATION', + 'GET_LOCATION', + 'offline_access${role_offline-access}', + ]); + + expect(clientRolesData).toEqual([ + 'ClientNameDescription', + 'realm-managementmanage-realm${role_manage-realm}', + 'realm-managementmanage-users${role_manage-users}', + 'accountmanage-account${role_manage-account}', + ]); + + // go to careTeams + const careTeamsTab = screen.getByText('CareTeams'); + fireEvent.click(careTeamsTab); + + // practitioner records + detailsTabSection = document.querySelector('div.ant-tabs-tabpane-active'); + const careTeamsTable = detailsTabSection?.querySelector('table'); + + const careTeamsData = [...(careTeamsTable?.querySelectorAll('tr') ?? [])].map( + (tr) => tr.textContent + ); + expect(careTeamsData).toEqual(['IdNameStatusCategory', 'No data']); + + // go to organization + const organizationsTab = screen.getByText('Organizations'); + fireEvent.click(organizationsTab); + + // practitioner records + detailsTabSection = document.querySelector('div.ant-tabs-tabpane-active'); + const organizationsTable = detailsTabSection?.querySelector('table'); + + const organizationsData = [...(organizationsTable?.querySelectorAll('tr') ?? [])].map( + (tr) => tr.textContent + ); + expect(organizationsData).toEqual([ + 'IdNameActiveType', + '0d7ae048-9b84-4f0c-ba37-8d6c0b97dc84e2e-corporationActive(http://terminology.hl7.org/CodeSystem/organization-type|team), ', + ]); +}); + +test('Edit button works correctly', async () => { + const history = createMemoryHistory(); + history.push(`${URL_USER}/${userId}`); + + jest.spyOn(notifications, 'sendSuccessNotification').mockImplementation(() => { + return; + }); + + nock(props.fhirBaseURL) + .get(`/${practitionerDetailsResourceType}/_search`) + .query({ 'keycloak-uuid': userId }) + .reply(200, practitionerDetailsBundle); + + nock(props.keycloakBaseURL).get(`${KEYCLOAK_URL_USERS}/${userId}`).reply(200, user1147); + + nock(props.keycloakBaseURL) + .get(`${KEYCLOAK_URL_USERS}/${userId}${KEYCLOAK_URL_USER_GROUPS}`) + .reply(200, user1147Groups); + + render( + + + + ); + + // this only await the first call to get the users. + await waitForElementToBeRemoved(document.querySelector('.ant-spin')); + + expect(screen.queryByTitle(/View details/i)).toBeInTheDocument(); + + const editBtn = screen.getByRole('button', { name: 'Edit' }); + fireEvent.click(editBtn); + + expect(history.location.pathname).toEqual('/admin/users/edit/userId'); +}); diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/types.ts b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/types.ts new file mode 100644 index 000000000..a49d8ceb3 --- /dev/null +++ b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/types.ts @@ -0,0 +1,49 @@ +import { IPractitionerRole } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IPractitionerRole'; +import { IPractitioner } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IPractitioner'; +import { Resource } from '@smile-cdr/fhirts/dist/FHIR-R4/classes/resource'; +import { ICareTeam } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/ICareTeam'; +import { IOrganization } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IOrganization'; +import { IGroup } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IGroup'; +import { LocationHierarchyResource } from '@opensrp/fhir-location-management'; + +export interface PractitionerDetail extends Resource { + fhir: { + careteams?: ICareTeam[]; + teams?: IOrganization[]; + locationHierarchyList?: LocationHierarchyResource[]; + practitionerRoles?: IPractitionerRole[]; + groups?: IGroup[]; + practitioner?: IPractitioner[]; + }; +} + +export interface RoleMapping { + id: string; + name: string; + description: string; + composite: boolean; + clientRole: boolean; + containerId: string; +} + +export interface ClientRoleMapping { + id: string; + client: string; + mappings: RoleMapping[]; +} + +export interface KeycloakUserRoleMappings { + realmMappings?: RoleMapping[]; + clientMappings?: Record; +} + +export interface PractitionerDetail extends Resource { + fhir: { + careteams?: ICareTeam[]; + teams?: IOrganization[]; + locationHierarchyList?: LocationHierarchyResource[]; + practitionerRoles?: IPractitionerRole[]; + groups?: IGroup[]; + practitioner?: IPractitioner[]; + }; +} diff --git a/packages/fhir-keycloak-user-management/src/constants.ts b/packages/fhir-keycloak-user-management/src/constants.ts index 899adc30d..f9c1abfc0 100644 --- a/packages/fhir-keycloak-user-management/src/constants.ts +++ b/packages/fhir-keycloak-user-management/src/constants.ts @@ -1,8 +1,17 @@ +import { URL_USER } from '@opensrp/user-management'; + export const practitionerResourceType = 'Practitioner'; export const careTeamResourceType = 'CareTeam'; export const organizationResourceType = 'Organization'; export const groupResourceType = 'Group'; export const practitionerRoleResourceType = 'PractitionerRole'; +export const keycloakRoleMappingsEndpoint = 'role-mappings'; +export const practitionerDetailsResourceType = 'PractitionerDetail'; // keycloak endpoints strings export const keycloakCountEndpoint = 'count'; +export const keycloakGroupEndpoint = 'groups'; +export const keycloakMembersEndpoint = 'members'; + +// router urls +export const USER_DETAILS_URL = `${URL_USER}/details`; diff --git a/packages/fhir-keycloak-user-management/src/index.tsx b/packages/fhir-keycloak-user-management/src/index.tsx index 5c893c25f..0db49d2fd 100644 --- a/packages/fhir-keycloak-user-management/src/index.tsx +++ b/packages/fhir-keycloak-user-management/src/index.tsx @@ -1,3 +1,5 @@ +import { UserDetails as UserDetailsV2 } from './components/UserList/Viewdetails'; export * from './components/CreateEditUser'; export * from './components/UserList/ListView'; export * from './constants'; +export { UserDetailsV2 }; diff --git a/packages/fhir-location-management/src/components/LocationUnitList/LocationUnitList.css b/packages/fhir-location-management/src/components/LocationUnitList/LocationUnitList.css index 5390eb54a..0008f68e8 100644 --- a/packages/fhir-location-management/src/components/LocationUnitList/LocationUnitList.css +++ b/packages/fhir-location-management/src/components/LocationUnitList/LocationUnitList.css @@ -21,7 +21,3 @@ font-size: 18px; border-left-color: #e9e9e9; } - -table tr:nth-child(2n) td { - background-color: #f4f4f4; -} diff --git a/packages/rbac/src/constants.ts b/packages/rbac/src/constants.ts index c0f6ff7a6..22b91e3de 100644 --- a/packages/rbac/src/constants.ts +++ b/packages/rbac/src/constants.ts @@ -33,6 +33,7 @@ export const FhirResources = [ 'CareTeam', 'PlanDefinition', 'Questionnaire', + 'PractitionerDetail', ] as const; export type FhirResource = typeof FhirResources[number]; diff --git a/packages/react-utils/src/components/fhirDataTypes/CodeableConcept/index.tsx b/packages/react-utils/src/components/fhirDataTypes/CodeableConcept/index.tsx new file mode 100644 index 000000000..8c2b6bf45 --- /dev/null +++ b/packages/react-utils/src/components/fhirDataTypes/CodeableConcept/index.tsx @@ -0,0 +1,31 @@ +import { CodeableConcept as TCodeableConcept } from '@smile-cdr/fhirts/dist/FHIR-R4/classes/codeableConcept'; +import { Tooltip } from 'antd'; +import { Coding } from '../Coding'; +import { Typography } from 'antd'; +import React from 'react'; + +const { Text } = Typography; + +export interface CodeableConceptProps { + concept: TCodeableConcept; +} + +export const CodeableConcept = (props: CodeableConceptProps) => { + const { concept } = props; + const { coding, text } = concept; + + const codingsTitle = ( + <> + {(coding ?? []).map((coding, index) => ( + <> + ,{' '} + + ))} + + ); + return ( + + {text ? {text} : codingsTitle} + + ); +}; diff --git a/packages/react-utils/src/components/fhirDataTypes/Coding/index.tsx b/packages/react-utils/src/components/fhirDataTypes/Coding/index.tsx new file mode 100644 index 000000000..9c5352f18 --- /dev/null +++ b/packages/react-utils/src/components/fhirDataTypes/Coding/index.tsx @@ -0,0 +1,22 @@ +import { Coding as TCoding } from '@smile-cdr/fhirts/dist/FHIR-R4/classes/coding'; +import { Typography } from 'antd'; +import React from 'react'; + +const { Text } = Typography; + +export interface CodingProps { + coding: TCoding; +} + +export const Coding = (props: CodingProps) => { + const { display, system, code } = props.coding; + let valueStr = ''; + + if (display) { + valueStr += display; + } + if (system) { + valueStr += `(${system}|${code ? code : ''})`; + } + return {valueStr}; +}; diff --git a/packages/react-utils/src/components/fhirDataTypes/index.ts b/packages/react-utils/src/components/fhirDataTypes/index.ts new file mode 100644 index 000000000..ed75eebaa --- /dev/null +++ b/packages/react-utils/src/components/fhirDataTypes/index.ts @@ -0,0 +1,2 @@ +export * from './CodeableConcept'; +export * from './Coding'; diff --git a/packages/react-utils/src/index.tsx b/packages/react-utils/src/index.tsx index 4c42cba8a..e2b73c8c3 100644 --- a/packages/react-utils/src/index.tsx +++ b/packages/react-utils/src/index.tsx @@ -21,3 +21,4 @@ export * from './components/PageHeader'; export * from './components/ButtonLink'; export * from './helpers/test-utils'; export * from './components/PrivateRoute'; +export * from './components/fhirDataTypes'; diff --git a/yarn.lock b/yarn.lock index c5ed562e8..d2f4d49a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -45,6 +45,24 @@ __metadata: languageName: node linkType: hard +"@ant-design/cssinjs@npm:^1.11.1": + version: 1.18.4 + resolution: "@ant-design/cssinjs@npm:1.18.4" + dependencies: + "@babel/runtime": ^7.11.1 + "@emotion/hash": ^0.8.0 + "@emotion/unitless": ^0.7.5 + classnames: ^2.3.1 + csstype: ^3.1.3 + rc-util: ^5.35.0 + stylis: ^4.0.13 + peerDependencies: + react: ">=16.0.0" + react-dom: ">=16.0.0" + checksum: c6028097929a9948d1e9d5441aeab51ff824edacf98976fb06c146397c7cc9b2fc3f88765a0d93345b1fbbf6b766f638260652d5637fcbf6e6bbafe4e79e60bd + languageName: node + linkType: hard + "@ant-design/cssinjs@npm:^1.9.1": version: 1.9.1 resolution: "@ant-design/cssinjs@npm:1.9.1" @@ -70,6 +88,13 @@ __metadata: languageName: node linkType: hard +"@ant-design/icons-svg@npm:^4.3.0": + version: 4.3.1 + resolution: "@ant-design/icons-svg@npm:4.3.1" + checksum: 47f0474277366fb3b8bacfeb1691be35052c3f9b28811be7fb25ad219100533d0e31c2eec00a8dee744c34381a4cda7f39b39403e160811a8fd5d33b861e77aa + languageName: node + linkType: hard + "@ant-design/icons@npm:^4.0.0": version: 4.7.0 resolution: "@ant-design/icons@npm:4.7.0" @@ -102,6 +127,22 @@ __metadata: languageName: node linkType: hard +"@ant-design/icons@npm:^5.0.0": + version: 5.2.6 + resolution: "@ant-design/icons@npm:5.2.6" + dependencies: + "@ant-design/colors": ^7.0.0 + "@ant-design/icons-svg": ^4.3.0 + "@babel/runtime": ^7.11.2 + classnames: ^2.2.6 + rc-util: ^5.31.1 + peerDependencies: + react: ">=16.0.0" + react-dom: ">=16.0.0" + checksum: 2f571699b1903383cd09faa78e4cce34973debb0e7ec6223b9d9a0a6ab2b2f0c876072db62bbd4e6a45e864df5447343315e066abeffaf58aa5b97df3acc89f1 + languageName: node + linkType: hard + "@ant-design/icons@npm:^5.1.0": version: 5.1.4 resolution: "@ant-design/icons@npm:5.1.4" @@ -118,6 +159,247 @@ __metadata: languageName: node linkType: hard +"@ant-design/pro-card@npm:2.5.29": + version: 2.5.29 + resolution: "@ant-design/pro-card@npm:2.5.29" + dependencies: + "@ant-design/icons": ^5.0.0 + "@ant-design/pro-provider": 2.13.5 + "@ant-design/pro-utils": 2.15.4 + "@babel/runtime": ^7.18.0 + classnames: ^2.3.2 + omit.js: ^2.0.2 + rc-resize-observer: ^1.0.0 + rc-util: ^5.4.0 + peerDependencies: + antd: ^4.24.15 || ^5.11.2 + react: ">=17.0.0" + checksum: 23931bb51a3635640dd1cbcfc4f7ae745834115451d7d013a34c0161363c0560ca5a887b73049c6345c0b54645eb8bdabf53833f75d165dac5b90b845c601764 + languageName: node + linkType: hard + +"@ant-design/pro-components@npm:^2.6.32": + version: 2.6.48 + resolution: "@ant-design/pro-components@npm:2.6.48" + dependencies: + "@ant-design/pro-card": 2.5.29 + "@ant-design/pro-descriptions": 2.5.32 + "@ant-design/pro-field": 2.14.5 + "@ant-design/pro-form": 2.24.3 + "@ant-design/pro-layout": 7.17.19 + "@ant-design/pro-list": 2.5.47 + "@ant-design/pro-provider": 2.13.5 + "@ant-design/pro-skeleton": 2.1.10 + "@ant-design/pro-table": 3.14.1 + "@ant-design/pro-utils": 2.15.4 + "@babel/runtime": ^7.16.3 + peerDependencies: + antd: ^4.24.15 || ^5.11.2 + react: ">=17.0.0" + react-dom: ">=17.0.0" + checksum: aa7f5c4a10339acc44e13148adb480b6ed185d1aa67e7b7cd6ccf30885da0361035c02e962124f157bdc0c406eef93959b090da573bfc2b9b7aa434f261633e5 + languageName: node + linkType: hard + +"@ant-design/pro-descriptions@npm:2.5.32": + version: 2.5.32 + resolution: "@ant-design/pro-descriptions@npm:2.5.32" + dependencies: + "@ant-design/pro-field": 2.14.5 + "@ant-design/pro-form": 2.24.3 + "@ant-design/pro-skeleton": 2.1.10 + "@ant-design/pro-utils": 2.15.4 + "@babel/runtime": ^7.18.0 + rc-resize-observer: ^0.2.3 + rc-util: ^5.0.6 + peerDependencies: + antd: ^4.24.15 || ^5.11.2 + react: ">=17.0.0" + checksum: 8ba73018a7428bb95664405a7eef9f0284a4071606e97b89840b1f9bdbeb18d03aea16349dd41bf46f0ee2c0bc437df66a39fba334c205a48b51b46a7266f4e2 + languageName: node + linkType: hard + +"@ant-design/pro-field@npm:2.14.5": + version: 2.14.5 + resolution: "@ant-design/pro-field@npm:2.14.5" + dependencies: + "@ant-design/icons": ^5.0.0 + "@ant-design/pro-provider": 2.13.5 + "@ant-design/pro-utils": 2.15.4 + "@babel/runtime": ^7.18.0 + "@chenshuai2144/sketch-color": ^1.0.8 + classnames: ^2.3.2 + dayjs: ^1.11.10 + lodash.tonumber: ^4.0.3 + omit.js: ^2.0.2 + rc-util: ^5.4.0 + swr: ^2.0.0 + peerDependencies: + antd: ^4.24.15 || ^5.11.2 + react: ">=17.0.0" + checksum: 7fa505911dea5d5a81074be9feeae5db9639ba1ccc87d72273f0739a44e779da6e866ec2484025e1e0a242dc17f80186ecea4e9afc863e3319b8e8bf08817096 + languageName: node + linkType: hard + +"@ant-design/pro-form@npm:2.24.3": + version: 2.24.3 + resolution: "@ant-design/pro-form@npm:2.24.3" + dependencies: + "@ant-design/icons": ^5.0.0 + "@ant-design/pro-field": 2.14.5 + "@ant-design/pro-provider": 2.13.5 + "@ant-design/pro-utils": 2.15.4 + "@babel/runtime": ^7.18.0 + "@chenshuai2144/sketch-color": ^1.0.7 + "@umijs/use-params": ^1.0.9 + classnames: ^2.3.2 + dayjs: ^1.11.10 + lodash.merge: ^4.6.2 + omit.js: ^2.0.2 + rc-resize-observer: ^1.1.0 + rc-util: ^5.0.6 + peerDependencies: + "@types/lodash.merge": ^4.6.7 + antd: ^4.24.15 || ^5.11.2 + rc-field-form: ^1.22.0 + react: ">=17.0.0" + react-dom: ">=17.0.0" + peerDependenciesMeta: + "@types/lodash.merge": + optional: true + checksum: 6c48404ca267c286c5bbfdb9c96eb26ab33617370f9ee5973544487e21aa861cd14b2f7a506daa183f44613fdd7eadd1c88827f1bd3aa89c90c2b627263d84e5 + languageName: node + linkType: hard + +"@ant-design/pro-layout@npm:7.17.19": + version: 7.17.19 + resolution: "@ant-design/pro-layout@npm:7.17.19" + dependencies: + "@ant-design/icons": ^5.0.0 + "@ant-design/pro-provider": 2.13.5 + "@ant-design/pro-utils": 2.15.4 + "@babel/runtime": ^7.18.0 + "@umijs/route-utils": ^4.0.0 + "@umijs/use-params": ^1.0.9 + classnames: ^2.3.2 + lodash.merge: ^4.6.2 + omit.js: ^2.0.2 + path-to-regexp: 2.4.0 + rc-resize-observer: ^1.1.0 + rc-util: ^5.0.6 + swr: ^2.0.0 + warning: ^4.0.3 + peerDependencies: + antd: ^4.24.15 || ^5.11.2 + react: ">=17.0.0" + react-dom: ">=17.0.0" + checksum: 6cfb01a99f630f2d73030afc79c24c6321492298416725fa06329a7eed28bc459040ae3d63f5a77b31393f105e540c525426a9489d6e445d7c244e938e1a195a + languageName: node + linkType: hard + +"@ant-design/pro-list@npm:2.5.47": + version: 2.5.47 + resolution: "@ant-design/pro-list@npm:2.5.47" + dependencies: + "@ant-design/icons": ^5.0.0 + "@ant-design/pro-card": 2.5.29 + "@ant-design/pro-field": 2.14.5 + "@ant-design/pro-table": 3.14.1 + "@ant-design/pro-utils": 2.15.4 + "@babel/runtime": ^7.18.0 + classnames: ^2.3.2 + dayjs: ^1.11.10 + rc-resize-observer: ^1.0.0 + rc-util: ^4.19.0 + peerDependencies: + antd: ^4.24.15 || ^5.11.2 + react: ">=17.0.0" + react-dom: ">=17.0.0" + checksum: 65b313ef0b7b8438ad2867a39af58fa4daf32b23742310f40db5f2b1acfe4063a710056caa026e9daf87a3e9e3836d4db5c24de7e594d5aeee58818f647c1669 + languageName: node + linkType: hard + +"@ant-design/pro-provider@npm:2.13.5": + version: 2.13.5 + resolution: "@ant-design/pro-provider@npm:2.13.5" + dependencies: + "@ant-design/cssinjs": ^1.11.1 + "@babel/runtime": ^7.18.0 + "@ctrl/tinycolor": ^3.4.0 + rc-util: ^5.0.1 + swr: ^2.0.0 + peerDependencies: + antd: ^4.24.15 || ^5.11.2 + react: ">=17.0.0" + react-dom: ">=17.0.0" + checksum: 533207977b954f440eac9cdad5019292547d934bd3b5051cc09440853945f2781029dd4a0ec1906af3758f64f081d6d81ce44c4b76cb22c7e037acff5d53fe88 + languageName: node + linkType: hard + +"@ant-design/pro-skeleton@npm:2.1.10": + version: 2.1.10 + resolution: "@ant-design/pro-skeleton@npm:2.1.10" + dependencies: + "@babel/runtime": ^7.18.0 + peerDependencies: + antd: ^4.24.15 || ^5.11.2 + react: ">=17.0.0" + react-dom: ">=17.0.0" + checksum: 4f57286e64e1a049f1cf7294da2c6f29000f1aa2a339e3f07e451e89dbdf82909a6a2a689abf432399b6bec595a3f5b9754021397ffaae4491d803af773cfe95 + languageName: node + linkType: hard + +"@ant-design/pro-table@npm:3.14.1": + version: 3.14.1 + resolution: "@ant-design/pro-table@npm:3.14.1" + dependencies: + "@ant-design/icons": ^5.0.0 + "@ant-design/pro-card": 2.5.29 + "@ant-design/pro-field": 2.14.5 + "@ant-design/pro-form": 2.24.3 + "@ant-design/pro-provider": 2.13.5 + "@ant-design/pro-utils": 2.15.4 + "@babel/runtime": ^7.18.0 + "@dnd-kit/core": ^6.0.8 + "@dnd-kit/modifiers": ^6.0.1 + "@dnd-kit/sortable": ^7.0.2 + "@dnd-kit/utilities": ^3.2.1 + classnames: ^2.3.2 + dayjs: ^1.11.10 + lodash.merge: ^4.6.2 + omit.js: ^2.0.2 + rc-resize-observer: ^1.0.0 + rc-util: ^5.0.1 + peerDependencies: + antd: ^4.24.15 || ^5.11.2 + rc-field-form: ^1.22.0 + react: ">=17.0.0" + react-dom: ">=17.0.0" + checksum: 639df8e94f5b1adad24a588ecdd7b1796f205cd3783d91ef0bf5e8d454a495b223e09c06d5cb1be15df482ac3c39f80a4dc2a8fab929fdfb4f4a55b2093b6182 + languageName: node + linkType: hard + +"@ant-design/pro-utils@npm:2.15.4": + version: 2.15.4 + resolution: "@ant-design/pro-utils@npm:2.15.4" + dependencies: + "@ant-design/icons": ^5.0.0 + "@ant-design/pro-provider": 2.13.5 + "@babel/runtime": ^7.18.0 + classnames: ^2.3.2 + dayjs: ^1.11.10 + lodash.merge: ^4.6.2 + rc-util: ^5.0.6 + safe-stable-stringify: ^2.4.3 + swr: ^2.0.0 + peerDependencies: + antd: ^4.24.15 || ^5.11.2 + react: ">=17.0.0" + react-dom: ">=17.0.0" + checksum: 5cce8d9522aa270eafc1c7f83a02b7ff9d2615188318cfe00952c5505dfb5a5de191efacad13518b9a1b1c97c8c864f712413b38aae79e7e14c913ef24e8ffb4 + languageName: node + linkType: hard + "@ant-design/react-slick@npm:~1.0.0": version: 1.0.1 resolution: "@ant-design/react-slick@npm:1.0.1" @@ -2021,6 +2303,18 @@ __metadata: languageName: node linkType: hard +"@chenshuai2144/sketch-color@npm:^1.0.7, @chenshuai2144/sketch-color@npm:^1.0.8": + version: 1.0.9 + resolution: "@chenshuai2144/sketch-color@npm:1.0.9" + dependencies: + reactcss: ^1.2.3 + tinycolor2: ^1.4.2 + peerDependencies: + react: ">=16.12.0" + checksum: 7337f9a24abc7630f2b839b1cce875ff07061b8b568d0d72c9528db9dc3c0ec7db78242b20180b419c60ecb2766533487d7cd77000f0e24dc7d049f8bc86db50 + languageName: node + linkType: hard + "@cnakazawa/watch@npm:^1.0.3": version: 1.0.4 resolution: "@cnakazawa/watch@npm:1.0.4" @@ -2159,6 +2453,68 @@ __metadata: languageName: node linkType: hard +"@dnd-kit/accessibility@npm:^3.1.0": + version: 3.1.0 + resolution: "@dnd-kit/accessibility@npm:3.1.0" + dependencies: + tslib: ^2.0.0 + peerDependencies: + react: ">=16.8.0" + checksum: fcb88c961e2f4c226ab575bc4a13712419884bb0f60761befcaa23bcb6c9939dc2cac6633416f2a07baee9a8830350c6df444039332408cdaaf27cad17c6b64b + languageName: node + linkType: hard + +"@dnd-kit/core@npm:^6.0.8": + version: 6.1.0 + resolution: "@dnd-kit/core@npm:6.1.0" + dependencies: + "@dnd-kit/accessibility": ^3.1.0 + "@dnd-kit/utilities": ^3.2.2 + tslib: ^2.0.0 + peerDependencies: + react: ">=16.8.0" + react-dom: ">=16.8.0" + checksum: 3b8f46d2f4d2723abad4721c7bc4d1df2c4f6f26ce54673243666212cfa6f34f33e3255b53144a847da469dc736c966c19e4c45330f967ce8c01f8f878ec7f5b + languageName: node + linkType: hard + +"@dnd-kit/modifiers@npm:^6.0.1": + version: 6.0.1 + resolution: "@dnd-kit/modifiers@npm:6.0.1" + dependencies: + "@dnd-kit/utilities": ^3.2.1 + tslib: ^2.0.0 + peerDependencies: + "@dnd-kit/core": ^6.0.6 + react: ">=16.8.0" + checksum: cd31715aac81baa2398558dc7c877a483d1c4c41cdb2f466557fdc41bb742db5cd1b34b3b84332b94ac4a2835e7e5a0e28c64e621936e976399788f1dd029ea4 + languageName: node + linkType: hard + +"@dnd-kit/sortable@npm:^7.0.2": + version: 7.0.2 + resolution: "@dnd-kit/sortable@npm:7.0.2" + dependencies: + "@dnd-kit/utilities": ^3.2.0 + tslib: ^2.0.0 + peerDependencies: + "@dnd-kit/core": ^6.0.7 + react: ">=16.8.0" + checksum: 4ce705aceb15766a0deefe25a9d95a87e9413c3fb9088ea3eb0962e57f844895000117fcec7c0944a0d4ae4e1e889cfa69e3d3778164d4d23115fb1edb218283 + languageName: node + linkType: hard + +"@dnd-kit/utilities@npm:^3.2.0, @dnd-kit/utilities@npm:^3.2.1, @dnd-kit/utilities@npm:^3.2.2": + version: 3.2.2 + resolution: "@dnd-kit/utilities@npm:3.2.2" + dependencies: + tslib: ^2.0.0 + peerDependencies: + react: ">=16.8.0" + checksum: 8a5015c2faa52760ab82a64287b2ac6a3d798867a1bca5ccbc1178560dbd9a1f9f1a21faea80f590ba1a4277c3eb7e7c4d3b4a39f1f32171bf6bc8174b370547 + languageName: node + linkType: hard + "@emotion/hash@npm:^0.8.0": version: 0.8.0 resolution: "@emotion/hash@npm:0.8.0" @@ -3673,6 +4029,7 @@ __metadata: react-i18next: ^11.8.10 uuid: ^8.3.1 peerDependencies: + "@ant-design/pro-components": ^2.6.32 "@opensrp/store": ^0.0.10 antd: ^5.5.1 i18next: ^19.8.4 @@ -3979,6 +4336,7 @@ __metadata: dependencies: "@2fd/ant-design-icons": ^2.6.0 "@ant-design/icons": ^4.7.0 + "@ant-design/pro-components": ^2.6.32 "@onaio/connected-private-route": ^0.0.11 "@onaio/connected-reducer-registry": ^0.0.3 "@onaio/gatekeeper": 1.0.0 @@ -5942,6 +6300,22 @@ __metadata: languageName: node linkType: hard +"@umijs/route-utils@npm:^4.0.0": + version: 4.0.1 + resolution: "@umijs/route-utils@npm:4.0.1" + checksum: e1ca91cf6da16d7623cc0a8816cf2655e1f8b7fcc2507d455383b31f7e1979e52bc2464453173e68b660d24c4255be44d521d280e580c025af6bed83b5727241 + languageName: node + linkType: hard + +"@umijs/use-params@npm:^1.0.9": + version: 1.0.9 + resolution: "@umijs/use-params@npm:1.0.9" + peerDependencies: + react: "*" + checksum: 7f72436440dff0e1911ee916340bd26c6c9a510bad4af536d3ec9a5a175d37255d42dbd1cb0dc996daf4d0c3b76e44816ac423ac73e6b3c1655b6b839fed175c + languageName: node + linkType: hard + "@webassemblyjs/ast@npm:1.11.1": version: 1.11.1 resolution: "@webassemblyjs/ast@npm:1.11.1" @@ -6464,6 +6838,15 @@ __metadata: languageName: node linkType: hard +"add-dom-event-listener@npm:^1.1.0": + version: 1.1.0 + resolution: "add-dom-event-listener@npm:1.1.0" + dependencies: + object-assign: 4.x + checksum: 7685d32c4a9d78ad7a36641774168d80e195ef0710ae801e7211d849100c0e4499657cf3838bdae5ee9134b5aa9d7f50d68dec73b03e7d0082302804efff6ea6 + languageName: node + linkType: hard + "add-stream@npm:^1.0.0": version: 1.0.0 resolution: "add-stream@npm:1.0.0" @@ -8838,6 +9221,13 @@ __metadata: languageName: node linkType: hard +"client-only@npm:^0.0.1": + version: 0.0.1 + resolution: "client-only@npm:0.0.1" + checksum: 0c16bf660dadb90610553c1d8946a7fdfb81d624adea073b8440b7d795d5b5b08beb3c950c6a2cf16279365a3265158a236876d92bce16423c485c322d7dfaf8 + languageName: node + linkType: hard + "cliui@npm:^5.0.0": version: 5.0.0 resolution: "cliui@npm:5.0.0" @@ -10186,6 +10576,13 @@ __metadata: languageName: node linkType: hard +"csstype@npm:^3.1.3": + version: 3.1.3 + resolution: "csstype@npm:3.1.3" + checksum: 8db785cc92d259102725b3c694ec0c823f5619a84741b5c7991b8ad135dfaa66093038a1cc63e03361a6cd28d122be48f2106ae72334e067dd619a51f49eddf7 + languageName: node + linkType: hard + "csv-parse@npm:^4.4.6": version: 4.16.3 resolution: "csv-parse@npm:4.16.3" @@ -10297,6 +10694,13 @@ __metadata: languageName: node linkType: hard +"dayjs@npm:^1.11.10": + version: 1.11.10 + resolution: "dayjs@npm:1.11.10" + checksum: a6b5a3813b8884f5cd557e2e6b7fa569f4c5d0c97aca9558e38534af4f2d60daafd3ff8c2000fed3435cfcec9e805bcebd99f90130c6d1c5ef524084ced588c4 + languageName: node + linkType: hard + "de-indent@npm:^1.0.2": version: 1.0.2 resolution: "de-indent@npm:1.0.2" @@ -17739,7 +18143,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:>=3.5 <5, lodash@npm:^4.0.0, lodash@npm:^4.1.1, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.17.5, lodash@npm:^4.7.0": +"lodash@npm:>=3.5 <5, lodash@npm:^4.0.0, lodash@npm:^4.0.1, lodash@npm:^4.1.1, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.17.5, lodash@npm:^4.7.0": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -19277,6 +19681,13 @@ __metadata: languageName: node linkType: hard +"object-assign@npm:4.x, object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": + version: 4.1.1 + resolution: "object-assign@npm:4.1.1" + checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f + languageName: node + linkType: hard + "object-assign@npm:^3.0.0": version: 3.0.0 resolution: "object-assign@npm:3.0.0" @@ -19284,13 +19695,6 @@ __metadata: languageName: node linkType: hard -"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1": - version: 4.1.1 - resolution: "object-assign@npm:4.1.1" - checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f - languageName: node - linkType: hard - "object-copy@npm:^0.1.0": version: 0.1.0 resolution: "object-copy@npm:0.1.0" @@ -19438,6 +19842,13 @@ __metadata: languageName: node linkType: hard +"omit.js@npm:^2.0.2": + version: 2.0.2 + resolution: "omit.js@npm:2.0.2" + checksum: 5d802b9fd7640250aada82f3b9b7243b554b38911f29b3de0d1066c00f24dd4ee72d3b9c94c582e373fb6511bd21e107917d419a7b2a04287f26c31133b48a15 + languageName: node + linkType: hard + "on-finished@npm:~2.3.0": version: 2.3.0 resolution: "on-finished@npm:2.3.0" @@ -20133,6 +20544,13 @@ __metadata: languageName: node linkType: hard +"path-to-regexp@npm:2.4.0": + version: 2.4.0 + resolution: "path-to-regexp@npm:2.4.0" + checksum: 581175bf2968e51452f2b8c71f10e75c995693668b4ecf7d0b48962fbe0c56830661ca5dd5fd6d8e2f0cc9a045ce07e89af504ab133e1d21887c2712df85b1f4 + languageName: node + linkType: hard + "path-to-regexp@npm:^1.7.0": version: 1.8.0 resolution: "path-to-regexp@npm:1.8.0" @@ -22213,7 +22631,7 @@ __metadata: languageName: node linkType: hard -"prop-types@npm:^15.5.8, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.0, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": +"prop-types@npm:^15.5.10, prop-types@npm:^15.5.8, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.0, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": version: 15.8.1 resolution: "prop-types@npm:15.8.1" dependencies: @@ -23082,6 +23500,21 @@ __metadata: languageName: node linkType: hard +"rc-resize-observer@npm:^0.2.3": + version: 0.2.6 + resolution: "rc-resize-observer@npm:0.2.6" + dependencies: + "@babel/runtime": ^7.10.1 + classnames: ^2.2.1 + rc-util: ^5.0.0 + resize-observer-polyfill: ^1.5.1 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 1ce6af2c63a60bedcd9edd4b9e4632df36308c59177ff5e0de861e8cadf483f333f71713f584a2c7281691eaed87a1615c2edfeab6938b3c0a3e8bfb2553d600 + languageName: node + linkType: hard + "rc-resize-observer@npm:^1.0.0, rc-resize-observer@npm:^1.1.0, rc-resize-observer@npm:^1.2.0": version: 1.2.0 resolution: "rc-resize-observer@npm:1.2.0" @@ -23485,6 +23918,32 @@ __metadata: languageName: node linkType: hard +"rc-util@npm:^4.19.0": + version: 4.21.1 + resolution: "rc-util@npm:4.21.1" + dependencies: + add-dom-event-listener: ^1.1.0 + prop-types: ^15.5.10 + react-is: ^16.12.0 + react-lifecycles-compat: ^3.0.4 + shallowequal: ^1.1.0 + checksum: f87d321ad2088171eef990f179fe8b34db648cd5ad37439de381093891189e429ad8c791077205c56de9e26e37749fb3f4ecfceba8c35f983f540650c7ed4fb0 + languageName: node + linkType: hard + +"rc-util@npm:^5.0.0, rc-util@npm:^5.35.0": + version: 5.38.1 + resolution: "rc-util@npm:5.38.1" + dependencies: + "@babel/runtime": ^7.18.3 + react-is: ^18.2.0 + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 40d0411fb5d6b0a187e718ff16c18f3d68eae3d7e4def43a9a9b2690b89cfce639077a69d683aa01302f8132394dd633baf76b07e5a3b8438fb706b1abb31937 + languageName: node + linkType: hard + "rc-util@npm:^5.0.1, rc-util@npm:^5.0.6, rc-util@npm:^5.15.0, rc-util@npm:^5.16.1, rc-util@npm:^5.18.1, rc-util@npm:^5.2.0, rc-util@npm:^5.3.0, rc-util@npm:^5.5.0, rc-util@npm:^5.6.1, rc-util@npm:^5.9.4": version: 5.18.1 resolution: "rc-util@npm:5.18.1" @@ -23861,7 +24320,7 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^18.0.0": +"react-is@npm:^18.0.0, react-is@npm:^18.2.0": version: 18.2.0 resolution: "react-is@npm:18.2.0" checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e @@ -24323,6 +24782,15 @@ __metadata: languageName: node linkType: hard +"reactcss@npm:^1.2.3": + version: 1.2.3 + resolution: "reactcss@npm:1.2.3" + dependencies: + lodash: ^4.0.1 + checksum: c53e386a0881f1477e1cff661f6a6ad4c662230941f3827862193ac30f9b75cdf7bc7b4c7e5ca543d3e4e80fee1a3e9fa0056c206b1c0423726c41773ab3fe45 + languageName: node + linkType: hard + "reactstrap@npm:^7.1.0": version: 7.1.0 resolution: "reactstrap@npm:7.1.0" @@ -25317,6 +25785,13 @@ __metadata: languageName: node linkType: hard +"safe-stable-stringify@npm:^2.4.3": + version: 2.4.3 + resolution: "safe-stable-stringify@npm:2.4.3" + checksum: 3aeb64449706ee1f5ad2459fc99648b131d48e7a1fbb608d7c628020177512dc9d94108a5cb61bbc953985d313d0afea6566d243237743e02870490afef04b43 + languageName: node + linkType: hard + "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" @@ -26930,6 +27405,18 @@ __metadata: languageName: node linkType: hard +"swr@npm:^2.0.0": + version: 2.2.4 + resolution: "swr@npm:2.2.4" + dependencies: + client-only: ^0.0.1 + use-sync-external-store: ^1.2.0 + peerDependencies: + react: ^16.11.0 || ^17.0.0 || ^18.0.0 + checksum: d1398f89fd68af0e0cb6100a5769b1e17c0dbe8a778898643ad28456acda64add43344754c7d919e3f2ca82854adf86ff7d465aba25a2d555bcb669e457138f8 + languageName: node + linkType: hard + "symbol-observable@npm:1.2.0, symbol-observable@npm:^1.2.0": version: 1.2.0 resolution: "symbol-observable@npm:1.2.0" @@ -27328,6 +27815,13 @@ __metadata: languageName: node linkType: hard +"tinycolor2@npm:^1.4.2": + version: 1.6.0 + resolution: "tinycolor2@npm:1.6.0" + checksum: 6df4d07fceeedc0a878d7bac47e2cd47c1ceeb1078340a9eb8a295bc0651e17c750f73d47b3028d829f30b85c15e0572c0fd4142083e4c21a30a597e47f47230 + languageName: node + linkType: hard + "tmp@npm:^0.0.33": version: 0.0.33 resolution: "tmp@npm:0.0.33" @@ -27610,6 +28104,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:^2.0.0": + version: 2.6.2 + resolution: "tslib@npm:2.6.2" + checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad + languageName: node + linkType: hard + "tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0": version: 2.3.1 resolution: "tslib@npm:2.3.1" @@ -28163,6 +28664,15 @@ __metadata: languageName: node linkType: hard +"use-sync-external-store@npm:^1.2.0": + version: 1.2.0 + resolution: "use-sync-external-store@npm:1.2.0" + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + checksum: 5c639e0f8da3521d605f59ce5be9e094ca772bd44a4ce7322b055a6f58eeed8dda3c94cabd90c7a41fb6fa852210092008afe48f7038792fd47501f33299116a + languageName: node + linkType: hard + "use@npm:^3.1.0": version: 3.1.1 resolution: "use@npm:3.1.1" @@ -28489,6 +28999,15 @@ __metadata: languageName: node linkType: hard +"warning@npm:^4.0.3": + version: 4.0.3 + resolution: "warning@npm:4.0.3" + dependencies: + loose-envify: ^1.0.0 + checksum: 4f2cb6a9575e4faf71ddad9ad1ae7a00d0a75d24521c193fa464f30e6b04027bd97aa5d9546b0e13d3a150ab402eda216d59c1d0f2d6ca60124d96cd40dfa35c + languageName: node + linkType: hard + "watchpack-chokidar2@npm:^2.0.1": version: 2.0.1 resolution: "watchpack-chokidar2@npm:2.0.1"