@datarailsshared/dr_renderer 1.2.14 → 1.2.15

package/.circleci/config.yml

@@ -1,8 +1,7 @@
-# Javascript Node CircleCI 2.0 configuration file
-#
-# Check {{ '/2.0/language-javascript/' | docs_url }} for more details
-#
-version: 2
+version: 2.1
+
+orbs:
+  datarails-cicd-orb: datarails-ns/datarails-cicd-orb@dev:primary
 
 defaults: &defaults
   working_directory: ~/repo
@@ -20,22 +19,67 @@ jobs:
       - run:
           name: Prepare publish version
           command: |
-            VERSION="1.2.$CIRCLE_BUILD_NUM"
+            postfix=""
+            if [[ "${CIRCLE_BRANCH}" != prod ]] ; then
+              postfix="-$CIRCLE_BRANCH"
+            fi
+
+            VERSION="1.2.$CIRCLE_BUILD_NUM$postfix"
             sed -i s/{{cicd_version}}/$VERSION/g ./package.json
             cat ./package.json
       - run:
           name: Authenticate with registry
           command: echo "//registry.npmjs.org/:_authToken=$npm_TOKEN" > ~/repo/.npmrc
+      - run:
+          name: Install dependencies 
+          command: npm install
+      - run:
+          name: Run npm test
+          command: npm test
       - run:
           name: Publish package
           command: npm publish . --access=public
+      - datarails-cicd-orb/add-ssh-id:
+          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:
+          name: prepare git tag
+          command: |
+            postfix=""
+            if [[ "${CIRCLE_BRANCH}" != prod ]] ; then
+              postfix="-$CIRCLE_BRANCH"
+            fi
 
+            VERSION="1.2.$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"
+            # 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
 workflows:
   version: 2
   npm-publish:
     jobs:
       - deploy:
+          context:
+            - metadata
           filters:
             branches:
               only:
                 - /prod.*/
+                - /tigers/
+                - /bratans/
+                - /dragons/
+                - /tigers/
+                - /wizards/
+                - /rocket/

package/babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+    presets: [['@babel/preset-env', {targets: {node: 'current'}}]],
+};

package/jest.config.js

@@ -0,0 +1,27 @@
+module.exports = {
+    clearMocks: true,
+    setupFilesAfterEnv: ['regenerator-runtime/runtime'],
+    testPathIgnorePatterns: [
+        "/node_modules/",
+    ],
+    transformIgnorePatterns: [
+        "<rootDir>/node_modules/(?!jquery|lodash|moment/)",
+    ],
+    collectCoverage: true,
+    collectCoverageFrom: [
+        '**/*.js',
+        '!**/*.config.js',
+        '!**/build/**',
+        '!**/coverage/**',
+        '!**/node_modules/**',
+        '!**/vendor/**'
+    ],
+    // coverageThreshold: {
+    //     "global": {
+    //         "branches": 100,
+    //         "functions": 100,
+    //         "lines": 100,
+    //         "statements": 100
+    //     }
+    // },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.14",
+  "version": "1.2.15",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",
@@ -9,7 +9,8 @@
     "tables"
   ],
   "scripts": {
-    "login": "npm login"
+    "login": "npm login",
+    "test": "jest --coverage"
   },
   "author": "Sergey Spivakov",
   "repository": {
@@ -17,6 +18,21 @@
     "url": "git+https://bitbucket.org/datarails/dr_renderer.git"
   },
   "license": "",
+  "dependencies": {
+    "jquery": "^3.6.0",
+    "lodash": "^4.17.20",
+    "regenerator-runtime": "^0.13.5"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.20.12",
+    "@babel/preset-env": "^7.20.2",
+    "@testing-library/dom": "^7.2.1",
+    "@testing-library/jest-dom": "^5.5.0",
+    "babel-jest": "^25.5.1",
+    "jest": "^25.3.0",
+    "moment": "^2.29.1",
+    "serve": "^11.3.0"
+  },
   "bugs": {
     "url": ""
   },
@@ -24,5 +40,10 @@
   "whitelistedNonPeerDependencies": [],
   "main": "src/index.js",
   "module": "src/index.js",
-  "sideEffects": false
+  "sideEffects": false,
+  "jest": {
+    "setupFiles": [
+      "./setup-jest.js"
+    ]
+  }
 }

package/src/dataformatter.js

@@ -497,6 +497,13 @@ var DataFormatterImpl = function () {
             var minutes = n.getMinutes();
             var seconds = n.getSeconds();
 
+            var padStartTime = function(time) {
+                if (time < 10) {
+                    return '0' + time;
+                }
+                return time;
+            }
+
             // Build res
             var res = pattern.replace(/((?:am\/pm)|(?:a\/p))|(?:(h[^ydsap]*?)mm)|(?:mm([^ydh]*?s))|(?:(h[^ydsap]*?)m)|(?:m([^ydh]*?s))/gi, function (a, ampm, fmin, fmin2, mmin, mmin2) {
 
@@ -506,11 +513,11 @@ var DataFormatterImpl = function () {
                 }
 
                 if (fmin) {
-                    return fmin + _this3.applyNumberPattern(minutes, '00');
+                    return fmin + _this3.applyNumberPattern(padStartTime(minutes), '00');
                 }
 
                 if (fmin2) {
-                    return _this3.applyNumberPattern(minutes, '00') + fmin2;
+                    return _this3.applyNumberPattern(padStartTime(minutes), '00') + fmin2;
                 }
 
                 if (mmin) {
@@ -527,7 +534,7 @@ var DataFormatterImpl = function () {
             return res.replace(/(ss)|(s)|(hh)|(h)|(dddd)|(ddd)|(dd)|(d)|(mmmmm)|(mmmm)|(mmm)|(mm)|(m)|(yyyy)|(yy)|(\[\])/gi, function (a, ss, s, hh, h, dddd, ddd, dd, d, mmmmm, mmmm, mmm, mm, m, yyyy, yy, ampm) {
 
                 if (ss) {
-                    return _this3.applyNumberPattern(seconds, '00');
+                    return _this3.applyNumberPattern(padStartTime(seconds), '00');
                 }
 
                 if (s) {
@@ -535,7 +542,7 @@ var DataFormatterImpl = function () {
                 }
 
                 if (hh) {
-                    return _this3.applyNumberPattern(foundAMPM ? hours % 12 : hours, '00');
+                    return _this3.applyNumberPattern(padStartTime(foundAMPM ? hours % 12 : hours), '00');
                 }
 
                 if (h) {
@@ -858,7 +865,7 @@ var DataFormatterImpl = function () {
                 // Standard condition for negative number
                 case sectionIndex === 1:
                     condition = 'type == "Number" && parseFloat(n) < 0';
-                    shouldAbsNumber = true;
+                    shouldAbsNumber = !!section.match(/\(.*\)/);
                     break;
 
             }
@@ -1003,6 +1010,10 @@ var DataFormatterImpl = function () {
 
                 // Call function
                 result = this.memoized[pattern].call(this, n, type);
+
+                if (result.value === result.pattern && !(String(n) === '0' && result.value.includes('0'))) {
+                    result.value = n;
+                }
             }
             catch (e) {