@openmrs/esm-form-engine-lib 4.1.1-pre.2404 → 4.1.1-pre.2408

package/dist/adapters/encounter-provider-adapter.js

@@ -4,8 +4,11 @@ export const EncounterProviderAdapter = {
         gracefullySetSubmission(field, value, null);
     },
     getInitialValue: function(field, sourceObject, context) {
-        const encounter = sourceObject ?? context.previousDomainObjectValue;
-        return getLatestProvider(encounter)?.uuid;
+        const provider = getLatestProvider(sourceObject);
+        if (provider?.uuid) {
+            return provider.uuid;
+        }
+        return context.currentProvider?.uuid;
     },
     getPreviousValue: function(field, sourceObject, context) {
         const encounter = sourceObject ?? context.previousDomainObjectValue;

package/dist/components/inputs/ui-select-extended/ui-select-extended.component.js

@@ -118,24 +118,22 @@ const UiSelectExtended = ({ field, errors, warnings, setFieldValue })=>{
     ]);
     useEffect(()=>{
         let ignore = false;
-        if (value && !isDirty && dataSource && isSearchable && sessionMode !== 'enter' && !items.length) {
-            // While in edit mode, search-based instances should fetch the initial item (previously selected value) to resolve its display property
+        if (value && !isDirty && dataSource && isSearchable && !items.length) {
+            // For search-based instances, fetch the initial item to resolve its display property
             setIsLoading(true);
-            try {
-                dataSource.fetchSingleItem(value).then((item)=>{
-                    if (!ignore) {
-                        setItems([
-                            dataSource.toUuidAndDisplay(item)
-                        ]);
-                        setIsLoading(false);
-                    }
-                });
-            } catch (error) {
+            dataSource.fetchSingleItem(value).then((item)=>{
+                if (!ignore) {
+                    setItems([
+                        dataSource.toUuidAndDisplay(item)
+                    ]);
+                    setIsLoading(false);
+                }
+            }).catch((error)=>{
                 if (!ignore) {
                     console.error(error);
                     setIsLoading(false);
                 }
-            }
+            });
         }
         return ()=>{
             ignore = true;
@@ -143,7 +141,6 @@ const UiSelectExtended = ({ field, errors, warnings, setFieldValue })=>{
     }, [
         value,
         isDirty,
-        sessionMode,
         dataSource,
         isSearchable,
         items

package/dist/datasources/provider-datasource.js

@@ -7,6 +7,10 @@ export class ProviderDataSource extends BaseOpenMRSDataSource {
         const { data } = await openmrsFetch(searchTerm ? `${url}&q=${searchTerm}` : url);
         return data?.results;
     }
+    async fetchSingleItem(uuid) {
+        const { data } = await openmrsFetch(`${restBaseUrl}/provider/${uuid}?v=custom:(uuid,display)`);
+        return data;
+    }
     constructor(){
         super(null);
     }

package/dist/src/adapters/encounter-provider-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encounter-provider-adapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/encounter-provider-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,qBAAqB,EAE3B,MAAM,UAAU,CAAC;AAGlB,eAAO,MAAM,wBAAwB,EAAE,qBA6BtC,CAAC"}
+{"version":3,"file":"encounter-provider-adapter.d.ts","sourceRoot":"","sources":["../../../src/adapters/encounter-provider-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,qBAAqB,EAE3B,MAAM,UAAU,CAAC;AAGlB,eAAO,MAAM,wBAAwB,EAAE,qBAgCtC,CAAC"}

package/dist/src/components/inputs/ui-select-extended/ui-select-extended.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-select-extended.component.d.ts","sourceRoot":"","sources":["../../../../../src/components/inputs/ui-select-extended/ui-select-extended.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAC;AAYjF,OAAO,EAAmB,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAO3E,QAAA,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA0LnD,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"ui-select-extended.component.d.ts","sourceRoot":"","sources":["../../../../../src/components/inputs/ui-select-extended/ui-select-extended.component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAC;AAYjF,OAAO,EAAmB,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAO3E,QAAA,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA2LnD,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/src/datasources/provider-datasource.d.ts

@@ -1,6 +1,8 @@
+import { type OpenmrsResource } from '@openmrs/esm-framework';
 import { BaseOpenMRSDataSource } from './data-source';
 export declare class ProviderDataSource extends BaseOpenMRSDataSource {
     constructor();
     fetchData(searchTerm: string, config?: Record<string, any>): Promise<any[]>;
+    fetchSingleItem(uuid: string): Promise<OpenmrsResource | null>;
 }
 //# sourceMappingURL=provider-datasource.d.ts.map

package/dist/src/datasources/provider-datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-datasource.d.ts","sourceRoot":"","sources":["../../../src/datasources/provider-datasource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,qBAAa,kBAAmB,SAAQ,qBAAqB;;IAKrD,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;CAMlF"}
+{"version":3,"file":"provider-datasource.d.ts","sourceRoot":"","sources":["../../../src/datasources/provider-datasource.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,qBAAa,kBAAmB,SAAQ,qBAAqB;;IAKrD,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAO3E,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;CAIrE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "4.1.1-pre.2404",
+  "version": "4.1.1-pre.2408",
   "description": "React Form Engine for O3",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/adapters/encounter-provider-adapter.ts

@@ -13,8 +13,11 @@ export const EncounterProviderAdapter: FormFieldValueAdapter = {
     gracefullySetSubmission(field, value, null);
   },
   getInitialValue: function (field: FormField, sourceObject: OpenmrsResource, context: FormProcessorContextProps) {
-    const encounter = sourceObject ?? context.previousDomainObjectValue;
-    return getLatestProvider(encounter)?.uuid;
+    const provider = getLatestProvider(sourceObject);
+    if (provider?.uuid) {
+      return provider.uuid;
+    }
+    return context.currentProvider?.uuid;
   },
   getPreviousValue: function (
     field: FormField,

package/src/components/inputs/ui-select-extended/ui-select-extended.component.tsx

@@ -124,28 +124,29 @@ const UiSelectExtended: React.FC<FormFieldInputProps> = ({ field, errors, warnin
 
   useEffect(() => {
     let ignore = false;
-    if (value && !isDirty && dataSource && isSearchable && sessionMode !== 'enter' && !items.length) {
-      // While in edit mode, search-based instances should fetch the initial item (previously selected value) to resolve its display property
+    if (value && !isDirty && dataSource && isSearchable && !items.length) {
+      // For search-based instances, fetch the initial item to resolve its display property
       setIsLoading(true);
-      try {
-        dataSource.fetchSingleItem(value).then((item) => {
+      dataSource
+        .fetchSingleItem(value)
+        .then((item) => {
           if (!ignore) {
             setItems([dataSource.toUuidAndDisplay(item)]);
             setIsLoading(false);
           }
+        })
+        .catch((error) => {
+          if (!ignore) {
+            console.error(error);
+            setIsLoading(false);
+          }
         });
-      } catch (error) {
-        if (!ignore) {
-          console.error(error);
-          setIsLoading(false);
-        }
-      }
     }
 
     return () => {
       ignore = true;
     };
-  }, [value, isDirty, sessionMode, dataSource, isSearchable, items]);
+  }, [value, isDirty, dataSource, isSearchable, items]);
 
   if (isLoading) {
     return <DropdownSkeleton />;

package/src/datasources/provider-datasource.ts

@@ -1,4 +1,4 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl, type OpenmrsResource } from '@openmrs/esm-framework';
 import { BaseOpenMRSDataSource } from './data-source';
 
 export class ProviderDataSource extends BaseOpenMRSDataSource {
@@ -12,4 +12,9 @@ export class ProviderDataSource extends BaseOpenMRSDataSource {
     const { data } = await openmrsFetch(searchTerm ? `${url}&q=${searchTerm}` : url);
     return data?.results;
   }
+
+  async fetchSingleItem(uuid: string): Promise<OpenmrsResource | null> {
+    const { data } = await openmrsFetch(`${restBaseUrl}/provider/${uuid}?v=custom:(uuid,display)`);
+    return data;
+  }
 }