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

package/src/stock-locations/stock-locations-table.component.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from "react";
+import React, { useState } from "react";
 import { useStockLocationPages } from "./stock-locations-table.resource";
 import {
   Button,
@@ -35,18 +35,6 @@ const StockLocationsItems: React.FC<StockLocationsTableProps> = () => {
     handleMutate(`${restBaseUrl}/Location?_summary=data`);
   };
 
-  const createStockLocation = () => {
-    {
-      showLocationModal ? (
-        <NewLocationForm
-          onModalChange={setAddLocationModal}
-          showModal={showLocationModal}
-          mutate={mutate}
-        />
-      ) : null;
-    }
-  };
-
   if (isLoading) {
     return <DataTableSkeleton role="progressbar" />;
   }
@@ -85,7 +73,9 @@ const StockLocationsItems: React.FC<StockLocationsTableProps> = () => {
   return (
     <div className={styles.tileContainer}>
       <Tile className={styles.tile}>
-        <p className={styles.content}>No stock items to display</p>
+        <p className={styles.content}>
+          {t("noStockItemsToDisplay", "No stock items to display")}
+        </p>
       </Tile>
     </div>
   );

package/src/stock-locations/stock-locations-table.resource.tsx

@@ -4,13 +4,11 @@ import {
   FetchResponse,
   openmrsFetch,
   restBaseUrl,
-  showSnackbar,
   usePagination,
 } from "@openmrs/esm-framework";
 import { useTranslation } from "react-i18next";
 import { StockOperationFilter } from "../stock-operations/stock-operations.resource";
 import { useStockTagLocations } from "../stock-lookups/stock-lookups.resource";
-import { extractErrorMessagesFromResponse } from "../constants";
 
 export function useStockLocationPages(filter: StockOperationFilter) {
   const { stockLocations, error, isLoading } = useStockTagLocations();
@@ -103,23 +101,13 @@ interface LocationName {
 export async function saveLocation({
   locationPayload,
 }): Promise<FetchResponse<LocationName>> {
-  try {
-    const response: FetchResponse = await openmrsFetch(
-      `${restBaseUrl}/location/`,
-      {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: locationPayload,
-      }
-    );
-    return response;
-  } catch (error) {
-    const errorMessages = extractErrorMessagesFromResponse(error);
-    showSnackbar({
-      subtitle: errorMessages.join(", "),
-      title: "Error on saving form",
-      kind: "error",
-      isLowContrast: true,
-    });
-  }
+  const response: FetchResponse = await openmrsFetch(
+    `${restBaseUrl}/location/`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: locationPayload,
+    }
+  );
+  return response;
 }

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

@@ -135,6 +135,7 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
             onSave: async (model) => {
               // TODO: Update
               await addOrEditStockOperation(
+                t,
                 model,
                 props.isEditing,
                 props.operation,

package/src/stock-operations/add-stock-operation/add-stock-operation.resource.tsx

@@ -6,16 +6,10 @@ export const useInitializeStockOperations = (props: AddStockOperationProps) => {
   const [isLoading, setIsLoading] = useState(true);
   const [isError, setIsError] = useState(false);
   const [result, setResult] = useState<InitializeResult>();
-  // const urlQueryParams = useUrlQueryParams();
 
   useEffect(() => {
     setIsLoading(true);
-    initializeNewStockOperation(
-      props.operation,
-      // urlQueryParams,
-      props.model,
-      props.operations
-    )
+    initializeNewStockOperation(props.operation, props.model, props.operations)
       .then((data) => {
         setResult(data);
         setIsLoading(false);

package/src/stock-operations/add-stock-operation/add-stock-operation.utils.tsx

@@ -3,7 +3,6 @@ import { initialStockOperationValue } from "../../core/utils/utils";
 import { MAIN_STORE_LOCATION_TAG, today } from "../../constants";
 import {
   operationFromString,
-  OperationType,
   StockOperationType,
   StockOperationTypeCanCapturePurchasePrice,
   StockOperationTypeHasPrint,

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

@@ -4,7 +4,6 @@ import { StockOperationDTO } from "../../core/api/types/stockOperation/StockOper
 import { SaveStockOperation } from "../../stock-items/types";
 import {
   operationFromString,
-  OperationType,
   StockOperationType,
 } from "../../core/api/types/stockOperation/StockOperationType";
 import {
@@ -19,7 +18,6 @@ import {
   DatePickerInput,
   InlineLoading,
   TextInput,
-  ComboBox,
 } from "@carbon/react";
 import { Controller, useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -32,11 +30,12 @@ import ControlledTextInput from "../../core/components/carbon/controlled-text-in
 import StockOperationReasonSelector from "../stock-operation-reason-selector/stock-operation-reason-selector.component";
 import ControlledTextArea from "../../core/components/carbon/controlled-text-area/controlled-text-area.component";
 import { InitializeResult } from "./types";
-import rootStyles from "../../root.scss";
 import { ResourceRepresentation } from "../../core/api/api";
 import { useStockOperationPages } from "../stock-operations-table.resource";
-import { useStockOperationContext } from "./stock-operation-context/useStockOperationContext";
 import { createBaseOperationPayload } from "./add-stock-utils";
+import { showSnackbar } from "@openmrs/esm-framework";
+
+import rootStyles from "../../root.scss";
 
 interface BaseOperationDetailsProps {
   isEditing?: boolean;
@@ -62,8 +61,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
   },
 }) => {
   const { t } = useTranslation();
-  const { setFormContext } = useStockOperationContext();
-  const { isLoading, items } = useStockOperationPages({
+  const { isLoading } = useStockOperationPages({
     v: ResourceRepresentation.Full,
     totalCount: true,
   });
@@ -88,7 +86,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
       <InlineLoading
         status="active"
         iconDescription="Loading"
-        description="Loading data..."
+        description={t("loadingData", "Loading data...")}
       />
     );
   }
@@ -99,7 +97,11 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
       const payload = createBaseOperationPayload(model, item, operationType);
       await onSave(payload);
     } catch (e) {
-      // Show notification
+      showSnackbar({
+        title: t("errorSavingBaseOperation", "Erro saving base operation"),
+        isLowContrast: true,
+        kind: "error",
+      });
     } finally {
       setIsSaving(false);
     }

package/src/stock-operations/add-stock-operation/stock-items-addition-row.component.tsx

@@ -1,5 +1,4 @@
 import React, { ChangeEvent, useState } from "react";
-import styles from "./stock-items-addition-row.scss";
 import { isDesktop } from "@openmrs/esm-framework";
 import {
   Button,
@@ -37,6 +36,8 @@ import { StockItemDTO } from "../../core/api/types/stockItem/StockItem";
 import QtyUomSelector from "../qty-uom-selector/qty-uom-selector.component";
 import BatchNoSelector from "../batch-no-selector/batch-no-selector.component";
 
+import styles from "./stock-items-addition-row.scss";
+
 interface StockItemsAdditionRowProps {
   canEdit?: boolean;
   rows: StockOperationItemFormData[];

package/src/stock-operations/add-stock-operation/stock-items-addition.component.tsx

@@ -23,10 +23,11 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { useValidationSchema } from "./validationSchema";
 import StockItemsAdditionRow from "./stock-items-addition-row.component";
 import { Add, ArrowRight } from "@carbon/react/icons";
-import styles from "./stock-items-addition.component.scss";
 import { errorAlert } from "../../core/utils/alert";
 import { useStockOperationContext } from "./stock-operation-context/useStockOperationContext";
 
+import styles from "./stock-items-addition.component.scss";
+
 interface StockItemsAdditionProps {
   isEditing?: boolean;
   canEdit?: boolean;
@@ -65,7 +66,6 @@ const StockItemsAddition: React.FC<StockItemsAdditionProps> = ({
       return;
     }
 
-    // const data = Object.assign(model, item);
     model.stockOperationItems = item?.stockItems;
     await onSave?.(model);
   };

package/src/stock-operations/edit-stock-operation/edit-stock-operation-action-menu.component.tsx

@@ -1,5 +1,6 @@
 import React, { useState } from "react";
 import { Button } from "@carbon/react";
+import { useTranslation } from "react-i18next";
 import { StockOperationDTO } from "../../core/api/types/stockOperation/StockOperationDTO";
 import { launchAddOrEditDialog } from "../stock-operation.utils";
 import { StockOperationType } from "../../core/api/types/stockOperation/StockOperationType";
@@ -13,6 +14,7 @@ interface EditStockOperationActionMenuProps {
 const EditStockOperationActionMenu: React.FC<
   EditStockOperationActionMenuProps
 > = ({ operationUuid, operationNumber, model, operations }) => {
+  const { t } = useTranslation();
   const [operation, setOperation] = useState<StockOperationDTO | null>(null);
 
   if (operationUuid && !operation) {
@@ -56,6 +58,7 @@ const EditStockOperationActionMenu: React.FC<
         kind="ghost"
         onClick={() => {
           launchAddOrEditDialog(
+            t,
             model ?? operation,
             true,
             type,

package/src/stock-operations/stock-operation.utils.tsx

@@ -1,11 +1,12 @@
-import { closeOverlay, launchOverlay } from "../core/components/overlay/hook";
 import React from "react";
+import { closeOverlay, launchOverlay } from "../core/components/overlay/hook";
 import {
   FetchResponse,
   restBaseUrl,
   showModal,
   showSnackbar,
 } from "@openmrs/esm-framework";
+import { TFunction } from "react-i18next";
 import { StockOperationDTO } from "../core/api/types/stockOperation/StockOperationDTO";
 import {
   createStockOperation,
@@ -19,7 +20,9 @@ import {
 import { useLocation } from "react-router-dom";
 import { extractErrorMessagesFromResponse } from "../constants";
 import { handleMutate } from "../utils";
+
 export const addOrEditStockOperation = async (
+  t: TFunction,
   stockOperation: StockOperationDTO,
   isEditing: boolean,
   operation?: StockOperationType,
@@ -50,21 +53,22 @@ export const addOrEditStockOperation = async (
       handleMutate(`${restBaseUrl}/stockmanagement/stockoperation`);
       showSnackbar({
         isLowContrast: true,
-        title: `${isEditing ? "Edit" : "Add"} Stock Operation`,
+        title: isEditing
+          ? t("editStockOperation", "Edit stock operation")
+          : t("addStockOperation", "Add stock operation"),
         kind: "success",
-        subtitle: `Stock Operation ${
-          isEditing ? "Edited" : "Added"
-        } Successfully`,
+        subtitle: isEditing
+          ? t("stockOperationEdited", "Stock operation edited successfully")
+          : t("stockOperationAdded", "Stock operation added successfully"),
       });
 
-      // Close overlay and open edit overlay
       closeOverlay();
     }
   } catch (error) {
     const errorMessages = extractErrorMessagesFromResponse(error);
     showSnackbar({
       subtitle: errorMessages.join(", "),
-      title: "Error on saving form",
+      title: t("errorSavingForm", "Error on saving form"),
       kind: "error",
       isLowContrast: true,
     });
@@ -72,6 +76,7 @@ export const addOrEditStockOperation = async (
 };
 
 export const launchAddOrEditDialog = (
+  t: TFunction,
   stockOperation: StockOperationDTO,
   isEditing: boolean,
   operation?: StockOperationType,
@@ -79,13 +84,24 @@ export const launchAddOrEditDialog = (
   canPrint?: boolean
 ) => {
   launchOverlay(
-    `${isEditing ? "Edit" : "New: "} ${
-      isEditing ? stockOperation?.operationTypeName : operation?.name
-    }`,
+    isEditing
+      ? t("editOperationTitle", "Edit {{operationType}}", {
+          operationType: stockOperation?.operationTypeName,
+        })
+      : t("newOperationTitle", "New: {{operationName}}", {
+          operationName: operation?.name,
+        }),
     <AddStockOperation
       model={stockOperation}
-      onSave={(so) =>
-        addOrEditStockOperation(so, isEditing, operation, operations, canPrint)
+      onSave={(stockOperation) =>
+        addOrEditStockOperation(
+          t,
+          stockOperation,
+          isEditing,
+          operation,
+          operations,
+          canPrint
+        )
       }
       isEditing={isEditing}
       operation={operation}

package/src/stock-operations/stock-operations-dialog/stock-operations-issue-stock-button.component.tsx

@@ -42,7 +42,7 @@ const StockOperationIssueStockButton: React.FC<
 
   const modifiedOperation = addRequisitionStockOperation(operation);
   const handleButtonClick = () => {
-    launchAddOrEditDialog(modifiedOperation, false, type, operations, false);
+    launchAddOrEditDialog(t, modifiedOperation, false, type, operations, false);
   };
 
   return (

package/src/stock-operations/stock-operations-table.component.tsx

@@ -347,6 +347,7 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
             itemText="Edit"
             onClick={() => {
               launchAddOrEditDialog(
+                t,
                 filteredItems[index],
                 true,
                 operation,
@@ -358,7 +359,7 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
         </OverflowMenu>
       ),
     }));
-  }, [handleOnComplete, filteredItems, operation, operations, items]);
+  }, [handleOnComplete, filteredItems, operation, operations, t]);
 
   if (isLoading) {
     return (
@@ -374,7 +375,12 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
 
   return (
     <div className={styles.tableOverride}>
-      <TabPanel>{t("Stock operations to track movement of stock.")}</TabPanel>
+      <TabPanel>
+        {t(
+          "stockOperationTrackMovement",
+          "Stock operations to track movement of stock."
+        )}
+      </TabPanel>
       <div id="table-tool-bar">
         <div></div>
         <div className="right-filters"></div>
@@ -447,6 +453,7 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                 <StockOperationTypesSelector
                   onOperationTypeSelected={(operation) => {
                     launchAddOrEditDialog(
+                      t,
                       initialStockOperationValue(),
                       false,
                       operation,

package/src/stock-reports/generate-report/create-stock-report.component.tsx

@@ -241,7 +241,10 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.Fullfillment,
           (report.fullFillment ?? ["All"]).join(","),
           (report.fullFillment ?? ["All"]).join(", "),
-          t("stockmanagement.report.edit.fullfillment"),
+          t(
+            "editFullfillmentReport",
+            "stockmanagement.report.edit.fullfillment"
+          ),
           newLine
         );
       }
@@ -250,7 +253,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.Patient,
           report.patientUuid ?? "",
           report.patientName?.trim() ?? "All Patients",
-          t("Patients"),
+          t("patients", "Patients"),
           newLine
         );
       }
@@ -259,7 +262,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.StockItem,
           report.stockItemUuid ?? "",
           report.stockItemName?.trim() ?? "All Stock Items",
-          t("Stock Item"),
+          t("stockItem", "Stock Item"),
           newLine
         );
       }
@@ -268,7 +271,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.StockItemCategory,
           report.stockItemCategoryConceptUuid ?? "",
           report.stockItemCategory?.trim() ?? "All Categories",
-          t("Stock Item Category"),
+          t("stockItemCategory", "Stock Item Category"),
           newLine
         );
       }
@@ -277,7 +280,10 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.InventoryGroupBy,
           report.inventoryGroupBy ?? "LocationStockItemBatchNo",
           report.inventoryGroupByName?.trim() ?? "Stock Item Batch Number",
-          t("stockmanagement.report.edit.inventorygroupby"),
+          t(
+            "displayInventoryReport",
+            "stockmanagement.report.edit.inventorygroupby"
+          ),
           newLine
         );
       }
@@ -286,7 +292,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.Location,
           report.location,
           report.location?.trim() ?? "",
-          t("Location"),
+          t("location", "Location"),
           newLine
         );
         if (displayChildLocations) {
@@ -294,7 +300,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
             ReportParameter.ChildLocations,
             report.childLocations ? "true" : "false",
             report.childLocations ? "Yes" : "No",
-            t("Include Child Locations"),
+            t("includeChildLocations", "Include Child Locations"),
             newLine
           );
         }
@@ -304,7 +310,10 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.MaxReorderLevelRatio,
           (report.maxReorderLevelRatio ?? 0).toString(),
           (report.maxReorderLevelRatio ?? 0).toString() + "%",
-          t("stockmanagement.report.edit.maxreorderlevelratio"),
+          t(
+            "displayMaxReorderReport",
+            "stockmanagement.report.edit.maxreorderlevelratio"
+          ),
           newLine
         );
       }
@@ -313,7 +322,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.StockSource,
           report.stockSourceUuid ?? "",
           report.stockSource?.trim() ?? "All Sources",
-          t("stockmanagement.report.edit.stocksource"),
+          t("displayStockReport", "stockmanagement.report.edit.stocksource"),
           newLine
         );
       }
@@ -322,7 +331,10 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.StockSourceDestination,
           report.stockSourceDestinationUuid ?? "",
           report.stockSourceDestination?.trim() ?? "All Destinations",
-          t("stockmanagement.report.edit.stocksourcedestination"),
+          t(
+            "displayStockDestinationReport",
+            "stockmanagement.report.edit.stocksourcedestination"
+          ),
           newLine
         );
       }
@@ -331,7 +343,10 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.MostLeastMoving,
           report.mostLeastMoving ?? "MostMoving",
           report.mostLeastMovingName?.trim() ?? "Most Moving",
-          t("stockmanagement.report.edit.mostleastmoving"),
+          t(
+            "displayMostLeastMovingReport",
+            "stockmanagement.report.edit.mostleastmoving"
+          ),
           newLine
         );
       }
@@ -357,7 +372,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
           ReportParameter.Date,
           report.date ? JSON.stringify(report.date).replaceAll('"', "") : "",
           formatDisplayDate(report.date) ?? "",
-          t("stockmanagement.report.edit.date"),
+          t("displayReportDate", "stockmanagement.report.edit.date"),
           newLine
         );
       }
@@ -405,7 +420,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
             });
           }
         })
-        .catch((error) => {
+        .catch(() => {
           showSnackbar({
             title: t("BatchJobErrorTitle", "Batch job"),
             subtitle: t("batchJobErrorMessage", "Error creating batch job"),
@@ -549,11 +564,11 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
             />
             <SelectItem
               value="LocationStockItem"
-              text={t("lcationstockitem", "Location  and Stock Item")}
+              text={t("locationAndStockItem", "Location and Stock Item")}
             />
             <SelectItem
               value="LocationStockItemBatchNo"
-              text={t("locationBatchno", "Location and Batch")}
+              text={t("locationAndBatchno", "Location and Batch")}
             />
           </Select>
         )}
@@ -572,7 +587,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
               disabled
               hidden
               value=""
-              text={t("Choose a location")}
+              text={t("chooseALocation", "Choose a location")}
             />
             {(stockLocations ?? [])?.map((loc) => {
               return <SelectItem key={loc.id} value={loc.id} text={loc.name} />;
@@ -589,7 +604,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
                 onChange={onChange}
                 value={value}
                 labelText={t(
-                  "IncludeChildLocations",
+                  "includeChildLocations",
                   "Include Child Locations"
                 )}
               />
@@ -615,7 +630,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
                 <RadioButton
                   value="LeastMoving"
                   id="mostLeastMovingLeast"
-                  labelText={t("LeastMoving", "Least Moving")}
+                  labelText={t("leastMoving", "Least Moving")}
                 />
               </RadioButtonGroup>
             )}

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

@@ -13,7 +13,7 @@ const AddStockSourceActionButton: React.FC = () => {
 
   return (
     <Button onClick={handleClick} size="md" kind="primary">
-      {t("stockmanagement.addnewsource", "Add New Source")}
+      {t("addNewStockSource", "Add New Source")}
     </Button>
   );
 };

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

@@ -63,7 +63,7 @@ const StockSourcesAddOrUpdate: React.FC<AddStockSourceProps> = ({ model }) => {
               title: t("addedSource", "Add Source"),
               kind: "success",
               subtitle: t(
-                "stocksourceaddedsuccessfully",
+                "stockSourceAddedSuccessfully",
                 "Stock Source Added Successfully"
               ),
               timeoutInMs: 5000,
@@ -75,7 +75,7 @@ const StockSourcesAddOrUpdate: React.FC<AddStockSourceProps> = ({ model }) => {
           },
           (error) => {
             showSnackbar({
-              title: t(`errorAddingSource', 'error adding a source`),
+              title: t("errorAddingSource", "Error adding a source"),
               kind: "error",
               isLowContrast: true,
               subtitle: error?.message,

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

@@ -35,7 +35,7 @@ const StockSourcesDeleteActionMenu: React.FC<
                 title: t("deletingSource", "Delete Source"),
                 kind: "success",
                 subtitle: t(
-                  "stocksourcedeletedsuccessfully",
+                  "stockSourceDeletedSuccessfully",
                   "Stock Source Deleted Successfully"
                 ),
               });
@@ -43,7 +43,7 @@ const StockSourcesDeleteActionMenu: React.FC<
             (error) => {
               setDeletingSource(false);
               showSnackbar({
-                title: t(`errorDeletingSource', 'error deleting a source`),
+                title: t("errorDeletingSource", "Error deleting a source"),
                 kind: "error",
                 isLowContrast: true,
                 subtitle: error?.message,

package/src/stock-user-role-scopes/add-stock-user-role-scope-button.component.tsx

@@ -8,12 +8,15 @@ const AddStockUserRoleScopeActionButton: React.FC = () => {
   const { t } = useTranslation();
 
   const handleClick = useCallback(() => {
-    launchOverlay("Add Stock User Role Scope", <AddStockUserRoleScope />);
+    launchOverlay(
+      t("addStockUserRoleScope", "Add Stock User Role Scope"),
+      <AddStockUserRoleScope />
+    );
   }, []);
 
   return (
     <Button onClick={handleClick} size="md" kind="primary">
-      {t("stockmanagement.addnewuserrolescope", "Add New User Role Scope")}
+      {t("addNewUserRoleScope", "Add New User Role Scope")}
     </Button>
   );
 };