@datarailsshared/dr_renderer 1.2.462 → 1.3.16

package/.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  datarails-cicd-orb: datarails/datarails-cicd-orb@dev:primary
+  datarails-cicd-orb: datarails-ns/datarails-cicd-orb@dev:primary
 
 defaults: &defaults
   working_directory: ~/repo
@@ -24,7 +24,7 @@ jobs:
               postfix="-$CIRCLE_BRANCH"
             fi
 
-            VERSION="1.2.$CIRCLE_BUILD_NUM$postfix"
+            VERSION="1.3.$CIRCLE_BUILD_NUM$postfix"
             sed -i s/{{cicd_version}}/$VERSION/g ./package.json
             cat ./package.json
       - run:
@@ -40,8 +40,8 @@ jobs:
           name: Publish package
           command: npm publish . --access=public
       - datarails-cicd-orb/add-ssh-id:
-          private_key_env_var: bitbucket_deploy_private_encoded
-          public_key_env_var: bitbucket_deploy_pub_encoded
+          private_key_env_var: github_deploy_private_encoded
+          public_key_env_var: github_deploy_pub_encoded
           is_public_key_encoded: true
           is_private_key_encoded: true
       - run:
@@ -52,14 +52,20 @@ jobs:
               postfix="-$CIRCLE_BRANCH"
             fi
 
-            VERSION="1.2.$CIRCLE_BUILD_NUM$postfix"
+            VERSION="1.3.$CIRCLE_BUILD_NUM$postfix"
             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
+            # Test SSH connection to GitHub
+            output=$(ssh -o "StrictHostKeyChecking no" -T git@github.com 2>&1 || true)
+            echo "$output"
+            if ! echo "$output" | grep -q "Hi.*You've successfully authenticated"; then
+              echo "Failed to authenticate with GitHub"
+              exit 1
+            fi
+            # Push the tag after successful authentication
             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.462",
+  "version": "1.3.16",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/highcharts_renderer.js

@@ -2242,7 +2242,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             return newOptions;
         }
 
-        const rangeArr = [range.low, range.medium, Math.max(range.high || 100, 100)];
+        const rangeArr = [1 * range.low, 1 * range.medium, Math.max(1 * range.high || 100, 100)];
 
         newOptions.segments.forEach((segment, i) => {
             segment.from = (rangeArr[i - 1] + 1) || segment.from;
@@ -2253,7 +2253,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             newOptions.goal = highchartsRenderer.objectCopyJsonMethod(GAUGE_OPTIONS_DEFAULT.goal);
         }
 
-        newOptions.goal.value = range.max || newOptions.goal.value;
+        newOptions.goal.value = 1 * range.max || newOptions.goal.value;
 
         delete newOptions.range;
 

package/tests/highcharts_renderer.test.js

@@ -8771,6 +8771,37 @@ describe('highcharts_renderer', () => {
             }]);
         });
 
+        it('should prepopulate segments with the old range data (string)', () => {
+            const res = highchartsRenderer.transformOldGaugeOptions({
+                opt1: 1,
+                opt2: '2',
+                range: {
+                    low: '20',
+                    medium: '30',
+                    high: '70',
+                    max: '200'
+                }
+            });
+            expect(res.segments).toEqual([{
+                from: 0,
+                to: 20,
+                color: GAUGE_OPTIONS_DEFAULT.segments[0].color,
+                title: GAUGE_OPTIONS_DEFAULT.segments[0].title,
+            },
+            {
+                from: 21,
+                to: 30,
+                color: GAUGE_OPTIONS_DEFAULT.segments[1].color,
+                title: GAUGE_OPTIONS_DEFAULT.segments[1].title
+            },
+            {
+                from: 31,
+                to: 100,
+                color: GAUGE_OPTIONS_DEFAULT.segments[2].color,
+                title: GAUGE_OPTIONS_DEFAULT.segments[2].title
+            }]);
+        });
+
         it('should remove old range object', () => {
             const res = highchartsRenderer.transformOldGaugeOptions({
                 opt1: 1,