@openmrs/esm-stock-management-app 1.0.1-pre.327 → 1.0.1-pre.330

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

@@ -86,10 +86,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4312836,
+      "size": 4313561,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4290887,
+        "javascript": 4291612,
         "share-init": 252,
         "runtime": 21445
       },
@@ -106,7 +106,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "1552a1194aa3a3ac",
+      "hash": "4a8de7e5af9880bb",
       "childrenByOrder": {}
     },
     {
@@ -333,9 +333,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 903022,
+      "size": 903747,
       "sizes": {
-        "javascript": 902812,
+        "javascript": 903537,
         "consume-shared": 210
       },
       "names": [],
@@ -349,7 +349,7 @@
       "auxiliaryFiles": [
         "979.js.map"
       ],
-      "hash": "ef1449bb81e85997",
+      "hash": "1e00550985a95c26",
       "childrenByOrder": {}
     }
   ]

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","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"}],"pages":[{"component":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.327"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","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"}],"pages":[{"component":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.330"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-stock-management-app",
-  "version": "1.0.1-pre.327",
+  "version": "1.0.1-pre.330",
   "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

@@ -10,9 +10,39 @@ export const configSchema = {
     _default: false,
     _description: "Whether to print balance on hand on the print out",
   },
+  packagingUnitsUUID: {
+    _type: Type.ConceptUuid,
+    _description: "UUID for the packaging unit",
+    _default: "bce2b1af-98b1-48a2-98a2-3e4ffb3c79c2",
+  },
+  stockAdjustmentReasonUUID: {
+    _type: Type.ConceptUuid,
+    _description: "UUID for the stock adjustment reasons",
+    _default: "3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25",
+  },
+  stockSourceTypeUUID: {
+    _type: Type.ConceptUuid,
+    _description: "UUID for the stock source types",
+    _default: "2e1e8049-9cbe-4a2d-b1e5-8a91e5d7d97d",
+  },
+  dispensingUnitsUUID: {
+    _type: Type.ConceptUuid,
+    _description: "UUID for the stock dispensing units uuid",
+    _default: "162402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+  },
+  stockItemCategoryUUID: {
+    _type: Type.ConceptUuid,
+    _description: "UUID for the stock item category",
+    _default: "6d24eb6e-b42f-4706-ab2d-ae4472161f6a",
+  },
 };
 
