Merge branch '1328-eusm-commodity-rd' into 1328-eusm-commodity-cu

Author: peterMuriuki

app/src/App/tests/App.test.tsx

@@ -242,7 +242,7 @@ describe('App - authenticated', () => {
       `${LIST_COMMODITY_URL}?${viewDetailsQuery}=1`
     );
     wrapper.update();
-    expect(wrapper.find('ViewDetails')).toHaveLength(1);
+    expect(wrapper.find('ViewDetailsWrapper')).toHaveLength(1);
 
     // go to new resource page
     (wrapper.find('Router').prop('history') as RouteComponentProps['history']).push(

app/src/configs/__mocks__/env.ts

@@ -44,3 +44,5 @@ export const ENABLE_QUEST = true;
 export const BACKEND_ACTIVE = false;
 
 export const ENABLE_FHIR_USER_MANAGEMENT = true;
+
+export const COMMODITIES_LIST_RESOURCE_ID = 'ad';

packages/fhir-group-management/src/components/CommodityList/Eusm/List.tsx

@@ -12,7 +12,7 @@ import {
 import { TFunction } from '@opensrp/i18n';
 import { useSearchParams, viewDetailsQuery } from '@opensrp/react-utils';
 import { supplyMgSnomedCode, snomedCodeSystem } from '../../../helpers/utils';
-import { useUserRole } from '@opensrp/rbac';
+import { RbacCheck, useUserRole } from '@opensrp/rbac';
 import { ViewDetailsWrapper } from './ViewDetails';
 
 interface GroupListProps {
@@ -90,9 +90,14 @@ export const EusmCommodityList = (props: GroupListProps) => {
       // eslint-disable-next-line react/display-name
       render: (_: unknown, record: TableData) => (
         <span className="d-flex align-items-center">
-          <Link to={`${ADD_EDIT_COMMODITY_URL}/${record.id}`} className="m-0 p-1">
-            {t('Edit')}
-          </Link>
+          <RbacCheck permissions={['Group.update']}>
+            <>
+              <Link to={`${ADD_EDIT_COMMODITY_URL}/${record.id}`} className="m-0 p-1">
+                {t('Edit')}
+              </Link>
+              <Divider type="vertical" />
+            </>
+          </RbacCheck>
           <Divider type="vertical" />
           <Dropdown
             menu={{ items: getItems(record) }}

packages/fhir-group-management/src/components/CommodityList/Eusm/tests/__snapshots__/list.test.tsx.snap

@@ -269,6 +269,10 @@ exports[`renders correctly when listing resources: table row 1 page 1 6`] = `
       class="ant-divider css-dev-only-do-not-override-k7429z ant-divider-vertical"
       role="separator"
     />
+    <div
+      class="ant-divider css-dev-only-do-not-override-k7429z ant-divider-vertical"
+      role="separator"
+    />
     <span
       aria-label="more"
       class="anticon anticon-more ant-dropdown-trigger more-options"