@datarailsshared/dr_renderer 1.2.123 → 1.2.126

package/.circleci/config.yml

@@ -29,7 +29,17 @@ jobs:
       - run:
           name: Publish package
           command: npm publish . --access=public
-
+      - run:
+          name: prepare git tag
+          command: |
+            VERSION="1.2.$CIRCLE_BUILD_NUM"
+            git config --global user.email noreplay@circleci.com
+            git config --global user.name circleci
+            git config --global -l
+            git tag -a "$CIRCLE_BRANCH/$VERSION" -m "circleci build"
+            ssh -o "StrictHostKeyChecking no" -T git@bitbucket.org
+            git push --tags origin
+            echo 555
 workflows:
   version: 2
   npm-publish:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.123",
+  "version": "1.2.126",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/highcharts_renderer.js

@@ -447,7 +447,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     cols = this.point.name;
                 }
                 
-                var drOthersInColumn = lodash.find(pivotData.getColKeys(), keys => keys.length && keys.includes('DR_Others')) || [];
+                var drOthersInColumn = lodash.find(pivotData.getColKeys(), keys => keys.length && lodash.includes(keys, 'DR_Others')) || [];
                 if (!lodash.isArray(cols) && drOthersInColumn[0] !== 'DR_Others') {
                     cols = [cols];
                 }
@@ -1378,7 +1378,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var num_cols = col_n_keys.length;
         var num_rows = row_n_keys.length;
 
-        const isOthersIncludedInRow = num_rows === 1 && row_n_keys[0].includes('DR_Others');
+        const isOthersIncludedInRow = num_rows === 1 && lodash.includes(row_n_keys[0], 'DR_Others');
         const othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
 
         lodash.forEach(col_n_keys, function (col_n_value) {
@@ -4406,7 +4406,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.isSystemField = function (field) {
-        var regex = new RegExp("^(FileBox_Name|DataMapper_Name|Doc_ID|Doc_version|Label|Submission_Date|User|table_id|Latest_In_Dim|Tab_name|CP_Name|DT_.+|VT_.+|System_.+)$", "m");
+        var regex = new RegExp("^(Parent_Name|Parent_Id|FileBox_ID|FileBox_Name|DataMapper_Name|Doc_ID|Doc_version|Label|Submission_Date|User|table_id|Latest_In_Dim|Tab_name|CP_Name|DT_.+|VT_.+|System_.+)$", "m");
 
         return (field.category && field.category.includes("")) || regex.test(field.name)
     };
@@ -7895,13 +7895,21 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         // another code for charts and tables
+        let default_show = lodash.get(widget_obj.options, 'chartOptions.default_show.value', 'chart');
 
         let subopts = null;
+        let is_table = false;
 
-        subopts = highchartsRenderer.getSupOptionsForPivot(widget_obj, pivot, true);
-        subopts.onlyOptions = true;
+        if (default_show == "table"){
+            subopts = highchartsRenderer.getOptionsForTable(widget_obj, pivot);
+            is_table = true;
+        }
+        else{
+            subopts = highchartsRenderer.getSupOptionsForPivot(widget_obj, pivot, true);
+            subopts.onlyOptions = true;
+        }
 
-        let hc_options = highchartsRenderer.rhPivotView(res, subopts, false);
+        let hc_options = highchartsRenderer.rhPivotView(res, subopts, is_table);
 
         return hc_options;
     }