From 61773e4b04f13fdd1e4eea46341cb12797b2d250 Mon Sep 17 00:00:00 2001 From: Sherfin Shamsudeen Date: Mon, 28 Feb 2022 17:28:56 +0530 Subject: [PATCH 1/4] Return promise returned by onComponentOptionChanged for subcontainer as well (#2378) --- frontend/src/Editor/SubContainer.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/Editor/SubContainer.jsx b/frontend/src/Editor/SubContainer.jsx index d3e0805c98..b58e1bfa08 100644 --- a/frontend/src/Editor/SubContainer.jsx +++ b/frontend/src/Editor/SubContainer.jsx @@ -364,9 +364,9 @@ export const SubContainer = ({ [optionName]: value, }, }; - onComponentOptionChanged(parentComponent, 'data', newData); + return onComponentOptionChanged(parentComponent, 'data', newData); } else { - onComponentOptionChanged(component, optionName, value, extraProps); + return onComponentOptionChanged(component, optionName, value, extraProps); } } From d3670a1b0e6814342accc0671161bee591c84912 Mon Sep 17 00:00:00 2001 From: Sherfin Shamsudeen Date: Mon, 28 Feb 2022 17:38:04 +0530 Subject: [PATCH 2/4] Bump patch version --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index d2d61a7e8e..e2cac26c1a 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.2.2 \ No newline at end of file +1.2.3 \ No newline at end of file From 42058bd08833f64ab6100d680a66900d16041b03 Mon Sep 17 00:00:00 2001 From: Sherfin Shamsudeen Date: Wed, 2 Mar 2022 16:04:35 +0530 Subject: [PATCH 3/4] Enforce boolean values on clientSidePagination and serverSidePagination (#2398) --- frontend/src/Editor/Components/Table/Table.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/Editor/Components/Table/Table.jsx b/frontend/src/Editor/Components/Table/Table.jsx index 04c904b9d7..df196e7d53 100644 --- a/frontend/src/Editor/Components/Table/Table.jsx +++ b/frontend/src/Editor/Components/Table/Table.jsx @@ -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; From a23939668bf16072765376a2c198ab6598e82bf0 Mon Sep 17 00:00:00 2001 From: Sherfin Shamsudeen Date: Wed, 2 Mar 2022 16:06:54 +0530 Subject: [PATCH 4/4] Bump patch version --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index e2cac26c1a..b966e81a45 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.2.3 \ No newline at end of file +1.2.4 \ No newline at end of file