Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b026281
docs: update sample
sgratzl Mar 23, 2022
de4411d
build: upgrade
sgratzl Nov 12, 2023
1e1066e
fix: setup
sgratzl Nov 12, 2023
49c42d6
fix: pbi version complain
sgratzl Nov 12, 2023
9b87d55
fix: add dummy priviledges
sgratzl Nov 12, 2023
4cf31fc
feat: start with string resources
sgratzl Nov 12, 2023
8f76bf2
feat: work on upgrade
sgratzl Sep 7, 2025
37b5e6c
featÖ drop license part
sgratzl Sep 7, 2025
727fc0c
build: start upgrade
sgratzl Sep 7, 2025
637cb41
fix: run prettier
sgratzl Sep 7, 2025
c40c624
feat: fix setup
sgratzl Sep 7, 2025
a2efcf1
fix: update copyright year
sgratzl Sep 7, 2025
3a33900
fix: eslint
sgratzl Sep 7, 2025
d93bdaa
feat: migrate settings
sgratzl Sep 20, 2025
ed61657
fix: formatting
sgratzl Sep 20, 2025
b4f2180
fix: setup by downgrading eslint
sgratzl Sep 21, 2025
e070427
fix: style settings
sgratzl Sep 21, 2025
c75f288
fix: public version
sgratzl Sep 21, 2025
c2b50eb
build: fix build package first then preview
sgratzl Sep 21, 2025
935d909
fix: sample build
sgratzl Sep 21, 2025
8c9cbe0
ci: fix ci setup
sgratzl Sep 21, 2025
efa3e4e
ci: fix formatting
sgratzl Sep 21, 2025
247c6e1
fix: generate combination color
sgratzl Sep 21, 2025
41f4b2b
feat: update samples
sgratzl Sep 21, 2025
2f92c57
feat: update preview samples
sgratzl Sep 21, 2025
bc4a250
Merge pull request #40 from upsetjs/sgratzl/upgrade
sgratzl Sep 21, 2025
2c8af8d
fix: clarify readme
sgratzl Sep 21, 2025
0498539
ci: disable deployment
sgratzl Sep 21, 2025
9b8ffa4
refactor: extract string resources
sgratzl Sep 21, 2025
76f7351
fix: format
sgratzl Sep 21, 2025
c5f645a
refactor: delete preview
sgratzl Sep 22, 2025
3e8c73c
build: downgrade to release
sgratzl Sep 22, 2025
b82bcb2
fix: linting
sgratzl Sep 22, 2025
e5656f3
fix: bump to 4 digits
sgratzl Sep 22, 2025
b75565d
Release 2.0.0
sgratzl Sep 22, 2025
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
33 changes: 0 additions & 33 deletions .eslintrc.js

This file was deleted.

