mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Annotations: Prevent creating a new range in unsaved dashboards (#81256)
This commit is contained in:
parent
9ba13dd309
commit
22561e8690
@ -274,7 +274,7 @@ export const CandlestickPanel = ({
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (timeRange2 != null) {
|
if (enableAnnotationCreation && timeRange2 != null) {
|
||||||
setNewAnnotationRange(timeRange2);
|
setNewAnnotationRange(timeRange2);
|
||||||
dismiss();
|
dismiss();
|
||||||
return;
|
return;
|
||||||
@ -320,7 +320,7 @@ export const CandlestickPanel = ({
|
|||||||
annotations={data.annotations ?? []}
|
annotations={data.annotations ?? []}
|
||||||
config={uplotConfig}
|
config={uplotConfig}
|
||||||
timeZone={timeZone}
|
timeZone={timeZone}
|
||||||
newRange={enableAnnotationCreation ? newAnnotationRange : null}
|
newRange={newAnnotationRange}
|
||||||
setNewRange={setNewAnnotationRange}
|
setNewRange={setNewAnnotationRange}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
|
@ -248,7 +248,7 @@ export const HeatmapPanel = ({
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (timeRange2 != null) {
|
if (enableAnnotationCreation && timeRange2 != null) {
|
||||||
setNewAnnotationRange(timeRange2);
|
setNewAnnotationRange(timeRange2);
|
||||||
dismiss();
|
dismiss();
|
||||||
return;
|
return;
|
||||||
@ -286,7 +286,7 @@ export const HeatmapPanel = ({
|
|||||||
annotations={data.annotations ?? []}
|
annotations={data.annotations ?? []}
|
||||||
config={builder}
|
config={builder}
|
||||||
timeZone={timeZone}
|
timeZone={timeZone}
|
||||||
newRange={enableAnnotationCreation ? newAnnotationRange : null}
|
newRange={newAnnotationRange}
|
||||||
setNewRange={setNewAnnotationRange}
|
setNewRange={setNewAnnotationRange}
|
||||||
canvasRegionRendering={false}
|
canvasRegionRendering={false}
|
||||||
/>
|
/>
|
||||||
|
@ -212,7 +212,7 @@ export const StateTimelinePanel = ({
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (timeRange2 != null) {
|
if (enableAnnotationCreation && timeRange2 != null) {
|
||||||
setNewAnnotationRange(timeRange2);
|
setNewAnnotationRange(timeRange2);
|
||||||
dismiss();
|
dismiss();
|
||||||
return;
|
return;
|
||||||
@ -249,7 +249,7 @@ export const StateTimelinePanel = ({
|
|||||||
annotations={data.annotations ?? []}
|
annotations={data.annotations ?? []}
|
||||||
config={builder}
|
config={builder}
|
||||||
timeZone={timeZone}
|
timeZone={timeZone}
|
||||||
newRange={enableAnnotationCreation ? newAnnotationRange : null}
|
newRange={newAnnotationRange}
|
||||||
setNewRange={setNewAnnotationRange}
|
setNewRange={setNewAnnotationRange}
|
||||||
canvasRegionRendering={false}
|
canvasRegionRendering={false}
|
||||||
/>
|
/>
|
||||||
|
@ -240,7 +240,7 @@ export const StatusHistoryPanel = ({
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (timeRange2 != null) {
|
if (enableAnnotationCreation && timeRange2 != null) {
|
||||||
setNewAnnotationRange(timeRange2);
|
setNewAnnotationRange(timeRange2);
|
||||||
dismiss();
|
dismiss();
|
||||||
return;
|
return;
|
||||||
@ -275,7 +275,7 @@ export const StatusHistoryPanel = ({
|
|||||||
annotations={data.annotations ?? []}
|
annotations={data.annotations ?? []}
|
||||||
config={builder}
|
config={builder}
|
||||||
timeZone={timeZone}
|
timeZone={timeZone}
|
||||||
newRange={enableAnnotationCreation ? newAnnotationRange : null}
|
newRange={newAnnotationRange}
|
||||||
setNewRange={setNewAnnotationRange}
|
setNewRange={setNewAnnotationRange}
|
||||||
canvasRegionRendering={false}
|
canvasRegionRendering={false}
|
||||||
/>
|
/>
|
||||||
|
@ -118,7 +118,7 @@ export const TimeSeriesPanel = ({
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (timeRange2 != null) {
|
if (enableAnnotationCreation && timeRange2 != null) {
|
||||||
setNewAnnotationRange(timeRange2);
|
setNewAnnotationRange(timeRange2);
|
||||||
dismiss();
|
dismiss();
|
||||||
return;
|
return;
|
||||||
@ -170,7 +170,7 @@ export const TimeSeriesPanel = ({
|
|||||||
annotations={data.annotations ?? []}
|
annotations={data.annotations ?? []}
|
||||||
config={uplotConfig}
|
config={uplotConfig}
|
||||||
timeZone={timeZone}
|
timeZone={timeZone}
|
||||||
newRange={enableAnnotationCreation ? newAnnotationRange : null}
|
newRange={newAnnotationRange}
|
||||||
setNewRange={setNewAnnotationRange}
|
setNewRange={setNewAnnotationRange}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
|
Loading…
Reference in New Issue
Block a user