Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
ff3c60b
Initial commit for qlik-trellis-container
Mar 29, 2019
bed2d15
Merge pull request #1 from qlik-oss/QLIK-94507/Initial
AlbertBackenhof Apr 3, 2019
30d1ad8
Using trellis root to select child elements
Apr 3, 2019
4a45d58
Removed snapshot support
Apr 3, 2019
ebe58b9
Merge pull request #2 from qlik-oss/DEB-150/MultipleTrellis
AlbertBackenhof Apr 5, 2019
eaafd0e
DEB-167: Corrected the spelling.
Apr 16, 2019
c44fbd5
DEB-171: Changed the order of properties to match the other items in …
Apr 16, 2019
a57710a
DEB-171: Corrected the Data section of properties to use only Dimensi…
Apr 16, 2019
913350f
DEB-166 : Restored the piece of code responsible for sorting, which w…
Apr 17, 2019
2cc47b3
Merge pull request #4 from qlik-oss/DEB-171/OrderOfProperties
PurwaShrivastava Apr 17, 2019
0a1e354
DEB-166: Fixing Review Comments.
Apr 17, 2019
ca0da47
DEB-167: Fixed Review Comments.
Apr 17, 2019
e6b7bda
DEB-167: Corrected the spelling now,
Apr 17, 2019
ebb58c6
Merge pull request #6 from qlik-oss/DEB-167/SpellingMistake
PurwaShrivastava Apr 17, 2019
4421337
Merge pull request #3 from qlik-oss/DEB-166/Sorting
PurwaShrivastava Apr 18, 2019
01bc735
DEB-185: Hide the dropdown for selecting master visualization if its …
Apr 23, 2019
6c7fc5e
DEB-196/spellingMistake : Correcting the spelling in the Add-ons sect…
Apr 25, 2019
5a90d3b
Able to show/hide null dimensions
Apr 25, 2019
b31893c
DEB-199: Moved Trellis Optiosn under Appearance section.
Apr 25, 2019
680eda1
Merge pull request #10 from qlik-oss/DEB-199/moveTrellisOptions
PurwaShrivastava Apr 26, 2019
1a0c0f0
Merge pull request #11 from qlik-oss/DEB-196/spellingMistake
PurwaShrivastava Apr 26, 2019
c09be94
Merge pull request #9 from qlik-oss/DEB-169/NullValues
AlbertBackenhof Apr 29, 2019
6b4ae2f
DEB-207/TextChanges : Text Changes done.
Apr 30, 2019
c9c97f8
Merge pull request #8 from qlik-oss/DEB-185/hideMasterVizSelection
PurwaShrivastava Apr 30, 2019
22c0abd
DEB-205: Fixed the Trellis to get updated when the variables "number …
May 2, 2019
800acaf
DEB-209/fixMastervizDropdown : Fixed the drop down to select Master V…
Apr 30, 2019
abc280a
Merge pull request #14 from qlik-oss/DEB-209/fixMastervizDropdown
PurwaShrivastava May 3, 2019
d854175
Merge pull request #13 from qlik-oss/DEB-205/updateTrellisFix
PurwaShrivastava May 3, 2019
188a3e1
Merge pull request #12 from qlik-oss/DEB-207/TextChanges
PurwaShrivastava May 3, 2019
1011bd3
fix: IE11 doesn't show data correct
May 3, 2019
47bb2b9
Merge pull request #15 from qlik-oss/DEB-215/notCorrectInIE
AlbertBackenhof May 3, 2019
65cb6c3
Using other Add Dimensions
May 3, 2019
641ffc6
Merge pull request #16 from qlik-oss/DEB-216/OtherAddDims
AlbertBackenhof May 3, 2019
c4ccf8a
Removed export from context menu
May 7, 2019
7cb7b72
Merge pull request #17 from qlik-oss/noExport
AlbertBackenhof May 7, 2019
bfdb291
DEB-222: Restricted all kinds of Container objects from Master Items …
May 7, 2019
f0eeb08
Merge pull request #18 from qlik-oss/DEB-222/noContainerInsideContainer
PurwaShrivastava May 8, 2019
76bf652
DEB-224: Corrected the title property to show Dimension as title inst…
May 8, 2019
529aa2a
DEB-224: Titles are not shown if the Master Objects have set "ShowTit…
May 9, 2019
19da5fa
Fixed white chart when used as MasterObject
May 9, 2019
370e02d
Merge pull request #20 from qlik-oss/DEB-161/MasterObject
AlbertBackenhof May 9, 2019
1fe5688
DEB-224: Fixing a review comment.
May 9, 2019
9998309
Merge pull request #19 from qlik-oss/DEB-224/fixTitle
PurwaShrivastava May 10, 2019
0daae71
Block filterpane and histogram
May 16, 2019
4995696
Updated github readme
May 20, 2019
bdb208b
Merge pull request #27 from qlik-oss/DEB-136/readme
AlbertBackenhof May 20, 2019
cbe3f96
Don't create trellis until master object is set
May 16, 2019
fa85b05
fixed advanced mode
qlikcoeps May 23, 2019
5e646e6
Made the aggregate function split case insensitive and also the expre…
May 27, 2019
b2d4297
Merge pull request #30 from qlik-oss/QLIK-96110/aggregateFunctionIgno…
PurwaShrivastava May 27, 2019
707fedf
Merge pull request #22 from qlik-oss/DEB-178/BlockFilterAndHisto
AlbertBackenhof May 27, 2019
467adec
Merge pull request #23 from qlik-oss/DEB-197/ConsoleErrors
AlbertBackenhof May 27, 2019
137e10a
Close masterobject popover on resize
May 16, 2019
2c4b8d3
Merge pull request #24 from qlik-oss/DEB-214/PopoverCloseOnResize
AlbertBackenhof May 27, 2019
f0d813a
Change name to Trellis container everywhere
May 16, 2019
0915f5e
Merge pull request #25 from qlik-oss/DEB-235/UpdateName
AlbertBackenhof May 27, 2019
9fbe0db
Improved render and action update
May 20, 2019
d410827
Merge pull request #28 from qlik-oss/DEB-229/ImprovedUpdate
AlbertBackenhof Jun 19, 2019
59a0a8b
Fixed wrong number of columns being rendered
qlikcoeps Jun 28, 2019
7e096ff
Fixed master item labels
qlikcoeps Jun 28, 2019
64d2ba9
Updated the About info for the Trellis Chart.
Jul 11, 2019
45b26c7
Merge pull request #34 from qlik-oss/atq/about
PurwaShrivastava Jul 12, 2019
7e05e65
added ability to have a calculated dimension
rileymd88 Jul 29, 2019
06fe799
sorted field list
rileymd88 Jul 29, 2019
d152d51
remove console log
rileymd88 Jul 30, 2019
3477c09
Added border formatting options
rileymd88 Jul 30, 2019
9162650
added custom border to scope watch
rileymd88 Jul 30, 2019
6773c82
removed console logs
rileymd88 Jul 30, 2019
b9ae3de
added ability to use 2 dimensions
rileymd88 Aug 1, 2019
5e6c054
added labels
rileymd88 Aug 1, 2019
c2d621d
finished ui for 2 dimensions
rileymd88 Aug 2, 2019
2f728fc
Update black duck link
phiols Sep 20, 2019
b8eb67f
Merge pull request #29 from qlik-oss/advancedModeFix
PurwaShrivastava Sep 23, 2019
36a0362
Merge pull request #39 from qlik-oss/pol/bd
PurwaShrivastava Sep 23, 2019
e9ef6d0
Merge pull request #31 from qlik-oss/columnNumberFix
PurwaShrivastava Sep 24, 2019
bb86a65
Merge pull request #32 from qlik-oss/masterItemLabels
PurwaShrivastava Sep 24, 2019
e605251
Merge pull request #36 from qlik-oss/borderOptions
PurwaShrivastava Sep 24, 2019
89a2c1c
Fixed undefined color error.
Sep 25, 2019
22f821d
Merge pull request #40 from qlik-oss/borderFix
PurwaShrivastava Sep 25, 2019
1167fb9
Merge branch 'master' into twoDimensions
Sep 25, 2019
1aa2d52
Fixed a bug on border options which gets set even when its off.
Sep 25, 2019
16fe8da
Merge branch 'master' into twoDimensions
PurwaShrivastava Sep 25, 2019
63fa742
fix lint fail.
Sep 25, 2019
0a659b4
Merge pull request #37 from qlik-oss/twoDimensions
PurwaShrivastava Sep 25, 2019
1750964
Merge branch 'master' into calculatedDimension
Sep 25, 2019
1be8418
Merge pull request #35 from qlik-oss/calculatedDimension
PurwaShrivastava Sep 25, 2019
c811470
fix: added 100 height to trellis cell element
phiols Oct 3, 2019
7c5cd08
Merge pull request #42 from qlik-oss/pol/QLIK-97860
QlikSMD Oct 4, 2019
97a0371
fixed two dimension issue
rileymd88 Oct 11, 2019
be6a64b
updated mobile mode to deal with two dimensions
rileymd88 Oct 11, 2019
6b4f7d5
updated slide mode to work two dimensions
rileymd88 Oct 11, 2019
48d4390
removed log
rileymd88 Oct 11, 2019
6f8bfc3
corrected typo in html
rileymd88 Oct 14, 2019
2d25fa5
updated cube to ignore selections
rileymd88 Oct 21, 2019
e440d43
Merge pull request #43 from qlik-oss/twoDimensionFix
PurwaShrivastava Nov 28, 2019
43eac31
fix: disable interaction
Jan 10, 2020
771f6fc
fix QB235 replace Set func with vanilla array func for IE
Jan 12, 2020
b8142a5
fix: minor fix
Jan 22, 2020
2947c25
Merge pull request #45 from qlik-oss/QB235
PurwaShrivastava Jan 27, 2020
c693bdc
Merge pull request #44 from qlik-oss/QB163
PurwaShrivastava Jan 27, 2020
b0a0219
Removing source maps from production mode.
Feb 12, 2020
77bd995
Merge pull request #46 from qlik-oss/QLIK-98564/sourceMaps
PurwaShrivastava Feb 12, 2020
59cb2df
Small change (5 lines of code changed) to controller.js
eap-job Apr 21, 2020
6f1e8e2
Switch added to turn associative mode on/off
eap-job May 8, 2020
966a4c1
Switch added to turn associative mode on/off
eap-job May 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"presets": [
"@babel/preset-env"
["@babel/preset-env", {
"targets": {
"ie": "11"
},
"useBuiltIns": "entry"
}]
]
}
}
110 changes: 110 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
version: 2

