@openmrs/esm-stock-management-app 3.1.1-pre.1179 → 3.1.1-pre.1184

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

@@ -5,9 +5,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 42799,
+      "size": 42809,
       "sizes": {
-        "javascript": 42799
+        "javascript": 42809
       },
       "names": [],
       "idHints": [],
@@ -21,7 +21,7 @@
       "auxiliaryFiles": [
         "130.js.map"
       ],
-      "hash": "5bc126556c6cb026",
+      "hash": "88b0342d767f0c0e",
       "childrenByOrder": {}
     },
     {
@@ -374,7 +374,7 @@
       "auxiliaryFiles": [
         "2177.js.map"
       ],
-      "hash": "82c42d0f22583234",
+      "hash": "70d6b1d33b4f5ee1",
       "childrenByOrder": {}
     },
     {
@@ -474,7 +474,7 @@
       "auxiliaryFiles": [
         "3041.js.map"
       ],
-      "hash": "99a668b8f93226e7",
+      "hash": "8e692939d24b9f16",
       "childrenByOrder": {}
     },
     {
@@ -531,9 +531,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 66396,
+      "size": 66568,
       "sizes": {
-        "javascript": 66396
+        "javascript": 66568
       },
       "names": [],
       "idHints": [],
@@ -547,7 +547,7 @@
       "auxiliaryFiles": [
         "3220.js.map"
       ],
-      "hash": "7f8f6a8f6b0ae827",
+      "hash": "078e3899db93dd94",
       "childrenByOrder": {}
     },
     {
@@ -685,7 +685,7 @@
       "auxiliaryFiles": [
         "4225.js.map"
       ],
-      "hash": "28271064fdca2fe1",
+      "hash": "22024486d6f4131e",
       "childrenByOrder": {}
     },
     {
@@ -693,9 +693,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 13631,
+      "size": 15090,
       "sizes": {
-        "javascript": 13631
+        "javascript": 15090
       },
       "names": [],
       "idHints": [],
@@ -707,7 +707,7 @@
         "4300.js"
       ],
       "auxiliaryFiles": [],
