Skip to content

SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.

feat(llm-attribute-mapping): group + mapper drawers + diff-save [3-4/5] (#11780)

Gaurav Tewari6d3861d60f74
diff --git a/frontend/public/locales/en-GB/titles.json b/frontend/public/locales/en-GB/titles.json
index d5a8b4c5a2..7d1657d863 100644
--- a/frontend/public/locales/en-GB/titles.json
+++ b/frontend/public/locales/en-GB/titles.json
@@ -63,5 +63,6 @@
"INTEGRATIONS_DETAIL": "SigNoz | Integration",
"PUBLIC_DASHBOARD": "SigNoz | Dashboard",
"LLM_OBSERVABILITY_OVERVIEW": "SigNoz | LLM Observability Overview",
- "LLM_OBSERVABILITY_CONFIGURATION": "SigNoz | LLM Observability Configuration"
+ "LLM_OBSERVABILITY_CONFIGURATION": "SigNoz | LLM Observability Configuration",
+ "LLM_OBSERVABILITY_ATTRIBUTE_MAPPING": "SigNoz | LLM Observability Attribute Mapping"
}
\ No newline at end of file
diff --git a/frontend/public/locales/en/titles.json b/frontend/public/locales/en/titles.json
index d0c875dfad..109edbe626 100644
--- a/frontend/public/locales/en/titles.json
+++ b/frontend/public/locales/en/titles.json
@@ -88,5 +88,6 @@
"INTEGRATIONS_DETAIL": "SigNoz | Integration",
"PUBLIC_DASHBOARD": "SigNoz | Dashboard",
"LLM_OBSERVABILITY_OVERVIEW": "SigNoz | LLM Observability Overview",
- "LLM_OBSERVABILITY_CONFIGURATION": "SigNoz | LLM Observability Configuration"
+ "LLM_OBSERVABILITY_CONFIGURATION": "SigNoz | LLM Observability Configuration",
+ "LLM_OBSERVABILITY_ATTRIBUTE_MAPPING": "SigNoz | LLM Observability Attribute Mapping"
}
\ No newline at end of file
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/AttributeMappingsTab.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/AttributeMappingsTab.tsx
index 589b7dc5a8..e012bd5df8 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/AttributeMappingsTab.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/AttributeMappingsTab.tsx
@@ -1,18 +1,34 @@
+import { DraftGroup } from '../types';
+import { AttributeMappingEditor } from '../hooks/useAttributeMappingEditor';
import styles from './AttributeMappingsTab.module.scss';
import MappingsTable from './components/MappingsTable/MappingsTable';
-import { useAttributeMappingStore } from './hooks/useAttributeMappingStore';
-function AttributeMappingsTab(): JSX.Element {
- const store = useAttributeMappingStore();
+interface AttributeMappingsTabProps {
+ editor: AttributeMappingEditor;
+ onEditGroup: (group: DraftGroup) => void;
+ onAddGroup: () => void;
+}
+// "Attribute mappings" tab: the mapping-groups listing and its error state.
+// The editor is owned by the container (the header's save/discard share it),
+// so it's passed in rather than created here.
+function AttributeMappingsTab({
+ editor,
+ onEditGroup,
+ onAddGroup,
+}: AttributeMappingsTabProps): JSX.Element {
return (
<div data-testid="attribute-mappings-tab">
- {store.isError ? (
+ {editor.isError ? (
<div className={styles.pageError} role="alert">
Failed to load mapping groups. Please try again.
</div>
) : (
- <MappingsTable store={store} />
+ <MappingsTable
+ editor={editor}
+ onEditGroup={onEditGroup}
+ onAddGroup={onAddGroup}
+ />
)}
</div>
);
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/__tests__/AttributeMappingsTab.test.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/__tests__/AttributeMappingsTab.test.tsx
index 25125ffc8c..b45f2a89c1 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/__tests__/AttributeMappingsTab.test.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/__tests__/AttributeMappingsTab.test.tsx
@@ -2,9 +2,19 @@ import {
SpantypesFieldContextDTO as FieldContext,
SpantypesSpanMapperOperationDTO as MapperOperation,
} from 'api/generated/services/sigNoz.schemas';
+import { toast } from '@signozhq/ui/sonner';
import { rest, server } from 'mocks-server/server';
import { render, screen, userEvent, waitFor, within } from 'tests/test-utils';
+jest.mock('@signozhq/ui/sonner', () => ({
+ ...jest.requireActual('@signozhq/ui/sonner'),
+ toast: {
+ success: jest.fn(),
+ error: jest.fn(),
+ warning: jest.fn(),
+ },
+}));
+
import {
GROUPS_ENDPOINT,
makeGroupsResponse,
@@ -14,7 +24,9 @@ import {
mockGroups,
mockMappers,
} from 'container/LLMObservability/AttributeMapping/__tests__/fixtures';
+import { DraftGroup } from 'container/LLMObservability/AttributeMapping/types';
import AttributeMappingsTab from '../AttributeMappingsTab';
+import { useAttributeMappingEditor } from '../../hooks/useAttributeMappingEditor';
function setupGroups(groups = mockGroups): void {
server.use(
@@ -39,6 +51,53 @@ async function expandGroup(
await user.click(screen.getByTestId(`group-expand-${groupId}`));
}
+async function openGroupActionsMenu(
+ user: ReturnType<typeof userEvent.setup>,
+ groupId: string,
+): Promise<void> {
+ await user.click(screen.getByTestId(`group-actions-${groupId}`));
+}
+
+interface AttributeMappingsTabWithStoreProps {
+ onEditGroup?: (group: DraftGroup) => void;
+ onAddGroup?: () => void;
+}
+function AttributeMappingsTabWithStore({
+ onEditGroup,
+ onAddGroup,
+}: AttributeMappingsTabWithStoreProps): JSX.Element {
+ const editor = useAttributeMappingEditor();
+ return (
+ <AttributeMappingsTab
+ editor={editor}
+ onEditGroup={onEditGroup ?? jest.fn()}
+ onAddGroup={onAddGroup ?? jest.fn()}
+ />
+ );
+}
+
+function SaveableHarness(): JSX.Element {
+ const editor = useAttributeMappingEditor();
+ return (
+ <>
+ <button
+ type="button"
+ data-testid="save-button"
+ onClick={(): void => {
+ void editor.save();
+ }}
+ >
+ Save
+ </button>
+ <AttributeMappingsTab
+ editor={editor}
+ onEditGroup={jest.fn()}
+ onAddGroup={jest.fn()}
+ />
+ </>
+ );
+}
+
describe('AttributeMappingsTab (integration)', () => {
beforeEach(() => {
// Reset URL state between tests — jsdom shares window.location across a file.
@@ -51,7 +110,7 @@ describe('AttributeMappingsTab (integration)', () => {
it('renders no error banner on a successful load', async () => {
setupGroups();
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
await waitFor(() =>
expect(screen.getByTestId('group-name-group-1')).toBeInTheDocument(),
@@ -63,7 +122,7 @@ describe('AttributeMappingsTab (integration)', () => {
server.use(
rest.get(GROUPS_ENDPOINT, (_req, res, ctx) => res(ctx.status(500))),
);
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
await expect(screen.findByRole('alert')).resolves.toHaveTextContent(
'Failed to load mapping groups. Please try again.',
@@ -72,7 +131,7 @@ describe('AttributeMappingsTab (integration)', () => {
it('shows the empty state when there are no groups', async () => {
setupGroups([]);
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
await expect(
screen.findByTestId('mapper-groups-empty'),
@@ -81,58 +140,96 @@ describe('AttributeMappingsTab (integration)', () => {
it('renders each group header row with its name, condition count and status', async () => {
setupGroups();
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
// Condition filters are no longer shown inline as clauses — the header
- // carries a count instead (the keys surface in the group drawer, later PR).
- // Group headers are antd Collapse panels, so rows scope to the panel item.
+ // carries a count instead (the keys surface in the group drawer).
+ // Every field carries a group-scoped testId, so assert on them directly.
+ await screen.findByTestId('group-name-group-1');
+
// group-1: enabled, with attribute + resource condition keys.
- const enabledRow = (await screen.findByTestId('group-name-group-1')).closest(
- '.ant-collapse-item',
- ) as HTMLElement;
- expect(
- within(enabledRow).getByTestId('group-name-group-1'),
- ).toHaveTextContent('demo');
- expect(
- within(enabledRow).getByTestId('group-condition-count-group-1'),
- ).toHaveTextContent('2 conditions');
- expect(within(enabledRow).getByTestId('group-enabled-group-1')).toBeChecked();
-
- // group-2: disabled, with no condition keys.
- const disabledRow = screen
- .getByTestId('group-name-group-2')
- .closest('.ant-collapse-item') as HTMLElement;
- expect(within(disabledRow).getByText('Tool')).toBeInTheDocument();
- expect(
- within(disabledRow).getByTestId('group-condition-count-group-2'),
- ).toHaveTextContent('0 conditions');
- expect(
- within(disabledRow).getByTestId('group-enabled-group-2'),
- ).not.toBeChecked();
+ expect(screen.getByTestId('group-name-group-1')).toHaveTextContent('demo');
+ expect(screen.getByTestId('group-condition-count-group-1')).toHaveTextContent(
+ '2 conditions',
+ );
+ expect(screen.getByTestId('group-enabled-group-1')).toBeChecked();
+
+ // group-2: disabled.
+ expect(screen.getByTestId('group-name-group-2')).toHaveTextContent('Tool');
+ expect(screen.getByTestId('group-condition-count-group-2')).toHaveTextContent(
+ '0 conditions',
+ );
+ expect(screen.getByTestId('group-enabled-group-2')).not.toBeChecked();
});
- it('renders the group enable state as a read-only switch', async () => {
+ it("stages a toggle of the group's enabled state via the header switch", async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
setupGroups();
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
- // The status switch reflects enabled state but is non-interactive in this
- // read-only listing — editing lands in a later PR.
const toggle = await screen.findByTestId('group-enabled-group-1');
expect(toggle).toBeChecked();
- expect(toggle).toBeDisabled();
+
+ await user.click(toggle);
+ expect(screen.getByTestId('group-enabled-group-1')).not.toBeChecked();
+ });
+
+ it('invokes onAddGroup from the toolbar button', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ const onAddGroup = jest.fn();
+ setupGroups();
+ render(<AttributeMappingsTabWithStore onAddGroup={onAddGroup} />);
+
+ await screen.findByTestId('group-name-group-1');
+ await user.click(screen.getByTestId('add-group-row'));
+
+ expect(onAddGroup).toHaveBeenCalledTimes(1);
+ });
+
+ it('invokes onEditGroup with the group when Edit is chosen from the actions menu', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ const onEditGroup = jest.fn();
+ setupGroups();
+ render(<AttributeMappingsTabWithStore onEditGroup={onEditGroup} />);
+
+ await screen.findByTestId('group-name-group-1');
+ await openGroupActionsMenu(user, 'group-1');
+ await user.click(await screen.findByRole('menuitem', { name: 'Edit' }));
+
+ expect(onEditGroup).toHaveBeenCalledTimes(1);
+ expect(onEditGroup.mock.calls[0][0]).toMatchObject({
+ localId: 'group-1',
+ name: 'demo',
+ });
+ });
+
+ it('stages a group removal when Delete is chosen from the actions menu', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ setupGroups();
+ render(<AttributeMappingsTabWithStore />);
+
+ await screen.findByTestId('group-name-group-1');
+ await openGroupActionsMenu(user, 'group-1');
+ await user.click(await screen.findByRole('menuitem', { name: 'Delete' }));
+
+ await waitFor(() =>
+ expect(screen.queryByTestId('group-name-group-1')).not.toBeInTheDocument(),
+ );
+ expect(screen.getByTestId('group-name-group-2')).toBeInTheDocument();
});
it("reveals a group's mappers on expand and hides them on collapse", async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
setupGroups();
setupMappers([makeMapper({ id: 'mapper-1' })]);
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
await screen.findByTestId('group-name-group-1');
- // The toggle is the antd Collapse header, which owns the expanded state.
+ // The clickable Collapse header owns the expanded state; find it by the
+ // aria-expanded contract rather than any framework-internal class.
const header = screen
.getByTestId('group-expand-group-1')
- .closest('.ant-collapse-header') as HTMLElement;
+ .closest('[aria-expanded]') as HTMLElement;
expect(header).toHaveAttribute('aria-expanded', 'false');
await expandGroup(user);
@@ -155,7 +252,7 @@ describe('AttributeMappingsTab (integration)', () => {
setupMappers([
makeMapper({ id: 'mapper-1', name: 'gen_ai.request.model', enabled: true }),
]);
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
await screen.findByTestId('group-name-group-1');
// Mappers are not fetched until the row is expanded.
@@ -172,29 +269,12 @@ describe('AttributeMappingsTab (integration)', () => {
const sources = within(mapperRow).getByTestId('mapper-sources-mapper-1');
expect(sources).toHaveTextContent('genai.model');
expect(sources).toHaveTextContent('llm.model');
- // Writes-to field context + enabled status (an inline Switch, not text).
expect(within(mapperRow).getByText('attribute')).toBeInTheDocument();
expect(
within(mapperRow).getByTestId('mapper-enabled-mapper-1'),
).toBeChecked();
});
- it("renders a mapper's enable state as a read-only switch", async () => {
- const user = userEvent.setup({ pointerEventsCheck: 0 });
- setupGroups();
- setupMappers([makeMapper({ id: 'mapper-1', enabled: true })]);
- render(<AttributeMappingsTab />);
-
- await screen.findByTestId('group-name-group-1');
- await expandGroup(user);
-
- // Like the group switch, a mapper's status switch reflects state without
- // accepting flips in this read-only listing.
- const toggle = await screen.findByTestId('mapper-enabled-mapper-1');
- expect(toggle).toBeChecked();
- expect(toggle).toBeDisabled();
- });
-
it('shows the mappers error state when the mappers request fails', async () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
setupGroups();
@@ -203,7 +283,7 @@ describe('AttributeMappingsTab (integration)', () => {
res(ctx.status(500)),
),
);
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
await screen.findByTestId('group-name-group-1');
await expandGroup(user);
@@ -217,7 +297,7 @@ describe('AttributeMappingsTab (integration)', () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
setupGroups();
setupMappers([]);
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
await screen.findByTestId('group-name-group-1');
await expandGroup(user);
@@ -243,7 +323,7 @@ describe('AttributeMappingsTab (integration)', () => {
},
}),
]);
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
await screen.findByTestId('group-name-group-1');
await expandGroup(user);
@@ -255,7 +335,7 @@ describe('AttributeMappingsTab (integration)', () => {
const user = userEvent.setup({ pointerEventsCheck: 0 });
setupGroups();
setupMappers([makeMapper({ id: 'mapper-1', config: { sources: [] } })]);
- render(<AttributeMappingsTab />);
+ render(<AttributeMappingsTabWithStore />);
await screen.findByTestId('group-name-group-1');
await expandGroup(user);
@@ -264,4 +344,167 @@ describe('AttributeMappingsTab (integration)', () => {
expect(screen.getByTestId('mapper-sources-mapper-1')).toHaveTextContent('—'),
);
});
+
+ it("re-fetches an open group's mappers on save instead of showing stale rows", async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ setupGroups();
+
+ let mappers = mockMappers;
+ server.use(
+ rest.get(mappersEndpoint('group-1'), (_req, res, ctx) =>
+ res(ctx.status(200), ctx.json(makeMappersResponse(mappers))),
+ ),
+ );
+ render(<SaveableHarness />);
+
+ await waitFor(() =>
+ expect(screen.getByTestId('group-name-group-1')).toBeInTheDocument(),
+ );
+
+ await user.click(screen.getByTestId('group-expand-group-1'));
+ await expect(
+ screen.findByTestId('mapper-target-mapper-1'),
+ ).resolves.toBeInTheDocument();
+
+ mappers = [makeMapper({ id: 'mapper-2', name: 'gen_ai.response.model' })];
+
+ await user.click(screen.getByTestId('save-button'));
+
+ await expect(
+ screen.findByTestId('mapper-target-mapper-2'),
+ ).resolves.toHaveTextContent('gen_ai.response.model');
+ expect(
+ screen.queryByTestId('mapper-target-mapper-1'),
+ ).not.toBeInTheDocument();
+ });
+
+ it('warns and keeps the working copy when the post-save refresh fails', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ (toast.success as jest.Mock).mockClear();
+ (toast.warning as jest.Mock).mockClear();
+
+ let failRefresh = false;
+ server.use(
+ rest.get(GROUPS_ENDPOINT, (_req, res, ctx) =>
+ failRefresh
+ ? res(ctx.status(500), ctx.json({ status: 'error' }))
+ : res(ctx.status(200), ctx.json(makeGroupsResponse(mockGroups))),
+ ),
+ rest.patch(`${GROUPS_ENDPOINT}/:groupId`, (_req, res, ctx) =>
+ res(ctx.status(200), ctx.json({ status: 'ok' })),
+ ),
+ );
+ render(<SaveableHarness />);
+
+ const toggle = await screen.findByTestId('group-enabled-group-1');
+ expect(toggle).toBeChecked();
+
+ await user.click(toggle);
+ expect(screen.getByTestId('group-enabled-group-1')).not.toBeChecked();
+
+ failRefresh = true;
+ await user.click(screen.getByTestId('save-button'));
+
+ await waitFor(() => expect(toast.warning).toHaveBeenCalled());
+ expect(toast.success).not.toHaveBeenCalled();
+ });
+
+ describe('mapper drawer', () => {
+ async function openGroupWithMapper(
+ user: ReturnType<typeof userEvent.setup>,
+ ): Promise<void> {
+ setupGroups();
+ setupMappers([makeMapper({ id: 'mapper-1', name: 'gen_ai.request.model' })]);
+ render(<AttributeMappingsTabWithStore />);
+
+ await screen.findByTestId('group-name-group-1');
+ await expandGroup(user);
+ await screen.findByTestId('mapper-target-mapper-1');
+ }
+
+ it('opens the add-mapping drawer from a group\'s "Add mapping" button', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ await openGroupWithMapper(user);
+
+ expect(screen.queryByTestId('mapper-form-drawer')).not.toBeInTheDocument();
+ await user.click(screen.getByTestId('add-mapper-group-1'));
+
+ await expect(
+ screen.findByTestId('mapper-form-drawer'),
+ ).resolves.toBeInTheDocument();
+ expect(screen.getByText('New custom mapping')).toBeInTheDocument();
+ });
+
+ it('opens the edit drawer prefilled and locks the target attribute', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ await openGroupWithMapper(user);
+
+ await user.click(screen.getByRole('button', { name: 'Mapping actions' }));
+ await user.click(await screen.findByRole('menuitem', { name: 'Edit' }));
+
+ await expect(
+ screen.findByTestId('mapper-form-drawer'),
+ ).resolves.toBeInTheDocument();
+ expect(screen.getByText('Edit mapping')).toBeInTheDocument();
+ const target = screen.getByTestId('mapper-form-target');
+ expect(target).toHaveValue('gen_ai.request.model');
+ expect(target).toBeDisabled();
+ });
+
+ it("toggles a mapper's enabled state through the store", async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ await openGroupWithMapper(user);
+
+ const toggle = screen.getByTestId('mapper-enabled-mapper-1');
+ expect(toggle).toBeChecked();
+
+ await user.click(toggle);
+
+ await waitFor(() =>
+ expect(screen.getByTestId('mapper-enabled-mapper-1')).not.toBeChecked(),
+ );
+ });
+
+ it('removes a mapper via the row action menu', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ await openGroupWithMapper(user);
+
+ await user.click(screen.getByRole('button', { name: 'Mapping actions' }));
+ await user.click(await screen.findByRole('menuitem', { name: 'Delete' }));
+
+ await waitFor(() =>
+ expect(
+ screen.queryByTestId('mapper-target-mapper-1'),
+ ).not.toBeInTheDocument(),
+ );
+ expect(screen.getByTestId('mappers-empty-group-1')).toBeInTheDocument();
+ });
+
+ it('creates a new mapping through the drawer and appends it to the group', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ await openGroupWithMapper(user);
+
+ await user.click(screen.getByTestId('add-mapper-group-1'));
+ await screen.findByTestId('mapper-form-drawer');
+
+ expect(screen.getByTestId('mapper-form-save')).toBeDisabled();
+
+ await user.type(
+ screen.getByTestId('mapper-form-target'),
+ 'gen_ai.response.model',
+ );
+ await user.type(screen.getByTestId('mapper-form-source-0'), 'raw.model');
+
+ const create = screen.getByTestId('mapper-form-save');
+ await waitFor(() => expect(create).toBeEnabled());
+ await user.click(create);
+
+ await waitFor(() =>
+ expect(screen.queryByTestId('mapper-form-drawer')).not.toBeInTheDocument(),
+ );
+ await expect(
+ screen.findByText('gen_ai.response.model'),
+ ).resolves.toBeInTheDocument();
+ });
+ });
});
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupActionsMenu/GroupActionsMenu.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupActionsMenu/GroupActionsMenu.tsx
new file mode 100644
index 0000000000..8910cd18d1
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupActionsMenu/GroupActionsMenu.tsx
@@ -0,0 +1,53 @@
+import { useMemo } from 'react';
+import { EllipsisVertical, Pencil, Trash2 } from '@signozhq/icons';
+import { Button } from '@signozhq/ui/button';
+import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+
+import type { DraftGroup } from 'container/LLMObservability/AttributeMapping/types';
+
+interface GroupActionsMenuProps {
+ group: DraftGroup;
+ onEdit: (group: DraftGroup) => void;
+ onRemove: (localId: string) => void;
+}
+
+function GroupActionsMenu({
+ group,
+ onEdit,
+ onRemove,
+}: GroupActionsMenuProps): JSX.Element {
+ const menuItems = useMemo<MenuItem[]>(
+ () => [
+ {
+ key: 'edit',
+ label: 'Edit',
+ icon: <Pencil size={14} />,
+ onClick: (): void => onEdit(group),
+ },
+ {
+ key: 'delete',
+ label: 'Delete',
+ danger: true,
+ icon: <Trash2 size={14} />,
+ onClick: (): void => onRemove(group.localId),
+ },
+ ],
+ [onEdit, onRemove, group],
+ );
+
+ return (
+ <DropdownMenuSimple menu={{ items: menuItems }} align="end">
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="icon"
+ aria-label="Group actions"
+ data-testid={`group-actions-${group.localId}`}
+ >
+ <EllipsisVertical size={16} />
+ </Button>
+ </DropdownMenuSimple>
+ );
+}
+
+export default GroupActionsMenu;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/ConditionsTooltip.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/ConditionsTooltip.module.scss
new file mode 100644
index 0000000000..6f20bc3232
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/ConditionsTooltip.module.scss
@@ -0,0 +1,32 @@
+.conditionsTooltip {
+ display: flex;
+ flex-direction: column;
+ gap: var(--spacing-3);
+ max-width: 320px;
+ text-align: left;
+}
+
+.section {
+ display: flex;
+ flex-direction: column;
+ gap: var(--spacing-1);
+}
+
+.keyList {
+ display: flex;
+ flex-wrap: wrap;
+ gap: var(--spacing-1);
+}
+
+.key {
+ max-width: 100%;
+ padding: 0 var(--spacing-1);
+ border-radius: var(--radius-1);
+ background: var(--bg-ink-300);
+ color: var(--l1-foreground);
+ font-family: var(--font-family-mono);
+ font-size: var(--font-size-xs);
+ white-space: normal;
+ overflow-wrap: anywhere;
+ word-break: break-word;
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/ConditionsTooltip.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/ConditionsTooltip.tsx
new file mode 100644
index 0000000000..ec49ae9fea
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/ConditionsTooltip.tsx
@@ -0,0 +1,61 @@
+import { Typography } from '@signozhq/ui/typography';
+
+import styles from './ConditionsTooltip.module.scss';
+
+interface ConditionsTooltipProps {
+ attributes: string[];
+ resource: string[];
+}
+
+function ConditionsTooltip({
+ attributes,
+ resource,
+}: ConditionsTooltipProps): JSX.Element {
+ const hasConditions = attributes.length > 0 || resource.length > 0;
+
+ if (!hasConditions) {
+ return (
+ <Typography.Text as="span" size="small" color="muted">
+ No conditions set up
+ </Typography.Text>
+ );
+ }
+
+ return (
+ <div
+ className={styles.conditionsTooltip}
+ data-testid="group-conditions-tooltip"
+ >
+ {attributes.length > 0 && (
+ <div className={styles.section}>
+ <Typography.Text as="span" size="small" color="muted">
+ Runs when a span attribute key contains
+ </Typography.Text>
+ <div className={styles.keyList}>
+ {attributes.map((key) => (
+ <code key={key} className={styles.key}>
+ {key}
+ </code>
+ ))}
+ </div>
+ </div>
+ )}
+ {resource.length > 0 && (
+ <div className={styles.section}>
+ <Typography.Text as="span" size="sm" color="muted">
+ {attributes.length > 0 ? 'or when' : 'Runs when'} a resource key contains
+ </Typography.Text>
+ <div className={styles.keyList}>
+ {resource.map((key) => (
+ <code key={key} className={styles.key}>
+ {key}
+ </code>
+ ))}
+ </div>
+ </div>
+ )}
+ </div>
+ );
+}
+
+export default ConditionsTooltip;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.module.scss
index d0a8341f93..94eefd83cc 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.module.scss
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.module.scss
@@ -7,6 +7,7 @@
.groupName {
color: var(--l1-foreground);
+ font-weight: var(--font-weight-semibold);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@@ -17,3 +18,15 @@
font-size: var(--font-size-xs);
white-space: nowrap;
}
+
+.conditionCount {
+ composes: groupCount;
+ display: inline-flex;
+ align-items: center;
+ gap: var(--spacing-2);
+ cursor: help;
+}
+
+.conditionInfoIcon {
+ color: var(--l3-foreground);
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.tsx
index 4fdb316b16..0f55fa8932 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeader/GroupHeader.tsx
@@ -1,10 +1,14 @@
+import { Info } from '@signozhq/icons';
+import { TooltipSimple } from '@signozhq/ui/tooltip';
import { Typography } from '@signozhq/ui/typography';
-import { MappingGroup } from 'container/LLMObservability/AttributeMapping/types';
+import { DraftGroup } from 'container/LLMObservability/AttributeMapping/types';
+
+import ConditionsTooltip from './ConditionsTooltip';
import styles from './GroupHeader.module.scss';
interface GroupHeaderProps {
- group: MappingGroup;
+ group: DraftGroup;
}
function GroupHeader({ group }: GroupHeaderProps): JSX.Element {
@@ -13,22 +17,33 @@ function GroupHeader({ group }: GroupHeaderProps): JSX.Element {
return (
<div
className={styles.groupHeaderLabel}
- data-testid={`group-expand-${group.id}`}
+ data-testid={`group-expand-${group.localId}`}
>
<Typography.Text
as="span"
className={styles.groupName}
- testId={`group-name-${group.id}`}
+ testId={`group-name-${group.localId}`}
>
{group.name}
</Typography.Text>
- <Typography.Text
- as="span"
- className={styles.groupCount}
- testId={`group-condition-count-${group.id}`}
+ <TooltipSimple
+ title={
+ <ConditionsTooltip
+ attributes={group.attributes}
+ resource={group.resource}
+ />
+ }
+ side="bottom"
+ align="start"
>
- · {conditionCount} {conditionCount === 1 ? 'condition' : 'conditions'}
- </Typography.Text>
+ <span
+ className={styles.conditionCount}
+ data-testid={`group-condition-count-${group.localId}`}
+ >
+ · {conditionCount} {conditionCount === 1 ? 'condition' : 'conditions'}
+ <Info size={12} className={styles.conditionInfoIcon} />
+ </span>
+ </TooltipSimple>
</div>
);
}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeaderActions/GroupHeaderActions.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeaderActions/GroupHeaderActions.tsx
index 341548f993..20b1aab431 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeaderActions/GroupHeaderActions.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeaderActions/GroupHeaderActions.tsx
@@ -1,13 +1,22 @@
import { Switch } from '@signozhq/ui/switch';
-import { MappingGroup } from 'container/LLMObservability/AttributeMapping/types';
+import { DraftGroup } from 'container/LLMObservability/AttributeMapping/types';
+import GroupActionsMenu from '../GroupActionsMenu/GroupActionsMenu';
import styles from './GroupHeaderActions.module.scss';
interface GroupHeaderActionsProps {
- group: MappingGroup;
+ group: DraftGroup;
+ onToggle: (localId: string, enabled: boolean) => void;
+ onEdit: (group: DraftGroup) => void;
+ onRemove: (localId: string) => void;
}
-function GroupHeaderActions({ group }: GroupHeaderActionsProps): JSX.Element {
+function GroupHeaderActions({
+ group,
+ onToggle,
+ onEdit,
+ onRemove,
+}: GroupHeaderActionsProps): JSX.Element {
return (
<div
className={styles.actions}
@@ -15,10 +24,10 @@ function GroupHeaderActions({ group }: GroupHeaderActionsProps): JSX.Element {
>
<Switch
value={group.enabled}
- // We don't yet support toggling a group's enabled state in this read-only PR, so disable the switch. A later PR will add the toggle handler and its drawer.
- disabled
- testId={`group-enabled-${group.id}`}
+ onChange={(checked): void => onToggle(group.localId, checked)}
+ testId={`group-enabled-${group.localId}`}
/>
+ <GroupActionsMenu group={group} onEdit={onEdit} onRemove={onRemove} />
</div>
);
}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupMappers/GroupMappers.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupMappers/GroupMappers.module.scss
index c56a9ec3ca..9b36e939d0 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupMappers/GroupMappers.module.scss
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupMappers/GroupMappers.module.scss
@@ -8,7 +8,26 @@
color: var(--l3-foreground);
}
+.stateContent {
+ display: inline-flex;
+ align-items: center;
+ gap: var(--spacing-2);
+
+ svg {
+ flex-shrink: 0;
+ }
+}
+
+.addMapperRow .stateCell {
+ padding-top: var(--spacing-2);
+ padding-bottom: var(--spacing-2);
+}
+
.stateCell {
padding: var(--spacing-4) var(--spacing-6) var(--spacing-4) var(--spacing-12);
font-size: var(--periscope-font-size-base);
}
+
+.addMapperCell {
+ padding: var(--spacing-4) var(--spacing-6) var(--spacing-4) var(--spacing-6);
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupMappers/GroupMappers.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupMappers/GroupMappers.tsx
index 32ea9f1ae8..0a05ccea32 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupMappers/GroupMappers.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupMappers/GroupMappers.tsx
@@ -1,14 +1,20 @@
+import { useEffect } from 'react';
+import { Button } from '@signozhq/ui/button';
+import { Typography } from '@signozhq/ui/typography';
+import { ArrowLeftRight, Plus, TriangleAlert } from '@signozhq/icons';
import { useListSpanMappers } from 'api/generated/services/spanmapper';
import { motion } from 'motion/react';
import {
- MappingGroup,
- Mapping,
+ DraftGroup,
+ DraftMapper,
+ Mapper,
} from 'container/LLMObservability/AttributeMapping/types';
-import { buildMappingsFromListResponse } from 'container/LLMObservability/AttributeMapping/utils';
+import { AttributeMappingEditor } from 'container/LLMObservability/AttributeMapping/hooks/useAttributeMappingEditor';
import { COLUMN_COUNT } from '../constants';
-import MapperRow, { MapperRowSkeleton } from '../MapperRow';
-import MappingsColgroup from '../MappingsColgroup';
+import MapperRow from '../MapperRow/MapperRow';
+import MapperRowSkeleton from '../MapperRow/MapperRowSkeleton';
+import MappingsColgroup from '../MappingsColgroup/MappingsColgroup';
import styles from './GroupMappers.module.scss';
const MAPPER_SKELETON_ROWS = 1;
@@ -19,72 +25,135 @@ const STATE_ROW_MOTION = {
transition: { duration: 0.18, ease: 'easeOut' },
} as const;
-interface StateRowProps {
- groupId: string;
+interface GroupMappersProps {
+ group: DraftGroup;
+ editor: AttributeMappingEditor;
+ onAddMapper: (groupLocalId: string) => void;
+ onEditMapper: (groupLocalId: string, mapper: DraftMapper) => void;
}
-function ErrorRow({ groupId }: StateRowProps): JSX.Element {
- return (
- <motion.tr className={styles.mapperStateRow} {...STATE_ROW_MOTION}>
+function GroupMappers({
+ group,
+ editor,
+ onAddMapper,
+ onEditMapper,
+}: GroupMappersProps): JSX.Element {
+ const { hydrateGroupMappers, removeMapper, toggleMapper } = editor;
+
+ const hasServerId = group.serverId !== null;
+ const { data, isLoading, isError } = useListSpanMappers(
+ { groupId: group.serverId ?? '' },
+ // refetchOnMount: false — the Collapse destroys inactive panels, so a
+ // group's mappers would otherwise refetch on every expand. Cached data is
+ // reused instead; the save flow evicts these caches so post-edit expands
+ // still fetch fresh.
+ { query: { enabled: hasServerId, refetchOnMount: false } },
+ );
+
+ useEffect(() => {
+ const items = data?.data?.items;
+ if (group.serverId && items) {
+ hydrateGroupMappers(group.serverId, items as unknown as Mapper[]);
+ }
+ }, [group.serverId, data, hydrateGroupMappers]);
+
+ const isLoadingMappers = hasServerId && isLoading;
+ const isErrorMappers = hasServerId && isError;
+ const mapperCount = group.mappers.length;
+
+ const skeletonRows = Array.from({ length: MAPPER_SKELETON_ROWS }).map(
+ (_, index) => (
+ // eslint-disable-next-line react/no-array-index-key
+ <MapperRowSkeleton key={`mapper-skeleton-${index}`} />
+ ),
+ );
+
+ const errorRow = (
+ <motion.tr
+ key="error"
+ className={styles.mapperStateRow}
+ {...STATE_ROW_MOTION}
+ >
<td
colSpan={COLUMN_COUNT}
className={styles.stateCell}
- data-testid={`mappers-error-${groupId}`}
+ data-testid={`mappers-error-${group.localId}`}
>
- Failed to load mappings. Please try again.
+ <span className={styles.stateContent}>
+ <TriangleAlert size={14} color="var(--danger-background)" />
+ <Typography.Text as="span" size="base">
+ Failed to load mappings. Please try again.
+ </Typography.Text>
+ </span>
</td>
</motion.tr>
);
-}
-function EmptyRow({ groupId }: StateRowProps): JSX.Element {
- return (
- <motion.tr className={styles.mapperStateRow} {...STATE_ROW_MOTION}>
+ const emptyRow = (
+ <motion.tr
+ key="empty"
+ className={styles.mapperStateRow}
+ {...STATE_ROW_MOTION}
+ >
<td
colSpan={COLUMN_COUNT}
className={styles.stateCell}
- data-testid={`mappers-empty-${groupId}`}
+ data-testid={`mappers-empty-${group.localId}`}
>
- No mappings in this group yet.
+ <span className={styles.stateContent}>
+ <ArrowLeftRight size={14} />
+ <Typography.Text as="span" size="base" color="muted">
+ No mappings in this group yet.
+ </Typography.Text>
+ </span>
</td>
</motion.tr>
);
-}
-
-interface GroupMappersProps {
- group: MappingGroup;
-}
-function GroupMappers({ group }: GroupMappersProps): JSX.Element {
- const {
- data: mappers = [],
- isLoading,
- isError,
- } = useListSpanMappers<Mapping[]>(
- {
- groupId: group.id,
- },
- {
- query: {
- refetchOnMount: false,
- select: buildMappingsFromListResponse,
- },
- },
+ const addMapperRow = (
+ <motion.tr
+ key="add-mapper"
+ className={styles.addMapperRow}
+ {...STATE_ROW_MOTION}
+ >
+ <td colSpan={COLUMN_COUNT} className={styles.addMapperCell}>
+ <Button
+ variant="link"
+ color="primary"
+ size="sm"
+ prefix={<Plus size={14} />}
+ onClick={(): void => onAddMapper(group.localId)}
+ testId={`add-mapper-${group.localId}`}
+ >
+ Add mapping
+ </Button>
+ </td>
+ </motion.tr>
);
+ const mapperRows = group.mappers.map((mapper, index) => (
+ <MapperRow
+ key={mapper.localId}
+ mapper={mapper}
+ index={index}
+ onEdit={(next): void => onEditMapper(group.localId, next)}
+ onRemove={(localId): void => removeMapper(group.localId, localId)}
+ onToggle={(localId, enabled): void =>
+ toggleMapper(group.localId, localId, enabled)
+ }
+ />
+ ));
+
+ // The add-mapping row trails every non-error state (including loading/empty).
let rows: JSX.Element[];
- if (isError) {
- rows = [<ErrorRow key="error" groupId={group.id} />];
- } else if (isLoading) {
- rows = Array.from({ length: MAPPER_SKELETON_ROWS }).map((_, index) => (
- <MapperRowSkeleton key={`mapper-skeleton-${index}`} />
- ));
- } else if (mappers.length === 0) {
- rows = [<EmptyRow key="empty" groupId={group.id} />];
+ if (isErrorMappers) {
+ rows = [errorRow];
+ } else if (isLoadingMappers && mapperCount === 0) {
+ rows = [...skeletonRows, addMapperRow];
+ } else if (mapperCount === 0) {
+ rows = [emptyRow, addMapperRow];
} else {
- rows = mappers.map((mapper, index) => (
- <MapperRow key={mapper.id} mapper={mapper} index={index} />
- ));
+ rows = [...mapperRows, addMapperRow];
}
return (
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperActionsMenu/MapperActionsMenu.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperActionsMenu/MapperActionsMenu.tsx
new file mode 100644
index 0000000000..9fd9d4c276
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperActionsMenu/MapperActionsMenu.tsx
@@ -0,0 +1,53 @@
+import { useMemo } from 'react';
+import { EllipsisVertical, Pencil, Trash2 } from '@signozhq/icons';
+import { Button } from '@signozhq/ui/button';
+import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+
+import type { DraftMapper } from 'container/LLMObservability/AttributeMapping/types';
+
+interface MapperActionsMenuProps {
+ mapper: DraftMapper;
+ onEdit: (mapper: DraftMapper) => void;
+ onRemove: (localId: string) => void;
+}
+
+function MapperActionsMenu({
+ mapper,
+ onEdit,
+ onRemove,
+}: MapperActionsMenuProps): JSX.Element {
+ const menuItems = useMemo<MenuItem[]>(
+ () => [
+ {
+ key: 'edit',
+ label: 'Edit',
+ icon: <Pencil size={14} />,
+ onClick: (): void => onEdit(mapper),
+ },
+ {
+ key: 'delete',
+ label: 'Delete',
+ danger: true,
+ icon: <Trash2 size={14} />,
+ onClick: (): void => onRemove(mapper.localId),
+ },
+ ],
+ [onEdit, onRemove, mapper],
+ );
+
+ return (
+ <DropdownMenuSimple menu={{ items: menuItems }} align="end">
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="icon"
+ aria-label="Mapping actions"
+ testId={`mapper-actions-${mapper.localId}`}
+ >
+ <EllipsisVertical size={16} />
+ </Button>
+ </DropdownMenuSimple>
+ );
+}
+
+export default MapperActionsMenu;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.module.scss
index 6e56390b43..f12622d9ae 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.module.scss
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.module.scss
@@ -11,11 +11,22 @@
font-size: var(--periscope-font-size-base);
}
-// Indent the first cell so mapper rows read as nested under their group.
.targetCell {
+ display: flex;
+ align-items: center;
+ gap: var(--spacing-3);
+ min-width: 0;
padding-left: var(--spacing-12);
}
+.targetName {
+ min-width: 0;
+}
+
+.targetContextBadge {
+ flex-shrink: 0;
+}
+
// Shorter vertical padding so the loading state reads as a compact placeholder.
.skeletonCell {
composes: cell;
@@ -29,7 +40,7 @@
}
}
-.statusCell {
+.actionsCell {
text-align: right;
}
@@ -47,6 +58,10 @@
gap: var(--spacing-3);
}
+.sourceChip {
+ font-family: var(--font-mono, monospace);
+}
+
.sourceChipText {
display: block;
max-width: 220px;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.tsx
index 13ca795d23..49f6c713f9 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.tsx
@@ -5,7 +5,8 @@ import { SpantypesFieldContextDTO } from 'api/generated/services/sigNoz.schemas'
import cx from 'classnames';
import { motion } from 'motion/react';
-import { Mapping } from 'container/LLMObservability/AttributeMapping/types';
+import { DraftMapper } from 'container/LLMObservability/AttributeMapping/types';
+import MapperActionsMenu from '../MapperActionsMenu/MapperActionsMenu';
import styles from './MapperRow.module.scss';
const MAX_VISIBLE_SOURCES = 3;
@@ -15,11 +16,20 @@ const MAX_STAGGERED_ROWS = 6;
const STAGGER_STEP = 0.03;
interface MapperRowProps {
- mapper: Mapping;
+ mapper: DraftMapper;
index: number;
+ onEdit: (mapper: DraftMapper) => void;
+ onRemove: (localId: string) => void;
+ onToggle: (localId: string, enabled: boolean) => void;
}
-function MapperRow({ mapper, index }: MapperRowProps): JSX.Element {
+function MapperRow({
+ mapper,
+ index,
+ onEdit,
+ onRemove,
+ onToggle,
+}: MapperRowProps): JSX.Element {
const sources = mapper.sources ?? [];
const visibleSources = sources.slice(0, MAX_VISIBLE_SOURCES);
const remainingSources = sources.length - visibleSources.length;
@@ -27,7 +37,7 @@ function MapperRow({ mapper, index }: MapperRowProps): JSX.Element {
return (
<motion.tr
className={styles.mapperRow}
- data-testid={`mapper-row-${mapper.id}`}
+ data-testid={`mapper-row-${mapper.localId}`}
initial={{ opacity: 0, y: -4 }}
animate={{ opacity: 1, y: 0 }}
transition={{
@@ -37,22 +47,38 @@ function MapperRow({ mapper, index }: MapperRowProps): JSX.Element {
>
<td className={cx(styles.cell, styles.targetCell)}>
<Typography.Text
+ weight="semibold"
truncate={1}
title={mapper.name}
- data-testid={`mapper-target-${mapper.id}`}
+ className={styles.targetName}
+ data-testid={`mapper-target-${mapper.localId}`}
>
{mapper.name}
</Typography.Text>
+ <Badge
+ color={
+ mapper.fieldContext === SpantypesFieldContextDTO.resource
+ ? 'amber'
+ : 'robin'
+ }
+ variant="outline"
+ className={styles.targetContextBadge}
+ >
+ {mapper.fieldContext}
+ </Badge>
</td>
<td className={styles.cell}>
{sources.length === 0 ? (
- <span className={styles.muted} data-testid={`mapper-sources-${mapper.id}`}>
+ <span
+ className={styles.muted}
+ data-testid={`mapper-sources-${mapper.localId}`}
+ >
—
</span>
) : (
<div
className={styles.sources}
- data-testid={`mapper-sources-${mapper.id}`}
+ data-testid={`mapper-sources-${mapper.localId}`}
>
{visibleSources.map((source) => (
<Badge
@@ -74,25 +100,14 @@ function MapperRow({ mapper, index }: MapperRowProps): JSX.Element {
</div>
)}
</td>
- <td className={styles.cell}>
- <Badge
- color={
- mapper.fieldContext === SpantypesFieldContextDTO.resource
- ? 'amber'
- : 'robin'
- }
- variant="outline"
- >
- {mapper.fieldContext}
- </Badge>
- </td>
- <td className={cx(styles.cell, styles.statusCell)}>
+ <td className={cx(styles.cell, styles.actionsCell)}>
<div className={styles.rowActions}>
<Switch
value={mapper.enabled}
- disabled
- testId={`mapper-enabled-${mapper.id}`}
+ onChange={(checked): void => onToggle(mapper.localId, checked)}
+ testId={`mapper-enabled-${mapper.localId}`}
/>
+ <MapperActionsMenu mapper={mapper} onEdit={onEdit} onRemove={onRemove} />
</div>
</td>
</motion.tr>
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRowSkeleton.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRowSkeleton.tsx
index 60bd8a0ed0..c5e13bdd66 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRowSkeleton.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRowSkeleton.tsx
@@ -8,6 +8,7 @@ function MapperRowSkeleton(): JSX.Element {
<tr className={styles.mapperRow}>
<td className={cx(styles.skeletonCell, styles.targetCell)}>
<Skeleton.Input active size="small" style={{ width: '55%' }} />
+ <Skeleton.Button active size="small" style={{ width: 72 }} />
</td>
<td className={styles.skeletonCell}>
<div className={styles.sources}>
@@ -15,10 +16,7 @@ function MapperRowSkeleton(): JSX.Element {
<Skeleton.Button active size="small" style={{ width: 56 }} />
</div>
</td>
- <td className={styles.skeletonCell}>
- <Skeleton.Button active size="small" style={{ width: 72 }} />
- </td>
- <td className={cx(styles.skeletonCell, styles.statusCell)}>
+ <td className={cx(styles.skeletonCell, styles.actionsCell)}>
<div className={styles.rowActions}>
<Skeleton.Button active size="small" shape="round" />
</div>
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsColgroup/MappingsColgroup.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsColgroup/MappingsColgroup.module.scss
index 38a08287c5..df2d0ac11c 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsColgroup/MappingsColgroup.module.scss
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsColgroup/MappingsColgroup.module.scss
@@ -2,10 +2,6 @@
width: 32%;
}
-.colWritesTo {
- width: 140px;
-}
-
-.colStatus {
- width: 120px;
+.colActions {
+ width: 176px;
}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsColgroup/MappingsColgroup.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsColgroup/MappingsColgroup.tsx
index 9713f1173e..872b4f3ba5 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsColgroup/MappingsColgroup.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsColgroup/MappingsColgroup.tsx
@@ -5,8 +5,7 @@ function MappingsColgroup(): JSX.Element {
<colgroup>
<col className={styles.colTarget} />
<col />
- <col className={styles.colWritesTo} />
- <col className={styles.colStatus} />
+ <col className={styles.colActions} />
</colgroup>
);
}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.module.scss
index f030aea816..6ceb8fff9c 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.module.scss
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.module.scss
@@ -1,3 +1,16 @@
+.tableWrapper {
+ display: flex;
+ flex-direction: column;
+ gap: var(--spacing-4);
+}
+
+.toolbar {
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ padding: var(--spacing-4);
+}
+
.table {
width: 100%;
border-collapse: collapse;
@@ -5,7 +18,7 @@
}
.headerRow {
- border-bottom: 1px solid var(--l2-border);
+ border-top: 1px solid var(--l2-border);
}
.headerCell {
@@ -73,7 +86,12 @@
}
}
-.tableEmpty {
+.tableState {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ gap: var(--spacing-3);
padding: var(--spacing-12) var(--spacing-6);
text-align: center;
color: var(--l3-foreground);
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.tsx b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.tsx
index e3ca1beec2..512bdb290e 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.tsx
@@ -1,30 +1,96 @@
-import { useState } from 'react';
-import { ChevronDown, ChevronRight } from '@signozhq/icons';
+import { useCallback, useState } from 'react';
+import { Button } from '@signozhq/ui/button';
+import { Typography } from '@signozhq/ui/typography';
+import { ChevronDown, ChevronRight, Layers, Plus } from '@signozhq/icons';
import { Collapse, type CollapseProps, Skeleton } from 'antd';
-import { AttributeMappingStore } from 'container/LLMObservability/AttributeMapping/AttributeMappingsTab/hooks/useAttributeMappingStore';
-import GroupHeader from './GroupHeader';
-import GroupHeaderActions from './GroupHeaderActions';
-import GroupMappers from './GroupMappers';
-import MappingsColgroup from './MappingsColgroup';
+import MapperFormDrawer from 'container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer';
+import { useMapperFormDrawer } from 'container/LLMObservability/AttributeMapping/components/MapperFormDrawer/hooks/useMapperFormDrawer';
+import {
+ DraftGroup,
+ DraftMapper,
+} from 'container/LLMObservability/AttributeMapping/types';
+import { AttributeMappingEditor } from 'container/LLMObservability/AttributeMapping/hooks/useAttributeMappingEditor';
+import GroupHeader from './GroupHeader/GroupHeader';
+import GroupHeaderActions from './GroupHeaderActions/GroupHeaderActions';
+import GroupMappers from './GroupMappers/GroupMappers';
+import MappingsColgroup from './MappingsColgroup/MappingsColgroup';
import styles from './MappingsTable.module.scss';
const SKELETON_ROW_COUNT = 3;
interface MappingsTableProps {
- store: AttributeMappingStore;
+ editor: AttributeMappingEditor;
+ onEditGroup: (group: DraftGroup) => void;
+ onAddGroup: () => void;
}
-function MappingsTable({ store }: MappingsTableProps): JSX.Element {
+function MappingsTable({
+ editor,
+ onEditGroup,
+ onAddGroup,
+}: MappingsTableProps): JSX.Element {
const [expandedGroups, setExpandedGroups] = useState<string[]>([]);
+ const [targetGroupId, setTargetGroupId] = useState<string | null>(null);
+ const drawer = useMapperFormDrawer();
- const isEmpty = !store.isLoading && store.groups.length === 0;
+ const { upsertMapper, removeMapper } = editor;
- const items: CollapseProps['items'] = store.groups.map((group) => ({
- key: group.id,
+ const handleAddMapper = useCallback(
+ (groupLocalId: string): void => {
+ setTargetGroupId(groupLocalId);
+ // Keep the group open so the staged row is visible after save.
+ setExpandedGroups((prev) =>
+ prev.includes(groupLocalId) ? prev : [...prev, groupLocalId],
+ );
+ drawer.openForAdd();
+ },
+ [drawer],
+ );
+
+ const handleEditMapper = useCallback(
+ (groupLocalId: string, mapper: DraftMapper): void => {
+ setTargetGroupId(groupLocalId);
+ drawer.openForEdit(mapper);
+ },
+ [drawer],
+ );
+
+ const handleSaveMapper = useCallback((): void => {
+ if (targetGroupId) {
+ upsertMapper(targetGroupId, drawer.draft);
+ }
+ drawer.close();
+ }, [targetGroupId, upsertMapper, drawer]);
+
+ const handleDeleteMapper = useCallback((): void => {
+ if (targetGroupId && drawer.draft.id) {
+ removeMapper(targetGroupId, drawer.draft.id);
+ }
+ drawer.close();
+ }, [targetGroupId, removeMapper, drawer]);
+
+ const isEmpty = !editor.isLoading && editor.groups.length === 0;
+
+ const items: CollapseProps['items'] = editor.groups.map((group) => ({
+ key: group.localId,
label: <GroupHeader group={group} />,
- extra: <GroupHeaderActions group={group} />,
- children: <GroupMappers group={group} />,
+ extra: (
+ <GroupHeaderActions
+ group={group}
+ onToggle={editor.toggleGroup}
+ onEdit={onEditGroup}
+ onRemove={editor.removeGroup}
+ />
+ ),
+ children: (
+ <GroupMappers
+ group={group}
+ editor={editor}
+ onAddMapper={handleAddMapper}
+ onEditMapper={handleEditMapper}
+ />
+ ),
}));
const skeletonBanners = (
@@ -45,48 +111,79 @@ function MappingsTable({ store }: MappingsTableProps): JSX.Element {
</div>
<div className={styles.skeletonGroupRight}>
<Skeleton.Button active size="small" shape="round" />
+ <Skeleton.Avatar active size={16} shape="square" />
</div>
</div>
))}
</div>
);
- if (isEmpty) {
- return (
- <div className={styles.tableEmpty} data-testid="mapper-groups-empty">
- No mapping groups yet.
+ return (
+ <div className={styles.tableWrapper}>
+ <div className={styles.toolbar}>
+ <Button
+ variant="link"
+ color="primary"
+ prefix={<Plus size={14} />}
+ onClick={onAddGroup}
+ testId="add-group-row"
+ disabled={editor.isLoading}
+ >
+ Add a new group
+ </Button>
</div>
- );
- }
- return (
- <div data-testid="mappings-table">
- <table className={styles.table}>
- <MappingsColgroup />
- <thead>
- <tr className={styles.headerRow}>
- <th className={styles.headerCell}>Target</th>
- <th className={styles.headerCell}>Sources</th>
- <th className={styles.headerCell}>Writes to</th>
- <th className={styles.headerCell}>Status</th>
- </tr>
- </thead>
- </table>
- {store.isLoading ? (
- skeletonBanners
+ {isEmpty ? (
+ <div className={styles.tableState} data-testid="mapper-groups-empty">
+ <Layers size={24} />
+ <Typography.Text as="span" size="base" color="muted">
+ No mapping groups yet.
+ </Typography.Text>
+ </div>
) : (
- <Collapse
- className={styles.groupsCollapse}
- activeKey={expandedGroups}
- onChange={(keys): void =>
- setExpandedGroups(Array.isArray(keys) ? keys : [keys])
- }
- bordered={false}
- destroyInactivePanel
- expandIcon={({ isActive }): JSX.Element =>
- isActive ? <ChevronDown size={14} /> : <ChevronRight size={14} />
- }
- items={items}
+ <div data-testid="mappings-table">
+ <table className={styles.table}>
+ <MappingsColgroup />
+ <thead>
+ <tr className={styles.headerRow}>
+ <th className={styles.headerCell}>Target</th>
+ <th className={styles.headerCell}>Sources</th>
+ <th className={styles.headerCell}>Actions</th>
+ </tr>
+ </thead>
+ </table>
+ {editor.isLoading ? (
+ skeletonBanners
+ ) : (
+ <Collapse
+ className={styles.groupsCollapse}
+ activeKey={expandedGroups}
+ onChange={(keys): void =>
+ setExpandedGroups(Array.isArray(keys) ? keys : [keys])
+ }
+ bordered={false}
+ destroyInactivePanel
+ expandIcon={({ isActive }): JSX.Element =>
+ isActive ? <ChevronDown size={14} /> : <ChevronRight size={14} />
+ }
+ items={items}
+ />
+ )}
+ </div>
+ )}
+
+ {drawer.isOpen && (
+ <MapperFormDrawer
+ isOpen={drawer.isOpen}
+ mode={drawer.mode}
+ draft={drawer.draft}
+ setDraft={drawer.setDraft}
+ onClose={drawer.close}
+ onSave={handleSaveMapper}
+ onDelete={handleDeleteMapper}
+ isSaving={false}
+ isDeleting={false}
+ saveError={null}
/>
)}
</div>
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/constants.ts b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/constants.ts
index 1ebf9d9c57..74f40f6e30 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/constants.ts
+++ b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/constants.ts
@@ -1 +1 @@
-export const COLUMN_COUNT = 4;
+export const COLUMN_COUNT = 3;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/hooks/useAttributeMappingStore.ts b/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/hooks/useAttributeMappingStore.ts
deleted file mode 100644
index a62ce43d1b..0000000000
--- a/frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/hooks/useAttributeMappingStore.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useMemo } from 'react';
-import { SpantypesSpanMapperGroupDTO } from 'api/generated/services/sigNoz.schemas';
-import { useListSpanMapperGroups } from 'api/generated/services/spanmapper';
-
-import { MappingGroup } from 'container/LLMObservability/AttributeMapping/types';
-import { buildMappingGroup } from 'container/LLMObservability/AttributeMapping/utils';
-
-export interface AttributeMappingStore {
- groups: MappingGroup[];
- isLoading: boolean;
- isError: boolean;
-}
-
-// Read-only store for the listing view: loads the server groups only. Each
-// group's mappers are fetched lazily when its panel is expanded (see
-// GroupMappers), so page load is a single request instead of an N+1 fan-out
-// across every group. Editing (enabled toggles, save/discard) and its drawers
-// land in a later PR — this PR only lists.
-export function useAttributeMappingStore(): AttributeMappingStore {
- const groupsQuery = useListSpanMapperGroups();
-
- const groups = useMemo<MappingGroup[]>(() => {
- const serverGroups: SpantypesSpanMapperGroupDTO[] =
- groupsQuery.data?.data?.items ?? [];
- return serverGroups.map((group) => buildMappingGroup(group));
- }, [groupsQuery.data]);
-
- return {
- groups,
- isLoading: groupsQuery.isLoading,
- isError: groupsQuery.isError,
- };
-}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.module.scss
index 579d402276..4f0224e6cf 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.module.scss
+++ b/frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.module.scss
@@ -1,6 +1,18 @@
.llmObservabilityAttributeMapping {
display: flex;
flex-direction: column;
- gap: var(--spacing-8);
- padding: var(--spacing-0);
+ gap: var(--spacing-4);
+ padding: var(--spacing-2) var(--spacing-2);
+
+ --tab-content-padding: 0;
+ --tab-text-color: var(--l1-foreground);
+ --tab-active-text-color: var(--l1-foreground);
+}
+
+.pageError {
+ padding: var(--padding-3) var(--padding-4);
+ border-radius: var(--radius-2);
+ background: var(--callout-error-background);
+ color: var(--callout-error-title);
+ font-size: var(--periscope-font-size-base);
}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.tsx b/frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.tsx
index 32c99930b5..bad600993f 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.tsx
@@ -1,17 +1,45 @@
+import { useCallback } from 'react';
+import { Divider } from '@signozhq/ui/divider';
import { Tabs } from '@signozhq/ui/tabs';
+import { useConfirmableAction } from 'hooks/useConfirmableAction';
-import AttributeMappingHeader from './components/AttributeMappingHeader';
+import AttributeMappingHeader from './components/AttributeMappingHeader/AttributeMappingHeader';
import AttributeMappingsTab from './AttributeMappingsTab/AttributeMappingsTab';
+import DiscardChangesDialog from './components/DiscardChangesDialog/DiscardChangesDialog';
+import GroupFormDrawer from './components/GroupFormDrawer/GroupFormDrawer';
import styles from './LLMObservabilityAttributeMapping.module.scss';
-
-const noop = (): void => undefined;
+import { useAttributeMappingEditor } from './hooks/useAttributeMappingEditor';
+import { useGroupFormDrawer } from './components/GroupFormDrawer/hooks/useGroupFormDrawer';
function LLMObservabilityAttributeMapping(): JSX.Element {
+ const editor = useAttributeMappingEditor();
+ const groupDrawer = useGroupFormDrawer();
+
+ const { discard } = editor;
+ // Discarding wipes the whole working copy, so gate it behind a confirm
+ // prompt rather than firing straight from the button.
+ const discardConfirm = useConfirmableAction(
+ useCallback(async (): Promise<void> => {
+ discard();
+ }, [discard]),
+ );
+
+ const handleGroupSave = useCallback((): void => {
+ editor.upsertGroup(groupDrawer.draft);
+ groupDrawer.close();
+ }, [editor, groupDrawer]);
+
const tabItems = [
{
key: 'attribute-mappings',
- label: 'Attribute mappings',
- children: <AttributeMappingsTab />,
+ label: 'Attribute Mappings',
+ children: (
+ <AttributeMappingsTab
+ editor={editor}
+ onEditGroup={groupDrawer.openForEdit}
+ onAddGroup={groupDrawer.openForAdd}
+ />
+ ),
},
{
key: 'test',
@@ -28,17 +56,39 @@ function LLMObservabilityAttributeMapping(): JSX.Element {
data-testid="llm-observability-attribute-mapping-page"
>
<AttributeMappingHeader
- isDirty={false}
- isSaving={false}
- onDiscard={noop}
- onSave={noop}
+ isDirty={editor.isDirty}
+ isSaving={editor.isSaving}
+ onDiscard={discardConfirm.request}
+ onSave={editor.save}
/>
+ {editor.saveError && (
+ <div className={styles.pageError} role="alert">
+ {editor.saveError}
+ </div>
+ )}
+ <Divider />
+
<Tabs
testId="attribute-mapping-tabs"
defaultValue="attribute-mappings"
items={tabItems}
/>
+ {groupDrawer.isOpen && (
+ <GroupFormDrawer
+ isOpen={groupDrawer.isOpen}
+ mode={groupDrawer.mode}
+ draft={groupDrawer.draft}
+ setDraft={groupDrawer.setDraft}
+ onClose={groupDrawer.close}
+ onSave={handleGroupSave}
+ />
+ )}
+ <DiscardChangesDialog
+ open={discardConfirm.open}
+ onConfirm={discardConfirm.confirm}
+ onCancel={discardConfirm.cancel}
+ />
</div>
);
}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/__tests__/LLMObservabilityAttributeMapping.test.tsx b/frontend/src/container/LLMObservability/AttributeMapping/__tests__/LLMObservabilityAttributeMapping.test.tsx
index 3cc1c723a2..855d024658 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/__tests__/LLMObservabilityAttributeMapping.test.tsx
+++ b/frontend/src/container/LLMObservability/AttributeMapping/__tests__/LLMObservabilityAttributeMapping.test.tsx
@@ -1,5 +1,5 @@
import { rest, server } from 'mocks-server/server';
-import { render, screen } from 'tests/test-utils';
+import { render, screen, userEvent, waitFor } from 'tests/test-utils';
import LLMObservabilityAttributeMapping from '../LLMObservabilityAttributeMapping';
import { GROUPS_ENDPOINT, makeGroupsResponse, mockGroups } from './fixtures';
@@ -34,7 +34,7 @@ describe('LLMObservabilityAttributeMapping', () => {
render(<LLMObservabilityAttributeMapping />);
expect(
- screen.getByRole('tab', { name: 'Attribute mappings' }),
+ screen.getByRole('tab', { name: 'Attribute Mappings' }),
).toBeInTheDocument();
expect(screen.getByRole('tab', { name: 'Test' })).toBeInTheDocument();
});
@@ -43,7 +43,7 @@ describe('LLMObservabilityAttributeMapping', () => {
render(<LLMObservabilityAttributeMapping />);
const attributeMappingsTab = screen.getByRole('tab', {
- name: 'Attribute mappings',
+ name: 'Attribute Mappings',
});
expect(attributeMappingsTab).toHaveAttribute('data-state', 'active');
await expect(
@@ -64,4 +64,44 @@ describe('LLMObservabilityAttributeMapping', () => {
expect(screen.queryByTestId('discard-changes-btn')).not.toBeInTheDocument();
expect(screen.queryByTestId('unsaved-changes')).not.toBeInTheDocument();
});
+
+ it('prompts before discarding, then reverts staged changes on confirm', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ render(<LLMObservabilityAttributeMapping />);
+
+ const toggle = await screen.findByTestId('group-enabled-group-1');
+ expect(toggle).toBeChecked();
+ await user.click(toggle);
+ expect(screen.getByTestId('group-enabled-group-1')).not.toBeChecked();
+
+ await user.click(screen.getByTestId('discard-changes-btn'));
+ const confirmBtn = await screen.findByTestId('discard-changes-confirm-btn');
+ expect(screen.getByTestId('group-enabled-group-1')).not.toBeChecked();
+
+ await user.click(confirmBtn);
+
+ await waitFor(() =>
+ expect(screen.getByTestId('group-enabled-group-1')).toBeChecked(),
+ );
+ expect(screen.queryByTestId('discard-changes-btn')).not.toBeInTheDocument();
+ });
+
+ it('keeps staged changes when the discard prompt is dismissed', async () => {
+ const user = userEvent.setup({ pointerEventsCheck: 0 });
+ render(<LLMObservabilityAttributeMapping />);
+
+ const toggle = await screen.findByTestId('group-enabled-group-1');
+ await user.click(toggle);
+
+ await user.click(screen.getByTestId('discard-changes-btn'));
+ await user.click(await screen.findByTestId('discard-changes-cancel-btn'));
+
+ await waitFor(() =>
+ expect(
+ screen.queryByTestId('discard-changes-confirm-btn'),
+ ).not.toBeInTheDocument(),
+ );
+ expect(screen.getByTestId('group-enabled-group-1')).not.toBeChecked();
+ expect(screen.getByTestId('discard-changes-btn')).toBeInTheDocument();
+ });
});
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/AttributeMappingHeader.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/AttributeMappingHeader.module.scss
index 54f3411823..c5a8889317 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/AttributeMappingHeader.module.scss
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/AttributeMappingHeader.module.scss
@@ -2,7 +2,8 @@
display: flex;
align-items: flex-start;
justify-content: space-between;
- gap: var(--spacing-8);
+ margin-left: var(--spacing-2);
+ margin-top: var(--spacing-4);
}
.pageHeaderActions {
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/index.ts b/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/index.ts
deleted file mode 100644
index bb6afb4d2d..0000000000
--- a/frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './AttributeMappingHeader';
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/DiscardChangesDialog/DiscardChangesDialog.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/DiscardChangesDialog/DiscardChangesDialog.tsx
new file mode 100644
index 0000000000..892a84bad3
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/DiscardChangesDialog/DiscardChangesDialog.tsx
@@ -0,0 +1,56 @@
+import { AlertDialog } from '@signozhq/ui/alert-dialog';
+import { Button } from '@signozhq/ui/button';
+import { Trash2, X } from '@signozhq/icons';
+
+interface DiscardChangesDialogProps {
+ open: boolean;
+ onConfirm: () => void;
+ onCancel: () => void;
+}
+
+function DiscardChangesDialog({
+ open,
+ onConfirm,
+ onCancel,
+}: DiscardChangesDialogProps): JSX.Element {
+ return (
+ <AlertDialog
+ open={open}
+ onOpenChange={(isOpen): void => {
+ if (!isOpen) {
+ onCancel();
+ }
+ }}
+ width="narrow"
+ title="Discard unsaved changes?"
+ titleIcon={<Trash2 size={16} />}
+ footer={
+ <>
+ <Button
+ variant="solid"
+ color="secondary"
+ onClick={onCancel}
+ prefix={<X size={12} />}
+ testId="discard-changes-cancel-btn"
+ >
+ Keep editing
+ </Button>
+ <Button
+ variant="solid"
+ color="destructive"
+ onClick={onConfirm}
+ prefix={<Trash2 size={12} />}
+ testId="discard-changes-confirm-btn"
+ >
+ Discard changes
+ </Button>
+ </>
+ }
+ >
+ This reverts every unsaved group and mapping change back to the last saved
+ state. This action cannot be undone.
+ </AlertDialog>
+ );
+}
+
+export default DiscardChangesDialog;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/GroupFormDrawer.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/GroupFormDrawer.module.scss
new file mode 100644
index 0000000000..c9ccf0c95d
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/GroupFormDrawer.module.scss
@@ -0,0 +1,39 @@
+.groupForm {
+ display: flex;
+ flex-direction: column;
+ gap: var(--spacing-10);
+ padding: var(--spacing-2) 0;
+}
+
+.groupFormField {
+ display: flex;
+ flex-direction: column;
+ gap: var(--spacing-4);
+}
+
+.groupFormFieldRow {
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.groupFormLabel {
+ font-size: var(--font-size-xs);
+ font-weight: var(--font-weight-semibold);
+ text-transform: uppercase;
+ letter-spacing: 0.04em;
+ color: var(--l3-foreground);
+}
+
+.groupFormHint {
+ font-size: var(--font-size-xs);
+ color: var(--l3-foreground);
+}
+
+.groupFormFooter {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ width: 100%;
+ gap: var(--spacing-4);
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/GroupFormDrawer.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/GroupFormDrawer.tsx
new file mode 100644
index 0000000000..9066537d20
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/GroupFormDrawer.tsx
@@ -0,0 +1,117 @@
+import { Button } from '@signozhq/ui/button';
+import { DrawerWrapper } from '@signozhq/ui/drawer';
+import { Input } from '@signozhq/ui/input';
+import { Switch } from '@signozhq/ui/switch';
+
+import ConditionKeyList from './components/ConditionKeyList/ConditionKeyList';
+import styles from './GroupFormDrawer.module.scss';
+import { FieldContext, GroupDraft, MapperDraftMode } from '../../types';
+import { isGroupDraftValid } from '../../utils';
+
+interface GroupFormDrawerProps {
+ isOpen: boolean;
+ mode: MapperDraftMode;
+ draft: GroupDraft;
+ setDraft: (next: GroupDraft) => void;
+ onClose: () => void;
+ onSave: () => void;
+}
+
+function GroupFormDrawer({
+ isOpen,
+ mode,
+ draft,
+ setDraft,
+ onClose,
+ onSave,
+}: GroupFormDrawerProps): JSX.Element {
+ const isEdit = mode === 'edit';
+ const isValid = isGroupDraftValid(draft);
+
+ return (
+ <DrawerWrapper
+ open={isOpen}
+ onOpenChange={(open): void => {
+ if (!open) {
+ onClose();
+ }
+ }}
+ title={isEdit ? 'Edit group' : 'New group'}
+ subTitle="A group gates which spans its mappings run on"
+ width="wide"
+ testId="group-form-drawer"
+ footer={
+ <div className={styles.groupFormFooter}>
+ <Button
+ variant="ghost"
+ color="secondary"
+ onClick={onClose}
+ testId="group-form-cancel"
+ >
+ Cancel
+ </Button>
+ <Button
+ variant="solid"
+ color="primary"
+ onClick={onSave}
+ disabled={!isValid}
+ testId="group-form-save"
+ >
+ {isEdit ? 'Save group' : 'Create group'}
+ </Button>
+ </div>
+ }
+ >
+ <div className={styles.groupForm}>
+ <div className={styles.groupFormField}>
+ <span className={styles.groupFormLabel}>Group Name</span>
+ <Input
+ placeholder="e.g. OpenAI gateway"
+ value={draft.name}
+ onChange={(event): void =>
+ setDraft({ ...draft, name: event.target.value })
+ }
+ testId="group-form-name"
+ />
+ </div>
+
+ <div className={`${styles.groupFormField} ${styles.groupFormFieldRow}`}>
+ <span className={styles.groupFormLabel}>Enabled</span>
+ <Switch
+ value={draft.enabled}
+ onChange={(checked): void => setDraft({ ...draft, enabled: checked })}
+ testId="group-form-enabled"
+ />
+ </div>
+
+ <ConditionKeyList
+ label="Condition · span attribute keys"
+ labelHint="·Runs when a span attribute key contains any of these"
+ keys={draft.attributes}
+ placeholder="e.g. gen_ai."
+ addLabel="Add attribute key"
+ testIdPrefix="group-form-attribute"
+ fieldContext={FieldContext.attribute}
+ onChange={(attributes): void => setDraft({ ...draft, attributes })}
+ />
+
+ <ConditionKeyList
+ label="Condition · resource keys"
+ labelHint="·Or when a resource key contains any of these"
+ keys={draft.resource}
+ placeholder="e.g. service.name"
+ addLabel="Add resource key"
+ testIdPrefix="group-form-resource"
+ fieldContext={FieldContext.resource}
+ onChange={(resource): void => setDraft({ ...draft, resource })}
+ />
+
+ <span className={styles.groupFormHint}>
+ Leave both empty to run this group on every span.
+ </span>
+ </div>
+ </DrawerWrapper>
+ );
+}
+
+export default GroupFormDrawer;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/components/ConditionKeyList/ConditionKeyList.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/components/ConditionKeyList/ConditionKeyList.module.scss
new file mode 100644
index 0000000000..edc7495320
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/components/ConditionKeyList/ConditionKeyList.module.scss
@@ -0,0 +1,35 @@
+.field {
+ display: flex;
+ flex-direction: column;
+ gap: var(--spacing-4);
+}
+
+.label {
+ font-size: var(--font-size-xs);
+ font-weight: var(--font-weight-semibold);
+ text-transform: uppercase;
+ letter-spacing: 0.04em;
+ color: var(--l3-foreground);
+}
+
+.labelHint {
+ font-weight: var(--font-weight-normal);
+ text-transform: none;
+ letter-spacing: normal;
+}
+
+.keys {
+ display: flex;
+ flex-direction: column;
+ gap: var(--spacing-4);
+}
+
+.keyRow {
+ display: flex;
+ align-items: center;
+ gap: var(--spacing-3);
+}
+
+.keyInput {
+ flex: 1;
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/components/ConditionKeyList/ConditionKeyList.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/components/ConditionKeyList/ConditionKeyList.tsx
new file mode 100644
index 0000000000..b7765097ad
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/components/ConditionKeyList/ConditionKeyList.tsx
@@ -0,0 +1,89 @@
+import { Button } from '@signozhq/ui/button';
+import { Plus, X } from '@signozhq/icons';
+
+import { FieldContextValue } from 'container/LLMObservability/AttributeMapping/types';
+import KeySearchInput from '../../../KeySearchInput/KeySearchInput';
+import styles from './ConditionKeyList.module.scss';
+
+interface ConditionKeyListProps {
+ label: string;
+ labelHint?: string;
+ keys: string[];
+ placeholder: string;
+ addLabel: string;
+ testIdPrefix: string;
+ fieldContext: FieldContextValue;
+ onChange: (keys: string[]) => void;
+}
+
+function ConditionKeyList({
+ label,
+ labelHint,
+ keys,
+ placeholder,
+ addLabel,
+ testIdPrefix,
+ fieldContext,
+ onChange,
+}: ConditionKeyListProps): JSX.Element {
+ const updateKey = (index: number, value: string): void => {
+ onChange(keys.map((key, i) => (i === index ? value : key)));
+ };
+
+ const addKey = (): void => {
+ onChange([...keys, '']);
+ };
+
+ const removeKey = (index: number): void => {
+ onChange(keys.filter((_, i) => i !== index));
+ };
+
+ return (
+ <div className={styles.field}>
+ <span className={styles.label}>
+ {label}
+ {labelHint && <span className={styles.labelHint}> {labelHint}</span>}
+ </span>
+
+ {keys.length > 0 && (
+ <div className={styles.keys}>
+ {keys.map((key, index) => (
+ // eslint-disable-next-line react/no-array-index-key
+ <div className={styles.keyRow} key={index}>
+ <KeySearchInput
+ className={styles.keyInput}
+ placeholder={placeholder}
+ value={key}
+ fieldContext={fieldContext}
+ onChange={(next): void => updateKey(index, next)}
+ testId={`${testIdPrefix}-${index}`}
+ />
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="icon"
+ aria-label="Remove key"
+ onClick={(): void => removeKey(index)}
+ testId={`${testIdPrefix}-remove-${index}`}
+ >
+ <X size={14} />
+ </Button>
+ </div>
+ ))}
+ </div>
+ )}
+
+ <Button
+ variant="dashed"
+ color="secondary"
+ prefix={<Plus size={14} />}
+ onClick={addKey}
+ testId={`${testIdPrefix}-add`}
+ >
+ {addLabel}
+ </Button>
+ </div>
+ );
+}
+
+export default ConditionKeyList;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/hooks/useGroupFormDrawer.ts b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/hooks/useGroupFormDrawer.ts
new file mode 100644
index 0000000000..97edbecd5a
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/GroupFormDrawer/hooks/useGroupFormDrawer.ts
@@ -0,0 +1,38 @@
+import { useCallback, useState } from 'react';
+
+import { DraftGroup, GroupDraft, MapperDraftMode } from '../../../types';
+import { EMPTY_GROUP_DRAFT, groupDraftFromNode } from '../../../utils';
+
+interface UseGroupFormDrawer {
+ isOpen: boolean;
+ mode: MapperDraftMode;
+ draft: GroupDraft;
+ setDraft: (next: GroupDraft) => void;
+ openForAdd: () => void;
+ openForEdit: (group: DraftGroup) => void;
+ close: () => void;
+}
+
+export function useGroupFormDrawer(): UseGroupFormDrawer {
+ const [isOpen, setIsOpen] = useState<boolean>(false);
+ const [mode, setMode] = useState<MapperDraftMode>('add');
+ const [draft, setDraft] = useState<GroupDraft>(EMPTY_GROUP_DRAFT);
+
+ const openForAdd = useCallback((): void => {
+ setMode('add');
+ setDraft(EMPTY_GROUP_DRAFT);
+ setIsOpen(true);
+ }, []);
+
+ const openForEdit = useCallback((group: DraftGroup): void => {
+ setMode('edit');
+ setDraft(groupDraftFromNode(group));
+ setIsOpen(true);
+ }, []);
+
+ const close = useCallback((): void => {
+ setIsOpen(false);
+ }, []);
+
+ return { isOpen, mode, draft, setDraft, openForAdd, openForEdit, close };
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/KeySearchInput/KeySearchInput.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/components/KeySearchInput/KeySearchInput.module.scss
new file mode 100644
index 0000000000..72c61ee73d
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/KeySearchInput/KeySearchInput.module.scss
@@ -0,0 +1,49 @@
+.keySearch {
+ position: relative;
+ flex: 1;
+ min-width: 0;
+}
+
+.keySearchDropdown {
+ position: absolute;
+ top: calc(100% + var(--spacing-2));
+ left: 0;
+ z-index: 20;
+ width: 100%;
+ max-height: 240px;
+ overflow-x: hidden;
+ overflow-y: auto;
+ padding: var(--spacing-2);
+ border: 1px solid var(--l2-border);
+ border-radius: 6px;
+ background: var(--l2-background);
+ box-shadow: 0 8px 24px
+ color-mix(in srgb, var(--bg-base-black) 40%, transparent);
+}
+
+.keySearchDropdownEmpty {
+ padding: var(--spacing-4) var(--spacing-5);
+ font-size: var(--font-size-xs);
+ color: var(--l3-foreground);
+}
+
+.keySearchOption {
+ display: block;
+ width: 100%;
+ max-width: 100%;
+ padding: var(--spacing-3) var(--spacing-5);
+ border: none;
+ border-radius: 3px;
+ background: transparent;
+ color: var(--l1-foreground);
+ font-size: var(--font-size-xs);
+ text-align: left;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ cursor: pointer;
+
+ &:hover {
+ background: var(--l2-background-hover);
+ }
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/KeySearchInput/KeySearchInput.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/KeySearchInput/KeySearchInput.tsx
new file mode 100644
index 0000000000..0f5c504b9f
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/KeySearchInput/KeySearchInput.tsx
@@ -0,0 +1,121 @@
+import { useMemo, useState } from 'react';
+import { Input } from '@signozhq/ui/input';
+import { useGetFieldsKeys } from 'api/generated/services/fields';
+import {
+ TelemetrytypesFieldContextDTO,
+ TelemetrytypesSignalDTO,
+} from 'api/generated/services/sigNoz.schemas';
+import cx from 'classnames';
+import Spinner from 'components/Spinner';
+import useDebounce from 'hooks/useDebounce';
+
+import {
+ FieldContext,
+ FieldContextValue,
+} from 'container/LLMObservability/AttributeMapping/types';
+import styles from './KeySearchInput.module.scss';
+
+const SUGGESTION_LIMIT = 50;
+const DEBOUNCE_MS = 300;
+
+interface KeySearchInputProps {
+ value: string;
+ fieldContext: FieldContextValue;
+ placeholder?: string;
+ className?: string;
+ disabled?: boolean;
+ testId?: string;
+ onChange: (value: string) => void;
+}
+
+// Maps the mapper's attribute/resource context to the fields-endpoint context.
+function toFieldsContext(
+ context: FieldContextValue,
+): TelemetrytypesFieldContextDTO {
+ return context === FieldContext.resource
+ ? TelemetrytypesFieldContextDTO.resource
+ : TelemetrytypesFieldContextDTO.attribute;
+}
+
+// Free-text input with span/resource key suggestions from /api/v1/fields/keys
+// (signal=traces). Typing keeps the custom value; suggestions are assistive.
+function KeySearchInput({
+ value,
+ fieldContext,
+ placeholder,
+ className,
+ disabled,
+ testId,
+ onChange,
+}: KeySearchInputProps): JSX.Element {
+ const [isOpen, setIsOpen] = useState(false);
+ const debouncedSearch = useDebounce(value, DEBOUNCE_MS);
+
+ const { data, isFetching } = useGetFieldsKeys(
+ {
+ signal: TelemetrytypesSignalDTO.traces,
+ fieldContext: toFieldsContext(fieldContext),
+ searchText: debouncedSearch,
+ limit: SUGGESTION_LIMIT,
+ },
+ { query: { enabled: isOpen && !disabled, keepPreviousData: true } },
+ );
+
+ const suggestions = useMemo(() => {
+ const keys = data?.data?.keys ?? {};
+ return Object.keys(keys)
+ .filter((key) => key !== value)
+ .slice(0, SUGGESTION_LIMIT);
+ }, [data, value]);
+
+ return (
+ <div className={cx(styles.keySearch, className)}>
+ <Input
+ placeholder={placeholder}
+ value={value}
+ disabled={disabled}
+ autoComplete="off"
+ onChange={(event): void => {
+ onChange(event.target.value);
+ setIsOpen(true);
+ }}
+ onFocus={(): void => setIsOpen(true)}
+ onBlur={(): void => setIsOpen(false)}
+ testId={testId}
+ />
+ {isOpen && suggestions.length > 0 && (
+ <div
+ className={styles.keySearchDropdown}
+ data-testid={`${testId}-dropdown`}
+ >
+ {suggestions.map((name) => (
+ <button
+ type="button"
+ key={name}
+ className={styles.keySearchOption}
+ title={name}
+ // onMouseDown (not onClick) so selection runs before the input blur.
+ onMouseDown={(event): void => {
+ event.preventDefault();
+ onChange(name);
+ setIsOpen(false);
+ }}
+ data-testid={`${testId}-option-${name}`}
+ >
+ {name}
+ </button>
+ ))}
+ </div>
+ )}
+ {isOpen && isFetching && suggestions.length === 0 && (
+ <div
+ className={cx(styles.keySearchDropdown, styles.keySearchDropdownEmpty)}
+ >
+ <Spinner size="small" height="auto" />
+ </div>
+ )}
+ </div>
+ );
+}
+
+export default KeySearchInput;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer.module.scss
new file mode 100644
index 0000000000..4bb86def54
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer.module.scss
@@ -0,0 +1,63 @@
+.form {
+ display: flex;
+ flex-direction: column;
+ gap: var(--spacing-10);
+ padding: var(--spacing-2) 0;
+}
+
+.field {
+ display: flex;
+ flex-direction: column;
+ gap: var(--spacing-4);
+}
+
+.label {
+ font-size: var(--font-size-xs);
+ font-weight: var(--font-weight-semibold);
+ text-transform: uppercase;
+ letter-spacing: 0.04em;
+ color: var(--l3-foreground);
+}
+
+.labelHint {
+ font-weight: var(--font-weight-normal);
+ text-transform: none;
+ letter-spacing: normal;
+}
+
+.hint {
+ font-size: var(--font-size-xs);
+ color: var(--l3-foreground);
+}
+
+.fieldContext {
+ width: 200px;
+}
+
+.sources {
+ display: flex;
+ flex-direction: column;
+ gap: var(--spacing-4);
+}
+
+.error {
+ padding: var(--spacing-5) var(--spacing-6);
+ border-radius: var(--radius-2);
+ background: var(--callout-error-background);
+ color: var(--callout-error-title);
+ font-size: var(--periscope-font-size-base);
+}
+
+.footer {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 100%;
+ gap: var(--spacing-4);
+}
+
+.footerActions {
+ display: flex;
+ gap: var(--spacing-4);
+ margin-left: auto;
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer.tsx
new file mode 100644
index 0000000000..bb99c1fe8e
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/MapperFormDrawer.tsx
@@ -0,0 +1,252 @@
+import { useState } from 'react';
+import { Button } from '@signozhq/ui/button';
+import { DrawerWrapper } from '@signozhq/ui/drawer';
+import { SelectSimple } from '@signozhq/ui/select';
+import {
+ closestCenter,
+ DndContext,
+ DragEndEvent,
+ PointerSensor,
+ useSensor,
+ useSensors,
+} from '@dnd-kit/core';
+import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
+import {
+ arrayMove,
+ SortableContext,
+ verticalListSortingStrategy,
+} from '@dnd-kit/sortable';
+import { Plus, Trash2 } from '@signozhq/icons';
+import { v4 as uuid } from 'uuid';
+
+import KeySearchInput from '../KeySearchInput/KeySearchInput';
+import styles from './MapperFormDrawer.module.scss';
+import SourceAttributeRow from './components/SourceAttributeRow/SourceAttributeRow';
+import {
+ FieldContext,
+ FieldContextValue,
+ MapperDraft,
+ MapperDraftMode,
+ SourceConfig,
+} from '../../types';
+import { createEmptySource, isMapperDraftValid } from '../../utils';
+
+const FIELD_CONTEXT_OPTIONS = [
+ { value: FieldContext.attribute, label: 'Span attribute' },
+ { value: FieldContext.resource, label: 'Resource' },
+];
+
+interface MapperFormDrawerProps {
+ isOpen: boolean;
+ mode: MapperDraftMode;
+ draft: MapperDraft;
+ setDraft: (next: MapperDraft) => void;
+ onClose: () => void;
+ onSave: () => void;
+ onDelete: () => void;
+ isSaving: boolean;
+ isDeleting: boolean;
+ saveError: string | null;
+}
+
+function MapperFormDrawer({
+ isOpen,
+ mode,
+ draft,
+ setDraft,
+ onClose,
+ onSave,
+ onDelete,
+ isSaving,
+ isDeleting,
+ saveError,
+}: MapperFormDrawerProps): JSX.Element {
+ const isEdit = mode === 'edit';
+ const isValid = isMapperDraftValid(draft);
+
+ const [rowIds, setRowIds] = useState<string[]>(() =>
+ draft.sources.map(() => uuid()),
+ );
+ const sourceIds = draft.sources.map(
+ (_, index) => rowIds[index] ?? `pending-${index}`,
+ );
+
+ const sensors = useSensors(
+ useSensor(PointerSensor, { activationConstraint: { distance: 5 } }),
+ );
+
+ const updateSource = (index: number, patch: Partial<SourceConfig>): void => {
+ const sources = draft.sources.map((source, i) =>
+ i === index ? { ...source, ...patch } : source,
+ );
+ setDraft({ ...draft, sources });
+ };
+
+ const addSource = (): void => {
+ setDraft({ ...draft, sources: [...draft.sources, createEmptySource()] });
+ setRowIds((prev) => [...prev, uuid()]);
+ };
+
+ const removeSource = (index: number): void => {
+ const sources = draft.sources.filter((_, i) => i !== index);
+ if (sources.length === 0) {
+ setDraft({ ...draft, sources: [createEmptySource()] });
+ setRowIds([uuid()]);
+ return;
+ }
+ setDraft({ ...draft, sources });
+ setRowIds((prev) => prev.filter((_, i) => i !== index));
+ };
+
+ const handleDragEnd = (event: DragEndEvent): void => {
+ const { active, over } = event;
+ if (!over || active.id === over.id) {
+ return;
+ }
+ const from = sourceIds.indexOf(String(active.id));
+ const to = sourceIds.indexOf(String(over.id));
+ if (from === -1 || to === -1) {
+ return;
+ }
+ setDraft({ ...draft, sources: arrayMove(draft.sources, from, to) });
+ setRowIds((prev) => arrayMove(prev, from, to));
+ };
+
+ return (
+ <DrawerWrapper
+ open={isOpen}
+ onOpenChange={(open): void => {
+ if (!open) {
+ onClose();
+ }
+ }}
+ title={isEdit ? 'Edit mapping' : 'New custom mapping'}
+ subTitle="Map source attributes onto a canonical target attribute"
+ width="wide"
+ testId="mapper-form-drawer"
+ footer={
+ <div className={styles.footer}>
+ {isEdit && (
+ <Button
+ variant="ghost"
+ color="destructive"
+ prefix={<Trash2 size={14} />}
+ onClick={onDelete}
+ disabled={isDeleting}
+ testId="mapper-form-delete"
+ >
+ {isDeleting ? 'Deleting…' : 'Delete'}
+ </Button>
+ )}
+ <div className={styles.footerActions}>
+ <Button
+ variant="ghost"
+ color="secondary"
+ onClick={onClose}
+ testId="mapper-form-cancel"
+ >
+ Cancel
+ </Button>
+ <Button
+ variant="solid"
+ color="primary"
+ onClick={onSave}
+ disabled={!isValid || isSaving}
+ testId="mapper-form-save"
+ >
+ {/* eslint-disable-next-line no-nested-ternary */}
+ {isSaving ? 'Saving…' : isEdit ? 'Save mapping' : 'Create mapping'}
+ </Button>
+ </div>
+ </div>
+ }
+ >
+ <div className={styles.form}>
+ <div className={styles.field}>
+ <span className={styles.label}>Target attribute</span>
+ <KeySearchInput
+ placeholder="e.g. gen_ai.content.prompt"
+ value={draft.name}
+ fieldContext={draft.fieldContext}
+ disabled={isEdit}
+ onChange={(name): void => setDraft({ ...draft, name })}
+ testId="mapper-form-target"
+ />
+ {isEdit && (
+ <span className={styles.hint}>
+ The target attribute can&apos;t be changed after creation.
+ </span>
+ )}
+ </div>
+
+ <div className={styles.field}>
+ <span className={styles.label}>Write target to</span>
+ <SelectSimple
+ className={styles.fieldContext}
+ items={FIELD_CONTEXT_OPTIONS}
+ value={draft.fieldContext}
+ withPortal={false}
+ onChange={(next): void =>
+ setDraft({ ...draft, fieldContext: next as FieldContextValue })
+ }
+ testId="mapper-form-field-context"
+ />
+ <span className={styles.hint}>
+ Where the standardized attribute is written.
+ </span>
+ </div>
+
+ <div className={styles.field}>
+ <span className={styles.label}>
+ Source attributes
+ <span className={styles.labelHint}>
+ {' '}
+ · priority: top → bottom · drag to reorder
+ </span>
+ </span>
+
+ <DndContext
+ sensors={sensors}
+ collisionDetection={closestCenter}
+ modifiers={[restrictToVerticalAxis]}
+ onDragEnd={handleDragEnd}
+ >
+ <SortableContext items={sourceIds} strategy={verticalListSortingStrategy}>
+ <div className={styles.sources}>
+ {draft.sources.map((source, index) => (
+ <SourceAttributeRow
+ key={sourceIds[index]}
+ id={sourceIds[index]}
+ index={index}
+ value={source}
+ canRemove={draft.sources.length > 1}
+ onChange={updateSource}
+ onRemove={removeSource}
+ />
+ ))}
+ </div>
+ </SortableContext>
+ </DndContext>
+
+ <Button
+ variant="dashed"
+ color="secondary"
+ prefix={<Plus size={14} />}
+ onClick={addSource}
+ testId="mapper-form-add-source"
+ >
+ Add another source
+ </Button>
+ </div>
+
+ {saveError && (
+ <div className={styles.error} role="alert">
+ {saveError}
+ </div>
+ )}
+ </div>
+ </DrawerWrapper>
+ );
+}
+
+export default MapperFormDrawer;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/components/SourceAttributeRow/SourceAttributeRow.module.scss b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/components/SourceAttributeRow/SourceAttributeRow.module.scss
new file mode 100644
index 0000000000..48af3a2cf8
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/components/SourceAttributeRow/SourceAttributeRow.module.scss
@@ -0,0 +1,40 @@
+.source {
+ display: flex;
+ align-items: center;
+ gap: var(--spacing-3);
+}
+
+.sourceHandle {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ padding: var(--spacing-2);
+ border: none;
+ background: transparent;
+ color: var(--l3-foreground);
+ cursor: grab;
+ touch-action: none;
+ user-select: none;
+
+ &:active {
+ cursor: grabbing;
+ }
+}
+
+.sourceIndex {
+ width: 20px;
+ text-align: center;
+ font-size: var(--font-size-xs);
+ color: var(--l3-foreground);
+}
+
+.sourceInput {
+ flex: 1;
+ min-width: 0;
+ font-family: 'Geist Mono', monospace;
+}
+
+.sourceSelect {
+ flex: 0 0 auto;
+ width: 120px;
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/components/SourceAttributeRow/SourceAttributeRow.tsx b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/components/SourceAttributeRow/SourceAttributeRow.tsx
new file mode 100644
index 0000000000..5289f4ad85
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/components/SourceAttributeRow/SourceAttributeRow.tsx
@@ -0,0 +1,112 @@
+import { Button } from '@signozhq/ui/button';
+import { SelectSimple } from '@signozhq/ui/select';
+import { useSortable } from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+import { GripVertical, X } from '@signozhq/icons';
+
+import {
+ FieldContext,
+ FieldContextValue,
+ MapperOperation,
+ MapperOperationValue,
+ SourceConfig,
+} from 'container/LLMObservability/AttributeMapping/types';
+import KeySearchInput from '../../../KeySearchInput/KeySearchInput';
+import styles from './SourceAttributeRow.module.scss';
+
+const CONTEXT_OPTIONS = [
+ { value: FieldContext.attribute, label: 'Attribute' },
+ { value: FieldContext.resource, label: 'Resource' },
+];
+
+const OPERATION_OPTIONS = [
+ { value: MapperOperation.move, label: 'Move' },
+ { value: MapperOperation.copy, label: 'Copy' },
+];
+
+interface SourceAttributeRowProps {
+ id: string;
+ index: number;
+ value: SourceConfig;
+ canRemove: boolean;
+ onChange: (index: number, patch: Partial<SourceConfig>) => void;
+ onRemove: (index: number) => void;
+}
+function SourceAttributeRow({
+ id,
+ index,
+ value,
+ canRemove,
+ onChange,
+ onRemove,
+}: SourceAttributeRowProps): JSX.Element {
+ const {
+ attributes,
+ listeners,
+ setNodeRef,
+ transform,
+ transition,
+ isDragging,
+ } = useSortable({ id });
+
+ const style = {
+ transform: CSS.Transform.toString(transform),
+ transition,
+ opacity: isDragging ? 0.6 : 1,
+ };
+
+ return (
+ <div className={styles.source} ref={setNodeRef} style={style}>
+ <div
+ className={styles.sourceHandle}
+ data-testid={`mapper-form-source-handle-${index}`}
+ {...attributes}
+ {...listeners}
+ >
+ <GripVertical size={14} />
+ </div>
+ <span className={styles.sourceIndex}>{index + 1}</span>
+ <KeySearchInput
+ className={styles.sourceInput}
+ placeholder="Source attribute key"
+ value={value.key}
+ fieldContext={value.context}
+ onChange={(key): void => onChange(index, { key })}
+ testId={`mapper-form-source-${index}`}
+ />
+ <SelectSimple
+ className={styles.sourceSelect}
+ items={CONTEXT_OPTIONS}
+ value={value.context}
+ withPortal={false}
+ onChange={(next): void =>
+ onChange(index, { context: next as FieldContextValue })
+ }
+ testId={`mapper-form-source-context-${index}`}
+ />
+ <SelectSimple
+ className={styles.sourceSelect}
+ items={OPERATION_OPTIONS}
+ value={value.operation}
+ withPortal={false}
+ onChange={(next): void =>
+ onChange(index, { operation: next as MapperOperationValue })
+ }
+ testId={`mapper-form-source-operation-${index}`}
+ />
+ <Button
+ variant="ghost"
+ color="secondary"
+ size="icon"
+ aria-label="Remove source"
+ disabled={!canRemove}
+ onClick={(): void => onRemove(index)}
+ testId={`mapper-form-source-remove-${index}`}
+ >
+ <X size={14} />
+ </Button>
+ </div>
+ );
+}
+
+export default SourceAttributeRow;
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/hooks/useMapperFormDrawer.ts b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/hooks/useMapperFormDrawer.ts
new file mode 100644
index 0000000000..a4972e20d9
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/components/MapperFormDrawer/hooks/useMapperFormDrawer.ts
@@ -0,0 +1,38 @@
+import { useCallback, useState } from 'react';
+
+import { DraftMapper, MapperDraft, MapperDraftMode } from '../../../types';
+import { EMPTY_MAPPER_DRAFT, mapperDraftFromNode } from '../../../utils';
+
+interface UseMapperFormDrawerResult {
+ isOpen: boolean;
+ mode: MapperDraftMode;
+ draft: MapperDraft;
+ setDraft: (next: MapperDraft) => void;
+ openForAdd: () => void;
+ openForEdit: (mapper: DraftMapper) => void;
+ close: () => void;
+}
+
+export function useMapperFormDrawer(): UseMapperFormDrawerResult {
+ const [isOpen, setIsOpen] = useState<boolean>(false);
+ const [mode, setMode] = useState<MapperDraftMode>('add');
+ const [draft, setDraft] = useState<MapperDraft>(EMPTY_MAPPER_DRAFT);
+
+ const openForAdd = useCallback((): void => {
+ setMode('add');
+ setDraft(EMPTY_MAPPER_DRAFT);
+ setIsOpen(true);
+ }, []);
+
+ const openForEdit = useCallback((mapper: DraftMapper): void => {
+ setMode('edit');
+ setDraft(mapperDraftFromNode(mapper));
+ setIsOpen(true);
+ }, []);
+
+ const close = useCallback((): void => {
+ setIsOpen(false);
+ }, []);
+
+ return { isOpen, mode, draft, setDraft, openForAdd, openForEdit, close };
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/hooks/useAttributeMappingEditor.ts b/frontend/src/container/LLMObservability/AttributeMapping/hooks/useAttributeMappingEditor.ts
new file mode 100644
index 0000000000..cb84672dd3
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/hooks/useAttributeMappingEditor.ts
@@ -0,0 +1,322 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { cloneDeep, isEqual } from 'lodash-es';
+import { toast } from '@signozhq/ui/sonner';
+import { useQueryClient } from 'react-query';
+import {
+ useCreateSpanMapper,
+ useCreateSpanMapperGroup,
+ useDeleteSpanMapper,
+ useDeleteSpanMapperGroup,
+ useListSpanMapperGroups,
+ useUpdateSpanMapper,
+ useUpdateSpanMapperGroup,
+} from 'api/generated/services/spanmapper';
+
+import { persistDraft, SaveMutations } from '../saveDraft';
+import {
+ DraftGroup,
+ GroupDraft,
+ Mapper,
+ MapperDraft,
+ MapperGroup,
+} from '../types';
+import {
+ buildDraftGroup,
+ buildDraftMapper,
+ nodeFromGroupDraft,
+ nodeFromMapperDraft,
+} from '../utils';
+
+const GROUPS_KEY_PREFIX = '/api/v1/span_mapper_groups';
+
+function clone(groups: DraftGroup[]): DraftGroup[] {
+ return cloneDeep(groups);
+}
+
+export interface AttributeMappingEditor {
+ groups: DraftGroup[];
+ isLoading: boolean;
+ isError: boolean;
+ isDirty: boolean;
+ isSaving: boolean;
+ saveError: string | null;
+ upsertGroup: (draft: GroupDraft) => void;
+ removeGroup: (localId: string) => void;
+ toggleGroup: (localId: string, enabled: boolean) => void;
+ hydrateGroupMappers: (groupServerId: string, mappers: Mapper[]) => void;
+ upsertMapper: (groupLocalId: string, draft: MapperDraft) => void;
+ removeMapper: (groupLocalId: string, mapperLocalId: string) => void;
+ toggleMapper: (
+ groupLocalId: string,
+ mapperLocalId: string,
+ enabled: boolean,
+ ) => void;
+ save: () => Promise<void>;
+ discard: () => void;
+}
+
+export function useAttributeMappingEditor(): AttributeMappingEditor {
+ const queryClient = useQueryClient();
+
+ const groupsQuery = useListSpanMapperGroups();
+ const { refetch: refetchGroups } = groupsQuery;
+ const serverGroups: MapperGroup[] = useMemo(
+ () => groupsQuery.data?.data?.items ?? [],
+ [groupsQuery.data],
+ );
+
+ const ready = !groupsQuery.isLoading;
+
+ const [loadedMappers, setLoadedMappers] = useState<Record<string, Mapper[]>>(
+ {},
+ );
+ const loadedRef = useRef<Set<string>>(new Set());
+
+ const snapshot = useMemo<DraftGroup[]>(() => {
+ if (!ready) {
+ return [];
+ }
+ return serverGroups.map((group) =>
+ buildDraftGroup(group, loadedMappers[group.id] ?? []),
+ );
+ }, [ready, serverGroups, loadedMappers]);
+
+ const [draft, setDraft] = useState<DraftGroup[] | null>(null);
+
+ // Initialise the working copy once data is ready (and re-init after a save
+ // clears it). Never clobbers in-flight edits — only runs when draft is null.
+ useEffect(() => {
+ if (ready && draft === null) {
+ setDraft(clone(snapshot));
+ }
+ }, [ready, draft, snapshot]);
+
+ const [isSaving, setIsSaving] = useState(false);
+ const [saveError, setSaveError] = useState<string | null>(null);
+
+ const { mutateAsync: createGroup } = useCreateSpanMapperGroup();
+ const { mutateAsync: updateGroup } = useUpdateSpanMapperGroup();
+ const { mutateAsync: deleteGroup } = useDeleteSpanMapperGroup();
+ const { mutateAsync: createMapper } = useCreateSpanMapper();
+ const { mutateAsync: updateMapper } = useUpdateSpanMapper();
+ const { mutateAsync: deleteMapper } = useDeleteSpanMapper();
+
+ const mutations: SaveMutations = useMemo(
+ () => ({
+ createGroup: async (data): Promise<string> => {
+ const result = await createGroup({ data });
+ return result.data.id;
+ },
+ updateGroup: async (groupId, data): Promise<void> => {
+ await updateGroup({ pathParams: { groupId }, data });
+ },
+ deleteGroup: async (groupId): Promise<void> => {
+ await deleteGroup({ pathParams: { groupId } });
+ },
+ createMapper: async (groupId, data): Promise<void> => {
+ await createMapper({ pathParams: { groupId }, data });
+ },
+ updateMapper: async (groupId, mapperId, data): Promise<void> => {
+ await updateMapper({ pathParams: { groupId, mapperId }, data });
+ },
+ deleteMapper: async (groupId, mapperId): Promise<void> => {
+ await deleteMapper({ pathParams: { groupId, mapperId } });
+ },
+ }),
+ [
+ createGroup,
+ updateGroup,
+ deleteGroup,
+ createMapper,
+ updateMapper,
+ deleteMapper,
+ ],
+ );
+
+ const upsertGroup = useCallback((groupDraft: GroupDraft): void => {
+ setDraft((prev) => {
+ const groups = prev ?? [];
+ if (groupDraft.id) {
+ return groups.map((group) =>
+ group.localId === groupDraft.id
+ ? nodeFromGroupDraft(groupDraft, group)
+ : group,
+ );
+ }
+ return [...groups, nodeFromGroupDraft(groupDraft)];
+ });
+ }, []);
+
+ const removeGroup = useCallback((localId: string): void => {
+ setDraft((prev) => (prev ?? []).filter((group) => group.localId !== localId));
+ }, []);
+
+ const toggleGroup = useCallback((localId: string, enabled: boolean): void => {
+ setDraft((prev) =>
+ (prev ?? []).map((group) =>
+ group.localId === localId ? { ...group, enabled } : group,
+ ),
+ );
+ }, []);
+
+ const hydrateGroupMappers = useCallback(
+ (groupServerId: string, mappers: Mapper[]): void => {
+ if (loadedRef.current.has(groupServerId)) {
+ return;
+ }
+ loadedRef.current.add(groupServerId);
+ setLoadedMappers((prev) => ({ ...prev, [groupServerId]: mappers }));
+ setDraft((prev) =>
+ prev === null
+ ? prev
+ : prev.map((group) =>
+ group.serverId === groupServerId
+ ? {
+ ...group,
+ mappers: [
+ ...mappers.map(buildDraftMapper),
+ ...group.mappers.filter((mapper) => mapper.serverId === null),
+ ],
+ }
+ : group,
+ ),
+ );
+ },
+ [],
+ );
+
+ const upsertMapper = useCallback(
+ (groupLocalId: string, mapperDraft: MapperDraft): void => {
+ setDraft((prev) =>
+ (prev ?? []).map((group) => {
+ if (group.localId !== groupLocalId) {
+ return group;
+ }
+ if (mapperDraft.id) {
+ return {
+ ...group,
+ mappers: group.mappers.map((mapper) =>
+ mapper.localId === mapperDraft.id
+ ? nodeFromMapperDraft(mapperDraft, mapper)
+ : mapper,
+ ),
+ };
+ }
+ return {
+ ...group,
+ mappers: [...group.mappers, nodeFromMapperDraft(mapperDraft)],
+ };
+ }),
+ );
+ },
+ [],
+ );
+
+ const removeMapper = useCallback(
+ (groupLocalId: string, mapperLocalId: string): void => {
+ setDraft((prev) =>
+ (prev ?? []).map((group) =>
+ group.localId === groupLocalId
+ ? {
+ ...group,
+ mappers: group.mappers.filter(
+ (mapper) => mapper.localId !== mapperLocalId,
+ ),
+ }
+ : group,
+ ),
+ );
+ },
+ [],
+ );
+
+ const toggleMapper = useCallback(
+ (groupLocalId: string, mapperLocalId: string, enabled: boolean): void => {
+ setDraft((prev) =>
+ (prev ?? []).map((group) =>
+ group.localId === groupLocalId
+ ? {
+ ...group,
+ mappers: group.mappers.map((mapper) =>
+ mapper.localId === mapperLocalId ? { ...mapper, enabled } : mapper,
+ ),
+ }
+ : group,
+ ),
+ );
+ },
+ [],
+ );
+
+ const discard = useCallback((): void => {
+ setSaveError(null);
+ setDraft(clone(snapshot));
+ }, [snapshot]);
+
+ const save = useCallback(async (): Promise<void> => {
+ if (!draft) {
+ return;
+ }
+ setIsSaving(true);
+ setSaveError(null);
+ try {
+ await persistDraft(snapshot, draft, mutations);
+ // Refresh the groups list in place — it stays mounted, so this just
+ // swaps in fresh data without a loading flash. Using the query's own
+ // refetch keeps it scoped to the groups list; the per-group mapper
+ // caches are handled separately below (mappers can change here, so
+ // their cached lists must be dropped rather than left stale).
+ const { isError: refreshFailed } = await refetchGroups();
+ if (refreshFailed) {
+ toast.warning(
+ 'Changes saved, but the list failed to refresh. Reload to see the latest.',
+ );
+ return;
+ }
+ // Reset the mapper-load tracking so expanded groups re-hydrate from
+ // the fresh server data.
+ loadedRef.current = new Set();
+ setLoadedMappers({});
+ // Reset the working copy so the effect above re-seeds it from the
+ // fresh snapshot (new server ids included).
+ setDraft(null);
+ // Evict the cached per-group mapper lists so an expanded group
+ // refetches its mappers against the fresh server state.
+ queryClient.removeQueries({
+ predicate: (query) =>
+ typeof query.queryKey?.[0] === 'string' &&
+ (query.queryKey[0] as string).startsWith(`${GROUPS_KEY_PREFIX}/`),
+ });
+ toast.success('Attribute mapping changes saved');
+ } catch (error) {
+ const message = error instanceof Error ? error.message : 'Save failed';
+ setSaveError(message);
+ toast.error(`Failed to save changes: ${message}`);
+ } finally {
+ setIsSaving(false);
+ }
+ }, [draft, snapshot, mutations, refetchGroups, queryClient]);
+
+ const isDirty = useMemo(
+ () => draft !== null && !isEqual(draft, snapshot),
+ [draft, snapshot],
+ );
+
+ return {
+ groups: draft ?? [],
+ isLoading: !ready || draft === null,
+ isError: groupsQuery.isError,
+ isDirty,
+ isSaving,
+ saveError,
+ upsertGroup,
+ removeGroup,
+ toggleGroup,
+ hydrateGroupMappers,
+ upsertMapper,
+ removeMapper,
+ toggleMapper,
+ save,
+ discard,
+ };
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/saveDraft.ts b/frontend/src/container/LLMObservability/AttributeMapping/saveDraft.ts
new file mode 100644
index 0000000000..a59896d4aa
--- /dev/null
+++ b/frontend/src/container/LLMObservability/AttributeMapping/saveDraft.ts
@@ -0,0 +1,190 @@
+import { isEqual } from 'lodash-es';
+import {
+ SpantypesPostableSpanMapperDTO,
+ SpantypesPostableSpanMapperGroupDTO,
+ SpantypesUpdatableSpanMapperDTO,
+ SpantypesUpdatableSpanMapperGroupDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+import { DraftGroup, DraftMapper, SourceConfig } from './types';
+import {
+ buildPostableGroup,
+ buildPostableMapper,
+ buildUpdatableGroup,
+ buildUpdatableMapper,
+} from './utils';
+
+// Thin persistence surface the editor wires to the generated mutations.
+// createGroup returns the new server id so its mappers can be created under it.
+export interface SaveMutations {
+ createGroup: (data: SpantypesPostableSpanMapperGroupDTO) => Promise<string>;
+ updateGroup: (
+ groupId: string,
+ data: SpantypesUpdatableSpanMapperGroupDTO,
+ ) => Promise<void>;
+ deleteGroup: (groupId: string) => Promise<void>;
+ createMapper: (
+ groupId: string,
+ data: SpantypesPostableSpanMapperDTO,
+ ) => Promise<void>;
+ updateMapper: (
+ groupId: string,
+ mapperId: string,
+ data: SpantypesUpdatableSpanMapperDTO,
+ ) => Promise<void>;
+ deleteMapper: (groupId: string, mapperId: string) => Promise<void>;
+}
+
+function sourcesEqual(a: SourceConfig[], b: SourceConfig[]): boolean {
+ return (
+ a.length === b.length &&
+ a.every(
+ (source, index) =>
+ source.key === b[index].key &&
+ source.context === b[index].context &&
+ source.operation === b[index].operation,
+ )
+ );
+}
+
+function groupChanged(snapshot: DraftGroup, draft: DraftGroup): boolean {
+ return (
+ snapshot.name !== draft.name ||
+ snapshot.enabled !== draft.enabled ||
+ !isEqual(snapshot.attributes, draft.attributes) ||
+ !isEqual(snapshot.resource, draft.resource)
+ );
+}
+
+function mapperChanged(snapshot: DraftMapper, draft: DraftMapper): boolean {
+ return (
+ snapshot.enabled !== draft.enabled ||
+ snapshot.fieldContext !== draft.fieldContext ||
+ !sourcesEqual(snapshot.sources, draft.sources)
+ );
+}
+
+function groupDraftOf(
+ node: DraftGroup,
+): Parameters<typeof buildPostableGroup>[0] {
+ return {
+ id: node.serverId,
+ name: node.name,
+ attributes: node.attributes,
+ resource: node.resource,
+ enabled: node.enabled,
+ };
+}
+
+function mapperDraftOf(
+ node: DraftMapper,
+): Parameters<typeof buildPostableMapper>[0] {
+ return {
+ id: node.serverId,
+ name: node.name,
+ fieldContext: node.fieldContext,
+ sources: node.sources,
+ enabled: node.enabled,
+ };
+}
+
+async function persistMappers(
+ groupServerId: string,
+ snapshotMappers: DraftMapper[],
+ draftMappers: DraftMapper[],
+ m: SaveMutations,
+): Promise<void> {
+ const snapById = new Map(
+ snapshotMappers
+ .filter((mapper) => mapper.serverId)
+ .map((mapper) => [mapper.serverId as string, mapper]),
+ );
+ const draftServerIds = new Set(
+ draftMappers
+ .filter((mapper) => mapper.serverId)
+ .map((mapper) => mapper.serverId as string),
+ );
+
+ // Creates/updates before deletes (see persistDraft). Sequential for
+ // deterministic ordering.
+ for (const mapper of draftMappers) {
+ if (!mapper.serverId) {
+ // eslint-disable-next-line no-await-in-loop
+ await m.createMapper(
+ groupServerId,
+ buildPostableMapper(mapperDraftOf(mapper)),
+ );
+ } else {
+ const snap = snapById.get(mapper.serverId);
+ if (!snap || mapperChanged(snap, mapper)) {
+ // eslint-disable-next-line no-await-in-loop
+ await m.updateMapper(
+ groupServerId,
+ mapper.serverId,
+ buildUpdatableMapper(mapperDraftOf(mapper)),
+ );
+ }
+ }
+ }
+
+ // Deletes last.
+ await Promise.all(
+ snapshotMappers
+ .filter((mapper) => mapper.serverId && !draftServerIds.has(mapper.serverId))
+ .map((mapper) => m.deleteMapper(groupServerId, mapper.serverId as string)),
+ );
+}
+
+// Diffs the staged tree against the server snapshot and issues the minimal set
+// of create/update/delete calls to reconcile them.
+export async function persistDraft(
+ snapshot: DraftGroup[],
+ draft: DraftGroup[],
+ m: SaveMutations,
+): Promise<void> {
+ const snapById = new Map(
+ snapshot
+ .filter((group) => group.serverId)
+ .map((group) => [group.serverId as string, group]),
+ );
+ const draftServerIds = new Set(
+ draft
+ .filter((group) => group.serverId)
+ .map((group) => group.serverId as string),
+ );
+
+ // Creates/updates before deletes: a mid-save failure then leaves incomplete
+ // additions rather than groups deleted with no replacement. Deletes are
+ // irreversible (cascade mappers server-side), so they run last.
+ //
+ // Names are unique per scope, so deleting and recreating the same name in
+ // one save collides and errors — recoverable by splitting across two saves,
+ // which we favour over the data loss delete-first would risk.
+ for (const group of draft) {
+ if (!group.serverId) {
+ // eslint-disable-next-line no-await-in-loop
+ const newId = await m.createGroup(buildPostableGroup(groupDraftOf(group)));
+ // eslint-disable-next-line no-await-in-loop
+ await persistMappers(newId, [], group.mappers, m);
+ continue;
+ }
+
+ const snap = snapById.get(group.serverId);
+ if (!snap || groupChanged(snap, group)) {
+ // eslint-disable-next-line no-await-in-loop
+ await m.updateGroup(
+ group.serverId,
+ buildUpdatableGroup(groupDraftOf(group)),
+ );
+ }
+ // eslint-disable-next-line no-await-in-loop
+ await persistMappers(group.serverId, snap?.mappers ?? [], group.mappers, m);
+ }
+
+ // Deleted groups (cascades mappers server-side).
+ await Promise.all(
+ snapshot
+ .filter((group) => group.serverId && !draftServerIds.has(group.serverId))
+ .map((group) => m.deleteGroup(group.serverId as string)),
+ );
+}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/types.ts b/frontend/src/container/LLMObservability/AttributeMapping/types.ts
index b54d88978d..6790a0103a 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/types.ts
+++ b/frontend/src/container/LLMObservability/AttributeMapping/types.ts
@@ -1,26 +1,58 @@
import {
SpantypesFieldContextDTO,
+ SpantypesSpanMapperDTO,
+ SpantypesSpanMapperGroupDTO,
SpantypesSpanMapperOperationDTO,
} from 'api/generated/services/sigNoz.schemas';
+export type MapperGroup = SpantypesSpanMapperGroupDTO;
+export type Mapper = SpantypesSpanMapperDTO;
+export const FieldContext = SpantypesFieldContextDTO;
+export type FieldContextValue = SpantypesFieldContextDTO;
+export const MapperOperation = SpantypesSpanMapperOperationDTO;
+export type MapperOperationValue = SpantypesSpanMapperOperationDTO;
+
+export type MapperDraftMode = 'add' | 'edit';
+
export interface SourceConfig {
key: string;
context: SpantypesFieldContextDTO;
operation: SpantypesSpanMapperOperationDTO;
}
-export interface Mapping {
- id: string;
+// Editable form state for a mapper. `sources` is ordered highest priority
+// first; `fieldContext` is where the standardized target is written.
+export interface MapperDraft {
+ id: string | null;
+ name: string;
+ fieldContext: SpantypesFieldContextDTO;
+ sources: SourceConfig[];
+ enabled: boolean;
+}
+
+export interface GroupDraft {
+ id: string | null;
+ name: string;
+ attributes: string[];
+ resource: string[];
+ enabled: boolean;
+}
+
+export interface DraftMapper {
+ localId: string;
+ serverId: string | null;
name: string;
fieldContext: SpantypesFieldContextDTO;
sources: SourceConfig[];
enabled: boolean;
}
-export interface MappingGroup {
- id: string;
+export interface DraftGroup {
+ localId: string;
+ serverId: string | null;
name: string;
attributes: string[];
resource: string[];
enabled: boolean;
+ mappers: DraftMapper[];
}
diff --git a/frontend/src/container/LLMObservability/AttributeMapping/utils.ts b/frontend/src/container/LLMObservability/AttributeMapping/utils.ts
index 58de11fb41..3efdeb384d 100644
--- a/frontend/src/container/LLMObservability/AttributeMapping/utils.ts
+++ b/frontend/src/container/LLMObservability/AttributeMapping/utils.ts
@@ -1,15 +1,49 @@
import {
- ListSpanMappers200,
- SpantypesSpanMapperDTO,
- SpantypesSpanMapperGroupDTO,
+ SpantypesPostableSpanMapperDTO,
+ SpantypesPostableSpanMapperGroupDTO,
+ SpantypesUpdatableSpanMapperDTO,
+ SpantypesUpdatableSpanMapperGroupDTO,
} from 'api/generated/services/sigNoz.schemas';
+import { v4 as uuid } from 'uuid';
-import { MappingGroup, Mapping, SourceConfig } from './types';
+import {
+ DraftGroup,
+ DraftMapper,
+ FieldContext,
+ GroupDraft,
+ Mapper,
+ MapperDraft,
+ MapperGroup,
+ MapperOperation,
+ SourceConfig,
+} from './types';
+
+// Client-side id for not-yet-persisted rows. Prefixed so it never collides
+// with a server UUID and is easy to spot in logs.
+function genLocalId(prefix: 'group' | 'mapper'): string {
+ return `local-${prefix}-${uuid()}`;
+}
-function getMapperSources(mapper: SpantypesSpanMapperDTO): SourceConfig[] {
+// Trimmed, de-duplicated, non-empty keys preserving input order.
+function cleanKeys(keys: string[]): string[] {
+ const seen = new Set<string>();
+ const result: string[] = [];
+ keys.forEach((raw) => {
+ const key = raw.trim();
+ if (key && !seen.has(key)) {
+ seen.add(key);
+ result.push(key);
+ }
+ });
+ return result;
+}
+
+// Source configs for a mapper, highest priority first (first match wins at
+// evaluation time).
+function getMapperSources(mapper: Mapper): SourceConfig[] {
const sources = mapper.config?.sources ?? [];
return [...sources]
- .sort((a, b) => a.priority - b.priority)
+ .sort((a, b) => b.priority - a.priority)
.map((source) => ({
key: source.key,
context: source.context,
@@ -17,9 +51,110 @@ function getMapperSources(mapper: SpantypesSpanMapperDTO): SourceConfig[] {
}));
}
-export function buildMapping(mapper: SpantypesSpanMapperDTO): Mapping {
+export function createEmptySource(): SourceConfig {
+ return {
+ key: '',
+ context: FieldContext.attribute,
+ operation: MapperOperation.copy,
+ };
+}
+
+export const EMPTY_MAPPER_DRAFT: MapperDraft = {
+ id: null,
+ name: '',
+ fieldContext: FieldContext.attribute,
+ sources: [createEmptySource()],
+ enabled: true,
+};
+
+function getCleanSources(draft: MapperDraft): SourceConfig[] {
+ const seen = new Set<string>();
+ const result: SourceConfig[] = [];
+ draft.sources.forEach((source) => {
+ const key = source.key.trim();
+ const dedupeKey = `${source.context}:${key}`;
+ if (key && !seen.has(dedupeKey)) {
+ seen.add(dedupeKey);
+ result.push({ ...source, key });
+ }
+ });
+ return result;
+}
+
+export function isMapperDraftValid(draft: MapperDraft): boolean {
+ return draft.name.trim().length > 0 && getCleanSources(draft).length > 0;
+}
+
+// Priority is derived from list order so the first row wins.
+function buildSources(
+ draft: MapperDraft,
+): SpantypesPostableSpanMapperDTO['config']['sources'] {
+ const sources = getCleanSources(draft);
+ return sources.map((source, index) => ({
+ key: source.key,
+ context: source.context,
+ operation: source.operation,
+ priority: sources.length - index,
+ }));
+}
+
+export function buildPostableMapper(
+ draft: MapperDraft,
+): SpantypesPostableSpanMapperDTO {
+ return {
+ name: draft.name.trim(),
+ fieldContext: draft.fieldContext,
+ enabled: draft.enabled,
+ config: { sources: buildSources(draft) },
+ };
+}
+
+// The target name is immutable on update (UpdatableSpanMapper has no name).
+export function buildUpdatableMapper(
+ draft: MapperDraft,
+): SpantypesUpdatableSpanMapperDTO {
+ return {
+ fieldContext: draft.fieldContext,
+ enabled: draft.enabled,
+ config: { sources: buildSources(draft) },
+ };
+}
+
+export const EMPTY_GROUP_DRAFT: GroupDraft = {
+ id: null,
+ name: '',
+ attributes: [''],
+ resource: [],
+ enabled: true,
+};
+
+export function isGroupDraftValid(draft: GroupDraft): boolean {
+ return draft.name.trim().length > 0;
+}
+
+export function buildPostableGroup(
+ draft: GroupDraft,
+): SpantypesPostableSpanMapperGroupDTO {
+ return {
+ name: draft.name.trim(),
+ enabled: draft.enabled,
+ condition: {
+ attributes: cleanKeys(draft.attributes),
+ resource: cleanKeys(draft.resource),
+ },
+ };
+}
+
+export function buildUpdatableGroup(
+ draft: GroupDraft,
+): SpantypesUpdatableSpanMapperGroupDTO {
+ return buildPostableGroup(draft);
+}
+
+export function buildDraftMapper(mapper: Mapper): DraftMapper {
return {
- id: mapper.id,
+ localId: mapper.id,
+ serverId: mapper.id,
name: mapper.name,
fieldContext: mapper.fieldContext,
sources: getMapperSources(mapper),
@@ -27,22 +162,71 @@ export function buildMapping(mapper: SpantypesSpanMapperDTO): Mapping {
};
}
-export function buildMappingsFromListResponse(
- response: ListSpanMappers200,
-): Mapping[] {
- const items = (response.data?.items ??
- []) as unknown as SpantypesSpanMapperDTO[];
- return items.map(buildMapping);
-}
-
-export function buildMappingGroup(
- group: SpantypesSpanMapperGroupDTO,
-): MappingGroup {
+export function buildDraftGroup(
+ group: MapperGroup,
+ mappers: Mapper[],
+): DraftGroup {
return {
- id: group.id,
+ localId: group.id,
+ serverId: group.id,
name: group.name,
attributes: group.condition?.attributes ?? [],
resource: group.condition?.resource ?? [],
enabled: group.enabled,
+ mappers: mappers.map(buildDraftMapper),
+ };
+}
+
+// DraftGroup -> editable form state (id carries the localId).
+export function groupDraftFromNode(group: DraftGroup): GroupDraft {
+ return {
+ id: group.localId,
+ name: group.name,
+ attributes: group.attributes.length > 0 ? group.attributes : [''],
+ resource: group.resource,
+ enabled: group.enabled,
+ };
+}
+
+// DraftMapper -> editable form state (id carries the localId).
+export function mapperDraftFromNode(mapper: DraftMapper): MapperDraft {
+ return {
+ id: mapper.localId,
+ name: mapper.name,
+ fieldContext: mapper.fieldContext,
+ sources:
+ mapper.sources.length > 0
+ ? mapper.sources.map((source) => ({ ...source }))
+ : [createEmptySource()],
+ enabled: mapper.enabled,
+ };
+}
+
+export function nodeFromGroupDraft(
+ draft: GroupDraft,
+ existing?: DraftGroup,
+): DraftGroup {
+ return {
+ localId: existing?.localId ?? genLocalId('group'),
+ serverId: existing?.serverId ?? null,
+ name: draft.name.trim(),
+ attributes: cleanKeys(draft.attributes),
+ resource: cleanKeys(draft.resource),
+ enabled: draft.enabled,
+ mappers: existing?.mappers ?? [],
+ };
+}
+
+export function nodeFromMapperDraft(
+ draft: MapperDraft,
+ existing?: DraftMapper,
+): DraftMapper {
+ return {
+ localId: existing?.localId ?? genLocalId('mapper'),
+ serverId: existing?.serverId ?? null,
+ name: draft.name.trim(),
+ fieldContext: draft.fieldContext,
+ sources: getCleanSources(draft),
+ enabled: draft.enabled,
};
}
diff --git a/frontend/src/container/LLMObservability/LLMObservability.module.scss b/frontend/src/container/LLMObservability/LLMObservability.module.scss
index abba2c816c..548bb30fe0 100644
--- a/frontend/src/container/LLMObservability/LLMObservability.module.scss
+++ b/frontend/src/container/LLMObservability/LLMObservability.module.scss
@@ -4,4 +4,10 @@
height: 100%;
margin-top: var(--spacing-2);
margin-left: var(--spacing-2);
+ --tab-text-color: var(--l1-foreground);
+ --tab-active-text-color: var(--l1-foreground);
+ [role='tabpanel'] {
+ margin: 0;
+ padding: var(--spacing-0) var(--spacing-4);
+ }
}
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.module.scss
index 5ea09cc779..67f07c638e 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.module.scss
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.module.scss
@@ -2,6 +2,10 @@
display: flex;
flex-direction: column;
gap: var(--spacing-8);
+ --tab-content-padding: 0;
+ margin-top: var(--spacing-3);
+ --tab-text-color: var(--l1-foreground);
+ --tab-active-text-color: var(--l1-foreground);
}
.tabLabel {
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx
index 4e230ddd31..0582f8618d 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx
@@ -33,7 +33,7 @@ function LLMObservabilityModelPricing(): JSX.Element {
items={[
{
key: MODEL_COSTS_TAB,
- label: 'Model costs',
+ label: 'Model Costs',
children: <ModelCostTabPanel />,
},
{
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/ModelCostTabPanel.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/ModelCostTabPanel.module.scss
index 369ea10f92..14f4d6852d 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/ModelCostTabPanel.module.scss
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/ModelCostTabPanel.module.scss
@@ -3,6 +3,7 @@
gap: var(--spacing-6);
align-items: center;
justify-content: space-between;
+ margin-top: var(--spacing-8);
}
.filtersBarLeft {
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/ModelCostDrawer.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/ModelCostDrawer.tsx
index 8ce1a3a470..dd1c54dfac 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/ModelCostDrawer.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/ModelCostDrawer.tsx
@@ -110,7 +110,7 @@ function ModelCostDrawer({
>
<div className={styles.drawerSection}>
<label htmlFor="billing-model-id">
- Billing model ID{' '}
+ Billing Model ID{' '}
<span className={styles.required} aria-hidden="true">
*
</span>
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.tsx
index 6c3d43e483..b90908a9f7 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.tsx
@@ -68,10 +68,10 @@ function ExtraPricingBuckets({
<div className={cx(styles.extraBucketsSection, styles.drawerSection)}>
<div className={styles.extraBucketsSectionHead}>
<Typography.Text as="span" size="small" color="muted">
- Extra pricing buckets
+ Extra Pricing Buckets
</Typography.Text>
<Typography.Text as="span" size="small" color="muted">
- optional
+ Optional
</Typography.Text>
</div>
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PricingFields/PricingFields.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PricingFields/PricingFields.tsx
index 457b352d9d..1b3f5fadd5 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PricingFields/PricingFields.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PricingFields/PricingFields.tsx
@@ -39,7 +39,7 @@ function PricingFields({
<div className={styles.pricingGrid}>
<div className={styles.pricingField}>
<label htmlFor="input-cost">
- Input cost{' '}
+ Input Cost{' '}
<span className={styles.required} aria-hidden="true">
*
</span>
@@ -59,7 +59,7 @@ function PricingFields({
</div>
<div className={styles.pricingField}>
<label htmlFor="output-cost">
- Output cost{' '}
+ Output Cost{' '}
<span className={styles.required} aria-hidden="true">
*
</span>
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostsTable.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostsTable.module.scss
index b423254ae5..989a9a8fde 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostsTable.module.scss
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostsTable.module.scss
@@ -7,6 +7,10 @@
:global(table) tbody tr {
cursor: default;
}
+
+ :global(.tanstack-header-title) {
+ color: var(--l2-foreground);
+ }
}
.modelCostsEmpty {
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/table.config.tsx b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/table.config.tsx
index b580b6b58e..fac7c30ab9 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/table.config.tsx
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/table.config.tsx
@@ -42,9 +42,9 @@ export function getModelCostsColumns({
cell: ({ row }): JSX.Element => (
<div className={styles.modelCell}>
<Typography.Text
- weight="semibold"
truncate={1}
testId={`model-cell-name-${row.id}`}
+ className={styles.tableCellStyles}
>
{row.modelName}
</Typography.Text>
@@ -59,7 +59,11 @@ export function getModelCostsColumns({
accessorKey: 'provider',
width: { min: 140 },
enableMove: false,
- cell: ({ row }): string => row.provider ?? '',
+ cell: ({ row }): JSX.Element => (
+ <Typography.Text className={styles.tableCellStyles}>
+ {row.provider ?? ''}
+ </Typography.Text>
+ ),
},
{
id: 'input',
@@ -67,7 +71,7 @@ export function getModelCostsColumns({
width: { min: 120 },
enableMove: false,
cell: ({ row }): JSX.Element => (
- <Typography.Text>
+ <Typography.Text className={styles.tableCellStyles}>
{formatPricePerMillion(row.pricing?.input)}
</Typography.Text>
),
@@ -78,7 +82,7 @@ export function getModelCostsColumns({
width: { min: 120 },
enableMove: false,
cell: ({ row }): JSX.Element => (
- <Typography.Text>
+ <Typography.Text className={styles.tableCellStyles}>
{formatPricePerMillion(row.pricing?.output)}
</Typography.Text>
),
@@ -92,7 +96,7 @@ export function getModelCostsColumns({
const buckets = getExtraBuckets(row);
if (buckets.length === 0) {
return (
- <Typography.Text color="muted" as="span">
+ <Typography.Text as="span" className={styles.tableCellStyles}>
—
</Typography.Text>
);
@@ -106,10 +110,19 @@ export function getModelCostsColumns({
variant="outline"
className={styles.extraBucketsChip}
>
- <Typography.Text as="span" size="small">
+ <Typography.Text
+ as="span"
+ size="small"
+ className={styles.tableCellStyles}
+ >
{startCase(bucket.key)}
</Typography.Text>
- <Typography.Text as="span" size="small" weight="semibold">
+ <Typography.Text
+ as="span"
+ size="small"
+ weight="semibold"
+ className={styles.tableCellStyles}
+ >
{formatPricePerMillion(bucket.pricePerMillion)}
</Typography.Text>
</Badge>
@@ -139,7 +152,11 @@ export function getModelCostsColumns({
header: 'Last seen',
width: { min: 120 },
enableMove: false,
- cell: ({ row }): string => getRelativeLastSeen(row),
+ cell: ({ row }): JSX.Element => (
+ <Typography.Text className={styles.tableCellStyles}>
+ {getRelativeLastSeen(row)}
+ </Typography.Text>
+ ),
},
{
id: 'actions',
diff --git a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/tableConfig.module.scss b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/tableConfig.module.scss
index 5a22a2089d..b2ba1a93ab 100644
--- a/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/tableConfig.module.scss
+++ b/frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/TableConfig/tableConfig.module.scss
@@ -24,3 +24,7 @@
.sourceBadge {
margin: 0;
}
+
+.tableCellStyles {
+ color: var(--l1-foreground);
+}