Merge branch 'ohcnetwork:develop' into develop

Author: sainak

.example.env

@@ -136,6 +136,9 @@ REACT_ENABLE_AUTO_INVOICE_AFTER_DISPENSE=false
 # Default state for tax inclusive pricing in inventory, When true, base price is calculated from MRP by removing tax
 REACT_INVENTORY_DEFAULT_TAX_INCLUSIVE=false
 
+# Set to "true" to open the schedule window automatically after patient registration
+REACT_OPEN_SCHEDULE_AFTER_PATIENT_REGISTRATION=true
+
 # Number of months offset for expiry restriction
 # 0 = restrict products expiring by end of current month
 # 1 = restrict products expiring by end of next month

care.config.ts

@@ -274,6 +274,14 @@ const careConfig = {
       : null,
   },
 
+  /**
+   * Open schedule window automatically after patient registration if set to "true"
+   */
+  openScheduleAfterPatientRegistration: booleanFromString(
+    env.REACT_OPEN_SCHEDULE_AFTER_PATIENT_REGISTRATION,
+    false,
+  ),
+
   /**
    * Decimal calculation configuration
    */

public/locale/en.json

@@ -909,6 +909,7 @@
   "bed_created_notification_one": "{{count}} Bed created successfully",
   "bed_created_notification_other": "{{count}} Beds created successfully",
   "bed_currently_reserved": "Bed is currently reserved for another patient",
+  "bed_encounter_details": "Bed Encounter Details",
   "bed_history": "Bed History",
   "bed_hold": "Bed Hold",
   "bed_layout": "Bed Layout",
@@ -3592,6 +3593,8 @@
   "no_product_definition_added": "No product definition added",
   "no_product_knowledge_found": "No product knowledges found!",
   "no_product_knowledge_found_for": "No product knowledge found for {{query}}",
+  "no_product_knowledge_linked": "No product knowledge linked, please select a product knowledge",
+  "no_product_linked": "No product linked",
   "no_product_selected": "No product selected",
   "no_products_added": "No products added",
   "no_products_found": "No products found",
@@ -4837,6 +4840,7 @@
   "schedule_weekdays_min_error": "Select at least one weekday",
   "scheduled": "Scheduled",
   "scheduled_for": "Schedule for:",
+  "scheduling": "Scheduling",
   "scribe__reviewing_field": "Reviewing field {{currentField}} / {{totalFields}}",
   "scribe_error": "Could not autofill fields",
   "scroll_to_question": "Scroll to question",
@@ -5146,6 +5150,7 @@
   "select_prn_reason": "Select reason for PRN",
   "select_product": "Select Product",
   "select_product_at_row": "Please select a product at row {{row}}",
+  "select_product_first": "Select a product first",
   "select_product_knowledge": "Select product knowledge",
   "select_product_type": "Select the product type",
   "select_purchase_order": "Select Purchase Order",

scripts/validate-env.ts

@@ -125,6 +125,8 @@ const envSchema = z
       booleanAsStringSchema.optional(),
     REACT_INVENTORY_DEFAULT_TAX_INCLUSIVE: booleanAsStringSchema.optional(),
     REACT_INVENTORY_EXPIRY_MONTH_OFFSET: numberAsString.optional(),
+    REACT_OPEN_SCHEDULE_AFTER_PATIENT_REGISTRATION:
+      booleanAsStringSchema.optional(),
     REACT_OBSERVATION_PLOTS_CONFIG_URL: z.string().url().optional(),
     REACT_DEFAULT_COUNTRY: z.string().optional(),
     REACT_DEFAULT_COUNTRY_NAME: z.string().optional(),

src/PluginEngine.tsx

@@ -10,14 +10,15 @@ import {
   __federation_method_setRemote as setFederationRemote,
   __federation_method_unwrapDefault as unwrapModule,
 } from "__federation__";
-import React, { Suspense } from "react";
+import React, { Suspense, useEffect, useMemo } from "react";
 
 import ErrorBoundary from "@/components/Common/ErrorBoundary";
 import Loading from "@/components/Common/Loading";
 import { PluginErrorBoundary } from "@/components/Common/PluginErrorBoundary";
-import { PlugConfig } from "@/types/plugConfig";
+import { PlugConfig, PlugConfigMeta } from "@/types/plugConfig";
 import plugConfigApi from "@/types/plugConfig/plugConfigApi";
 import query from "@/Utils/request/query";
+import { deepFreeze } from "@/Utils/utils";
 import { t } from "i18next";
 import { Loader2Icon } from "lucide-react";
 import { z } from "zod";
@@ -82,6 +83,22 @@ export default function PluginEngine({
       }),
   });
 
