Compare commits
7 Commits
0.82.0
...
atq/fixDep
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43fa4cd380 | ||
|
|
233f2a5c7c | ||
|
|
ca6893296a | ||
|
|
f13312c288 | ||
|
|
6fc73c4cc8 | ||
|
|
9424e847c9 | ||
|
|
b86a3ae9c6 |
@@ -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:
|
||||
|
||||
17
.circleci/upgrade-node.sh
Normal file
17
.circleci/upgrade-node.sh
Normal file
@@ -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
|
||||
@@ -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}
|
||||
|
||||
Reference in New Issue
Block a user