Skip to content

Commit

Permalink
Merge branch 'main' of github.com:vizzuhq/vizzu-lib
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/apps/weblib/ts-api/cvizzu.types.d.ts
#	src/apps/weblib/ts-api/module/cchart.ts
#	src/apps/weblib/ts-api/render.ts
  • Loading branch information
simzer committed Jan 17, 2024
2 parents 576cb65 + 03dfdc2 commit b5245df
Show file tree
Hide file tree
Showing 2,864 changed files with 145,640 additions and 145,848 deletions.
52 changes: 23 additions & 29 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,31 +1,25 @@
module.exports = {
env: {
browser: true,
jest: true
},
extends: ['standard', 'prettier'],
root: true,
parserOptions: {
ecmaVersion: 'latest'
},
overrides: [
{
files: ['test/integration/test_cases/**', 'test/integration/test_data/**'],
rules: {
camelcase: 'off'
}
},
{
files: ['*.ts', '*.tsx'],
extends: ['standard', 'prettier', 'plugin:@typescript-eslint/recommended'],
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint'],
rules: {
'no-use-before-define': 'off',
'@typescript-eslint/no-use-before-define': 'error',
'@typescript-eslint/explicit-function-return-type': ['error']
}
}
],
ignorePatterns: ['**/dist/**', '!.puppeteerrc.cjs']
overrides: [
{
files: ['*.ts', '*.tsx'],
extends: ['@vizzu/eslint-config/typescript'],
rules: {
'no-use-before-define': 'off',
'@typescript-eslint/no-use-before-define': 'error',
'@typescript-eslint/explicit-function-return-type': ['error']
}
},
{
files: ['*.js', '*.mjs', '*.cjs'],
extends: ['@vizzu/eslint-config/standard']
},
{
files: ['test/e2e/test_cases/**', 'test/e2e/test_data/**'],
extends: ['@vizzu/eslint-config/standard'],
rules: {
camelcase: 'off'
}
}
],
ignorePatterns: ['**/dist/**']
}
16 changes: 8 additions & 8 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: CD

on:
release:
types: [published]
release:
types: [published]

jobs:
release:
runs-on: ubuntu-22.04
publish:
runs-on: ubuntu-22.04

steps:
- name: Trigger Cloud Build
run: |
curl -X POST -H "Content-type: application/json" "https://cloudbuild.googleapis.com/v1/projects/vizzu-ci/triggers/vizzu-lib-release:webhook?key=${{ secrets.VIZZUHQ_GCP_BUILD }}" -d "{}"
steps:
- name: Trigger Cloud Build
run: |
curl -X POST -H "Content-type: application/json" "https://cloudbuild.googleapis.com/v1/projects/vizzu-ci/triggers/vizzu-lib-release:webhook?key=${{ secrets.VIZZUHQ_GCP_BUILD }}" -d "{}"
39 changes: 22 additions & 17 deletions .github/workflows/docker-vizzu-dev-desktop.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
name: Docker Build and Push vizzu-dev-desktop
name: Docker publish vizzu-dev-desktop

on:
push:
paths:
- '**/vizzu-dev-desktop'
push:
branches-ignore:
- main
paths:
- '**/vizzu-dev-desktop'
- '**/docker-vizzu-dev-desktop.yml'

jobs:
build-and-push:
runs-on: ubuntu-22.04
publish:
runs-on: ubuntu-22.04

steps:
- name: Checkout code
uses: actions/checkout@v3
steps:
- name: Checkout repo
uses: actions/checkout@v3
with:
fetch-depth: 1

- name: Login to Docker Hub
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin
- name: Login to Docker
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin

- name: Build and Push Docker Image
run: |
IMAGE="vizzu-dev-desktop"
IMAGE_NAME="vizzu/$IMAGE:0.8"
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
docker push $IMAGE_NAME
- name: Build and Publish
run: |
IMAGE="vizzu-dev-desktop"
IMAGE_NAME="vizzu/$IMAGE:0.9"
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
docker push $IMAGE_NAME
39 changes: 22 additions & 17 deletions .github/workflows/docker-vizzu-dev-wasm.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
name: Docker Build and Push vizzu-dev-wasm
name: Docker publish vizzu-dev-wasm

on:
push:
paths:
- '**/vizzu-dev-wasm'
push:
branches-ignore:
- main
paths:
- '**/vizzu-dev-wasm'
- '**/docker-vizzu-dev-wasm.yml'

jobs:
build-and-push:
runs-on: ubuntu-22.04
publish:
runs-on: ubuntu-22.04

steps:
- name: Checkout code
uses: actions/checkout@v3
steps:
- name: Checkout repo
uses: actions/checkout@v3
with:
fetch-depth: 1

- name: Login to Docker Hub
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin
- name: Login to Docker
run: echo ${{ secrets.VIZZUHQ_DOCKER_API }} | docker login -u ${{ secrets.VIZZUHQ_DOCKER_USER }} --password-stdin