+  const pluginMeta = useMemo(() => {
+    return pluginsQuery.reduce(
+      (acc, plugin) => {
+        if (!plugin.isLoading && plugin.meta) {
+          acc[plugin.slug] = deepFreeze({ ...plugin.meta });
+        }
+        return acc;
+      },
+      {} as Record<string, PlugConfigMeta>,
+    );
+  }, [pluginsQuery]);
+
+  useEffect(() => {
+    window.__CARE_PLUGIN_RUNTIME__ = deepFreeze({ meta: pluginMeta });
+  }, [pluginMeta]);
+
   return (
     <Suspense fallback={<Loading />}>
       <ErrorBoundary

src/Utils/utils.ts

@@ -430,3 +430,12 @@ export function formatTruncatedList<T>(
 
   return `${displayedItems.map(getDisplayValue).join(", ")} ... +${remainingCount} ${t("more") || moreText}`;
 }
+
+export function deepFreeze<T>(obj: T): T {
+  if (!obj || typeof obj !== "object") return obj;
+
+  Object.freeze(obj);
+  Object.values(obj).forEach(deepFreeze);
+
+  return obj;
+}

src/components/Encounter/EncounterInfoCard.tsx

@@ -30,12 +30,18 @@ export interface EncounterInfoCardProps {
   encounter: EncounterListRead | EncounterRead;
   facilityId: string;
   hideBorder?: boolean;
+  disableHover?: boolean;
 }
 
 export default function EncounterInfoCard(props: EncounterInfoCardProps) {
   const { t } = useTranslation();
 
-  const { encounter, facilityId, hideBorder = false } = props;
+  const {
+    encounter,
+    facilityId,
+    hideBorder = false,
+    disableHover = false,
+  } = props;
 
   // Get encounter tags and handle overflow
   const encounterTags = encounter.tags || [];
@@ -47,8 +53,9 @@ export default function EncounterInfoCard(props: EncounterInfoCardProps) {
       data-status={encounter.status}
       key={props.encounter.id}
       className={cn(
-        "hover:shadow-lg transition-shadow group md:flex md:flex-col h-full overflow-hidden",
+        "md:flex md:flex-col h-full overflow-hidden",
         hideBorder && "border-none shadow-none",
+        !disableHover && "hover:shadow-lg transition-shadow group",
       )}
     >
       <CardHeader className="bg-gray-100 px-4 pt-2 pb-1">

src/components/Medication/SubstitutionSheet.tsx

@@ -46,12 +46,16 @@ import { ProductKnowledgeBase } from "@/types/inventory/productKnowledge/product
 interface SubstitutionSheetProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
-  originalProductKnowledge: ProductKnowledgeBase | undefined;
+  originalProductKnowledge?: ProductKnowledgeBase;
+  /** Used when no original product knowledge exists (e.g., medication without linked product) */
+  originalMedicationName?: string;
   currentSubstitution?: {
     substitutedProductKnowledge?: ProductKnowledgeBase;
     type?: SubstitutionType;
     reason?: SubstitutionReason;
   };
+  /** Pre-selected substitute product (optional) */
+  preSelectedProduct?: ProductKnowledgeBase;
   onSave: (
     substitutionDetails?: {
       substitutedProductKnowledge: ProductKnowledgeBase;
@@ -76,37 +80,41 @@ export function SubstitutionSheet({
   open,
   onOpenChange,
   originalProductKnowledge,
+  originalMedicationName,
   currentSubstitution,
+  preSelectedProduct,
   onSave,
   facilityId: _facilityId,
 }: SubstitutionSheetProps) {
   const { t } = useTranslation();
   const [selectedSubstitute, setSelectedSubstitute] = useState<
     ProductKnowledgeBase | undefined
-  >(currentSubstitution?.substitutedProductKnowledge);
+  >(currentSubstitution?.substitutedProductKnowledge || preSelectedProduct);
 
   const form = useForm<SubstitutionFormValues>({
     resolver: zodResolver(substitutionSchema),
     defaultValues: {
       substitutedProductKnowledge:
-        currentSubstitution?.substitutedProductKnowledge || undefined,
+        currentSubstitution?.substitutedProductKnowledge ||
+        preSelectedProduct ||
+        undefined,
       type: currentSubstitution?.type || SubstitutionType.E,
       reason: currentSubstitution?.reason || SubstitutionReason.OS,
     },
   });
 
   useEffect(() => {
     if (open) {
+      const initialProduct =
+        currentSubstitution?.substitutedProductKnowledge || preSelectedProduct;
       form.reset({
-        substitutedProductKnowledge:
-          currentSubstitution?.substitutedProductKnowledge || undefined,
+        substitutedProductKnowledge: initialProduct || undefined,
         type: currentSubstitution?.type || SubstitutionType.E,
         reason: currentSubstitution?.reason || SubstitutionReason.OS,
       });
-      setSelectedSubstitute(currentSubstitution?.substitutedProductKnowledge);
-      // No need to set search term anymore
+      setSelectedSubstitute(initialProduct);
     }
-  }, [open, currentSubstitution, form]);
+  }, [open, currentSubstitution, preSelectedProduct, form]);
 
   useEffect(() => {
     form.setValue("substitutedProductKnowledge", selectedSubstitute, {
@@ -130,7 +138,8 @@ export function SubstitutionSheet({
     setSelectedSubstitute(product);
   };
 
-  if (!originalProductKnowledge) return null;
+  const displayName =
+    originalProductKnowledge?.name || originalMedicationName || "";
 
   const handleClearSubstitution = () => {
     onSave(null); // Pass null to indicate clearing
@@ -148,9 +157,7 @@ export function SubstitutionSheet({
             <div className="space-y-2">
               <div className="flex items-center gap-2">
                 <span>{t("substituting_for")}:</span>
-                <Badge variant="secondary">
-                  {originalProductKnowledge.name}
-                </Badge>
+                <Badge variant="secondary">{displayName}</Badge>
               </div>
               <p className="text-sm text-muted-foreground">
                 {t("select_alternative_medication_and_provide_details")}