Annotations: Prevent creating on unsaved dashboard (#81200)

2 years ago · 9da3db1ddf
parent 1d25039674
commit 9da3db1ddf
5 changed files with 7 additions and 7 deletions
--- a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
+++ b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
@ -299,8 +299,8 @@ export const CandlestickPanel = ({
                    />
                  );
                }}
-                maxWidth={options.tooltip.maxWidth}
-                maxHeight={options.tooltip.maxHeight}
+                maxWidth={options.tooltip?.maxWidth}
+                maxHeight={options.tooltip?.maxHeight}
              />
            ) : (
              <>
@ -320,7 +320,7 @@ export const CandlestickPanel = ({
                annotations={data.annotations ?? []}
                config={uplotConfig}
                timeZone={timeZone}
-                newRange={newAnnotationRange}
+                newRange={enableAnnotationCreation ? newAnnotationRange : null}
                setNewRange={setNewAnnotationRange}
              />
            ) : (
--- a/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
+++ b/public/app/plugins/panel/heatmap/HeatmapPanel.tsx
@ -286,7 +286,7 @@ export const HeatmapPanel = ({
                  annotations={data.annotations ?? []}
                  config={builder}
                  timeZone={timeZone}
-                  newRange={newAnnotationRange}
+                  newRange={enableAnnotationCreation ? newAnnotationRange : null}
                  setNewRange={setNewAnnotationRange}
                  canvasRegionRendering={false}
                />
--- a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
+++ b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
@ -249,7 +249,7 @@ export const StateTimelinePanel = ({
                  annotations={data.annotations ?? []}
                  config={builder}
                  timeZone={timeZone}
-                  newRange={newAnnotationRange}
+                  newRange={enableAnnotationCreation ? newAnnotationRange : null}
                  setNewRange={setNewAnnotationRange}
                  canvasRegionRendering={false}
                />
--- a/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
+++ b/public/app/plugins/panel/status-history/StatusHistoryPanel.tsx
@ -275,7 +275,7 @@ export const StatusHistoryPanel = ({
                  annotations={data.annotations ?? []}
                  config={builder}
                  timeZone={timeZone}
-                  newRange={newAnnotationRange}
+                  newRange={enableAnnotationCreation ? newAnnotationRange : null}
                  setNewRange={setNewAnnotationRange}
                  canvasRegionRendering={false}
                />
--- a/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
+++ b/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
@ -170,7 +170,7 @@ export const TimeSeriesPanel = ({
                annotations={data.annotations ?? []}
                config={uplotConfig}
                timeZone={timeZone}
-                newRange={newAnnotationRange}
+                newRange={enableAnnotationCreation ? newAnnotationRange : null}
                setNewRange={setNewAnnotationRange}
              />
            ) : (