-export type Config = {
+export type ConfigObject = {
   printItemCost: boolean;
   printBalanceOnHand: boolean;
+  packagingUnitsUUID: string;
+  stockAdjustmentReasonUUID: string;
+  stockSourceTypeUUID: string;
+  dispensingUnitsUUID: string;
+  stockItemCategoryUUID: string;
 };

package/src/constants.ts

@@ -86,18 +86,6 @@ export const APP_STOCKMANAGEMENT_REPORTS = "App: stockmanagement.reports";
 
 /** @type {string}: Task: stockmanagement.reports.mutate, Able to create stock reports*/
 
-// concepts
-export const STOCK_SOURCE_TYPE_CODED_CONCEPT_ID =
-  "2e1e8049-9cbe-4a2d-b1e5-8a91e5d7d97d";
-export const STOCK_ADJUSTMENT_REASON_CODED_CONCEPT_ID =
-  "3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25";
-export const DISPENSING_UNITS_CONCEPT_ID =
-  "162402AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-export const PACKAGING_UNITS_CODED_CONCEPT_ID =
-  "bce2b1af-98b1-48a2-98a2-3e4ffb3c79c2";
-export const STOCK_ITEM_CATEGORY_CONCEPT_ID =
-  "6d24eb6e-b42f-4706-ab2d-ae4472161f6a";
-
 export const INVENTORY_CLERK_ROLE_UUID = "d210eb66-2188-11ed-9dff-507b9dea1806";
 export const INVENTORY_MANAGER_ROLE_UUID =
   "cca4be4b-2188-11ed-9dff-507b9dea1806";

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

@@ -1,9 +1,10 @@
 import React, { ReactNode } from "react";
 import { ComboBox, TextInputSkeleton } from "@carbon/react";
-import { useConceptById } from "../../../stock-lookups/stock-lookups.resource";
-import { DISPENSING_UNITS_CONCEPT_ID } from "../../../constants";
+import { useConcept } from "../../../stock-lookups/stock-lookups.resource";
 import { Concept } from "../../../core/api/types/concept/Concept";
 import { Control, Controller, FieldValues } from "react-hook-form";
+import { type ConfigObject } from "../../../config-schema";
+import { useConfig } from "@openmrs/esm-framework";
 
 interface DispensingUnitSelectorProps<T> {
   dispensingUnitUuid?: string;
@@ -20,10 +21,11 @@ interface DispensingUnitSelectorProps<T> {
 }
 
 const DispensingUnitSelector = <T,>(props: DispensingUnitSelectorProps<T>) => {
+  const { dispensingUnitsUUID } = useConfig<ConfigObject>();
   const {
     items: { setMembers: dispensingUnits },
     isLoading,
-  } = useConceptById(DISPENSING_UNITS_CONCEPT_ID);
+  } = useConcept(dispensingUnitsUUID);
 
   if (isLoading) return <TextInputSkeleton />;
 

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

@@ -1,10 +1,11 @@
 import React, { ReactNode } from "react";
 import { Concept } from "../../../core/api/types/concept/Concept";
 import { Control, Controller, FieldValues } from "react-hook-form";
-import { useConceptById } from "../../../stock-lookups/stock-lookups.resource";
-import { PACKAGING_UNITS_CODED_CONCEPT_ID } from "../../../constants";
+import { useConcept } from "../../../stock-lookups/stock-lookups.resource";
 import { ComboBox, TextInputSkeleton } from "@carbon/react";
 import { StockItemPackagingUOMDTO } from "../../../core/api/types/stockItem/StockItemPackagingUOM";
+import { useConfig } from "@openmrs/esm-framework";
+import { type ConfigObject } from "../../../config-schema";
 
 interface PackagingUnitsConceptSelectorProps<T> {
   row?: StockItemPackagingUOMDTO;
@@ -23,10 +24,12 @@ interface PackagingUnitsConceptSelectorProps<T> {
 const PackagingUnitsConceptSelector = <T,>(
   props: PackagingUnitsConceptSelectorProps<T>
 ) => {
+  const { packagingUnitsUUID } = useConfig<ConfigObject>();
+
   const {
     items: { answers: dispensingUnits },
     isLoading,
-  } = useConceptById(PACKAGING_UNITS_CODED_CONCEPT_ID);
+  } = useConcept(packagingUnitsUUID);
 
   if (isLoading) return <TextInputSkeleton />;
 

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

@@ -2,8 +2,9 @@ import React, { ReactNode } from "react";
 import { Control, Controller, FieldValues } from "react-hook-form";
 import { Concept } from "../../../core/api/types/concept/Concept";
 import { ComboBox, TextInputSkeleton } from "@carbon/react";
-import { useConceptById } from "../../../stock-lookups/stock-lookups.resource";
-import { STOCK_ITEM_CATEGORY_CONCEPT_ID } from "../../../constants";
+import { useConcept } from "../../../stock-lookups/stock-lookups.resource";
+import { type ConfigObject } from "../../../config-schema";
+import { useConfig } from "@openmrs/esm-framework";
 
 interface StockItemCategorySelectorProps<T> {
   categoryUuid?: string;
@@ -22,10 +23,11 @@ interface StockItemCategorySelectorProps<T> {
 const StockItemCategorySelector = <T,>(
   props: StockItemCategorySelectorProps<T>
 ) => {
+  const { stockItemCategoryUUID } = useConfig<ConfigObject>();
   const {
     items: { answers: categories },
     isLoading,
-  } = useConceptById(STOCK_ITEM_CATEGORY_CONCEPT_ID);
+  } = useConcept(stockItemCategoryUUID);
 
   if (isLoading) return <TextInputSkeleton />;
 

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

@@ -162,17 +162,25 @@ const StockItemDetails = forwardRef<never, StockItemDetailsProps>(
           </FormGroup>
 
           {hasExpiration && (
-            <ControlledNumberInput
-              id="expiryNotice"
-              name="expiryNotice"
-              control={control}
-              controllerName="expiryNotice"
-              size={"md"}
-              allowEmpty={true}
-              label={t("expiryNoticeDays", "Expiration Notice (days)")}
-              invalid={!!errors.expiryNotice}
-              invalidText={errors.expiryNotice && errors?.expiryNotice?.message}
-            />
+            <FormGroup
+              className="clear-margin-bottom"
+              legendText={t("expirationNotice", "Expiration Notice (days)")}
+              title={t("expirationNotice", "Expiration Notice (days)")}
+            >
+              <ControlledNumberInput
+                id="expiryNotice"
+                name="expiryNotice"
+                control={control}
+                controllerName="expiryNotice"
+                size={"md"}
+                allowEmpty={true}
+                label={t("expiryNoticeDays", "Expiration Notice (days)")}
+                invalid={!!errors.expiryNotice}
+                invalidText={
+                  errors.expiryNotice && errors?.expiryNotice?.message
+                }
+              />
+            </FormGroup>
           )}
         </div>
         <PreferredVendorSelector

package/src/stock-lookups/stock-lookups.resource.ts

@@ -191,9 +191,8 @@ export function useUser(id: string) {
   };
 }
 
-// getConceptById
-export function useConceptById(id: string) {
-  const apiUrl = `ws/rest/v1/concept/${id}`;
+export function useConcept(conceptUuid: string) {
+  const apiUrl = `ws/rest/v1/concept/${conceptUuid}`;
   const { data, error, isLoading } = useSWR<
     {
       data: Concept;

package/src/stock-operations/stock-operation-reason-selector/stock-operation-reason-selector.component.tsx

@@ -2,8 +2,9 @@ import React, { ReactNode } from "react";
 import { Control, Controller, FieldValues } from "react-hook-form";
 import { Concept } from "../../core/api/types/concept/Concept";
 import { ComboBox, SelectSkeleton } from "@carbon/react";
-import { useConceptById } from "../../stock-lookups/stock-lookups.resource";
-import { STOCK_ADJUSTMENT_REASON_CODED_CONCEPT_ID } from "../../constants";
+import { useConcept } from "../../stock-lookups/stock-lookups.resource";
+import { type ConfigObject } from "../../config-schema";
+import { useConfig } from "@openmrs/esm-framework";
 
 interface StockOperationReasonSelectorProps<T> {
   reasonUuid?: string;
@@ -22,11 +23,13 @@ interface StockOperationReasonSelectorProps<T> {
 const StockOperationReasonSelector = <T,>(
   props: StockOperationReasonSelectorProps<T>
 ) => {
+  const { stockAdjustmentReasonUUID } = useConfig<ConfigObject>();
+
   const {
     isLoading,
     isError,
     items: { answers: reasons },
-  } = useConceptById(STOCK_ADJUSTMENT_REASON_CODED_CONCEPT_ID);
+  } = useConcept(stockAdjustmentReasonUUID);
 
   if (isLoading || isError) return <SelectSkeleton />;
 

package/src/stock-operations/stock-operation-sources-filter/stock-operation-sources-filter.component.tsx

@@ -1,14 +1,15 @@
 import styles from "./stock-operation-sources-filter.scss";
 import { Dropdown, DropdownSkeleton } from "@carbon/react";
 import React from "react";
-import { STOCK_SOURCE_TYPE_CODED_CONCEPT_ID } from "../../constants";
-import { useConceptById } from "../../stock-lookups/stock-lookups.resource";
+import { useConcept } from "../../stock-lookups/stock-lookups.resource";
+import { type ConfigObject } from "../../config-schema";
+import { useConfig } from "@openmrs/esm-framework";
 
 const StockOperationSourcesFilter: React.FC = () => {
+  const { stockSourceTypeUUID } = useConfig<ConfigObject>();
+
   // get stock sources
-  const { items, isLoading, isError } = useConceptById(
-    STOCK_SOURCE_TYPE_CODED_CONCEPT_ID
-  );
+  const { items, isLoading, isError } = useConcept(stockSourceTypeUUID);
   if (isLoading || isError) {
     return <DropdownSkeleton />;
   }

package/src/stock-sources/add-stock-sources/add-stock-sources.component.tsx

@@ -11,13 +11,13 @@ import {
 import React, { ChangeEvent, useCallback, useState } from "react";
 import { handleMutate } from "../swr-revalidation";
 import styles from "./add-stock-sources.scss";
-import { useConceptById } from "../../stock-lookups/stock-lookups.resource";
-import { STOCK_SOURCE_TYPE_CODED_CONCEPT_ID } from "../../constants";
+import { useConcept } from "../../stock-lookups/stock-lookups.resource";
 import { StockSource } from "../../core/api/types/stockOperation/StockSource";
 import { createOrUpdateStockSource } from "../stock-sources.resource";
-import { showNotification, showToast } from "@openmrs/esm-framework";
+import { showNotification, showToast, useConfig } from "@openmrs/esm-framework";
 import { useTranslation } from "react-i18next";
 import { closeOverlay } from "../../core/components/overlay/hook";
+import { type ConfigObject } from "../../config-schema";
 
 interface AddStockSourceProps {
   model?: StockSource;
@@ -25,9 +25,10 @@ interface AddStockSourceProps {
 
 const StockSourcesAddOrUpdate: React.FC<AddStockSourceProps> = ({ model }) => {
   const { t } = useTranslation();
+  const { stockSourceTypeUUID } = useConfig<ConfigObject>();
 
   // get stock sources
-  const { items } = useConceptById(STOCK_SOURCE_TYPE_CODED_CONCEPT_ID);
+  const { items } = useConcept(stockSourceTypeUUID);
 
   const [formModel, setFormModel] = useState<StockSource>({ ...model });
 

package/src/stock-sources/stock-sources-filter/stock-sources-filter.component.tsx

@@ -1,16 +1,16 @@
 import styles from "./stock-sources-filter.scss";
 import { Dropdown, DropdownSkeleton } from "@carbon/react";
 import React from "react";
-import { STOCK_SOURCE_TYPE_CODED_CONCEPT_ID } from "../../constants";
-import { useConceptById } from "../../stock-lookups/stock-lookups.resource";
+import { useConcept } from "../../stock-lookups/stock-lookups.resource";
+import { type ConfigObject } from "../../config-schema";
+import { useConfig } from "@openmrs/esm-framework";
 
 const StockSourcesFilter: React.FC<{
   onFilterChange: (selectedSourceType: string) => void;
 }> = ({ onFilterChange }) => {
+  const { stockSourceTypeUUID } = useConfig<ConfigObject>();
   // get stock sources
-  const { items, isLoading, isError } = useConceptById(
-    STOCK_SOURCE_TYPE_CODED_CONCEPT_ID
-  );
+  const { items, isLoading, isError } = useConcept(stockSourceTypeUUID);
   if (isLoading || isError) {
     return <DropdownSkeleton />;
   }