@openmrs/esm-stock-management-app 1.0.1-pre.548 → 1.0.1-pre.559

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

@@ -85,10 +85,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5450044,
+      "size": 5444407,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5428094,
+        "javascript": 5422457,
         "share-init": 252,
         "runtime": 21446
       },
@@ -105,7 +105,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "30e2f185cb912a10",
+      "hash": "0885d110df6c3477",
       "childrenByOrder": {}
     },
     {
@@ -113,9 +113,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 8082,
+      "size": 8120,
       "sizes": {
-        "javascript": 8082
+        "javascript": 8120
       },
       "names": [],
       "idHints": [],
@@ -127,7 +127,7 @@
         "271.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "7d23e8860b9c0e5d",
+      "hash": "67571844717f3958",
       "childrenByOrder": {}
     },
     {
@@ -135,9 +135,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1781617,
+      "size": 1775980,
       "sizes": {
-        "javascript": 1781407,
+        "javascript": 1775770,
         "consume-shared": 210
       },
       "names": [],
@@ -151,7 +151,7 @@
       "auxiliaryFiles": [
         "281.js.map"
       ],
-      "hash": "15013cd39570dd8f",
+      "hash": "140cb36d45968ade",
       "childrenByOrder": {}
     },
     {
@@ -183,9 +183,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 13314,
+      "size": 13352,
       "sizes": {
-        "javascript": 13314
+        "javascript": 13352
       },
       "names": [],
       "idHints": [],
@@ -197,7 +197,7 @@
         "319.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "7ecfe10284442b2a",
+      "hash": "212523370ebec16d",
       "childrenByOrder": {}
     },
     {
@@ -205,9 +205,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 11083,
+      "size": 11121,
       "sizes": {
-        "javascript": 11083
+        "javascript": 11121
       },
       "names": [],
       "idHints": [],
@@ -219,7 +219,7 @@
         "460.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "d872230380eef2ff",
+      "hash": "121c4ef0e9fc4b30",
       "childrenByOrder": {}
     },
     {
@@ -251,9 +251,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 11474,
+      "size": 11502,
       "sizes": {
-        "javascript": 11474
+        "javascript": 11502
       },
       "names": [],
       "idHints": [],
@@ -265,7 +265,7 @@
         "574.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "89e992c4e2233665",
+      "hash": "1dabb0391057300e",
       "childrenByOrder": {}
     },
     {
@@ -342,9 +342,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 13448,
+      "size": 13486,
       "sizes": {
-        "javascript": 13448
+        "javascript": 13486
       },
       "names": [],
       "idHints": [],
@@ -356,7 +356,7 @@
         "757.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "6efd965a2bf3aa0b",
+      "hash": "fd6b9f5b0f1c7de5",
       "childrenByOrder": {}
     },
     {
@@ -391,9 +391,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 10033,
+      "size": 10071,
       "sizes": {
-        "javascript": 10033
+        "javascript": 10071
       },
       "names": [],
       "idHints": [],
@@ -405,7 +405,7 @@
         "788.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "e784a343b35c9de5",
+      "hash": "3f32b894414c9964",
       "childrenByOrder": {}
     },
     {
@@ -440,9 +440,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 11828,
+      "size": 11866,
       "sizes": {
-        "javascript": 11828
+        "javascript": 11866
       },
       "names": [],
       "idHints": [],
@@ -454,7 +454,7 @@
         "807.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "ad69a777c299058a",
+      "hash": "280b0ae7fdf58f36",
       "childrenByOrder": {}
     },
     {
@@ -462,9 +462,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 10465,
+      "size": 10503,
       "sizes": {
-        "javascript": 10465
+        "javascript": 10503
       },
       "names": [],
       "idHints": [],
@@ -476,7 +476,7 @@
         "833.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "b8bb5103d89866c8",
+      "hash": "27c91533423752b2",
       "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-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"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":"root","route":"stock-management"}],"version":"1.0.1-pre.548"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"extensions":[{"name":"stock-nav-menu","slot":"stock-sidebar-slot","component":"stockNavMenu","online":true,"offline":true},{"name":"overview-db-link","slot":"stock-page-dashboard-slot","component":"stockOverviewLink","meta":{"name":"overview","slot":"overview-dashboard-slot","title":"overview"},"order":0,"online":true,"offline":true},{"name":"stock-overview-db","slot":"overview-dashboard-slot","component":"stockOverview"},{"name":"operations-db-link","slot":"stock-page-dashboard-slot","component":"stockOperationsLink","meta":{"name":"operations","slot":"operations-dashboard-slot","title":"operations"},"order":2,"online":true,"offline":true},{"name":"stock-operations-db","slot":"operations-dashboard-slot","component":"stockOperations"},{"name":"items-db-link","slot":"stock-page-dashboard-slot","component":"stockItemsLink","meta":{"name":"items","slot":"items-dashboard-slot","title":"items"},"order":1,"online":true,"offline":true},{"name":"stock-items-db","slot":"items-dashboard-slot","component":"stockItems"},{"name":"user-scopes-db-link","slot":"stock-page-dashboard-slot","component":"stockUserScopesLink","meta":{"name":"user-scopes","slot":"user-scopes-dashboard-slot","title":"user-scopes"},"order":3,"online":true,"offline":true},{"name":"stock-user-scopes-db","slot":"user-scopes-dashboard-slot","component":"stockUserScopes"},{"name":"sources-db-link","slot":"stock-page-dashboard-slot","component":"stockSourcesLink","meta":{"name":"sources","slot":"sources-dashboard-slot","title":"Sources"},"order":2,"online":true,"offline":true},{"name":"stock-sources-db","slot":"sources-dashboard-slot","component":"stockSources"},{"name":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"name":"reports-db-link","slot":"stock-page-dashboard-slot","component":"stockReportsLink","meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"},"order":5,"online":true,"offline":true},{"name":"stock-reports-db","slot":"reports-dashboard-slot","component":"stockReports"},{"name":"settings-db-link","slot":"stock-page-dashboard-slot","component":"stockSettingsLink","meta":{"name":"settings","slot":"settings-dashboard-slot","title":"Settings"},"order":6,"online":true,"offline":true},{"name":"stock-settings-db","slot":"settings-dashboard-slot","component":"stockSettings"},{"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":"root","route":"stock-management"}],"version":"1.0.1-pre.559"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-stock-management-app",
-  "version": "1.0.1-pre.548",
+  "version": "1.0.1-pre.559",
   "license": "MPL-2.0",
   "description": "Stock management microfrontend for OpenMRS 3.x",
   "browser": "dist/openmrs-esm-stock-management-app.js",
@@ -69,14 +69,14 @@
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.68",
     "@swc/jest": "^0.2.26",
-    "@testing-library/dom": "^8.20.1",
+    "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^13.4.0",
+    "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/file-saver": "^2.0.5",
     "@types/jest": "^28.1.8",
-    "@types/react": "^18.2.14",
-    "@types/react-dom": "^18.2.6",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "^5.3.3",
     "@types/webpack-env": "^1.18.1",

package/src/core/api/types/stockOperation/StockOperationDTO.ts

@@ -3,7 +3,6 @@ import { StockOperationItemDTO } from "./StockOperationItemDTO";
 import { StockOperationStatus } from "./StockOperationStatus";
 
 export interface StockOperationDTO {
-  receivedItems: any;
   uuid: string | null | undefined;
   cancelReason: string | null | undefined;
   cancelledBy: number;

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

@@ -82,10 +82,12 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
   }, [currentStockOperationType, requisition, props.model?.uuid]);
 
   const [selectedIndex, setSelectedIndex] = useState(0);
