@openmrs/esm-stock-management-app 1.0.1-pre.479 → 1.0.1-pre.484

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

@@ -86,10 +86,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4766982,
+      "size": 4766853,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4745033,
+        "javascript": 4744904,
         "share-init": 252,
         "runtime": 21445
       },
@@ -106,7 +106,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "b3395d02da05f6f7",
+      "hash": "e52cb3631184607a",
       "childrenByOrder": {}
     },
     {
@@ -114,9 +114,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 7685,
+      "size": 7694,
       "sizes": {
-        "javascript": 7685
+        "javascript": 7694
       },
       "names": [],
       "idHints": [],
@@ -128,7 +128,7 @@
         "271.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "62e4eff8b6ee6a39",
+      "hash": "0cb37e3477f0eecc",
       "childrenByOrder": {}
     },
     {
@@ -160,9 +160,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 12768,
+      "size": 12770,
       "sizes": {
-        "javascript": 12768
+        "javascript": 12770
       },
       "names": [],
       "idHints": [],
@@ -174,7 +174,7 @@
         "319.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "9577cb4bde364dd6",
+      "hash": "78c810e8e20a403e",
       "childrenByOrder": {}
     },
     {
@@ -182,9 +182,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 10602,
+      "size": 10604,
       "sizes": {
-        "javascript": 10602
+        "javascript": 10604
       },
       "names": [],
       "idHints": [],
@@ -196,7 +196,7 @@
         "460.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "0239cab658afad3e",
+      "hash": "853e580ee18acb6d",
       "childrenByOrder": {}
     },
     {
@@ -204,9 +204,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1095270,
+      "size": 1095141,
       "sizes": {
-        "javascript": 1095060,
+        "javascript": 1094931,
         "consume-shared": 210
       },
       "names": [],
@@ -220,7 +220,7 @@
       "auxiliaryFiles": [
         "474.js.map"
       ],
-      "hash": "0310bd4a2bb367b0",
+      "hash": "229d6a418e7c76e6",
       "childrenByOrder": {}
     },
     {
@@ -252,9 +252,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 10899,
+      "size": 10901,
       "sizes": {
-        "javascript": 10899
+        "javascript": 10901
       },
       "names": [],
       "idHints": [],
@@ -266,7 +266,7 @@
         "574.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "3ec9fe24b95ef377",
+      "hash": "73adef869115d16f",
       "childrenByOrder": {}
     },
     {
@@ -343,9 +343,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 12877,
+      "size": 12879,
       "sizes": {
-        "javascript": 12877
+        "javascript": 12879
       },
       "names": [],
       "idHints": [],
@@ -357,7 +357,7 @@
         "757.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "1673f3931afe5889",
+      "hash": "0f431833a88f72aa",
       "childrenByOrder": {}
     },
     {
@@ -365,9 +365,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 9609,
+      "size": 9611,
       "sizes": {
-        "javascript": 9609
+        "javascript": 9611
       },
       "names": [],
       "idHints": [],
@@ -379,7 +379,7 @@
         "788.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "ea169669bdd9d02e",
+      "hash": "704ff9bb8200591c",
       "childrenByOrder": {}
     },
     {
@@ -414,9 +414,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 11292,
+      "size": 11294,
       "sizes": {
-        "javascript": 11292
+        "javascript": 11294
       },
       "names": [],
       "idHints": [],
@@ -428,7 +428,7 @@
         "807.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "19a2bffdfb06fcf0",
+      "hash": "b18f2b03183a99b3",
       "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":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"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-operation-dialog","component":"stockOperationDialog"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsDialog"},{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.479"}