-      "hash": "c52dc4ccb1cba2d6",
+      "hash": "53933917309d6844",
       "childrenByOrder": {}
     },
     {
@@ -805,9 +805,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 61696,
+      "size": 61607,
       "sizes": {
-        "javascript": 61696
+        "javascript": 61607
       },
       "names": [],
       "idHints": [],
@@ -821,7 +821,7 @@
       "auxiliaryFiles": [
         "4732.js.map"
       ],
-      "hash": "35f64fc891eb04c5",
+      "hash": "78b177c7c59cbf52",
       "childrenByOrder": {}
     },
     {
@@ -875,9 +875,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1193875,
+      "size": 1193676,
       "sizes": {
-        "javascript": 1193875
+        "javascript": 1193676
       },
       "names": [],
       "idHints": [],
@@ -890,7 +890,7 @@
       "auxiliaryFiles": [
         "5125.js.map"
       ],
-      "hash": "d416abac70d118c4",
+      "hash": "2ae37ae70d9623ef",
       "childrenByOrder": {}
     },
     {
@@ -942,9 +942,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 336072,
+      "size": 336194,
       "sizes": {
-        "javascript": 336072
+        "javascript": 336194
       },
       "names": [],
       "idHints": [],
@@ -958,7 +958,7 @@
       "auxiliaryFiles": [
         "5333.js.map"
       ],
-      "hash": "f1430c31f3b3bf56",
+      "hash": "6ec66111f95a2dc1",
       "childrenByOrder": {}
     },
     {
@@ -1006,7 +1006,7 @@
       "auxiliaryFiles": [
         "5422.js.map"
       ],
-      "hash": "3c636702fe4c7fcb",
+      "hash": "deb66a7ae0395cd6",
       "childrenByOrder": {}
     },
     {
@@ -1036,9 +1036,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 16265,
+      "size": 16330,
       "sizes": {
-        "javascript": 16265
+        "javascript": 16330
       },
       "names": [],
       "idHints": [],
@@ -1052,7 +1052,7 @@
       "auxiliaryFiles": [
         "5609.js.map"
       ],
-      "hash": "498c711c4d0ff106",
+      "hash": "0a139227de0e49d2",
       "childrenByOrder": {}
     },
     {
@@ -1125,9 +1125,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 15324,
+      "size": 15317,
       "sizes": {
-        "javascript": 15324
+        "javascript": 15317
       },
       "names": [],
       "idHints": [],
@@ -1141,7 +1141,7 @@
       "auxiliaryFiles": [
         "6184.js.map"
       ],
-      "hash": "178d0d2d5a5bb6b7",
+      "hash": "25d40dc968c8bec9",
       "childrenByOrder": {}
     },
     {
@@ -1260,7 +1260,7 @@
       "auxiliaryFiles": [
         "6606.js.map"
       ],
-      "hash": "00c58885bc4b42a1",
+      "hash": "0acb966245874bd1",
       "childrenByOrder": {}
     },
     {
@@ -1290,9 +1290,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 27612,
+      "size": 27973,
       "sizes": {
-        "javascript": 27612
+        "javascript": 27973
       },
       "names": [],
       "idHints": [],
@@ -1306,7 +1306,7 @@
       "auxiliaryFiles": [
         "6757.js.map"
       ],
-      "hash": "4b2ab09462947725",
+      "hash": "970f85564f5d7088",
       "childrenByOrder": {}
     },
     {
@@ -1451,9 +1451,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 31469,
+      "size": 31474,
       "sizes": {
-        "javascript": 31469
+        "javascript": 31474
       },
       "names": [],
       "idHints": [],
@@ -1467,7 +1467,7 @@
       "auxiliaryFiles": [
         "8161.js.map"
       ],
-      "hash": "2f4a25523e0da8c8",
+      "hash": "ca06d2393681e437",
       "childrenByOrder": {}
     },
     {
@@ -1563,10 +1563,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5478052,
+      "size": 5477853,
       "sizes": {
         "consume-shared": 210,
-        "javascript": 5455820,
+        "javascript": 5455621,
         "share-init": 336,
         "runtime": 21686
       },
@@ -1583,7 +1583,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "eb199dd94a12ae7c",
+      "hash": "a285452b3aa34fe5",
       "childrenByOrder": {}
     },
     {
@@ -1591,9 +1591,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 216707,
+      "size": 217209,
       "sizes": {
-        "javascript": 216707
+        "javascript": 217209
       },
       "names": [],
       "idHints": [],
@@ -1607,7 +1607,7 @@
       "auxiliaryFiles": [
         "9186.js.map"
       ],
-      "hash": "5f82966e2167fb1a",
+      "hash": "853f8452e93562fd",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.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-operations-modal","component":"stockOperationsModal"},{"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.1.1-pre.1179"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.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-operations-modal","component":"stockOperationsModal"},{"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.1.1-pre.1184"}

package/package.json

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

package/src/constants.ts

