@openmrs/esm-stock-management-app 1.0.1-pre.390 → 1.0.1-pre.395

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

@@ -32,9 +32,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1033166,
+      "size": 1032484,
       "sizes": {
-        "javascript": 1032956,
+        "javascript": 1032274,
         "consume-shared": 210
       },
       "names": [],
@@ -48,7 +48,7 @@
       "auxiliaryFiles": [
         "39.js.map"
       ],
-      "hash": "2cbfcdfa0269bf60",
+      "hash": "1f3724fd167824bb",
       "childrenByOrder": {}
     },
     {
@@ -110,10 +110,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4782215,
+      "size": 4781533,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4760267,
+        "javascript": 4759585,
         "share-init": 252,
         "runtime": 21444
       },
@@ -130,7 +130,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "c181c28d434fae3b",
+      "hash": "defc8b2869583d61",
       "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.390"}
+{"$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.395"}

package/package.json

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

package/src/core/components/card/metrics-card-component.tsx

@@ -15,7 +15,7 @@ interface MetricsCardProps {
   headerLabel: string;
   children?: React.ReactNode;
   view: string;
-  count?: { expiry7days: Array<any>; expiry30days: Array<any> };
+  count?: { expiry6months: Array<any> };
   outofstockCount?: { itemsbelowmin: Array<any>; itemsabovemax: Array<any> };
   disposedCount?: { expired: Array<any>; poorquality: Array<any> };
 }
