{errors && errors.length !== 0
? errors.map((error: any) => {
return (
- {_.startCase(_.camelCase(error[0][0]))} -{" "}
- {error[0][1]}
+ {error[0][0].toLowerCase()} -{" "}
+ {error[0][1].toLowerCase()}
);
})
diff --git a/src/Components/Facility/Investigations/InvestigationTable.tsx b/src/Components/Facility/Investigations/InvestigationTable.tsx
index 8149e18496b..54e7e50bdc7 100644
--- a/src/Components/Facility/Investigations/InvestigationTable.tsx
+++ b/src/Components/Facility/Investigations/InvestigationTable.tsx
@@ -2,7 +2,6 @@ import ButtonV2 from "../../Common/components/ButtonV2";
import CareIcon from "../../../CAREUI/icons/CareIcon";
import { SelectFormField } from "../../Form/FormFields/SelectFormField";
import TextFormField from "../../Form/FormFields/TextFormField";
-import _ from "lodash";
import { classNames } from "../../../Utils/utils";
import { useState } from "react";
diff --git a/src/Components/Facility/Investigations/Reports/index.tsx b/src/Components/Facility/Investigations/Reports/index.tsx
index ab5380c62ca..2db928386f1 100644
--- a/src/Components/Facility/Investigations/Reports/index.tsx
+++ b/src/Components/Facility/Investigations/Reports/index.tsx
@@ -17,7 +17,7 @@ import { InvestigationResponse } from "./types";
import Loading from "../../../Common/Loading";
import Page from "../../../Common/components/Page";
import ReportTable from "./ReportTable";
-import _ from "lodash";
+import { chain } from "lodash-es";
import { useDispatch } from "react-redux";
import { useRef } from "react";
@@ -175,7 +175,7 @@ const InvestigationReports = ({ id }: any) => {
})
);
- const investigationList = _.chain(data)
+ const investigationList = chain(data)
.compact()
.flatten()
.map((i) => ({
diff --git a/src/Components/Facility/Investigations/Reports/utils.tsx b/src/Components/Facility/Investigations/Reports/utils.tsx
index 485a3e1d5f4..46b95800339 100644
--- a/src/Components/Facility/Investigations/Reports/utils.tsx
+++ b/src/Components/Facility/Investigations/Reports/utils.tsx
@@ -1,20 +1,20 @@
-import _ from "lodash";
+import { memoize, chain, findIndex } from "lodash-es";
import { InvestigationResponse } from "./types";
-export const transformData = _.memoize((data: InvestigationResponse) => {
- const sessions = _.chain(data)
+export const transformData = memoize((data: InvestigationResponse) => {
+ const sessions = chain(data)
.map((value) => value.session_object)
.uniqBy("session_external_id")
.orderBy("session_created_date", "desc")
.value();
- const groupByInvestigation = _.chain(data)
+ const groupByInvestigation = chain(data)
.groupBy("investigation_object.external_id")
.values()
.value();
const reqData = groupByInvestigation.map((value) => {
const sessionValues = Array.from({ length: sessions.length });
value.forEach((val) => {
- const sessionIndex = _.findIndex(sessions, [
+ const sessionIndex = findIndex(sessions, [
"session_external_id",
val.session_object.session_external_id,
]);
@@ -55,7 +55,7 @@ export const transformData = _.memoize((data: InvestigationResponse) => {
return { sessions, data: reqData };
});
-export const getColorIndex = _.memoize(
+export const getColorIndex = memoize(
({ max, min, value }: { min?: number; max?: number; value?: number }) => {
if (!max && min && value) {
// 1 => yellow color
diff --git a/src/Components/Facility/Investigations/ShowInvestigation.tsx b/src/Components/Facility/Investigations/ShowInvestigation.tsx
index 4c2826f6eea..4b8d1d065a7 100644
--- a/src/Components/Facility/Investigations/ShowInvestigation.tsx
+++ b/src/Components/Facility/Investigations/ShowInvestigation.tsx
@@ -9,7 +9,7 @@ import {
import PageTitle from "../../Common/PageTitle";
import InvestigationTable from "./InvestigationTable";
-import _ from "lodash";
+import { set, chain } from "lodash-es";
import { navigate } from "raviger";
import * as Notification from "../../../Utils/Notifications.js";
@@ -110,7 +110,7 @@ export default function ShowInvestigation(props: any) {
const handleValueChange = (value: any, name: string) => {
const changedFields = { ...state.changedFields };
- _.set(changedFields, name, value);
+ set(changedFields, name, value);
dispatch({ type: "set_changed_fields", changedFields });
};
@@ -147,7 +147,7 @@ export default function ShowInvestigation(props: any) {
};
const handleUpdateCancel = useCallback(() => {
- const changedValues = _.chain(state.initialValues)
+ const changedValues = chain(state.initialValues)
.map((val: any, _key: string) => ({
id: val?.id,
initialValue: val?.notes || val?.value || null,
diff --git a/src/Components/Facility/Investigations/Table.tsx b/src/Components/Facility/Investigations/Table.tsx
index 4d6ce4c2340..4bd7e841543 100644
--- a/src/Components/Facility/Investigations/Table.tsx
+++ b/src/Components/Facility/Investigations/Table.tsx
@@ -1,7 +1,7 @@
import { FieldChangeEvent } from "../../Form/FormFields/Utils";
import { SelectFormField } from "../../Form/FormFields/SelectFormField";
import TextFormField from "../../Form/FormFields/TextFormField";
-import _ from "lodash";
+import { set } from "lodash-es";
import { useState } from "react";
const TestRow = ({ data, value, onChange, i }: any) => {
@@ -59,7 +59,7 @@ export const TestTable = ({ title, data, state, dispatch }: any) => {
const handleValueChange = (value: any, name: string) => {
const form = { ...state };
- _.set(form, name, value);
+ set(form, name, value);
dispatch({ type: "set_form", form });
};
diff --git a/src/Components/Facility/LegacyFacilityCNS.tsx b/src/Components/Facility/LegacyFacilityCNS.tsx
index b3a933b9a9f..5b0005c9daf 100644
--- a/src/Components/Facility/LegacyFacilityCNS.tsx
+++ b/src/Components/Facility/LegacyFacilityCNS.tsx
@@ -16,7 +16,7 @@ import Pagination from "../Common/Pagination";
import { PatientModel } from "../Patient/models";
import { FacilityModel } from "./models";
import AutocompleteFormField from "../Form/FormFields/Autocomplete";
-import { uniqBy } from "lodash";
+import { uniqBy } from "lodash-es";
import DialogModal from "../Common/Dialog";
import { LegacyMonitorCard } from "./LegacyMonitorCard";
diff --git a/src/Components/Form/AutoCompleteAsync.tsx b/src/Components/Form/AutoCompleteAsync.tsx
index 5f33c6388c5..db2d1e888df 100644
--- a/src/Components/Form/AutoCompleteAsync.tsx
+++ b/src/Components/Form/AutoCompleteAsync.tsx
@@ -1,6 +1,6 @@
import { useEffect, useState, useMemo } from "react";
import { Combobox } from "@headlessui/react";
-import { debounce } from "lodash";
+import { debounce } from "lodash-es";
import { DropdownTransition } from "../Common/components/HelperComponents";
import CareIcon from "../../CAREUI/icons/CareIcon";
import {
diff --git a/src/Components/Form/Form.tsx b/src/Components/Form/Form.tsx
index e934c4ffe0e..66383616034 100644
--- a/src/Components/Form/Form.tsx
+++ b/src/Components/Form/Form.tsx
@@ -1,4 +1,4 @@
-import { isEmpty, omitBy } from "lodash";
+import { isEmpty, omitBy } from "lodash-es";
import { useEffect, useMemo, useState } from "react";
import { classNames } from "../../Utils/utils";
import { Cancel, Submit } from "../Common/components/ButtonV2";
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index c515e7584c1..4fc6fef7fbe 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -61,7 +61,7 @@ import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
import TextFormField from "../Form/FormFields/TextFormField";
import TransferPatientDialog from "../Facility/TransferPatientDialog";
import countryList from "../../Common/static/countries.json";
-import { debounce } from "lodash";
+import { debounce } from "lodash-es";
import useAppHistory from "../../Common/hooks/useAppHistory";
import useConfig from "../../Common/hooks/useConfig";
diff --git a/src/Components/Patient/SampleDetails.tsx b/src/Components/Patient/SampleDetails.tsx
index e29df92f47f..672f3905792 100644
--- a/src/Components/Patient/SampleDetails.tsx
+++ b/src/Components/Patient/SampleDetails.tsx
@@ -7,7 +7,6 @@ import ButtonV2 from "../Common/components/ButtonV2";
import Card from "../../CAREUI/display/Card";
import { FileUpload } from "./FileUpload";
import Page from "../Common/components/Page";
-import _ from "lodash";
import { formatAge, formatDateTime } from "../../Utils/utils";
import { getTestSample } from "../../Redux/actions";
@@ -258,12 +257,16 @@ export const SampleDetails = ({ id }: DetailRoute) => {
- Status: {" "}
- {_.startCase(_.camelCase(flow.status))}
+
+ Status:{" "}
+ {" "}
+ {flow.status}
- Label:{" "}
- {_.capitalize(flow.notes)}
+
+ Label:
+ {" "}
+ {flow.notes?.toLowerCase()}
Created On :{" "}
@@ -301,12 +304,16 @@ export const SampleDetails = ({ id }: DetailRoute) => {
- Status:
- {_.startCase(_.camelCase(sampleDetails.status))}
+
+ Status:{" "}
+
+ {sampleDetails.status}
- Result:
- {_.startCase(_.camelCase(sampleDetails.result))}
+
+ Result:{" "}
+
+ {sampleDetails.result}
Patient:
@@ -339,11 +346,11 @@ export const SampleDetails = ({ id }: DetailRoute) => {
)}
{sampleDetails.doctor_name && (
-
+
Doctor's Name:{" "}
- {_.startCase(_.camelCase(sampleDetails.doctor_name))}
+ {sampleDetails.doctor_name}
)}
{sampleDetails.diagnosis && (
@@ -423,10 +430,10 @@ export const SampleDetails = ({ id }: DetailRoute) => {
)}
{sampleDetails.sample_type && (
-
+
Sample Type:{" "}
- {_.startCase(_.camelCase(sampleDetails.sample_type))}
+ {sampleDetails.sample_type}
)}
diff --git a/src/Components/Patient/SampleTestCard.tsx b/src/Components/Patient/SampleTestCard.tsx
index 847be365181..0c299f0a1b5 100644
--- a/src/Components/Patient/SampleTestCard.tsx
+++ b/src/Components/Patient/SampleTestCard.tsx
@@ -6,7 +6,6 @@ import { SAMPLE_TEST_STATUS } from "../../Common/constants";
import { patchSample } from "../../Redux/actions";
import * as Notification from "../../Utils/Notifications";
import UpdateStatusDialog from "./UpdateStatusDialog";
-import _ from "lodash";
import { formatDateTime } from "../../Utils/utils";
import ButtonV2 from "../Common/components/ButtonV2";
import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
@@ -91,8 +90,8 @@ export const SampleTestCard = (props: SampleDetailsProps) => {
Status{" "}
-
- {_.startCase(_.camelCase(itemData.status))}
+
+ {itemData.status?.toLowerCase()}
@@ -101,10 +100,11 @@ export const SampleTestCard = (props: SampleDetailsProps) => {
Sample Type{" "}
-
- {itemData.sample_type !== "OTHER TYPE"
+
+ {(itemData.sample_type !== "OTHER TYPE"
? itemData.sample_type
- : itemData.sample_type_other}
+ : itemData.sample_type_other
+ )?.toLowerCase()}
@@ -125,8 +125,8 @@ export const SampleTestCard = (props: SampleDetailsProps) => {
Result{" "}
-
- {_.startCase(_.camelCase(itemData.result))}
+
+ {itemData.result?.toLowerCase()}
diff --git a/src/Redux/fireRequest.tsx b/src/Redux/fireRequest.tsx
index 9859ea540b6..bf083e23a92 100644
--- a/src/Redux/fireRequest.tsx
+++ b/src/Redux/fireRequest.tsx
@@ -1,6 +1,6 @@
import * as Notification from "../Utils/Notifications.js";
-import { isEmpty, omitBy } from "lodash";
+import { isEmpty, omitBy } from "lodash-es";
import { LocalStorageKeys } from "../Common/constants";
import api from "./api";
diff --git a/src/Utils/Notifications.js b/src/Utils/Notifications.js
index b4393049531..298622c35ca 100644
--- a/src/Utils/Notifications.js
+++ b/src/Utils/Notifications.js
@@ -1,6 +1,6 @@
import { alert, Stack, defaultModules } from "@pnotify/core";
import * as PNotifyMobile from "@pnotify/mobile";
-import _ from "lodash";
+import { startCase, camelCase } from "lodash-es";
defaultModules.set(PNotifyMobile, {});
@@ -43,7 +43,7 @@ const notifyError = (error) => {
errorMsg = error.detail;
} else {
for (let [key, value] of Object.entries(error)) {
- let keyName = _.startCase(_.camelCase(key));
+ let keyName = startCase(camelCase(key));
if (Array.isArray(value)) {
const uniques = [...new Set(value)];
errorMsg += `${keyName} - ${uniques.splice(0, 5).join(", ")}`;