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

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

Browse Source
This commit is contained in:
Adela Almasan
2024-01-25 08:14:46 -06:00
committed by GitHub
parent 9ba13dd309
commit 22561e8690
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/panel/candlestick/CandlestickPanel.tsx
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
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
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
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
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}
/>
) : (