@openmrs/esm-stock-management-app 1.0.1-pre.366 → 1.0.1-pre.368

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

@@ -59,9 +59,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1021542,
+      "size": 1024655,
       "sizes": {
-        "javascript": 1021332,
+        "javascript": 1024445,
         "consume-shared": 210
       },
       "names": [],
@@ -75,7 +75,7 @@
       "auxiliaryFiles": [
         "56.js.map"
       ],
-      "hash": "39cbceceb641e93e",
+      "hash": "2c8d7edfd39db751",
       "childrenByOrder": {}
     },
     {
@@ -110,10 +110,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4770591,
+      "size": 4773704,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4748643,
+        "javascript": 4751756,
         "share-init": 252,
         "runtime": 21444
       },
@@ -130,7 +130,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "c684d2d0c8d571da",
+      "hash": "3e8626336ae7a6e4",
       "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"}],"pages":[{"component":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.366"}
+{"$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"}],"pages":[{"component":"stockManagement","route":"stock-management"}],"version":"1.0.1-pre.368"}

package/package.json

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

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

@@ -59,7 +59,6 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
   }
 
   let operations: StockOperationType[] | null | undefined;
-
   const tabs: TabItem[] = [
     {
       name: isEditing
@@ -86,7 +85,7 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
             setManageStockItems(true);
             setSelectedIndex(1);
           }}
-          operation={props.operation}
+          operation={props?.operation}
         />
       ),
     },
@@ -124,7 +123,13 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
           setup={result}
           canEdit={canEdit}
           locked={false}
