Merge pull request #96 from qlik-oss/atq/fixDeploy

fix: Environment Setup not needed for deploy

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/qlik-smart-pivot
   docker:
-    - image: circleci/node:stretch
+    - image: circleci/node:16.13.0
   environment:
     GITHUB_ORG: "qlik-oss"
     GITHUB_REPO: "PLSmartPivot"
@@ -12,20 +12,12 @@ defaults: &defaults
 jobs:
   test:
     docker:
-    - image: circleci/node:stretch-browsers
+    - image: circleci/node:16.13.0-browsers
     steps:
       - checkout
       - run:
           name: Install dependencies
           command: npm install
-      - run:
-          name: BlackDuck scan
-          command: curl -s https://detect.synopsys.com/detect.sh | bash -s -- \
-            --blackduck.url="https://qliktech.blackducksoftware.com" \
-            --blackduck.trust.cert=true \
-            --blackduck.username="svc-blackduck" \
-            --blackduck.password=${svc_blackduck} \
-            --detect.project.name="viz-bundle-qlik-smart-pivot"
 
   bump-version:
     <<: *defaults
@@ -43,6 +35,10 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - run:
+          name: Setup environment
+          command: |
+           sudo chmod +x ./.circleci/upgrade-node.sh
       - attach_workspace:
           at: ~/qlik-smart-pivot
       - run:

.circleci/upgrade-node.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -eo pipefail
+
+NVM_DIR="/opt/circleci/.nvm"
+NODE_VERSION="v16"
+
+curl -o-  https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+
+echo "Installing Node $NODE_VERSION"
+nvm install $NODE_VERSION
+nvm alias default $NODE_VERSION
+
+# Each step uses the same `$BASH_ENV`, so need to modify it
+echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
+echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV

gulpfile.js

@@ -24,7 +24,8 @@ gulp.task('qext', function () {
 		repository: pkg.repository,
 		dependencies: {
 			'qlik-sense': '>=5.5.x'
-		}
+		},
+		__next: true
 	};
 	if (pkg.contributors) {
 		qext.contributors = pkg.contributors;

src/data-table/index.jsx

@@ -143,15 +143,13 @@ class DataTable extends React.PureComponent {
                     }
 
                     // eslint-disable-next-line no-shadow
-                    const { dimension1: dimension1Info, dimension2, measurement } = measurementData.parents;
-                    const id = `${dimension1Info.elementNumber}-${dimension2 && dimension2.elementNumber}-${measurement.header}-${measurement.index}`;
                     return (
                       <DataCell
                         cellWidth={cellWidth}
                         component={component}
                         data={data}
                         general={general}
-                        key={`${dimensionEntry.displayValue}-${id}`}
+                        key={`${Math.random()}-${new Date().getTime()}`}
                         measurement={measurementData}
                         styleBuilder={styleBuilder}
                         styling={styling}

src/index.js

@@ -12,7 +12,7 @@ if (!window._babelPolyfill) {
   require("@babel/polyfill"); // eslint-disable-line global-require
 }
 
-export default {
+export default ({ flags }) => ({
   design: {
     dimensions: {
       max: 1,
@@ -104,12 +104,22 @@ export default {
     );
     return snapshotLayout;
   },
-  getContextMenu (obj, menu) {
+  async getContextMenu (obj, menu) {
     if (!this.$scope.layout.allowexportxls) {
       return menu;
     }
 
-    if (this.backendApi.model.layout.qMeta.privileges.indexOf('exportdata') !== -1) {
+    const app = this.backendApi.model.app;
+    const isPersonalResult = await app.global.isPersonalMode();
+
+    // Export as XLS option is removed from desktop because the desktop wrapper blocks downloads.
+    // Enabled for windows and QCS
+    // isPersonalMode returns true for both desktop and QCS
+    // By checking both if has download dialog and if is QCS can enable Export as XLS option on QCS
+    if (
+      (this.backendApi.model.layout.qMeta.privileges.includes('exportdata') && !isPersonalResult) ||
+      (flags.isEnabled('DOWNLOAD_USE_REPORTING') && isPersonalResult)
+    ) {
       menu.addItem({
         translation: 'Export as XLS',
         tid: 'export-excel',
@@ -127,4 +137,4 @@ export default {
     return menu;
   },
   version: 1.0
-};
+});