Merge branch 'main' into create-side-profile-view

onaio · Jun 5, 2024 · 32bb632 · 32bb632
2 parents f1ddbbe + 8434097
commit 32bb632
Show file tree

Hide file tree

Showing 29 changed files with 235 additions and 110 deletions.
diff --git a/app/src/App/fhir-apps.tsx b/app/src/App/fhir-apps.tsx
@@ -343,7 +343,7 @@ const FHIRApps = () => {
         exact
         path={URL_TEAM_ASSIGNMENT}
         {...teamAffiliationProps}
-        permissions={['OrganizationAffiliation.read']}
+        permissions={['OrganizationAffiliation.read', 'Location.read']}
         component={FhirTeamAssignment}
       />
       <PrivateComponent

diff --git a/app/src/routes/index.tsx b/app/src/routes/index.tsx
@@ -136,7 +136,7 @@ export function getRoutes(roles: string[], t: TFunction, userRole: UserRole): Ro
           children: [
             { title: t('Teams'), url: URL_TEAMS, key: 'TEAMS', permissions: ['Organization.read'] },
             {
-              permissions: ['OrganizationAffiliation.read'],
+              permissions: ['OrganizationAffiliation.read', 'Location.read'],
               title: t('Team Assignment'),
               url: URL_TEAM_ASSIGNMENT,
               key: 'team-assignment',

diff --git a/packages/fhir-care-team/src/components/CreateEditCareTeam/Form.tsx b/packages/fhir-care-team/src/components/CreateEditCareTeam/Form.tsx
@@ -29,6 +29,7 @@ export interface CareTeamFormProps {
   fhirBaseURL: string;
   practitioners: IPractitioner[];
   organizations: IOrganization[];
+  disabled?: string[];
 }
 
 /**
@@ -37,7 +38,7 @@ export interface CareTeamFormProps {
  * @param {object} props - component props
  */
 const CareTeamForm: React.FC<CareTeamFormProps> = (props: CareTeamFormProps) => {
-  const { fhirBaseURL, initialValues, practitioners, organizations } = props;
+  const { fhirBaseURL, initialValues, practitioners, organizations, disabled } = props;
   const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
   const history = useHistory();
   const { t } = useTranslation();
@@ -123,6 +124,7 @@ const CareTeamForm: React.FC<CareTeamFormProps> = (props: CareTeamFormProps) =>
                 showSearch
                 options={practOptions}
                 filterOption={selectFilterFunction}
+                disabled={disabled?.includes(practitionerParticipants)}
               />
             </Form.Item>
 
@@ -139,6 +141,7 @@ const CareTeamForm: React.FC<CareTeamFormProps> = (props: CareTeamFormProps) =>
                 showSearch
                 placeholder={t('Select a managing Organization')}
                 filterOption={selectFilterFunction}
+                disabled={disabled?.includes(managingOrganizations)}
               />
             </Form.Item>
 

diff --git a/packages/fhir-care-team/src/components/CreateEditCareTeam/index.tsx b/packages/fhir-care-team/src/components/CreateEditCareTeam/index.tsx
@@ -13,7 +13,9 @@ import {
 import {
   FHIR_CARE_TEAM,
   FHIR_PRACTITIONERS,
+  managingOrganizations,
   organizationResourceType,
+  practitionerParticipants,
   practitionerResourceType,
   ROUTE_PARAM_CARE_TEAM_ID,
 } from '../../constants';
@@ -23,6 +25,7 @@ import { useTranslation } from '../../mls';
 import { IPractitioner } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IPractitioner';
 import { ICareTeam } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/ICareTeam';
 import { IOrganization } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IOrganization';
+import { useUserRole } from '@opensrp/rbac';
 
 // Interface for route params
 interface RouteParams {
@@ -44,6 +47,7 @@ export type CreateEditCareTeamProps = EditCareTeamProps & RouteComponentProps<Ro
 
 const CreateEditCareTeam: React.FC<CreateEditCareTeamProps> = (props: CreateEditCareTeamProps) => {
   const { fhirBaseURL } = props;
+  const userRole = useUserRole();
   const params = useParams<RouteParams>();
   const careTeamId = params[ROUTE_PARAM_CARE_TEAM_ID];
   const { t } = useTranslation();
@@ -60,21 +64,25 @@ const CreateEditCareTeam: React.FC<CreateEditCareTeamProps> = (props: CreateEdit
     }
   );
 
+  const hasReadOrgs = userRole.hasPermissions(['Organization.read']);
   const organizations = useQuery(
     organizationResourceType,
     async () => loadAllResources(fhirBaseURL, organizationResourceType),
     {
       onError: () => sendErrorNotification(t('There was a problem fetching organizations')),
       select: (res) => getResourcesFromBundle<IOrganization>(res),
+      enabled: hasReadOrgs,
     }
   );
 
+  const hasReadPractitioner = userRole.hasPermissions(['Practitioner.read']);
   const fhirPractitioners = useQuery(
     FHIR_PRACTITIONERS,
     async () => loadAllResources(fhirBaseURL, practitionerResourceType, { active: true }),
     {
       onError: () => sendErrorNotification(t('There was a problem fetching practitioners')),
       select: (res) => getResourcesFromBundle<IPractitioner>(res),
+      enabled: hasReadPractitioner,
     }
   );
 
@@ -92,11 +100,19 @@ const CreateEditCareTeam: React.FC<CreateEditCareTeamProps> = (props: CreateEdit
 
   const buildInitialValues = getCareTeamFormFields(singleCareTeam.data as ICareTeam);
 
+  const disabledFields: string[] = [];
+  if (!hasReadOrgs) {
+    disabledFields.push(managingOrganizations);
+  }
+  if (!hasReadPractitioner) {
+    disabledFields.push(practitionerParticipants);
+  }
   const careTeamFormProps = {
     fhirBaseURL,
     initialValues: buildInitialValues,
     organizations: organizations.data ?? [],
     practitioners: fhirPractitioners.data ?? [],
+    disabled: disabledFields,
   };
 
   return (

diff --git a/packages/fhir-care-team/src/components/CreateEditCareTeam/tests/index.test.tsx b/packages/fhir-care-team/src/components/CreateEditCareTeam/tests/index.test.tsx
@@ -25,6 +25,8 @@ import { screen, render } from '@testing-library/react';
 import userEvents from '@testing-library/user-event';
 import { careTeam1, careTeam4201Edited, organizations } from './fixtures';
 import flushPromises from 'flush-promises';
+import { RoleContext } from '@opensrp/rbac';
+import { superUserRole } from '@opensrp/react-utils';
 
 jest.mock('fhirclient', () => {
   return jest.requireActual('fhirclient/lib/entry/browser');
@@ -56,14 +58,16 @@ const AppWrapper = (props: any) => {
   return (
     <Provider store={store}>
       <QueryClientProvider client={queryClient}>
-        <Switch>
-          <Route exact path="/add">
-            <CreateEditCareTeam {...props} />
-          </Route>
-          <Route exact path={`/add/:${ROUTE_PARAM_CARE_TEAM_ID}`}>
-            <CreateEditCareTeam {...props} />
-          </Route>
-        </Switch>
+        <RoleContext.Provider value={superUserRole}>
+          <Switch>
+            <Route exact path="/add">
+              <CreateEditCareTeam {...props} />
+            </Route>
+            <Route exact path={`/add/:${ROUTE_PARAM_CARE_TEAM_ID}`}>
+              <CreateEditCareTeam {...props} />
+            </Route>
+          </Switch>
+        </RoleContext.Provider>
       </QueryClientProvider>
     </Provider>
   );

diff --git a/packages/fhir-care-team/src/components/ListView/index.tsx b/packages/fhir-care-team/src/components/ListView/index.tsx
@@ -119,7 +119,7 @@ export const CareTeamList: React.FC<CareTeamListPropTypes> = (props: CareTeamLis
       },
       {
         key: '2',
-        permissions: [],
+        permissions: ['CareTeam.read'],
         label: (
           <Button type="link" onClick={() => addParam(viewDetailsQuery, record.id)}>
             View Details

diff --git a/packages/fhir-client/src/components/PatientDetails/PopulatedTableTabs/index.tsx b/packages/fhir-client/src/components/PatientDetails/PopulatedTableTabs/index.tsx
@@ -51,6 +51,7 @@ import { ITask } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/ITask';
 import { ICarePlan } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/ICarePlan';
 import { Coding } from '@smile-cdr/fhirts/dist/FHIR-R4/classes/coding';
 import { Button } from 'antd';
+import { useUserRole } from '@opensrp/rbac';
 
 /** Populated table tabs wrapper props */
 export interface PopulatedTableTabsProps {
@@ -68,8 +69,14 @@ export const PopulatedTableTabs: React.FC<PopulatedTableTabsProps> = (
 ) => {
   const { fhirBaseURL, patientId } = props;
   const { t } = useTranslation();
+  const userRole = useUserRole();
 
   const { addParams, removeParam } = useSearchParams();
+  const hasCareTeamRead = userRole.hasPermissions(['CareTeam.read']);
+  const hasConditionRead = userRole.hasPermissions(['Condition.read']);
+  const hasTaskRead = userRole.hasPermissions(['Task.read']);
+  const hasImmunizationRead = userRole.hasPermissions(['Immunization.read']);
+  const hasEncounterRead = userRole.hasPermissions(['Encounter.read']);
 
   const defaultTableData = {
     resourceId: patientId,
@@ -158,10 +165,12 @@ export const PopulatedTableTabs: React.FC<PopulatedTableTabsProps> = (
             resourceType={carePlanResourceType}
             title={t('Care plan')}
             resourceFilters={defaultSearchParamsFactory(patientId)}
+            hasResourcePermissions={hasCareTeamRead}
           />
         ),
         key: 'carePlan',
         children: <TabsTable<ICarePlan> {...carePlanTableData} />,
+        disabled: !hasCareTeamRead,
       },
       {
         label: (
@@ -170,10 +179,12 @@ export const PopulatedTableTabs: React.FC<PopulatedTableTabsProps> = (
             resourceType={conditionResourceType}
             title={t('Condition')}
             resourceFilters={defaultSearchParamsFactory(patientId)}
+            hasResourcePermissions={hasConditionRead}
           />
         ),
         key: 'condition',
         children: <TabsTable<ICondition> {...conditionTableData} />,
+        disabled: !hasConditionRead,
       },
       {
         label: (
@@ -182,10 +193,12 @@ export const PopulatedTableTabs: React.FC<PopulatedTableTabsProps> = (
             resourceType={taskResourceType}
             title={t('Task')}
             resourceFilters={taskSearchParams(patientId)}
+            hasResourcePermissions={hasTaskRead}
           />
         ),
         key: 'task',
         children: <TabsTable<ITask> {...taskTableData} />,
+        disabled: !hasTaskRead,
       },
       {
         label: (
@@ -194,10 +207,12 @@ export const PopulatedTableTabs: React.FC<PopulatedTableTabsProps> = (
             resourceType={immunizationResourceType}
             title={t('Immunization')}
             resourceFilters={immunizationSearchParams(patientId)}
+            hasResourcePermissions={hasImmunizationRead}
           />
         ),
         key: 'immunization',
         children: <TabsTable<IImmunization> {...immunizationTableData} />,
+        disabled: !hasImmunizationRead,
       },
       {
         label: (
@@ -206,10 +221,12 @@ export const PopulatedTableTabs: React.FC<PopulatedTableTabsProps> = (
             resourceType={encounterResourceType}
             title={t('Patient encounter')}
             resourceFilters={defaultSearchParamsFactory(patientId)}
+            hasResourcePermissions={hasEncounterRead}
           />
         ),
         key: 'patientEncounter',
         children: <TabsTable<IEncounter> {...patientEncounterTableData} />,
+        disabled: !hasEncounterRead,
       },
     ],
   };

diff --git a/packages/fhir-client/src/components/PatientDetails/PopulatedTableTabs/tests/index.test.tsx b/packages/fhir-client/src/components/PatientDetails/PopulatedTableTabs/tests/index.test.tsx
@@ -26,6 +26,8 @@ import nock from 'nock';
 import { authenticateUser } from '@onaio/session-reducer';
 import { patientResourceDetails } from '../../tests/fixtures';
 import { last } from 'lodash';
+import { RoleContext } from '@opensrp/rbac';
+import { superUserRole } from '@opensrp/react-utils';
 
 const { QueryClient, QueryClientProvider } = reactQuery;
 
@@ -87,7 +89,11 @@ const AppWrapper = (props: any) => {
       <QueryClientProvider client={queryClient}>
         <Switch>
           <Route exact path={`${LIST_PATIENTS_URL}/:id`}>
-            {(routeProps) => <PopulatedTableTabs {...{ ...props, ...routeProps }} />}
+            {(routeProps) => (
+              <RoleContext.Provider value={superUserRole}>
+                <PopulatedTableTabs {...{ ...props, ...routeProps }} />
+              </RoleContext.Provider>
+            )}
           </Route>
         </Switch>
       </QueryClientProvider>

diff --git a/packages/fhir-client/src/components/PatientDetails/tests/index.test.tsx b/packages/fhir-client/src/components/PatientDetails/tests/index.test.tsx
@@ -26,6 +26,8 @@ import {
   resourceEntriesCount,
 } from '../PopulatedTableTabs/tests/fixtures';
 import { last } from 'lodash';
+import { RoleContext } from '@opensrp/rbac';
+import { superUserRole } from '@opensrp/react-utils';
 
 const { QueryClient, QueryClientProvider } = reactQuery;
 
@@ -86,7 +88,11 @@ const AppWrapper = (props: any) => {
       <QueryClientProvider client={queryClient}>
         <Switch>
           <Route exact path={props.path}>
-            {(routeProps) => <PatientDetails {...{ ...props, ...routeProps }} />}
+            {(routeProps) => (
+              <RoleContext.Provider value={superUserRole}>
+                <PatientDetails {...{ ...props, ...routeProps }} />
+              </RoleContext.Provider>
+            )}
           </Route>
         </Switch>
       </QueryClientProvider>

diff --git a/packages/fhir-group-management/src/components/BaseComponents/BaseGroupsListView/index.tsx b/packages/fhir-group-management/src/components/BaseComponents/BaseGroupsListView/index.tsx
@@ -113,7 +113,7 @@ export function BaseListView<TableData extends ExtendableTableData = DefaultTabl
         <Col className="main-content">
           <div className="main-content__header">
             <SearchForm data-testid="search-form" {...searchFormProps} />
-            <RbacCheck permissions={['Group.create']}>
+            <RbacCheck permissions={['Group.create', 'List.create', 'List.update']}>
               {createButtonUrl ? (
                 <Button type="primary" onClick={() => history.push(createButtonUrl)}>
                   <PlusOutlined />

diff --git a/packages/fhir-group-management/src/components/CommodityAddEdit/Eusm/tests/index.test.tsx b/packages/fhir-group-management/src/components/CommodityAddEdit/Eusm/tests/index.test.tsx
@@ -26,6 +26,8 @@ import userEvent from '@testing-library/user-event';
 import * as notifications from '@opensrp/notifications';
 import { photoUploadCharacteristicCode } from '../../../../helpers/utils';
 import { cloneDeep } from 'lodash';
+import { RoleContext } from '@opensrp/rbac';
+import { superUserRole } from '@opensrp/react-utils';
 
 jest.mock('@opensrp/notifications', () => ({
   __esModule: true,
@@ -66,14 +68,16 @@ const AppWrapper = (props: any) => {
   return (
     <Provider store={store}>
       <QueryClientProvider client={queryClient}>
-        <Switch>
-          <Route exact path="/add">
-            <CommodityAddEdit {...props} />
-          </Route>
-          <Route exact path="/add/:id">
-            <CommodityAddEdit {...props} />
-          </Route>
-        </Switch>
+        <RoleContext.Provider value={superUserRole}>
+          <Switch>
+            <Route exact path="/add">
+              <CommodityAddEdit {...props} />
+            </Route>
+            <Route exact path="/add/:id">
+              <CommodityAddEdit {...props} />
+            </Route>
+          </Switch>
+        </RoleContext.Provider>
       </QueryClientProvider>
     </Provider>
   );

diff --git a/packages/fhir-group-management/src/components/CommodityList/Default/List.tsx b/packages/fhir-group-management/src/components/CommodityList/Default/List.tsx
@@ -156,7 +156,7 @@ export const DefaultCommodityList = (props: GroupListProps) => {
       // eslint-disable-next-line react/display-name
       render: (_: unknown, record: DefaultTableData) => (
         <span className="d-flex align-items-center">
-          <RbacCheck permissions={['Group.update']}>
+          <RbacCheck permissions={['Group.update', 'List.create', 'List.update']}>
             <>
               <Link to={`${ADD_EDIT_COMMODITY_URL}/${record.id}`} className="m-0 p-1">
                 {t('Edit')}

diff --git a/packages/fhir-group-management/src/components/CommodityList/Eusm/List.tsx b/packages/fhir-group-management/src/components/CommodityList/Eusm/List.tsx
@@ -89,7 +89,7 @@ export const EusmCommodityList = (props: GroupListProps) => {
       // eslint-disable-next-line react/display-name
       render: (_: unknown, record: TableData) => (
         <span className="d-flex align-items-center">
-          <RbacCheck permissions={['Group.update']}>
+          <RbacCheck permissions={['Group.update', 'List.create', 'List.update']}>
             <>
               <Link to={`${ADD_EDIT_COMMODITY_URL}/${record.id}`} className="m-0 p-1">
                 {t('Edit')}

diff --git a/packages/fhir-group-management/src/components/ProductForm/index.tsx b/packages/fhir-group-management/src/components/ProductForm/index.tsx
@@ -36,6 +36,7 @@ import {
   normalizeFileInputEvent,
   SelectOption,
 } from './utils';
+import { useUserRole } from '@opensrp/rbac';
 
 const { Item: FormItem } = Form;
 
@@ -83,6 +84,11 @@ function CommodityForm<
   const { t } = useTranslation();
   const goTo = (url = '#') => history.push(url);
 
+  const userRole = useUserRole();
+  if (!userRole.hasPermissions(['Binary.create'])) {
+    disabled.push(productImage);
+  }
+
   const { mutate, isLoading } = useMutation(
     (values: FormFields) => {
       return mutationEffect(initialValues, values);
@@ -287,6 +293,7 @@ function CommodityForm<
                 multiple={false}
                 listType="picture-card"
                 maxCount={1}
+                disabled={disabled.includes(productImage)}
               >
                 {!getFieldValue(productImage)?.length ? (
                   <button

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
@@ -113,7 +113,7 @@ export const UserList = (props: OrganizationListProps) => {
         <Col className="main-content">
           <div className="main-content__header">
             <SearchForm data-testid="search-form" {...searchFormProps} />
-            <RbacCheck permissions={['iam_user.create']}>
+            <RbacCheck permissions={['iam_user.create', 'Practitioner.create']}>
               <Button type="primary" onClick={() => history.push(URL_USER_CREATE)}>
                 <PlusOutlined />
                 {t('Add User')}