@openmrs/esm-stock-management-app 1.0.1-pre.684 → 1.0.1-pre.691

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

@@ -134,10 +134,10 @@
       "initial": true,
       "entry": true,
       "recorded": false,
-      "size": 5407714,
+      "size": 5407793,
       "sizes": {
         "consume-shared": 252,
-        "javascript": 5385765,
+        "javascript": 5385844,
         "share-init": 252,
         "runtime": 21445
       },
@@ -154,7 +154,7 @@
       "auxiliaryFiles": [
         "main.js.map"
       ],
-      "hash": "7584bde8978b83b7",
+      "hash": "b6ba4ea06ac17137",
       "childrenByOrder": {}
     },
     {
@@ -607,9 +607,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1748842,
+      "size": 1748921,
       "sizes": {
-        "javascript": 1748632,
+        "javascript": 1748711,
         "consume-shared": 210
       },
       "names": [],
@@ -623,7 +623,7 @@
       "auxiliaryFiles": [
         "973.js.map"
       ],
-      "hash": "b0ca032dbaa177cd",
+      "hash": "f060b14379d6e58f",
       "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":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"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":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.684"}
+{"$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":"locations-db-link","slot":"stock-page-dashboard-slot","component":"stockLocationsLink","meta":{"name":"locations","slot":"locations-dashboard-slot","title":"Locations"},"order":4,"online":true,"offline":true},{"name":"stock-locations-db","slot":"locations-dashboard-slot","component":"stockLocations"},{"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":"import-bulk-stock-items","component":"importBulkStockItemsModal"},{"name":"stock-operation-dialog","component":"stockOperationModal"}],"pages":[{"component":"root","route":"stock-management"}],"version":"1.0.1-pre.691"}

package/package.json

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

package/src/stock-operations/add-stock-operation/add-stock-operation.test.tsx

