@openmrs/esm-stock-management-app 1.0.1-pre.783 → 1.0.1-pre.785

package/src/stock-operations/stock-operations-forms/input-components/qty-uim-selector.test.tsx

@@ -0,0 +1,157 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { useStockItem } from '../../../stock-items/stock-items.resource';
+import QtyUomSelector from './quantity-uom-selector.component';
+
+jest.mock('../../../stock-items/stock-items.resource');
+jest.mock('react-i18next', () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+const mockUseStockItem = useStockItem as jest.Mock;
+
+describe('QtyUOMSelector', () => {
+  const mockOnValueChange = jest.fn();
+  const mockStockItemUuid = 'test-uuid';
+  const mockitem = {
+    uuid: '33225466-93c8-4720-b110-4f445f3764c6',
+    drugUuid: '1776AFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
+    drugName: 'Ibuprofen Injection solution  5mg/mL ',
+    conceptUuid: '77897AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+    conceptName: 'IBUPROFEN',
+    hasExpiration: true,
+    preferredVendorUuid: 'b7e481ef-06e7-46ba-8a7c-ab077aa3355f',
+    preferredVendorName: 'Kenya Medical Supplies Authority',
+    purchasePrice: 100.0,
+    purchasePriceUoMUuid: '65dc9ec7-0663-4cf0-a35c-6a2d2cf99eee',
+    purchasePriceUoMName: 'Box',
+    purchasePriceUoMFactor: 10.0,
+    dispensingUnitName: 'Tablet',
+    dispensingUnitUuid: '1513AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+    dispensingUnitPackagingUoMUuid: '65dc9ec7-0663-4cf0-a35c-6a2d2cf99eee',
+    dispensingUnitPackagingUoMName: 'Box',
+    dispensingUnitPackagingUoMFactor: 10.0,
+    defaultStockOperationsUoMUuid: null,
+    defaultStockOperationsUoMName: null,
+    defaultStockOperationsUoMFactor: null,
+    categoryUuid: '183f9497-b72e-4ebe-ae17-5dcf110ff3b6',
+    categoryName: 'Other Lymph Node Comments',
+    commonName: 'Ibuprofen 5 MG/ML Injectable Solution',
+    acronym: null,
+    reorderLevel: null,
+    reorderLevelUoMUuid: null,
+    reorderLevelUoMName: null,
+    reorderLevelUoMFactor: null,
+    dateCreated: '2024-09-03T09:46:47.000+0300',
+    creatorGivenName: 'Mark',
+    creatorFamilyName: 'Miller',
+    voided: false,
+    expiryNotice: 180,
+    permission: {
+      canView: true,
+      canEdit: true,
+    },
+    packagingUnits: [
+      {
+        uuid: '8023ef7d-56da-442f-bc74-319f000840b4',
+        factor: 1.0,
+        packagingUomUuid: '162382AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+        packagingUomName: 'Vial',
+        stockItemUuid: '33225466-93c8-4720-b110-4f445f3764c6',
+        isDefaultStockOperationsUoM: false,
+        isDispensingUnit: false,
+        links: [
+          {
+            rel: 'full',
+            uri: 'http://hie.kenyahmis.org/openmrs/ws/rest/v1/stockmanagement/stockitempackaginguom/8023ef7d-56da-442f-bc74-319f000840b4?v=full',
+            resourceAlias: 'stockitempackaginguom',
+          },
+        ],
+        resourceVersion: '1.8',
+      },
+      {
+        uuid: '65dc9ec7-0663-4cf0-a35c-6a2d2cf99eee',
+        factor: 10.0,
+        packagingUomUuid: '162396AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+        packagingUomName: 'Box',
+        stockItemUuid: '33225466-93c8-4720-b110-4f445f3764c6',
+        isDefaultStockOperationsUoM: false,
+        isDispensingUnit: true,
+        links: [
+          {
+            rel: 'full',
+            uri: 'http://hie.kenyahmis.org/openmrs/ws/rest/v1/stockmanagement/stockitempackaginguom/65dc9ec7-0663-4cf0-a35c-6a2d2cf99eee?v=full',
+            resourceAlias: 'stockitempackaginguom',
+          },
+        ],
+        resourceVersion: '1.8',
+      },
+    ],
+    references: [],
+    links: [
+      {
+        rel: 'self',
+        uri: 'http://hie.kenyahmis.org/openmrs/ws/rest/v1/stockmanagement/stockitem/33225466-93c8-4720-b110-4f445f3764c6',
+        resourceAlias: 'stockitem',
+      },
+    ],
+    resourceVersion: '1.8',
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseStockItem.mockReturnValue({
+      isLoading: false,
+      item: mockitem,
+    });
+  });
+  it('should render Skeleton when loading stock item', () => {
+    mockUseStockItem.mockReturnValue({ isLoading: true });
+    render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} />);
+    expect(screen.getByRole('progressbar')).toBeInTheDocument();
+  });
+  it('should render Inline notification error when error ocuured while fetching item', () => {
+    const errorMessage = 'error loading stock item';
+    mockUseStockItem.mockReturnValue({ isLoading: false, error: new Error(errorMessage) });
+    render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} />);
+    expect(screen.getByText(errorMessage)).toBeInTheDocument();
+    expect(screen.getByRole('status')).toBeInTheDocument();
+  });
+  it('should render Inline notification error when error ocuured while fetching item', () => {
+    const errorMessage = 'error loading stock item';
+    mockUseStockItem.mockReturnValue({ isLoading: false, error: new Error(errorMessage) });
+    render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} />);
+    expect(screen.getByText(errorMessage)).toBeInTheDocument();
+    expect(screen.getByRole('status')).toBeInTheDocument();
+  });
+
+  it('should display error message when error prop is provided', () => {
+    const errorMessage = 'This is an error';
+    render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} error={errorMessage} />);
+    expect(screen.getByText(errorMessage)).toBeInTheDocument();
+  });
+  it('should display error message when error prop is provided', () => {
+    const errorMessage = 'This is an error';
+    render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} error={errorMessage} />);
+    expect(screen.getByText(errorMessage)).toBeInTheDocument();
+  });
+
+  it('should render packing uom options', async () => {
+    render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} />);
+    const combobox = screen.getByRole('combobox');
+    await userEvent.click(combobox);
+    mockitem.packagingUnits.forEach(({ factor, packagingUomName }) => {
+      expect(screen.getByText(`${packagingUomName} - ${factor}`)).toBeInTheDocument();
+    });
+  });
+  it('should packing uom selection', async () => {
+    const itemToSelect = mockitem.packagingUnits[1];
+    render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} />);
+    const combobox = screen.getByRole('combobox');
+    await userEvent.click(combobox);
+    const option = screen.getByText(`${itemToSelect.packagingUomName} - ${itemToSelect.factor}`);
+    await userEvent.click(option);
+    expect(mockOnValueChange).toHaveBeenCalledWith(itemToSelect.uuid);
+  });
+});

