@openmrs/esm-stock-management-app 3.0.1-pre.875 → 3.0.1-pre.879

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

@@ -30,9 +30,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1236267,
+      "size": 1234729,
       "sizes": {
-        "javascript": 1236099,
+        "javascript": 1234561,
         "consume-shared": 168
       },
       "names": [],
@@ -46,7 +46,7 @@
       "auxiliaryFiles": [
         "14.js.map"
       ],
-      "hash": "0defcf614903a598",
+      "hash": "bf089be412e1dc95",
       "childrenByOrder": {}
     },
     {
@@ -100,6 +100,30 @@
       "hash": "bf5e0110b574d273",
       "childrenByOrder": {}
     },
+    {
+      "rendered": true,
+      "initial": false,
+      "entry": false,
+      "recorded": false,
+      "size": 334333,
+      "sizes": {
+        "javascript": 334333
+      },
+      "names": [],
+      "idHints": [],
+      "runtime": [
+        "@openmrs/esm-stock-management-app",
+        "main"
+      ],
+      "files": [
+        "27.js"
+      ],
+      "auxiliaryFiles": [
+        "27.js.map"
+      ],
+      "hash": "f8ed0024b027ba7c",
+      "childrenByOrder": {}
+    },
     {
       "rendered": true,
       "initial": false,
@@ -252,10 +276,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5612812,
+      "size": 5611274,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5591282,
+        "javascript": 5589744,
         "share-init": 210,
         "runtime": 21110
       },
@@ -272,7 +296,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "8e80d9984d810553",
+      "hash": "1c0d001b4b8059ee",
       "childrenByOrder": {}
     },
     {
@@ -466,9 +490,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 13638,
+      "size": 13645,
       "sizes": {
-        "javascript": 13638
+        "javascript": 13645
       },
       "names": [],
       "idHints": [],
@@ -480,7 +504,7 @@
         "574.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "aa047aacef29f988",
+      "hash": "7ac8d070b32e8d7e",
       "childrenByOrder": {}
     },
     {
@@ -815,30 +839,6 @@
       ],
       "hash": "0b62e4cea3cb991b",
       "childrenByOrder": {}
-    },
-    {
-      "rendered": true,
-      "initial": false,
-      "entry": false,
-      "recorded": false,
-      "size": 338735,
-      "sizes": {
-        "javascript": 338735
-      },
-      "names": [],
-      "idHints": [],
-      "runtime": [
-        "@openmrs/esm-stock-management-app",
-        "main"
-      ],
-      "files": [
-        "987.js"
-      ],
-      "auxiliaryFiles": [
-        "987.js.map"
-      ],
-      "hash": "72ba819e6017e783",
-      "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":"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-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"modals":[{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"expired-stock-modal","component":"expiredStockModal"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"receiving-stock-modal","component":"receivingStockModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"workspaces":[{"name":"stock-operation-form-workspace","component":"stockOperationFormWorkspace","title":"Stock Operation","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-item-rules-form-workspace","component":"stockItemRulesFormWorkspace","title":"Stock Item Rules","type":"form"},{"name":"stock-item-form-workspace","component":"stockItemFormWorkspace","title":"Stock Items","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-sources-form-workspace","component":"stockSourcesFormWorkspace","title":"Stock Sources","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-location-form-workspace","component":"stockLocationsFormWorkspace","title":"Stock Locations","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-user-role-scopes-form-workspace","component":"stockUserScopesFormWorkspace","title":"User Role Scopes","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-reports-form-workspace","component":"stockReportsFormWorkspace","title":"Reports","type":"form","canMaximize":true,"width":"extra-wide"}],"pages":[{"component":"root","route":"stock-management"}],"version":"3.0.1-pre.875"}
+{"$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":"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-management-app-menu-item","component":"stockManagementAppMenuItem","slot":"app-menu-item-slot","meta":{"name":" Stock Management"}},{"name":"delete-packaging-unit-button","component":"deletePackagingUnitButton"}],"modals":[{"name":"delete-stock-modal","component":"deleteStockModal"},{"name":"delete-stock-user-scope-modal","component":"deleteUserScopeModal"},{"name":"delete-stock-rule-modal","component":"deleteStockRuleModal"},{"name":"delete-packaging-unit-modal","component":"deletePackagingUnitModal"},{"name":"expired-stock-modal","component":"expiredStockModal"},{"name":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"receiving-stock-modal","component":"receivingStockModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"},{"name":"transactions-print-bincard-preview-modal","component":"transactionBincardPrintPreviewModal"},{"name":"transactions-print-stockcard-preview-modal","component":"transactionStockcardPrintPreviewModal"}],"workspaces":[{"name":"stock-operation-form-workspace","component":"stockOperationFormWorkspace","title":"Stock Operation","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-item-rules-form-workspace","component":"stockItemRulesFormWorkspace","title":"Stock Item Rules","type":"form"},{"name":"stock-item-form-workspace","component":"stockItemFormWorkspace","title":"Stock Items","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-sources-form-workspace","component":"stockSourcesFormWorkspace","title":"Stock Sources","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-location-form-workspace","component":"stockLocationsFormWorkspace","title":"Stock Locations","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-user-role-scopes-form-workspace","component":"stockUserScopesFormWorkspace","title":"User Role Scopes","type":"form","canMaximize":true,"width":"extra-wide"},{"name":"stock-reports-form-workspace","component":"stockReportsFormWorkspace","title":"Reports","type":"form","canMaximize":true,"width":"extra-wide"}],"pages":[{"component":"root","route":"stock-management"}],"version":"3.0.1-pre.879"}