defaults: &defaults
working_directory: ~/qlik-trellis-container
docker:
- image: circleci/node:stretch
environment:
GITHUB_ORG: "qlik-oss"
GITHUB_REPO: "qwik-trellis"
PACKAGE_NAME: "qlik-trellis-container"

jobs:
test:
docker:
- image: circleci/node:stretch-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-trellis-container"

bump-version:
<<: *defaults
steps:
- checkout
- run:
name: Bump version
command: |
sudo chmod +x scripts/bump-version.sh
sudo chmod +x scripts/get-latest-version.sh
scripts/bump-version.sh $GITHUB_ORG $GITHUB_REPO
- persist_to_workspace:
root: ~/qlik-trellis-container
paths:
- BUMPED_VERSION

build:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: ~/qlik-trellis-container
- run:
name: Install dependencies
command: npm install
- run:
name: Build and package
command: |
sudo chmod +x scripts/get-bumped-version.sh
export VERSION=$(scripts/get-bumped-version.sh)
echo "Version: ${VERSION}"
npm run build:zip
sudo chmod +x scripts/verify-files.sh
scripts/verify-files.sh
environment:
NODE_ENV: production
- persist_to_workspace:
root: ~/qlik-trellis-container
paths:
- dist
- store_artifacts:
path: dist
destination: dist

