@datarailsshared/dr_renderer 1.5.131 → 1.5.133

package/.github/workflows/release.yml

@@ -10,7 +10,7 @@ on:
     branches:
       - 'master'
       - 'main'
-      - 'migration-to-github'
+      - 'move-to-jfrog'
 
 concurrency:
   group: '${{ github.ref }}-${{ github.workflow }}'
@@ -18,7 +18,7 @@ concurrency:
 
 permissions:
   contents: read
-  packages: write
+  packages: read
 
 jobs:
   publish-npm:
@@ -34,12 +34,40 @@ jobs:
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-  publish-gh-packages:
-    name: Publish to GitHub Packages
+  publish-jfrog:
+    name: Publish to JFrog Artifactory
     needs: publish-npm
-    uses: datarails/dr_github_reusable/.github/workflows/npm-publish-gh-packages.yml@main
-    with:
-      node_version: '14.16.1'
-      package_scope: '@datarails'
-      version: ${{ needs.publish-npm.outputs.version }}
-    secrets: inherit
+    if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/move-to-jfrog') }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '14.16.1'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Update package version
+        run: |
+          VERSION="${{ needs.publish-npm.outputs.version }}"
+          sed -i "s/{{cicd_version}}/$VERSION/g" package.json
+          echo "Updated package.json to version $VERSION"
+
+      - name: Configure npm for JFrog Artifactory
+        env:
+          ARTIFACTORY_NPM_REPO: ${{ secrets.ARTIFACTORY_NPM_REPO }}
+          ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
+        run: |
+          REGISTRY_HOST=$(echo "$ARTIFACTORY_NPM_REPO" | sed 's|https://||' | sed 's|/$||')
+          {
+            echo "registry=${ARTIFACTORY_NPM_REPO}"
+            echo "//${REGISTRY_HOST}/:_authToken=${ARTIFACTORY_TOKEN}"
+          } > .npmrc
+          echo "✓ npm configured for JFrog Artifactory"
+
+      - name: Publish to JFrog Artifactory
+        run: npm publish

package/package.json

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

package/src/highcharts_renderer.js

@@ -8238,11 +8238,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 lodash.forEach(values, (value, key) => {
                     const formatInfo = pivotData[type][key] || {};
                     const valueToFloat = parseFloat(value);
-                    const isBlankDate = formatInfo.type === 'Date' && (value === '' || value === '[blank]');
                     const isDate = formatInfo.type === 'Date' && (moment_lib(valueToFloat).isValid() || moment_lib(value, formatInfo.format).isValid());
                     const isNumberFormatting = !isDate && formatInfo.format && highchartsRenderer.isFormattingNumberAxis(pivotData);
 
-                    if (isNumberFormatting || isDate || isBlankDate) {
+                    if (isNumberFormatting || isDate) {
                         values[key] = highchartsRenderer.returnRawDataValue(
                             formatInfo.type,
                             !isNaN(valueToFloat) ? valueToFloat : value,

package/src/options/builders.js

@@ -359,8 +359,8 @@ const withLabelWithPercentagePercentStacked = () => {
         createToggle('hide_subtotals', 'Hide subtotals', false),
         ...createLabelStyleGroup(),
         createDivider(),
-        createCheckbox('show_value', 'Value', false, { clickFn: labelValueClickFn }),
-        createCheckbox('show_out_of_x_axis', '% Out of [X Axis]', true, { clickFn: labelValueClickFn }),
+        createCheckbox('show_value', 'Value', true, { clickFn: labelValueClickFn }),
+        createCheckbox('show_out_of_x_axis', '% Out of [X Axis]', false, { clickFn: labelValueClickFn }),
         createCheckbox('show_out_of_data_series', '% Out of [Data Series]', false, { clickFn: labelValueClickFn }),
         // present_total and show_percentage removed - total is always 100% for percent stacking
     ]);

package/tests/__snapshots__/suboptions.test.js.snap

@@ -469,8 +469,8 @@ Object {
     "shadow": false,
     "show": true,
     "show_out_of_data_series": false,
-    "show_out_of_x_axis": true,
-    "show_value": false,
+    "show_out_of_x_axis": false,
+    "show_value": true,
     "vertical": false,
   },
   "legends_position": Object {
@@ -784,8 +784,8 @@ Object {
     "shadow": false,
     "show": true,
     "show_out_of_data_series": false,
-    "show_out_of_x_axis": true,
-    "show_value": false,
+    "show_out_of_x_axis": false,
+    "show_value": true,
     "vertical": false,
   },
   "legends_position": Object {
@@ -3515,14 +3515,14 @@ Object {
     },
     Object {
       "clickFn": "[Function]",
-      "default_value": false,
+      "default_value": true,
       "element_label": "Value",
       "element_type": "checkbox",
       "value_name": "show_value",
     },
     Object {
       "clickFn": "[Function]",
-      "default_value": true,
+      "default_value": false,
       "element_label": "% Out of [X Axis]",
       "element_type": "checkbox",
       "value_name": "show_out_of_x_axis",

package/tests/highcharts_renderer.test.js

@@ -5120,17 +5120,6 @@ describe('highcharts_renderer', () => {
                 const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
                 expect(formattedKey).toEqual(initialKey);
             });
-
-            // some e2e tests exist that expects this behavior
-            it('should format blank value with [blank] text', () => {
-                const initialKey = ['DR_Others', ''];
-                const pivotData = {
-                    colFormats: [{ type: "Text", name: "Month" }, { type: 'Date', name: "Date" }],
-                };
-                const type = 'colFormats';
-                const formattedKey = highchartsRenderer.getFormattedKey(initialKey, pivotData, type);
-                expect(formattedKey).toEqual(['DR_Others', '[blank]']);
-            });
         });
     });