package/package.json

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

package/src/stock-operations/stock-operations-forms/stock-item-form/stock-item-form.workspace.tsx

@@ -1,5 +1,3 @@
-import React, { useMemo } from 'react';
-import classNames from 'classnames';
 import {
   Button,
   ButtonSet,
@@ -13,21 +11,22 @@ import {
 } from '@carbon/react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useConfig, useLayoutType } from '@openmrs/esm-framework';
+import classNames from 'classnames';
+import React, { useMemo } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { type z } from 'zod';
+import { type ConfigObject } from '../../../config-schema';
 import { DATE_PICKER_CONTROL_FORMAT, DATE_PICKER_FORMAT, formatForDatePicker, today } from '../../../constants';
 import {
   operationFromString,
   type StockOperationType,
 } from '../../../core/api/types/stockOperation/StockOperationType';
-import { type BaseStockOperationItemFormData, getStockOperationItemFormSchema } from '../../validation-schema';
-import { type ConfigObject } from '../../../config-schema';
 import { useStockItem } from '../../../stock-items/stock-items.resource';
+import { type BaseStockOperationItemFormData, getStockOperationItemFormSchema } from '../../validation-schema';
+import useOperationTypePermisions from '../hooks/useOperationTypePermisions';
 import BatchNoSelector from '../input-components/batch-no-selector.component';
 import QtyUomSelector from '../input-components/quantity-uom-selector.component';
-import UniqueBatchNoEntryInput from '../input-components/unique-batch-no-entry-input.component';
-import useOperationTypePermisions from '../hooks/useOperationTypePermisions';
 import styles from './stock-item-form.scss';
 
 export interface StockItemFormProps {
@@ -85,12 +84,15 @@ const StockItemForm: React.FC<StockItemFormProps> = ({ stockOperationType, stock
                 defaultValue={stockOperationItem?.batchNo}
                 name={'batchNo' as any}
                 render={({ field, fieldState: { error } }) => (
-                  <UniqueBatchNoEntryInput
-                    defaultValue={field.value}
-                    onValueChange={field.onChange}
-                    stockItemUuid={stockOperationItem.stockItemUuid}
-                    error={error?.message}
-                    stockOperationItemUuid={stockOperationItem.uuid}
+                  <TextInput
+                    label={t('qty', 'Qty')}
+                    maxLength={50}
+                    {...field}
+                    invalidText={error?.message}
+                    invalid={error?.message}
+                    placeholder={t('batchNumber', 'Batch Number')}
+                    labelText={t('batchNumber', 'Batch Number')}
+                    id="batchNumber"
                   />
                 )}
               />

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

@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
-import { Button, InlineLoading } from '@carbon/react';
+import { IconButton, InlineLoading } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { TrashCan } from '@carbon/react/icons';
-import { deleteUserRoleScopes } from '../stock-user-role-scopes.resource';
 import { restBaseUrl, showModal, showSnackbar } from '@openmrs/esm-framework';
+import { deleteUserRoleScopes } from '../stock-user-role-scopes.resource';
 import { handleMutate } from '../../utils';
 
 interface StockUserScopDeleteActionMenuProps {
@@ -51,13 +51,14 @@ const StockUserScopeDeleteActionMenu: React.FC<StockUserScopDeleteActionMenuProp
   }, [t, uuid]);
 
   const deleteButton = (
-    <Button
+    <IconButton
+      autoAlign
       kind="ghost"
-      size="md"
+      label={t('deleteUserRoleScope', 'Delete user role scope')}
       onClick={handleDeleteStockUserScope}
-      iconDescription={t('deleteUserScope', 'Delete Stock User Scope')}
-      renderIcon={(props) => <TrashCan size={16} {...props} />}
-    />
+    >
+      <TrashCan size={16} />
+    </IconButton>
   );
 
   return deletingUserScope ? <InlineLoading /> : deleteButton;

package/src/stock-user-role-scopes/edit-stock-user-scope/edit-stock-user-scope-action-menu.component.tsx

@@ -1,10 +1,9 @@
-import { Button } from '@carbon/react';
-import { Edit } from '@carbon/react/icons';
-
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { type UserRoleScope } from '../../core/api/types/identity/UserRoleScope';
+import { IconButton } from '@carbon/react';
+import { Edit } from '@carbon/react/icons';
 import { launchWorkspace } from '@openmrs/esm-framework';
+import { type UserRoleScope } from '../../core/api/types/identity/UserRoleScope';
 
 interface EditStockUserRoleActionsMenuProps {
   data: UserRoleScope;
@@ -13,20 +12,22 @@ interface EditStockUserRoleActionsMenuProps {
 const EditStockUserRoleActionsMenu: React.FC<EditStockUserRoleActionsMenuProps> = ({ data }) => {
   const { t } = useTranslation();
 
-  const handleClick = useCallback(() => {
+  const handleLaunchWorkspace = useCallback(() => {
     launchWorkspace('stock-user-role-scopes-form-workspace', {
-      workspaceTitle: t('editUserScope', 'Edit user scope role'),
+      workspaceTitle: t('editUserRoleScope', 'Edit user role scope'),
       model: data,
     });
   }, [data, t]);
 
   return (
-    <Button
+    <IconButton
+      autoAlign
       kind="ghost"
-      onClick={handleClick}
-      iconDescription={t('editUserScope', 'Edit user scope role')}
-      renderIcon={(props) => <Edit size={16} {...props} />}
-    />
+      label={t('editUserRoleScope', 'Edit user role scope')}
+      onClick={handleLaunchWorkspace}
+    >
+      <Edit size={16} />
+    </IconButton>
   );
 };
 export default EditStockUserRoleActionsMenu;

package/src/stock-user-role-scopes/stock-user-role-scopes-items-table.component.tsx

@@ -123,10 +123,10 @@ function StockUserRoleScopesItems() {
             <span key={key}>
               {location?.locationName}
               {location?.enableDescendants ? (
-                <ArrowDownLeft key={`${key}-${index}-0`} />
+                <ArrowDownLeft className={styles.arrowIcon} key={`${key}-${index}-0`} size={12} />
               ) : (
-                <ArrowLeft key={`${key}-${index}-1`} />
-              )}{' '}
+                <ArrowLeft className={styles.arrowIcon} key={`${key}-${index}-1`} size={12} />
+              )}
             </span>
           );
         }),

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

@@ -64,3 +64,7 @@
 .toolbarAction {
   max-width: none;
 }
+
+.arrowIcon {
+  margin: 0 layout.$spacing-02;
+}

package/translations/en.json

@@ -76,7 +76,7 @@
   "deleteStockItemReferenceTitle": "Error Deleting a stockitem reference",
   "deleteStockRule": "Delete Stock Rule",
   "deleteStockUserScope": "Delete Stock User Scope",
-  "deleteUserScope": "Delete Stock User Scope",
+  "deleteUserRoleScope": "Delete user role scope",
   "deletingRule": "Delete Rule",
   "deletingSource": "Delete Source",
   "deletingstockUserScope": "Delete Stock User Scope",
@@ -98,7 +98,7 @@
   "editStockOperation": "Edit stock operation",
   "editStockRule": "Edit Stock Rule",
   "editStockSource": "Edit stock source",
-  "editUserScope": "Edit user scope role",
+  "editUserRoleScope": "Edit user role scope",
   "enabled": "Enabled",
   "endDate": "End Date",
   "ended": "Ended",