Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v4.8.0 #629

Merged
merged 47 commits into from
Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
575c813
build(deps): bump loader-utils from 2.0.2 to 2.0.4
dependabot[bot] Nov 11, 2022
cfceb74
Merge pull request #603 from lineupjs/dependabot/npm_and_yarn/loader-…
sgratzl Nov 11, 2022
12c863e
build(deps): bump loader-utils from 2.0.2 to 2.0.4
dependabot[bot] Nov 17, 2022
bb016e0
Merge pull request #604 from lineupjs/dependabot/npm_and_yarn/loader-…
sgratzl Nov 18, 2022
3b68b0f
build(deps): bump loader-utils from 2.0.2 to 2.0.4
dependabot[bot] Nov 18, 2022
057d633
Merge pull request #605 from lineupjs/dependabot/npm_and_yarn/loader-…
sgratzl Nov 19, 2022
dedfa88
build: upgrade
sgratzl Dec 7, 2022
31b43ec
fix: test update
sgratzl Dec 7, 2022
a9d3c19
feat: advanced boolean parsing
sgratzl Dec 7, 2022
c2151e8
feat: add support for 1px min bar
sgratzl Dec 7, 2022
7271ccc
fix: linting
sgratzl Dec 7, 2022
66ec2a3
fix: linting
sgratzl Dec 7, 2022
d103dd1
feat: allow for custom HTML label generation
sgratzl Dec 7, 2022
605403f
test: use beforeEach instead of before
sgratzl Dec 9, 2022
5b5ca62
feat: add missing rows as new category in cat filter
sgratzl Dec 9, 2022
0944979
feat: auto check filter missing upon first entry
sgratzl Dec 9, 2022
5275360
fix: test
sgratzl Dec 10, 2022
18047e4
fix: linting
sgratzl Dec 10, 2022
9497bde
build(deps): bump json5 from 1.0.1 to 1.0.2
dependabot[bot] Jan 7, 2023
a631661
Merge pull request #615 from lineupjs/dependabot/npm_and_yarn/json5-1…
sgratzl Jan 7, 2023
a995f22
build(deps): bump json5 from 1.0.1 to 1.0.2
dependabot[bot] Jan 8, 2023
d160507
Merge pull request #616 from lineupjs/dependabot/npm_and_yarn/json5-1…
sgratzl Jan 10, 2023
2d98375
build(deps): bump http-cache-semantics from 4.1.0 to 4.1.1
dependabot[bot] Feb 4, 2023
8cf257b
Merge pull request #618 from lineupjs/dependabot/npm_and_yarn/http-ca…
sgratzl Feb 7, 2023
28e15b9
build(deps): bump peter-evans/create-pull-request from 4 to 5
dependabot[bot] Apr 10, 2023
313c03e
Merge pull request #611 from lineupjs/sgratzl/minbar
thinkh Apr 17, 2023
b58805a
fix: add `on` to true values in boolean column
thinkh Apr 17, 2023
f9d536b
docs: update `trueValues` doc
thinkh Apr 17, 2023
2b98227
feat: add custom true values to bool.html example
thinkh Apr 17, 2023
6dbfd00
Merge pull request #613 from lineupjs/sgratzl/renderer
thinkh Apr 17, 2023
2987d05
fix: eslint
thinkh Apr 17, 2023
124ee81
Merge remote-tracking branch 'origin/develop' into sgratzl/filter
thinkh Apr 17, 2023
9eff44a
Merge remote-tracking branch 'origin/develop' into sgratzl/upgrade
thinkh Apr 17, 2023
879484e
Merge pull request #612 from lineupjs/sgratzl/boolean
sgratzl Apr 17, 2023
3d05b4d
Merge pull request #614 from lineupjs/sgratzl/filter
sgratzl Jul 20, 2023
7c74f1b
Merge pull request #610 from lineupjs/sgratzl/upgrade
sgratzl Jul 20, 2023
5dca0c8
build: upgrade
sgratzl Jul 20, 2023
48a41df
fix: linting
sgratzl Jul 20, 2023
f3892dd
fix: type only markers
sgratzl Jul 20, 2023
2e61f3b
fix: linting
sgratzl Jul 20, 2023
fc87f7b
build: downgrade prettier
sgratzl Jul 23, 2023
9d8968f
build: fix tests
sgratzl Jul 23, 2023
d73c9c0
ci: make docs the last stage
sgratzl Jul 23, 2023
a02978c
Merge pull request #623 from lineupjs/sgratzl/upgrade2
sgratzl Jul 24, 2023
1f4eafb
Merge pull request #620 from lineupjs/dependabot/github_actions/devel…
sgratzl Jul 24, 2023
df49174
Merge pull request #628 from lineupjs/625-wrong-tooltip-for-missing-v…
thinkh Jul 27, 2023
3c59d7b
chore: release v4.8.0
thinkh Jul 27, 2023
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
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
- run: yarn build
- run: yarn lint
- run: yarn test:coverage
- run: yarn docs
- run: yarn cy:compile
- run: yarn cy:junit
- uses: actions/upload-artifact@v2
Expand All @@ -39,6 +38,7 @@ jobs:
cypress/screenshots
cypress/videos

