Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion client/src/app/queries/advisories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ export const useFetchAdvisories = (
labels: Label[] = [],
disableQuery = false,
) => {
const { q, ...rest } = requestParamsQuery(params);
const labelQuery = labelRequestParamsQuery(labels);

const { data, isLoading, error, refetch } = useQuery({
queryKey: [AdvisoriesQueryKey, params, labelQuery],
queryFn: () => {
const { q, ...rest } = requestParamsQuery(params);
return listAdvisories({
client,
query: {
Expand Down
12 changes: 6 additions & 6 deletions client/src/app/queries/sbom-groups.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,20 @@ export const useFetchSBOMGroups = (
> = {},
enabled = true,
) => {
const { q, ...rest } = requestParamsQuery(params);
const parentQuery = parentId ? `parent=${parentId}` : "";

const { data, isLoading, error, refetch } = useQuery({
queryKey: [SBOMGroupsQueryKey, parentId, { params, extraQueryParams }],
queryFn: () =>
listSbomGroups({
queryFn: () => {
const { q, ...rest } = requestParamsQuery(params);
const parentQuery = parentId ? `parent=${parentId}` : "";
return listSbomGroups({
client,
query: {
...rest,
...extraQueryParams,
q: [q, parentQuery].filter((e) => e).join("&"),
},
}),
});
},
enabled,
});

Expand Down
9 changes: 5 additions & 4 deletions client/src/app/queries/sboms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,21 @@ export const useFetchSBOMs = (
labels: Label[] = [],
disableQuery = false,
) => {
const { q, ...rest } = requestParamsQuery(params);
const labelQuery = labelRequestParamsQuery(labels);

const { data, isLoading, error, refetch } = useQuery({
queryKey: [SBOMsQueryKey, groupId, params, labelQuery],
queryFn: () =>
listSboms({
queryFn: () => {
const { q, ...rest } = requestParamsQuery(params);
return listSboms({
client,
query: {
...rest,
group: groupId ? [groupId] : [],
q: [q, labelQuery].filter((e) => e).join("&"),
},
}),
});
},
enabled: !disableQuery,
});
return {
Expand Down
43 changes: 19 additions & 24 deletions client/src/app/queries/vulnerabilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,32 +41,27 @@ export const useFetchVulnerabilities = (
};

export const useFetchVulnerabilitiesByPackageIds = (ids: string[]) => {
const chunks = {
ids: ids.reduce<string[][]>((chunks, item, index) => {
if (index % 100 === 0) {
chunks.push([item]);
} else {
chunks[chunks.length - 1].push(item);
}
return chunks;
}, []),
dataResolver: async (ids: string[]) => {
const response = await analyzeV3({
client,
body: { purls: ids },
});
return response.data ?? null;
},
};
const chunkedIds = ids.reduce<string[][]>((chunks, item, index) => {
if (index % 100 === 0) {
chunks.push([item]);
} else {
chunks[chunks.length - 1].push(item);
}
return chunks;
}, []);

const userQueries = useQueries({
queries: chunks.ids.map((ids) => {
return {
queryKey: [VulnerabilitiesQueryKey, ids],
queryFn: () => chunks.dataResolver(ids),
retry: false,
};
}),
queries: chunkedIds.map((chunkIds) => ({
queryKey: [VulnerabilitiesQueryKey, chunkIds],
queryFn: async () => {
const response = await analyzeV3({
client,
body: { purls: chunkIds },
});
return response.data ?? null;
},
retry: false,
})),
});

const isFetching = userQueries.some(({ isFetching }) => isFetching);
Expand Down
1 change: 0 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ export default defineConfig([
"@typescript-eslint/no-unused-vars": "off",
"@eslint-react/exhaustive-deps": "off",
"@tanstack/query/prefer-query-options": "off",
"@tanstack/query/exhaustive-deps": "off",
},
ignores: [
"client/config/**",
Expand Down
Loading