Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-05 22:38:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Resolved a bug (#2414)

Browse source
This commit is contained in:
Muhsin Shah C P 2022-03-10 21:06:04 +05:30 committed by GitHub
parent 44bbbc8936
commit 633a318d27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/Editor/Inspector/Components/Table.jsx
View file

@ -2,7 +2,7 @@ import React from 'react';
import Accordion from '@/_ui/Accordion';
import { renderElement } from '../Utils';
import { computeActionName } from '@/_helpers/utils';
import { computeActionName, resolveReferences } from '@/_helpers/utils';
// eslint-disable-next-line import/no-unresolved
import SortableList, { SortableItem } from 'react-easy-sort';
import arrayMove from 'array-move';
@ -600,7 +600,9 @@ class Table extends React.Component {
if (!component.component.definition.properties.displaySearchBox)
paramUpdated({ name: 'displaySearchBox' }, 'value', true, 'properties');
const displaySearchBox = component.component.definition.properties.displaySearchBox.value;
const serverSidePagination = component.component.definition.properties.serverSidePagination?.value ?? false;
const serverSidePagination = component.component.definition.properties.serverSidePagination?.value
? resolveReferences(component.component.definition.properties.serverSidePagination?.value, currentState)
: false;
const renderCustomElement = (param, paramType = 'properties') => {
return renderElement(component, componentMeta, paramUpdated, dataQueries, param, paramType, currentState);
@ -744,10 +746,11 @@ class Table extends React.Component {
let renderOptions = [];
!serverSidePagination && options.splice(1, 0, 'clientSidePagination');
options.map((option) => renderOptions.push(renderCustomElement(option)));
const conditionalOptions = [
{ name: 'clientSidePagination', condition: !serverSidePagination },
{ name: 'displaySearchBox', condition: displaySearchBox },
{ name: 'loadingState', condition: true },
];