IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Variables: Fix for flickering repeat panels (#43447)

Browse Source 
* Variables: Fix for flickering repeat panels

* Refactor: updates after PR comments
This commit is contained in:
Hugo Häggmark 2022-01-10 06:41:18 +01:00 committed by GitHub
parent 34f757ba5a
commit 9d11c9153f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/app/features/dashboard/state/DashboardModel.ts
View File

@ -49,7 +49,12 @@ import { RefreshEvent, TimeRangeUpdatedEvent } from '@grafana/runtime';
import { sortedDeepCloneWithoutNulls } from 'app/core/utils/object';
import { Subscription } from 'rxjs';
import { appEvents } from '../../../core/core';
import { VariablesChanged, VariablesChangedEvent, VariablesChangedInUrl } from '../../variables/types';
import {
VariablesChanged,
VariablesChangedEvent,
VariablesChangedInUrl,
VariablesTimeRangeProcessDone,
} from '../../variables/types';
export interface CloneOptions {
saveVariables?: boolean;
@ -178,6 +183,9 @@ export class DashboardModel {
this.appEventsSubscription = new Subscription();
this.lastRefresh = Date.now();
this.appEventsSubscription.add(appEvents.subscribe(VariablesChanged, this.variablesChangedHandler.bind(this)));
this.appEventsSubscription.add(
appEvents.subscribe(VariablesTimeRangeProcessDone, this.variablesTimeRangeProcessDoneHandler.bind(this))
);
this.appEventsSubscription.add(
appEvents.subscribe(VariablesChangedInUrl, this.variablesChangedInUrlHandler.bind(this))
);
@ -1210,8 +1218,15 @@ export class DashboardModel {
});
}
private variablesChangedHandler(event: VariablesChanged) {
private variablesTimeRangeProcessDoneHandler(event: VariablesTimeRangeProcessDone) {
const processRepeats = event.payload.variableIds.length > 0;
this.variablesChangedHandler(new VariablesChanged({ panelIds: [], refreshAll: true }), processRepeats);
}
private variablesChangedHandler(event: VariablesChanged, processRepeats = true) {
if (processRepeats) {
this.processRepeats();
}
if (event.payload.refreshAll || getTimeSrv().isRefreshOutsideThreshold(this.lastRefresh)) {
this.startRefresh({ refreshAll: true, panelIds: [] });

4
public/app/features/variables/state/actions.ts
View File

@ -23,6 +23,7 @@ import {
VariablesChanged,
VariablesChangedEvent,
VariablesChangedInUrl,
VariablesTimeRangeProcessDone,
VariableWithMultiSupport,
VariableWithOptions,
} from '../types';
@ -571,13 +572,14 @@ export const onTimeRangeUpdated = (
return false;
}) as VariableWithOptions[];
const variableIds = variablesThatNeedRefresh.map((variable) => variable.id);
const promises = variablesThatNeedRefresh.map((variable: VariableWithOptions) =>
dispatch(timeRangeUpdated(toVariableIdentifier(variable)))
);
try {
await Promise.all(promises);
dependencies.events.publish(new VariablesChanged({ panelIds: [], refreshAll: true }));
dependencies.events.publish(new VariablesTimeRangeProcessDone({ variableIds }));
} catch (error) {
console.error(error);
dispatch(notifyApp(createVariableErrorNotification('Template variable service failed', error)));

8
public/app/features/variables/types.ts
View File

@ -162,6 +162,14 @@ export class VariablesChanged extends BusEventWithPayload<VariablesChangedEvent>
static type = 'variables-changed';
}
export interface VariablesTimeRangeProcessDoneEvent {
variableIds: string[];
}
export class VariablesTimeRangeProcessDone extends BusEventWithPayload<VariablesTimeRangeProcessDoneEvent> {
static type = 'variables-time-range-process-done';
}
export class VariablesChangedInUrl extends BusEventWithPayload<VariablesChangedEvent> {
static type = 'variables-changed-in-url';
}