Release 2 RC 3

sonar-project.properties

@@ -5,4 +5,5 @@ sonar.testExecutionReportPaths=reports/test-reporter.xml
 sonar.sources=src
 sonar.tests=src
 sonar.test.inclusions=**/*.test.js,**/*.test.ts,**/*.test.tsx
-sonar.exclusions=**/*.test.js,**/*.test.ts,**/*.test.tsx,**/*.test.tsx.snap,src/stories/**,**/fixtures/**
+sonar.exclusions=**/*.test.js,**/*.test.ts,**/*.test.tsx,**/*.test.tsx.snap,src/stories/**,**/fixtures/**
+sonar.cpd.exclusions=**/fixtures/**

src/core/conversion/pxGrafDataConverter.test.ts

@@ -1,22 +1,22 @@
 import { convertPxGraphDataToChartOptions } from "./pxGrafDataConverter";
-import { GROUP_HORIZONTAL_BAR_CHART_WITH_SELECTABLES } from "./TestFixtures/groupHorizontalBarChart";
-import { GROUP_VERTICAL_BAR_CHART_WITH_SELECTABLES_PIVOTED } from "./TestFixtures/groupVerticalBarChart";
-import { STACKED_HORIZONTAL_BAR_CHART_WITH_SELECTABLES } from "./TestFixtures/stackedHorizontalBarChart";
-import { STACKED_VERTICAL_BAR_CHART_WITH_SELECTABLES } from "./TestFixtures/stackedVerticalBarChart";
-import { HORIZONTAL_BAR_CHART_WITH_SELECTABLES } from "./TestFixtures/horizontalBarChart";
-import { PIE_CHART_ASCENDING } from "./TestFixtures/PieChart";
-import { VERTICAL_BAR_CHART_WITH_SELECTABLES } from "./TestFixtures/verticalBarChart";
-import { PERCENT_VERTICAL_BAR_CHART_WITH_SELECTABLES } from "./TestFixtures/percentVerticalBarChart";
-import { PYRAMID_CHART_WITH_SELECTABLES } from "./TestFixtures/pyramidChart";
-import { SCATTER_PLOT_WITH_SELECTABLES } from "./TestFixtures/scatterPlot";
-import { LINE_CHART_WITH_QUARTER_SERIES } from "./TestFixtures/lineChart";
+import { GROUP_HORIZONTAL_BAR_CHART_WITH_SELECTABLES } from "./fixtures/groupHorizontalBarChart";
+import { GROUP_VERTICAL_BAR_CHART_WITH_SELECTABLES_PIVOTED } from "./fixtures/groupVerticalBarChart";
+import { STACKED_HORIZONTAL_BAR_CHART_WITH_SELECTABLES } from "./fixtures/stackedHorizontalBarChart";
+import { STACKED_VERTICAL_BAR_CHART_WITH_SELECTABLES } from "./fixtures/stackedVerticalBarChart";
+import { HORIZONTAL_BAR_CHART_WITH_SELECTABLES } from "./fixtures/horizontalBarChart";
+import { PIE_CHART_ASCENDING } from "./fixtures/PieChart";
+import { VERTICAL_BAR_CHART_WITH_SELECTABLES } from "./fixtures/verticalBarChart";
+import { PERCENT_VERTICAL_BAR_CHART_WITH_SELECTABLES } from "./fixtures/percentVerticalBarChart";
+import { PYRAMID_CHART_WITH_SELECTABLES } from "./fixtures/pyramidChart";
+import { SCATTER_PLOT_WITH_SELECTABLES } from "./fixtures/scatterPlot";
+import { LINE_CHART_WITH_QUARTER_SERIES } from "./fixtures/lineChart";
 import { extractSelectableVariableValues } from "./helpers";
 import { convertPxGrafResponseToView } from "./viewUtils";
-import { EMPTY_VISUALIZATION_RESPONSE } from "./TestFixtures/viewUtils";
+import { EMPTY_VISUALIZATION_RESPONSE } from "./fixtures/viewUtils";
 import { IQueryVisualizationResponse } from "../types";
 import { EVariableType, IVariableMeta, IVariableValueMeta } from "../types/queryVisualizationResponse";
 import { IUnitInfo } from "../types/view";
-import { PERCENT_HORIZONTAL_BAR_CHART_WITH_SELECTABLES } from "./TestFixtures/percentHorizontalBarChart";
+import { PERCENT_HORIZONTAL_BAR_CHART_WITH_SELECTABLES } from "./fixtures/percentHorizontalBarChart";
 
 describe('PxGrafDataConverter tests, convertPxGrafResponseToView', () => {
     const unit1 = { 'fi': 'foo' };

src/core/conversion/viewUtils.test.ts

@@ -1,19 +1,19 @@
 import { ETimeVariableInterval, EVariableType, EVisualizationType, IContentComponent, IQueryVisualizationResponse, IVariableMeta, IVariableValueMeta, TMultiLanguageString } from '../types/queryVisualizationResponse';
 import { TVariableSelections } from '../types/variableSelections';
 import { ESeriesType, IDataSeries, View } from '../types/view';
-import { GROUP_HORIZONTAL_BAR_CHART_WITH_PRELIMINARY_DATA_SET, GROUP_HORIZONTAL_BAR_CHART_WITH_SUM_SORTING,GROUP_HORIZONTAL_BAR_CHART_WITH_REVERSED_SORTING } from './TestFixtures/groupHorizontalBarChart';
-import { HORIZONTAL_BAR_CHART_ASCENDING, HORIZONTAL_BAR_CHART_WITH_SELECTABLES } from './TestFixtures/horizontalBarChart';
-import { LINE_CHART_WITH_COMBINATION_SERIES, LINE_CHART_WITH_MULTISELECTABLE_VARIABLE, LINE_CHART_WITH_QUARTER_SERIES } from './TestFixtures/lineChart';
-import { PERCENT_HORIZONTAL_BAR_CHART, PERCENT_HORIZONTAL_BAR_CHART_VIEW, PERCENT_HORIZONTAL_BAR_CHART_WITH_SELECTABLES, PERCENT_HORIZONTAL_BAR_CHART_WITH_SELECTABLES_VIEW } from './TestFixtures/percentHorizontalBarChart';
+import { GROUP_HORIZONTAL_BAR_CHART_WITH_PRELIMINARY_DATA_SET, GROUP_HORIZONTAL_BAR_CHART_WITH_SUM_SORTING,GROUP_HORIZONTAL_BAR_CHART_WITH_REVERSED_SORTING } from './fixtures/groupHorizontalBarChart';
+import { HORIZONTAL_BAR_CHART_ASCENDING, HORIZONTAL_BAR_CHART_WITH_SELECTABLES } from './fixtures/horizontalBarChart';
+import { LINE_CHART_WITH_COMBINATION_SERIES, LINE_CHART_WITH_MULTISELECTABLE_VARIABLE, LINE_CHART_WITH_QUARTER_SERIES } from './fixtures/lineChart';
+import { PERCENT_HORIZONTAL_BAR_CHART, PERCENT_HORIZONTAL_BAR_CHART_VIEW, PERCENT_HORIZONTAL_BAR_CHART_WITH_SELECTABLES, PERCENT_HORIZONTAL_BAR_CHART_WITH_SELECTABLES_VIEW } from './fixtures/percentHorizontalBarChart';
 import {
     PERCENT_VERTICAL_BAR_CHART,
     PERCENT_VERTICAL_BAR_CHART_PIVOTED_WITH_SELECTABLES,
     PERCENT_VERTICAL_BAR_CHART_PIVOTED_WITH_SELECTABLES_VIEW,
     PERCENT_VERTICAL_BAR_CHART_VIEW,
     PERCENT_VERTICAL_BAR_CHART_WITH_SELECTABLES,
     PERCENT_VERTICAL_BAR_CHART_WITH_SELECTABLES_VIEW
-} from './TestFixtures/percentVerticalBarChart';
-import { SELECTABLE_TABLE_WITH_MISSING_DATA } from './TestFixtures/tableChart';
+} from './fixtures/percentVerticalBarChart';
+import { SELECTABLE_TABLE_WITH_MISSING_DATA } from './fixtures/tableChart';
 import { ASCENDING, DESCENDING, SUM, REVERSED, NO_SORTING } from './viewSorting';
 import { buildSeries, convertPxGrafResponseToView, convertToRelative } from './viewUtils';
 import { v4 as uuidV4 } from 'uuid'

src/core/tables/csvTable.test.ts

@@ -1,9 +1,9 @@
-import { VIEW_WITH_COMPLEX_ROW_AND_COLUMN_VARIABLES } from "../conversion/TestFixtures/exportingUtils";
+import { VIEW_WITH_COMPLEX_ROW_AND_COLUMN_VARIABLES } from "../conversion/fixtures/exportingUtils";
 import { generateCsv } from "./csvTable";
 import { CSV_FIXTURES_COMPLEX_VIEW_ROW_AND_COL_VARS, CSV_FIXTURES_COL_VARS, CSV_FIXTURES_ROW_VARS, CSV_FIXTURES_ONE_CELL, CSV_FIXTURES_ROW_AND_COL_VARS } from "./fixtures/csvFixtures";
 import { extractSelectableVariableValues } from "../conversion";
 import { convertPxGrafResponseToView } from "../conversion/viewUtils";
-import { TABLE_WITH_ONLY_COLUMN_VARIABLES } from "../conversion/TestFixtures/tableChart";
+import { TABLE_WITH_ONLY_COLUMN_VARIABLES } from "../conversion/fixtures/tableChart";
 import { TABLE_WITH_ONE_CELL, TABLE_WITH_ONLY_ROW_VARIABLES, TABLE_WITH_ROW_AND_COLUMN_VARIABLES } from "../../stories/fixtures/table";
 
 const locales = ['fi', 'sv', 'en'];

src/core/tables/htmlTable.test.ts

@@ -1,6 +1,6 @@
 import { prettyDOM } from "@testing-library/dom";
 import { TABLE_WITH_ONE_CELL, TABLE_WITH_ONLY_ROW_VARIABLES, TABLE_WITH_ROW_AND_COLUMN_VARIABLES } from "../../stories/fixtures/table";
-import { SELECTABLE_TABLE_WITH_MISSING_DATA, TABLE_WITH_ONLY_COLUMN_VARIABLES } from "../conversion/TestFixtures/tableChart";
+import { SELECTABLE_TABLE_WITH_MISSING_DATA, TABLE_WITH_ONLY_COLUMN_VARIABLES } from "../conversion/fixtures/tableChart";
 import { extractSelectableVariableValues } from "../conversion/helpers";
 import { convertPxGrafResponseToView } from "../conversion/viewUtils";
 import { renderHtmlTable } from "./htmlTable";

src/core/tables/xlsx/xlsxDataBuilder.test.ts

@@ -1,7 +1,7 @@
-import { VIEW_WITH_COMPLEX_ROW_AND_COLUMN_VARIABLES } from "../../conversion/TestFixtures/exportingUtils";
+import { VIEW_WITH_COMPLEX_ROW_AND_COLUMN_VARIABLES } from "../../conversion/fixtures/exportingUtils";
 import { extractSelectableVariableValues } from "../../conversion";
 import { convertPxGrafResponseToView } from "../../conversion/viewUtils";
-import { TABLE_WITH_ONLY_COLUMN_VARIABLES } from "../../conversion/TestFixtures/tableChart";
+import { TABLE_WITH_ONLY_COLUMN_VARIABLES } from "../../conversion/fixtures/tableChart";
 import { TABLE_WITH_ONE_CELL, TABLE_WITH_ONLY_ROW_VARIABLES, TABLE_WITH_ROW_AND_COLUMN_VARIABLES } from "../../../stories/fixtures/table";
 import { XLSX_FIXTURES_COL_VARS, XLSX_FIXTURES_COMPLEX_VIEW_ROW_AND_COL_VARS, XLSX_FIXTURES_ONE_CELL, XLSX_FIXTURES_ROW_AND_COL_VARS, XLSX_FIXTURES_ROW_VARS } from "../fixtures/xlsxFixtures";
 import { buildCellRows } from "./xlsxDataBuilder";

src/react/components/burgerMenu/burgerMenu.test.tsx

@@ -1,6 +1,6 @@
 import { act, render, screen, waitFor, fireEvent } from "@testing-library/react";
 import { BurgerMenu, calculateExportDimensions } from "./burgerMenu";
-import { HORIZONTAL_BAR_CHART_ASCENDING } from "../../../core/conversion/TestFixtures/horizontalBarChart";
+import { HORIZONTAL_BAR_CHART_ASCENDING } from "../../../core/conversion/fixtures/horizontalBarChart";
 import { convertPxGrafResponseToView } from "../../../core/conversion/viewUtils";
 import React from "react";
 import 'jest-styled-components';

src/react/components/chart/tableView.test.tsx

@@ -2,7 +2,7 @@ import { render } from "@testing-library/react";
 import { TableView } from "./tableView";
 import { convertPxGrafResponseToView } from "../../../core/conversion/viewUtils";
 import React from "react";
-import { TABLE_WITH_ROW_AND_COLUMN_VARIABLES } from "../../../core/conversion/TestFixtures/tableChart";
+import { TABLE_WITH_ROW_AND_COLUMN_VARIABLES } from "../../../core/conversion/fixtures/tableChart";
 
 jest.mock('uuid', () => ({
     ...jest.requireActual('uuid'),

src/stories/chartstories/horizontal.stories.tsx

@@ -16,7 +16,7 @@ export const Ascending = {
 } satisfies StoryObj<typeof Chart>;
 
 export const Selectable = {
-    name: 'Ascending',
+    name: 'Selectable',
     args: SELECTABLE_HORIZONTAL_BAR_CHART,
 } satisfies StoryObj<typeof Chart>;