Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dashboard filter predicate updates

This commit is contained in:
Nate Kelley 2025-04-17 11:39:30 -06:00
parent 0917ae1120
commit fdb9e47fae
No known key found for this signature in database
GPG Key ID: FD90372AB8D98B4F
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
web/src/api/buster_rest/dashboards/dashboardQueryHelpers.ts
View File

@ -30,7 +30,11 @@ export const useEnsureDashboardConfig = (prefetchData: boolean = true) => {
return null;
});
if (res) {
queryClient.setQueryData(options.queryKey, res);
queryClient.setQueryData(
dashboardQueryKeys.dashboardGetDashboard(res.dashboard.id, res.dashboard.version_number)
.queryKey,
res
);
dashboardResponse = res;
}
}
@ -76,9 +80,10 @@ export const useGetDashboardAndInitializeMetrics = (prefetchData: boolean = true
initializeMetrics(data.metrics);
setOriginalDashboards(data.dashboard);
if (!version_number && data.dashboard.version_number) {
if (data.dashboard.version_number) {
queryClient.setQueryData(
dashboardQueryKeys.dashboardGetDashboard(id, data.dashboard.version_number).queryKey,
dashboardQueryKeys.dashboardGetDashboard(data.dashboard.id, data.dashboard.version_number)
.queryKey,
data
);
}
@ -118,13 +123,12 @@ export const useGetDashboardVersionNumber = (props?: {
};
type PredicateType = (query: Query<BusterDashboardResponse, RustApiError>) => boolean;
const filterMetricPredicate = <PredicateType>((query) => {
const filterDashboardPredicate = <PredicateType>((query) => {
const lastKey = last(query.queryKey);
return (
typeof lastKey === 'number' &&
!!lastKey &&
query.state.data !== undefined &&
typeof query.state.data === 'object' &&
query.state.data !== null &&
'versions' in query.state.data
);
@ -158,7 +162,7 @@ const useGetLatestDashboardVersion = ({ dashboardId }: { dashboardId: string })
const updateLatestVersion = useMemoizedFn(() => {
const queries = queryClient.getQueriesData<BusterDashboardResponse, any>({
queryKey: memoizedKey,
predicate: filterMetricPredicate
predicate: filterDashboardPredicate
});
const newVersion = getLatestVersionNumber(queries);
setLatestVersion(newVersion);
@ -192,7 +196,7 @@ export const useGetLatestDashboardVersionNumber = () => {
const method = useMemoizedFn((dashboardId: string) => {
const queries = queryClient.getQueriesData<BusterDashboardResponse, any>({
queryKey: dashboardQueryKeys.dashboardGetDashboard(dashboardId, null).queryKey.slice(0, -1),
predicate: filterMetricPredicate
predicate: filterDashboardPredicate
});
return getLatestVersionNumber(queries);

2
web/src/api/buster_rest/metrics/getMetricQueryRequests.ts
View File

@ -43,7 +43,7 @@ export const useGetMetric = <TData = IBusterMetric>(
const isLatestVersion =
updatedMetric.version_number === last(updatedMetric.versions)?.version_number;
if (isLatestVersion) setOriginalMetric(updatedMetric);
if (!paramVersionNumber && result?.version_number) {
if (result?.version_number) {
queryClient.setQueryData(
metricsQueryKeys.metricsGetMetric(result.id, result.version_number).queryKey,
updatedMetric