- run: yarn docs
- run: |
mkdir -p public/main
cp -rt public/main/ docs demo/* build/*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
echo -n "::set-output name=next_tag::"
npm version --no-git-tag-version ${{ github.event.inputs.versionName }} --preid ${{ github.event.inputs.preid }}
- name: Create pull request into main
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
branch: release/${{ steps.version.outputs.next_tag }}
commit-message: 'chore: release ${{ steps.version.outputs.next_tag }}'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ jobs:
- run: yarn build
- run: yarn lint
- run: yarn test:coverage
- run: yarn docs
- run: yarn cy:compile
- run: yarn cy:junit
- uses: actions/upload-artifact@v2
Expand All @@ -84,6 +83,7 @@ jobs:
cypress/screenshots
cypress/videos

- run: yarn docs
- run: |
mkdir -p public/main
cp -rt public/main/ docs demo/* build/*
Expand Down
3 changes: 0 additions & 3 deletions .gitpod.yml

This file was deleted.

File renamed without changes.
1 change: 0 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"stylelint-config-standard-scss"
],
"rules": {
"string-quotes": "single",
"keyframes-name-pattern": null,
"no-descending-specificity": null,
"value-list-comma-newline-after": null,
Expand Down
783 changes: 0 additions & 783 deletions .yarn/releases/yarn-3.2.2.cjs

This file was deleted.

874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ packageExtensions:
dependencies:
typescript: ~4.1.5

yarnPath: .yarn/releases/yarn-3.2.2.cjs
yarnPath: .yarn/releases/yarn-3.6.1.cjs
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2021, The Caleydo Team
Copyright (c) 2022, The Caleydo Team
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -679,12 +679,6 @@ LineUp.js depends on

## Development Environment

Try the Gitpod online IDE and start coding instantly in your browser.

[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/lineupjs/lineupjs)

Otherwise follow the steps to setup a local development environment.

**Installation**

The setup requires [Node.js v16 or higher](https://nodejs.org/en/download/).
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cypress/integration/builder.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { generateData } from './utils/data';
describe('builder', () => {
let lineup: Taggle;
let lineUpJS: LineUpJSType;
before(
beforeEach(
withLineUp((l, document) => {
lineUpJS = l;
const arr = generateData();
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/builder2.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { generateData, DEFAULT_CATEGORIES } from './utils/data';
describe('builder2', () => {
let lineup: LineUp;
let lineUpJS: LineUpJSType;
before(
beforeEach(
withLineUp((l, document) => {
lineUpJS = l;
const arr = generateData();
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/custom_instance_id.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { withLineUp, waitReady, LineUpJSType, Taggle } from './utils/lineup';
describe('builder', () => {
let lineup: Taggle;
let lineUpJS: LineUpJSType;
before(
beforeEach(
withLineUp((l, document) => {
lineUpJS = l;
const b = lineUpJS.builder([]);
Expand Down
4 changes: 2 additions & 2 deletions cypress/integration/pr289_color_mapping_reset.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { openMoreDialog, closeDialog, resetDialog } from './utils/ui';
describe('pr275_sort_group', () => {
let lineup: LineUp;
let lineUpJS: LineUpJSType;
before(
beforeEach(
withLineUp((l, document) => {
lineUpJS = l;
const arr = generateData({
Expand Down Expand Up @@ -41,7 +41,7 @@ describe('pr275_sort_group', () => {
it('choose divergent color mapping', () => {
openColorMappingDialog().within(() => {
// select another color
cy.contains('Diverging Color').click();
cy.get('[data-toggle]').contains('Diverging Color').click();
cy.get('input[value="interpolateBrBG"]').check();
});
closeDialog();
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/restore_aggregation_state.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('restore_aggregation_state', () => {
});
}

before(
beforeEach(
withLineUp((l, document) => {
lineUpJS = l;
const arr = generateData({
Expand Down
1 change: 1 addition & 0 deletions cypress/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"declaration": false,
"declarationMap": false,
"composite": false,
"verbatimModuleSyntax": false,
"types": [
"cypress",
"d3-color",
Expand Down
65 changes: 65 additions & 0 deletions demo/bool.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<!DOCTYPE html>
<html>
<head lang="en">
<meta charset="UTF-8" />
<title>LineUp Builder Test</title>

<link href="./LineUpJS.css" rel="stylesheet" />
<link href="./demo.css" rel="stylesheet" />
</head>
<body>
<script src="./LineUpJS.js"></script>

<script>
window.onload = function () {
const arr = [];
const vs = [
'y',
'yes',
'true',
true,
'1',
'1.0',
1,
1.0,
'n',
'no',
'false',
false,
'0',
'0.0',
0,
0.0,
'on',
'off',
];
for (let i = 0; i < vs.length; ++i) {
arr.push({
s: 'Row ' + i,
bool: vs[i],
custombool: i % 2 === 0 ? 'yeah' : 'nope',
});
}
for (let i = 0; i < vs.length; ++i) {
arr.push({
s: 'Row ' + i,
bool: typeof vs[i] === 'string' ? vs[i].toUpperCase() : vs[i],
custombool: i % 2 === 0 ? 'yeah'.toUpperCase() : 'nope'.toUpperCase(),
});
}
const b = LineUpJS.builder(arr);

b.column(LineUpJS.buildStringColumn('s').label('label'));
b.column(LineUpJS.buildBooleanColumn('bool').label('bool'));
b.column(
LineUpJS.buildBooleanColumn('custombool')
.label('custombool')
.summary('custom true values')
.trueValues(['yeah'])
);

b.build(document.body);
};
</script>
</body>
</html>
5 changes: 4 additions & 1 deletion demo/htmlLabel.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
const builder = LineUpJS.builder(arr);

// manually define columns
builder.deriveColumns().column(LineUpJS.buildStringColumn('d').htmlLabel('<strong>STRONG</strong>'));
builder
.deriveColumns()
.column(LineUpJS.buildStringColumn('d').htmlLabel('<strong>STRONG</strong>'))
.column(LineUpJS.buildStringColumn('d').htmlLabel('DD', (col, ctx) => `<i>${col.label}</i>`));

builder.defaultRanking();

Expand Down
47 changes: 47 additions & 0 deletions demo/number_min_rep.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>Document</title>
<link href="./LineUpJS.css" rel="stylesheet" />

<style>
body {
margin: 0;
padding: 0;
}

.lu {
clear: both;
position: absolute;
top: 1px;
bottom: 0;
left: 0;
right: 0;
padding: 0;
}
</style>
</head>
<body>
<script src="./LineUpJS.js"></script>
<script>
let testData = [
{ n: 0, m: 1 },
{ n: 20, m: 10 },
{ n: 100, m: 100 },
];
for (let i = 0; i < 5; i++) {
testData = [...testData, ...testData];
}
const builder = LineUpJS.builder(testData);

builder.column(LineUpJS.buildNumberColumn('n').label('N').custom('showMinimumRepresentation', true));
builder.column(LineUpJS.buildNumberColumn('m').label('M').custom('showMinimumRepresentation', true));
builder.column(LineUpJS.buildNumberColumn('n').label('N 2'));
builder.column(LineUpJS.buildNumberColumn('m').label('M 2'));
builder.buildTaggle(document.body);
</script>
</body>
</html>
29 changes: 29 additions & 0 deletions jest.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* eslint-env node */
const path = require('path');

const mapper = {};
for (const d of [
'd3-dispatch',
'd3-scale-chromatic',
'd3-interpolate',
'd3-color',
'd3-scale',
'd3-array',
'd3-format',
'd3-time',
'd3-time-format',
]) {
mapper[`^${d}$`] = require.resolve(d).replace(`src${path.sep}index.js`, `dist${path.sep}/${d}.js`);
}

module.exports = {
testEnvironment: 'jsdom',
preset: 'ts-jest',
testRegex: '/tests/.*\\.spec\\.(ts|tsx|js)$',
moduleNameMapper: mapper,
globals: {
'ts-jest': {
tsconfig: 'tsconfig.test.json',
},
},
};
12 changes: 0 additions & 12 deletions jest.config.js

This file was deleted.

Loading