refactor can update functions

Author: ashercoren

vim--ai-scribe--react/src/components/molecules/SoapSection.tsx

@@ -170,7 +170,9 @@ export const SoapSection = ({
           fullWidth
           className="py-3 w-2/3 self-center"
           disabled={!isWriteAvailable}
-          tooltip={!isWriteAvailable ? "EHR write access missing" : "" }
+          tooltip={
+            !isWriteAvailable ? "Can't write to EHR in current state" : ""
+          }
         >
           Push to EHR
         </Button>

vim--ai-scribe--react/src/components/organisms/RecordingTab/RecordingTab.tsx

@@ -1,6 +1,6 @@
 import { Mic, User } from "lucide-react";
 import { Button } from "../../atoms/Button";
-import { useProviderName } from "../ai-scribe-demo/useProviderName";
+import { useProviderName } from "../../../vimOs/useProviderName";
 
 export const RecordingTab = ({
   patientName,

vim--ai-scribe--react/src/components/organisms/notes-tab/NotesSections.tsx

@@ -13,19 +13,15 @@ interface NotePanelProps {
 }
 
 const useUpdateSubjective = () => {
-  const encounterUpdates = useUpdateEncounterSubscription<"subjective">(
-    {
-      subjective: {
-        generalNotes: true,
-        chiefComplaintNotes: true,
-        historyOfPresentIllnessNotes: true,
-        reviewOfSystemsNotes: true,
-      },
-    },
+  const encounterUpdates = useUpdateEncounterSubscription(
     "subjective",
     {
-      subjective: ["chiefComplaintNotes", "reviewOfSystemsNotes"],
-    }
+      generalNotes: true,
+      chiefComplaintNotes: true,
+      historyOfPresentIllnessNotes: true,
+      reviewOfSystemsNotes: true,
+    },
+    ["chiefComplaintNotes", "reviewOfSystemsNotes"]
   );
 
   const { updateSubscriptionField, canUpdateSubscriptionParams } =
@@ -47,17 +43,13 @@ const useUpdateSubjective = () => {
 };
 
 const useUpdateObjective = () => {
-  const encounterUpdates = useUpdateEncounterSubscription<"objective">(
-    {
-      objective: {
-        generalNotes: true,
-        physicalExamNotes: true,
-      },
-    },
+  const encounterUpdates = useUpdateEncounterSubscription(
     "objective",
     {
-      objective: ["generalNotes", "physicalExamNotes"],
-    }
+      generalNotes: true,
+      physicalExamNotes: true,
+    },
+    ["generalNotes", "physicalExamNotes"]
   );
 
   const { updateSubscriptionField, canUpdateSubscriptionParams } =
@@ -79,16 +71,12 @@ const useUpdateObjective = () => {
 };
 
 const useUpdateAssessment = () => {
-  const encounterUpdates = useUpdateEncounterSubscription<"assessment">(
-    {
-      assessment: {
-        generalNotes: true,
-      },
-    },
+  const encounterUpdates = useUpdateEncounterSubscription(
     "assessment",
     {
-      assessment: ["generalNotes"],
-    }
+      generalNotes: true,
+    },
+    ["generalNotes"]
   );
 
   const { updateSubscriptionField, canUpdateSubscriptionParams } =
@@ -110,16 +98,12 @@ const useUpdateAssessment = () => {
 };
 
 const useUpdatePlan = () => {
-  const encounterUpdates = useUpdateEncounterSubscription<"plan">(
-    {
-      plan: {
-        generalNotes: true,
-      },
-    },
+  const encounterUpdates = useUpdateEncounterSubscription(
     "plan",
     {
-      plan: ["generalNotes"],
-    }
+      generalNotes: true,
+    },
+    ["generalNotes"]
   );
 
   const { updateSubscriptionField, canUpdateSubscriptionParams } =
@@ -167,33 +151,31 @@ export const NotesSections = ({
         isHighlighted={isHighlighted("subjective")}
         isWriteAvailable={canUpdateSubjectiveNote}
         renderHighlightedText={renderHighlightedText}
-        onPushToEHR={() => {
-          updateSubjectiveNote();
-        }}
+        onPushToEHR={updateSubjectiveNote}
       />
       <SoapSection
         title="Objective"
         fieldName="objective"
         isHighlighted={isHighlighted("objective")}
         isWriteAvailable={canUpdateObjectiveNote}
         renderHighlightedText={renderHighlightedText}
-        onPushToEHR={() => updateObjectiveNote()}
+        onPushToEHR={updateObjectiveNote}
       />
       <SoapSection
         title="Assessment"
         fieldName="assessment"
         isHighlighted={isHighlighted("assessment")}
         isWriteAvailable={canUpdateAssessmentNote}
         renderHighlightedText={renderHighlightedText}
-        onPushToEHR={() => updateAssessmentNote()}
+        onPushToEHR={updateAssessmentNote}
       />
       <SoapSection
         title="Plan"
         fieldName="plan"
         isHighlighted={isHighlighted("plan")}
         isWriteAvailable={canUpdatePlanNote}
         renderHighlightedText={renderHighlightedText}
-        onPushToEHR={() => updatePlanNote()}
+        onPushToEHR={updatePlanNote}
       />
     </div>
   );

vim--ai-scribe--react/src/vimOs/useUpdateEncounter.ts

@@ -2,51 +2,52 @@ import { useEffect, useMemo, useState } from "react";
 import type { EHR } from "vim-os-js-browser/types";
 import { useVimOsContext } from "@/providers/VimOSContext";
 
-const calcIsUpdatable = (
-  sectionName: keyof EHR.UpdateEncounterParams,
-  priorityList: Partial<Record<keyof EHR.UpdateEncounterParams, string[]>>,
+type SectionField<T extends keyof EHR.UpdateEncounterParams> =
+  keyof NonNullable<EHR.UpdateEncounterParams[T]>;
+
+type SectionFields<T extends keyof EHR.UpdateEncounterParams> = Array<
+  SectionField<T>
+>;
+
+const calcIsUpdatable = <T extends keyof EHR.UpdateEncounterParams>(
+  sectionName: T,
+  priorityList: SectionFields<T>,
   details: EHR.CanUpdateEncounterParams
-) => {
-  if (sectionName && priorityList) {
-    const section = details[sectionName] || {};
-    const priorities = priorityList[sectionName] || [];
-    const updatableField = priorities?.find(
-      (fieldName) => section[fieldName as keyof typeof section] === true
-    );
-    
-    return updatableField;
-  }
+): SectionFields<T> => {
+  const section = details[sectionName] || {};
+  const updatableFields = priorityList.filter(
+    (fieldName) => section[fieldName as keyof typeof section] === true
+  );
+
+  return updatableFields;
 };
 
 export const useUpdateEncounterSubscription = <
   T extends keyof EHR.UpdateEncounterParams
 >(
-  subscriptionParams: EHR.CanUpdateEncounterParams,
   sectionName: T,
-  priorityList: Partial<Record<keyof EHR.UpdateEncounterParams, string[]>> // TODO Support Actual Fieldname // Partial<Record<T, Array<keyof EHR.UpdateEncounterParams[T]>>>
+  subscriptionParams: EHR.CanUpdateEncounterParams[T],
+  priorityList: SectionFields<T>
 ) => {
   const vimOS = useVimOsContext();
   const [canUpdateSubscriptionParams, setCanUpdateSubscriptionParams] =
     useState<boolean>(false);
-  const [subscriptionUpdatableField, setSubscriptionUpdatableField] =
-    useState<string>();
+  const [subscriptionUpdatableFields, setSubscriptionUpdatableFields] =
+    useState<SectionFields<T>>();
 
   useEffect(() => {
     const onUpdate = () => {
-      if (subscriptionParams) {
-        const { details } =
-          vimOS.ehr.resourceUpdater.canUpdateEncounter(subscriptionParams);
-        if (sectionName && priorityList) {
-          const updatableField = calcIsUpdatable(
-            sectionName,
-            priorityList,
-            details
-          );
-          const canUpdate = updatableField !== undefined;
-          setCanUpdateSubscriptionParams(canUpdate);
-          setSubscriptionUpdatableField(updatableField);
-        }
-      }
+      const { details } = vimOS.ehr.resourceUpdater.canUpdateEncounter({
+        [sectionName]: subscriptionParams,
+      });
+      const updatableFields = calcIsUpdatable(
+        sectionName,
+        priorityList,
+        details
+      );
+      const canUpdate = updatableFields.length > 0;
+      setCanUpdateSubscriptionParams(canUpdate);
+      setSubscriptionUpdatableFields(updatableFields);
     };
 
     vimOS.ehr.resourceUpdater.subscribe("encounter", onUpdate);
@@ -63,7 +64,7 @@ export const useUpdateEncounterSubscription = <
   return useMemo(
     () => ({
       canUpdateSubscriptionParams,
-      subscriptionUpdatableField,
+      subscriptionUpdatableFields,
       updateSubscriptionField: (content: string) => {
         if (!sectionName || !canUpdateSubscriptionParams) {
           return;
@@ -86,7 +87,7 @@ export const useUpdateEncounterSubscription = <
               variant: "destructive",
               title: "Uh oh! Something went wrong.",
               sectionName,
-              subscriptionUpdatableField,
+              subscriptionUpdatableFields,
               description: error ? JSON.stringify(error) : "An error occurred.",
             });
           });
@@ -95,7 +96,7 @@ export const useUpdateEncounterSubscription = <
     [
       canUpdateSubscriptionParams,
       sectionName,
-      subscriptionUpdatableField,
+      subscriptionUpdatableFields,
       vimOS.ehr.resourceUpdater,
     ]
   );