Skip to content

[ENG-581] Optimize complete service request logic by remove duplication of mutation #16462

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.

Sign up for GitHub

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

Open
NikhilA8606 wants to merge 1 commit into
base: develop
Choose a base branch
from
+56 −60
Open

[ENG-581] Optimize complete service request logic by remove duplication of mutation #16462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
116 changes: 56 additions & 60 deletions src/pages/Facility/services/serviceRequests/ServiceRequestShow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import activityDefinitionApi from "@/types/emr/activityDefinition/activityDefini
import { DiagnosticReportStatus } from "@/types/emr/diagnosticReport/diagnosticReport";
import {
EDITABLE_SERVICE_REQUEST_STATUSES,
ServiceRequestReadSpec,
Status,
} from "@/types/emr/serviceRequest/serviceRequest";
import serviceRequestApi from "@/types/emr/serviceRequest/serviceRequestApi";
Expand Down Expand Up @@ -95,7 +96,6 @@ export default function ServiceRequestShow({
const [isPrintingAllQRCodes, setIsPrintingAllQRCodes] = useState(false);
const [isQRCodeSheetOpen, setIsQRCodeSheetOpen] = useState(false);
const [isCompleteDialogOpen, setIsCompleteDialogOpen] = useState(false);
const [completionNote, setCompletionNote] = useState("");
const [selectedSpecimenDefinition, setSelectedSpecimenDefinition] =
useState<SpecimenDefinitionRead | null>(null);

Expand Down Expand Up @@ -160,22 +160,6 @@ export default function ServiceRequestShow({
},
});

const {
mutate: completeServiceRequest,
isPending: isCompletingServiceRequest,
} = useMutation({
mutationFn: mutate(serviceRequestApi.updateServiceRequest, {
pathParams: { facilityId, serviceRequestId },
}),
onSuccess: () => {
toast.success(t("service_request_completed"));
setIsCompleteDialogOpen(false);
queryClient.invalidateQueries({
queryKey: ["serviceRequest", facilityId, serviceRequestId],
});
},
});

const createDraftSpecimen = (requirement: SpecimenDefinitionRead) => {
const matchingSpecimens = request?.specimens.filter(
(spec) => spec.specimen_definition?.id === requirement.id,
Expand Down Expand Up @@ -644,11 +628,7 @@ export default function ServiceRequestShow({
<Button
variant="primary"
className="font-semibold shrink-0"
onClick={() => {
setCompletionNote(request.note ?? "");
setIsCompleteDialogOpen(true);
}}
disabled={isCompletingServiceRequest}
onClick={() => setIsCompleteDialogOpen(true)}
>
{t("mark_as_complete")}
<ShortcutBadge actionId="mark-as-complete" />
Expand All @@ -659,9 +639,7 @@ export default function ServiceRequestShow({
{isMobile ? (
<Sheet
open={isCompleteDialogOpen}
onOpenChange={(open) => {
if (!isCompletingServiceRequest) setIsCompleteDialogOpen(open);
}}
onOpenChange={setIsCompleteDialogOpen}
>
Comment thread
NikhilA8606 marked this conversation as resolved.
Comment thread
NikhilA8606 marked this conversation as resolved.
<SheetContent side="bottom">
<SheetHeader>
Expand All @@ -671,26 +649,18 @@ export default function ServiceRequestShow({
</SheetDescription>
</SheetHeader>
<CompletionNoteContent
note={completionNote}
isUpdating={isCompletingServiceRequest}
onNoteChange={setCompletionNote}
onComplete={() =>
completeServiceRequest({
status: Status.completed,
note: completionNote.trim() || null,
locations: request.locations.map((loc) => loc.id),
})
}
facilityId={facilityId}
serviceRequestId={serviceRequestId}
setIsCompleteDialogOpen={setIsCompleteDialogOpen}
onCancel={() => setIsCompleteDialogOpen(false)}
serviceRequest={request}
/>
</SheetContent>
</Sheet>
) : (
<Dialog
open={isCompleteDialogOpen}
onOpenChange={(open) => {
if (!isCompletingServiceRequest) setIsCompleteDialogOpen(open);
}}
onOpenChange={setIsCompleteDialogOpen}
>
Comment thread
NikhilA8606 marked this conversation as resolved.
<DialogContent className="sm:max-w-lg shadow-lg border-white/20">
<DialogHeader>
Expand All @@ -700,17 +670,11 @@ export default function ServiceRequestShow({
</DialogDescription>
</DialogHeader>
<CompletionNoteContent
note={completionNote}
isUpdating={isCompletingServiceRequest}
onNoteChange={setCompletionNote}
onComplete={() =>
completeServiceRequest({
status: Status.completed,
note: completionNote.trim() || null,
locations: request.locations.map((loc) => loc.id),
})
}
facilityId={facilityId}
serviceRequestId={serviceRequestId}
setIsCompleteDialogOpen={setIsCompleteDialogOpen}
onCancel={() => setIsCompleteDialogOpen(false)}
serviceRequest={request}
/>
</DialogContent>
</Dialog>
Expand All @@ -722,21 +686,39 @@ export default function ServiceRequestShow({
}

interface CompletionNoteContentProps {
note: string;
isUpdating: boolean;
onNoteChange: (note: string) => void;
onComplete: () => void;
facilityId: string;
serviceRequestId: string;
onCancel: () => void;
setIsCompleteDialogOpen: (open: boolean) => void;
serviceRequest: ServiceRequestReadSpec;
}

const CompletionNoteContent = ({
note,
isUpdating,
onNoteChange,
onComplete,
facilityId,
serviceRequestId,
onCancel,
setIsCompleteDialogOpen,
serviceRequest,
}: CompletionNoteContentProps) => {
const { t } = useTranslation();
const queryClient = useQueryClient();
const [note, setNote] = useState(serviceRequest.note ?? "");

const {
mutate: completeServiceRequest,
isPending: isCompletingServiceRequest,
} = useMutation({
mutationFn: mutate(serviceRequestApi.updateServiceRequest, {
pathParams: { facilityId, serviceRequestId },
}),
onSuccess: () => {
toast.success(t("service_request_completed"));
setIsCompleteDialogOpen(false);
queryClient.invalidateQueries({
queryKey: ["serviceRequest", facilityId, serviceRequestId],
});
},
});

return (
<>
Expand All @@ -746,18 +728,32 @@ const CompletionNoteContent = ({
</p>
<Textarea
value={note}
onChange={(e) => onNoteChange(e.target.value)}
onChange={(e) => setNote(e.target.value)}
placeholder={t("enter_note")}
className="min-h-14"
aria-label={t("completion_note")}
/>
</div>
<div className="flex flex-row items-start justify-start gap-2 pt-2 sm:pt-0">
<Button variant="primary" onClick={onComplete} disabled={isUpdating}>
<Button
variant="primary"
onClick={() =>
completeServiceRequest({
status: Status.completed,
note: note.trim() || null,
locations: serviceRequest.locations.map((loc) => loc.id),
})
}
disabled={isCompletingServiceRequest}
>
<CheckIcon className="size-4" />
{isUpdating ? t("updating") : `${t("save_and_complete")}`}
{isCompletingServiceRequest ? t("updating") : t("save_and_complete")}
</Button>
<Button variant="outline" onClick={onCancel} disabled={isUpdating}>
<Button
variant="outline"
onClick={onCancel}
disabled={isCompletingServiceRequest}
>
{t("cancel")}
</Button>
</div>
Expand Down
Loading