package/src/stock-operations/stock-operations-forms/input-components/quantity-uom-selector.component.tsx

@@ -0,0 +1,53 @@
+import { ComboBox, InlineNotification, SkeletonText } from '@carbon/react';
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
+import { useStockItem } from '../../../stock-items/stock-items.resource';
+
+interface QtyUomSelectorProps {
+  stockItemUuid: string;
+  intiallvalue?: string;
+  onValueChange?: (value: string) => void;
+  error?: string;
+}
+
+const QtyUomSelector: React.FC<QtyUomSelectorProps> = ({ stockItemUuid, error, intiallvalue, onValueChange }) => {
+  const { t } = useTranslation();
+  const { isLoading, error: stockItemError, item } = useStockItem(stockItemUuid);
+  const initialSelectedItem = useMemo<StockItemPackagingUOMDTO | null>(
+    () => (item?.packagingUnits ?? []).find((u) => u.uuid === intiallvalue),
+    [item?.packagingUnits, intiallvalue],
+  );
+
+  if (isLoading) return <SkeletonText role="progressbar" />;
+
+  if (stockItemError)
+    return (
+      <InlineNotification
+        kind="error"
+        title={t('packagingUomError', 'Error loading Stock item')}
+        subtitle={stockItemError?.message}
+      />
+    );
+
+  return (
+    <ComboBox
+      titleText={t('quantityUom', 'Qty UoM')}
+      name={'stockItemPackagingUOMUuid'}
+      id={'stockItemPackagingUOMUuid'}
+      items={item?.packagingUnits ?? []}
+      onChange={(data: { selectedItem?: StockItemPackagingUOMDTO }) => {
+        onValueChange?.(data.selectedItem?.uuid);
+      }}
+      initialSelectedItem={initialSelectedItem}
+      itemToString={(s: StockItemPackagingUOMDTO) =>
+        s.packagingUomName ? `${s?.packagingUomName} - ${s?.factor} ` : ''
+      }
+      placeholder={t('filter', 'Filter') + '...'}
+      invalid={error}
+      invalidText={error}
+    />
+  );
+};
+
+export default QtyUomSelector;