deploy:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: ~/qlik-trellis-container
- run:
name: Install ghr
command: |
sudo chmod +x scripts/install-ghr.sh
scripts/install-ghr.sh
- run:
name: Create GitHub Release
command: |
sudo chmod +x scripts/get-bumped-version.sh
export VERSION=$(scripts/get-bumped-version.sh)
echo "Version: ${VERSION}"
sudo chmod +x scripts/create-release.sh
scripts/create-release.sh $GITHUB_ORG $GITHUB_REPO $PACKAGE_NAME $VERSION

workflows:
version: 2
master_flow:
jobs:
- test
- bump-version:
requires:
- test
- build:
requires:
- bump-version
- deploy:
requires:
- build
filters:
branches:
only:
- master
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# editorconfig.org
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
62 changes: 62 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
module.exports = {
parserOptions: {
ecmaVersion: 6,
ecmaFeatures: {
jsx: true,
modules: true
},
sourceType: "module"
},
parser: "babel-eslint",
env: {
browser: true,
es6: true,
node: true
},
globals: {
angular: false,
define: false,
describe: false,
document: false,
expect: false,
it: false,
require: false
},
rules: {
"indent": ["error", 2, { "SwitchCase": 1 }],
"object-curly-spacing": ["error", "always"],
"max-len": ["warn", { "code": 120, "ignoreComments": true, "ignoreTrailingComments": false }],
"no-console": ["warn"],
"no-mixed-operators": ["warn", {
"groups": [
["==", "!=", "===", "!==", ">", ">=", "<", "<="],
["&&", "||"],
["in", "instanceof"]
],
"allowSamePrecedence": true
}],
"no-multi-spaces": ["error"],
"no-cond-assign": ["warn"],
"no-fallthrough": ["warn"],
"no-undef": ["warn"],
"no-unused-vars": ["warn", { "args": "none" }],
"no-use-before-define": ["warn", { "functions": false, "classes": false, "variables": false }],
"no-useless-escape": ["warn"],
"no-useless-return": ["warn"],
"no-underscore-dangle": ["warn", { "allow": ["_id"] }],
"no-redeclare": ["warn"],
"no-restricted-syntax": ["warn"],
"operator-linebreak": ["warn", "before"],
"prefer-promise-reject-errors": ["warn"],
"padded-blocks": ["warn", { "blocks": "never", "switches": "never", "classes": "never" }],
"semi": ["error", "always"],
"valid-typeof": ["warn"],
"no-eval": ["error"],
"no-implied-eval": ["error"],
"no-debugger": ["warn"],
"no-mixed-spaces-and-tabs": ["warn"],
},
extends: [
"eslint:recommended"
]
}
29 changes: 29 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain

