+) {
+ const value = row[field];
+ const valueIsEmpty = value === null || value === undefined || value === '';
+ if (!valueIsEmpty) {
+ return mapping?.[String(value)] || value;
+ }
+
+ const defaultValue = mapping?.[LABEL_FOR_DEFAULT_TABLE_CELL_VALUE];
+ return defaultValue || value;
+}
diff --git a/ui/src/components/table/tests/TableExpansionRowData.test.tsx b/ui/src/components/table/tests/TableExpansionRowData.test.tsx
new file mode 100644
index 000000000..d7f3df03b
--- /dev/null
+++ b/ui/src/components/table/tests/TableExpansionRowData.test.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { getExpansionRowData } from '../TableExpansionRowData';
+import { LABEL_FOR_DEFAULT_TABLE_CELL_VALUE } from '../TableConsts';
+
+const moreInfo = [
+ { label: 'Name', field: 'name', mapping: { [LABEL_FOR_DEFAULT_TABLE_CELL_VALUE]: 'Unknown' } },
+ { label: 'Age', field: 'age' },
+ {
+ label: 'Country',
+ field: 'country',
+ mapping: { [LABEL_FOR_DEFAULT_TABLE_CELL_VALUE]: 'N/A' },
+ },
+];
+
+const getTermByText = (content: string) =>
+ screen.getAllByRole('term').find((term) => term.textContent === content);
+const getDefinitionByText = (content: string) =>
+ screen.getAllByRole('definition').find((definition) => definition.textContent === content);
+
+it('returns an empty array when moreInfo is undefined or empty', () => {
+ const result = getExpansionRowData({}, []);
+ expect(result).toEqual([]);
+});
+
+it('correctly processes non-empty moreInfo and returns expected React elements', async () => {
+ const row = { name: 'John Doe', age: 30, country: 'USA' };
+ render({getExpansionRowData(row, moreInfo)}
);
+
+ expect(screen.getAllByRole('definition')).toHaveLength(moreInfo.length);
+
+ expect(getTermByText('Name')).toBeInTheDocument();
+ expect(getDefinitionByText('John Doe')).toBeInTheDocument();
+
+ expect(getTermByText('Country')).toBeInTheDocument();
+ expect(getDefinitionByText('USA')).toBeInTheDocument();
+
+ expect(getTermByText('Age')).toBeInTheDocument();
+ expect(getDefinitionByText('30')).toBeInTheDocument();
+});
+it('excludes fields when not present in row and no default value is provided', async () => {
+ const row = { name: 'Jane Doe', country: 'Canada' };
+ render({getExpansionRowData(row, moreInfo)}
);
+
+ const userAge = screen.queryByText('30');
+ const ageTag = screen.queryByText('Age');
+
+ expect(userAge).not.toBeInTheDocument();
+ expect(ageTag).not.toBeInTheDocument();
+});
+
+it('includes fields with their default value when specified and field in row is empty or missing', () => {
+ const row = { age: 25 };
+ render({getExpansionRowData(row, moreInfo)}
);
+
+ expect(getDefinitionByText('Unknown')).toBeInTheDocument();
+ expect(getDefinitionByText('N/A')).toBeInTheDocument();
+});
+
+it('handles non-string values correctly, converting them to strings', () => {
+ const row = { name: 'Alice', age: null, country: undefined };
+ render({getExpansionRowData(row, moreInfo)}
);
+
+ expect(getDefinitionByText('Alice')).toBeInTheDocument();
+ expect(getDefinitionByText('N/A')).toBeInTheDocument();
+ expect(getDefinitionByText('Age')).toBeUndefined();
+});
diff --git a/ui/src/components/table/tests/table.utils.test.ts b/ui/src/components/table/tests/table.utils.test.ts
new file mode 100644
index 000000000..b4f96efa1
--- /dev/null
+++ b/ui/src/components/table/tests/table.utils.test.ts
@@ -0,0 +1,58 @@
+import { LABEL_FOR_DEFAULT_TABLE_CELL_VALUE } from '../TableConsts';
+import { getTableCellValue } from '../table.utils';
+
+it('should return row[field] if field exists in row and is not empty', () => {
+ const row = {
+ field1: 'value1',
+ };
+ const field = 'field1';
+ const mapping = {
+ [LABEL_FOR_DEFAULT_TABLE_CELL_VALUE]: 'defaultValue',
+ };
+ const result = getTableCellValue(row, field, mapping);
+ expect(result).toBe('value1');
+});
+
+it('should return mapping[LABEL_FOR_DEFAULT_TABLE_CELL_VALUE] if field does not exist in row and defaultValue exists in mapping', () => {
+ const row = {
+ field2: 'value2',
+ };
+ const field = 'field1';
+ const mapping = {
+ [LABEL_FOR_DEFAULT_TABLE_CELL_VALUE]: 'defaultValue',
+ };
+ const result = getTableCellValue(row, field, mapping);
+ expect(result).toBe('defaultValue');
+});
+
+it('should return row[field] if field exists in row and is empty but defaultValue does not exist in mapping', () => {
+ const row = {
+ field1: '',
+ };
+ const field = 'field1';
+ const mapping = {};
+ const result = getTableCellValue(row, field, mapping);
+ expect(result).toBe('');
+});
+
+it('should return undefined if field does not exist in row and defaultValue does not exist in mapping', () => {
+ const row = {
+ field2: '',
+ };
+ const field = 'field1';
+ const mapping = {};
+ const result = getTableCellValue(row, field, mapping);
+ expect(result).toBeUndefined();
+});
+
+it('should return correctly mapped value as field1 exists in row and its value should be mapped', () => {
+ const row = {
+ field1: 'someValue',
+ };
+ const field = 'field1';
+ const mapping = {
+ someValue: 'mappedValue',
+ };
+ const result = getTableCellValue(row, field, mapping);
+ expect(result).toBe('mappedValue');
+});