diff --git a/apps/dfe-core-ui/e2e/specs/Sources/Ingest/ingestRules.spec.ts b/apps/dfe-core-ui/e2e/specs/Sources/Ingest/ingestRules.spec.ts
index 9c97efe2d..13c664848 100644
--- a/apps/dfe-core-ui/e2e/specs/Sources/Ingest/ingestRules.spec.ts
+++ b/apps/dfe-core-ui/e2e/specs/Sources/Ingest/ingestRules.spec.ts
@@ -184,7 +184,7 @@ test.describe('', { tag: [TAGS.core, TAGS.source] }, () => {
page,
request,
}) => {
- await page.goto(`${BASE_URL}/sources/ingest-rules`);
+ await page.goto(`${BASE_URL}/sources/ingest-procedures`);
const sourceRules = page.getByRole('list', { name: 'Source rules order' });
await expect(
sourceRules.getByTestId(`rule-block-source.${COMPOUND}`),
diff --git a/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/BlockRow.tsx b/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/BlockRow.tsx
new file mode 100644
index 000000000..d54a739e7
--- /dev/null
+++ b/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/BlockRow.tsx
@@ -0,0 +1,72 @@
+import { Tooltip } from '@/core/components/Tooltip';
+import { TRuleBlock } from '@/Sources/hooks/useFetchRuleBlocks/types';
+import { IconAlertTriangle } from '@repo/dfe-icons';
+import { Tag } from 'antd';
+import Link from 'next/link';
+import { KIND_LABEL } from './RuleOrderList.helpers';
+
+export const BlockRow = ({
+ block,
+ title,
+}: {
+ block: TRuleBlock;
+ title: string;
+}) => {
+ const rows = block.rules.length;
+ const warnings = block.warnings ?? [];
+ return (
+
+ {block.kind === 'source' ? (
+
+ {title}
+
+ ) : (
+ {title}
+ )}
+ {block.kind !== 'default' && (
+
+ {KIND_LABEL[block.kind]}
+
+ )}
+ {block.version && (
+
+ {`version ${block.version}`}
+
+ )}
+ {!block.compiled && (
+
+ Not in the receiver's rules
+
+ )}
+ {warnings.length > 0 && (
+
+ {warnings.map((warning) => (
+ {warning}
+ ))}
+
+ }
+ >
+ 1 ? 's' : ''}: ${warnings.join(' ')}`}
+ className="flex text-warning"
+ >
+
+
+
+ )}
+
+ {block.kind === 'default'
+ ? 'Takes what no block above matched'
+ : `${rows} rule row${rows === 1 ? '' : 's'}`}
+
+
+ );
+};
diff --git a/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/RbacOrderList.tsx b/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/RbacOrderList.tsx
new file mode 100644
index 000000000..af9f810eb
--- /dev/null
+++ b/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/RbacOrderList.tsx
@@ -0,0 +1,35 @@
+import { RbacProtected } from '@/core/components/RbacProtected';
+import { SortableRuleList } from '@/Sources/components/SortableRuleList';
+import { TRuleBlock } from '@/Sources/hooks/useFetchRuleBlocks/types';
+import { BlockRow } from './BlockRow';
+
+export const RbacOrderList = ({
+ label,
+ ordered,
+ titleOf,
+ isPending,
+ changed,
+ onMove,
+}: {
+ label: string;
+ ordered: TRuleBlock[];
+ titleOf: (block: TRuleBlock) => string;
+ isPending: boolean;
+ changed: boolean;
+ onMove: (from: number, to: number) => void;
+}) => {
+ const { isAuthorized } = RbacProtected.useRbac({
+ action: RbacProtected.rbacActions.source_write,
+ });
+ return (
+ }
+ />
+ );
+};
diff --git a/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/RuleOrderList.helpers.ts b/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/RuleOrderList.helpers.ts
new file mode 100644
index 000000000..59756e86e
--- /dev/null
+++ b/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/RuleOrderList.helpers.ts
@@ -0,0 +1,18 @@
+import { TRuleBlock } from '@/Sources/hooks/useFetchRuleBlocks/types';
+
+export const sameOrder = (left: string[], right: string[]) =>
+ left.length === right.length &&
+ left.every((id, index) => id === right[index]);
+
+export const KIND_LABEL: Record = {
+ source: 'Source',
+ profile: 'Compatibility profile',
+ default: 'Default',
+};
+
+export const moveId = (ids: string[], from: number, to: number) => {
+ const next = [...ids];
+ const [moved] = next.splice(from, 1);
+ if (moved !== undefined) next.splice(to, 0, moved);
+ return next;
+};
diff --git a/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/index.tsx b/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/index.tsx
new file mode 100644
index 000000000..aaafd7bfd
--- /dev/null
+++ b/apps/dfe-core-ui/src/Sources/components/IngestProcedures/RuleOrderList/index.tsx
@@ -0,0 +1,173 @@
+'use client';
+
+import { CustomScrollbar } from '@/core/components/CustomScrollbar';
+import { NotificationCard } from '@/core/components/NotificationCard';
+import { useSetComponentHeight } from '@/core/hooks/useSetComponentHeight';
+import { IngestWriteRefusal } from '@/Sources/components/IngestRules/IngestWriteRefusal';
+import { IngestWriteResult } from '@/Sources/components/IngestRules/IngestWriteResult';
+import {
+ TRuleBlock,
+ TRuleTarget,
+} from '@/Sources/hooks/useFetchRuleBlocks/types';
+import { useReorderRuleBlocks } from '@/Sources/hooks/useReorderRuleBlocks';
+import { Button } from 'antd';
+import { useMemo, useState } from 'react';
+import { RbacOrderList } from './RbacOrderList';
+import { moveId, sameOrder } from './RuleOrderList.helpers';
+
+interface RuleOrderListProps {
+ target: TRuleTarget;
+ title: string;
+ description: string;
+ blocks: TRuleBlock[];
+ etag: string | null;
+ titleOf: (block: TRuleBlock) => string;
+ nameOf: (id: string) => string;
+ onReload: () => Promise;
+ isReloading: boolean;
+ componentHeight?: {
+ initialOffset: number;
+ };
+}
+
+export const RuleOrderList = ({
+ target,
+ title,
+ description,
+ blocks,
+ etag,
+ titleOf,
+ nameOf,
+ onReload,
+ isReloading,
+ componentHeight: componentHeightProp = {
+ initialOffset: 0,
+ },
+}: RuleOrderListProps) => {
+ const serverIds = useMemo(() => blocks.map((block) => block.id), [blocks]);
+ const [draft, setDraft] = useState(null);
+ const [sentIds, setSentIds] = useState([]);
+ const { mutate, isPending, error, reset, data } = useReorderRuleBlocks({
+ etag,
+ onSuccess: () => setDraft(null),
+ });
+
+ // A draft only stands while it names the blocks the engine has.
+ const draftIds =
+ draft &&
+ draft.length === serverIds.length &&
+ draft.every((id) => serverIds.includes(id))
+ ? draft
+ : serverIds;
+ const byId = new Map(blocks.map((block) => [block.id, block]));
+ const ordered = draftIds
+ .map((id) => byId.get(id))
+ .filter((block): block is TRuleBlock => !!block);
+ const isDirty = !sameOrder(draftIds, serverIds);
+ const movable = ordered.filter((block) => !block.pinned);
+
+ const handleReload = () => {
+ void onReload().then(() => {
+ setDraft(null);
+ reset();
+ });
+ };
+
+ const handleSave = () => {
+ const ids = movable.map((block) => block.id);
+ setSentIds(ids);
+ mutate({ target, blocks: ids });
+ };
+
+ const dirtyHeightOffset = isDirty ? 50 : 0;
+ const errorHeightOffset = error ? 100 : 0;
+ const resultHeightOffset = data && !isDirty ? 62 : 0;
+
+ const { componentHeight } = useSetComponentHeight({
+ offset:
+ componentHeightProp?.initialOffset +
+ dirtyHeightOffset +
+ errorHeightOffset +
+ resultHeightOffset,
+ });
+ return (
+
+
+
+ {title}
+
+
+ {description}
+
+
+
+ {isDirty && (
+
+ {
+ setDraft(null);
+ reset();
+ }}
+ disabled={isPending}
+ >
+ Discard
+
+
+ Save order
+
+
+ }
+ />
+ )}
+
+ {error ? (
+
+ ) : (
+ data &&
+ !isDirty &&
+ )}
+
+ {movable.length === 0 && (
+
+ No block here can move: only the default runs.
+
+ )}
+
+
+ {
+ reset();
+ setDraft(moveId(draftIds, from, to));
+ }}
+ />
+
+
+ );
+};
diff --git a/apps/dfe-core-ui/src/Sources/components/IngestProcedures/index.tsx b/apps/dfe-core-ui/src/Sources/components/IngestProcedures/index.tsx
new file mode 100644
index 000000000..785f29708
--- /dev/null
+++ b/apps/dfe-core-ui/src/Sources/components/IngestProcedures/index.tsx
@@ -0,0 +1,132 @@
+import { NotificationCard } from '@/core/components/NotificationCard';
+import { RuleOrderList } from './RuleOrderList';
+
+import { GenericErrorCard } from '@/core/components/GenericError';
+import { DeploymentCompatibility } from '@/Sources/components/IngestRules/DeploymentCompatibility';
+import { useFetchCompatProfiles } from '@/Sources/hooks/useFetchCompatProfiles';
+import { useFetchRuleBlocks } from '@/Sources/hooks/useFetchRuleBlocks';
+import {
+ TRuleBlock,
+ TRuleTarget,
+} from '@/Sources/hooks/useFetchRuleBlocks/types';
+import { IconAlertTriangle } from '@repo/dfe-icons';
+import { Spin } from 'antd';
+
+const TARGETS: { target: TRuleTarget; title: string; description: string }[] = [
+ {
+ target: '_source',
+ title: 'Source rules',
+ description:
+ 'Which source a record belongs to. The receiver tries each block from the top, and the first that matches decides.',
+ },
+ {
+ target: '_org_id',
+ title: 'Org rules',
+ description:
+ 'Which org a record belongs to, tried the same way once its source is known.',
+ },
+];
+
+export const IngestProcedures = () => {
+ const { data, isLoading, isFetching, error, refetch } = useFetchRuleBlocks();
+ const { profiles } = useFetchCompatProfiles();
+
+ const titleOf = (block: TRuleBlock) => {
+ if (block.kind === 'default') return 'Default';
+ if (block.kind === 'profile') {
+ return (
+ profiles?.find((profile) => profile.id === block.name)?.title ??
+ block.name
+ );
+ }
+ return block.name;
+ };
+
+ // Ids are source., compat. or default, and a refusal can name one this page has not read.
+ const nameOf = (id: string) => {
+ const [kind, ...rest] = id.split('.');
+ const name = rest.join('.');
+ if (kind === 'source') return name;
+ if (kind === 'compat') {
+ return profiles?.find((profile) => profile.id === name)?.title ?? name;
+ }
+ return id === 'default' ? 'Default' : id;
+ };
+ return (
+
+
+ {isLoading && (
+ <>
+
Loading rule blocks
+ >
+ )}
+ {error && (
+
+ )}
+ {data && !data.etag && (
+
}
+ title="This order is read only here"
+ description="The engine answered without a revision the browser may read, which a save has to send back. The console reaches the engine on another origin that does not expose the ETag header."
+ />
+ )}
+
+
+ {data ? (
+
block.target === TARGETS[0].target,
+ )}
+ etag={data.etag}
+ titleOf={titleOf}
+ nameOf={nameOf}
+ onReload={refetch}
+ isReloading={isFetching}
+ />
+ ) : (
+
+ )}
+
+
+
+ {data ? (
+
block.target === TARGETS[1].target,
+ )}
+ etag={data.etag}
+ titleOf={titleOf}
+ nameOf={nameOf}
+ onReload={refetch}
+ isReloading={isFetching}
+ />
+ ) : (
+
+ )}
+
+
+
+ );
+};
diff --git a/apps/dfe-core-ui/src/Sources/components/IngestRules/RuleOrder.tsx b/apps/dfe-core-ui/src/Sources/components/IngestRules/RuleOrder.tsx
index 7ce65f481..fb13e3508 100644
--- a/apps/dfe-core-ui/src/Sources/components/IngestRules/RuleOrder.tsx
+++ b/apps/dfe-core-ui/src/Sources/components/IngestRules/RuleOrder.tsx
@@ -192,6 +192,7 @@ const RuleOrderList = ({
ordered={ordered}
titleOf={titleOf}
isPending={isPending}
+ changed={isDirty}
onMove={(from, to) => {
reset();
setDraft(moveId(draftIds, from, to));
@@ -247,12 +248,14 @@ const RbacOrderList = ({
ordered,
titleOf,
isPending,
+ changed,
onMove,
}: {
label: string;
ordered: TRuleBlock[];
titleOf: (block: TRuleBlock) => string;
isPending: boolean;
+ changed: boolean;
onMove: (from: number, to: number) => void;
}) => {
const { isAuthorized } = RbacProtected.useRbac({
@@ -264,6 +267,7 @@ const RbacOrderList = ({
label={label}
itemName={titleOf}
disabled={!isAuthorized || isPending}
+ changed={changed}
onMove={onMove}
renderItem={(block) => }
/>
diff --git a/apps/dfe-core-ui/src/Sources/components/SortableRuleList/SortableDropdown.tsx b/apps/dfe-core-ui/src/Sources/components/SortableRuleList/SortableDropdown.tsx
new file mode 100644
index 000000000..7a2019795
--- /dev/null
+++ b/apps/dfe-core-ui/src/Sources/components/SortableRuleList/SortableDropdown.tsx
@@ -0,0 +1,76 @@
+'use client';
+
+import { IconChevronDown, IconChevronUp } from '@repo/dfe-icons';
+import { Button, Dropdown, Select } from 'antd';
+import { useState } from 'react';
+
+export const SortableDropdown = ({
+ onChange,
+ onOpenChange,
+ options,
+ buttonRef,
+ open: openProp,
+ ruleName,
+}: {
+ onChange: (to: number) => void;
+ onOpenChange: (open: boolean) => void;
+ options: { value: number; label: string; disabled: boolean }[];
+ buttonRef: React.Ref;
+ open: boolean;
+ ruleName: string;
+}) => {
+ const [open, setOpen] = useState(openProp);
+ return (
+ {
+ onOpenChange(next);
+ setOpen(next);
+ }}
+ popupRender={() => (
+ event.preventDefault()}
+ >
+
+ String(option?.label ?? '')
+ .toLowerCase()
+ .includes(input.trim().toLowerCase()),
+ }}
+ virtual={false}
+ className="w-44"
+ placeholder="Search position"
+ aria-label={`Search positions for ${ruleName}`}
+ options={options}
+ onChange={(to) => {
+ onChange(to);
+ }}
+ getPopupContainer={(trigger) =>
+ trigger.parentElement ?? document.body
+ }
+ />
+
+ )}
+ >
+
+ ) : (
+
+ )
+ }
+ />
+
+ );
+};
diff --git a/apps/dfe-core-ui/src/Sources/components/SortableRuleList/SortableRuleList.test.tsx b/apps/dfe-core-ui/src/Sources/components/SortableRuleList/SortableRuleList.test.tsx
index fc2d7256b..4161039a2 100644
--- a/apps/dfe-core-ui/src/Sources/components/SortableRuleList/SortableRuleList.test.tsx
+++ b/apps/dfe-core-ui/src/Sources/components/SortableRuleList/SortableRuleList.test.tsx
@@ -16,11 +16,20 @@ const ROWS: Row[] = [
{ id: 'default', name: 'Default', pinned: true },
];
-const Harness = ({ disabled = false }: { disabled?: boolean }) => {
+const Harness = ({
+ disabled = false,
+ trackChanges = false,
+}: {
+ disabled?: boolean;
+ trackChanges?: boolean;
+}) => {
const [rows, setRows] = useState(ROWS);
+ const changed =
+ trackChanges && rows.some((row, index) => row.id !== ROWS[index]?.id);
return (
row.name}
disabled={disabled}
@@ -95,6 +104,42 @@ describe('SortableRuleList', () => {
expect(pinned).not.toHaveAttribute('draggable', 'true');
});
+ it('tags how far a row moved, purple when up and orange when down', async () => {
+ const user = userEvent.setup();
+ render( , { wrapper });
+
+ expect(document.querySelector('.ant-tag')).toBeNull();
+
+ await user.click(screen.getByRole('button', { name: 'Move charlie up' }));
+
+ expect(
+ within(screen.getByTestId('rule-block-c')).getByText('1', {
+ selector: '.ant-tag',
+ }),
+ ).toHaveClass('ant-tag-purple');
+ expect(
+ within(screen.getByTestId('rule-block-b')).getByText('1', {
+ selector: '.ant-tag',
+ }),
+ ).toHaveClass('ant-tag-orange');
+ expect(
+ screen.getByTestId('rule-block-a').querySelector('.ant-tag'),
+ ).toBeNull();
+
+ await user.click(screen.getByRole('button', { name: 'Move charlie up' }));
+
+ expect(
+ within(screen.getByTestId('rule-block-c')).getByText('2', {
+ selector: '.ant-tag',
+ }),
+ ).toHaveClass('ant-tag-purple');
+
+ await user.click(screen.getByRole('button', { name: 'Move charlie down' }));
+ await user.click(screen.getByRole('button', { name: 'Move charlie down' }));
+
+ expect(document.querySelector('.ant-tag')).toBeNull();
+ });
+
it('moves with the up button and keeps focus on it', async () => {
const user = userEvent.setup();
render( , { wrapper });
@@ -123,14 +168,27 @@ describe('SortableRuleList', () => {
).toHaveFocus();
});
- it('moves to a chosen position from the menu', async () => {
+ it('moves to a position chosen from the search', async () => {
const user = userEvent.setup();
render( , { wrapper });
await user.click(
screen.getByRole('button', { name: 'Move alpha to position' }),
);
- await user.click(await screen.findByText('Position 3'));
+ const search = await screen.findByRole('combobox', {
+ name: 'Search positions for alpha',
+ });
+ expect(screen.getByTestId('rule-block-a')).toHaveClass(
+ 'outline-tertiary/50',
+ );
+ expect(screen.getByTestId('rule-block-b')).not.toHaveClass(
+ 'outline-tertiary/50',
+ );
+ await user.type(search, '3');
+ expect(
+ screen.queryByRole('option', { name: 'Position 1' }),
+ ).not.toBeInTheDocument();
+ await user.click(screen.getByRole('option', { name: 'Position 3' }));
expect(order().slice(0, 3)).toEqual([
'rule-block-b',
diff --git a/apps/dfe-core-ui/src/Sources/components/SortableRuleList/index.tsx b/apps/dfe-core-ui/src/Sources/components/SortableRuleList/index.tsx
index 8c07582f7..f69a2863e 100644
--- a/apps/dfe-core-ui/src/Sources/components/SortableRuleList/index.tsx
+++ b/apps/dfe-core-ui/src/Sources/components/SortableRuleList/index.tsx
@@ -5,12 +5,12 @@ import { cn } from '@/core/utils/style';
import {
IconArrowDown,
IconArrowUp,
- IconDotsVertical,
IconGripVertical,
IconPin,
} from '@repo/dfe-icons';
-import { Button, Dropdown } from 'antd';
+import { Button, Tag } from 'antd';
import { useEffect, useId, useRef, useState } from 'react';
+import { SortableDropdown } from './SortableDropdown';
export type SortableRuleItem = {
id: string;
@@ -23,11 +23,15 @@ type Control = 'handle' | 'up' | 'down' | 'menu';
/** Where a dragged row lands: before the row under the pointer, or after it. */
type DropTarget = { index: number; after: boolean };
+const sameIds = (left: string[], right: string[]) =>
+ left.length === right.length &&
+ left.every((id, index) => id === right[index]);
+
/**
* A first-match list whose order is edited by drag, by keyboard and by menu.
*
* Dragging is pointer-only, so every move it offers is also a button (WCAG 2.2
- * SC 2.5.7): Move up, Move down and a move-to-position menu on each row, and
+ * SC 2.5.7): Move up, Move down and a move-to-position search on each row, and
* the arrow keys on its handle. Each move is announced in a live region as
* "Moved to position N of M", and focus stays on the control that made
* it. Pinned rows sit where the engine keeps them and are never a drop target
@@ -40,6 +44,7 @@ export function SortableRuleList({
renderItem,
onMove,
disabled = false,
+ changed = false,
}: {
items: T[];
/** The list's accessible name. */
@@ -49,14 +54,23 @@ export function SortableRuleList({
renderItem: (item: T, position: number) => React.ReactNode;
onMove: (from: number, to: number) => void;
disabled?: boolean;
+ /** True while this order differs from the saved one. Tags compare against the order held before this became true. */
+ changed?: boolean;
}) {
const instructionsId = useId();
// The count re-keys the message, so a repeat of the same words is announced again.
const [announcement, setAnnouncement] = useState({ text: '', count: 0 });
const [dragIndex, setDragIndex] = useState(null);
+ const [positionMenuId, setPositionMenuId] = useState(null);
const [dropTarget, setDropTarget] = useState(null);
const pendingFocus = useRef<{ id: string; control: Control } | null>(null);
const controls = useRef(new Map());
+ // The saved order. An edit leaves it in place; while nothing is edited it follows the list.
+ const itemIds = items.map((item) => item.id);
+ const [baseline, setBaseline] = useState(itemIds);
+ if (!changed && !sameIds(baseline, itemIds)) {
+ setBaseline(itemIds);
+ }
const movableCount = items.filter((item) => !item.pinned).length;
const movable = (index: number) =>
@@ -139,6 +153,10 @@ export function SortableRuleList({
{items.map((item, index) => {
const name = itemName(item);
const canMove = movable(index);
+ const savedAt = baseline.indexOf(item.id);
+ const places = savedAt >= 0 ? Math.abs(savedAt - index) : 0;
+ const moved =
+ changed && places > 0 ? (index < savedAt ? 'up' : 'down') : null;
const showLineBefore =
dragIndex !== null &&
dropTarget?.index === index &&
@@ -182,6 +200,8 @@ export function SortableRuleList({
'relative flex items-center gap-2 rounded-md border px-2 py-2',
'border-foreground/15 bg-background dark:border-dark-foreground/15 dark:bg-dark-background',
dragIndex === index && 'opacity-50',
+ positionMenuId === item.id &&
+ 'outline-2 -outline-offset-2 outline-tertiary/50',
item.pinned &&
'bg-foreground/[0.03] dark:bg-dark-foreground/[0.04]',
)}
@@ -222,12 +242,48 @@ export function SortableRuleList({
)}
-
+
{index + 1}
+ {canMove && (
+ ({
+ value: to,
+ label: `Position ${to + 1}`,
+ disabled: to === index,
+ }))}
+ onChange={(to) => {
+ setPositionMenuId(null);
+ move(index, to, 'menu');
+ }}
+ onOpenChange={(next) => {
+ setPositionMenuId(next ? item.id : null);
+ }}
+ buttonRef={register(item.id, 'menu')}
+ ruleName={name}
+ open={positionMenuId === item.id}
+ />
+ )}
{renderItem(item, index + 1)}
+ {moved && (
+
+ {moved === 'up' ? (
+ <>
+ {places}
+ >
+ ) : (
+ <>
+ {places}
+ >
+ )}
+
+ )}
{canMove && (
@@ -252,25 +308,6 @@ export function SortableRuleList({
onClick={() => move(index, index + 1, 'down')}
/>
- ({
- key: String(to),
- label: `Position ${to + 1}`,
- disabled: to === index,
- })),
- onClick: ({ key }) => move(index, Number(key), 'menu'),
- }}
- >
- }
- />
-
)}
{showLineAfter && (
diff --git a/apps/dfe-core-ui/src/Sources/components/SourcesToolbar/index.tsx b/apps/dfe-core-ui/src/Sources/components/SourcesToolbar/index.tsx
index b3e46d423..fd8900ddc 100644
--- a/apps/dfe-core-ui/src/Sources/components/SourcesToolbar/index.tsx
+++ b/apps/dfe-core-ui/src/Sources/components/SourcesToolbar/index.tsx
@@ -17,8 +17,8 @@ export const SourcesToolbar = () => {
disabled: false,
},
{
- path: '/sources/ingest-rules',
- label: 'Ingest rules',
+ path: '/sources/ingest-procedures',
+ label: 'Ingest Procedures',
disabled: false,
},
];
diff --git a/apps/dfe-core-ui/src/Sources/scenes/IngestRules/index.tsx b/apps/dfe-core-ui/src/Sources/scenes/IngestRules/index.tsx
index a49585978..682cc4720 100644
--- a/apps/dfe-core-ui/src/Sources/scenes/IngestRules/index.tsx
+++ b/apps/dfe-core-ui/src/Sources/scenes/IngestRules/index.tsx
@@ -1,26 +1,16 @@
'use client';
import { MainContentCard } from '@/core/components/ContentCard';
-import { CustomScrollbar } from '@/core/components/CustomScrollbar';
import { RbacProtected } from '@/core/components/RbacProtected';
-import { useSetComponentHeight } from '@/core/hooks/useSetComponentHeight';
-import { DeploymentCompatibility } from '@/Sources/components/IngestRules/DeploymentCompatibility';
-import { RuleOrder } from '@/Sources/components/IngestRules/RuleOrder';
+import { IngestProcedures } from '@/Sources/components/IngestProcedures';
/** The order the receiver's rules run in, and the compatibility profiles they include. */
export const IngestRulesScene = () => {
- const { componentHeight } = useSetComponentHeight({ offset: 100 });
-
return (
-
-
-
-
-
-
+
diff --git a/apps/dfe-core-ui/src/app/(auth)/sources/ingest-rules/page.tsx b/apps/dfe-core-ui/src/app/(auth)/sources/ingest-procedures/page.tsx
similarity index 100%
rename from apps/dfe-core-ui/src/app/(auth)/sources/ingest-rules/page.tsx
rename to apps/dfe-core-ui/src/app/(auth)/sources/ingest-procedures/page.tsx
diff --git a/apps/dfe-core-ui/src/core/components/NotificationCard/index.tsx b/apps/dfe-core-ui/src/core/components/NotificationCard/index.tsx
index 9b394537d..1e7d272dd 100644
--- a/apps/dfe-core-ui/src/core/components/NotificationCard/index.tsx
+++ b/apps/dfe-core-ui/src/core/components/NotificationCard/index.tsx
@@ -116,7 +116,7 @@ export const NotificationCard = ({
{typeof title === 'string' ? (
@@ -129,7 +129,7 @@ export const NotificationCard = ({
{typeof description === 'string' ? (
diff --git a/docs/console-and-the-flow.md b/docs/console-and-the-flow.md
index 6959ed8e9..103b4fdee 100644
--- a/docs/console-and-the-flow.md
+++ b/docs/console-and-the-flow.md
@@ -34,7 +34,7 @@ Each group is one RBAC family: a heading appears when at least one destination u
The Observe destinations are dfe-hyperdx embeds and appear once a dfe-hyperdx URL is configured.
-Settings and Platform are not in the menu. The settings button in the header opens them, at `/settings/admin` and `/settings/platform`. Some routes have no menu entry either: `/sources/ingest-rules`, `/schemas/meta-schemas`, `/schemas/other-schemas`, `/field-maps`, `/transforms`, `/account`, and the first-run `/setup/[step]`.
+Settings and Platform are not in the menu. The settings button in the header opens them, at `/settings/admin` and `/settings/platform`. Some routes have no menu entry either: `/sources/ingest-procedures`, `/schemas/meta-schemas`, `/schemas/other-schemas`, `/field-maps`, `/transforms`, `/account`, and the first-run `/setup/[step]`.
## The Source page draws the engine's flow resolver