+{"$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":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"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-operation-dialog","component":"stockOperationDialog"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsDialog"},{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"stock-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.484"}

package/package.json

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

package/src/stock-items/add-stock-item/stock-item-details/stock-item-details.component.tsx

@@ -66,13 +66,6 @@ const StockItemDetails = forwardRef<never, StockItemDetailsProps>(
 
     useEffect(() => {
       setIsDrug(model.isDrug ?? false);
-      setSelectedItemType(
-        model.isDrug === true
-          ? "Pharmaceuticals"
-          : model.isDrug === false
-          ? "Non Pharmaceuticals"
-          : undefined
-      );
       setHasExpiration(model.hasExpiration ?? false);
     }, [model.hasExpiration, model.isDrug]);
 
@@ -80,30 +73,34 @@ const StockItemDetails = forwardRef<never, StockItemDetailsProps>(
       <form
         className={`${rootStyles.formContainer} ${rootStyles.verticalForm}`}
       >
-        <FormGroup
-          className="clear-margin-bottom"
-          legendText={t("itemType", "Item Type")}
-          title={t("itemType", "Item Type")}
-        >
-          <ControlledRadioButtonGroup
-            control={control}
-            name="isDrug"
-            controllerName="isDrug"
-            legendText=""
-            invalid={!!errors.isDrug}
-            invalidText={errors.isDrug && errors?.isDrug?.message}
-            onChange={(selection: boolean) => {
-              const selectedOption = radioOptions.find(
-                (option) => option.value === selection
-              );
-              const selectedLabel = selectedOption ? selectedOption.label : "";
-              setIsDrug(selection);
-              setSelectedItemType(selectedLabel);
-            }}
-            options={radioOptions} // Pass radioOptions directly
-          />
-        </FormGroup>
-        {isDrug && (
+        {!isEditing && (
+          <FormGroup
+            className="clear-margin-bottom"
+            legendText={t("itemType", "Item Type")}
+            title={t("itemType", "Item Type")}
+          >
+            <ControlledRadioButtonGroup
+              control={control}
+              name="isDrug"
+              controllerName="isDrug"
+              legendText=""
+              invalid={!!errors.isDrug}
+              invalidText={errors.isDrug && errors?.isDrug?.message}
+              onChange={(selection: boolean) => {
+                const selectedOption = radioOptions.find(
+                  (option) => option.value === selection
+                );
+                const selectedLabel = selectedOption
+                  ? selectedOption.label
+                  : "";
+                setIsDrug(selection);
+                setSelectedItemType(selectedLabel);
+              }}
+              options={radioOptions} // Pass radioOptions directly
+            />
+          </FormGroup>
+        )}
+        {selectedItemType === "Pharmaceuticals" ? (
           <DrugSelector
             name="drugUuid"
             controllerName="drugUuid"
@@ -113,8 +110,7 @@ const StockItemDetails = forwardRef<never, StockItemDetailsProps>(
             invalid={!!errors.drugUuid}
             invalidText={errors.drugUuid && errors?.drugUuid?.message}
           />
-        )}
-        {isDrug != undefined && !isDrug && (
+        ) : selectedItemType === "Non Pharmaceuticals" ? (
           <ConceptsSelector
             name="conceptUuid"
             controllerName="conceptUuid"
@@ -124,7 +120,7 @@ const StockItemDetails = forwardRef<never, StockItemDetailsProps>(
             invalid={!!errors.drugUuid}
             invalidText={errors.drugUuid && errors?.drugUuid?.message}
           />
-        )}
+        ) : null}
         <ControlledTextInput
           id="commonName"
           name="commonName"

package/src/stock-items/stock-item.utils.tsx

@@ -56,12 +56,10 @@ export const launchAddOrEditDialog = (
 ) => {
   launchOverlay(
     isEditing
-      ? t("editItem", "Edit {{name}}", {
+      ? `${t("editItem", "Edit {{name}}", {
           name: stockItem?.drugName || stockItem.conceptName || "",
-        })
-      : t("addItem", "Add {{name}}", {
-          name: stockItem?.drugName || stockItem.conceptName || "",
-        }),
+        })} ${stockItem.isDrug ? "(Drug)" : "(Non Drug)"}`
+      : t("addItem", "Add stock item"),
     <AddEditStockItem
       model={stockItem}
       onSave={(stockItem) => addOrEditStockItem(t, stockItem, isEditing)}

package/translations/am.json

@@ -9,7 +9,7 @@
   "activeTo": "እስከ",
   "addedRule": "እንዴት ያክል",
   "addedSource": "መጠንቀቂያን እንዴት",
-  "addItem": "እንዴት ያክል {{name}}",
+  "addItem": "እንዴት ያክል stock item",
   "addLocation": "አዲስ ቦታ ፍጠር",
   "addNewStock": "አዲስ አስገባ",
   "addNewStockRule": "አዲስ ህግ ጨምር",

package/translations/ar.json

@@ -9,7 +9,7 @@
   "activeTo": "مفعل حتى",
   "addedRule": "أضف قاعدة",
   "addedSource": "أضف مصدر",
-  "addItem": "أضف {{name}}",
+  "addItem": "أضف stock item",
   "addLocation": "إنشاء موقع جديد",
   "addNewStock": "اضف جديد",
   "addNewStockRule": "إضافة قاعدة جديدة",

package/translations/en.json

@@ -9,7 +9,7 @@
   "activeTo": "Active To",
   "addedRule": "Add Rule",
   "addedSource": "Add Source",
-  "addItem": "Add {{name}}",
+  "addItem": "Add stock item",
   "addLocation": "Create new Location",
   "addNewStock": "Add New",
   "addNewStockRule": "Add New Rule",

package/translations/es.json

@@ -9,7 +9,7 @@
   "activeTo": "Activo Hasta",
   "addedRule": "Agregar Regla",
   "addedSource": "Agregar Fuente",
-  "addItem": "Agregar {{name}}",
+  "addItem": "Agregar stock item",
   "addLocation": "Crear una nueva Ubicación",
   "addNewStock": "Agregar nuevo",
   "addNewStockRule": "Agregar nueva regla",

package/translations/fr.json

@@ -9,7 +9,7 @@
   "activeTo": "Actif Jusqu'à",
   "addedRule": "Ajouter Règle",
   "addedSource": "Ajouter Source",
-  "addItem": "Ajouter {{name}}",
+  "addItem": "Ajouter stock item",
   "addLocation": "Créer un nouvel Emplacement",
   "addNewStock": "Ajouter un nouveau",
   "addNewStockRule": "Ajouter une nouvelle règle",
@@ -289,4 +289,4 @@
   "view": "Voir",
   "whoIsThePreferredVendor": "Quel est le fournisseur préféré?",
   "yes": "Oui"
-}
+}

package/translations/km.json

@@ -9,7 +9,7 @@
   "activeTo": "សកម្មដល់",
   "addedRule": "បន្ថែមច្បាប់",
   "addedSource": "បន្ថែមប្រភព",
-  "addItem": "បន្ថែម {{name}}",
+  "addItem": "បន្ថែម stock item",
   "addLocation": "បង្កើតទីតាំងថ្មី",
   "addNewStock": "បន្ថែមថ្មី",
   "addNewStockRule": "បន្ថែមច្បាប់ថ្មី",
@@ -110,7 +110,7 @@
   "errorCreatingForm": "កំហុសក្នុងការបង្កើតទំរង់",
   "errorDeletingRule": "កំហុសក្នុងការលុបច្បាប់",
   "errorDeletingSource": "កំហុសក្នុងការលុបប្រភព",
-  "errorDeletingUserScope": "មាន​បញ្ហា​មួយ​បាន​កើត​ឡើង​ក្នុង​ការ​ផ្ទុក​ឡើង​ធាតុ​ស្តុក",
+  "errorDeletingUserScope": "មាន\u200bបញ្ហា\u200bមួយ\u200bបាន\u200bកើត\u200bឡើង\u200bក្នុង\u200bការ\u200bផ្ទុក\u200bឡើង\u200bធាតុ\u200bស្តុក",
   "errorDescription": "ពិពណ៌នាកំហុស",
   "errorDescriptionTitle": "កំហុសក្នុងការរក្សាទំរង់",
   "errorEditingStockItem": "កំហុសក្នុងការកែប្រែមុខទំនិញស្តុក",
@@ -271,7 +271,7 @@
   "submit": "ដាក់ស្នើ",
   "submitted": "បានដាក់ស្នើ",
   "successfullysaved": "អ្នកបានរក្សាទុកវិសាលភាពតួនាទីអ្នកប្រើដោយជោគជ័យ",
-  "SuccessfullyUploadedStockItem": "អ្នក​បាន​ផ្ទុក​ឡើង​ធាតុ​ស្តុក​ដោយ​ជោគជ័យ",
+  "SuccessfullyUploadedStockItem": "អ្នក\u200bបាន\u200bផ្ទុក\u200bឡើង\u200bធាតុ\u200bស្តុក\u200bដោយ\u200bជោគជ័យ",
   "successMessage": "សារជោគជ័យ",
   "tabletOverlay": "ការជ្រៀតកាន់តាប្លេត",
   "tags": "ស្លាក",

package/translations/zh.json

@@ -9,7 +9,7 @@
   "activeTo": "结束生效",
   "addedRule": "添加规则",
   "addedSource": "添加来源",
-  "addItem": "添加{{name}}",
+  "addItem": "添加 stock item",
   "addLocation": "创建新位置",
   "addNewStock": "添加新",
   "addNewStockRule": "添加新规则",
@@ -216,7 +216,7 @@
   "reasonPlaceholder": "在此输入原因",
   "receivedNull": "未收到要显示的",
   "receivedView": "查看全部",
-  "接收": ":",
+  "Receiving": "",
   "references": "参考",
   "reject": "拒绝",
   "rejected": "已拒绝",
@@ -289,4 +289,4 @@
   "view": "查看",
   "whoIsThePreferredVendor": "谁是首选供应商？",
   "yes": "是"
-}
+}