Permission the fhir-flag module

onaio · Nov 7, 2024 · f31c3c4 · f31c3c4
1 parent c2d2b68
commit f31c3c4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/app/src/App/fhir-apps.tsx b/app/src/App/fhir-apps.tsx
@@ -583,7 +583,7 @@ const FHIRApps = () => {
         disableLoginProtection={DISABLE_LOGIN_PROTECTION}
         exact
         path={`${URL_CLOSE_FLAGS}/:id`}
-        // permissions={['Flag.update']}
+        permissions={['Flag.read']}
         component={CloseFlag}
       />
       <Route

diff --git a/packages/fhir-flag/src/components/BaseComponent/index.tsx b/packages/fhir-flag/src/components/BaseComponent/index.tsx
@@ -13,6 +13,7 @@ import { IBundle } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IBundle';
 import { IPractitioner } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IPractitioner';
 import { useTranslation } from '../../mls';
 import { thatiMinutes } from '../../constants';
+import { RbacCheck } from '@opensrp/rbac';
 
 export interface CloseFlagProps {
   fhirBaseURL: string;
@@ -54,7 +55,7 @@ export const CloseFlag = (props: CloseFlagProps) => {
       enabled: !!user_id,
       staleTime: thatiMinutes,
       select: (response) => {
-        return getResourcesFromBundle<IPractitioner>(response)?.[0];
+        return getResourcesFromBundle<IPractitioner>(response)[0];
       },
     }
   );
@@ -80,10 +81,20 @@ export const CloseFlag = (props: CloseFlagProps) => {
   return (
     <Row>
       <Col span={24}>
-        {flag.data?.subject?.reference?.includes('Location') ? (
-          <LocationFlag {...commonProps} locationReference={flag.data.subject.reference} />
+        {flag.data?.subject.reference?.includes('Location') ? (
+          <RbacCheck
+            permissions={['Location.read']}
+            fallback={t('Missing Required permissions to perform this action')}
+          >
+            <LocationFlag {...commonProps} locationReference={flag.data.subject.reference} />
+          </RbacCheck>
         ) : (
-          <ProductFlag {...commonProps} inventoryGroupReference={flag.data?.subject.reference} />
+          <RbacCheck
+            permissions={['Group.read', 'Location.read', 'List.read']}
+            fallback={t('Missing Required permissions to perform this action')}
+          >
+            <ProductFlag {...commonProps} inventoryGroupReference={flag.data?.subject.reference} />
+          </RbacCheck>
         )}
       </Col>
     </Row>

diff --git a/packages/fhir-flag/src/components/CloseFlagForm/index.tsx b/packages/fhir-flag/src/components/CloseFlagForm/index.tsx
@@ -8,6 +8,7 @@ import { sendErrorNotification, sendSuccessNotification } from '@opensrp/notific
 import { useTranslation } from '../../mls';
 import { comments, locationName, productName, status } from '../../constants';
 import { IFlag } from '@smile-cdr/fhirts/dist/FHIR-R4/interfaces/IFlag';
+import { useUserRole } from '@opensrp/rbac';
 
 const { Item: FormItem } = Form;
 const { TextArea } = Input;
@@ -36,6 +37,7 @@ const headerProps = {
 
 const CloseFlagForm = (props: CloseFlagFormProps) => {
   const { initialValues, flag, mutationEffect } = props;
+  const userRole = useUserRole();
   const { t } = useTranslation();
 
   const stableInitialValues = useMemo(() => initialValues, [initialValues]);
@@ -63,6 +65,15 @@ const CloseFlagForm = (props: CloseFlagFormProps) => {
     mutate(values);
   };
 
+  const saveBtnDisabled = userRole.hasPermissions([
+    'Flag.update',
+    'Encounter.update',
+    'Observation.update',
+  ]);
+  const saveBtnDisabledReason = saveBtnDisabled
+    ? t('Missing Required permissions to perform this action')
+    : undefined;
+
   return (
     <BodyLayout headerProps={headerProps}>
       <Row className="user-group">
@@ -89,8 +100,13 @@ const CloseFlagForm = (props: CloseFlagFormProps) => {
               <TextArea rows={4} placeholder={t('How was the flag resolved?')} />
             </FormItem>
 
-            <FormItem {...tailLayout}>
-              <Button type="primary" id="submit-button" htmlType="submit">
+            <FormItem {...tailLayout} help={saveBtnDisabledReason}>
+              <Button
+                type="primary"
+                id="submit-button"
+                htmlType="submit"
+                disabled={saveBtnDisabled}
+              >
                 {isLoading ? t('Saving') : t('Save')}
               </Button>
             </FormItem>