- name: Build and Push Docker Image
run: |
IMAGE="vizzu-dev-wasm"
IMAGE_NAME="vizzu/$IMAGE:0.8"
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
docker push $IMAGE_NAME
- name: Build and Publish
run: |
IMAGE="vizzu-dev-wasm"
IMAGE_NAME="vizzu/$IMAGE:0.9"
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
docker push $IMAGE_NAME
18 changes: 18 additions & 0 deletions .github/workflows/slack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Notify on merged PR
on:
pull_request:
types:
- closed

jobs:
notify_merged_pr:
name: Notify on merged PR
runs-on: ubuntu-22.04
if: ${{ github.event.pull_request.merged == true }}
steps:
- uses: abinoda/slack-action@master
env:
SLACK_BOT_TOKEN: ${{ secrets.VIZZUHQ_SLACK_API }}
with:
args: '{\"channel\":\"${{ secrets.VIZZUHQ_SLACK_CHANNEL }}\",\"blocks\":[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"*PR:* ${{ github.event.pull_request.title }}\n*Description :* ${{ github.event.pull_request.body }}\n*Opened by :* ${{ github.event.pull_request.user.login }}\n*Merged at:* ${{ github.event.pull_request.merged_at }}\n<${{ github.event.pull_request.html_url }}|View PR>\"}}]}'
if: success()
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ test_report.tgz

__pycache__

.venv
.venv*
vizzu_dev*
.pdm-python

placeholder-plugin.yaml
docs/examples/**/*.png
docs/examples/**/*.mp4
docs/examples/**/*.webm
Expand Down
8 changes: 0 additions & 8 deletions .prettierrc

This file was deleted.

2 changes: 1 addition & 1 deletion .puppeteerrc.cjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { join } = require('path')

module.exports = {
cacheDirectory: join(__dirname, 'node_modules', '.cache', 'puppeteer')
cacheDirectory: join(__dirname, 'node_modules', '.cache', 'puppeteer')
}
58 changes: 56 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,60 @@

### Fixed

- Json serializer control character escape fixed. Some unicode characters
were not escaped properly.
- Fix dimension label transition on axis and legend.

### Added

- Added optional `categories` member to the `legend-marker`, `legend-label` and `plot-axis-label` events.
- Remove unused marker selection and selected marker coloring.
- Remove cursor modification over logo.
- Make `channel.step` option to work on dimensions.
- When X axis dimension labels are close to each other, they are rotated to avoid overlapping.

## [0.9.3] - 2023-12-20

### Fixed

- Orientation and channel min/max cannot be null, only auto
- Corrected listing of Type-fest dependency from development to normal.
- Added missing `cvizzu.d.ts` and `cvizzu.types.d.ts` to the npm package.
- Logo positioning issue in charts when only the logo is rendered and the chart is resized.
- API issue where exact chart position was not accurately queried during mouse events.
- Missing space between value and unit in axis labels.
- Bug fixed where rendered label units disappeared when target plot did not contain a unit.
- Configuration of experimental plot rotation feature changed from relative `rotate` to absolute `angle`.

### Added

- Units on legend.

## [0.9.2] - 2023-11-22

### Fixed

- Fixed redraw on browser zoom (bug since 0.9.0).
- Fixed clearing of the canvas before rendering when devicePixelRatio is not 1.
- TypeScript definition fixed, measures can contain null values.

### Added

- Animation control object expose properties `position`, `direction`, `speed`
and `playState` to be able to query the current state of the animation, and
to be more conform with the Web Animation API.

## [0.9.1] - 2023-11-15

### Fixed

- Fixed crash on splitted chart with no measure.
- Fixed refresh of chart when duration is 0.

## [0.9.0] - 2023-11-10

### Fixed

- Implemented deep copying of received values to ensure the original data
remains unchanged during subsequent modifications.
- detach() won't fail on not initialized chart.
Expand All @@ -30,6 +84,7 @@
- Layout stretched to the bottom of the canvas.
- Legend accepts only the acceptable channel values.
- From now the dimension axis title is shown if set.
- "step" was not listed in chart channel accessors.

### Added

Expand All @@ -51,8 +106,7 @@
`Vizzu.feature()` with name `cssProperties`.
- `shorthands`, `pointerEvents`, `pivotData`, `rendering` features can be disabled through
`Vizzu.feature()`
- TypeScript interface made more typesafe, while the javascript api got ported to
- TypeScript.
- TypeScript interface made more typesafe, while the javascript api got ported to TypeScript.
- `pointeron` event removed, `pointerleave` event added.
- `Vizzu.feature.htmlCanvas.element` introduced to expose the underlying HTML canvas element.
- `Vizzu.feature.rendering.update()` introduced to trigger chart re-rendering.
Expand Down
Loading

0 comments on commit b5245df

Please sign in to comment.