@openmrs/esm-stock-management-app 1.0.1-pre.484 → 1.0.1-pre.489

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,14 +24,14 @@ import {
   StructuredListRow,
   StructuredListCell,
   StructuredListBody,
-  OverflowMenu,
-  OverflowMenuItem,
   DatePickerInput,
   DatePicker,
   TableToolbarMenu,
   TableToolbarAction,
+  Button,
 } from "@carbon/react";
-import { ArrowRight } from "@carbon/react/icons";
+import { ArrowRight, Edit } from "@carbon/react/icons";
+
 import { formatDisplayDate } from "../core/utils/datetimeUtils";
 import styles from "../stock-items/stock-items-table.scss";
 import {
@@ -341,22 +341,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,
-                filteredItems[index],
-                true,
-                operation,
-                operations,
-                false
-              );
-            }}
-          />
-        </OverflowMenu>
+        <Button
+          kind="ghost"
+          size="md"
+          onClick={() => {
+            launchAddOrEditDialog(
+              t,
+              filteredItems[index],
+              true,
+              operation,
+              operations,
+              false
+            );
+          }}
+          iconDescription={t("editStockItem", "Edit Stock Item")}
+          renderIcon={(props) => <Edit size={16} {...props} />}
+        ></Button>
       ),
     }));
   }, [handleOnComplete, filteredItems, operation, operations, t]);
@@ -520,10 +520,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>
@@ -556,24 +552,6 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                                   ? filteredItems[index]?.creatorFamilyName
                                   : ""}
                               </StructuredListCell>
-                              <StructuredListCell>
-                                {filteredItems[index]?.stockOperationItems
-                                  ? filteredItems[
-                                      index
-                                    ].stockOperationItems?.map(
-                                      (item) => item.batchNo
-                                    )[0]
-                                  : ""}
-                              </StructuredListCell>
-                              <StructuredListCell>
-                                {filteredItems[index]?.stockOperationItems
-                                  ? filteredItems[
-                                      index
-                                    ].stockOperationItems?.map(
-                                      (item) => item.quantity
-                                    )[0]
-                                  : ""}
-                              </StructuredListCell>
                             </StructuredListRow>
                             <StructuredListRow>
                               <StructuredListCell noWrap>
@@ -618,24 +596,6 @@ const StockOperations: React.FC<StockOperationsTableProps> = () => {
                                   ? items[index]?.creatorFamilyName
                                   : ""}
                               </StructuredListCell>
-                              <StructuredListCell>
-                                {filteredItems[index]?.stockOperationItems
-                                  ? filteredItems[
-                                      index
-                                    ].stockOperationItems?.map(
-                                      (item) => item.batchNo
-                                    )[1]
-                                  : ""}
-                              </StructuredListCell>
-                              <StructuredListCell>
-                                {filteredItems[index]?.stockOperationItems
-                                  ? filteredItems[
-                                      index
-                                    ].stockOperationItems?.map(
-                                      (item) => item.quantity
-                                    )[1]
-                                  : ""}
-                              </StructuredListCell>
                             </StructuredListRow>
                           </StructuredListBody>
                         </>

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

@@ -80,9 +80,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
 
   const { reportTypes, isLoading } = useReportTypes();
   const { stockLocations } = useStockTagLocations();
-  const { items, isLoading: isLoadingStockItemCategories } = useConcept(
-    stockItemCategoryUUID
-  );
+  const { items } = useConcept(stockItemCategoryUUID);
   const [displayDate, setDisplayDate] = useState<boolean>(false);
   const [displayStartDate, setDisplayStartDate] = useState<boolean>(false);
   const [displayEndDate, setDisplayEndDate] = useState<boolean>(false);
@@ -644,6 +642,7 @@ const CreateReport: React.FC<CreateReportProps> = ({ model }) => {
               <NumberInput
                 id="limitTop"
                 allowEmpty={true}
+                hideSteppers={true}
                 value={value}
                 onchange={onChange}
                 label={t("limit", "Limit")}

package/translations/en.json

@@ -52,8 +52,8 @@
   "code": "Code",
   "comingSoonUnderDev": "Exciting updates are on the way! In the meantime, use the link below to access Admin UI settings.",
   "commonName": "Common Name",
-  "complete": "Complete Dispatch ",
-  "completed": "Completed",
+  "completedispatch": "Complete Dispatch ",
+  "complete": "Complete",
   "continue": "Continue",
   "created": "Created",
   "createLocation": "Create Location",