Skip to content
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

fix(editor): Ensure Datatable component renders All option #10525

Merged
merged 2 commits into from
Aug 27, 2024
Merged

fix(editor): Ensure Datatable component renders All option #10525

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
7d47e07
fix(editor): Ensure `Datatable` component renders `All` option
ivov Aug 23, 2024
cce566d
Merge master, fix conflicts
ivov Aug 27, 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
11 changes: 10 additions & 1 deletion packages/design-system/src/components/N8nDatatable/Datatable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import type { DatatableColumn, DatatableRow, DatatableRowDataType } from '../../
import { useI18n } from '../../composables/useI18n';
import { getValueByPath } from '../../utils';

const ALL_ROWS = -1;

interface DatatableProps {
columns: DatatableColumn[];
rows: DatatableRow[];
Expand Down Expand Up @@ -41,6 +43,8 @@ const totalRows = computed(() => {
});

const visibleRows = computed(() => {
if (props.rowsPerPage === ALL_ROWS) return props.rows;

const start = (props.currentPage - 1) * props.rowsPerPage;
const end = start + props.rowsPerPage;

Expand All @@ -59,6 +63,11 @@ function onUpdateCurrentPage(value: number) {
function onRowsPerPageChange(value: number) {
emit('update:rowsPerPage', value);

if (value === ALL_ROWS) {
onUpdateCurrentPage(1);
return;
}

const maxPage = Math.ceil(totalRows.value / value);
if (maxPage < props.currentPage) {
onUpdateCurrentPage(maxPage);
Expand Down Expand Up @@ -131,7 +140,7 @@ function getThStyle(column: DatatableColumn) {
:label="`${size}`"
:value="size"
/>
<N8nOption :label="`All`" value="*"> </N8nOption>
<N8nOption :label="`All`" :value="ALL_ROWS"> </N8nOption>
</N8nSelect>
</div>
</div>
Expand Down
21 changes: 21 additions & 0 deletions packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,26 @@ describe('components', () => {
);
expect(wrapper.container.querySelector('tbody td')?.textContent).toEqual('Row slot');
});

it('should render all rows when rowsPerPage is set to -1', () => {
const wrapper = render(N8nDatatable, {
props: { columns, rows, rowsPerPage: -1 },
global: { stubs },
});

const pagination = wrapper.container.querySelector('.pagination');
expect(pagination?.querySelector('.el-pager')).toBeNull();

const pageSizeSelector = wrapper.container.querySelector('.pageSizeSelector');
expect(pageSizeSelector?.textContent).toContain('Page size');

const allOption = wrapper.getByText('All');
expect(allOption).not.toBeNull();

expect(wrapper.container.querySelectorAll('tbody tr').length).toEqual(rows.length);
expect(wrapper.container.querySelectorAll('tbody tr td').length).toEqual(
columns.length * rows.length,
);
});
});
});
Loading