@@ -0,0 +1,192 @@
+import React from 'react';
+import { render, waitFor, screen, fireEvent } from '@testing-library/react';
+import { showSnackbar } from '@openmrs/esm-framework';
+import AddStockOperation from './add-stock-operation.component';
+import { useInitializeStockOperations } from './add-stock-operation.resource';
+import { useStockOperationTypes } from '../../stock-lookups/stock-lookups.resource';
+import { getStockOperationLinks } from '../stock-operations.resource';
+import { StockOperationDTO } from '../../core/api/types/stockOperation/StockOperationDTO';
+import { StockOperationType } from '../../core/api/types/stockOperation/StockOperationType';
+import { InitializeResult } from './types';
+import { useStockOperations } from '../stock-operations.resource';
+import { closeOverlay } from '../../core/components/overlay/hook';
+
+jest.mock('react-i18next', () => ({
+  useTranslation: jest.fn().mockReturnValue({ t: (key) => key }),
+}));
+
+jest.mock('@openmrs/esm-framework', () => ({
+  ActionMenu: jest.fn(() => null),
+  showSnackbar: jest.fn(),
+  useDebounce: jest.fn((x) => x),
+  getGlobalStore: jest.fn(() => ({
+    getState: jest.fn(),
+    subscribe: jest.fn(),
+    setState: jest.fn(),
+  })),
+  parseDate: jest.fn((date) => new Date(date)),
+  showNotification: jest.fn(),
+  usePagination: jest.fn(() => ({ currentPage: 1, setPage: jest.fn() })),
+  useSession: jest.fn(() => ({ user: { display: 'Test User' } })),
+}));
+
+jest.mock('./add-stock-operation.resource', () => ({
+  useInitializeStockOperations: jest.fn(),
+}));
+
+jest.mock('../../stock-lookups/stock-lookups.resource', () => ({
+  useStockOperationTypes: jest.fn(),
+  useUsers: jest.fn().mockReturnValue({ items: { results: [] }, isLoading: false }),
+}));
+
+jest.mock('../stock-operations.resource', () => ({
+  operationStatusColor: jest.fn(() => 'some-color'),
+  getStockOperationLinks: jest.fn(),
+  useStockOperations: jest.fn().mockReturnValue({
+    items: { results: [] },
+    isLoading: false,
+    error: null,
+  }),
+}));
+
+jest.mock('../../core/components/overlay/hook', () => ({
+  closeOverlay: jest.fn(),
+}));
+
+jest.mock('../../stock-items/stock-items.resource', () => ({
+  useStockItems: jest.fn().mockReturnValue({
+    isLoading: false,
+    error: null,
+    items: {
+      results: [{ uuid: 'mock-uuid', packagingUomName: 'Mock Unit', factor: 1 }],
+    },
+  }),
+  useStockItem: jest.fn(),
+}));
+
+const mockOnGoBack = jest.fn();
+const mockOnSave = jest.fn();
+const mockOnComplete = jest.fn();
+const mockOnSubmit = jest.fn();
+const mockOnDispatch = jest.fn();
+
+const mockProps = {
+  stockOperations: { results: [] },
+  uuid: 'some-mock-uuid',
+  isEditing: false,
+  canPrint: false,
+  canEdit: true,
+  locked: false,
+  model: {
+    approvalRequired: null,
+    uuid: 'mock-uuid',
+    operationType: 'mock-operation-type',
+    status: 'COMPLETED',
+    dateCreated: '2023-01-01',
+    creatorFamilyName: 'Doe',
+    creatorGivenName: 'John',
+  } as unknown as StockOperationDTO,
+  operation: {
+    name: 'Stock Issue',
+    description: 'Issuing stock',
+    operationType: 'stockissue',
+    hasSource: true,
+    sourceType: {},
+    hasDestination: true,
+    destinationType: {},
+    hasRecipient: false,
+    recipientRequired: false,
+    availableWhenReserved: false,
+    allowExpiredBatchNumbers: false,
+    stockOperationTypeLocationScopes: [],
+  } as StockOperationType,
+  setup: {
+    isNegativeQuantityAllowed: false,
+    requiresBatchUuid: false,
+    requiresActualBatchInfo: false,
+    isQuantityOptional: false,
+  } as InitializeResult,
+  actions: {
+    onGoBack: mockOnGoBack,
+    onSave: mockOnSave,
+    onComplete: mockOnComplete,
+    onSubmit: mockOnSubmit,
+    onDispatch: mockOnDispatch,
+  },
+  dto: {
+    results: [],
+  },
+};
+
+describe('AddStockOperation', () => {
+  beforeEach(() => {
+    (useInitializeStockOperations as jest.Mock).mockReturnValue({
+      isLoading: true,
+      error: null,
+      item: {},
+      result: {
+        uuid: 'some-valid-uuid-value',
+      },
+    });
+    const mockStockOperationTypes = { results: [] };
+    (useStockOperationTypes as jest.Mock).mockReturnValue(mockStockOperationTypes);
+    (getStockOperationLinks as jest.Mock).mockResolvedValue({ data: { results: [] } });
+    (useStockOperations as jest.Mock).mockReturnValue({ items: { results: [] }, isLoading: false, error: null });
+  });
+
+  it('displays error state correctly', async () => {
+    (useInitializeStockOperations as jest.Mock).mockReturnValue({
+      isLoading: false,
+      error: true,
+      result: null,
+    });
+    const { result } = useInitializeStockOperations(mockProps);
+    if (!result) {
+      return null;
+    }
+    render(<AddStockOperation {...mockProps} />);
+    expect(showSnackbar).toHaveBeenCalledWith(
+      expect.objectContaining({
+        kind: 'error',
+        title: 'error',
+      }),
+    );
+  });
+
+  it('displays loading state correctly', async () => {
+    (useInitializeStockOperations as jest.Mock).mockReturnValue({
+      isLoading: true,
+      error: null,
+      result: null,
+    });
+    render(<AddStockOperation {...mockProps} />);
+    expect(showSnackbar).not.toHaveBeenCalled();
+  });
+
+  it('displays error state and shows snackbar', () => {
+    (useInitializeStockOperations as jest.Mock).mockReturnValue({ isLoading: false, error: true, result: null });
+    render(<AddStockOperation {...mockProps} />);
+    expect(showSnackbar).toHaveBeenCalledWith(expect.objectContaining({ kind: 'error' }));
+  });
+
+  it('calls external utilities correctly', async () => {
+    (useInitializeStockOperations as jest.Mock).mockReturnValue({
+      isLoading: false,
+      error: true,
+      result: null,
+    });
+
+    render(<AddStockOperation {...mockProps} />);
+    await waitFor(() => {
+      expect(closeOverlay).toHaveBeenCalled();
+    });
+    await waitFor(() => {
+      expect(showSnackbar).toHaveBeenCalledWith(
+        expect.objectContaining({
+          kind: 'error',
+          title: 'error',
+        }),
+      );
+    });
+  });
+});

package/src/stock-operations/batch-no-selector/batch-no-selector.component.tsx

@@ -65,7 +65,7 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
     }
   }, [isLoading, stockItemBatchNos, props.selectedItem, filteredBatches]);
 
-  if (isLoading) return <InlineLoading status="active" />;
+  if (isLoading) return <InlineLoading status="active" data-testid="loading" />;
 
   return (
     <div style={{ display: 'flex', flexDirection: 'column' }}>
@@ -88,9 +88,7 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
               onChange(data.selectedItem?.uuid);
             }}
             initialSelectedItem={initialSelectedItem}
