@openmrs/esm-stock-management-app 1.0.1-pre.554 → 1.0.1-pre.575

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-operations/stock-operations-table.scss

@@ -1,12 +1,11 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import "~@openmrs/esm-styleguide/src/vars";
-@import '../root.scss';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '~@openmrs/esm-styleguide/src/vars' as *;
 
 .tileContainer {
   background-color: $ui-02;
   border-top: 1px solid $ui-03;
-  padding: 5rem 0;
+  padding: layout.$spacing-11 0;
 }
 
 .tile {
@@ -23,7 +22,7 @@
 .content {
   @include type.type-style('heading-compact-02');
   color: $text-02;
-  margin-bottom: 0.5rem;
+  margin-bottom: layout.$spacing-03;
 }
 
 .helper {
@@ -42,7 +41,7 @@
 }
 
 .dateAlign {
-  padding-top: spacing.$spacing-03;
+  padding-top: layout.$spacing-03;
   height: 100%;
 }
 
@@ -50,12 +49,12 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: spacing.$spacing-05;
+  margin-bottom: layout.$spacing-05;
 }
 
 .rowLoadingContainer {
   text-align: center;
-  padding: 5rem 2rem;
+  padding: layout.$spacing-11 2rem;
   margin: auto;
   width: 20%;
 }

package/src/stock-reports/report-list/stock-reports.scss

@@ -1,6 +1,7 @@
 @use '@carbon/styles/scss/colors';
 @use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@carbon/layout';
