Skip to content

feat(AnalyticalTable): introduce popinDisplay column option #6619

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
Lukas742 merged 3 commits into from
Dec 2, 2024
Merged

feat(AnalyticalTable): introduce popinDisplay column option #6619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72cc434
feat(AnalyticalTable): introduce `popinDisplay` column option
Lukas742 Nov 13, 2024
81a38bc
adjust tests
Lukas742 Nov 13, 2024
8c7c5ed
fix types
Lukas742 Nov 14, 2024
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
141 changes: 137 additions & 4 deletions packages/main/src/components/AnalyticalTable/AnalyticalTable.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@ import type {
PopoverDomRef
} from '../..';
import {
Popover,
AnalyticalTable,
AnalyticalTableHooks,
AnalyticalTablePopinDisplay,
AnalyticalTableScaleWidthMode,
AnalyticalTableSelectionBehavior,
AnalyticalTableSelectionMode,
AnalyticalTableSubComponentsBehavior,
AnalyticalTableVisibleRowCountMode,
Button,
IndicationColor,
Input
Input,
Popover,
Text
} from '../..';
import { useManualRowSelect } from './pluginHooks/useManualRowSelect';
import { useRowDisableSelection } from './pluginHooks/useRowDisableSelection';
Expand Down Expand Up @@ -1986,13 +1988,15 @@ describe('AnalyticalTable', () => {
['ltr', 'rtl'].forEach((dir) => {
cy.mount(<AnalyticalTable data={data} columns={columnsWithPopIn} dir={dir} />);
cy.viewport(801, 1024);

cy.findByText('Name').should('be.visible');
cy.findByText('Age').should('be.visible');
cy.findByText('Friend Name').should('be.visible');
cy.findByText('Custom original Header1').should('be.visible');
cy.findByText('Custom original Header2').should('be.visible');
cy.findByText('Custom Header').should('be.visible');
cy.findByText('Custom Header').should('be.visible');
cy.findByText('PopinDisplay Modes').should('be.visible').should('have.attr', 'ui5-text');
cy.findAllByTestId('popinCell').should('exist');
cy.contains('Custom Cell 2').should('be.visible');

cy.contains('Custom Header 1').should('not.exist');
Expand All @@ -2017,18 +2021,77 @@ describe('AnalyticalTable', () => {
cy.contains('Custom Header 2').should('be.visible');
cy.contains('pop-in content').should('exist');
cy.contains('C').should('exist');
cy.findAllByTestId('popinCell').should('exist');
cy.findAllByText('PopinDisplay Modes:').as('popinHeader').should('be.exist');
//popinDisplay: Block
cy.get('@popinHeader').parent().should('have.css', 'flex-direction', 'column');

cy.viewport(600, 1024);
cy.wait(200);
cy.contains('Age').should('not.exist');
cy.contains('40').should('not.exist');

cy.mount(
<AnalyticalTable
data={data}
columns={[
...columnsWithPopIn.slice(0, -1),
{
id: 'popinDisplay',
Header: 'PopinDisplay Modes',
responsivePopIn: true,
responsiveMinWidth: 801,
popinDisplay: AnalyticalTablePopinDisplay.Inline,
Cell: () => {
return (
<Text data-testid="popinCell" maxLines={1}>
Popin Cell
</Text>
);
}
}
]}
dir={dir}
/>
);
cy.findAllByText('PopinDisplay Modes:').as('popinHeader').should('be.exist');
//popinDisplay: Row
cy.get('@popinHeader').parent().should('have.css', 'flex-direction', 'row');
cy.findAllByTestId('popinCell').should('exist');

cy.mount(
<AnalyticalTable
data={data}
columns={[
...columnsWithPopIn.slice(0, -1),
{
id: 'popinDisplay',
Header: 'PopinDisplay Modes',
responsivePopIn: true,
responsiveMinWidth: 801,
popinDisplay: AnalyticalTablePopinDisplay.WithoutHeader,
Cell: () => {
return (
<Text data-testid="popinCell" maxLines={1}>
Popin Cell
</Text>
);
}
}
]}
dir={dir}
/>
);
//popinDisplay: WithoutHeader
cy.findAllByText('PopinDisplay Modes:').should('not.exist');
cy.findAllByTestId('popinCell').should('exist');
});
});

it('pop-in columns: adjustTableHeightOnPopIn ', () => {
document.body.style.margin = '0px';
cy.viewport(800, 2000);
cy.mount(<AnalyticalTable data={data} columns={columnsWithPopIn} adjustTableHeightOnPopIn />);
cy.mount(<AnalyticalTable data={data} columns={columnsWithPopIn} adjustTableHeightOnPopIn data-testid="table" />);

cy.findByText('Name').should('be.visible');
cy.findByText('Age').should('be.visible');
Expand All @@ -2040,12 +2103,68 @@ describe('AnalyticalTable', () => {
cy.findByText('Custom original Header2').should('not.exist');
cy.contains('Custom Header').should('be.visible');
cy.contains('Custom Cell 2').should('be.visible');
cy.findAllByTestId('popinCell').should('be.visible');

cy.contains('Custom Header 1').should('be.visible');
cy.contains('Custom Header 2').should('be.visible');
cy.contains('pop-in content').should('be.visible');

cy.contains('C').should('be.visible');
cy.findByTestId('table').should('have.css', 'height', '1764px');

cy.mount(
<AnalyticalTable
data={data}
columns={[
...columnsWithPopIn.slice(0, -1),
{
id: 'popinDisplay',
Header: 'PopinDisplay Modes',
responsivePopIn: true,
responsiveMinWidth: 801,
popinDisplay: AnalyticalTablePopinDisplay.Inline,
Cell: () => {
return (
<Text data-testid="popinCell" maxLines={1}>
Popin Cell
</Text>
);
}
}
]}
data-testid="table"
adjustTableHeightOnPopIn
/>
);
cy.findAllByTestId('popinCell').should('be.visible');
cy.findByTestId('table').should('have.css', 'height', '1684px');

cy.mount(
<AnalyticalTable
data={data}
columns={[
...columnsWithPopIn.slice(0, -1),
{
id: 'popinDisplay',
Header: 'PopinDisplay Modes',
responsivePopIn: true,
responsiveMinWidth: 801,
popinDisplay: AnalyticalTablePopinDisplay.WithoutHeader,
Cell: () => {
return (
<Text data-testid="popinCell" maxLines={1}>
Popin Cell
</Text>
);
}
}
]}
data-testid="table"
adjustTableHeightOnPopIn
/>
);
cy.findAllByTestId('popinCell').should('be.visible');
cy.findByTestId('table').should('have.css', 'height', '1684px');
});

it('plugin hook: useRowDisableSelection', () => {
Expand Down Expand Up @@ -3427,6 +3546,20 @@ const columnsWithPopIn = [
}
return 'original content';
}
},
{
id: 'popinDisplay',
Header: 'PopinDisplay Modes',
responsivePopIn: true,
responsiveMinWidth: 801,
popinDisplay: 'Block',
Cell: () => {
return (
<Text data-testid="popinCell" maxLines={1}>
Popin Cell
</Text>
);
}
}
];

Expand Down
Loading
Loading