@openmrs/esm-stock-management-app 1.0.1-pre.341 → 1.0.1-pre.345

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

@@ -112,10 +112,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 4354387,
+      "size": 4354490,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 4332439,
+        "javascript": 4332542,
         "share-init": 252,
         "runtime": 21444
       },
@@ -132,7 +132,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "70636bac7beb7ce2",
+      "hash": "7aee2e2d1996d07d",
       "childrenByOrder": {}
     },
     {
@@ -140,9 +140,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 917590,
+      "size": 917693,
       "sizes": {
-        "javascript": 917380,
+        "javascript": 917483,
         "consume-shared": 210
       },
       "names": [],
@@ -156,7 +156,7 @@
       "auxiliaryFiles": [
         "220.js.map"
       ],
-      "hash": "8f6b8a00aadb7471",
+      "hash": "3913a34587c13a55",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","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.341"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":"^1.2.0","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.345"}

package/package.json

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

package/src/core/components/table/table.scss

@@ -102,7 +102,7 @@
   margin: spacing.$spacing-03 0;
 }
 
-section {
+.section {
   margin: spacing.$spacing-03;
 }
 

package/src/root.component.tsx

@@ -1,10 +1,5 @@
 import React from "react";
 
-const swrConfiguration = {
-  // Maximum number of retries when the backend returns an error
-  errorRetryCount: 3,
-};
-
 const Root: React.FC = () => {
   return <></>;
 };

package/src/root.scss

@@ -1,9 +1,5 @@
 @use '@carbon/styles/scss/spacing';
 @use '@carbon/styles/scss/type';
-@import "~carbon-components/scss/globals/scss/vendor/@carbon/elements/scss/type/styles";
-@import "~carbon-components/src/globals/scss/vendor/@carbon/layout/scss/generated/spacing";
-@import "~carbon-components/src/globals/scss/vendor/@carbon/layout/scss/generated/layout";
-@import "carbon-components/scss/globals/scss/typography.scss";
 @import "~@openmrs/esm-styleguide/src/vars";
 
 $ui-01: #f4f4f4;
@@ -23,55 +19,51 @@ $brand-teal-01: #3197D9;
 $button-primary: #0078A6;
 
 .productiveHeading01 {
-  @include carbon--type-style("productive-heading-01");
+  @include type.type-style("heading-01");
 }
 
 .productiveHeading02 {
-  @include carbon--type-style("productive-heading-02");
+  @include type.type-style("heading-02");
 }
 
 .productiveHeading03 {
-  @include carbon--type-style("productive-heading-03");
+  @include type.type-style("productive-heading-03");
 }
 
 .productiveHeading04 {
-  @include carbon--type-style("productive-heading-04");
+  @include type.type-style("productive-heading-04");
 }
 
 .productiveHeading05 {
-  @include carbon--type-style("productive-heading-05");
+  @include type.type-style("productive-heading-05");
 }
 
 .productiveHeading06 {
-  @include carbon--type-style("productive-heading-06");
+  @include type.type-style("productive-heading-06");
 }
 
 .bodyShort01 {
-  @include carbon--type-style("body-short-01");
+  @include type.type-style("body-short-01");
 }
 
 .helperText01 {
-  @include carbon--type-style("helper-text-01");
+  @include type.type-style("helper-text-01");
 }
 
 .bodyShort02 {
-  @include carbon--type-style("body-short-02");
+  @include type.type-style("body-short-02");
 }
 
 .bodyLong01 {
-  @include carbon--type-style("body-long-01");
+  @include type.type-style("body-long-01");
 }
 
 .bodyLong02 {
-  @include carbon--type-style("body-long-02");
+  @include type.type-style("body-long-02");
 }
 
 .label01 {
-  @include carbon--type-style("label-01");
-}
-
-.text01 {
-  color: $text-01;
+  @include type.type-style("label-01");
 }
 
 .text02 {
@@ -82,78 +74,10 @@ aside {
   background-color: $ui-02 !important;
 }
 
-// Login Overrides
-
-div[class*='-esm-login__styles__center'] > img {
-  width: 140px; // design has 120px
-}
-
-:global(.tab-12rem) > button {
-  width: 12rem !important;
-}
-
-:global(.tab-14rem) > button {
-  width: 14rem !important;
-}
-
-:global(.tab-16rem) > button {
-  width: 16rem !important;
-}
-
-:global(.bx--overflow-menu) > div {
-  width: 15rem !important;
-}
-
-nav :global(.bx--accordion__title) {
-  color: #525252;
-  font-weight: 600 !important;
-}
-
-nav :global(.bx--accordion__content) {
-  padding-bottom: 0 !important;
-  padding-top: 0 !important;
-}
-
-nav :global(.bx--accordion__content) > a {
-  background-color: #cecece !important;
-  color: #161616 !important;
-  border-left-color: var(--brand-01) !important;
-}
-
 .container {
   padding: spacing.$spacing-07;
 }
 
-.welcome {
-  @include type.type-style('heading-04');
-  margin: spacing.$spacing-05 0;
-}
-
-.explainer {
-  margin-bottom: 2rem;
-}
-
-.noMargin {
-  margin: 0 !important;
-}
-
-.noPadding {
-  margin: 0 !important;
-}
-
-.noSpacing {
-  margin: 0 !important;
-  padding: 0 !important;
-}
-
-.section {
-  margin: spacing.$spacing-03;
-}
-
-:global(.cds--table-sort__description) {
-  display: none;
-}
-
 .formContainer {
   height: calc(100vh - 100px) !important;
   overflow: scroll;
@@ -170,5 +94,15 @@ nav :global(.bx--accordion__content) > a {
   :global(.cds--form-item) {
     flex: none !important;
   }
-}
 
+  :global(.cds--label) {
+    color: black;
+    display: inline-block;
+    font-size: var(--cds-label-01-font-size);
+    font-weight: bold;
+    letter-spacing: var(--cds-label-01-letter-spacing, .32px);
+    line-height: 1rem;
+    margin-bottom: 0.5rem;
+    vertical-align: baseline;
+  }
+}

package/src/stock-items/add-stock-item/stock-item-details/stock-item-details.scss

@@ -2,7 +2,7 @@
 @use '@carbon/styles/scss/type';
 @import '~@openmrs/esm-styleguide/src/vars';
 
-section {
+.section {
   margin: spacing.$spacing-03;
 }
 

package/src/stock-items/add-stock-item/stock-item-rules/add-stock-rules.scss

@@ -2,7 +2,7 @@
 @use '@carbon/styles/scss/type';
 @import '~@openmrs/esm-styleguide/src/vars';
 
-section {
+.section {
   margin: spacing.$spacing-03;
 }
 

package/src/stock-items/add-stock-item/stock-item-rules/stock-item-rules.scss

@@ -2,7 +2,7 @@
 @use '@carbon/styles/scss/type';
 @import '~@openmrs/esm-styleguide/src/vars';
 
-section {
+.section {
   margin: spacing.$spacing-03;
 }
 

package/src/stock-operations/add-stock-operation/add-stock-operation.scss

@@ -1,44 +1,41 @@
 @use '@carbon/styles/scss/spacing';
 @use '@carbon/styles/scss/type';
 @import '~@openmrs/esm-styleguide/src/vars';
-
 .sectionTitle {
-  @include type.type-style('heading-compact-02');
-  color: $text-02;
-  margin-bottom: spacing.$spacing-04;
+    @include type.type-style('heading-compact-02');
+    color: $text-02;
+    margin-bottom: spacing.$spacing-04;
 }
 
 .modalBody {
-  padding-bottom: spacing.$spacing-05;
+    padding-bottom: spacing.$spacing-05;
 }
 
 .actionsContainer {
-  display: "flex";
-  justify-content: space-between;
-  margin: "5px";
-}
-
-.statusDescriptions {
-  display: "flex";
-  flex-direction: "row";
+    display: flex;
+    justify-content: space-between;
+    margin: 5px;
 }
 
 .statusContainer {
-  display: "flex";
-  flex-direction: "row";
-  margin-top: "4px";
+    display: flex;
+    margin-top: 4px;
+    gap: 1rem;
 }
 
-.text {
-  font-size: "8px";
-}
 .textHeading {
-  font-size: "10px";
-  font-weight: bold;
+    font-weight: bold;
+}
+
+.statusDescriptions {
+    margin-top: 4px;
+    .text {
+        margin-right: 4px;
+    }
 }
 
 .actionButtons {
-  margin: "10px";
-  display: "flex";
-  flex-direction: "row";
+    margin: 10px;
+    display: flex;
+    flex-direction: row;
 }

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

@@ -182,7 +182,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             id="operationNoLbl"
             value={model?.operationNumber}
             readOnly={true}
-            labelText={"Operation Number:"}
+            labelText={"Operation Number"}
           />
         )}
 
@@ -193,8 +193,8 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             control={control}
             title={
               operation?.hasDestination
-                ? t("from:", "From:")
-                : t("location:", "Location:")
+                ? t("from", "From")
+                : t("location:", "Location")
             }
             placeholder={
               operation.hasDestination
@@ -212,7 +212,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             id="sourceUuidLbl"
             value={model?.sourceName ?? ""}
             readOnly={true}
-            labelText={operation?.hasDestination ? "From:" : "From:"}
+            labelText={operation?.hasDestination ? "From" : "From"}
           />
         )}
         {canEdit && !lockDestination && operation?.hasDestination && (
@@ -220,7 +220,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             controllerName="destinationUuid"
             name="destinationUuid"
             control={control}
-            title={operation?.hasSource ? "To:" : "Location:"}
+            title={operation?.hasSource ? "To" : "Location"}
             placeholder={
               operation?.hasSource
                 ? t("chooseADestination", "Choose a destination")
@@ -239,7 +239,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             id="destinationUuidLbl"
             value={model?.destinationName ?? ""}
             readOnly={true}
-            labelText={operation?.hasSource ? "To:" : "To:"}
+            labelText={operation?.hasSource ? "To" : "To"}
           />
         )}
 
@@ -248,7 +248,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             controllerName="responsiblePersonUuid"
             name="responsiblePersonUuid"
             control={control}
-            title={t("responsiblePerson:", "Responsible Person:")}
+            title={t("responsiblePerson:", "Responsible Person")}
             placeholder={t("filter", "Filter ...")}
             invalid={!!errors.responsiblePersonUuid}
             invalidText={
@@ -272,8 +272,8 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             maxLength={255}
             size={"md"}
             value={`${model?.responsiblePersonOther ?? ""}`}
-            labelText={t("responsiblePerson", "Responsible Person:")}
-            placeholder={t("pleaseSpecify", "Please Specify:")}
+            labelText={t("responsiblePerson", "Responsible Person")}
+            placeholder={t("pleaseSpecify", "Please Specify")}
             invalid={!!errors.responsiblePersonOther}
             invalidText={
               errors.responsiblePersonOther &&
@@ -302,7 +302,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
             name="reasonUuid"
             control={control}
             placeholder={t("chooseAReason", "Choose a reason")}
-            title={t("reason", "Reason:")}
+            title={t("reason", "Reason")}
             invalid={!!errors.reasonUuid}
             invalidText={errors.reasonUuid && errors?.reasonUuid?.message}
             onReasonChange={(reason) => {
@@ -327,7 +327,7 @@ const BaseOperationDetails: React.FC<BaseOperationDetailsProps> = ({
           controllerName="remarks"
           maxLength={255}
           value={`${model?.remarks ?? ""}`}
-          labelText={t("remarks:", "Remarks:")}
+          labelText={t("remarks:", "Remarks")}
           invalid={!!errors.remarks}
           invalidText={errors.remarks && errors?.remarks?.message}
         />

package/src/stock-operations/stock-operations-dialog/stock-operations-dialog.scss

@@ -1,7 +1,7 @@
 @use '@carbon/styles/scss/spacing';
 @use '@carbon/styles/scss/type';
 
-section {
+.section {
   margin: spacing.$spacing-03;
 }
 

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

@@ -2,7 +2,7 @@
 @use '@carbon/styles/scss/type';
 @import '~@openmrs/esm-styleguide/src/vars';
 
-section {
+.section {
   margin: spacing.$spacing-03;
 }
 

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

@@ -2,7 +2,7 @@
 @use '@carbon/styles/scss/type';
 @import '~@openmrs/esm-styleguide/src/vars';
 
-section {
+.section {
   margin: spacing.$spacing-03;
 }
 
@@ -26,12 +26,15 @@ section {
   grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); /* Adjust the values as needed */
   gap: 16px; /* Adjust the gap between checkboxes */
 }
+
 .hr {
   border: 1px solid #000;
 }
+
 .toggle {
   margin: 5px;
 }
+
 .checkbox{
   width: 100%;
 }