Skip to content

Commit edc21dc

Browse files
korvin89korvin89
authored
Update @gravity-ui/chartkit to v5.18.0 (#1845)
1 parent 4ce8e03 commit edc21dc

File tree

21 files changed

+57
-29
lines changed

21 files changed

+57
-29
lines changed

‎jest/mocks/globals.mock.js

+8
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,11 @@ jest.mock(`../../src/ui/libs/userSettings/index.ts`, () => {
6161
},
6262
};
6363
});
64+
65+
jest.mock('@gravity-ui/chartkit/d3', () => {
66+
return {
67+
CustomShapeRenderer: {
68+
pieCenterText: () => {},
69+
},
70+
};
71+
});

‎package-lock.json

+29-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"@diplodoc/transform": "^4.20.0",
6161
"@gravity-ui/app-layout": "^2.1.0",
6262
"@gravity-ui/browserslist-config": "^4.3.0",
63-
"@gravity-ui/chartkit": "^5.17.1",
63+
"@gravity-ui/chartkit": "^5.18.1",
6464
"@gravity-ui/dashkit": "^8.20.1",
6565
"@gravity-ui/date-utils": "^2.3.0",
6666
"@gravity-ui/expresskit": "^2.1.0",

‎tests/opensource-suites/dash/base/loading.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const TEXTS = {
1414
};
1515

1616
const SELECTORS = {
17-
CHART_LINE_ITEM: '.chartkit-d3-axis',
17+
CHART_LINE_ITEM: '.gcharts-d3-axis',
1818
};
1919

