@openmrs/esm-stock-management-app 1.0.1-pre.406 → 1.0.1-pre.413

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

@@ -32,9 +32,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1033651,
+      "size": 1033664,
       "sizes": {
-        "javascript": 1033441,
+        "javascript": 1033454,
         "consume-shared": 210
       },
       "names": [],
@@ -48,7 +48,7 @@
       "auxiliaryFiles": [
         "39.js.map"
       ],
-      "hash": "94b7d138985a7d25",
+      "hash": "18c3174bdcd2453a",
       "childrenByOrder": {}
     },
     {
@@ -110,10 +110,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4724831,
+      "size": 4724844,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4702883,
+        "javascript": 4702896,
         "share-init": 252,
         "runtime": 21444
       },
@@ -130,7 +130,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "418aee604a9f031d",
+      "hash": "698d620af01dedda",
       "childrenByOrder": {}
     },
     {
@@ -212,9 +212,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1643,
+      "size": 1706,
       "sizes": {
-        "javascript": 1643
+        "javascript": 1706
       },
       "names": [],
       "idHints": [],
@@ -226,7 +226,7 @@
         "574.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "b3e5d6afecdfdf79",
+      "hash": "79c30f90fd2e5c04",
       "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-management-dashboard","slot":"stock-management-dashboard-slot","component":"stockManagementDashboard"},{"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":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.406"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-management-dashboard","slot":"stock-management-dashboard-slot","component":"stockManagementDashboard"},{"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":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.413"}

package/package.json

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

package/src/constants.ts

@@ -110,7 +110,6 @@ export const PRINT_LOGO =
 export const PRINT_LOGO_TEXT = "Ministry of Health";
 
 export const MAIN_STORE_LOCATION_TAG = "Main Store";
-
 export const BASE_OPENMRS_APP_URL = "/openmrs/";
 
 export const STOCKMGMT_RESOURCE_URL = "/openmrs/stockmanagement/spa.page/";

package/src/stock-home/stock-home-inventory-card.component.tsx

@@ -38,13 +38,16 @@ const StockHomeInventoryCard = () => {
 
   mergedArray = mergedArray.filter((item) => item.hasExpiration);
 
-  const filteredData = mergedArray.filter((item) => {
-    const expirationDate = new Date(item.expiration);
-    const differenceInDays = Math.ceil(
-      (expirationDate.getTime() - currentDate.getTime()) / (1000 * 60 * 60 * 24)
-    );
-    return differenceInDays <= 180 && differenceInDays >= 0;
-  });
+  const filteredData = mergedArray
+    .filter((item) => {
+      const expirationDate = new Date(item.expiration);
+      const differenceInDays = Math.ceil(
+        (expirationDate.getTime() - currentDate.getTime()) /
+          (1000 * 60 * 60 * 24)
+      );
+      return differenceInDays <= 180 && differenceInDays >= 0;
+    })
+    .slice(0, 5);
 
   return (
     <>

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

@@ -5,6 +5,7 @@ import { ComboBox, TextInputSkeleton } from "@carbon/react";
 import { useConcept } from "../../../stock-lookups/stock-lookups.resource";
 import { type ConfigObject } from "../../../config-schema";
 import { useConfig } from "@openmrs/esm-framework";
+import { useTranslation } from "react-i18next";
 
 interface StockItemCategorySelectorProps<T> {
   categoryUuid?: string;
@@ -23,6 +24,8 @@ interface StockItemCategorySelectorProps<T> {
 const StockItemCategorySelector = <T,>(
   props: StockItemCategorySelectorProps<T>
 ) => {
+  const { t } = useTranslation();
+
   const { stockItemCategoryUUID } = useConfig<ConfigObject>();
   const {
     items: { answers: categories },
@@ -52,10 +55,10 @@ const StockItemCategorySelector = <T,>(
             categories?.find((p) => p.uuid === props.categoryUuid) || {}
           }
           itemToString={(item?: Concept) =>
-            item && item?.display ? `${item?.display}` : ""
+            item && item?.display ? `${t(item?.display)}` : ""
           }
           shouldFilterItem={() => true}
-          value={categories?.find((p) => p.uuid === value)?.display ?? ""}
+          value={t(categories?.find((p) => p.uuid === value)?.display) ?? ""}
           placeholder={props.placeholder}
           ref={ref}
           invalid={props.invalid}

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

@@ -4,8 +4,8 @@ export interface RadioOption {
 }
 
 export const radioOptions: RadioOption[] = [
-  { label: "Drug", value: true },
-  { label: "Other", value: false },
+  { label: "Pharmaceuticals", value: true },
+  { label: "Non Pharmaceuticals", value: false },
 ];
 
 export const expirationOptions: RadioOption[] = [

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

@@ -15,7 +15,7 @@ import React, { ChangeEvent, useCallback, useState, useEffect } from "react";
 import styles from "./add-stock-rules.scss";
 import {
   useRoles,
-  useStockLocations,
+  useStockTagLocations,
 } from "../../../stock-lookups/stock-lookups.resource";
 import { createOrUpdateStockRule } from "./stock-rules.resource";
 import { StockRule } from "../../../core/api/types/stockItem/StockRule";
@@ -38,7 +38,6 @@ const StockRulesAddOrUpdate: React.FC<AddStockRuleProps> = ({
   stockItemUuid,
 }) => {
   const { t } = useTranslation();
-  console.warn("Got stock id: ", stockItemUuid);
 
   const [stockItemFilter, setStockItemFilter] =
     useState<StockItemInventoryFilter>({
@@ -59,10 +58,7 @@ const StockRulesAddOrUpdate: React.FC<AddStockRuleProps> = ({
 
   const { items: dispensingUnits } = useStockItemPackagingUOMs(stockItemFilter);
 
-  //locations
-  const {
-    locations: { results: locations },
-  } = useStockLocations({ v: ResourceRepresentation.Default });
+  const { stockLocations } = useStockTagLocations();
 
   //Roles
   const {
@@ -113,8 +109,10 @@ const StockRulesAddOrUpdate: React.FC<AddStockRuleProps> = ({
   };
 
   const onLocationChange = (evt: ChangeEvent<HTMLSelectElement>) => {
-    const selectedLocation = locations.find((x) => x.uuid === evt.target.value);
-    setFormModel({ ...formModel, locationUuid: selectedLocation.uuid });
+    const selectedLocation = stockLocations.find(
+      (x) => x.id === evt.target.value
+    );
+    setFormModel({ ...formModel, locationUuid: selectedLocation.id });
   };
 
   const onQuantityUnitChange = (evt: ChangeEvent<HTMLSelectElement>) => {
@@ -217,12 +215,12 @@ const StockRulesAddOrUpdate: React.FC<AddStockRuleProps> = ({
                     value=""
                     text={t("chooseLocation", "Choose the location")}
                   />
-                  {locations?.map((location) => {
+                  {stockLocations?.map((location) => {
                     return (
                       <SelectItem
-                        key={location.uuid}
-                        value={location.uuid}
-                        text={location.display}
+                        key={location.id}
+                        value={location.id}
+                        text={location.name}
                       />
                     );
                   })}

package/src/stock-items/components/filter-stock-items/filter-stock-items.component.tsx

@@ -19,8 +19,12 @@ const FilterStockItems: React.FC<FilterStockItemsProps> = ({
       className={styles.spacing}
     >
       <RadioButton labelText="All" value="" id="is-drug-all" />
-      <RadioButton labelText="Drugs" value="true" id="is-drug-drug" />
-      <RadioButton labelText="Other" value="false" id="is-drug-other" />
+      <RadioButton labelText="Pharmaceuticals" value="true" id="is-drug-drug" />
+      <RadioButton
+        labelText="Non Pharmaceuticals"
+        value="false"
+        id="is-drug-other"
+      />
     </RadioButtonGroup>
   );
 };

package/src/stock-operations/add-stock-operation/base-operation-details.component.tsx

@@ -118,7 +118,9 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
                 maxDate={formatForDatePicker(today())}
                 locale="en"
                 dateFormat={DATE_PICKER_CONTROL_FORMAT}
-                onChange={onChange}
+                onChange={([newDate]) => {
+                  onChange(newDate);
+                }}
               >
                 <DatePickerInput
                   invalid={!!errors.operationDate}
@@ -127,7 +129,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
                   name="operationDate"
                   placeholder={DATE_PICKER_FORMAT}
                   labelText={t("operationDate", "Operation Date")}
-                  value={formatForDatePicker(model?.operationDate)}
+                  defaultValue={formatForDatePicker(model?.operationDate)}
                 />
               </DatePicker>
             )}

package/translations/en.json

@@ -20,5 +20,7 @@
   "patientGetterExplainer": "Try clicking the button below to fetch a patient from the backend",
   "resources": "Resources",
   "usefulLinks": "Below are some links to useful resources",
-  "welcomeText": "Welcome to the O3 Template app"
+  "welcomeText": "Welcome to the O3 Template app",
+  "Is a Drug": "Pharmaceuticals",
+  "Non Drug": "Non Pharmaceuticals"
 }