Skip to content

EES-5733 Table export options #5728

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

Merged
merged 9 commits into from
Apr 4, 2025
Merged

EES-5733 Table export options #5728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dbb886b
EES-7733 (DRAFT) commit initial table export for data block
Mar 27, 2025
0caefa0
EES-5733 update hidden text
Mar 31, 2025
5970530
EES-5733 fix table download and tidying
amyb-hiveit Apr 3, 2025
fe3164e
EES-5733 fix styling
amyb-hiveit Apr 3, 2025
7311993
EES-5733 csv download
amyb-hiveit Apr 3, 2025
0fa0e48
EES-5733 remove context for chart download
amyb-hiveit Apr 3, 2025
e3b01ab
EES-5733 add copy table option to DownloadTable
amyb-hiveit Apr 3, 2025
ac68552
EES-5733 do not show export menu when editing datablocks
amyb-hiveit Apr 3, 2025
19fe49c
EES-5733 export menu tests
amyb-hiveit Apr 3, 2025
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
41 changes: 19 additions & 22 deletions ...statistics-admin/src/pages/release/datablocks/__tests__/ReleaseDataBlockEditPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import _dataBlockService, {
} from '@admin/services/dataBlockService';
import _permissionService from '@admin/services/permissionService';
import render from '@common-test/render';
import { RefContextProvider } from '@common/contexts/RefContext';
import { Chart } from '@common/modules/charts/types/chart';
import _tableBuilderService, {
Subject,
Expand Down Expand Up @@ -542,27 +541,25 @@ describe('ReleaseDataBlockEditPage', () => {

const renderPage = () => {
return render(
<RefContextProvider>
<TestConfigContextProvider>
<MemoryRouter
initialEntries={[
generatePath<ReleaseDataBlockRouteParams>(
releaseDataBlockEditRoute.path,
{
publicationId: 'publication-1',
releaseVersionId: 'release-1',
dataBlockId: 'block-1',
},
),
]}
>
<Route
path={releaseDataBlockEditRoute.path}
component={ReleaseDataBlockEditPage}
/>
</MemoryRouter>
</TestConfigContextProvider>
</RefContextProvider>,
<TestConfigContextProvider>
<MemoryRouter
initialEntries={[
generatePath<ReleaseDataBlockRouteParams>(
releaseDataBlockEditRoute.path,
{
publicationId: 'publication-1',
releaseVersionId: 'release-1',
dataBlockId: 'block-1',
},
),
]}
>
<Route
path={releaseDataBlockEditRoute.path}
component={ReleaseDataBlockEditPage}
/>
</MemoryRouter>
</TestConfigContextProvider>,
);
};
});
14 changes: 6 additions & 8 deletions ...on-statistics-admin/src/pages/release/datablocks/components/DataBlockPageReadOnlyTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import LoadingSpinner from '@common/components/LoadingSpinner';
import Tabs from '@common/components/Tabs';
import TabsSection from '@common/components/TabsSection';
import WarningMessage from '@common/components/WarningMessage';
import { RefContextProvider } from '@common/contexts/RefContext';
import ChartRenderer from '@common/modules/charts/components/ChartRenderer';
import useDataBlock from '@common/modules/find-statistics/hooks/useDataBlock';
import mapTableHeadersConfig from '@common/modules/table-tool/utils/mapTableHeadersConfig';
Expand Down Expand Up @@ -82,13 +81,12 @@ const DataBlockPageReadOnlyTabs = ({ releaseVersionId, dataBlock }: Props) => {
}
>
{chart && (
<RefContextProvider>
<ChartRenderer
id={`dataBlockTabs-chart-${dataBlock.id}`}
source={dataBlock.source}
chart={chart}
/>
</RefContextProvider>
<ChartRenderer
id={`dataBlockTabs-chart-${dataBlock.id}`}
source={dataBlock.source}
chart={chart}
showExportMenu={false}
/>
)}
</ErrorBoundary>
</div>
Expand Down
1 change: 1 addition & 0 deletions ...on-statistics-admin/src/pages/release/datablocks/components/chart/ChartBuilderPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const ChartBuilderPreview = ({ chart, loading }: Props) => {
chart={chart}
key={renderCount.current}
id="chartBuilderPreview"
showExportMenu={false}
/>
</div>
</LoadingSpinner>
Expand Down
23 changes: 10 additions & 13 deletions ...statistics-admin/src/pages/release/datablocks/components/chart/ChartBuilderTabSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import ChartBuilder, {
import { SavedDataBlock } from '@admin/pages/release/datablocks/components/DataBlockPageTabs';
import { ReleaseDataBlock } from '@admin/services/dataBlockService';
import releaseChartFileService from '@admin/services/releaseChartFileService';
import { RefContextProvider } from '@common/contexts/RefContext';
import { Chart } from '@common/modules/charts/types/chart';
import { FullTable } from '@common/modules/table-tool/types/fullTable';
import mapFullTable from '@common/modules/table-tool/utils/mapFullTable';
Expand Down Expand Up @@ -128,18 +127,16 @@ const ChartBuilderTabSection = ({
);

return (
<RefContextProvider>
<ChartBuilder
releaseVersionId={releaseVersionId}
data={table.results}
meta={meta}
initialChart={dataBlock.charts[0]}
tableTitle={dataBlock.heading}
onChartSave={handleChartSave}
onChartDelete={handleChartDelete}
onTableQueryUpdate={handleTableQueryUpdate}
/>
</RefContextProvider>
<ChartBuilder
releaseVersionId={releaseVersionId}
data={table.results}
meta={meta}
initialChart={dataBlock.charts[0]}
tableTitle={dataBlock.heading}
onChartSave={handleChartSave}
onChartDelete={handleChartDelete}
onTableQueryUpdate={handleTableQueryUpdate}
/>
);
};

Expand Down
173 changes: 81 additions & 92 deletions ...stics-admin/src/pages/release/datablocks/components/chart/__tests__/ChartBuilder.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
ChartBuilderFormsContextProvider,
} from '@admin/pages/release/datablocks/components/chart/contexts/ChartBuilderFormsContext';
import render from '@common-test/render';
import { RefContextProvider } from '@common/contexts/RefContext';
import { Chart } from '@common/modules/charts/types/chart';
import { screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
Expand Down Expand Up @@ -114,19 +113,17 @@ describe('ChartBuilder', () => {
describe('data sets', () => {
test('adding data sets', async () => {
const { user } = render(
<RefContextProvider>
<ChartBuilderFormsContextProvider initialForms={testFormState}>
<ChartBuilder
releaseVersionId="release-1"
data={testFullTable.results}
meta={testFullTable.subjectMeta}
tableTitle="Table title"
onChartSave={jest.fn()}
onChartDelete={noop}
onTableQueryUpdate={jest.fn()}
/>
</ChartBuilderFormsContextProvider>
</RefContextProvider>,
<ChartBuilderFormsContextProvider initialForms={testFormState}>
<ChartBuilder
releaseVersionId="release-1"
data={testFullTable.results}
meta={testFullTable.subjectMeta}
tableTitle="Table title"
onChartSave={jest.fn()}
onChartDelete={noop}
onTableQueryUpdate={jest.fn()}
/>
</ChartBuilderFormsContextProvider>,
);

await user.click(screen.getByRole('button', { name: 'Line' }));
Expand Down Expand Up @@ -194,19 +191,17 @@ describe('ChartBuilder', () => {

test('removing a data set', async () => {
render(
<RefContextProvider>
<ChartBuilderFormsContextProvider initialForms={testFormState}>
<ChartBuilder
releaseVersionId="release-1"
data={testFullTable.results}
meta={testFullTable.subjectMeta}
tableTitle="Table title"
onChartSave={jest.fn()}
onChartDelete={noop}
onTableQueryUpdate={jest.fn()}
/>
</ChartBuilderFormsContextProvider>
</RefContextProvider>,
<ChartBuilderFormsContextProvider initialForms={testFormState}>
<ChartBuilder
releaseVersionId="release-1"
data={testFullTable.results}
meta={testFullTable.subjectMeta}
tableTitle="Table title"
onChartSave={jest.fn()}
onChartDelete={noop}
onTableQueryUpdate={jest.fn()}
/>
</ChartBuilderFormsContextProvider>,
);

await userEvent.click(screen.getByRole('button', { name: 'Line' }));
Expand Down Expand Up @@ -273,19 +268,17 @@ describe('ChartBuilder', () => {

test('removing all data sets', async () => {
const { user } = render(
<RefContextProvider>
<ChartBuilderFormsContextProvider initialForms={testFormState}>
<ChartBuilder
releaseVersionId="release-1"
data={testFullTable.results}
meta={testFullTable.subjectMeta}
tableTitle="Table title"
onChartSave={jest.fn()}
onChartDelete={noop}
onTableQueryUpdate={jest.fn()}
/>
</ChartBuilderFormsContextProvider>
</RefContextProvider>,
<ChartBuilderFormsContextProvider initialForms={testFormState}>
<ChartBuilder
releaseVersionId="release-1"
data={testFullTable.results}
meta={testFullTable.subjectMeta}
tableTitle="Table title"
onChartSave={jest.fn()}
onChartDelete={noop}
onTableQueryUpdate={jest.fn()}
/>
</ChartBuilderFormsContextProvider>,
);

await user.click(screen.getByRole('button', { name: 'Line' }));
Expand Down Expand Up @@ -414,32 +407,30 @@ describe('ChartBuilder', () => {
const handleUpdate = jest.fn();

const { user } = render(
<RefContextProvider>
<ChartBuilderFormsContextProvider initialForms={testFormState}>
<ChartBuilder
releaseVersionId="release-1"
data={testFullTable.results}
initialChart={testInitialChart}
meta={{
...testFullTable.subjectMeta,
boundaryLevels: [
{
id: 1,
label: 'Boundary level 1',
},
{
id: 2,
label: 'Boundary level 2',
},
],
}}
tableTitle="Table title"
onChartSave={jest.fn()}
onChartDelete={noop}
onTableQueryUpdate={handleUpdate}
/>
</ChartBuilderFormsContextProvider>
</RefContextProvider>,
<ChartBuilderFormsContextProvider initialForms={testFormState}>
<ChartBuilder
releaseVersionId="release-1"
data={testFullTable.results}
initialChart={testInitialChart}
meta={{
...testFullTable.subjectMeta,
boundaryLevels: [
{
id: 1,
label: 'Boundary level 1',
},
{
id: 2,
label: 'Boundary level 2',
},
],
}}
tableTitle="Table title"
onChartSave={jest.fn()}
onChartDelete={noop}
onTableQueryUpdate={handleUpdate}
/>
</ChartBuilderFormsContextProvider>,
);

expect(
Expand Down Expand Up @@ -569,32 +560,30 @@ describe('ChartBuilder', () => {
const handleSubmit = jest.fn();

const { user } = render(
<RefContextProvider>
<ChartBuilderFormsContextProvider initialForms={testFormState}>
<ChartBuilder
releaseVersionId="release-1"
data={testFullTable.results}
initialChart={testInitialChart}
meta={{
...testFullTable.subjectMeta,
boundaryLevels: [
{
id: 1,
label: 'Boundary level 1',
},
{
id: 2,
label: 'Boundary level 2',
},
],
}}
tableTitle="Table title"
onChartSave={handleSubmit}
onChartDelete={noop}
onTableQueryUpdate={jest.fn()}
/>
</ChartBuilderFormsContextProvider>
</RefContextProvider>,
<ChartBuilderFormsContextProvider initialForms={testFormState}>
<ChartBuilder
releaseVersionId="release-1"
data={testFullTable.results}
initialChart={testInitialChart}
meta={{
...testFullTable.subjectMeta,
boundaryLevels: [
{
id: 1,
label: 'Boundary level 1',
},
{
id: 2,
label: 'Boundary level 2',
},
],
}}
tableTitle="Table title"
onChartSave={handleSubmit}
onChartDelete={noop}
onTableQueryUpdate={jest.fn()}
/>
</ChartBuilderFormsContextProvider>,
);

expect(
Expand Down
Loading