-  const [canReceiveItems, setCanReceiveItems] = useState(false);
+  const [canDisplayReceivedItems, setCanDisplayReceivedItems] = useState(false);
 
   useEffect(() => {
-    setCanReceiveItems(props?.model?.permission?.canReceiveItems ?? false);
+    setCanDisplayReceivedItems(
+      props?.model?.permission?.canDisplayReceivedItems ?? false
+    );
   }, [props?.model?.permission]);
 
   if (isLoading) return <AccordionSkeleton />;
@@ -182,6 +184,9 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
               : result.requiresDispatchAcknowledgement
           }
           actions={{
+            onGoBack: () => {
+              setSelectedIndex(1);
+            },
             onSave: async (model) => {
               // TODO: Update
               await addOrEditStockOperation(
@@ -193,17 +198,15 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
                 props.canPrint
               );
             },
-            onGoBack: () => {
-              setSelectedIndex(1);
-            },
+
             onComplete: async () => {
-              await showActionDialogButton("Complete", true, props?.model);
+              await showActionDialogButton("Complete", false, props?.model);
             },
             onSubmit: async () => {
-              await showActionDialogButton("Submit", true, props?.model);
+              await showActionDialogButton("Submit", false, props?.model);
             },
             onDispatch: async () => {
-              await showActionDialogButton("Dispatch", true, props?.model);
+              await showActionDialogButton("Dispatch", false, props?.model);
             },
           }}
         />
