diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/InfiniteScrollVariableHeightRows_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/InfiniteScrollVariableHeightRows_spec.ts index bd06c6c2dd66..b5046d8fce87 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/InfiniteScrollVariableHeightRows_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/InfiniteScrollVariableHeightRows_spec.ts @@ -43,6 +43,7 @@ describe( propPane.EnterJSContext("Table data", JSON.stringify(testData)); + propPane.TogglePropertyState("Server side pagination", "On"); propPane.TogglePropertyState("Infinite scroll", "On"); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Table_InfiniteScroll_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Table_InfiniteScroll_spec.ts index 6579ba49b2ea..5d8c88ed98c2 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Table_InfiniteScroll_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/Table_InfiniteScroll_spec.ts @@ -48,6 +48,7 @@ describe( it("1. should enable infinite scroll and verify records are loaded automatically when scrolling", () => { // Enable infinite scroll in the property pane + propPane.TogglePropertyState("Server side pagination", "On"); propPane.TogglePropertyState("Infinite scroll", "On"); // Wait for network call to complete diff --git a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts index bf12ab66c6d8..278554f7f119 100644 --- a/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts +++ b/app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts @@ -200,8 +200,10 @@ export default [ updateCellEditabilityOnInfiniteScrollChange, updateSearchSortFilterOnInfiniteScrollChange, ]), - dependencies: ["primaryColumns"], - hidden: () => !Widget.getFeatureFlag(INFINITE_SCROLL_ENABLED), + dependencies: ["primaryColumns", "serverSidePaginationEnabled"], + hidden: (props: TableWidgetProps) => + !Widget.getFeatureFlag(INFINITE_SCROLL_ENABLED) || + !props.serverSidePaginationEnabled, }, { helpText: createMessage(TABLE_WIDGET_TOTAL_RECORD_TOOLTIP),