2020
const waitForDashFirstResponseSentData = async ({

‎tests/opensource-suites/dash/base/relations.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {ConnectionsDialogQA, Feature} from '../../../../src/shared';
77
import {TestParametrizationConfig} from '../../../types/config';
88

99
const SELECTORS = {
10-
CHART_LEGEND_ITEM: '.chartkit-d3-legend__item',
10+
CHART_LEGEND_ITEM: '.gcharts-d3-legend__item',
1111
CONTROL_SELECT_ITEMS_KEY: 'chartkit-control-select-items',
1212
};
1313
const PARAMS = {

‎tests/opensource-suites/dash/relations/ignore.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {DashRelationTypes} from '../../../../src/shared';
77
import {TestParametrizationConfig} from '../../../types/config';
88

99
const SELECTORS = {
10-
CHART_LEGEND_ITEM: '.chartkit-d3-legend__item',
10+
CHART_LEGEND_ITEM: '.gcharts-d3-legend__item',
1111
CONTROL_SELECT_ITEMS_KEY: 'chartkit-control-select-items',
1212
};
1313

‎tests/opensource-suites/dash/relations/relations.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {DashCommonQa, DashRelationTypes} from '../../../../src/shared';
77
import {TestParametrizationConfig} from '../../../types/config';
88

99
const SELECTORS = {
10-
CHART_LEGEND_ITEM: '.chartkit-d3-legend__item',
10+
CHART_LEGEND_ITEM: '.gcharts-d3-legend__item',
1111
CONTROL_SELECT_ITEMS_KEY: 'chartkit-control-select-items',
1212
};
1313

‎tests/opensource-suites/ql/visualizations/column/column.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ datalensTest.describe('QL', () => {
2828
const qlPage = new QLPage({page});
2929

3030
const previewLoader = page.locator('.grid-loader');
31-
const chart = page.locator('.chartkit-graph,.chartkit-d3');
31+
const chart = page.locator('.chartkit-graph,.gcharts-d3');
3232

3333
await qlPage.sectionVisualization.removeFieldByClick(
3434
PlaceholderName.X,

‎tests/opensource-suites/ql/visualizations/pie/labels.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ datalensTest.describe('QL', () => {
2020
datalensTest('"Column names" in Labels section @screenshot', async ({page}) => {
2121
const qlPage = new QLPage({page});
2222
const previewLoader = page.locator('.grid-loader');
23-
const chart = page.locator('.chartkit-graph,.chartkit-d3');
23+
const chart = page.locator('.chartkit-graph,.gcharts-d3');
2424

2525
await qlPage.sectionVisualization.addFieldByClick(PlaceholderName.Labels, 'city');
2626
await expect(previewLoader).not.toBeVisible();

‎tests/opensource-suites/ql/visualizations/treemap/basic.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ datalensTest.describe('QL', () => {
2727

2828
datalensTest('Visualization of the graph without errors', async ({page}) => {
2929
const previewLoader = page.locator('.grid-loader');
30-
const chart = page.locator('.chartkit-d3');
30+
const chart = page.locator('.gcharts-d3');
3131

3232
await expect(previewLoader).not.toBeVisible();
3333
await expect(chart).toBeVisible();

‎tests/opensource-suites/wizard/edit-history/basic.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ datalensTest.describe('Wizard', () => {
3232
datalensTest('Make some changes, then undo them', async ({page}) => {
3333
const wizardPage = new WizardPage({page});
3434
const chartContainer = page.locator(slct(WizardPageQa.SectionPreview));
35-
const chart = chartContainer.locator('.chartkit-graph,.chartkit-d3');
35+
const chart = chartContainer.locator('.chartkit-graph,.gcharts-d3');
3636

3737
await expect(chart).toBeVisible();
3838

@@ -62,7 +62,7 @@ datalensTest.describe('Wizard', () => {
6262
datalensTest('Make some changes, then undo them, then redo them', async ({page}) => {
6363
const wizardPage = new WizardPage({page});
6464
const chartContainer = page.locator(slct(WizardPageQa.SectionPreview));
65-
const chart = chartContainer.locator('.chartkit-graph,.chartkit-d3');
65+
const chart = chartContainer.locator('.chartkit-graph,.gcharts-d3');
6666

6767
await expect(chart).toBeVisible();
6868

‎tests/opensource-suites/wizard/fields/parameters.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ datalensTest.describe('Wizard', () => {
6161
const datasetFields = page.locator(slct(SectionDatasetQA.DatasetFields));
6262
const chartContainer = page.locator(slct(WizardPageQa.SectionPreview));
6363
const previewLoader = chartContainer.locator(slct(ChartKitQa.Loader));
64-
const chart = chartContainer.locator('.chartkit-graph,.chartkit-d3');
64+
const chart = chartContainer.locator('.chartkit-graph,.gcharts-d3');
6565
const noData = chartContainer.locator(slct('ERR.CK.NO_DATA'));
6666

6767
// Create parameter (value = 1)

‎tests/opensource-suites/wizard/visualizations/line/axis.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ datalensTest.describe('Wizard', () => {
2121
datalensTest('Date and time on the Y axis @screenshot', async ({page}) => {
2222
const wizardPage = new WizardPage({page});
2323
const chartContainer = page.locator(slct(WizardPageQa.SectionPreview));
24-
const chart = chartContainer.locator('.chartkit-graph,.chartkit-d3');
24+
const chart = chartContainer.locator('.chartkit-graph,.gcharts-d3');
2525

2626
// Create dateTime field
2727
const dateTimeMeasureField = 'MaxDate';

‎tests/opensource-suites/wizard/visualizations/pie/basic.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ datalensTest.describe('Wizard', () => {
2222
datalensTest('Auto coloring @screenshot', async ({page}) => {
2323
const wizardPage = new WizardPage({page});
2424
const chartContainer = page.locator(slct(WizardPageQa.SectionPreview));
25-
const chart = chartContainer.locator('.chartkit-graph,.chartkit-d3');
25+
const chart = chartContainer.locator('.chartkit-graph,.gcharts-d3');
2626
const previewLoader = chartContainer.locator(slct(ChartKitQa.Loader));
2727

2828
// 1. Only Measures placeholder is filled

‎tests/opensource-suites/wizard/visualizations/pie/hierarchy.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ datalensTest.describe('Wizard', () => {
2929
async ({page}) => {
3030
const wizardPage = new WizardPage({page});
3131
const chartContainer = page.locator(slct(WizardPageQa.SectionPreview));
32-
const chart = chartContainer.locator('.chartkit-d3');
32+
const chart = chartContainer.locator('.gcharts-d3');
3333
const previewLoader = chartContainer.locator(slct(ChartKitQa.Loader));
3434

3535
await wizardPage.sectionVisualization.addFieldByClick(

‎tests/opensource-suites/wizard/visualizations/scatter/coloring.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ datalensTest.describe('Wizard', () => {
2222
await page.setViewportSize(SMALL_SCREENSHOT_VIEWPORT_SIZE);
2323
const wizardPage = new WizardPage({page});
2424
const chartContainer = page.locator(slct(WizardPageQa.SectionPreview));
25-
const chart = chartContainer.locator('.chartkit-d3');
25+
const chart = chartContainer.locator('.gcharts-d3');
2626
const previewLoader = chartContainer.locator(slct(ChartKitQa.Loader));
2727

2828
await wizardPage.createNewFieldWithFormula(

‎tests/opensource-suites/wizard/visualizations/treemap/hierarchy.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ datalensTest.describe('Wizard', () => {
2929
async ({page}) => {
3030
const wizardPage = new WizardPage({page});
3131
const chartContainer = page.locator(slct(WizardPageQa.SectionPreview));
32-
const chart = chartContainer.locator('.chartkit-d3');
32+
const chart = chartContainer.locator('.gcharts-d3');
3333
const previewLoader = chartContainer.locator(slct(ChartKitQa.Loader));
3434

3535
await wizardPage.sectionVisualization.addFieldByClick(

‎tests/opensource-suites/wizard/visualizations/treemap/html-in-chart.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ datalensTest.describe('Wizard', () => {
2323
datalensTest('Markdown dimension @screenshot', async ({page}) => {
2424
const wizardPage = new WizardPage({page});
2525
const chartContainer = page.locator(slct(WizardPageQa.SectionPreview));
26-
const chart = chartContainer.locator('.chartkit-d3');
26+
const chart = chartContainer.locator('.gcharts-d3');
2727
const previewLoader = chartContainer.locator(slct(ChartKitQa.Loader));
2828

2929
await wizardPage.createNewFieldWithFormula(

‎tests/opensource-suites/wizard/visualizations/treemap/tooltip.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ datalensTest.describe('Wizard', () => {
1818
datalensTest('Tooltip when hovering chart area @screenshot', async ({page}) => {
1919
const wizardPage = new WizardPage({page});
2020
const chartContainer = page.locator(slct(WizardPageQa.SectionPreview));
21-
const chart = chartContainer.locator('.chartkit-d3');
21+
const chart = chartContainer.locator('.gcharts-d3');
2222
const previewLoader = chartContainer.locator(slct(ChartKitQa.Loader));
2323

2424
await wizardPage.sectionVisualization.addFieldByClick(

‎tests/page-objects/constants/chartkit.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ export const COMMON_CHARTKIT_SELECTORS = {
44
scrollableNode: 'chartkit-scrollable-node',
55
tooltipContainer: 'highcharts-tooltip-container',
66
tooltipNameColumn: '_tooltip-rows__name-td',
7-
chartLegendItem: '.chartkit-d3-legend__item',
7+
chartLegendItem: '.gcharts-d3-legend__item',
88
};

‎tests/page-objects/ql/QLPage.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ class QLPage extends ChartPage {
221221

222222
waitForSomeSuccessfulRender() {
223223
return new Promise((resolve, reject) => {
224-
this.page.waitForSelector('.chartkit .chartkit-d3').then(resolve, () => undefined);
224+
this.page.waitForSelector('.chartkit .gcharts-d3').then(resolve, () => undefined);
225225
this.page.waitForSelector('.chartkit .chartkit-graph').then(resolve, () => undefined);
226226

227227
const metricLocators = [

0 commit comments

Comments
 (0)