OH2-255 Revise and align permissions for CORE, API and UI

src/components/accessories/admission/PatientAdmission.tsx

@@ -28,7 +28,7 @@ import { CurrentAdmission } from "../currentAdmission/CurrentAdmission";
 const PatientAdmission: FC = () => {
   const { t } = useTranslation();
   const dispatch = useDispatch();
-  const canCreate = usePermission("admission.create");
+  const canCreate = usePermission("admissions.create");
   const infoBoxRef = useRef<HTMLDivElement>(null);
   const [shouldResetForm, setShouldResetForm] = useState(false);
   const [creationMode, setCreationMode] = useState(true);

src/components/accessories/admission/admissionTable/AdmissionTable.tsx

@@ -20,7 +20,7 @@ const PatientAdmissionTable: FunctionComponent<IOwnProps> = ({
   handleEdit,
 }) => {
   const { t } = useTranslation();
-  const canUpdate = usePermission("admission.update");
+  const canUpdate = usePermission("admissions.update");
 
   const header = ["admDate", "disDate"];
   const dateFields = ["admDate", "disDate"];

src/components/accessories/appHeader/AppHeader.tsx

@@ -57,9 +57,9 @@ const AppHeader: FunctionComponent<TProps> = ({
   };
   const navigate = useNavigate();
 
-  const canAccessPatient = usePermission("patient.access");
-  const canAccessVisit = usePermission("visit.access");
-  const canAccessLaboratory = usePermission("laboratory.access");
+  const canAccessPatient = usePermission("patients.access");
+  const canAccessVisit = usePermission("opds.access");
+  const canAccessLaboratory = usePermission("laboratories.access");
   const canAccessDashboard = usePermission("dashboard.access");
 
   return (

src/components/accessories/dashboard/layouts/consts.ts

@@ -31,16 +31,16 @@ export const DASHBOARDS: TDashboardComponent[] = [
  */
 export const DASHBOARDS_PERMISSIONS: Record<TDashboardComponent, TPermission> =
   {
-    admissionByAgeType: "admission.read",
-    admissionBySex: "admission.read",
-    admissionByType: "admission.read",
-    admissionByWard: "admission.read",
-    dischargeByAgeType: "discharges.read",
-    dischargeBySex: "discharges.read",
-    dischargeByType: "discharges.read",
-    dischargeByWard: "discharges.read",
-    opdByAgeType: "opd.read",
-    opdBySex: "opd.read",
+    admissionBySex: "admissions.read",
+    admissionByAgeType: "admissions.read",
+    admissionByType: "admissions.read",
+    admissionByWard: "admissions.read",
+    dischargeBySex: "admissions.read",
+    dischargeByAgeType: "admissions.read",
+    dischargeByType: "admissions.read",
+    dischargeByWard: "admissions.read",
+    opdByAgeType: "opds.read",
+    opdBySex: "opds.read",
   };
 
 export const defaultLayoutConfig: Layouts = {

src/components/accessories/laboratory/EditLaboratoryContent.tsx

@@ -1,112 +1,112 @@
-import { Button } from "@material-ui/core";
-import { Cancel } from "@material-ui/icons";
-import React, { FC, useCallback, useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { useDispatch, useSelector } from "react-redux";
-import { useParams, useNavigate } from "react-router";
-import { IState } from "../../../types";
-import { initialFields } from "./consts";
-import "./styles.scss";
-import { useEffect } from "react";
-import { updateLabFields } from "../../../libraries/formDataHandling/functions";
-import {
-  createLabReset,
-  getLabWithRowsByCode,
-  getLabWithRowsByCodeReset,
-  updateLabReset,
-} from "../../../state/laboratories/actions";
-import { getExams } from "../../../state/exams/actions";
-import ExamForm from "./examForm/ExamForm";
-import { getPatientThunk } from "../../../state/patients/actions";
-import { Permission } from "../../../libraries/permissionUtils/Permission";
-
-export const EditLaboratoryContent: FC = () => {
-  const { t } = useTranslation();
-  const dispatch = useDispatch();
-  const { id } = useParams<{ id: string | undefined }>();
-  const navigate = useNavigate();
-
-  const creationMode = useMemo(() => (id ? false : true), [id]);
-
-  const labWithRows = useSelector(
-    (state: IState) => state.laboratories.getLabWithRowsByCode.data
-  );
-
-  const labToEdit = labWithRows?.laboratoryDTO;
-
-  useEffect(() => {
-    if (id) {
-      dispatch(getLabWithRowsByCode(parseInt(id)));
-    }
-  }, [id, dispatch]);
-
-  useEffect(() => {
-    if (labToEdit?.patientCode) {
-      dispatch(getPatientThunk(labToEdit.patientCode.toString()));
-    }
-  }, [labWithRows, dispatch, labToEdit?.patientCode]);
-
-  const handleReset = useCallback(() => {
-    dispatch(getLabWithRowsByCodeReset());
-    navigate(0);
-  }, [dispatch, navigate]);
-
-  const patient = useSelector(
-    (state: IState) => state.patients.selectedPatient.data
-  );
-
-  const open = useMemo(() => {
-    return creationMode
-      ? true
-      : labWithRows?.laboratoryDTO?.code !== undefined &&
-          patient?.code !== undefined;
-  }, [creationMode, labWithRows, patient]);
-
-  const formFields = useMemo(() => {
-    return creationMode
-      ? initialFields
-      : updateLabFields(initialFields, labToEdit ?? {});
-  }, [creationMode, labToEdit]);
-
-  useEffect(() => {
-    dispatch(getExams());
-  }, [dispatch]);
-
-  const handleBack = useCallback(() => {
-    if (creationMode) {
-      dispatch(createLabReset());
-    } else {
-      dispatch(updateLabReset());
-    }
-    navigate(-1);
-  }, [navigate, dispatch, creationMode]);
-
-  return (
-    <>
-      <div className="lab__header">
-        <div className="lab__title">{t("nav.laboratory")}</div>
-        <div className="lab__actions">
-          <Button
-            onClick={handleBack}
-            type="button"
-            variant="contained"
-            color="primary"
-          >
-            <Cancel fontSize="small" />
-            {t("common.discard")}
-          </Button>
-        </div>
-      </div>
-      <Permission require={creationMode ? "exam.create" : "exam.update"}>
-        {open && (
-          <ExamForm
-            fields={formFields}
-            handleReset={handleReset}
-            creationMode={creationMode}
-            labWithRowsToEdit={labWithRows ?? {}}
-          />
-        )}
-      </Permission>
-    </>
-  );
-};
+import { Button } from "@material-ui/core";
+import { Cancel } from "@material-ui/icons";
+import React, { FC, useCallback, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { useDispatch, useSelector } from "react-redux";
+import { useParams, useNavigate } from "react-router";
+import { IState } from "../../../types";
+import { initialFields } from "./consts";
+import "./styles.scss";
+import { useEffect } from "react";
+import { updateLabFields } from "../../../libraries/formDataHandling/functions";
+import {
+  createLabReset,
+  getLabWithRowsByCode,
+  getLabWithRowsByCodeReset,
+  updateLabReset,
+} from "../../../state/laboratories/actions";
+import { getExams } from "../../../state/exams/actions";
+import ExamForm from "./examForm/ExamForm";
+import { getPatientThunk } from "../../../state/patients/actions";
+import { Permission } from "../../../libraries/permissionUtils/Permission";
+
+export const EditLaboratoryContent: FC = () => {
+  const { t } = useTranslation();
+  const dispatch = useDispatch();
+  const { id } = useParams<{ id: string | undefined }>();
+  const navigate = useNavigate();
+
+  const creationMode = useMemo(() => (id ? false : true), [id]);
+
+  const labWithRows = useSelector(
+    (state: IState) => state.laboratories.getLabWithRowsByCode.data
+  );
+
+  const labToEdit = labWithRows?.laboratoryDTO;
+
+  useEffect(() => {
+    if (id) {
+      dispatch(getLabWithRowsByCode(parseInt(id)));
+    }
+  }, [id, dispatch]);
+
+  useEffect(() => {
+    if (labToEdit?.patientCode) {
+      dispatch(getPatientThunk(labToEdit.patientCode.toString()));
+    }
+  }, [labWithRows, dispatch, labToEdit?.patientCode]);
+
+  const handleReset = useCallback(() => {
+    dispatch(getLabWithRowsByCodeReset());
+    navigate(0);
+  }, [dispatch, navigate]);
+
+  const patient = useSelector(
+    (state: IState) => state.patients.selectedPatient.data
+  );
+
+  const open = useMemo(() => {
+    return creationMode
+      ? true
+      : labWithRows?.laboratoryDTO?.code !== undefined &&
+          patient?.code !== undefined;
+  }, [creationMode, labWithRows, patient]);
+
+  const formFields = useMemo(() => {
+    return creationMode
+      ? initialFields
+      : updateLabFields(initialFields, labToEdit ?? {});
+  }, [creationMode, labToEdit]);
+
+  useEffect(() => {
+    dispatch(getExams());
+  }, [dispatch]);
+
+  const handleBack = useCallback(() => {
+    if (creationMode) {
+      dispatch(createLabReset());
+    } else {
+      dispatch(updateLabReset());
+    }
+    navigate(-1);
+  }, [navigate, dispatch, creationMode]);
+
+  return (
+    <>
+      <div className="lab__header">
+        <div className="lab__title">{t("nav.laboratory")}</div>
+        <div className="lab__actions">
+          <Button
+            onClick={handleBack}
+            type="button"
+            variant="contained"
+            color="primary"
+          >
+            <Cancel fontSize="small" />
+            {t("common.discard")}
+          </Button>
+        </div>
+      </div>
+      <Permission require={creationMode ? "exams.create" : "exams.update"}>
+        {open && (
+          <ExamForm
+            fields={formFields}
+            handleReset={handleReset}
+            creationMode={creationMode}
+            labWithRowsToEdit={labWithRows ?? {}}
+          />
+        )}
+      </Permission>
+    </>
+  );
+};

src/components/accessories/laboratory/Exams.tsx

@@ -135,13 +135,13 @@ export const Exams: FC = () => {
   const errorMessage = useSelector((state: IState) =>
     state.laboratories.searchLabs.error?.message
       ? state.laboratories.searchLabs.error?.message
-      : "common.somethingwrong"
+      : t("common.somethingwrong")
   );
 
   const updateLabErrorMsg = useSelector((state: IState) =>
     state.laboratories.updateLab.error?.message
       ? state.laboratories.updateLab.error?.message
-      : "common.somethingwrong"
+      : t("common.somethingwrong")
   );
 
   let status = useSelector(
@@ -156,7 +156,7 @@ export const Exams: FC = () => {
     if (changeStatus === "SUCCESS") {
       dispatch(searchLabs({ ...filter, paged: true }));
     }
-  }, [changeStatus, dispatch, filter]);
+  }, [changeStatus]);
 
   /**
    * I commented the following lignes because they were causing issue with filter.
@@ -180,7 +180,7 @@ export const Exams: FC = () => {
           />
         )}
         {status !== "LOADING" && (
-          <Permission require="exam.read">
+          <Permission require="exams.read">
             <ExamFilterForm
               onSubmit={onSubmit}
               fields={fields}
@@ -190,11 +190,11 @@ export const Exams: FC = () => {
               <InfoBox type="info" message={t("common.emptydata")} />
             )}
             {status === "FAIL" && (
-              <InfoBox type="error" message={t(errorMessage)} />
+              <InfoBox type="error" message={errorMessage} />
             )}
             {changeStatus === "FAIL" && (
               <div ref={infoBoxRef} className="info-box-container">
-                <InfoBox type="error" message={t(updateLabErrorMsg)} />
+                <InfoBox type="error" message={updateLabErrorMsg} />
               </div>
             )}
             {status === "SUCCESS" && (

src/components/accessories/laboratory/filter/ExamFilterForm.tsx

@@ -252,7 +252,7 @@ export const ExamFilterForm: FC<IExamFilterProps> = ({
           <form className="filterLabForm__form" onSubmit={formik.handleSubmit}>
             <div className="filterLabForm__section">
               <div className="filterLabForm__section_content">
-                <Permission require="patient.read">
+                <Permission require="patients.read">
                   <div className="fullWidth filterLabForm__item">
                     <PatientPicker
                       theme={"regular"}

src/components/accessories/laboratory/table/ExamTable.tsx

@@ -42,8 +42,8 @@ export const ExamTable: FC<IExamTableProps> = ({
 }) => {
   const { t } = useTranslation();
   const dispatch = useDispatch();
-  const canUpdate = usePermission("exam.update");
-  const canDelete = usePermission("exam.delete");
+  const canUpdate = usePermission("exams.update");
+  const canDelete = usePermission("exams.delete");
   const deleteStatus = useSelector<IState, any>(
     (state: IState) => state.laboratories.deleteLab.status
   );

src/components/accessories/opds/Opds.tsx

@@ -65,7 +65,7 @@ export const Opds: FC = () => {
           switch (status) {
             case "FAIL":
               return (
-                <Permission require="opd.read">
+                <Permission require="opds.read">
                   <OpdFilterForm
                     onSubmit={onSubmit}
                     fields={fields}
@@ -84,7 +84,7 @@ export const Opds: FC = () => {
 
             case "SUCCESS_EMPTY":
               return (
-                <Permission require="opd.read">
+                <Permission require="opds.read">
                   <OpdFilterForm
                     onSubmit={onSubmit}
                     fields={fields}
@@ -96,7 +96,7 @@ export const Opds: FC = () => {
 
             case "SUCCESS":
               return (
-                <Permission require="opd.read">
+                <Permission require="opds.read">
                   <OpdFilterForm
                     onSubmit={onSubmit}
                     fields={fields}

src/components/accessories/opds/filter/OpdFilterForm.tsx

@@ -469,7 +469,7 @@ export const OpdFilterForm: FC<IOpdFilterProps> = ({
                 {t("opd.patient")}
               </div>
               <div className="filterOpdForm__section_content">
-                <Permission require="patient.read">
+                <Permission require="patients.read">
                   <div className="filterOpdForm__item">
                     <PatientPicker
                       theme={"regular"}