* text=auto
.* text eol=lf
*.css text eol=lf
*.scss text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.md text eol=lf
*.sh text eol=lf
*.txt text eol=lf
*.svg text eol=lf
50 changes: 48 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,48 @@
node_modules/*
dist/*
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# Temporary build files
node_modules/
dist/
BUMPED_VERSION

# =========================
# Operating System Files
# =========================

# OSX
# =========================

.DS_Store
.AppleDouble
.LSOverride

# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
save-exact=true
65 changes: 18 additions & 47 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,54 +1,25 @@
# Qwik Trellis
Qwik Trellis is a Qlik Sense extension which allows you to create a trellis chart object based on an existing master vizulisation.
![Qwik Trellis](https://raw.githubusercontent.com/rileymd88/data/master/qwik-trellis/qwiktrellis.PNG)
![Qwik Trellis GIF](https://raw.githubusercontent.com/rileymd88/data/master/qwik-trellis/qwiktrellis2.gif)

## Important Information
>This extension code requires building using webpack. You can NOT download the repo and directly install. To get the correct approved version download from the releases page (file: qwik-trellis.zip) and install directly into Qlik Sense.

* [GitHub releases page](https://github.com/rileymd88/qwik-trellis/releases)

Only developers need to use webpack

## Release Notes v0.6
* Added slide/mobile mode

## Release Notes v0.5
* Added limit to number of charts which can be created
* Added support for objects which are not measure based
* Issue with Qlik Sense Desktop Client fixed
* Usability improvements

## Release Notes v0.4
* Ability to sort trellis charts using standard qlik sorting properties
* IE11 Support added
* Performance improvements and bug fixes
* Updated build process

## Release Notes v0.3
* Ability to automatically set the same range for all charts
* Ability to hide measure labels on one side only
* Performance improvements and bug fixes

## Release Notes v0.2
* Ability to create Trellis chart based on master item and 1 dimension
* Ability to hide dimension labels on one side only
* Ability to force all dimensions to be shown
* Advanced mode which allows full flexibility of how formulas are handled in the end trellis objects

## Using Advanced Mode
Qwik Trellis will try to automatically inject the correct set analysis into your formula, however if you need more flexibility then there is an advanced mode available. When advanced mode is turned on, Qwik Trellis will automatically replace all placeholders found within all formulas in the master item vizulisation with the following values:

| Placeholders | Values |
|----------------|------------------------------------------|
| $(vDim) | Dimension Name |
| $(vDimValue) | Dimension Value |
| $(vDimSet) | [Dimension Name]={'Dimension Value'}, |
| $(vDimSetFull) | {<[Dimension Name]={'Dimension Value'}>} |
# Trellis container
This extension is part of the extension bundles for Qlik Sense. The repository is maintained and moderated by Qlik RD.

Feel free to fork and suggest pull requests for improvements and bug fixes. Changes will be moderated and reviewed before inclusion in future bundle versions. Please note that emphasis is on backward compatibility, i.e. breaking changes will most likely not be approved.

Usage documentation for the extension is available at https://help.qlik.com.

# Developing the extension
If you want to do code changes to the extension follow these simple steps to get going.

1. Get Qlik Sense Desktop
1. Create a new app and add Trellis container to a sheet.
2. Clone the repository
3. Run `npm install`
4. Run `npm run build` - to build a dev-version to the /dist folder.
5. Move the content of the /dist folder to the extension directory. Usually in `C:/Users/<user>/Documents/Qlik/Sense/Extensions/qlik-trellis-container`.

# Resources Used in this Extension
[Qwik Trellis by Riley MacDonald](https://github.com/rileymd88/qwik-trellis)

# Original authors
[github.com/rileymd88](https://github.com/rileymd88)

# License
Released under the [MIT License](LICENSE).
Binary file added assets/qlik-trellis-container.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 0 additions & 17 deletions deployment.config.json

This file was deleted.

Loading