@@ -213,7 +216,7 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
   ].concat(
     StockOperationTypeIsStockIssue(
       props?.model?.operationType as OperationType
-    ) || canReceiveItems
+    ) || canDisplayReceivedItems
       ? status === "DISPATCHED" || status === "COMPLETED"
         ? [
             {
@@ -505,6 +508,7 @@ const AddStockOperation: React.FC<AddStockOperationProps> = (props) => {
                       <div style={{ margin: "2px" }}>
                         <StockOperationCompleteDispatchButton
                           operation={props?.model}
+                          reason={false}
                         />
                       </div>
                       <div style={{ margin: "2px" }}>

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

@@ -59,10 +59,7 @@ export async function initializeNewStockOperation(
   let destinationPartyList: Party[] | null | undefined;
 
   if (isNew) {
-    model = structuredClone({
-      ...initialStockOperationValue(),
-      receivedItems: [],
-    });
+    model = structuredClone(initialStockOperationValue());
     model = Object.assign(model, {
       operationDate: today(),
       operationTypeName: currentStockOperationType?.name,

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

@@ -46,11 +46,12 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
   model,
   requiresDispatchAcknowledgement,
   actions,
+  isEditing,
 }) => {
   const { t } = useTranslation();
   const [isSaving, setIsSaving] = useState(false);
   const [approvalRequired, setApprovalRequired] = useState<boolean | null>(
-    null
+    model?.approvalRequired
   );
 
   const handleRadioButtonChange = (selectedItem: boolean) => {
@@ -68,7 +69,9 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
               "Does the transaction require approval ?"
             )}
             onChange={handleRadioButtonChange}
-            defaultSelected={approvalRequired}
+            defaultSelected={
+              model?.approvalRequired === null ? false : approvalRequired
+            }
           >
             <RadioButton
               value={true}
@@ -111,15 +114,15 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
                   kind="primary"
                   onClick={async () => {
                     delete model?.dateCreated;
-                    delete model?.status;
                     setIsSaving(true);
-                    await actions.onSave(model).then(() => {
-                      delete model?.dateCreated;
-                      model.status = "COMPLETED";
-                      setIsSaving(true);
-                      actions.onComplete(model);
+                    if (!isEditing) {
+                      delete model.status;
+                      await actions.onSave(model);
                       setIsSaving(false);
-                    });
+                    }
+                    model.status = "COMPLETED";
+                    actions.onComplete(model);
+                    setIsSaving(false);
                   }}
                   renderIcon={ListChecked}
                 >
@@ -137,13 +140,9 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
                     delete model?.dateCreated;
                     delete model?.status;
                     setIsSaving(true);
-                    await actions.onSave(model).then(() => {
-                      delete model?.dateCreated;
-                      model.status = "COMPLETED";
-                      setIsSaving(true);
-                      actions.onDispatch(model);
-                      setIsSaving(false);
-                    });
+                    model.status = "DISPATCHED";
+                    await actions.onDispatch(model);
+                    setIsSaving(false);
                   }}
                   renderIcon={Departure}
                 >
@@ -160,7 +159,7 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
                   onClick={actions.onSubmit}
                   renderIcon={SendFilled}
                 >
-                  {t("submit", "Submit For Review")}
+                  {t("submitForReview", "Submit For Review")}
                 </Button>
               )}
             </>
@@ -175,6 +174,7 @@ const StockOperationSubmission: React.FC<StockOperationSubmissionProps> = ({
               delete model?.dateCreated;
               delete model?.status;
               setIsSaving(true);
+              model.approvalRequired = approvalRequired ? true : false;
               await actions.onSave(model);
               setIsSaving(false);
             }}

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

@@ -8,17 +8,18 @@ import { StockOperationDTO } from "../../core/api/types/stockOperation/StockOper
 
 interface StockOperationCompleteButtonProps {
   operation: StockOperationDTO;
+  reason: boolean;
 }
 
 const StockOperationCompleteButton: React.FC<
   StockOperationCompleteButtonProps
-> = ({ operation }) => {
+> = ({ operation, reason }) => {
   const { t } = useTranslation();
   const launchCompleteModal = useCallback(() => {
     const dispose = showModal("stock-operation-dialog", {
       title: "Complete",
       operation: operation,
-      requireReason: true,
+      requireReason: reason,
       closeModal: () => dispose(),
     });
   }, [operation]);

package/src/stock-operations/stock-operations-dialog/stock-operations-completed-dispatch-button.component.tsx

@@ -8,17 +8,18 @@ import { StockOperationDTO } from "../../core/api/types/stockOperation/StockOper
 
 interface StockOperationCompleteDispatchButtonProps {
   operation: StockOperationDTO;
+  reason: boolean;
 }
 
 const StockOperationCompleteDispatchButton: React.FC<
   StockOperationCompleteDispatchButtonProps
-> = ({ operation }) => {
+> = ({ operation, reason }) => {
   const { t } = useTranslation();
   const launchcompletedDispatchModal = useCallback(() => {
     const dispose = showModal("stock-operation-dialog", {
       title: "Complete Dispatch",
       operation: operation,
-      requireReason: false,
+      requireReason: reason,
       closeModal: () => dispose(),
     });
   }, [operation]);

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

@@ -24,15 +24,14 @@ import {
   StructuredListRow,
   StructuredListCell,
   StructuredListBody,
-  OverflowMenu,
-  OverflowMenuItem,
   DatePickerInput,
   DatePicker,
   TableToolbarMenu,
   TableToolbarAction,
+  Button,
   InlineLoading,
 } from "@carbon/react";
-import { ArrowRight } from "@carbon/react/icons";
+import { ArrowRight, Edit } from "@carbon/react/icons";
 import { formatDisplayDate } from "../core/utils/datetimeUtils";
 import {
   StockOperationStatusCancelled,
@@ -131,18 +130,8 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
     selectedStatus.length ||
     selectedOperations.length;
 
-  const config = useConfig();
-
   let operations: StockOperationType[] | null | undefined;
 
-  const handleOnComplete = () => {
-    const dispose = showModal("stock-operation-dialog", {
-      title: "complete",
-      closeModal: () => dispose(),
-    });
-    handleMutate(`${restBaseUrl}/stockmanagement/stockoperation`);
-  };
-
   const handleOnFilterChange = useCallback((selectedItems, filterType) => {
     if (filterType === StockFilters.SOURCES) {
       setSelectedSources(selectedItems);
@@ -308,22 +297,22 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
         </div>
       ),
       actions: (
-        <OverflowMenu flipped={"true"} aria-label="overflow-menu">
-          <OverflowMenuItem itemText="Complete" onClick={handleOnComplete} />
-          <OverflowMenuItem
-            itemText="Edit"
-            onClick={() => {
-              launchAddOrEditDialog(
-                t,
-                items[index],
-                true,
-                operation,
-                operations,
-                false
-              );
-            }}
-          />
-        </OverflowMenu>
+        <Button
+          kind="ghost"
+          size="md"
+          onClick={() => {
+            launchAddOrEditDialog(
+              t,
+              items[index],
+              true,
+              operation,
+              operations,
+              false
+            );
+          }}
+          iconDescription={t("editStockItem", "Edit Stock Item")}
+          renderIcon={(props) => <Edit size={16} {...props} />}
+        ></Button>
       ),
     }));
   }, [items, operation, operations, t]);
@@ -396,19 +385,16 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                   </DatePicker>
 
                   <StockOperationsFilters
-                    conceptUuid={config.stockSourceTypeUUID}
                     filterName={StockFilters.SOURCES}
                     onFilterChange={handleOnFilterChange}
                   />
 
                   <StockOperationsFilters
-                    conceptUuid={config.stockSourceTypeUUID}
                     filterName={StockFilters.STATUS}
                     onFilterChange={handleOnFilterChange}
                   />
 
                   <StockOperationsFilters
-                    conceptUuid={config.stockSourceTypeUUID}
                     filterName={StockFilters.OPERATION}
                     onFilterChange={handleOnFilterChange}
                   />
@@ -423,7 +409,7 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                   onOperationTypeSelected={(operation) => {
                     launchAddOrEditDialog(
                       t,
-                      { ...initialStockOperationValue(), receivedItems: [] },
+                      initialStockOperationValue(),
                       false,
                       operation,
                       operations,
@@ -489,10 +475,6 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                               <StructuredListCell head>
                                 {t("dateCompleted", "Date Completed")}
                               </StructuredListCell>
-                              <StructuredListCell head>
-                                {t("batchNumber", "Batch Number")}
-                              </StructuredListCell>
-                              <StructuredListCell head>Qty</StructuredListCell>
                             </StructuredListRow>
                           </StructuredListHead>
                           <StructuredListBody>
@@ -521,20 +503,6 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                                   ? items[index]?.creatorFamilyName
                                   : ""}
                               </StructuredListCell>
-                              <StructuredListCell>
-                                {items[index]?.stockOperationItems
-                                  ? items[index].stockOperationItems?.map(
-                                      (item) => item.batchNo
-                                    )[0]
-                                  : ""}
-                              </StructuredListCell>
-                              <StructuredListCell>
-                                {items[index]?.stockOperationItems
-                                  ? items[index].stockOperationItems?.map(
-                                      (item) => item.quantity
-                                    )[0]
-                                  : ""}
-                              </StructuredListCell>
                             </StructuredListRow>
                             <StructuredListRow>
                               <StructuredListCell noWrap>
@@ -577,20 +545,6 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                                   ? items[index]?.creatorFamilyName
                                   : ""}
                               </StructuredListCell>
-                              <StructuredListCell>
-                                {items[index]?.stockOperationItems
-                                  ? items[index].stockOperationItems?.map(
-                                      (item) => item.batchNo
-                                    )[1]
-                                  : ""}
-                              </StructuredListCell>
-                              <StructuredListCell>
-                                {items[index]?.stockOperationItems
-                                  ? items[index].stockOperationItems?.map(
-                                      (item) => item.quantity
-                                    )[1]
-                                  : ""}
-                              </StructuredListCell>
                             </StructuredListRow>
                           </StructuredListBody>
                         </>

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

@@ -61,9 +61,10 @@ const StockSourcesDeleteActionMenu: React.FC<
       kind="ghost"
       size="md"
       onClick={handleDeleteStockSource}
-      iconDescription={t("deleteSource", "Delete Source")}
-      renderIcon={(props) => <TrashCan size={16} {...props} />}
-    />
+      aria-label={t("deleteSource", "Delete Source")}
+    >
+      <TrashCan size={16} />
+    </Button>
   );
 
   return deletingSource ? <InlineLoading /> : deleteButton;