Skip to content

Bump axios from 1.18.0 to 1.20.0 in /client #2013

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
BryonLewis merged 3 commits into from
Oct 1, 2026
+12 −7
Merged

Bump axios from 1.18.0 to 1.20.0 in /client #2013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cf09c6
Bump axios from 1.18.0 to 1.20.0 in /client
dependabot[bot] Oct 1, 2026
8ad6844
Merge branch 'main' into dependabot/npm_and_yarn/client/axios-1.20.0
BryonLewis Oct 1, 2026
5f6188c
resolve param type issues with axios 1.20
BryonLewis Oct 1, 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
8 changes: 4 additions & 4 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions client/platform/web-girder/api/review.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ const parentConfig = {
customTypeStyling: { fish: { color: '#123456' } },
};

function folderIdFromRequestOptions(options?: { params?: unknown }): string {
const params = options?.params as { folderId?: string } | undefined;
return params?.folderId ?? '';
}

describe('web stereo review through the real platform adapters', () => {
let review: ReviewService;
let scope: ReturnType<typeof effectScope>;
Expand Down Expand Up @@ -86,7 +91,7 @@ describe('web stereo review through the real platform adapters', () => {
if (url === 'dive_dataset/rig/media') return { data: { imageData: [] } } as never;
if (url === 'dive_dataset/rig/configuration') return { data: parentConfig } as never;
if (url === 'dive_annotation/track') {
const folder = options?.params.folderId;
const folder = folderIdFromRequestOptions(options);
if (folder === failCamera) throw new Error('Camera access denied');
return { data: JSON.parse(JSON.stringify(tracks[folder])) } as never;
}
Expand All @@ -105,7 +110,7 @@ describe('web stereo review through the real platform adapters', () => {
throw new Error(`Unexpected GET ${url}`);
});
vi.mocked(girderRest.patch).mockImplementation(async (_url, body, options) => {
const folder = options?.params.folderId;
const folder = folderIdFromRequestOptions(options);
if (folder === failCamera) throw new Error('Write denied');
const { upsert, delete: deleted } = (body as SaveDetectionsArgs).tracks;
tracks[folder] = tracks[folder].filter((item) => !deleted.includes(item.id));
Expand Down Expand Up @@ -196,7 +201,7 @@ describe('web stereo review through the real platform adapters', () => {
review.entries.value[0].items.forEach((item) => review.deleteTrack(item));
await review.save();
expect(tracks).toEqual({ leftFolder: [], rightFolder: [] });
expect(vi.mocked(girderRest.patch).mock.calls.every(([, , options]) => options?.params.folderId !== 'rig')).toBe(true);
expect(vi.mocked(girderRest.patch).mock.calls.every(([, , options]) => folderIdFromRequestOptions(options) !== 'rig')).toBe(true);
});

it('loads each stereo video URL and frame rate without using the parent media', async () => {
Expand Down
Loading