12 changes: 6 additions & 6 deletions .github/disable_dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: 'github-actions'
directory: '/'
- package-ecosystem: "github-actions"
directory: "/"
target-branch: dev
schedule:
interval: 'weekly'
interval: "weekly"
# Maintain dependencies for npm
- package-ecosystem: 'npm'
directory: '/'
- package-ecosystem: "npm"
directory: "/"
target-branch: dev
schedule:
interval: 'weekly'
interval: "weekly"
96 changes: 39 additions & 57 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,67 +6,49 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v5
- uses: actions/setup-node@v5
with:
node-version: 16
- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node2-
${{ runner.OS }}-
- name: copy example secret
run: cp src/secrets.example.ts src/secrets.ts
- name: create secrets from action secret
env:
LICENSE_INFO: ${{ secrets.LICENSE_KEY }}
if: env.LICENSE_INFO != null
run: |
echo '${{ env.LICENSE_INFO }}' > src/secrets.ts
node-version: lts/*
cache: npm
- run: npm ci
- run: npm run build --if-present
- run: npm run build
- run: npm test
- run: npm run lint
- run: npm run alint
- run: |
mkdir -p public/integrations/powerbi
cp dist/upsetjs_venn.pbiviz public/integrations/powerbi/
cp dist/upsetjs_venn_preview.pbiviz public/integrations/powerbi/
cp samples/got.pbix public/integrations/powerbi/got_venn.pbix
cp samples/sample.pbix public/integrations/powerbi/sample_venn.pbix
# - run: |
# mkdir -p public/integrations/powerbi
# cp dist/upsetjs_venn.pbiviz public/integrations/powerbi/
# cp dist/upsetjs_venn_preview.pbiviz public/integrations/powerbi/
# cp samples/got.pbix public/integrations/powerbi/got_venn.pbix
# cp samples/sample.pbix public/integrations/powerbi/sample_venn.pbix

- name: Deploy Main
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
uses: upsetjs/actions-gh-pages@sgratzl
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
external_repository: upsetjs/upsetjs.github.io
publish_branch: main
publish_dir: ./public
enable_jekyll: true
keep_files: true
# - name: Deploy Main
# if: github.ref == 'refs/heads/main' && github.event_name == 'push'
# uses: upsetjs/actions-gh-pages@sgratzl
# env:
# ACTIONS_ALLOW_UNSECURE_COMMANDS: true
# with:
# external_repository: upsetjs/upsetjs.github.io
# publish_branch: main
# publish_dir: ./public
# enable_jekyll: true
# keep_files: true

- if: github.ref == 'refs/heads/dev'
# move to next directory
run: |
mv public public2
mkdir -p public
mv public2 public/next
# - if: github.ref == 'refs/heads/dev'
# # move to next directory
# run: |
# mv public public2
# mkdir -p public
# mv public2 public/next

- name: Deploy Develop
if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
uses: upsetjs/actions-gh-pages@sgratzl
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
external_repository: upsetjs/upsetjs.github.io
publish_branch: main
publish_dir: ./public
enable_jekyll: true
keep_files: true
# - name: Deploy Develop
# if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
# uses: upsetjs/actions-gh-pages@sgratzl
# env:
# ACTIONS_ALLOW_UNSECURE_COMMANDS: true
# with:
# external_repository: upsetjs/upsetjs.github.io
# publish_branch: main
# publish_dir: ./public
# enable_jekyll: true
# keep_files: true
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ node_modules
/build
/webpack.statistics*
/keys
/src/secrets.ts
*.bak.json
*.bak.json
.eslintcache
10 changes: 9 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
src/secrets.ts
*.png
*.svg
*.pbix
.editorconfig
.eslintignore
.prettierignore
.gitattributes
.gitignore
*.resjson
6 changes: 0 additions & 6 deletions .prettierrc.js

This file was deleted.

24 changes: 12 additions & 12 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"version": "0.1.0",
"configurations": [
{
"name": "Debugger",
"type": "chrome",
"request": "attach",
"port": 9222,
"sourceMaps": true,
"webRoot": "${cwd}/"
}
]
}
"version": "0.1.0",
"configurations": [
{
"name": "Debugger",
"type": "chrome",
"request": "attach",
"port": 9222,
"sourceMaps": true,
"webRoot": "${cwd}/"
}
]
}
80 changes: 37 additions & 43 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,47 +1,41 @@
{
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[yaml]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.formatOnSave": true,
"editor.formatOnType": true,
"eslint.enable": true,
"files.associations": {
"*.resjson": "json"
},
"json.schemas": [
{
"fileMatch": ["/pbiviz.json"],
"url": "./node_modules/powerbi-visuals-api/schema.pbiviz.json"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
{
"fileMatch": ["/capabilities.json"],
"url": "./node_modules/powerbi-visuals-api/schema.capabilities.json"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[yaml]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.formatOnSave": true,
"editor.formatOnType": true,
"eslint.enable": true,
"files.associations": {
"*.resjson": "json"
},
"json.schemas": [
{
"fileMatch": [
"/pbiviz.json"
],
"url": "./node_modules/powerbi-visuals-api/schema.pbiviz.json"
},
{
"fileMatch": [
"/capabilities.json"
],
"url": "./node_modules/powerbi-visuals-api/schema.capabilities.json"
},
{
"fileMatch": [
"/dependencies.json"
],
"url": "./node_modules/powerbi-visuals-api/schema.dependencies.json"
}
],
"search.exclude": {
"typings": true
},
"typescript.tsdk": "node_modules\\typescript\\lib"
{
"fileMatch": ["/dependencies.json"],
"url": "./node_modules/powerbi-visuals-api/schema.dependencies.json"
}
],
"search.exclude": {
"typings": true
},
"typescript.tsdk": "node_modules\\typescript\\lib"
}
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ If you want to use UpSet.js for a commercial application or in a commercial envi

### Open-source license

> Copyright (C) 2021 Samuel Gratzl (sam@sgratzl.com)
> Copyright (C) 2025 Samuel Gratzl (sam@sgratzl.com)

### GNU AFFERO GENERAL PUBLIC LICENSE

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ see also https://docs.microsoft.com/en-us/power-bi/developer/visuals/environment

```sh
npm i
cp src/secrets.example.json src/secrets.json
npm run pbiviz -- --install-cert
```

Expand All @@ -56,7 +55,7 @@ npm run release
1. Create a new release
1. Update the sample dataset with the latest version
1. Send a mail to pbivizsubmit@microsoft.com.
subject: Ultimate Venn Diagram vX.X.X
subject: Venn Diagram vX.X.X
content: ?
attachments: the pbiviz and the sample report
1. Wait for app package XML response
Expand Down
Binary file removed assets/icon_preview.png
Binary file not shown.
Loading