From b935fd14e4ed8013f2bfa3d213338e8ac75d1c3a Mon Sep 17 00:00:00 2001 From: hrutik7 <62372737+hrutik7@users.noreply.github.com> Date: Wed, 3 Aug 2022 17:31:23 +0530 Subject: [PATCH] Graph accordian moved in options (#3305) * graph accordian moved in options * suggested changes in widjetJS * remove blank space in widgetJS in line 240 and 241 * reset operations.json file and plugins pkg lock Co-authored-by: Gandharv --- .../src/Editor/Inspector/Components/Chart.jsx | 61 +++++++++++-------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/frontend/src/Editor/Inspector/Components/Chart.jsx b/frontend/src/Editor/Inspector/Components/Chart.jsx index b4fbd193fa..9e31db12a3 100644 --- a/frontend/src/Editor/Inspector/Components/Chart.jsx +++ b/frontend/src/Editor/Inspector/Components/Chart.jsx @@ -147,18 +147,7 @@ class Chart extends React.Component { }); } - items.push({ - title: 'Loading state', - children: renderElement( - component, - componentMeta, - paramUpdated, - dataQueries, - 'loadingState', - 'properties', - currentState - ), - }); + if (chartType !== 'pie') { if (!plotFromJson) { @@ -177,8 +166,22 @@ class Chart extends React.Component { } items.push({ - title: 'Show axes', - children: renderElement( + title: 'Options', + children: + <> + { + renderElement( + component, + componentMeta, + paramUpdated, + dataQueries, + 'loadingState', + 'properties', + currentState + ) + } + + {renderElement( component, componentMeta, paramUpdated, @@ -186,21 +189,25 @@ class Chart extends React.Component { 'showAxes', 'properties', currentState - ), + )}, + + {renderElement( + component, + componentMeta, + paramUpdated, + dataQueries, + 'showGridLines', + 'properties', + currentState + ) + } + + }); - items.push({ - title: 'Show grid lines', - children: renderElement( - component, - componentMeta, - paramUpdated, - dataQueries, - 'showGridLines', - 'properties', - currentState - ), - }); + + + } items.push({