Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into resolution
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/apps/weblib/cinterface.cpp
#	src/apps/weblib/cinterface.h
#	src/apps/weblib/interface.cpp
#	src/apps/weblib/interface.h
#	src/apps/weblib/ts-api/cvizzu.types.d.ts
#	src/apps/weblib/ts-api/module/cchart.ts
#	src/base/gui/widget.h
#	src/chart/main/chart.h
#	src/chart/ui/chart.cpp
#	src/chart/ui/chart.h
#	test/integration/test_cases/test_cases.json
#	test/integration/tests/config_tests.json
#	test/integration/tests/features.json
#	test/integration/tests/fixes.json
  • Loading branch information
schaumb committed May 17, 2024
2 parents 1c47e4d + c16c294 commit be15ee5
Show file tree
Hide file tree
Showing 2,913 changed files with 153,231 additions and 148,693 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 "{}"
42 changes: 22 additions & 20 deletions .github/workflows/docker-vizzu-dev-desktop.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
name: Docker Build and Push vizzu-dev-desktop
name: Docker publish vizzu-dev-desktop

on:
push:
branches-ignore:
- main
paths:
- '**/vizzu-dev-desktop'
- '**/docker-vizzu-dev-desktop.yml'
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.9"
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.10"
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
docker push $IMAGE_NAME
42 changes: 22 additions & 20 deletions .github/workflows/docker-vizzu-dev-wasm.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
name: Docker Build and Push vizzu-dev-wasm
name: Docker publish vizzu-dev-wasm

on:
push:
branches-ignore:
- main
paths:
- '**/vizzu-dev-wasm'
- '**/docker-vizzu-dev-wasm.yml'
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.9"
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.10"
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\":\"*REPO:* vizzu-lib\n*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()
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ dist
.coverage
test_report
test_report.tgz
*.ppt
*.pptx
*.ipynb

__pycache__

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')
}
80 changes: 74 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,83 @@

### Fixed

- When only logo rendered chart resized, the previous drawn logo position was not deleted.
- At the mouse events the lib is not queried the exact rendered chart position through API.
- On axis labels sometimes missed a space character between value and unit.
- Rendered label units are suddenly disappeared when target plot does not contain a unit.
- next() can be called multiple times from Plugin hooks
- Line and circle chats with only dimensions on x, and y axes the markers were off the axis labels.
- Crash on TreeMap only with negative values
- On dimension axis where no marker, print the dimension name as default title.
- On measure axis with specified channel min-max where no marker, print the labels.
- Legend markers are not flickering on same data.
- From now legend appears/disappears linear time.
- Axis labels are not animated to a different axis label.
- Dimension axis density on sorted values was wrongly calculated.
- Tooltip with 'seriesName' does not rewrite first series data.
- Handle as different category the empty string and the missing value.
- On chart resize, the font size is recalculated.

### Added

- Units on legend.
- New plugins and plugin hooks introduced:
- plugin: scheduler - plugin resposible for scheduling the rendering
- plugin: clock - supplying the current time for the animation
- plugin: canvasRenderer - plugin for rendering the chart on a htmlcanvas compatible canvas
- hook: start - hook for starting the rendering loop
- hook: render - hook for rendering the chart
- Chart generation performance optimization: ~3x speed
- Maximum marker limit increased: ~2x count
- Reduced wasm binary size: ~3%

## [0.10.1] - 2024-03-12

### Added

- Updated `type-fest` dependency version to `4.12.0`

## [0.10.0] - 2024-03-11

### Fixed

- Json serializer control character escape fixed. Some unicode characters
were not escaped properly.
- Fix dimension label transition on axis and legend.
- Through event handler call, when a new event handler is registered, undefined behaviour happened.
- Fixed channel reset with empty array when shorthands plugin switched off.
- Legend label outerRect was not properly calculated.
- Line chart connector circles color was not contained the alpha channel.
- Line chart draws was overwrite the event's settings.
- Legend title outerRect was not properly calculated.
- Fixed stacked empty min/max aggregated values.
- Fixed error when an animation triggered during tooptip activation which removed the corresopnding marker.

### Added

- In config channels, data series and their aggregators can be specified separately
in a descriptor object, besides encoding them into one string (old way).
- Added optional `categories` member to the `legend-marker`, `legend-label` and `plot-axis-label` events.
- Remove unused marker selection and selected marker coloring.
- Removed marker's alpha color when tooltip is shown.
- 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.
- The event handler registration order changed. Now the handlers are called in the opposite order of the registration.
- Added the padded rectangle, the bounding rectangle and the align parameter to the draw text event object.
- Tooltip works on marker labels too.

## [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

Expand All @@ -20,7 +89,6 @@
- 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.
- Orientation and channel min/max cannot be null, only auto

### Added

Expand Down
Loading

0 comments on commit be15ee5

Please sign in to comment.