-            itemToString={(s: StockBatchDTO) =>
-              s?.batchNo ? `${s?.batchNo} | Qty: ${s?.quantity ?? "Unknown"}` : ""
-            }
+            itemToString={(s: StockBatchDTO) => (s?.batchNo ? `${s?.batchNo} | Qty: ${s?.quantity ?? 'Unknown'}` : '')}
             placeholder={props.placeholder}
             invalid={props.invalid}
             invalidText={props.invalidText}
@@ -99,7 +97,11 @@ const BatchNoSelector = <T,>(props: BatchNoSelectorProps<T>) => {
         )}
       />
       {isLoading && <InlineLoading status="active" />}
-      {validationMessage && <div style={{ color: 'red', marginTop: '8px' }}>{t(validationMessage)}</div>}
+      {validationMessage && (
+        <div data-testid="validation-message" style={{ color: 'red', marginTop: '8px' }}>
+          {t(validationMessage)}
+        </div>
+      )}
     </div>
   );
 };

package/src/stock-operations/batch-no-selector/batch-no-selector.test.tsx

@@ -1,10 +1,101 @@
 import React from 'react';
-
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import { useForm, FormProvider } from 'react-hook-form';
+import { useStockItemBatchNos } from './batch-no-selector.resource';
+import { useStockItemBatchInformationHook } from '../../stock-items/add-stock-item/batch-information/batch-information.resource';
 import BatchNoSelector from './batch-no-selector.component';
+import { StockBatchDTO } from '../../core/api/types/stockItem/StockBatchDTO';
+import userEvent from '@testing-library/user-event';
+import { waitFor } from '@testing-library/react';
+
+// Mock hooks
+jest.mock('./batch-no-selector.resource');
+jest.mock('../../stock-items/add-stock-item/batch-information/batch-information.resource');
+jest.mock('react-i18next', () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+const mockUseStockItemBatchNos = useStockItemBatchNos as jest.Mock;
+const mockUseStockItemBatchInformationHook = useStockItemBatchInformationHook as jest.Mock;
+
+describe('BatchNoSelector Component', () => {
+  const stockItemUuid = 'test-uuid';
+  const batchUuid = 'batch-uuid';
+  const mockStockItemBatchNos: StockBatchDTO[] = [
+    { uuid: '1', batchNo: 'batch1', quantity: '10', expiration: new Date(), stockItemUuid: '', voided: false },
+    { uuid: '2', batchNo: 'batch2', quantity: '20', expiration: new Date(), stockItemUuid: '', voided: false },
+  ];
+  const mockBatchInformation = [
+    { batchNumber: 'batch1', quantity: '10' },
+    { batchNumber: 'batch2', quantity: '20' },
+  ];
+
+  beforeEach(() => {
+    mockUseStockItemBatchNos.mockReturnValue({
+      isLoading: false,
+      stockItemBatchNos: mockStockItemBatchNos,
+    });
+    mockUseStockItemBatchInformationHook.mockReturnValue({
+      items: mockBatchInformation,
+      setStockItemUuid: jest.fn(),
+    });
+  });
+
+  const renderComponent = () => {
+    const Wrapper = () => {
+      const methods = useForm();
+      return (
+        <FormProvider {...methods}>
+          <BatchNoSelector
+            stockItemUuid={stockItemUuid}
+            batchUuid={batchUuid}
+            controllerName="batchNo"
+            name="batchNo"
+            control={methods.control}
+          />
+        </FormProvider>
+      );
+    };
+    render(<Wrapper />);
+  };
+
+  test('should render without crashing', () => {
+    renderComponent();
+    expect(screen.getByRole('combobox')).toBeInTheDocument();
+  });
+
+  test('should display loading state when isLoading is true', () => {
+    mockUseStockItemBatchNos.mockReturnValueOnce({
+      isLoading: true,
+      stockItemBatchNos: [],
+    });
+    renderComponent();
+    expect(screen.getByTestId('loading')).toBeInTheDocument();
+  });
+
+  test('should call onBatchNoChanged when a batch is selected', async () => {
+    const onBatchNoChanged = jest.fn();
+    const Wrapper = () => {
+      const methods = useForm();
+      return (
+        <FormProvider {...methods}>
+          <BatchNoSelector
+            stockItemUuid={stockItemUuid}
+            batchUuid={batchUuid}
+            controllerName="batchNo"
+            name="batchNo"
+            control={methods.control}
+            onBatchNoChanged={onBatchNoChanged}
+          />
+        </FormProvider>
+      );
+    };
+    render(<Wrapper />);
+
+    const combobox = screen.getByRole('combobox');
+    await userEvent.click(combobox);
+    await userEvent.click(screen.getByText((content) => content.includes('batch1')));
 
-describe('Test the batch no selector', () => {
-  it(`renders without dying`, () => {
-    // render(<BatchNoSelector />);
+    expect(onBatchNoChanged).toHaveBeenCalledWith(mockStockItemBatchNos[0]);
   });
 });