Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show ICD-11 Diagnosis functionality unavailable error if issues with Redis #7973

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState } from "react";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import AutocompleteFormField from "../../Form/FormFields/Autocomplete";
import {
Expand All @@ -10,6 +10,7 @@ import ConditionVerificationStatusMenu from "../ConditionVerificationStatusMenu"
import { classNames, mergeQueryOptions } from "../../../Utils/utils";
import useQuery from "../../../Utils/request/useQuery";
import routes from "../../../Redux/api";
import { Error } from "../../../Utils/Notifications";

interface AddICD11DiagnosisProps {
className?: string;
Expand All @@ -24,7 +25,15 @@ export default function AddICD11Diagnosis(props: AddICD11DiagnosisProps) {
const [adding, setAdding] = useState(false);
const hasError = !!props.disallowed.find((d) => d?.id === selected?.id);

const { data, loading, refetch } = useQuery(routes.listICD11Diagnosis);
const { res, data, loading, refetch } = useQuery(routes.listICD11Diagnosis, {
silent: true,
});

useEffect(() => {
if (res?.status === 500) {
Error({ msg: "ICD-11 Diagnosis functionality is facing issues." });
}
}, [res?.status]);

const handleAdd = async (status: CreateDiagnosis["verification_status"]) => {
if (!selected) return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,11 @@ export default function ConsultationDiagnosisEntry(props: Props) {
? "font-semibold text-primary-500"
: "font-normal",
!isActive && "text-gray-500 line-through",
!object.diagnosis_object?.label && "italic text-gray-500",
)}
>
{object.diagnosis_object?.label}
{object.diagnosis_object?.label ||
"Unable to retrieve this ICD-11 diagnosis at the moment"}
</span>
<div className="flex items-center justify-end gap-2 sm:flex-row md:absolute md:inset-y-0 md:right-2 md:justify-normal">
<div className="w-32">
Expand Down
11 changes: 9 additions & 2 deletions src/Components/Diagnosis/DiagnosesListAccordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
ConsultationDiagnosis,
} from "./types";
import { useTranslation } from "react-i18next";
import { compareBy } from "../../Utils/utils";
import { classNames, compareBy } from "../../Utils/utils";
import { useState } from "react";
import CareIcon from "../../CAREUI/icons/CareIcon";
import ButtonV2 from "../Common/components/ButtonV2";
Expand Down Expand Up @@ -96,7 +96,14 @@ const DiagnosesOfStatus = ({ diagnoses }: Props) => {
<ul className="text-sm">
{diagnoses.map((diagnosis) => (
<li key={diagnosis.id} className="flex items-center gap-2">
<span>{diagnosis.diagnosis_object?.label}</span>
<span
className={classNames(
!diagnosis.diagnosis_object?.label && "italic text-gray-500",
)}
>
{diagnosis.diagnosis_object?.label ||
"Unable to resolve ICD-11 diagnosis at the moment"}
</span>
</li>
))}
</ul>
Expand Down
6 changes: 5 additions & 1 deletion src/Components/Facility/ConsultationForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,11 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
>
<FieldLabel>Procedures</FieldLabel>
<ProcedureBuilder
procedures={state.form.procedure}
procedures={
Array.isArray(state.form.procedure)
? state.form.procedure
: []
}
setProcedures={(procedure) => {
handleFormFieldChange({
name: "procedure",
Expand Down
11 changes: 10 additions & 1 deletion src/Components/Patient/DiagnosesFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import useQuery from "../../Utils/request/useQuery";
import routes from "../../Redux/api";
import { mergeQueryOptions } from "../../Utils/utils";
import { debounce } from "lodash-es";
import { Error } from "../../Utils/Notifications";

export const FILTER_BY_DIAGNOSES_KEYS = [
"diagnoses",
Expand Down Expand Up @@ -34,7 +35,15 @@ interface Props {
export default function DiagnosesFilter(props: Props) {
const { t } = useTranslation();
const [diagnoses, setDiagnoses] = useState<ICD11DiagnosisModel[]>([]);
const { data, loading, refetch } = useQuery(routes.listICD11Diagnosis);
const { res, data, loading, refetch } = useQuery(routes.listICD11Diagnosis, {
silent: true,
});

useEffect(() => {
if (res?.status === 500) {
Error({ msg: "ICD-11 Diagnosis functionality is facing issues." });
}
}, [res?.status]);

useEffect(() => {
if (!props.value) {
Expand Down
Loading