Skip to content

use tableu20 colors as default #989

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.

Sign up for GitHub

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+26 −16
Draft

use tableu20 colors as default #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cc118c
use tableu20 colors as default
adrianmroz-allegro Dec 6, 2022
38b3ff2
fix tests
adrianmroz-allegro Dec 6, 2022
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
30 changes: 20 additions & 10 deletions src/common/models/colors/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,26 @@
import { hsl, range, rgb } from "d3";

export const DEFAULT_SERIES_COLORS = [
"#2D95CA",
"#EFB925",
"#DA4E99",
"#4CC873",
"#745CBD",
"#EA7136",
"#E68EE0",
"#218C35",
"#B0B510",
"#904064"
"#4E79A7",
"#A0CBE8",
"#F28E2B",
"#FFBE7D",
"#59A14F",
"#8CD17D",
"#B6992D",
"#F1CE63",
"#499894",
"#86BCB6",
"#E15759",
"#FF9D9A",
"#79706E",
"#BAB0AC",
"#D37295",
"#FABFD2",
"#B07AA1",
"#D4A6C8",
"#9D7660",
"#D7B5A6"
];

export const DEFAULT_MAIN_COLOR = "#FF5900";
Expand Down
4 changes: 2 additions & 2 deletions src/common/utils/rules/split-adjustments.mocha.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ describe("Split adjustment utilities", () => {
});

describe("adjustColorSplit", () => {
it("should adjust limit with predefined limits (5, 10)", () => {
it("should adjust limit with limits based on available colours", () => {
const dimension: Dimension = {
...createDimension("string", "foobar", $("foobar")),
limits: [42, 100]
};
const split = stringSplitCombine("foobar", { limit: 50 });
const adjusted = adjustColorSplit(split, dimension, SeriesList.fromSeries([]), DEFAULT_COLORS);

expect(adjusted.limit).to.be.equal(10);
expect(adjusted.limit).to.be.equal(20);
});
});

Expand Down
8 changes: 4 additions & 4 deletions src/common/utils/url-hash-converter/url-hash-converter.fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ export class UrlHashConverterFixtures {
static lineChartVersion4() {
return "4/N4IgbglgzgrghgGwgLzgFwgewHYgFwhLYCmAtAMYAWcATmiADTjTxKoY4DKxaG2A5lHyh+NTDAAO3GhGJC8AM0RRiAXyYYAtsWQ5i+EAFE05APQBVACoBhRiAU" +
"QEaYjXkBtUGgCeE/QS36TDTECgYBdgEACi5YACbuoLEwNOhYuASRAIwAInZQzhL4pJkaPn6E6HL0qgC66p5lBvkyAnbBoQRUcNgkCHZw5BzpIBC4TGCIMHL4biDEYyDYm" +
"HlgdrGB9jR25EI1TEv0ispqeyBQEkhoCSDevk1oLfxrENrYUGkGXT3EfUxQmHRhCB2gZ1k44BFGgQVDJpkxYhBgoMPgR1lByPMEa0mL4ZJhYgYQOpCC8IIdMgAGeo3KE3" +
"F4bBGvd44ML0uyibowBC0MleAyRSyZAASeQBh1AIP8bNKd1R9LeH3hiOIyJZBDg6MxoyexKQmjJ+GwXIQtT+MWmeA8wJCLnmGNBPzQEKYCgBmnQQNu5XWSi59HGk3KRJl" +
"5W0GuS+mp7Vt2HtnXE2H99jdHrwDVlIB9cD9dgmCCmhOJXoMYdgwWDEptwVj5TgsXWBJdKfFNIzWZzAfzQaLtNLEaJpwkoxIsWy8uZbxmIC+vTs2Dg2nOAw20AASpgAEa" +
"YeiD4fEWKcMUO8FEoA";
"HlgdrGB9jR25EI1TEv0ispqeyBQEkhoCSDevk1oLfxrENrYUGkGXT3EfUxQmHRhCB2gZ1k44BFGgQVDJpkxYhBgoMPgR1lByPMEa0mL4ZJhYgYQOpCC8IIcAEwABnqNyh" +
"NxeGwRr3eODCDLsom6MAQtDJXgMkUsmQAEnkAYdQCD/OzSndUQy3h94YjiMjWQQ4OjMaMnsSkJoyfhsNyELU/jFpngPMCQi55hjQT80BCmAoAZp0EDbuV1kpufRxpNykT" +
"ZeVtJrkvoae07dgHZ1xNgA/Z3Z68A05SBfXB/XYJggpoTid6DOHYMEQ5LbcE4+U4LF1gTXamJbTM9nc4GC8Hi3Sy5GiacJKMSLFsgqWW8ZiAvr07Ng4NpzgMNtAAEqYAB" +
"GmHoQ5HxFinHFjvBRKAA==";
}

static noSlashInEncodedDefinition2() {
Expand Down