fix(chart): closes fgpv-vpgf#379 fgpv-vpgf#359 and move control left

raviinder · Feb 22, 2022 · cfcbd3b · cfcbd3b
1 parent ac00384
commit cfcbd3b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/chart/src/chart-controls.ts b/chart/src/chart-controls.ts
@@ -75,7 +75,7 @@ export class ChartControls {
         });
 
         // add the control to panel header
-        panel.header._header.find('.rv-header-content')[0].after(this.compileTemplate(CHART_SELECT_TEMPLATE)[0]);
+        panel.header._header.find('.rv-header-content')[0].before(this.compileTemplate(CHART_SELECT_TEMPLATE)[0]);
     }
 
     /**
@@ -85,7 +85,8 @@ export class ChartControls {
      * @param {Number} selectedLabel selected label
      */
     private createChart(selectedChart: string, selectedLabel: [number]): void {
-        const item = JSON.parse(JSON.stringify(ChartParser.getItem(selectedChart)));
+        const origItem = ChartParser.getItem(selectedChart);
+        const item = JSON.parse(JSON.stringify(origItem));
         const colors = item.config.options.colors === '' ? ChartLoader.defaultColors : item.config.options.colors.split(';');
         item.config.layers[0].data = item.config.layers[0].data.map((obj, i) => {
             return ({ ...obj, color: colors[i] });
@@ -101,7 +102,7 @@ export class ChartControls {
             // Display Label combo.
             $('.rv-chart-label-select').css('display', 'block');
             // Hide and show multi check / single item combo on the basis of items.
-            if (item.config.layers[0].data.length > 1) {
+            if (origItem.config.layers[0].data.length > 1) {
                 $('.multiple-select').css('display', 'block');
                 $('.single-select').css('display', 'none');
             }

diff --git a/chart/src/chart-parser.ts b/chart/src/chart-parser.ts
@@ -212,7 +212,7 @@ export class ChartParser {
             item.config.layers[0].data = item.config.layers[0].data
                 .map((obj, i) => {
                     let key = this.ascii(obj.measure);
-                    if (labelArrayLength === 0) {
+                    if (labelArrayLength === 0 || item.config.layers[0].data.length === 1) {
                         self.selectedLabel.push(key);
                         self.selectedSingleLabel = key;
                     }

diff --git a/chart/src/main.scss b/chart/src/main.scss
@@ -151,7 +151,7 @@
         margin-left: 40px;
 
         & #nouisliderX {
-            width: 97%;
+            width: 94.5%;
         }
     }
 }