Skip to content

Admin panel redesign (CRE blues) on OIE RQ fanout tip #1146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
northdpole merged 2 commits into from
Oct 13, 2026
Merged

Admin panel redesign (CRE blues) on OIE RQ fanout tip #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2e8cec
Redesign admin panel with CRE blues, env/.env diff, and review widgets.
northdpole Oct 11, 2026
99ac24a
Allow Bearer on Admin OIE REST and fix staging filing lookup.
northdpole Oct 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
354 changes: 331 additions & 23 deletions application/frontend/src/pages/Admin/Admin.scss
View file
Open in desktop

Large diffs are not rendered by default.

87 changes: 54 additions & 33 deletions application/frontend/src/pages/Admin/Admin.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe('Admin', () => {
</MemoryRouter>
);
expect(getByText(/CRE_ALLOW_IMPORT/)).toBeTruthy();
expect(queryByText('Dashboard')).toBeNull();
expect(queryByText('Overview')).toBeNull();
});

it('asks anonymous users to log in', () => {
Expand All @@ -81,7 +81,7 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
expect(getByText('Sign in to continue.')).toBeTruthy();
expect(getByText(/Sign in to continue/)).toBeTruthy();
});

it('loads import runs and links to MyOpenCRE', async () => {
Expand All @@ -97,7 +97,7 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Graph management'));
fireEvent.click(getByText('Review'));
await findByText('asvs');
fireEvent.click(getByText('MyOpenCRE'));
expect(getByText('Open MyOpenCRE').closest('a')?.getAttribute('href')).toBe('/myopencre');
Expand All @@ -111,12 +111,17 @@ describe('Admin', () => {
running: [],
failed: [],
import_runs: [],
needs_attention: { staged_review: 2, failed_24h: 0, blocked: 1, ingest_errors: 0 },
review_pulse: {
accepted_as_is_pct: 40,
adjusted_pct: 35,
rejected_pct: 25,
pending: 3,
},
agent: {
enabled: true,
writes_cre_graph: false,
demo_path: '/chatbot',
db_url: 'postgresql://cre:***@127.0.0.1:5432/opencre',
db_env_key: 'DEV_DATABASE_URL',
package_present: false,
},
});
Expand All @@ -129,12 +134,13 @@ describe('Admin', () => {
</MemoryRouter>
);
await findByText(/writes CRE graph: false/);
expect(getByText(/Main DB \(DEV_DATABASE_URL\):/)).toBeTruthy();
expect(getByText(/postgresql:\/\/cre:\*\*\*@127.0.0.1:5432\/opencre/)).toBeTruthy();
expect(getByText('Needs attention')).toBeTruthy();
expect(getByText('Review pulse')).toBeTruthy();
expect(getByText('40%')).toBeTruthy();
expect(getByText('Open chat demo').closest('a')?.getAttribute('href')).toBe('/chatbot');
expect(queryByRole('button', { name: 'OWASP agent' })).toBeNull();
fireEvent.click(getByText('Job management and logs'));
expect(await findByText('New')).toBeTruthy();
fireEvent.click(getByText('Open review'));
expect(await findByText(/Approve, deny, or relink/)).toBeTruthy();
});

it('reviews links per run and loads the changeset graph', async () => {
Expand All @@ -147,7 +153,7 @@ describe('Admin', () => {
edges: [],
});
}
if (u.endsWith('/links') && init?.method === 'POST') {
if (u.includes('/links') && init?.method === 'POST') {
return jsonRes({
run_id: 'r1',
links: [
Expand All @@ -161,7 +167,7 @@ describe('Admin', () => {
],
});
}
if (u.endsWith('/links')) {
if (u.includes('/links') && (!init || !init.method || init.method === 'GET')) {
return jsonRes({
run_id: 'r1',
links: [
Expand All @@ -183,18 +189,19 @@ describe('Admin', () => {
}
return jsonRes({});
});
const { getByText, findByText } = render(
const { getByText, findByText, getAllByText } = render(
<MemoryRouter>
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Graph management'));
fireEvent.click(getByText('Review'));
await findByText('asvs');
fireEvent.click(getByText('Graph'));
expect(await findByText('ASVS 1.1')).toBeTruthy();
fireEvent.click(getByText('Changeset'));
expect(await findByText('Added controls and links')).toBeTruthy();
fireEvent.click(getByText('Approve'));
expect(await findByText('Staged links')).toBeTruthy();
const accepts = getAllByText('Accept');
fireEvent.click(accepts[accepts.length - 1]);
await waitFor(() =>
expect((global as any).fetch).toHaveBeenCalledWith(
expect.stringContaining('/links'),
Expand Down Expand Up @@ -233,7 +240,20 @@ describe('Admin', () => {
it('shows config restart instructions', async () => {
loggedIn();
(global as any).fetch = jest.fn((url: string) => {
if (String(url).includes('/admin/config')) {
const u = String(url);
if (u.includes('/admin/config/diff')) {
return jsonRes({
diff: [
{
key: 'CRE_ALLOW_IMPORT',
status: 'match',
process: '1',
dotenv: '1',
},
],
});
}
if (u.includes('/admin/config')) {
return jsonRes({
writable: false,
restart_instructions: 'HTTP cannot change process env.',
Expand All @@ -248,22 +268,23 @@ describe('Admin', () => {
],
});
}
if (String(url).includes('/admin/repos.yaml')) {
if (u.includes('/admin/repos.yaml')) {
return jsonRes({ yaml: 'sources: []\n', source: 'repos.yaml:abc' });
}
if (String(url).includes('/rest/v1/api-keys')) {
return jsonRes({ keys: [] });
}
return jsonRes({});
});
const { getByText, findByText } = render(
const { getByText, findByText, getAllByText } = render(
<MemoryRouter>
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Config'));
fireEvent.click(getByText('Config values'));
expect(await findByText('Environment vs .env')).toBeTruthy();
expect(await findByText('HTTP cannot change process env.')).toBeTruthy();
expect(getByText('CRE_ALLOW_IMPORT')).toBeTruthy();
expect(getAllByText('CRE_ALLOW_IMPORT').length).toBeGreaterThan(0);
});

it('mints an API key from Config Manage API keys dialog', async () => {
Expand Down Expand Up @@ -373,7 +394,7 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Config'));
fireEvent.click(getByText('Config values'));
expect(await findByText(/C\.1 auto-file high-confidence links \(off/)).toBeTruthy();
const toggle = await findByRole('checkbox');
fireEvent.click(toggle);
Expand Down Expand Up @@ -436,7 +457,7 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Config'));
fireEvent.click(getByText('Config values'));
expect(await findByText(/End-to-end bootstrap/)).toBeTruthy();
fireEvent.click(getByText(/^Import upstream CRE \+ harvest$/));
await waitFor(() =>
Expand Down Expand Up @@ -534,7 +555,7 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Graph management'));
fireEvent.click(getByText('Review'));
await findByText('asvs');
fireEvent.click(getByText('Impact'));
await waitFor(() =>
Expand Down Expand Up @@ -585,11 +606,11 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Graph management'));
fireEvent.click(getByText('Review'));
await findByText('asvs');
fireEvent.click(getByText('Changeset'));
expect(await findByText(/run not found/)).toBeTruthy();
expect(queryByText('Added controls and links')).toBeNull();
expect(queryByText('Staged links')).toBeNull();
});

it('saves repos.yaml and expands an org from config', async () => {
Expand Down Expand Up @@ -632,7 +653,7 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Config'));
fireEvent.click(getByText('Config values'));
expect(await findByText('targets.yaml')).toBeTruthy();
fireEvent.change(getByLabelText('repos.yaml'), {
target: { value: 'repositories:\n - id: custom\n' },
Expand Down Expand Up @@ -666,7 +687,7 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Config'));
fireEvent.click(getByText('Config values'));
await findByText('targets.yaml');
fireEvent.change(getByPlaceholderText('GitHub org'), { target: { value: 'NoSuchOrgCcdd' } });
fireEvent.click(getByText('Add org'));
Expand Down Expand Up @@ -725,11 +746,11 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Graph management'));
fireEvent.click(getByText('Review'));
expect(await findByText('Drop last')).toBeTruthy();
fireEvent.click(getByText('Drop last'));
expect(await findByText(/source is required/)).toBeTruthy();
fireEvent.click(getByText('Config'));
fireEvent.click(getByText('Config values'));
fireEvent.click(getByText('Add target'));
fireEvent.click(getByText('Add'));
expect(await findByText(/owner and repo are required/)).toBeTruthy();
Expand Down Expand Up @@ -757,7 +778,7 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Graph management'));
fireEvent.click(getByText('Review'));
await findByText('asvs');
fireEvent.click(getByText('Graph'));
expect(await findByText(/graph unavailable/)).toBeTruthy();
Expand Down Expand Up @@ -794,7 +815,7 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Config'));
fireEvent.click(getByText('Config values'));
await findByText('targets.yaml');
fireEvent.click(getByText('Add target'));
fireEvent.change(getByPlaceholderText('OWASP'), { target: { value: 'OWASP' } });
Expand Down Expand Up @@ -850,7 +871,7 @@ describe('Admin', () => {
loggedIn();
(global as any).fetch = jest.fn((url: string) => {
const u = String(url);
if (u.endsWith('/links')) {
if (u.includes('/links')) {
return jsonRes({ run_id: 'r1', links: [] });
}
if (u.includes('/changeset')) {
Expand All @@ -866,7 +887,7 @@ describe('Admin', () => {
<Admin />
</MemoryRouter>
);
fireEvent.click(getByText('Graph management'));
fireEvent.click(getByText('Review'));
await findByText('asvs');
fireEvent.click(getByText('Changeset'));
expect(await findByText('No staged links on this run.')).toBeTruthy();
Expand Down
Loading
Loading