@openmrs/esm-stock-management-app 3.1.1-pre.1074 → 3.1.1-pre.1077

package/dist/openmrs-esm-stock-management-app.js.buildmanifest.json

@@ -847,9 +847,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1193886,
+      "size": 1193875,
       "sizes": {
-        "javascript": 1193886
+        "javascript": 1193875
       },
       "names": [],
       "idHints": [],
@@ -862,7 +862,7 @@
       "auxiliaryFiles": [
         "5125.js.map"
       ],
-      "hash": "a6f49bf7e744a783",
+      "hash": "a8605db42d7160df",
       "childrenByOrder": {}
     },
     {
@@ -1539,10 +1539,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5542530,
+      "size": 5542519,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5520295,
+        "javascript": 5520284,
         "share-init": 336,
         "runtime": 21689
       },
@@ -1559,7 +1559,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "381167fedca62a28",
+      "hash": "a9adc5f3fa83c00b",
       "childrenByOrder": {}
     },
     {
@@ -1567,9 +1567,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 217155,
+      "size": 216707,
       "sizes": {
-        "javascript": 217155
+        "javascript": 216707
       },
       "names": [],
       "idHints": [],
@@ -1583,7 +1583,7 @@
       "auxiliaryFiles": [
         "9186.js.map"
       ],
-      "hash": "6315551f41f7f32d",
+      "hash": "2d43ab620ea08fc4",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"modals":[{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"expired-stock-modal","component":"expiredStockModal"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"receiving-stock-modal","component":"receivingStockModal"},{"name":"stock-operations-modal","component":"stockOperationsModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"workspaces":[{"name":"stock-operation-form-workspace","component":"stockOperationFormWorkspace","title":"Stock Operation","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-item-rules-form-workspace","component":"stockItemRulesFormWorkspace","title":"Stock Item Rules","type":"form"},{"name":"stock-item-form-workspace","component":"stockItemFormWorkspace","title":"Stock Items","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-sources-form-workspace","component":"stockSourcesFormWorkspace","title":"Stock Sources","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-location-form-workspace","component":"stockLocationsFormWorkspace","title":"Stock Locations","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-user-role-scopes-form-workspace","component":"stockUserScopesFormWorkspace","title":"User Role Scopes","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-reports-form-workspace","component":"stockReportsFormWorkspace","title":"Reports","type":"form","canMaximize":true,"width":"extra-wide"}],"pages":[{"component":"root","route":"stock-management"}],"version":"3.1.1-pre.1074"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"name":"stock-management-admin-card-link","slot":"system-admin-page-card-link-slot","component":"stockManagementAdminCardLink"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"modals":[{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"expired-stock-modal","component":"expiredStockModal"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"receiving-stock-modal","component":"receivingStockModal"},{"name":"stock-operations-modal","component":"stockOperationsModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"workspaces":[{"name":"stock-operation-form-workspace","component":"stockOperationFormWorkspace","title":"Stock Operation","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-item-rules-form-workspace","component":"stockItemRulesFormWorkspace","title":"Stock Item Rules","type":"form"},{"name":"stock-item-form-workspace","component":"stockItemFormWorkspace","title":"Stock Items","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-sources-form-workspace","component":"stockSourcesFormWorkspace","title":"Stock Sources","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-location-form-workspace","component":"stockLocationsFormWorkspace","title":"Stock Locations","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-user-role-scopes-form-workspace","component":"stockUserScopesFormWorkspace","title":"User Role Scopes","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-reports-form-workspace","component":"stockReportsFormWorkspace","title":"Reports","type":"form","canMaximize":true,"width":"extra-wide"}],"pages":[{"component":"root","route":"stock-management"}],"version":"3.1.1-pre.1077"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-stock-management-app",
-  "version": "3.1.1-pre.1074",
+  "version": "3.1.1-pre.1077",
   "license": "MPL-2.0",
   "description": "Stock management microfrontend for OpenMRS 3.x",
   "browser": "dist/openmrs-esm-stock-management-app.js",

package/src/config-schema.ts

@@ -1,77 +1,77 @@
 import { Type } from '@openmrs/esm-framework';
 export const configSchema = {
-  printItemCost: {
-    type: Type.Boolean,
+  autoPopulateResponsiblePerson: {
+    _type: Type.Boolean,
     _default: false,
-    _description: 'Whether to print item costs on the print out',
+    _description: 'Auto-populate responsible person in stock operations with the currently logged-in user',
+  },
+  dispensingUnitsUUID: {
+    _type: Type.ConceptUuid,
+    _description: 'UUID for the stock dispensing units',
+    _default: '162402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
   },
   enablePrintButton: {
     _type: Type.Boolean,
     _default: true,
     _description: 'Enable or disable the print button in the stock management UI',
   },
-  autoPopulateResponsiblePerson: {
-    type: Type.Boolean,
-    _default: false,
-    _description: 'Auto populate responsible person in stock operations with the currently logged in user',
+  logo: {
+    src: {
+      _type: Type.String,
+      _default: null,
+      _description: 'A path or URL to an image',
+    },
+    alt: {
+      _type: Type.String,
+      _default: 'Logo',
+      _description: 'Alt text shown on hover',
+    },
+    name: {
+      _type: Type.String,
+      _default: null,
+      _description: 'The organization name displayed when image is absent',
+    },
+  },
+  packingUnitsUUID: {
+    _type: Type.ConceptUuid,
+    _description: 'UUID for the packaging unit',
+    _default: 'a6d438fe-05c1-4d4d-9755-c11cf6b0b3b9',
   },
   printBalanceOnHand: {
-    type: Type.Boolean,
+    _type: Type.Boolean,
     _default: false,
-    _description: 'Whether to print balance on hand on the print out',
+    _description: 'Whether to include balance on hand on the printout',
   },
-  packagingUnitsUUID: {
-    _type: Type.ConceptUuid,
-    _description: 'UUID for the packaging unit',
-    _default: 'bce2b1af-98b1-48a2-98a2-3e4ffb3c79c2',
+  printItemCost: {
+    _type: Type.Boolean,
+    _default: false,
+    _description: 'Whether to include item costs on the printout',
   },
   stockAdjustmentReasonUUID: {
     _type: Type.ConceptUuid,
     _description: 'UUID for the stock adjustment reasons',
-    _default: '47f0825e-8648-47c2-b847-d3197ed6bb72',
+    _default: '3a9021d1-d6c1-4fc2-8e30-ca8e204e44de',
   },
-  stockTakeReasonUUID: {
+  stockItemCategoryUUID: {
     _type: Type.ConceptUuid,
-    _description: 'UUID for the stock take reasons',
-    _default: '47f0825e-8648-47c2-b847-d3197ed6bb72',
+    _description: 'UUID for the stock item category',
+    _default: '8ccf6066-9297-4d76-aaf3-00aa3714d198',
   },
   stockSourceTypeUUID: {
     _type: Type.ConceptUuid,
     _description: 'UUID for the stock source types',
-    _default: '2e1e8049-9cbe-4a2d-b1e5-8a91e5d7d97d',
+    _default: '937a0440-95f7-42f6-aaef-16cf611fcf10',
   },
-  dispensingUnitsUUID: {
+  stockTakeReasonUUID: {
     _type: Type.ConceptUuid,
-    _description: 'UUID for the stock dispensing units uuid',
-    _default: '162402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+    _description: 'UUID for the stock take reasons',
+    _default: 'faa466c5-0953-4d4f-8ea7-d9a06341c3f3',
   },
   useItemCommonNameAsDisplay: {
     _type: Type.Boolean,
-    _description: 'true to use item common name as display and false to use Drug name as display',
+    _description: 'Use item common name as display (true) or drug name as display (false)',
     _default: true,
   },
-  stockItemCategoryUUID: {
-    _type: Type.ConceptUuid,
-    _description: 'UUID for the stock item category',
-    _default: '6d24eb6e-b42f-4706-ab2d-ae4472161f6a',
-  },
-  logo: {
-    src: {
-      _type: Type.String,
-      _default: null,
-      _description: 'A path or URL to an image.',
-    },
-    alt: {
-      _type: Type.String,
-      _default: 'Logo',
-      _description: 'Alt text, shown on hover',
-    },
-    name: {
-      _type: Type.String,
-      _default: null,
-      _description: 'The organization name displayed when image is absent',
-    },
-  },
 };
 
 export type ConfigObject = {
@@ -83,7 +83,7 @@ export type ConfigObject = {
     alt: string;
     name: string;
   };
-  packagingUnitsUUID: string;
+  packingUnitsUUID: string;
   printBalanceOnHand: boolean;
   printItemCost: boolean;
   stockAdjustmentReasonUUID: string;

package/src/stock-items/add-stock-item/concepts-selector/concepts-selector.component.tsx

@@ -1,21 +1,19 @@
 import React, { type ReactNode, useMemo, useState } from 'react';
-import { type Concept } from '../../../core/api/types/concept/Concept';
+import { ComboBox, TextInputSkeleton } from '@carbon/react';
 import { type Control, Controller, type FieldValues } from 'react-hook-form';
+import { type Concept } from '../../../core/api/types/concept/Concept';
 import { useConcepts } from '../../../stock-lookups/stock-lookups.resource';
-import { ComboBox, TextInputSkeleton } from '@carbon/react';
 
 interface ConceptsSelectorProps<T> {
   conceptUuid?: string;
-  onConceptUuidChange?: (unit: Concept) => void;
-  title?: string;
-  placeholder?: string;
+  control: Control<FieldValues, T>;
+  controllerName: string;
   invalid?: boolean;
   invalidText?: ReactNode;
-
-  // Control
-  controllerName: string;
   name: string;
-  control: Control<FieldValues, T>;
+  onConceptUuidChange?: (unit: Concept) => void;
+  placeholder?: string;
+  title?: string;
 }
 
 const ConceptsSelector = <T,>(props: ConceptsSelectorProps<T>) => {
@@ -24,7 +22,8 @@ const ConceptsSelector = <T,>(props: ConceptsSelectorProps<T>) => {
     isLoading,
   } = useConcepts({});
   const [inputValue, setInputValue] = useState('');
-  const handleInputChange = (value) => {
+
+  const handleInputChange = (value: string) => {
     setInputValue(value);
   };
 
@@ -34,34 +33,36 @@ const ConceptsSelector = <T,>(props: ConceptsSelectorProps<T>) => {
       : concepts.filter((concept) => concept.display?.toLowerCase().includes(inputValue.trim()?.toLowerCase()));
   }, [inputValue, concepts]);
 
-  if (isLoading) return <TextInputSkeleton />;
+  if (isLoading) {
+    return <TextInputSkeleton />;
+  }
 
   return (
     <Controller
-      name={props.controllerName}
       control={props.control}
-      render={({ field: { onChange, ref } }) => (
+      name={props.controllerName}
+      render={({ field: { onChange, value, ref } }) => (
         <ComboBox
-          titleText={props.title}
-          name={props.name}
-          control={props.control}
-          controllerName={props.controllerName}
           id={props.name}
-          size={'md'}
+          invalid={props.invalid}
+          invalidText={props.invalidText}
           items={filteredConcepts}
-          onChange={(data: { selectedItem: Concept }) => {
-            props.onConceptUuidChange?.(data.selectedItem);
-            onChange(data.selectedItem.uuid);
+          itemToString={(item?: Concept) => item?.display ?? ''}
+          name={props.name}
+          onChange={(data: { selectedItem: Concept | null }) => {
+            if (data.selectedItem) {
+              props.onConceptUuidChange?.(data.selectedItem);
+              onChange(data.selectedItem.uuid);
+            } else {
+              onChange('');
+            }
           }}
-          initialSelectedItem={concepts?.find((p) => p.uuid === props.conceptUuid) || {}}
-          itemToString={(item?: Concept) => (item && item?.display ? `${item?.display}` : '')}
-          shouldFilterItem={() => true}
-          onInputChange={(event) => handleInputChange(event)}
-          inputValue={inputValue}
+          onInputChange={handleInputChange}
           placeholder={props.placeholder}
           ref={ref}
-          invalid={props.invalid}
-          invalidText={props.invalidText}
+          selectedItem={concepts?.find((p) => p.uuid === value) ?? null}
+          size="md"
+          titleText={props.title}
         />
       )}
     />

package/src/stock-items/add-stock-item/dispensing-unit-selector/dispensing-unit-selector.component.tsx

@@ -1,59 +1,59 @@
 import React, { type ReactNode } from 'react';
 import { ComboBox, TextInputSkeleton } from '@carbon/react';
-import { useConcept } from '../../../stock-lookups/stock-lookups.resource';
-import { type Concept } from '../../../core/api/types/concept/Concept';
 import { type Control, Controller, type FieldValues } from 'react-hook-form';
-import { type ConfigObject } from '../../../config-schema';
 import { useConfig } from '@openmrs/esm-framework';
+import { type Concept } from '../../../core/api/types/concept/Concept';
+import { type ConfigObject } from '../../../config-schema';
+import { useConcept } from '../../../stock-lookups/stock-lookups.resource';
 
 interface DispensingUnitSelectorProps<T> {
+  control: Control<FieldValues, T>;
+  controllerName: string;
   dispensingUnitUuid?: string;
-  onDispensingUnitChange?: (unit: Concept) => void;
-  title?: string;
-  placeholder?: string;
   invalid?: boolean;
   invalidText?: ReactNode;
-
-  // Control
-  controllerName: string;
   name: string;
-  control: Control<FieldValues, T>;
+  onDispensingUnitChange?: (unit: Concept) => void;
+  placeholder?: string;
+  title?: string;
 }
 
 const DispensingUnitSelector = <T,>(props: DispensingUnitSelectorProps<T>) => {
-  const { dispensingUnitsUUID } = useConfig<ConfigObject>();
+  const { packingUnitsUUID } = useConfig<ConfigObject>();
   const {
-    items: { setMembers: dispensingUnits },
+    items: { answers: packingUnits },
     isLoading,
-  } = useConcept(dispensingUnitsUUID);
+  } = useConcept(packingUnitsUUID);
 
-  if (isLoading) return <TextInputSkeleton />;
+  if (isLoading) {
+    return <TextInputSkeleton />;
+  }
 
   return (
     <Controller
-      name={props.controllerName}
       control={props.control}
+      name={props.controllerName}
       render={({ field: { onChange, value, ref } }) => (
         <ComboBox
-          titleText={props.title}
-          name={props.name}
-          control={props.control}
-          controllerName={props.controllerName}
           id={props.name}
-          size={'md'}
-          items={dispensingUnits || []}
-          onChange={(data: { selectedItem: Concept }) => {
-            props.onDispensingUnitChange?.(data.selectedItem);
-            onChange(data.selectedItem.uuid);
+          name={props.name}
+          items={packingUnits || []}
+          selectedItem={packingUnits?.find((p) => p.uuid === value) ?? null}
+          invalid={props.invalid}
+          invalidText={props.invalidText}
+          itemToString={(item?: Concept) => item?.display ?? ''}
+          onChange={(data: { selectedItem: Concept | null }) => {
+            if (data.selectedItem) {
+              props.onDispensingUnitChange?.(data.selectedItem);
+              onChange(data.selectedItem.uuid);
+            } else {
+              onChange('');
+            }
           }}
-          initialSelectedItem={dispensingUnits?.find((p) => p.uuid === props.dispensingUnitUuid) || {}}
-          itemToString={(item?: Concept) => (item && item?.display ? `${item?.display}` : '')}
-          shouldFilterItem={() => true}
-          value={dispensingUnits?.find((p) => p.uuid === value)?.display ?? ''}
           placeholder={props.placeholder}
           ref={ref}
-          invalid={props.invalid}
-          invalidText={props.invalidText}
+          size="md"
+          titleText={props.title}
         />
       )}
     />

package/src/stock-items/add-stock-item/packaging-units-concept-selector/packaging-units-concept-selector.component.tsx

@@ -22,12 +22,12 @@ interface PackagingUnitsConceptSelectorProps<T> {
 }
 
 const PackagingUnitsConceptSelector = <T,>(props: PackagingUnitsConceptSelectorProps<T>) => {
-  const { packagingUnitsUUID } = useConfig<ConfigObject>();
+  const { packingUnitsUUID } = useConfig<ConfigObject>();
 
   const {
     items: { answers: dispensingUnits },
     isLoading,
-  } = useConcept(packagingUnitsUUID);
+  } = useConcept(packingUnitsUUID);
 
   if (isLoading) return <TextInputSkeleton />;