@@ -58,13 +58,9 @@ const MetricsCard: React.FC<MetricsCardProps> = ({
         {!isEmpty(count) && (
           <div className={styles.countGrid}>
             <span style={{ color: "#DA1E28" }}>
-              {t("in7days", "In 7 days")}
+              {t("in6months", "In 6 months")}
             </span>
-            <span style={{ color: " #FABA5F" }}>
-              {t("in30days", "In 30 days")}
-            </span>
-            <p style={{ color: "#DA1E28" }}>{count.expiry7days?.length}</p>
-            <p style={{ color: "#FABA5F" }}>{count.expiry30days?.length}</p>
+            <p style={{ color: "#DA1E28" }}>{count.expiry6months?.length}</p>
           </div>
         )}
         {!isEmpty(outofstockCount) && (

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

@@ -11,12 +11,11 @@ const StockHomeInventoryCard = () => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === "tablet";
 
-  // TODO: Pull low on stock
   const { items: expiryItems, isLoading: inventoryLoading } =
     useStockInventory();
   const { items: stockItems, isLoading } = useStockInventoryItems();
 
-  if (isLoading) return <></>;
+  if (isLoading || inventoryLoading) return <></>;
 
   if (stockItems?.length === 0) {
     return (
@@ -28,23 +27,23 @@ const StockHomeInventoryCard = () => {
     );
   }
 
-  const currentDate: any = new Date();
-  let mergedArray: any[] = expiryItems.map((batch) => {
+  const currentDate = new Date();
+
+  let mergedArray = expiryItems.map((batch) => {
     const matchingItem = stockItems?.find(
-      (item2) => batch?.stockItemUuid === item2.uuid
+      (item) => batch?.stockItemUuid === item.uuid
     );
     return { ...batch, ...matchingItem };
   });
+
   mergedArray = mergedArray.filter((item) => item.hasExpiration);
+
   const filteredData = mergedArray.filter((item) => {
-    const expiryNotice = item.expiryNotice || 0; // Default to 0 if expiryNotice is undefined or null
-    const expirationDate: any = new Date(item.expiration);
+    const expirationDate = new Date(item.expiration);
     const differenceInDays = Math.ceil(
-      (expirationDate - currentDate) / (1000 * 60 * 60 * 24)
+      (expirationDate.getTime() - currentDate.getTime()) / (1000 * 60 * 60 * 24)
     );
-
-    // Include items that have not expired yet or are within the expiry notice period
-    return differenceInDays <= expiryNotice || differenceInDays < 0;
+    return differenceInDays <= 180 && differenceInDays >= 0;
   });
 
   return (

package/src/stock-home/stock-home-metrics.tsx

@@ -16,29 +16,34 @@ const StockManagementMetrics: React.FC = (filter: StockOperationFilter) => {
   const { t } = useTranslation();
 
   const { stockList: allStocks, isLoading, error } = useStockList();
-
   const { items: expiryItems, isLoading: inventoryLoading } =
     useStockInventory();
   const { items: stockItems } = useStockInventoryItems();
 
-  const currentDate: any = new Date();
-  let mergedArray: any[] = expiryItems.map((batch) => {
+  const currentDate = new Date();
+
+  let mergedArray = expiryItems.map((batch) => {
     const matchingItem = stockItems?.find(
-      (item2) => batch?.stockItemUuid === item2.uuid
+      (item) => batch?.stockItemUuid === item.uuid
     );
     return { ...batch, ...matchingItem };
   });
+
   mergedArray = mergedArray.filter((item) => item.hasExpiration);
+
   const filteredData = mergedArray.filter((item) => {
     const expiryNotice = item.expiryNotice || 0;
-    const expirationDate: any = new Date(item.expiration);
+    const expirationDate = new Date(item.expiration);
     const differenceInDays = Math.ceil(
-      (expirationDate - currentDate) / (1000 * 60 * 60 * 24)
+      (expirationDate.getTime() - currentDate.getTime()) / (1000 * 60 * 60 * 24)
     );
-
     return differenceInDays <= expiryNotice || differenceInDays < 0;
   });
 
+  const sixMonthsExpiryStocks = filteredData.filter(
+    (stock) => stock.hasExpiration && stock.expiryNotice <= 180
+  );
+
   const { items } = useDisposalList({
     v: ResourceRepresentation.Full,
     totalCount: true,
@@ -56,13 +61,6 @@ const StockManagementMetrics: React.FC = (filter: StockOperationFilter) => {
     return <ErrorState headerTitle={t("errorStockMetric")} error={error} />;
   }
 
-  const sevenDaysExpiryStocks = allStocks.filter(
-    (stock) => stock.hasExpiration && stock.ExpiryNotice <= 7
-  );
-  const thirtyDaysExpiryStocks = allStocks.filter(
-    (stock) => stock.hasExpiration && stock.ExpiryNotice <= 30
-  );
-
   const filteredItems =
     items &&
     items.filter(
@@ -81,8 +79,7 @@ const StockManagementMetrics: React.FC = (filter: StockOperationFilter) => {
           headerLabel={t("expiringStock", "Expiring Stock")}
           view="items"
           count={{
-            expiry7days: sevenDaysExpiryStocks,
-            expiry30days: thirtyDaysExpiryStocks,
+            expiry6months: sixMonthsExpiryStocks,
           }}
         />
         <MetricsCard
@@ -91,8 +88,8 @@ const StockManagementMetrics: React.FC = (filter: StockOperationFilter) => {
           headerLabel={t("highestServiceVolume", "Out of Stock ")}
           view="items"
           outofstockCount={{
-            itemsbelowmin: sevenDaysExpiryStocks,
-            itemsabovemax: thirtyDaysExpiryStocks,
+            itemsbelowmin: ["0"],
+            itemsabovemax: ["0"],
           }}
         />
         <MetricsCard

package/src/stock-home/useStockList.tsx

@@ -4,16 +4,16 @@ import { openmrsFetch, restBaseUrl } from "@openmrs/esm-framework";
 interface StockList {
   uuid: string;
   hasExpiration: boolean;
-  ExpiryNotice: number;
+  expiryNotice: number;
   results: {
     uuid: string;
     hasExpiration: boolean;
-    ExpiryNotice: number;
+    expiryNotice: number;
   };
 }
 
 const useStockList = () => {
-  const url = `${restBaseUrl}/stockmanagement/stockitem`;
+  const url = `${restBaseUrl}/stockmanagement/stockitem?v=default&totalCount=true`;
 
   const { data, error } = useSWR<{ data: { results: Array<StockList> } }>(
     url,
@@ -23,7 +23,7 @@ const useStockList = () => {
   const stocks = data?.data.results.map((stock) => ({
     uuid: stock.uuid,
     hasExpiration: stock.hasExpiration,
-    ExpiryNotice: stock.ExpiryNotice,
+    expiryNotice: stock.expiryNotice,
   }));
 
   return {