Skip to content

Commit

Permalink
Resolving conflicts after merge of antlr code (#1021)
Browse files Browse the repository at this point in the history 
* Resolved initial render of bar chart

Signed-off-by: ruchika-narang <[email protected]>

* Made the charts workable after merging of antlr code to main

Signed-off-by: ruchika-narang <[email protected]>

* Changes of condition for userconfigs

Signed-off-by: ruchika-narang <[email protected]>

* Worked on line chart, treemap with the new antlr code

Signed-off-by: ruchika-narang <[email protected]>

Signed-off-by: ruchika-narang <[email protected]>
  • Loading branch information
@ruchika-narang
ruchika-narang authored Sep 13, 2022
1 parent 25bd43b commit 06c4b30
Show file tree
Hide file tree
Showing 10 changed files with 308 additions and 515 deletions.
288 changes: 12 additions & 276 deletions ...ility/public/components/custom_panels/helpers/__tests__/__snapshots__/utils.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,26 +133,7 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
"size": 4,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"label": "Carrier",
"name": "Carrier",
"type": "keyword",
},
],
"metrics": Array [
Object {
"label": "avg(FlightDelayMin)",
"name": "avg(FlightDelayMin)",
"type": "double",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"barwidth": 0.97,
Expand Down Expand Up @@ -617,26 +598,7 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
"size": 4,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"label": "Carrier",
"name": "Carrier",
"type": "keyword",
},
],
"metrics": Array [
Object {
"label": "avg(FlightDelayMin)",
"name": "avg(FlightDelayMin)",
"type": "double",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"barwidth": 0.97,
Expand Down Expand Up @@ -1124,26 +1086,7 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
"size": 4,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"label": "Carrier",
"name": "Carrier",
"type": "keyword",
},
],
"metrics": Array [
Object {
"label": "avg(FlightDelayMin)",
"name": "avg(FlightDelayMin)",
"type": "double",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"barwidth": 0.97,
Expand Down Expand Up @@ -1567,12 +1510,8 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
"defaultAxes": Object {
"xaxis": Array [
Object {
"aggregation": "",
"custom_label": "",
"label": "",
"name": "",
"side": "right",
"type": "",
},
],
"yaxis": Array [
Expand Down Expand Up @@ -1698,34 +1637,7 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
"size": 4,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"aggregation": "",
"custom_label": "",
"label": "",
"name": "",
"side": "right",
"type": "",
},
],
"metrics": Array [
Object {
"label": "avg(FlightDelayMin)",
"name": "avg(FlightDelayMin)",
"type": "double",
},
Object {
"label": "Carrier",
"name": "Carrier",
"type": "keyword",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"category": "Visualizations",
Expand Down Expand Up @@ -2104,12 +2016,8 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
"defaultAxes": Object {
"xaxis": Array [
Object {
"aggregation": "",
"custom_label": "",
"label": "",
"name": "",
"side": "right",
"type": "",
},
],
"yaxis": Array [
Expand Down Expand Up @@ -2235,34 +2143,7 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
"size": 4,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"aggregation": "",
"custom_label": "",
"label": "",
"name": "",
"side": "right",
"type": "",
},
],
"metrics": Array [
Object {
"label": "avg(FlightDelayMin)",
"name": "avg(FlightDelayMin)",
"type": "double",
},
Object {
"label": "Carrier",
"name": "Carrier",
"type": "keyword",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"category": "Visualizations",
Expand Down Expand Up @@ -2695,12 +2576,8 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
"defaultAxes": Object {
"xaxis": Array [
Object {
"aggregation": "",
"custom_label": "",
"label": "",
"name": "",
"side": "right",
"type": "",
},
],
"yaxis": Array [
Expand Down Expand Up @@ -2826,34 +2703,7 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
"size": 4,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"aggregation": "",
"custom_label": "",
"label": "",
"name": "",
"side": "right",
"type": "",
},
],
"metrics": Array [
Object {
"label": "avg(FlightDelayMin)",
"name": "avg(FlightDelayMin)",
"type": "double",
},
Object {
"label": "Carrier",
"name": "Carrier",
"type": "keyword",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"category": "Visualizations",
Expand Down Expand Up @@ -3440,26 +3290,7 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
"size": 4,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"label": "Carrier",
"name": "Carrier",
"type": "keyword",
},
],
"metrics": Array [
Object {
"label": "avg(FlightDelayMin)",
"name": "avg(FlightDelayMin)",
"type": "double",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"category": "Visualizations",
Expand Down Expand Up @@ -3729,26 +3560,7 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
"size": 4,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"label": "Carrier",
"name": "Carrier",
"type": "keyword",
},
],
"metrics": Array [
Object {
"label": "avg(FlightDelayMin)",
"name": "avg(FlightDelayMin)",
"type": "double",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"category": "Visualizations",
Expand Down Expand Up @@ -4041,26 +3853,7 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
"size": 4,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"label": "Carrier",
"name": "Carrier",
"type": "keyword",
},
],
"metrics": Array [
Object {
"label": "avg(FlightDelayMin)",
"name": "avg(FlightDelayMin)",
"type": "double",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"category": "Visualizations",
Expand Down Expand Up @@ -4358,26 +4151,7 @@ exports[`Utils helper functions renders displayVisualization function 4`] = `
"size": 0,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"label": "span(timestamp,1h)",
"name": "span(timestamp,1h)",
"type": "timestamp",
},
],
"metrics": Array [
Object {
"label": "count('ip')",
"name": "count('ip')",
"type": "integer",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"category": "Visualizations",
Expand Down Expand Up @@ -4593,26 +4367,7 @@ exports[`Utils helper functions renders displayVisualization function 4`] = `
"size": 0,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"label": "span(timestamp,1h)",
"name": "span(timestamp,1h)",
"type": "timestamp",
},
],
"metrics": Array [
Object {
"label": "count('ip')",
"name": "count('ip')",
"type": "integer",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"category": "Visualizations",
Expand Down Expand Up @@ -4851,26 +4606,7 @@ exports[`Utils helper functions renders displayVisualization function 4`] = `
"size": 0,
"status": 200,
},
"userConfigs": Object {
"dataConfig": Object {
"valueOptions": Object {
"dimensions": Array [
Object {
"label": "span(timestamp,1h)",
"name": "span(timestamp,1h)",
"type": "timestamp",
},
],
"metrics": Array [
Object {
"label": "count('ip')",
"name": "count('ip')",
"type": "integer",
},
],
},
},
},
"userConfigs": Object {},
},
"vis": Object {
"category": "Visualizations",
Expand Down
Loading

0 comments on commit 06c4b30

Please sign in to comment.