chore(deps): update dependencies and bring storybook up to date
- update client and server dependencies within their ranges, keeping all playwright packages aligned at 1.63 - fix code flagged by react-hooks 7.1: refs written during render and synchronous setState in effects - add stories for the ui components that had none, with interaction tests, and cover all DescriptionList layouts - drop the unused mdx stories pattern - run the storybook tests as part of the pre-commit checks - bump version to 1.20.1
This commit is contained in:
1 parent
9f341719ef
commit
227251861b
20 files changed
+5048
-3616
No files matched your search
@@ -2,6 +2,23 @@
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## 1.20.1 - 2026-09-30
|
||||
|
||||
Changes since 1.20.0:
|
||||
|
||||
### Added
|
||||
|
||||
- Storybook stories for AutoRefreshIndicator, CodeBlock, CodeEditor, MarkdownContent, Modal, Notification, Search, Textarea, Toast and UuidBadge, with interaction tests where the component has behavior. The DescriptionList story covers all four layouts.
|
||||
|
||||
### Changed
|
||||
|
||||
- Updated all client and server dependencies to the latest versions within their ranges, including React 19.3, Storybook 10.6, NestJS 11.2, TypeORM 0.3.31 and Playwright 1.63 (the Docker image now ships HeadlessChrome 153).
|
||||
- The Storybook tests are part of the pre-commit checks.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Code flagged by the stricter React hooks lint rules: the runs list no longer writes refs during render, and the scenario list, scenario files and sessions list no longer set state synchronously inside effects.
|
||||
|
||||
## 1.20.0 - 2026-09-30
|
||||
|
||||
Changes since 1.19.3:
|
||||
|
||||
@@ -34,10 +34,11 @@ Before committing, run and pass all of these (and report the results):
|
||||
# server
|
||||
cd server && npm run lint && npx tsc --noEmit -p tsconfig.json && npm test && npm run build
|
||||
# client
|
||||
cd client && npm run lint && npm run build
|
||||
cd client && npm run lint && npm run build && npm run test:storybook
|
||||
```
|
||||
|
||||
- Lint must stay clean in both packages (no errors, no warnings).
|
||||
- `test:storybook` runs every story in `client/.storybook/stories/` in headless Chromium (needs `npx playwright install --only-shell chromium` once, and again after Playwright updates). Add or update a story when adding or changing a `client/src/ui/` component.
|
||||
- Don't run prettier over whole existing files; several aren't prettier-clean and it produces unrelated diffs. Format only new files or the lines you changed.
|
||||
- Server tests use an in-memory DB, a Playwright mock (`server/test/__mocks__/playwright.ts`), and a temporary files directory per test app (see `server/test/app.harness.ts`).
|
||||
- Import Node.js built-in modules with the `node:` prefix (`node:fs`, `node:path`, `node:crypto`, ...).
|
||||
|
||||
@@ -12,7 +12,7 @@ function getAbsolutePath(value: string) {
|
||||
return dirname(fileURLToPath(import.meta.resolve(`${value}/package.json`)));
|
||||
}
|
||||
const config: StorybookConfig = {
|
||||
stories: ['./stories/**/*.mdx', './stories/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
|
||||
stories: ['./stories/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
|
||||
addons: [
|
||||
getAbsolutePath('@storybook/addon-vitest'),
|
||||
getAbsolutePath('@storybook/addon-a11y'),
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, fn, userEvent, within } from 'storybook/test';
|
||||
import { AutoRefreshIndicator } from '../../src/ui/AutoRefreshIndicator/AutoRefreshIndicator';
|
||||
|
||||
const meta: Meta<typeof AutoRefreshIndicator> = {
|
||||
title: 'UI/AutoRefreshIndicator',
|
||||
component: AutoRefreshIndicator,
|
||||
parameters: { layout: 'centered' },
|
||||
tags: ['autodocs'],
|
||||
args: { onClick: fn() },
|
||||
};
|
||||
export default meta;
|
||||
type Story = StoryObj<typeof AutoRefreshIndicator>;
|
||||
|
||||
export const Active: Story = { args: { active: true, pulseKey: 1 } };
|
||||
export const Idle: Story = { args: { active: false } };
|
||||
export const Errored: Story = { args: { active: false, error: true } };
|
||||
|
||||
export const ClickToRefresh: Story = {
|
||||
args: { active: false },
|
||||
play: async ({ args, canvasElement }) => {
|
||||
await userEvent.click(within(canvasElement).getByRole('button'));
|
||||
await expect(args.onClick).toHaveBeenCalled();
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,33 @@
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect } from 'storybook/test';
|
||||
import { CodeBlock } from '../../src/ui/CodeBlock/CodeBlock';
|
||||
|
||||
const meta: Meta<typeof CodeBlock> = {
|
||||
title: 'UI/CodeBlock',
|
||||
component: CodeBlock,
|
||||
parameters: { layout: 'padded' },
|
||||
tags: ['autodocs'],
|
||||
};
|
||||
export default meta;
|
||||
type Story = StoryObj<typeof CodeBlock>;
|
||||
|
||||
export const JavaScript: Story = {
|
||||
args: {
|
||||
language: 'javascript',
|
||||
code: "const url = context.getEnv('BASE_URL');\nawait context.page.goto(url);\nreturn await context.page.title();",
|
||||
},
|
||||
play: async ({ canvasElement }) => {
|
||||
// Highlighting splits the code into many spans: check the whole text and
|
||||
// that highlighting actually happened
|
||||
const code = canvasElement.querySelector('code');
|
||||
await expect(code).toHaveTextContent('await context.page.goto(url);');
|
||||
await expect(code?.querySelector('.hljs-keyword')).not.toBeNull();
|
||||
},
|
||||
};
|
||||
|
||||
export const Json: Story = {
|
||||
args: {
|
||||
language: 'json',
|
||||
code: JSON.stringify({ status: 'pass', output: { title: 'Dashboard' } }, null, 2),
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,35 @@
|
||||
import React, { useState } from 'react';
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { CodeEditor, type CodeEditorProps } from '../../src/ui/CodeEditor/CodeEditor';
|
||||
|
||||
// Monaco is loaded from a CDN at runtime, so these stories only check that the
|
||||
// editor mounts; they have no interaction tests.
|
||||
function ControlledEditor(
|
||||
props: Omit<CodeEditorProps, 'value' | 'onChange'> & { initial: string },
|
||||
) {
|
||||
const { initial, ...rest } = props;
|
||||
const [value, setValue] = useState(initial);
|
||||
return <CodeEditor {...rest} value={value} onChange={setValue} />;
|
||||
}
|
||||
|
||||
const meta: Meta<typeof ControlledEditor> = {
|
||||
title: 'UI/CodeEditor',
|
||||
component: ControlledEditor,
|
||||
parameters: { layout: 'padded' },
|
||||
tags: ['autodocs'],
|
||||
};
|
||||
export default meta;
|
||||
type Story = StoryObj<typeof ControlledEditor>;
|
||||
|
||||
export const JavaScript: Story = {
|
||||
args: {
|
||||
language: 'javascript',
|
||||
rows: 8,
|
||||
initial:
|
||||
"await context.page.goto(context.getEnv('BASE_URL'));\nreturn await context.page.title();",
|
||||
},
|
||||
};
|
||||
|
||||
export const WithError: Story = {
|
||||
args: { language: 'javascript', rows: 4, error: true, initial: 'await context.page.goto(' },
|
||||
};
|
||||
@@ -15,7 +15,7 @@ const meta: Meta<typeof DescriptionList> = {
|
||||
),
|
||||
],
|
||||
argTypes: {
|
||||
layout: { control: 'select', options: ['inline', 'compact'] },
|
||||
layout: { control: 'select', options: ['inline', 'compact', 'comfortable', 'grid'] },
|
||||
},
|
||||
};
|
||||
export default meta;
|
||||
@@ -35,6 +35,14 @@ export const Compact: Story = {
|
||||
args: { items: urlItems, layout: 'compact' },
|
||||
};
|
||||
|
||||
export const Comfortable: Story = {
|
||||
args: { items: urlItems, layout: 'comfortable' },
|
||||
};
|
||||
|
||||
export const Grid: Story = {
|
||||
args: { items: urlItems, layout: 'grid' },
|
||||
};
|
||||
|
||||
export const WithLinks: Story = {
|
||||
args: {
|
||||
layout: 'inline',
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, within } from 'storybook/test';
|
||||
import { MarkdownContent } from '../../src/ui/MarkdownContent/MarkdownContent';
|
||||
|
||||
const meta: Meta<typeof MarkdownContent> = {
|
||||
title: 'UI/MarkdownContent',
|
||||
component: MarkdownContent,
|
||||
parameters: { layout: 'padded' },
|
||||
tags: ['autodocs'],
|
||||
};
|
||||
export default meta;
|
||||
type Story = StoryObj<typeof MarkdownContent>;
|
||||
|
||||
export const Description: Story = {
|
||||
args: {
|
||||
content: [
|
||||
'## Login flow',
|
||||
'',
|
||||
'Logs in with the **test user** and checks the dashboard.',
|
||||
'',
|
||||
'- Uses the `BASE_URL` environment value',
|
||||
'- Needs the `user` credential alias',
|
||||
'',
|
||||
'```js',
|
||||
"await context.page.goto(context.getEnv('BASE_URL'));",
|
||||
'```',
|
||||
].join('\n'),
|
||||
},
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await expect(canvas.getByRole('heading', { name: 'Login flow' })).toBeInTheDocument();
|
||||
await expect(canvas.getByText('test user').tagName).toBe('STRONG');
|
||||
await expect(canvas.getAllByRole('listitem')).toHaveLength(2);
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,63 @@
|
||||
import React, { useState } from 'react';
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, userEvent, within } from 'storybook/test';
|
||||
import { Modal } from '../../src/ui/Modal/Modal';
|
||||
import { Button } from '../../src/ui/Button/Button';
|
||||
|
||||
function ModalDemo({ title, body }: { title: string; body: string }) {
|
||||
const [open, setOpen] = useState(false);
|
||||
return (
|
||||
<>
|
||||
<Button onClick={() => setOpen(true)}>Open modal</Button>
|
||||
<Modal
|
||||
open={open}
|
||||
title={title}
|
||||
onClose={() => setOpen(false)}
|
||||
footer={
|
||||
<>
|
||||
<Button variant="secondary" onClick={() => setOpen(false)}>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button onClick={() => setOpen(false)}>Confirm</Button>
|
||||
</>
|
||||
}
|
||||
>
|
||||
{body}
|
||||
</Modal>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
const meta: Meta<typeof ModalDemo> = {
|
||||
title: 'UI/Modal',
|
||||
component: ModalDemo,
|
||||
parameters: { layout: 'centered' },
|
||||
tags: ['autodocs'],
|
||||
args: { title: 'Delete scenario', body: 'This deletes the scenario, its versions and its runs.' },
|
||||
};
|
||||
export default meta;
|
||||
type Story = StoryObj<typeof ModalDemo>;
|
||||
|
||||
export const Default: Story = {
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await userEvent.click(canvas.getByRole('button', { name: 'Open modal' }));
|
||||
const dialog = canvas.getByRole('dialog', { name: 'Delete scenario' });
|
||||
await expect(dialog).toHaveTextContent('its versions and its runs');
|
||||
await userEvent.click(within(dialog).getByRole('button', { name: 'Cancel' }));
|
||||
await expect(canvas.queryByRole('dialog')).not.toBeInTheDocument();
|
||||
},
|
||||
};
|
||||
|
||||
export const ClosesOnEscapeAndBackdrop: Story = {
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await userEvent.click(canvas.getByRole('button', { name: 'Open modal' }));
|
||||
await userEvent.keyboard('{Escape}');
|
||||
await expect(canvas.queryByRole('dialog')).not.toBeInTheDocument();
|
||||
|
||||
await userEvent.click(canvas.getByRole('button', { name: 'Open modal' }));
|
||||
await userEvent.click(canvas.getByRole('presentation'));
|
||||
await expect(canvas.queryByRole('dialog')).not.toBeInTheDocument();
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,30 @@
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { Notification } from '../../src/ui/Notification/Notification';
|
||||
|
||||
const meta: Meta<typeof Notification> = {
|
||||
title: 'UI/Notification',
|
||||
component: Notification,
|
||||
parameters: { layout: 'padded' },
|
||||
tags: ['autodocs'],
|
||||
argTypes: {
|
||||
variant: { control: 'select', options: ['info', 'success', 'error', 'warning', 'note'] },
|
||||
},
|
||||
};
|
||||
export default meta;
|
||||
type Story = StoryObj<typeof Notification>;
|
||||
|
||||
export const Info: Story = {
|
||||
args: {
|
||||
variant: 'info',
|
||||
title: 'Traces are off',
|
||||
children: 'Enable them per run in the run modal.',
|
||||
},
|
||||
};
|
||||
export const Success: Story = { args: { variant: 'success', children: 'Scenario imported.' } };
|
||||
export const Error: Story = {
|
||||
args: { variant: 'error', title: 'Run failed', children: 'Step 2 timed out after 60s.' },
|
||||
};
|
||||
export const Warning: Story = {
|
||||
args: { variant: 'warning', children: 'The environment of this run no longer exists.' },
|
||||
};
|
||||
export const Note: Story = { args: { variant: 'note', children: 'Pinned snippet version: v3.' } };
|
||||
@@ -0,0 +1,34 @@
|
||||
import React, { useState } from 'react';
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, userEvent, within } from 'storybook/test';
|
||||
import { Search } from '../../src/ui/Search/Search';
|
||||
|
||||
function ControlledSearch({ placeholder }: { placeholder?: string }) {
|
||||
const [value, setValue] = useState('');
|
||||
return (
|
||||
<div>
|
||||
<Search value={value} onChange={setValue} placeholder={placeholder} />
|
||||
<p data-testid="query">{value}</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const meta: Meta<typeof ControlledSearch> = {
|
||||
title: 'UI/Search',
|
||||
component: ControlledSearch,
|
||||
parameters: { layout: 'centered' },
|
||||
tags: ['autodocs'],
|
||||
};
|
||||
export default meta;
|
||||
type Story = StoryObj<typeof ControlledSearch>;
|
||||
|
||||
export const Default: Story = {};
|
||||
|
||||
export const Typing: Story = {
|
||||
args: { placeholder: 'Filter logs…' },
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await userEvent.type(canvas.getByPlaceholderText('Filter logs…'), 'timeout');
|
||||
await expect(canvas.getByTestId('query')).toHaveTextContent('timeout');
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,37 @@
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, within } from 'storybook/test';
|
||||
import { Textarea } from '../../src/ui/Textarea/Textarea';
|
||||
|
||||
const meta: Meta<typeof Textarea> = {
|
||||
title: 'UI/Textarea',
|
||||
component: Textarea,
|
||||
parameters: { layout: 'centered' },
|
||||
tags: ['autodocs'],
|
||||
decorators: [
|
||||
(Story) => (
|
||||
<div style={{ width: 360 }}>
|
||||
<Story />
|
||||
</div>
|
||||
),
|
||||
],
|
||||
};
|
||||
export default meta;
|
||||
type Story = StoryObj<typeof Textarea>;
|
||||
|
||||
export const Default: Story = {
|
||||
args: { label: 'Description', placeholder: 'Describe this scenario', rows: 4 },
|
||||
};
|
||||
|
||||
export const WithHint: Story = {
|
||||
args: { label: 'Description', hint: 'Markdown is supported.', rows: 4 },
|
||||
};
|
||||
|
||||
export const WithError: Story = {
|
||||
args: { label: 'Description', error: 'Description is too long.', rows: 4 },
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
const textarea = canvas.getByLabelText('Description');
|
||||
await expect(textarea).toHaveAttribute('aria-invalid', 'true');
|
||||
await expect(canvas.getByRole('alert')).toHaveTextContent('Description is too long.');
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,41 @@
|
||||
import React from 'react';
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, userEvent, within } from 'storybook/test';
|
||||
import { ToastProvider } from '../../src/ui/Toast/ToastProvider';
|
||||
import { useToast } from '../../src/ui/Toast/useToast';
|
||||
import { Button } from '../../src/ui/Button/Button';
|
||||
|
||||
function ToastButtons() {
|
||||
const toast = useToast();
|
||||
return (
|
||||
<div style={{ display: 'flex', gap: 8 }}>
|
||||
<Button onClick={() => toast.success('Scenario run started')}>Success</Button>
|
||||
<Button variant="danger" onClick={() => toast.error('Environment not found')}>
|
||||
Error
|
||||
</Button>
|
||||
<Button variant="secondary" onClick={() => toast.info('Traces are off')}>
|
||||
Info
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
const meta: Meta<typeof ToastProvider> = {
|
||||
title: 'UI/Toast',
|
||||
component: ToastProvider,
|
||||
parameters: { layout: 'centered' },
|
||||
tags: ['autodocs'],
|
||||
args: { durationMs: 3500, children: <ToastButtons /> },
|
||||
};
|
||||
export default meta;
|
||||
type Story = StoryObj<typeof ToastProvider>;
|
||||
|
||||
export const Default: Story = {};
|
||||
|
||||
export const ShowsToast: Story = {
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await userEvent.click(canvas.getByRole('button', { name: 'Success' }));
|
||||
await expect(await within(document.body).findByText('Scenario run started')).toBeVisible();
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,21 @@
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, within } from 'storybook/test';
|
||||
import { UuidBadge } from '../../src/ui/UuidBadge/UuidBadge';
|
||||
|
||||
const meta: Meta<typeof UuidBadge> = {
|
||||
title: 'UI/UuidBadge',
|
||||
component: UuidBadge,
|
||||
parameters: { layout: 'centered' },
|
||||
tags: ['autodocs'],
|
||||
};
|
||||
export default meta;
|
||||
type Story = StoryObj<typeof UuidBadge>;
|
||||
|
||||
export const Default: Story = {
|
||||
args: { id: '61d2b1c2-7664-4dca-974f-436c2ee90b2e' },
|
||||
play: async ({ canvasElement }) => {
|
||||
// Shows a shortened id and keeps the full one in the tooltip
|
||||
const badge = within(canvasElement).getByTitle('61d2b1c2-7664-4dca-974f-436c2ee90b2e');
|
||||
await expect(badge).toHaveTextContent('61d2…0b2e');
|
||||
},
|
||||
};
|
||||
@@ -68,10 +68,12 @@ export function RunsPage() {
|
||||
const sortDirRef = useRef(sortDir);
|
||||
const pageRef = useRef(page);
|
||||
const pageSizeRef = useRef(pageSize);
|
||||
sortByRef.current = sortBy;
|
||||
sortDirRef.current = sortDir;
|
||||
pageRef.current = page;
|
||||
pageSizeRef.current = pageSize;
|
||||
useEffect(() => {
|
||||
sortByRef.current = sortBy;
|
||||
sortDirRef.current = sortDir;
|
||||
pageRef.current = page;
|
||||
pageSizeRef.current = pageSize;
|
||||
}, [sortBy, sortDir, page, pageSize]);
|
||||
|
||||
const load = useCallback(
|
||||
(orderBy: string, orderDir: SortDirection, p: number, limit: number) => {
|
||||
|
||||
@@ -98,7 +98,7 @@ export function ScenarioDetailPage() {
|
||||
|
||||
// Files state
|
||||
const [files, setFiles] = useState<FileMetadata[]>([]);
|
||||
const [filesLoading, setFilesLoading] = useState(false);
|
||||
const [filesLoading, setFilesLoading] = useState(true);
|
||||
const [uploadOpen, setUploadOpen] = useState(false);
|
||||
const [uploadFile, setUploadFile] = useState<File | null>(null);
|
||||
const [uploadExpiresAt, setUploadExpiresAt] = useState('');
|
||||
@@ -106,9 +106,10 @@ export function ScenarioDetailPage() {
|
||||
|
||||
const [usedSnippets, setUsedSnippets] = useState<UsedSnippet[]>([]);
|
||||
|
||||
const loadFiles = useCallback(async () => {
|
||||
// Fetches the files; `filesLoading` starts as true for the fetch from the
|
||||
// load effect, and `loadFiles` sets it for reloads (e.g. after an upload)
|
||||
const fetchFiles = useCallback(async () => {
|
||||
if (!id) return;
|
||||
setFilesLoading(true);
|
||||
try {
|
||||
const result = await scenarioFiles.list(id);
|
||||
setFiles(result.items);
|
||||
@@ -117,6 +118,11 @@ export function ScenarioDetailPage() {
|
||||
}
|
||||
}, [id]);
|
||||
|
||||
const loadFiles = async () => {
|
||||
setFilesLoading(true);
|
||||
await fetchFiles();
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (!id) return;
|
||||
void scenarios
|
||||
@@ -126,7 +132,7 @@ export function ScenarioDetailPage() {
|
||||
setScenarioCreds(s.scenarioCredentials ?? []);
|
||||
})
|
||||
.finally(() => setLoading(false));
|
||||
void loadFiles();
|
||||
void fetchFiles();
|
||||
scenarios
|
||||
.usedSnippets(id)
|
||||
.then(setUsedSnippets)
|
||||
@@ -141,7 +147,7 @@ export function ScenarioDetailPage() {
|
||||
setEnvs(r.data);
|
||||
})
|
||||
.catch(() => {});
|
||||
}, [id, loadFiles]);
|
||||
}, [id, fetchFiles]);
|
||||
|
||||
const openRunModal = () => {
|
||||
// Preselect the scenario's default environment (or the first one) when the
|
||||
|
||||
@@ -68,9 +68,10 @@ export function ScenariosPage() {
|
||||
const [pageSize, setPageSize] = useState(10);
|
||||
const [total, setTotal] = useState(0);
|
||||
|
||||
const load = useCallback(
|
||||
// Fetches a page; `loading` starts as true for the initial fetch from the
|
||||
// effect, and `load` sets it for later ones (no setState inside the effect)
|
||||
const fetchPage = useCallback(
|
||||
(orderBy: string, orderDir: SortDirection, p: number, limit: number) => {
|
||||
setLoading(true);
|
||||
Promise.all([
|
||||
scenarios.list(p, limit, orderBy, orderDir === 'asc' ? 'ASC' : 'DESC'),
|
||||
environments.list(1, 200),
|
||||
@@ -88,9 +89,14 @@ export function ScenariosPage() {
|
||||
[toast],
|
||||
);
|
||||
|
||||
const load = (orderBy: string, orderDir: SortDirection, p: number, limit: number) => {
|
||||
setLoading(true);
|
||||
fetchPage(orderBy, orderDir, p, limit);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
load('updatedAt', 'desc', 1, 10);
|
||||
}, [load]);
|
||||
fetchPage('updatedAt', 'desc', 1, 10);
|
||||
}, [fetchPage]);
|
||||
|
||||
const handleSort = (key: string, dir: SortDirection) => {
|
||||
setSortBy(key);
|
||||
|
||||
@@ -23,7 +23,9 @@ export function SessionsPage() {
|
||||
usePageTitle(t('sessions.title'));
|
||||
const navigate = useNavigate();
|
||||
const [items, setItems] = useState<Session[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
// Loading until the current query's result has arrived (derived, so the
|
||||
// loading effect doesn't have to set state synchronously)
|
||||
const [loadedQuery, setLoadedQuery] = useState<string | null>(null);
|
||||
const [deleteId, setDeleteId] = useState<string | null>(null);
|
||||
const [deleting, setDeleting] = useState(false);
|
||||
const [sortBy, setSortBy] = useState('id');
|
||||
@@ -32,15 +34,18 @@ export function SessionsPage() {
|
||||
const [pageSize, setPageSize] = useState(10);
|
||||
const [total, setTotal] = useState(0);
|
||||
|
||||
const query = `${sortBy}|${sortDir}|${page}|${pageSize}`;
|
||||
const loading = loadedQuery !== query;
|
||||
|
||||
const load = useCallback((orderBy: string, orderDir: SortDirection, p: number, limit: number) => {
|
||||
setLoading(true);
|
||||
const key = `${orderBy}|${orderDir}|${p}|${limit}`;
|
||||
sessions
|
||||
.list(p, limit, orderBy, orderDir === 'asc' ? 'ASC' : 'DESC')
|
||||
.then((res) => {
|
||||
setItems(res.data);
|
||||
setTotal(res.total);
|
||||
})
|
||||
.finally(() => setLoading(false));
|
||||
.finally(() => setLoadedQuery(key));
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
Generated
+4629
-3596
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "liqa",
|
||||
"version": "1.20.0",
|
||||
"version": "1.20.1",
|
||||
"private": true,
|
||||
"engines": {
|
||||
"node": ">=24"
|
||||
|
||||
Reference in new issue
Block a user