@openmrs/esm-stock-management-app 3.0.1-pre.805 → 3.0.1-pre.826

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import AddEditStockItem from './add-stock-item.component';
-import { StockItemDTO } from '../../core/api/types/stockItem/StockItem';
+import { type StockItemDTO } from '../../core/api/types/stockItem/StockItem';
 
 // Mock components
 jest.mock('react-i18next', () => ({
@@ -22,8 +22,8 @@ jest.mock('@carbon/react/icons', () => ({
   Save: () => <div>Save Icon</div>,
 }));
 
-jest.mock('./stock-item-details/stock-item-details.component', () => ({ model }) => (
-  <div data-testid="stock-item-details">Stock Item Details: {model.uuid}</div>
+jest.mock('./stock-item-details/stock-item-details.component', () => ({ stockItem }) => (
+  <div data-testid="stock-item-details">Stock Item Details: {stockItem?.uuid}</div>
 ));
 
 jest.mock('./packaging-units/packaging-units.component', () => ({ stockItemUuid }) => (
@@ -120,14 +120,14 @@ describe('AddEditStockItem', () => {
   };
 
   it('renders correctly with initial state and default selected tab', () => {
-    render(<AddEditStockItem model={mockModel} />);
+    render(<AddEditStockItem stockItem={mockModel} />);
     expect(screen.getByTestId('stock-item-details')).toBeInTheDocument();
     expect(screen.getByText('Stock Item Details: test-uuid-123')).toBeInTheDocument();
   });
 
   it('changes selected tab when clicking on different tabs', async () => {
     const user = userEvent.setup();
-    render(<AddEditStockItem model={mockModel} isEditing={true} />);
+    render(<AddEditStockItem stockItem={mockModel} />);
 
     await user.click(screen.getByText('packagingUnits'));
     expect(screen.getByTestId('packaging-units')).toBeInTheDocument();
@@ -139,7 +139,7 @@ describe('AddEditStockItem', () => {
   });
 
   it('disables tabs when isEditing is false', () => {
-    render(<AddEditStockItem model={mockModel} isEditing={false} />);
+    render(<AddEditStockItem />);
 
     const disabledTabs = [
       'packagingUnits',
@@ -150,13 +150,13 @@ describe('AddEditStockItem', () => {
       'references',
     ];
     disabledTabs.forEach((tabName) => {
-      const tab = screen.getByRole('tab', { name: tabName });
+      const tab = screen.getByRole('button', { name: tabName });
       expect(tab).toHaveAttribute('aria-disabled', 'true');
     });
   });
 
   it('enables tabs when isEditing is true', () => {
-    render(<AddEditStockItem model={mockModel} isEditing={true} />);
+    render(<AddEditStockItem stockItem={mockModel} />);
 
     const enabledTabs = [
       'packagingUnits',
@@ -167,14 +167,14 @@ describe('AddEditStockItem', () => {
       'references',
     ];
     enabledTabs.forEach((tabName) => {
-      const tab = screen.getByRole('tab', { name: tabName });
-      expect(tab).not.toHaveAttribute('aria-disabled', 'true');
+      const tab = screen.getByRole('button', { name: tabName });
+      expect(tab).toHaveAttribute('aria-disabled', 'false');
     });
   });
 
   it('renders correct components based on model prop', async () => {
     const user = userEvent.setup();
-    render(<AddEditStockItem model={mockModel} isEditing={true} />);
+    render(<AddEditStockItem stockItem={mockModel} />);
 
     expect(screen.getByText('Stock Item Details: test-uuid-123')).toBeInTheDocument();
 
@@ -198,7 +198,7 @@ describe('AddEditStockItem', () => {
   });
 
   it('translates tab names correctly', () => {
-    render(<AddEditStockItem model={mockModel} />);
+    render(<AddEditStockItem stockItem={mockModel} />);
 
     const tabNames = [
       'stockItemDetails',

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

@@ -1,6 +1,6 @@
-import React, { ReactNode } from 'react';
+import React, { type ReactNode } from 'react';
 import { ComboBox } from '@carbon/react';
-import { Control, Controller, FieldValues } from 'react-hook-form';
+import { type Control, Controller, type FieldValues } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useStockTagLocations } from '../../../../stock-lookups/stock-lookups.resource';
 

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

@@ -7,7 +7,7 @@ import styles from '../../stock-items-table.scss';
 import { useStockItemBatchInformationHook } from './batch-information.resource';
 import BatchInformationLocationsFilter from './batch-information-locations/batch-information-locations-filter.component';
 import { useForm } from 'react-hook-form';
-import { StockItemInventoryFilter } from '../../stock-items.resource';
+import { type StockItemInventoryFilter } from '../../stock-items.resource';
 
 interface BatchInformationProps {
   onSubmit?: () => void;

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

@@ -1,6 +1,6 @@
 import { ResourceRepresentation } from '../../../core/api/api';
 import { useEffect, useMemo, useState } from 'react';
-import { StockItemInventoryFilter, useStockItemInventory } from '../../stock-items.resource';
+import { type StockItemInventoryFilter, useStockItemInventory } from '../../stock-items.resource';
 
 export function useStockItemBatchInformationHook(filter?: StockItemInventoryFilter) {
   const [stockItemFilter, setStockItemFilter] = useState<StockItemInventoryFilter>({

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

@@ -1,6 +1,6 @@
-import React, { ReactNode, useMemo, useState } from 'react';
-import { Concept } from '../../../core/api/types/concept/Concept';
-import { Control, Controller, FieldValues } from 'react-hook-form';
+import React, { type ReactNode, useMemo, useState } from 'react';
+import { type Concept } from '../../../core/api/types/concept/Concept';
+import { type Control, Controller, type FieldValues } from 'react-hook-form';
 import { useConcepts } from '../../../stock-lookups/stock-lookups.resource';
 import { ComboBox, TextInputSkeleton } from '@carbon/react';
 

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

@@ -1,6 +1,6 @@
-import React, { ReactNode, useMemo, useState } from 'react';
-import { Control, Controller, FieldValues } from 'react-hook-form';
-import { StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
+import React, { type ReactNode, useMemo, useState } from 'react';
+import { type Control, Controller, type FieldValues } from 'react-hook-form';
+import { type StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
 import { ComboBox, SelectSkeleton } from '@carbon/react';
 
 interface DispensingPackageMeasurementProps<T> {

package/src/stock-items/add-stock-item/dispensing-unit-selector/dispensing-unit-selector.component.tsx

@@ -1,8 +1,8 @@
-import React, { ReactNode } from 'react';
+import React, { type ReactNode } from 'react';
 import { ComboBox, TextInputSkeleton } from '@carbon/react';
 import { useConcept } from '../../../stock-lookups/stock-lookups.resource';
-import { Concept } from '../../../core/api/types/concept/Concept';
-import { Control, Controller, FieldValues } from 'react-hook-form';
+import { type Concept } from '../../../core/api/types/concept/Concept';
+import { type Control, Controller, type FieldValues } from 'react-hook-form';
 import { type ConfigObject } from '../../../config-schema';
 import { useConfig } from '@openmrs/esm-framework';
 

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

@@ -1,8 +1,8 @@
-import React, { ReactNode, useState } from 'react';
+import React, { type ReactNode, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ComboBox, InlineLoading } from '@carbon/react';
-import { Drug } from '../../../core/api/types/concept/Drug';
-import { Control, Controller, FieldValues } from 'react-hook-form';
+import { type Drug } from '../../../core/api/types/concept/Drug';
+import { type Control, Controller, type FieldValues } from 'react-hook-form';
 import { useDrugsHook } from './drug-selector.resource';
 import { fetchStockItem } from '../../stock-items.resource';
 

package/src/stock-items/add-stock-item/drug-selector/drug-selector.resource.tsx

@@ -1,5 +1,5 @@
 import { ResourceRepresentation } from '../../../core/api/api';
-import { DrugFilterCriteria, useDrugs } from '../../../stock-lookups/stock-lookups.resource';
+import { type DrugFilterCriteria, useDrugs } from '../../../stock-lookups/stock-lookups.resource';
 
 export function useDrugsHook(searchTerm?: string, filter?: DrugFilterCriteria) {
   const defaultFilters: DrugFilterCriteria = {

package/src/stock-items/add-stock-item/packaging-units/packaging-units-delete-modal-button.component.tsx

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import { Button } from '@carbon/react';
 import { TrashCan } from '@carbon/react/icons';
 import { showModal } from '@openmrs/esm-framework';
-import { StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
+import { type StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
 
 interface DeleteModalButtonProps {
   row?: StockItemPackagingUOMDTO;

package/src/stock-items/add-stock-item/packaging-units/packaging-units-delete-modal.component.tsx

@@ -4,7 +4,7 @@ import { Button, ModalHeader, ModalBody, ModalFooter, TextArea } from '@carbon/r
 import { deleteStockItemPackagingUnit } from '../../stock-items.resource';
 import { useStockItemPackageUnitsHook } from './packaging-units.resource';
 import { useTranslation } from 'react-i18next';
-import { StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
+import { type StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
 
 import styles from '../packaging-units/packaging-units.scss';
 

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

@@ -1,7 +1,3 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import { showSnackbar, restBaseUrl } from '@openmrs/esm-framework';
-import { useTranslation } from 'react-i18next';
-import { useStockItemPackageUnitsHook } from './packaging-units.resource';
 import {
   Button,
   DataTable,
@@ -14,19 +10,22 @@ import {
   TableHeader,
   TableRow,
 } from '@carbon/react';
-import PackagingUnitsConceptSelector from '../packaging-units-concept-selector/packaging-units-concept-selector.component';
-import ControlledNumberInput from '../../../core/components/carbon/controlled-number-input/controlled-number-input.component';
 import { Save } from '@carbon/react/icons';
-import { FormProvider, useForm, useFormContext } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { PackageUnitFormData, packageUnitSchema } from './validationSchema';
-import { StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
+import { restBaseUrl, showSnackbar } from '@openmrs/esm-framework';
+import React, { useEffect, useMemo, useState } from 'react';
+import { FormProvider, useForm, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import { type StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
+import ControlledNumberInput from '../../../core/components/carbon/controlled-number-input/controlled-number-input.component';
+import { handleMutate } from '../../../utils';
 import { createStockItemPackagingUnit, updateStockItemPackagingUnit } from '../../stock-items.resource';
+import PackagingUnitsConceptSelector from '../packaging-units-concept-selector/packaging-units-concept-selector.component';
 import DeleteModalButton from './packaging-units-delete-modal-button.component';
-import { handleMutate } from '../../../utils';
+import { useStockItemPackageUnitsHook } from './packaging-units.resource';
+import { type PackageUnitFormData, packageUnitSchema } from './validationSchema';
 
 import styles from './packaging-units.scss';
-import { closeOverlay } from '../../../core/components/overlay/hook';
 
 interface PackagingUnitsProps {
   isEditing?: boolean;

package/src/stock-items/add-stock-item/packaging-units/packaging-units.resource.tsx

@@ -1,6 +1,6 @@
 import { ResourceRepresentation } from '../../../core/api/api';
 import { useEffect, useState } from 'react';
-import { StockItemInventoryFilter, useStockItemPackagingUOMs } from '../../stock-items.resource';
+import { type StockItemInventoryFilter, useStockItemPackagingUOMs } from '../../stock-items.resource';
 
 export function useStockItemPackageUnitsHook(v?: ResourceRepresentation) {
   const [stockItemFilter, setStockItemFilter] = useState<StockItemInventoryFilter>({
@@ -24,7 +24,7 @@ export function useStockItemPackageUnitsHook(v?: ResourceRepresentation) {
   const { items, isLoading, error, mutate } = useStockItemPackagingUOMs(stockItemFilter);
 
   return {
-    items: items.results,
+    items: items.results ?? [],
     totalCount: items.totalCount,
     isLoading,
     error,

package/src/stock-items/add-stock-item/packaging-units-concept-selector/packaging-units-concept-selector.component.tsx

@@ -1,9 +1,9 @@
-import React, { ReactNode } from 'react';
-import { Concept } from '../../../core/api/types/concept/Concept';
-import { Control, Controller, FieldValues } from 'react-hook-form';
+import React, { type ReactNode } from 'react';
+import { type Concept } from '../../../core/api/types/concept/Concept';
+import { type Control, Controller, type FieldValues } from 'react-hook-form';
 import { useConcept } from '../../../stock-lookups/stock-lookups.resource';
 import { ComboBox, TextInputSkeleton } from '@carbon/react';
-import { StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
+import { type StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
 import { useConfig } from '@openmrs/esm-framework';
 import { type ConfigObject } from '../../../config-schema';
 

package/src/stock-items/add-stock-item/preferred-vendor-selector/preferred-vendor-selector.component.tsx

@@ -1,10 +1,10 @@
-import React, { ReactNode } from 'react';
-import { Concept } from '../../../core/api/types/concept/Concept';
-import { Control, Controller, FieldValues } from 'react-hook-form';
+import React, { type ReactNode } from 'react';
+import { type Concept } from '../../../core/api/types/concept/Concept';
+import { type Control, Controller, type FieldValues } from 'react-hook-form';
 import { ComboBox, TextInputSkeleton } from '@carbon/react';
 import { useStockSources } from '../../../stock-sources/stock-sources.resource';
 import { ResourceRepresentation } from '../../../core/api/api';
-import { StockSource } from '../../../core/api/types/stockOperation/StockSource';
+import { type StockSource } from '../../../core/api/types/stockOperation/StockSource';
 
 interface PreferredVendorSelectorProps<T> {
   preferredVendorUuid?: string;

package/src/stock-items/add-stock-item/quantities/quantities.resource.tsx

@@ -1,6 +1,6 @@
 import { ResourceRepresentation } from '../../../core/api/api';
 import { useEffect, useState } from 'react';
-import { StockItemInventoryFilter, useStockItemInventory } from '../../stock-items.resource';
+import { type StockItemInventoryFilter, useStockItemInventory } from '../../stock-items.resource';
 
 export function useStockItemQuantitiesHook(v?: ResourceRepresentation) {
   const [stockItemFilter, setStockItemFilter] = useState<StockItemInventoryFilter>({

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

@@ -1,6 +1,6 @@
-import React, { ReactNode } from 'react';
-import { Control, Controller, FieldValues } from 'react-hook-form';
-import { Concept } from '../../../core/api/types/concept/Concept';
+import React, { type ReactNode } from 'react';
+import { type Control, Controller, type FieldValues } from 'react-hook-form';
+import { type Concept } from '../../../core/api/types/concept/Concept';
 import { ComboBox, TextInputSkeleton } from '@carbon/react';
 import { useConcept } from '../../../stock-lookups/stock-lookups.resource';
 import { type ConfigObject } from '../../../config-schema';