-          model={isEditing ? props?.model : result?.dto}
+          model={
+            isEditing
+              ? props?.model
+              : props?.operation?.name === "Stock Issue"
+              ? props?.model
+              : result?.dto
+          }
           requiresDispatchAcknowledgement={
             isEditing
               ? props?.model?.operationType === "return" ||

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

@@ -58,7 +58,6 @@ function shouldDeleteDestinationUuid(operationType) {
 
 export function createBaseOperationPayload(model, item, operationType) {
   const req = Object.assign(model, item);
-
   const propertiesToDelete = [
     "submitted",
     "cancelledByFamilyName",
@@ -105,6 +104,5 @@ export function createBaseOperationPayload(model, item, operationType) {
   if (shouldDeleteDestinationUuid(operationType)) {
     delete req.destinationUuid;
   }
-
   return req;
 }

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

@@ -36,10 +36,7 @@ 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,
-  getRequisitionStockOperations,
-} from "./add-stock-utils";
+import { createBaseOperationPayload } from "./add-stock-utils";
 
 interface BaseOperationDetailsProps {
   isEditing?: boolean;
@@ -70,8 +67,8 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
     v: ResourceRepresentation.Full,
     totalCount: true,
   });
-  const requisitionStockOperations = getRequisitionStockOperations(items);
-  const operationType = operationFromString(operation.operationType);
+  const operationType = operationFromString(operation?.operationType);
+  const issueStockOperation = mapIssueStockLocations(model);
 
   const {
     handleSubmit,
@@ -79,7 +76,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
     formState: { errors },
     setValue,
   } = useForm<StockOperationFormData>({
-    defaultValues: model,
+    defaultValues: operationType === "stockissue" ? issueStockOperation : model,
     mode: "all",
     resolver: zodResolver(operationSchema(operationType)),
   });
@@ -112,34 +109,6 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
       <form
         className={`${rootStyles.formContainer} ${rootStyles.verticalForm}`}
       >
-        {operationType === OperationType.STOCK_ISSUE_OPERATION_TYPE && (
-          <Controller
-            control={control}
-            name="requisitionStockOperationUuid"
-            render={({ field }) => (
-              <ComboBox
-                id="requisitionStockOperationUuid"
-                items={requisitionStockOperations}
-                onChange={(data: { selectedItem: StockOperationDTO }) => {
-                  field.onChange(data.selectedItem.uuid);
-                  Object.assign(
-                    model.stockOperationItems,
-                    data.selectedItem.stockOperationItems
-                  );
-                  setFormContext({
-                    stockItems: data.selectedItem.stockOperationItems,
-                  });
-                }}
-                itemToString={(item) => `${item?.operationNumber}` ?? ""}
-                titleText={t("requisitionStockOperation", "Requisition")}
-                invalid={!!errors.requisitionStockOperationUuid}
-                invalidText={errors.requisitionStockOperationUuid?.message}
-                placeholder={t("chooseARequisition", "Choose a requisition")}
-              />
-            )}
-          />
-        )}
-
         {canEdit && (
           <Controller
             control={control}
@@ -210,7 +179,11 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
         {(!canEdit || isEditing || lockSource) && (
           <TextInput
             id="sourceUuidLbl"
-            value={model?.sourceName ?? ""}
+            value={
+              operationType === "stockissue"
+                ? issueStockOperation.sourceName
+                : model?.sourceName ?? ""
+            }
             readOnly={true}
             labelText={operation?.hasDestination ? "From" : "From"}
           />
@@ -237,7 +210,11 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
         {(!canEdit || isEditing || lockDestination) && (
           <TextInput
             id="destinationUuidLbl"
-            value={model?.destinationName ?? ""}
+            value={
+              operationType === "stockissue"
+                ? issueStockOperation.destinationName
+                : model?.destinationName ?? ""
+            }
             readOnly={true}
             labelText={operation?.hasSource ? "To" : "To"}
           />
@@ -348,5 +325,19 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
     </div>
   );
 };
+function mapIssueStockLocations(stockOperation) {
+  /** Since we are using requisition information to issue stock,
+      please note that the locations will be inverted: the destination listed on the requisition will become the issuing location.
+  */
+  const { sourceUuid, sourceName, destinationUuid, destinationName } =
+    stockOperation;
+  return {
+    ...stockOperation,
+    sourceUuid: destinationUuid,
+    sourceName: destinationName,
+    destinationUuid: sourceUuid,
+    destinationName: sourceName,
+  };
+}
 
 export default BaseOperationDetails;

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

@@ -12,7 +12,10 @@ import {
   updateStockOperation,
 } from "./stock-operations.resource";
 import AddStockOperation from "./add-stock-operation/add-stock-operation.component";
-import { StockOperationType } from "../core/api/types/stockOperation/StockOperationType";
+import {
+  OperationType,
+  StockOperationType,
+} from "../core/api/types/stockOperation/StockOperationType";
 import { useLocation } from "react-router-dom";
 import { extractErrorMessagesFromResponse } from "../constants";
 import { handleMutate } from "./swr-revalidation";
@@ -28,6 +31,17 @@ export const addOrEditStockOperation = async (
     if (operation.operationType === "requisition") {
       delete payload.destinationName;
     }
+    if (operation.operationType === OperationType.STOCK_ISSUE_OPERATION_TYPE) {
+      const stockIssueOpsTypeUuid = "66666666-6666-6666-6666-666666666666";
+      delete payload.completedDate;
+      delete payload.completedBy;
+      delete payload.completedByFamilyName;
+      delete payload.completedByGivenName;
+      delete payload.operationTypeUuid;
+      delete payload.permission;
+      delete payload.locked;
+      payload["operationTypeUuid"] = stockIssueOpsTypeUuid;
+    }
     const response: FetchResponse<StockOperationDTO> = await (isEditing
       ? updateStockOperation
       : createStockOperation)(payload);

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

@@ -20,7 +20,7 @@ const StockOperationIssueStockButton: React.FC<
     uuid: "",
     name: "Stock Issue",
     description: "",
-    operationType: "",
+    operationType: "stockissue",
     hasSource: false,
     sourceType: "Location",
     hasDestination: false,
@@ -40,8 +40,9 @@ const StockOperationIssueStockButton: React.FC<
     voided: false,
   };
 
+  const modifiedOperation = addRequisitionStockOperation(operation);
   const handleButtonClick = () => {
-    launchAddOrEditDialog(operation, false, type, operations, false);
+    launchAddOrEditDialog(modifiedOperation, false, type, operations, false);
   };
 
   return (
@@ -54,5 +55,12 @@ const StockOperationIssueStockButton: React.FC<
     </Button>
   );
 };
+function addRequisitionStockOperation(stockOperation) {
+  const { uuid } = stockOperation;
+  return {
+    ...stockOperation,
+    requisitionStockOperationUuid: uuid,
+  };
+}
 
 export default StockOperationIssueStockButton;

package/src/stock-operations/validation-schema.ts

@@ -169,9 +169,6 @@ export const operationSchema = (operation: OperationType): z.Schema => {
             .min(1, {
               message: "Destination Required",
             }),
-          requisitionStockOperationUuid: z.string({
-            required_error: "Requisition stock uuid required",
-          }),
         })
       );
     case OperationType.RETURN_OPERATION_TYPE: