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

Dahboard: Only show "Another session is editing this dashboard" once per edit session (#40485)

Browse Source
This commit is contained in:
An 2021-10-14 14:40:35 -04:00 committed by GitHub
parent 7a35a31929
commit 0c5491d6fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/live/dashboard/dashboardWatcher.ts
View File

@ -1,6 +1,6 @@
import { getGrafanaLiveSrv, locationService } from '@grafana/runtime';
import { getDashboardSrv } from '../../dashboard/services/DashboardSrv';
import { appEvents } from 'app/core/core';
import { appEvents, contextSrv } from 'app/core/core';
import {
AppEvents,
isLiveChannelMessageEvent,
@ -24,12 +24,14 @@ class DashboardWatcher {
editing = false;
lastEditing?: DashboardEvent;
subscription?: Unsubscribable;
hasSeenNotice?: boolean;
setEditingState(state: boolean) {
const changed = (this.editing = state);
this.editing = state;
this.hasSeenNotice = false;
if (changed) {
if (changed && contextSrv.isEditor) {
this.sendEditingState();
}
}
@ -131,10 +133,11 @@ class DashboardWatcher {
this.reloadPage();
}
} else if (showPopup) {
if (action === DashboardEventAction.EditingStarted) {
if (action === DashboardEventAction.EditingStarted && !this.hasSeenNotice) {
const editingEvent = event.message;
const recent = this.getRecentEditingEvent();
if (!recent || recent.message !== editingEvent.message) {
this.hasSeenNotice = true;
appEvents.emit(AppEvents.alertWarning, [
'Another session is editing this dashboard',
editingEvent.message,