Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enforce boolean values on clientSidePagination and serverSidePagination (#2398)

Browse source
This commit is contained in:
Sherfin Shamsudeen 2022-03-02 16:04:35 +05:30 committed by GitHub
parent d3670a1b0e
commit 42058bd088
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/Editor/Components/Table/Table.jsx
View file

@ -49,10 +49,12 @@ export function Table({
const actions = component.definition.properties.actions || { value: [] };
const serverSidePaginationProperty = component.definition.properties.serverSidePagination;
const serverSidePagination = serverSidePaginationProperty
let serverSidePagination = serverSidePaginationProperty
? resolveWidgetFieldValue(serverSidePaginationProperty.value, currentState)
: false;
if (typeof serverSidePagination !== 'boolean') serverSidePagination = false;
const serverSideSearchProperty = component.definition.properties.serverSideSearch;
const serverSideSearch = serverSideSearchProperty
? resolveWidgetFieldValue(serverSideSearchProperty.value, currentState)
@ -79,9 +81,11 @@ export function Table({
const highlightSelectedRow = resolveWidgetFieldValue(highlightSelectedRowProperty, currentState) ?? false; // default is false for backward compatibility
const clientSidePaginationProperty = component.definition.properties.clientSidePagination?.value;
const clientSidePagination =
let clientSidePagination =
resolveWidgetFieldValue(clientSidePaginationProperty, currentState) ?? !serverSidePagination; // default is true for backward compatibility
if (typeof clientSidePagination !== 'boolean') clientSidePagination = true;
const tableTypeProperty = component.definition.styles.tableType;
let tableType = tableTypeProperty ? tableTypeProperty.value : 'table-bordered';
tableType = tableType === '' ? 'table-bordered' : tableType;