@@ -8,7 +8,6 @@ export const startOfDay = dayjs(new Date().setUTCHours(0, 0, 0, 0)).format(omrsD
 export const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
 export const DATE_PICKER_FORMAT = 'DD/MM/YYYY';
-
 export const DATE_PICKER_CONTROL_FORMAT = 'd/m/Y';
 
 export const formatForDatePicker = (date: Date | null | undefined) => {
@@ -54,7 +53,7 @@ export const APP_STOCKMANAGEMENT_STOCKOPERATIONS = 'App: stockmanagement.stockop
 /** @type {string}: Task: stockmanagement.stockoperations.mutate, Able to create and update stock operations*/
 export const TASK_STOCKMANAGEMENT_STOCKOPERATIONS_MUTATE = 'Task: stockmanagement.stockoperations.mutate';
 
-/** @type {string}: Task: stockmanagement.stockoperations.approve, Able to aprove stock operations*/
+/** @type {string}: Task: stockmanagement.stockoperations.approve, Able to approve stock operations*/
 export const TASK_STOCKMANAGEMENT_STOCKOPERATIONS_APPROVE = 'Task: stockmanagement.stockoperations.approve';
 
 /** @type {string}: Task: stockmanagement.stockoperations.receiveitems, Able to receive dispatched stock items*/
@@ -84,7 +83,7 @@ export const INVENTORY_CLERK_ROLE_UUID = 'd210eb66-2188-11ed-9dff-507b9dea1806';
 export const INVENTORY_MANAGER_ROLE_UUID = 'cca4be4b-2188-11ed-9dff-507b9dea1806';
 export const INVENTORY_DISPENSING_ROLE_UUID = '84bdd876-4694-11ed-8109-00155dcc3fc0';
 export const INVENTORY_REPORTING_ROLE_UUID = 'a49be648-6b0a-11ed-93a2-806d973f13a9';
-export const INVENTORY_ADMNISTRATOR_ROLE_UUID = '2083fd40-3391-11ed-a667-507b9dea1806';
+export const INVENTORY_ADMINISTRATOR_ROLE_UUID = '2083fd40-3391-11ed-a667-507b9dea1806';
 
 export const STOCK_OPERATION_PRINT_DISABLE_BALANCE_ON_HAND = true;
 export const STOCK_OPERATION_PRINT_DISABLE_COSTS = true;

package/src/core/components/carbon/controlled-combo-box.component.tsx

@@ -1,31 +1,34 @@
 import React from 'react';
 import { type Control, Controller, type FieldValues } from 'react-hook-form';
-import { ComboBox } from '@carbon/react';
+import { ComboBox, type ComboBoxProps } from '@carbon/react';
 
-interface ControlledComboBoxProps<T> {
+interface ControlledComboBoxProps<T, ItemType>
+  extends Omit<ComboBoxProps<ItemType>, 'onChange' | 'id' | 'ref' | 'value'> {
   controllerName: string;
   name: string;
   control: Control<FieldValues, T>;
   onChange?: (e: { selectedItem: never }) => void;
 }
 
-const ControlledComboBox = <T,>(props: ControlledComboBoxProps<T>) => {
+const ControlledComboBox = <T, ItemType = unknown>(props: ControlledComboBoxProps<T, ItemType>) => {
+  const { controllerName, name, control, onChange: onChangeProp, ...comboBoxProps } = props;
+
   return (
     <Controller
-      name={props.controllerName}
-      control={props.control}
+      name={controllerName}
+      control={control}
       render={({ field: { onChange, value, ref } }) => (
         <ComboBox
-          {...props}
+          {...comboBoxProps}
           onChange={(e: { selectedItem: never }) => {
             onChange(e);
 
             // Fire prop change
-            if (props.onChange) {
-              props.onChange(e);
+            if (onChangeProp) {
+              onChangeProp(e);
             }
           }}
-          id={props.name}
+          id={name}
           ref={ref}
           value={value}
         />

package/src/core/components/carbon/controlled-radio-button-group.component.tsx

@@ -4,43 +4,48 @@ import { type Control, Controller, type FieldValues } from 'react-hook-form';
 import { RadioButtonGroup, RadioButton } from '@carbon/react';
 import { type RadioOption } from '../../../stock-items/add-stock-item/stock-item-details/stock-item-details.resource';
 
-interface ControlledRadioButtonGroupProps<T> extends RadioButtonGroupProps {
+interface ControlledRadioButtonGroupProps<T>
+  extends Omit<RadioButtonGroupProps, 'onChange' | 'id' | 'ref' | 'value' | 'defaultSelected'> {
   controllerName: string;
   name: string;
   control: Control<FieldValues, T>;
-  options: RadioOption[]; // Change the type to RadioOption[]
+  options: RadioOption[];
+  id?: string;
+  onChange?: (selectedValue: string, name: string, event: React.ChangeEvent<HTMLInputElement>) => void;
 }
 
 const ControlledRadioButtonGroup = <T,>(props: ControlledRadioButtonGroupProps<T>) => {
+  const { controllerName, name, control, options, onChange: onChangeProp, id: propsId, ...radioGroupProps } = props;
+
   return (
     <Controller
-      name={props.controllerName}
-      control={props.control}
+      name={controllerName}
+      control={control}
       render={({ field: { onChange, value, ref } }) => (
         <RadioButtonGroup
-          {...props}
+          {...radioGroupProps}
+          name={name}
           onChange={(selectedValue: string, name: string, event: React.ChangeEvent<HTMLInputElement>) => {
-            onChange(selectedValue, name, event);
+            onChange(selectedValue);
 
             // Fire prop change
-            if (props.onChange) {
-              props.onChange(selectedValue, name, event);
+            if (onChangeProp) {
+              onChangeProp(selectedValue, name, event);
             }
           }}
-          id={props.name}
+          id={name}
           ref={ref}
-          defaultSelected={props.id}
-          value={value}
+          defaultSelected={propsId}
+          valueSelected={value}
         >
-          {props.options.map((option, index) => (
+          {options.map((option, index) => (
             <RadioButton
-              key={`${index}-${props.name}-${option.value}`}
-              id={`${props.name}-${option.value}`}
+              key={`${index}-${name}-${option.value}`}
+              id={`${name}-${option.value}`}
               labelText={option.label}
-              value={option.value}
+              value={String(option.value)}
               checked={value === option.value}
               onChange={() => onChange(option.value)}
-              ref={ref}
             />
           ))}
         </RadioButtonGroup>

package/src/core/components/table/table.component.tsx

@@ -74,21 +74,24 @@ const DataList: React.FC<ListProps> = ({ columns, data, children, totalItems, go
       }),
     );
   };
-  const handleExport = (object) => {
+  const handleExportCSV = () => {
     const csvString = convertToCSV(list, columns);
-    if (object.currentTarget.innerText === 'Download As CSV') {
-      const blob = new Blob([csvString], { type: 'text/csv;charset=utf-8' });
-      saveAs(blob, 'data.csv');
-    } else if (object.currentTarget.innerText === 'Download As Json') {
-      const jsonBlob = new Blob([csvString], { type: 'application/json' });
-      saveAs(jsonBlob, 'data.json');
-    }
+    const blob = new Blob([csvString], { type: 'text/csv;charset=utf-8' });
+    saveAs(blob, 'data.csv');
   };
+
+  const handleExportJSON = () => {
+    const jsonString = JSON.stringify(list, null, 2);
+    const jsonBlob = new Blob([jsonString], { type: 'application/json' });
+    saveAs(jsonBlob, 'data.json');
+  };
+
   const convertToCSV = (data, columns) => {
     const header = columns.map((col) => col.header).join(',');
     const rows = data.map((row) => columns.map((col) => JSON.stringify(row[col.key])).join(','));
     return [header, ...rows].join('\n');
   };
+
   return (
     <>
       <DataTable
@@ -119,15 +122,21 @@ const DataList: React.FC<ListProps> = ({ columns, data, children, totalItems, go
                     ) : (
                       <>
                         <OverflowMenu
-                          size="sm"
-                          kind="tertiary"
-                          renderIcon={DocumentDownload}
-                          iconDescription="Download As"
                           focusTrap={false}
+                          iconDescription={t('downloadOptions', 'Download options')}
+                          renderIcon={DocumentDownload}
+                          size="sm"
                         >
-                          <OverflowMenuItem itemText="Download As CSV" onClick={handleExport} />
-                          <OverflowMenuItem itemText="Download As PDF" onClick={handleExport} />
-                          <OverflowMenuItem itemText="Download As Json" onClick={handleExport} />
+                          <OverflowMenuItem
+                            className={styles.menuItem}
+                            itemText={t('downloadAsCSV', 'Download As CSV')}
+                            onClick={handleExportCSV}
+                          />
+                          <OverflowMenuItem
+                            className={styles.menuItem}
+                            itemText={t('downloadAsJson', 'Download As JSON')}
+                            onClick={handleExportJSON}
+                          />
                         </OverflowMenu>
                         <TableToolbarSearch
                           className={styles.itemListSearch}
@@ -172,8 +181,8 @@ const DataList: React.FC<ListProps> = ({ columns, data, children, totalItems, go
                 </div>
               ) : null}
               <Pagination
-                forwardText="Next page"
-                backwardText="Previous page"
+                forwardText={t('nextPage', 'Next page')}
+                backwardText={t('previousPage', 'Previous page')}
                 page={currentPage}
                 pageSize={currentPageSize}
                 pageSizes={pageSizes}

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

@@ -171,3 +171,7 @@
   @include type.type-style('body-compact-01');
   color: $text-02;
 }
+
+.menuItem {
+  max-width: none;
+}

package/src/core/components/table/types.ts

@@ -3,3 +3,15 @@ import type React from 'react';
 export interface DataTableRenderProps {
   onInputChange: (e: React.ChangeEvent<HTMLInputElement>, defaultValue?: string) => void;
 }
+
+export interface CustomTableHeader {
+  key: string;
+  header: string | { content: React.ReactNode };
+  styles?: React.CSSProperties;
+  isSortable?: boolean;
+}
+
+export interface CustomTableRow {
+  id: string;
+  [key: string]: unknown;
+}

package/src/core/components/tabs/vertical-tabs.component.tsx

@@ -20,12 +20,8 @@ const VerticalTabs: React.FC<VerticalTabsProps> = ({ tabs, title, hasContainer,
       `}
     >
       {title && <p className={styles.heading}>{title}</p>}
-      <div className={styles.tab}>
-        <Tabs
-          className={`${styles.verticalTabs}`}
-          selectedIndex={selectedIndex}
-          onChange={({ selectedIndex }) => onChange?.(selectedIndex)}
-        >
+      <div className={`${styles.tab} ${styles.verticalTabs}`}>
+        <Tabs selectedIndex={selectedIndex} onChange={({ selectedIndex }) => onChange?.(selectedIndex)}>
           <TabList aria-label="navigation">
             {tabs.map((tab: TabItem, index: number) => (
               <Tab key={index} disabled={tab.disabled}>

package/src/declarations.d.ts

@@ -1,6 +1,3 @@
-declare module '@carbon/react';
 declare module '*.css';
 declare module '*.scss';
 declare module '*.png';
-
-declare type SideNavProps = object;

package/src/stock-home/stock-home-inventory-card.component.tsx

@@ -55,8 +55,8 @@ const StockHomeInventoryCard = () => {
           <div className={styles.cardText}>
             <p>{t('expiringStock', 'Expiring stock')}</p>
             <p>
-              <strong>{item?.drugName}</strong> {t('batchNo', 'Batch No:')} {item?.batchNo} {t('quantity', 'Quantity:')}{' '}
-              {item?.quantity} {item?.dispensingUnitName}
+              <strong>{item?.drugName}</strong> {t('batchNumberLabel', 'Batch number:')} {item?.batchNo}{' '}
+              {t('quantityLabel', 'Quantity:')} {item?.quantity} {item?.dispensingUnitName}
             </p>
           </div>
         </div>

package/src/stock-items/add-stock-item/add-stock-item.component.tsx

@@ -53,7 +53,7 @@ const AddEditStockItem: React.FC<AddStockItemProps> = ({ stockItem, closeWorkspa
       disabled: !isEditing,
     },
     {
-      name: t('stockRules', 'Rules'),
+      name: t('rules', 'Rules'),
       component: <StockItemRules stockItemUuid={stockItem?.uuid} />,
       disabled: !isEditing,
     },

package/src/stock-items/add-stock-item/batch-information/batch-information-locations/batch-information-locations-filter.component.tsx

@@ -29,9 +29,6 @@ const BatchInformationLocationsFilter = <T,>(props: BatchInformationLocationsFil
       render={({ field: { onChange, value, ref } }) => (
         <ComboBox
           titleText={props.title}
-          name={props.name}
-          control={props.control}
-          controllerName={props.controllerName}
           id={props.name}
           size={'md'}
           items={stockLocations ?? []}

package/src/stock-items/add-stock-item/batch-information/batch-information.component.tsx

@@ -1,12 +1,12 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useForm } from 'react-hook-form';
 import { formatDisplayDate } from '../../../core/utils/datetimeUtils';
 import { DataTableSkeleton } from '@carbon/react';
-import DataList from '../../../core/components/table/table.component';
+import { type StockItemInventoryFilter } from '../../stock-items.resource';
 import { useStockItemBatchInformationHook } from './batch-information.resource';
 import BatchInformationLocationsFilter from './batch-information-locations/batch-information-locations-filter.component';
-import { useForm } from 'react-hook-form';
-import { type StockItemInventoryFilter } from '../../stock-items.resource';
+import DataList from '../../../core/components/table/table.component';
 
 interface BatchInformationProps {
   onSubmit?: () => void;
@@ -32,7 +32,7 @@ const BatchInformation: React.FC<BatchInformationProps> = ({ stockItemUuid }) =>
       },
       {
         key: 'batch',
-        header: t('batchNumber', 'Batch Number'),
+        header: t('batchNumber', 'Batch number'),
       },
       {
         key: 'quantity',