package/src/stock-operations/stock-operations-forms/input-components/stock-item-search.component.tsx

@@ -0,0 +1,56 @@
+import { ClickableTile, Search } from '@carbon/react';
+import { useDebounce } from '@openmrs/esm-framework';
+import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { StockItemDTO } from '../../../core/api/types/stockItem/StockItem';
+import { useFilterableStockItems } from '../hooks/useFilterableStockItems';
+import styles from './input-components-styles.scss';
+
+type StockItemSearchProps = {
+  onSelectedItem?: (stockItem: StockItemDTO) => void;
+};
+
+const StockItemSearch: React.FC<StockItemSearchProps> = ({ onSelectedItem }) => {
+  const { t } = useTranslation();
+  const { isLoading, stockItemsList, setSearchString } = useFilterableStockItems({});
+  const [searchTerm, setSearchTerm] = useState('');
+  const debouncedSearchTerm = useDebounce(searchTerm);
+
+  useEffect(() => {
+    if (debouncedSearchTerm?.length !== 0) {
+      setSearchString(debouncedSearchTerm);
+    }
+  }, [debouncedSearchTerm, setSearchString]);
+
+  const handleOnSearchResultClick = (stockItem: StockItemDTO) => {
+    onSelectedItem?.(stockItem);
+    setSearchTerm('');
+  };
+  return (
+    <div className={styles.stockItemSearchContainer}>
+      <div style={{ display: 'flex' }}>
+        <Search
+          size="lg"
+          placeholder={t('findItems', 'Find your items')}
+          labelText={t('search', 'Search')}
+          closeButtonLabelText={t('clearSearch', 'Clear search input')}
+          value={searchTerm}
+          id="search-stock-operation-item"
+          name="search-stock-operation-item"
+          onChange={(e) => setSearchTerm(e.target.value)}
+        />
+      </div>
+      {searchTerm && stockItemsList?.length > 0 && (
+        <div className={styles.searchResults}>
+          {stockItemsList?.slice(0, 5).map((stockItem) => (
+            <ClickableTile onClick={() => handleOnSearchResultClick(stockItem)} key={stockItem?.uuid}>
+              {stockItem?.commonName}
+            </ClickableTile>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default StockItemSearch;

package/src/stock-operations/stock-operations-forms/input-components/stock-operation-reason-selector.component.tsx

@@ -0,0 +1,59 @@
+import { ComboBox, InlineNotification, SelectSkeleton } from '@carbon/react';
+import { useConfig } from '@openmrs/esm-framework';
+import React from 'react';
+import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import { ConfigObject } from '../../../config-schema';
+import { Concept } from '../../../core/api/types/concept/Concept';
+import { useConcept } from '../../../stock-lookups/stock-lookups.resource';
+
+const StockOperationReasonSelector = () => {
+  const { stockAdjustmentReasonUUID } = useConfig<ConfigObject>();
+  const form = useFormContext<{ reasonUuid: string }>();
+  const {
+    isLoading,
+    error,
+    items: { answers: reasons },
+  } = useConcept(stockAdjustmentReasonUUID);
+  const { t } = useTranslation();
+  if (isLoading) return <SelectSkeleton role="progressbar" />;
+
+  if (error)
+    return (
+      <InlineNotification
+        lowContrast
+        kind="error"
+        title={t('reasonError', 'Error loading reasons concepts')}
+        subtitle={error?.message}
+      />
+    );
+
+  return (
+    <Controller
+      control={form.control}
+      name={'reasonUuid'}
+      render={({ field, fieldState: { error } }) => (
+        <ComboBox
+          readOnly={field.disabled}
+          titleText={t('reason', 'Reason')}
+          placeholder={t('chooseAReason', 'Choose a reason')}
+          name={'reasonUuid'}
+          id={'reasonUuid'}
+          size={'xl'}
+          items={reasons}
+          initialSelectedItem={reasons?.find((p) => p.uuid === field.value)}
+          selectedItem={reasons.find((p) => p.uuid === field.value)}
+          itemToString={(item?: Concept) => (item && item?.display ? `${item?.display}` : '')}
+          onChange={(data: { selectedItem?: Concept }) => {
+            field.onChange(data?.selectedItem?.uuid);
+          }}
+          ref={field.ref}
+          invalid={error?.message}
+          invalidText={error?.message}
+        />
+      )}
+    />
+  );
+};
+
+export default StockOperationReasonSelector;

package/src/stock-operations/stock-operations-forms/input-components/stock-operation-reason-selector.test.tsx

@@ -0,0 +1,216 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { useConfig } from '@openmrs/esm-framework';
+import { useFormContext } from 'react-hook-form';
+import { useConcept } from '../../../stock-lookups/stock-lookups.resource';
+import StockOperationReasonSelector from './stock-operation-reason-selector.component';
+
+// Mock the hooks
+jest.mock('@openmrs/esm-framework', () => ({
+  useConfig: jest.fn(),
+}));
+
+jest.mock('react-hook-form', () => ({
+  useFormContext: jest.fn(),
+  Controller: ({ render }) => render({ field: {}, fieldState: {} }),
+}));
+jest.mock('../../../stock-lookups/stock-lookups.resource');
+jest.mock('react-i18next', () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+const mockUseConcept = useConcept as jest.Mock;
+const mockUseConfig = useConfig as jest.Mock;
+const mockUseFormContext = useFormContext as jest.Mock;
+
+describe('StockoperationReasonSelector', () => {
+  const mockConcepts = {
+    uuid: '3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25',
+    display: 'Stock Adjustment Reason',
+    name: {
+      display: 'Stock Adjustment Reason',
+      uuid: '4eb6556a-a2d4-4e85-9b62-4d076a1063fc',
+      name: 'Stock Adjustment Reason',
+      locale: 'en',
+      localePreferred: true,
+      conceptNameType: 'FULLY_SPECIFIED',
+      links: [
+        {
+          rel: 'self',
+          uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25/name/4eb6556a-a2d4-4e85-9b62-4d076a1063fc',
+          resourceAlias: 'name',
+        },
+        {
+          rel: 'full',
+          uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25/name/4eb6556a-a2d4-4e85-9b62-4d076a1063fc?v=full',
+          resourceAlias: 'name',
+        },
+      ],
+      resourceVersion: '1.9',
+    },
+    datatype: {
+      uuid: '8d4a48b6-c2cc-11de-8d13-0010c6dffd0f',
+      display: 'Coded',
+      links: [
+        {
+          rel: 'self',
+          uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/conceptdatatype/8d4a48b6-c2cc-11de-8d13-0010c6dffd0f',
+          resourceAlias: 'conceptdatatype',
+        },
+      ],
+    },
+    conceptClass: {
+      uuid: '8d491e50-c2cc-11de-8d13-0010c6dffd0f',
+      display: 'Question',
+      links: [
+        {
+          rel: 'self',
+          uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/conceptclass/8d491e50-c2cc-11de-8d13-0010c6dffd0f',
+          resourceAlias: 'conceptclass',
+        },
+      ],
+    },
+    set: false,
+    version: null,
+    retired: false,
+    names: [
+      {
+        uuid: '4eb6556a-a2d4-4e85-9b62-4d076a1063fc',
+        display: 'Stock Adjustment Reason',
+        links: [
+          {
+            rel: 'self',
+            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25/name/4eb6556a-a2d4-4e85-9b62-4d076a1063fc',
+            resourceAlias: 'name',
+          },
+        ],
+      },
+      {
+        uuid: '36eb0855-c810-4816-9bed-1de5c615e702',
+        display: 'Stock Adjustment Reason',
+        links: [
+          {
+            rel: 'self',
+            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25/name/36eb0855-c810-4816-9bed-1de5c615e702',
+            resourceAlias: 'name',
+          },
+        ],
+      },
+    ],
+    descriptions: [
+      {
+        uuid: '67311e07-1935-448b-8305-7d11abf0de63',
+        display: 'Stock Adjustment Reason',
+        links: [
+          {
+            rel: 'self',
+            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25/description/67311e07-1935-448b-8305-7d11abf0de63',
+            resourceAlias: 'description',
+          },
+        ],
+      },
+    ],
+    mappings: [],
+    answers: [
+      {
+        uuid: '165420AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+        display: 'Drug not available due to expired medication',
+        links: [
+          {
+            rel: 'self',
+            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/165420AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            resourceAlias: 'concept',
+          },
+        ],
+      },
+      {
+        uuid: '160584AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+        display: 'Lost or ran out of medication',
+        links: [
+          {
+            rel: 'self',
+            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/160584AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            resourceAlias: 'concept',
+          },
+        ],
+      },
+      {
+        uuid: '122835AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+        display: 'Work Shift Change',
+        links: [
+          {
+            rel: 'self',
+            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/122835AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            resourceAlias: 'concept',
+          },
+        ],
+      },
+      {
+        uuid: '160561AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+        display: 'New drug available',
+        links: [
+          {
+            rel: 'self',
+            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/160561AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+            resourceAlias: 'concept',
+          },
+        ],
+      },
+    ],
+    setMembers: [],
+    attributes: [],
+    links: [
+      {
+        rel: 'self',
+        uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25',
+        resourceAlias: 'concept',
+      },
+      {
+        rel: 'full',
+        uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25?v=full',
+        resourceAlias: 'concept',
+      },
+    ],
+    resourceVersion: '2.0',
+  };
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseConfig.mockReturnValue({ stockAdjustmentReasonUUID: 'uuid' });
+    mockUseConcept.mockReturnValue({
+      isLoading: false,
+      items: mockConcepts,
+    });
+  });
+
+  it('should display loading state while loading reason concepts', () => {
+    mockUseFormContext.mockReturnValue({ control: {} });
+    mockUseConcept.mockReturnValue({
+      isLoading: true,
+      items: mockConcepts,
+    });
+    render(<StockOperationReasonSelector />);
+    expect(screen.getByRole('progressbar')).toBeInTheDocument();
+  });
+  it('should display error notification when error encountered while fetching concepts', () => {
+    const errorMessahe = 'Error message';
+    mockUseConcept.mockReturnValue({
+      isLoading: false,
+      items: mockConcepts,
+      error: new Error(errorMessahe),
+    });
+    render(<StockOperationReasonSelector />);
+    expect(screen.getByRole('status')).toBeInTheDocument();
+    expect(screen.getByText(errorMessahe)).toBeInTheDocument();
+  });
+
+  it('renders ComboBox with reasons', async () => {
+    render(<StockOperationReasonSelector />);
+    const combobox = screen.getByRole('combobox');
+    await userEvent.click(combobox);
+    mockConcepts.answers.forEach((ans) => {
+      expect(screen.getByText(`${ans?.display}`)).toBeInTheDocument();
+    });
+  });
+});

package/src/stock-operations/{batch-no-selector → stock-operations-forms/input-components}/unique-batch-no-entry-input.component.tsx

@@ -1,31 +1,35 @@
 import { TextInput } from '@carbon/react';
 import React, { ChangeEvent, useEffect, useMemo, useState } from 'react';
-import { useStockItemBatchNos } from './batch-no-selector.resource';
 import { TextInputSkeleton } from '@carbon/react';
+import { useStockItemBatchNumbers } from '../hooks/useStockItemBatchNumbers';
+import { useTranslation } from 'react-i18next';
 
 type UniqueBatchNoEntryInputProps = {
   defaultValue?: string;
   onValueChange?: (value: string) => void;
   error?: string;
   stockItemUuid: string;
+  stockOperationItemUuid: string;
 };
 const UniqueBatchNoEntryInput: React.FC<UniqueBatchNoEntryInputProps> = ({
   defaultValue,
   onValueChange,
   error,
   stockItemUuid,
+  stockOperationItemUuid,
 }) => {
-  const { isLoading, stockItemBatchNos } = useStockItemBatchNos(stockItemUuid);
+  const { isLoading, stockItemBatchNos } = useStockItemBatchNumbers(stockItemUuid);
   const [value, setValue] = useState(defaultValue);
   const [_error, setError] = useState<string>();
-
+  const { t } = useTranslation();
+  const isNewItem = useMemo(() => stockOperationItemUuid.startsWith('new-item'), [stockOperationItemUuid]);
   const batchNoAlreadyUsed = useMemo(
-    () => stockItemBatchNos?.findIndex((batchNo) => batchNo.batchNo === value) !== -1,
-    [stockItemBatchNos, value],
+    () => isNewItem && stockItemBatchNos?.findIndex((batchNo) => batchNo.batchNo === value) !== -1,
+    [stockItemBatchNos, value, isNewItem],
   );
 
   useEffect(() => {
-    if (defaultValue) setValue(defaultValue);
+    if (defaultValue) setValue(defaultValue ?? '');
   }, [defaultValue]);
 
   useEffect(() => {
@@ -41,12 +45,13 @@ const UniqueBatchNoEntryInput: React.FC<UniqueBatchNoEntryInputProps> = ({
 
   return (
     <TextInput
-      size="sm"
       maxLength={50}
       onChange={(e: ChangeEvent<HTMLInputElement>) => setValue(e.target.value)}
       value={value}
       invalidText={_error ?? error}
       invalid={_error ?? error}
+      placeholder={t('batchNumber', 'Batch Number')}
+      labelText={t('batchNumber', 'Batch Number')}
     />
   );
 };