feat: update generate ticks into an array of properties for each axis (…

…#19850) * feat: update generate ticks into an array of properties for each axis * fix: add missing operand * chore: reorder properties to be consistent * fix: update GenerateYAxisTicks to array of strings * fix: change expected property to null
influxdata · Oct 29, 2020 · f6a26ee · f6a26ee
1 parent 8aa3e6a
commit f6a26ee
Show file tree

Hide file tree

Showing 19 changed files with 196 additions and 90 deletions.
diff --git a/dashboard.go b/dashboard.go
@@ -716,12 +716,13 @@ type LinePlusSingleStatProperties struct {
 	DecimalPlaces              DecimalPlaces    `json:"decimalPlaces"`
 	Note                       string           `json:"note"`
 	ShowNoteWhenEmpty          bool             `json:"showNoteWhenEmpty"`
-	GenerateAxisTicks          bool             `json:"generateAxisTicks"`
 	XColumn                    string           `json:"xColumn"`
+	GenerateXAxisTicks         []string         `json:"generateXAxisTicks"`
 	XTotalTicks                int              `json:"xTotalTicks"`
 	XTickStart                 float64          `json:"xTickStart"`
 	XTickStep                  float64          `json:"xTickStep"`
 	YColumn                    string           `json:"yColumn"`
+	GenerateYAxisTicks         []string         `json:"generateYAxisTicks"`
 	YTotalTicks                int              `json:"yTotalTicks"`
 	YTickStart                 float64          `json:"yTickStart"`
 	YTickStep                  float64          `json:"yTickStep"`
@@ -744,12 +745,13 @@ type XYViewProperties struct {
 	ViewColors                 []ViewColor      `json:"colors"`
 	Note                       string           `json:"note"`
 	ShowNoteWhenEmpty          bool             `json:"showNoteWhenEmpty"`
-	GenerateAxisTicks          bool             `json:"generateAxisTicks"`
 	XColumn                    string           `json:"xColumn"`
+	GenerateXAxisTicks         []string         `json:"generateXAxisTicks"`
 	XTotalTicks                int              `json:"xTotalTicks"`
 	XTickStart                 float64          `json:"xTickStart"`
 	XTickStep                  float64          `json:"xTickStep"`
 	YColumn                    string           `json:"yColumn"`
+	GenerateYAxisTicks         []string         `json:"generateYAxisTicks"`
 	YTotalTicks                int              `json:"yTotalTicks"`
 	YTickStart                 float64          `json:"yTickStart"`
 	YTickStep                  float64          `json:"yTickStep"`
@@ -774,12 +776,13 @@ type BandViewProperties struct {
 	ShowNoteWhenEmpty          bool             `json:"showNoteWhenEmpty"`
 	TimeFormat                 string           `json:"timeFormat"`
 	HoverDimension             string           `json:"hoverDimension"`
-	GenerateAxisTicks          bool             `json:"generateAxisTicks"`
 	XColumn                    string           `json:"xColumn"`
+	GenerateXAxisTicks         []string         `json:"generateXAxisTicks"`
 	XTotalTicks                int              `json:"xTotalTicks"`
 	XTickStart                 float64          `json:"xTickStart"`
 	XTickStep                  float64          `json:"xTickStep"`
 	YColumn                    string           `json:"yColumn"`
+	GenerateYAxisTicks         []string         `json:"generateYAxisTicks"`
 	YTotalTicks                int              `json:"yTotalTicks"`
 	YTickStart                 float64          `json:"yTickStart"`
 	YTickStep                  float64          `json:"yTickStep"`
@@ -797,13 +800,6 @@ type CheckViewProperties struct {
 	CheckID                    string           `json:"checkID"`
 	Queries                    []DashboardQuery `json:"queries"`
 	ViewColors                 []string         `json:"colors"`
-	GenerateAxisTicks          bool             `json:"generateAxisTicks"`
-	XTotalTicks                int              `json:"xTotalTicks"`
-	XTickStart                 float64          `json:"xTickStart"`
-	XTickStep                  float64          `json:"xTickStep"`
-	YTotalTicks                int              `json:"yTotalTicks"`
-	YTickStart                 float64          `json:"yTickStart"`
-	YTickStep                  float64          `json:"yTickStep"`
 	LegendColorizeRows         bool             `json:"legendColorizeRows"`
 	LegendOpacity              float64          `json:"legendOpacity"`
 	LegendOrientationThreshold int              `json:"legendOrientationThreshold"`
@@ -847,12 +843,13 @@ type HeatmapViewProperties struct {
 	Queries                    []DashboardQuery `json:"queries"`
 	ViewColors                 []string         `json:"colors"`
 	BinSize                    int32            `json:"binSize"`
-	GenerateAxisTicks          bool             `json:"generateAxisTicks"`
 	XColumn                    string           `json:"xColumn"`
+	GenerateXAxisTicks         []string         `json:"generateXAxisTicks"`
 	XTotalTicks                int              `json:"xTotalTicks"`
 	XTickStart                 float64          `json:"xTickStart"`
 	XTickStep                  float64          `json:"xTickStep"`
 	YColumn                    string           `json:"yColumn"`
+	GenerateYAxisTicks         []string         `json:"generateYAxisTicks"`
 	YTotalTicks                int              `json:"yTotalTicks"`
 	YTickStart                 float64          `json:"yTickStart"`
 	YTickStep                  float64          `json:"yTickStep"`
@@ -879,12 +876,13 @@ type ScatterViewProperties struct {
 	ViewColors                 []string         `json:"colors"`
 	FillColumns                []string         `json:"fillColumns"`
 	SymbolColumns              []string         `json:"symbolColumns"`
-	GenerateAxisTicks          bool             `json:"generateAxisTicks"`
 	XColumn                    string           `json:"xColumn"`
+	GenerateXAxisTicks         []string         `json:"generateXAxisTicks"`
 	XTotalTicks                int              `json:"xTotalTicks"`
 	XTickStart                 float64          `json:"xTickStart"`
 	XTickStep                  float64          `json:"xTickStep"`
 	YColumn                    string           `json:"yColumn"`
+	GenerateYAxisTicks         []string         `json:"generateYAxisTicks"`
 	YTotalTicks                int              `json:"yTotalTicks"`
 	YTickStart                 float64          `json:"yTickStart"`
 	YTickStep                  float64          `json:"yTickStep"`
@@ -910,8 +908,8 @@ type MosaicViewProperties struct {
 	Queries                    []DashboardQuery `json:"queries"`
 	ViewColors                 []string         `json:"colors"`
 	FillColumns                []string         `json:"fillColumns"`
-	GenerateAxisTicks          bool             `json:"generateAxisTicks"`
 	XColumn                    string           `json:"xColumn"`
+	GenerateXAxisTicks         []string         `json:"generateXAxisTicks"`
 	XTotalTicks                int              `json:"xTotalTicks"`
 	XTickStart                 float64          `json:"xTickStart"`
 	XTickStep                  float64          `json:"xTickStep"`

diff --git a/dashboard_test.go b/dashboard_test.go
@@ -48,12 +48,13 @@ func TestView_MarshalJSON(t *testing.T) {
     "geom": "",
     "note": "",
     "showNoteWhenEmpty": false,
-		"generateAxisTicks": false,
 		"xColumn": "",
+		"generateXAxisTicks": null,
 		"xTotalTicks": 0,
 		"xTickStart": 0,
 		"xTickStep": 0,
 		"yColumn": "",
+		"generateYAxisTicks": null,
 		"yTotalTicks": 0,
 		"yTickStart": 0,
 		"yTickStep": 0,

diff --git a/http/dashboard_test.go b/http/dashboard_test.go
@@ -464,12 +464,13 @@ func TestService_handleGetDashboard(t *testing.T) {
 			"showNoteWhenEmpty": false,
 			"timeFormat": "",
 			"type": "xy",
-			"generateAxisTicks": false,
 			"xColumn": "",
+			"generateXAxisTicks": null,
 			"xTotalTicks": 0,
 			"xTickStart": 0,
 			"xTickStep": 0,
 			"yColumn": "",
+			"generateYAxisTicks": null,
 			"yTotalTicks": 0,
 			"yTickStart": 0,
 			"yTickStep": 0,
@@ -991,12 +992,13 @@ func TestService_handlePostDashboard(t *testing.T) {
 								"showNoteWhenEmpty": false,
 								"timeFormat": "",
 								"type": "",
-								"generateAxisTicks": false,
 								"xColumn": "",
+								"generateXAxisTicks": null,
 								"xTotalTicks": 0,
 								"xTickStart": 0,
 								"xTickStep": 0,
 								"yColumn": "",
+								"generateYAxisTicks": null,
 								"yTotalTicks": 0,
 								"yTickStart": 0,
 								"yTickStep": 0,

diff --git a/http/swagger.yml b/http/swagger.yml
@@ -8976,10 +8976,12 @@ components:
           $ref: "#/components/schemas/Axes"
         legend:
           $ref: "#/components/schemas/Legend"
-        generateAxisTicks:
-          type: boolean
         xColumn:
           type: string
+        generateXAxisTicks:
+          type: array
+          items:
+            type: string
         xTotalTicks:
           type: integer
         xTickStart:
@@ -8990,6 +8992,10 @@ components:
           format: float
         yColumn:
           type: string
+        generateYAxisTicks:
+          type: array
+          items:
+            type: string
         yTotalTicks:
           type: integer
         yTickStart:
@@ -9057,10 +9063,12 @@ components:
           $ref: "#/components/schemas/Axes"
         legend:
           $ref: "#/components/schemas/Legend"
-        generateAxisTicks:
-          type: boolean
         xColumn:
           type: string
+        generateXAxisTicks:
+          type: array
+          items:
+            type: string
         xTotalTicks:
           type: integer
         xTickStart:
@@ -9071,6 +9079,10 @@ components:
           format: float
         yColumn:
           type: string
+        generateYAxisTicks:
+          type: array
+          items:
+            type: string
         yTotalTicks:
           type: integer
         yTickStart:
@@ -9139,10 +9151,12 @@ components:
           $ref: "#/components/schemas/Axes"
         legend:
           $ref: "#/components/schemas/Legend"
-        generateAxisTicks:
-          type: boolean
         xColumn:
           type: string
+        generateXAxisTicks:
+          type: array
+          items:
+            type: string
         xTotalTicks:
           type: integer
         xTickStart:
@@ -9153,6 +9167,10 @@ components:
           format: float
         yColumn:
           type: string
+        generateYAxisTicks:
+          type: array
+          items:
+            type: string
         yTotalTicks:
           type: integer
         yTickStart:
@@ -9225,10 +9243,12 @@ components:
         showNoteWhenEmpty:
           description: If true, will display note when empty
           type: boolean
-        generateAxisTicks:
-          type: boolean
         xColumn:
           type: string
+        generateXAxisTicks:
+          type: array
+          items:
+            type: string
         xTotalTicks:
           type: integer
         xTickStart:
@@ -9318,10 +9338,12 @@ components:
         showNoteWhenEmpty:
           description: If true, will display note when empty
           type: boolean
-        generateAxisTicks:
-          type: boolean
         xColumn:
           type: string
+        generateXAxisTicks:
+          type: array
+          items:
+            type: string
         xTotalTicks:
           type: integer
         xTickStart:
@@ -9332,6 +9354,10 @@ components:
           format: float
         yColumn:
           type: string
+        generateYAxisTicks:
+          type: array
+          items:
+            type: string
         yTotalTicks:
           type: integer
         yTickStart:
@@ -9420,10 +9446,12 @@ components:
         showNoteWhenEmpty:
           description: If true, will display note when empty
           type: boolean
-        generateAxisTicks:
-          type: boolean
         xColumn:
           type: string
+        generateXAxisTicks:
+          type: array
+          items:
+            type: string
         xTotalTicks:
           type: integer
         xTickStart:
@@ -9434,6 +9462,10 @@ components:
           format: float
         yColumn:
           type: string
+        generateYAxisTicks:
+          type: array
+          items:
+            type: string
         yTotalTicks:
           type: integer
         yTickStart:

diff --git a/pkger/clone_resource.go b/pkger/clone_resource.go
@@ -753,12 +753,13 @@ func convertCellView(cell influxdb.Cell) chart {
 		ch.Kind = chartKindHeatMap
 		ch.Queries = convertQueries(p.Queries)
 		ch.Colors = stringsToColors(p.ViewColors)
-		ch.GenerateAxisTicks = p.GenerateAxisTicks
 		ch.XCol = p.XColumn
+		ch.GenerateXAxisTicks = p.GenerateXAxisTicks
 		ch.XTotalTicks = p.XTotalTicks
 		ch.XTickStart = p.XTickStart
 		ch.XTickStep = p.XTickStep
 		ch.YCol = p.YColumn
+		ch.GenerateYAxisTicks = p.GenerateYAxisTicks
 		ch.YTotalTicks = p.YTotalTicks
 		ch.YTickStart = p.YTickStart
 		ch.YTickStep = p.YTickStep
@@ -796,12 +797,13 @@ func convertCellView(cell influxdb.Cell) chart {
 		ch.Axes = convertAxes(p.Axes)
 		ch.Shade = p.ShadeBelow
 		ch.HoverDimension = p.HoverDimension
-		ch.GenerateAxisTicks = p.GenerateAxisTicks
 		ch.XCol = p.XColumn
+		ch.GenerateXAxisTicks = p.GenerateXAxisTicks
 		ch.XTotalTicks = p.XTotalTicks
 		ch.XTickStart = p.XTickStart
 		ch.XTickStep = p.XTickStep
 		ch.YCol = p.YColumn
+		ch.GenerateYAxisTicks = p.GenerateYAxisTicks
 		ch.YTotalTicks = p.YTotalTicks
 		ch.YTickStart = p.YTickStart
 		ch.YTickStep = p.YTickStep
@@ -818,8 +820,8 @@ func convertCellView(cell influxdb.Cell) chart {
 		ch.Kind = chartKindMosaic
 		ch.Queries = convertQueries(p.Queries)
 		ch.Colors = stringsToColors(p.ViewColors)
-		ch.GenerateAxisTicks = p.GenerateAxisTicks
 		ch.XCol = p.XColumn
+		ch.GenerateXAxisTicks = p.GenerateXAxisTicks
 		ch.XTotalTicks = p.XTotalTicks
 		ch.XTickStart = p.XTickStart
 		ch.XTickStep = p.XTickStep
@@ -837,12 +839,13 @@ func convertCellView(cell influxdb.Cell) chart {
 		ch.Kind = chartKindScatter
 		ch.Queries = convertQueries(p.Queries)
 		ch.Colors = stringsToColors(p.ViewColors)
-		ch.GenerateAxisTicks = p.GenerateAxisTicks
 		ch.XCol = p.XColumn
+		ch.GenerateXAxisTicks = p.GenerateXAxisTicks
 		ch.XTotalTicks = p.XTotalTicks
 		ch.XTickStart = p.XTickStart
 		ch.XTickStep = p.XTickStep
 		ch.YCol = p.YColumn
+		ch.GenerateYAxisTicks = p.GenerateYAxisTicks
 		ch.YTotalTicks = p.YTotalTicks
 		ch.YTickStart = p.YTickStart
 		ch.YTickStep = p.YTickStep
@@ -879,12 +882,13 @@ func convertCellView(cell influxdb.Cell) chart {
 		ch.Axes = convertAxes(p.Axes)
 		ch.Geom = p.Geom
 		ch.HoverDimension = p.HoverDimension
-		ch.GenerateAxisTicks = p.GenerateAxisTicks
 		ch.XCol = p.XColumn
+		ch.GenerateXAxisTicks = p.GenerateXAxisTicks
 		ch.XTotalTicks = p.XTotalTicks
 		ch.XTickStart = p.XTickStart
 		ch.XTickStep = p.XTickStep
 		ch.YCol = p.YColumn
+		ch.GenerateYAxisTicks = p.GenerateYAxisTicks
 		ch.YTotalTicks = p.YTotalTicks
 		ch.YTickStart = p.YTickStart
 		ch.YTickStep = p.YTickStep
@@ -902,12 +906,13 @@ func convertCellView(cell influxdb.Cell) chart {
 		ch.Geom = p.Geom
 		ch.Shade = p.ShadeBelow
 		ch.HoverDimension = p.HoverDimension
-		ch.GenerateAxisTicks = p.GenerateAxisTicks
 		ch.XCol = p.XColumn
+		ch.GenerateXAxisTicks = p.GenerateXAxisTicks
 		ch.XTotalTicks = p.XTotalTicks
 		ch.XTickStart = p.XTickStart
 		ch.XTickStep = p.XTickStep
 		ch.YCol = p.YColumn
+		ch.GenerateYAxisTicks = p.GenerateYAxisTicks
 		ch.YTotalTicks = p.YTotalTicks
 		ch.YTickStart = p.YTickStart
 		ch.YTickStep = p.YTickStep
@@ -969,6 +974,14 @@ func convertChartToResource(ch chart) Resource {
 		r[fieldChartFillColumns] = ch.FillColumns
 	}
 
+	if len(ch.GenerateXAxisTicks) > 0 {
+		r[fieldChartGenerateXAxisTicks] = ch.GenerateXAxisTicks
+	}
+
+	if len(ch.GenerateYAxisTicks) > 0 {
+		r[fieldChartGenerateYAxisTicks] = ch.GenerateYAxisTicks
+	}
+
 	if zero := new(tableOptions); ch.TableOptions != *zero {
 		tRes := make(Resource)
 		assignNonZeroBools(tRes, map[string]bool{
@@ -1001,7 +1014,6 @@ func convertChartToResource(ch chart) Resource {
 	assignNonZeroBools(r, map[string]bool{
 		fieldChartNoteOnEmpty:        ch.NoteOnEmpty,
 		fieldChartShade:              ch.Shade,
-		fieldChartGenerateAxisTicks:  ch.GenerateAxisTicks,
 		fieldChartLegendColorizeRows: ch.LegendColorizeRows,
 	})