+@use '~@openmrs/esm-styleguide/src/vars' as *;
 
 .content {
   @include type.type-style('heading-compact-02');

package/src/stock-settings/stock-settings.component.tsx

@@ -10,7 +10,7 @@ function StockSettings() {
 
   return (
     <div className={styles.StockSettings}>
-      <div className={styles.title}>
+      <div className={styles.tableHeader}>
         {t(
           "comingSoonUnderDev",
           "Exciting updates are on the way! In the meantime, use the link below to access Admin UI settings."

package/src/stock-settings/stock-settings.scss

@@ -1,6 +1,8 @@
 @use '@carbon/colors';
 @use '@carbon/layout';
-@use "../root.scss" as *;
+@use '@carbon/type';
+@use '@openmrs/esm-styleguide/src/vars' as *;
+
 
 .StockSettings {
     display: flex;
@@ -18,6 +20,7 @@
     }
 }
 
-.title {
-    @extend .productiveHeading01;
-}
+.tableHeader {
+    @include type.type-style('heading-compact-01');
+    color: $text-02;
+  }

package/src/stock-sources/add-stock-sources/add-stock-sources.scss

@@ -1,18 +1,18 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '~@openmrs/esm-styleguide/src/vars' as *;
 
 .section {
-  margin: spacing.$spacing-03;
+  margin: layout.$spacing-03;
 }
 
 .sectionTitle {
   @include type.type-style('heading-compact-02');
   color: $text-02;
-  margin-bottom: spacing.$spacing-04;
+  margin-bottom: layout.$spacing-04;
 }
 
 .modalBody {
-  padding-bottom: spacing.$spacing-05;
+  padding-bottom: layout.$spacing-05;
 }
 

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

@@ -1,7 +1,7 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Button, ModalHeader, ModalBody, ModalFooter } from "@carbon/react";
-import styles from "../root.scss";
+import styles from "./delete-stock-modal.scss";
 
 interface DeleteConfirmationProps {
   uuid?: string;
@@ -20,11 +20,11 @@ const DeleteConfirmation: React.FC<DeleteConfirmationProps> = ({
 
   return (
     <>
-      <ModalHeader closeModal={close} className={styles.productiveHeading03}>
+      <ModalHeader closeModal={close} className={styles.modalHeader}>
         {t("deleteStock", "Delete Stock source")}?
       </ModalHeader>
       <ModalBody>
-        <p className={styles.bodyLong01}>
+        <p className={styles.bodyText}>
           {t(
             "deleteConfirmationText",
             `Are you sure you want to delete this source? This action can't be undone.`,

package/src/stock-sources/delete-stock-modal.scss

@@ -0,0 +1,11 @@
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '~@openmrs/esm-styleguide/src/vars' as *;
+
+.bodyText {
+    @include type.type-style('body-long-01');
+  }
+
+.modalHeader {
+    @include type.type-style('heading-compact-02');
+  }

package/src/stock-sources/stock-sources-filter/stock-sources-filter.scss

@@ -1,10 +1,12 @@
+@use '@carbon/layout';
+
 .filterContainer {
     :global(.cds--dropdown__wrapper--inline) {
       gap: 0;
     }
   
     :global(.cds--list-box__menu-icon) {
-      height: 1rem;
+      height: layout.$spacing-05;
     }
   
     :global(.cds--dropdown--inline) :global(.cds--list-box__field) {

package/src/stock-sources/stock-sources.scss

@@ -1,5 +1,5 @@
 @use '@carbon/styles/scss/colors';
-@use '@carbon/styles/scss/spacing';
+@use '@carbon/layout';
 @use '@carbon/styles/scss/type';
 @import '~@openmrs/esm-styleguide/src/vars';
 
@@ -64,7 +64,7 @@
 
 .tableContainer {
   background-color: $ui-01;
-  margin: 0 spacing.$spacing-05;
+  margin: 0 layout.$spacing-05;
   padding: 0;
 
   a {
@@ -80,8 +80,8 @@
   }
 
   .toolbarContent {
-    height: spacing.$spacing-07;
-    margin-bottom: spacing.$spacing-02;
+    height: layout.$spacing-07;
+    margin-bottom: layout.$spacing-02;
   }
 }
 
@@ -142,7 +142,7 @@
 .tileContainer {
   background-color: $ui-02;
   border-top: 1px solid $ui-03;
-  padding: 5rem 0;
+  padding: layout.$spacing-11 0;
 }
 
 .tile {
@@ -178,7 +178,7 @@
 .tabletHeading {
   text-align: left;
   text-transform: capitalize;
-  margin-bottom: spacing.$spacing-05;
+  margin-bottom: layout.$spacing-05;
 
   h4:after {
     content: '';
@@ -204,13 +204,13 @@
 
 .headerBtnContainer {
   background-color: $ui-background;
-  padding: spacing.$spacing-05;
+  padding: layout.$spacing-05;
   text-align: right;
 }
 
 .addPatientToListBtn {
-  margin-left: spacing.$spacing-05;
-  height: spacing.$spacing-09;
+  margin-left: layout.$spacing-05;
+  height: layout.$spacing-09;
 }
 
 .editIcon {

package/src/stock-user-role-scopes/delete-stock-user-scope-modal.component.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Button, ModalHeader, ModalBody, ModalFooter } from "@carbon/react";
-import styles from "../root.scss";
+import styles from "./delete-stock-user-scope-modal.scss";
 
 interface DeleteConfirmationProps {
   uuid?: string;

package/src/stock-user-role-scopes/delete-stock-user-scope-modal.scss

@@ -0,0 +1,11 @@
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '~@openmrs/esm-styleguide/src/vars' as *;
+
+.bodyText {
+    @include type.type-style('body-long-01');
+  }
+
+.modalHeader {
+    @include type.type-style('heading-compact-02');
+  }

package/src/stock-user-role-scopes/stock-user-role-scopes.scss

@@ -1,6 +1,7 @@
-@use '@carbon/styles/scss/colors';
-@use '@carbon/styles/scss/type';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@carbon/colors';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '~@openmrs/esm-styleguide/src/vars' as *;
 
 .content {
   @include type.type-style('heading-compact-02');
@@ -17,7 +18,7 @@
   @include type.type-style('body-compact-02');
   color: $text-02;
   width: 80%;
-  margin: 1.5rem auto;
+  margin: layout.$spacing-06 auto;
   overflow: hidden;
   text-align: center;
 
@@ -33,12 +34,12 @@
   }
 
   &::before {
-    right: 0.5rem;
+    right: layout.$spacing-03;
     margin-left: -50%;
   }
 
   &::after {
-    left: 0.5rem;
+    left: layout.$spacing-03;;
     margin-right: -50%;
   }
 }
@@ -46,7 +47,7 @@
 .tileContainer {
   background-color: $ui-02;
   border-top: 1px solid $ui-03;
-  padding: 5rem 0;
+  padding: layout.$spacing-11 0;
 }
 
 .tile {

package/translations/am.json

@@ -280,6 +280,7 @@
   "stockSourceDeletedSuccessfully": "የአክሲዮን ምንጭ በተሳካ ሁኔታ ተሰርዟል።",
   "stockUserScopeDeletedSuccessfully": "የአክሲዮን ተጠቃሚ ወሰን በተሳካ ሁኔታ ተሰርዟል።",
   "submit": "አስተዋውቅ",
+  "submitForReview": "Submit For Review",
   "submitted": "ተጠይቷል",
   "successfullysaved": "የተጠቃሚ ሚና አካባቢ በተሳካ ሁኔታ ተስተካክሏል",
   "SuccessfullyUploadedStockItem": "የአክሲዮን ንጥሎችን በተሳካ ሁኔታ ሰቅለዋል።",

package/translations/ar.json

@@ -280,6 +280,7 @@
   "stockSourceDeletedSuccessfully": "تم حذف مصدر المخزون بنجاح",
   "stockUserScopeDeletedSuccessfully": "تم حذف نطاق مستخدم المخزون بنجاح",
   "submit": "تقديم",
+  "submitForReview": "Submit For Review",
   "submitted": "تم تقديمه",
   "successfullysaved": "تم حفظ نطاق دور المستخدم بنجاح",
   "SuccessfullyUploadedStockItem": "لقد قمت بتحميل العناصر المخزنة بنجاح",

package/translations/en.json

@@ -54,7 +54,7 @@
   "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 ",
+  "complete": "Complete",
   "completed": "Completed",
   "continue": "Continue",
   "created": "Created",
@@ -280,6 +280,7 @@
   "stockSourceDeletedSuccessfully": "Stock Source Deleted Successfully",
   "stockUserScopeDeletedSuccessfully": "Stock User Scope Deleted Successfully",
   "submit": "Submit",
+  "submitForReview": "Submit For Review",
   "submitted": "Submitted",
   "successfullysaved": "You have successfully saved user role scope ",
   "SuccessfullyUploadedStockItem": "You have successfully uploaded stock items",

package/translations/es.json

@@ -280,6 +280,7 @@
   "stockSourceDeletedSuccessfully": "Fuente de stock eliminada correctamente",
   "stockUserScopeDeletedSuccessfully": "Ámbito de usuario de stock eliminado Exitosamente",
   "submit": "Enviar",
+  "submitForReview": "Submit For Review",
   "submitted": "Enviado",
   "successfullysaved": "Ha guardado con éxito el alcance del rol del usuario",
   "SuccessfullyUploadedStockItem": "Has cargado correctamente los artículos en stock",

package/translations/fr.json

@@ -280,6 +280,7 @@
   "stockSourceDeletedSuccessfully": "Source de stock supprimée avec succès",
   "stockUserScopeDeletedSuccessfully": "Portée de l'utilisateur stock supprimée avec succès",
   "submit": "Soumettre",
+  "submitForReview": "Submit For Review",
   "submitted": "Soumis",
   "successfullysaved": "Vous avez enregistré avec succès la portée du rôle de l'utilisateur",
   "SuccessfullyUploadedStockItem": "Vous avez téléchargé avec succès les articles en stock",

package/translations/he.json

@@ -280,6 +280,7 @@
   "stockSourceDeletedSuccessfully": "מקור מלאי נמחק בהצלחה",
   "stockUserScopeDeletedSuccessfully": "היקף משתמש במניות נמחק בהצלחה",
   "submit": "שלח",
+  "submitForReview": "Submit For Review",
   "submitted": "נשלח",
   "successfullysaved": "שמרת בהצלחה תחום תפקיד משתמש",
   "SuccessfullyUploadedStockItem": "העלית בהצלחה פריטי מלאי",

package/translations/km.json

@@ -280,6 +280,7 @@
   "stockSourceDeletedSuccessfully": "ប្រភពស្តុកត្រូវបានលុបដោយជោគជ័យ",
   "stockUserScopeDeletedSuccessfully": "វិសាលភាពអ្នកប្រើប្រាស់ស្តុកត្រូវបានលុបដោយជោគជ័យ",
   "submit": "ដាក់ស្នើ",
+  "submitForReview": "Submit For Review",
   "submitted": "បានដាក់ស្នើ",
   "successfullysaved": "អ្នកបានរក្សាទុកវិសាលភាពតួនាទីអ្នកប្រើដោយជោគជ័យ",
   "SuccessfullyUploadedStockItem": "អ្នក\u200bបាន\u200bផ្ទុក\u200bឡើង\u200bធាតុ\u200bស្តុក\u200bដោយ\u200bជោគជ័យ",

package/translations/zh.json

@@ -280,6 +280,7 @@
   "stockSourceDeletedSuccessfully": "库存源已成功删除",
   "stockUserScopeDeletedSuccessfully": "库存用户范围已成功删除",
   "submit": "提交",
+  "submitForReview": "Submit For Review",
   "submitted": "已提交",
   "successfullysaved": "您已成功保存用户角色范围",
   "SuccessfullyUploadedStockItem": "您已成功上传库存商品",