apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Annotations: Prevent creating a new range in unsaved dashboards (#81256)

Browse Source
pull/81265/head
Adela Almasan 1 year ago committed by GitHub
parent 9ba13dd309
commit 22561e8690
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      public/app/plugins/panel/candlestick/CandlestickPanel.tsx
  2. 4
      public/app/plugins/panel/heatmap/HeatmapPanel.tsx
  3. 4
      public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
  4. 4
      public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
  5. 4
      public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx

4
public/app/plugins/panel/candlestick/CandlestickPanel.tsx
Unescape View File

@ -274,7 +274,7 @@ export const CandlestickPanel = ({
return null;
}
if (timeRange2 != null) {
if (enableAnnotationCreation && timeRange2 != null) {
setNewAnnotationRange(timeRange2);
dismiss();
return;
@ -320,7 +320,7 @@ export const CandlestickPanel = ({
annotations={data.annotations ?? []}
config={uplotConfig}
timeZone={timeZone}
newRange={enableAnnotationCreation ? newAnnotationRange : null}
newRange={newAnnotationRange}
setNewRange={setNewAnnotationRange}
/>
) : (

4
public/app/plugins/panel/heatmap/HeatmapPanel.tsx
Unescape View File

@ -248,7 +248,7 @@ export const HeatmapPanel = ({
return null;
}
if (timeRange2 != null) {
if (enableAnnotationCreation && timeRange2 != null) {
setNewAnnotationRange(timeRange2);
dismiss();
return;
@ -286,7 +286,7 @@ export const HeatmapPanel = ({
annotations={data.annotations ?? []}
config={builder}
timeZone={timeZone}
newRange={enableAnnotationCreation ? newAnnotationRange : null}
newRange={newAnnotationRange}
setNewRange={setNewAnnotationRange}
canvasRegionRendering={false}
/>

4
public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
Unescape View File

@ -212,7 +212,7 @@ export const StateTimelinePanel = ({
return null;
}
if (timeRange2 != null) {
if (enableAnnotationCreation && timeRange2 != null) {
setNewAnnotationRange(timeRange2);
dismiss();
return;
@ -249,7 +249,7 @@ export const StateTimelinePanel = ({
annotations={data.annotations ?? []}
config={builder}
timeZone={timeZone}
newRange={enableAnnotationCreation ? newAnnotationRange : null}
newRange={newAnnotationRange}
setNewRange={setNewAnnotationRange}
canvasRegionRendering={false}
/>

4
public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
Unescape View File

@ -240,7 +240,7 @@ export const StatusHistoryPanel = ({
return null;
}
if (timeRange2 != null) {
if (enableAnnotationCreation && timeRange2 != null) {
setNewAnnotationRange(timeRange2);
dismiss();
return;
@ -275,7 +275,7 @@ export const StatusHistoryPanel = ({
annotations={data.annotations ?? []}
config={builder}
timeZone={timeZone}
newRange={enableAnnotationCreation ? newAnnotationRange : null}
newRange={newAnnotationRange}
setNewRange={setNewAnnotationRange}
canvasRegionRendering={false}
/>

4
public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
Unescape View File

@ -118,7 +118,7 @@ export const TimeSeriesPanel = ({
return null;
}
if (timeRange2 != null) {
if (enableAnnotationCreation && timeRange2 != null) {
setNewAnnotationRange(timeRange2);
dismiss();
return;
@ -170,7 +170,7 @@ export const TimeSeriesPanel = ({
annotations={data.annotations ?? []}
config={uplotConfig}
timeZone={timeZone}
newRange={enableAnnotationCreation ? newAnnotationRange : null}
newRange={newAnnotationRange}
setNewRange={setNewAnnotationRange}
/>
) : (

Write Preview
Loading…
Cancel
Save