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

package/src/stock-items/stock-items-table.test.tsx

@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event';
 import StockItemsTableComponent from './stock-items-table.component';
 import { useStockItemsPages } from './stock-items-table.resource';
 import { handleMutate } from '../utils';
-import { launchAddOrEditDialog } from './stock-item.utils';
+import { launchAddOrStockItemWorkspace } from './stock-item.utils';
 
 jest.mock('./stock-items-table.resource', () => ({
   useStockItemsPages: jest.fn(),
@@ -15,7 +15,7 @@ jest.mock('../utils', () => ({
 }));
 
 jest.mock('./stock-item.utils', () => ({
-  launchAddOrEditDialog: jest.fn(),
+  launchAddOrStockItemWorkspace: jest.fn(),
 }));
 
 jest.mock('react-i18next', () => ({
@@ -27,16 +27,18 @@ jest.mock('react-i18next', () => ({
 describe('StockItemsTableComponent', () => {
   const mockUseStockItemsPages = {
     isLoading: false,
-    items: Array(25).fill(null).map((_, index) => ({
-      uuid: `item-${index}`,
-      commonName: `Test Item ${index}`,
-      drugUuid: index % 2 === 0 ? `drug-${index}` : null,
-      conceptName: `Concept ${index}`,
-      dispensingUnitName: `Unit ${index}`,
-      defaultStockOperationsUoMName: `UoM ${index}`,
-      reorderLevel: index * 10,
-      reorderLevelUoMName: 'Units',
-    })),
+    items: Array(25)
+      .fill(null)
+      .map((_, index) => ({
+        uuid: `item-${index}`,
+        commonName: `Test Item ${index}`,
+        drugUuid: index % 2 === 0 ? `drug-${index}` : null,
+        conceptName: `Concept ${index}`,
+        dispensingUnitName: `Unit ${index}`,
+        defaultStockOperationsUoMName: `UoM ${index}`,
+        reorderLevel: index * 10,
+        reorderLevelUoMName: 'Units',
+      })),
     totalCount: 25,
     currentPageSize: 10,
     setPageSize: jest.fn(),
@@ -57,13 +59,13 @@ describe('StockItemsTableComponent', () => {
     render(<StockItemsTableComponent />);
     expect(screen.getByText('panelDescription')).toBeInTheDocument();
     expect(screen.getByRole('searchbox')).toBeInTheDocument();
-    
+
     const user = userEvent.setup();
     const menuButton = screen.getByTestId('stock-items-menu');
     await user.click(menuButton);
-  
+
     await screen.findByText('Refresh');
-    
+
     expect(screen.getByText('type')).toBeInTheDocument();
     expect(screen.getByText('genericName')).toBeInTheDocument();
     expect(screen.getByText('commonName')).toBeInTheDocument();
@@ -87,9 +89,12 @@ describe('StockItemsTableComponent', () => {
     const user = userEvent.setup();
     const searchInput = screen.getByRole('searchbox');
     await user.type(searchInput, 'test search');
-    await waitFor(() => {
-      expect(mockUseStockItemsPages.setSearchString).toHaveBeenCalledWith('test search');
-    }, { timeout: 2000 });
+    await waitFor(
+      () => {
+        expect(mockUseStockItemsPages.setSearchString).toHaveBeenCalledWith('test search');
+      },
+      { timeout: 2000 },
+    );
   });
 
   it('updates pagination when page or page size changes', async () => {
@@ -106,12 +111,12 @@ describe('StockItemsTableComponent', () => {
 
   it('triggers handleRefresh when refresh button is clicked', async () => {
     render(<StockItemsTableComponent />);
-    
+
     const user = userEvent.setup();
     const menuButton = screen.getByTestId('stock-items-menu');
     expect(menuButton).toBeInTheDocument();
     await user.click(menuButton);
-  
+
     const refreshButton = await screen.findByText('Refresh');
     expect(refreshButton).toBeInTheDocument();
     await user.click(refreshButton);
@@ -125,10 +130,10 @@ describe('StockItemsTableComponent', () => {
     const user = userEvent.setup();
     const editButtons = screen.getAllByLabelText('Edit Stock Item');
     await user.click(editButtons[0]);
-    expect(launchAddOrEditDialog).toHaveBeenCalledWith(
+
+    expect(launchAddOrStockItemWorkspace).toHaveBeenCalledWith(
       expect.any(Function),
       expect.objectContaining({ uuid: 'item-0' }),
-      true
     );
   });
-});
+});

package/src/stock-items/stock-items.resource.ts

@@ -10,6 +10,8 @@ import { type StockItemReference, type StockItemReferenceDTO } from '../core/api
 import { type StockItemTransactionDTO } from '../core/api/types/stockItem/StockItemTransaction';
 import { type StockRule } from '../core/api/types/stockItem/StockRule';
 import { type StockOperationItemCost } from '../core/api/types/stockOperation/StockOperationItemCost';
+import { z } from 'zod';
+import { stockItemDetailsSchema, type StockItemFormData } from './validationSchema';
 
 export interface StockItemFilter extends ResourceFilterCriteria {
   isDrug?: string | null | undefined;
@@ -227,11 +229,11 @@ export function deleteStockItemPackagingUnit(id: string) {
 }
 
 // createStockItem
-export function createStockItem(item: StockItemDTO) {
+export function createStockItem(item: StockItemFormData) {
   const apiUrl = `${restBaseUrl}/stockmanagement/stockitem`;
   const abortController = new AbortController();
   delete item.isDrug;
-  return openmrsFetch(apiUrl, {
+  return openmrsFetch<StockItemDTO>(apiUrl, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -242,12 +244,12 @@ export function createStockItem(item: StockItemDTO) {
 }
 
 // updateStockItem
-export function updateStockItem(item: StockItemDTO) {
-  const apiUrl = `${restBaseUrl}/stockmanagement/stockitem/${item.uuid}`;
+export function updateStockItem(stockItemUuid: string, item: StockItemFormData) {
+  const apiUrl = `${restBaseUrl}/stockmanagement/stockitem/${stockItemUuid}`;
   const abortController = new AbortController();
   delete item.isDrug;
   delete item.dateCreated;
-  return openmrsFetch(apiUrl, {
+  return openmrsFetch<StockItemDTO>(apiUrl, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',

package/src/stock-operations/stock-operations-forms/stock-operation-stepper/stock-operation-stepper.component.tsx

@@ -35,6 +35,7 @@ const StockOperationStepper: React.FC<StockOperationStepperProps> = ({
               className={`${styles.stepperItem} ${active ? styles.stepperItemActive : ''}`}
               key={index}
               onClick={!disabled ? () => onChange?.(index) : undefined}
+              aria-disabled={disabled}
             >
               <p className={styles.title}>{title}</p>
             </li>