Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions app/client/src/entities/DataTree/dataTreeWidget.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,10 @@ describe("generateDataTreeWidget", () => {
type: "array",
disabled: "return !options.entity.multiRowSelection",
},
setPageNumber: {
path: "pageNo",
type: "number",
},
setData: {
path: "tableData",
type: "array",
Expand Down Expand Up @@ -597,6 +601,10 @@ describe("generateDataTreeWidget", () => {
type: "array",
disabled: "return !options.entity.multiRowSelection",
},
setPageNumber: {
path: "Table1.pageNo",
type: "number",
},
setData: {
path: "Table1.tableData",
type: "array",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,26 +217,26 @@ function Actions() {
{totalRecordsCount ? (
<TableHeaderContentWrapper>
Page&nbsp;
<PaginationItemWrapper
<PageNumberInput
accentColor={accentColor}
borderRadius={borderRadius}
className="page-item"
selected
>
{pageNo + 1}
</PaginationItemWrapper>
disabled={pageCount === 1}
pageCount={pageCount}
pageNo={pageNo + 1}
updatePageNo={updatePageNo}
/>
&nbsp;
<span>{`of ${pageCount}`}</span>
</TableHeaderContentWrapper>
) : (
<PaginationItemWrapper
<PageNumberInput
accentColor={accentColor}
borderRadius={borderRadius}
className="page-item"
selected
>
{pageNo + 1}
</PaginationItemWrapper>
disabled={pageCount === 1}
pageCount={pageCount}
pageNo={pageNo + 1}
updatePageNo={updatePageNo}
/>
)}
<PaginationItemWrapper
accentColor={accentColor}
Expand Down
28 changes: 28 additions & 0 deletions app/client/src/widgets/TableWidgetV2/widget/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,10 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
type: "array",
disabled: "return !options.entity.multiRowSelection",
},
setPageNumber: {
path: "pageNo",
type: "number",
},
setData: {
path: "tableData",
type: "array",
Expand Down Expand Up @@ -1063,15 +1067,39 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
pushBatchMetaUpdates("pageNo", 1);
this.updatePaginationDirectionFlags(PaginationDirection.INITIAL);
} else {
let pageNoWasClamped = false;

//check if pageNo does not excede the max Page no, due to change of totalRecordsCount or change of pageSize
if (serverSidePaginationEnabled && totalRecordsCount) {
const maxAllowedPageNumber = Math.ceil(totalRecordsCount / pageSize);

if (pageNo > maxAllowedPageNumber) {
pushBatchMetaUpdates("pageNo", maxAllowedPageNumber);
this.updatePaginationDirectionFlags(PaginationDirection.NEXT_PAGE);
pageNoWasClamped = true;
}
}

// Detect when pageNo changes via setPageNumber (not through user interaction)
// and trigger onPageChange for server-side pagination
// Skip if pageNo was clamped above to avoid double-triggering
if (
!pageNoWasClamped &&
serverSidePaginationEnabled &&
this.props.onPageChange &&
pageNo !== prevProps.pageNo &&
pageNo >= 1 &&
prevProps.pageNo >= 1
) {
// Determine event type based on page direction
const eventType =
pageNo > prevProps.pageNo
? EventType.ON_NEXT_PAGE
: EventType.ON_PREV_PAGE;

// Trigger onPageChange to fetch new page data
this.updatePageNumber(pageNo, eventType);
}
}

// Reset widget state when infinite scroll is initially enabled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,19 @@ export default [
hidden: (props: TableWidgetProps) => !props.serverSidePaginationEnabled,
dependencies: ["serverSidePaginationEnabled"],
},
{
propertyName: "pageNo",
isBindProperty: true,
isTriggerProperty: false,
validation: {
type: ValidationTypes.NUMBER,
params: {
min: 1,
default: 1,
natural: true,
},
},
},
],
expandedByDefault: false,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ export const settersConfig = {
type: "array",
disabled: "return !options.entity.multiRowSelection",
},
setPageNumber: {
path: "pageNo",
type: "number",
},
setData: {
path: "tableData",
type: "array",
Expand Down
6 changes: 6 additions & 0 deletions app/client/src/workers/Evaluation/__tests__/setters.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ describe("Setter class test", () => {
expect(setters.getMap()).toEqual({
Table1: {
setData: true,
setPageNumber: true,
setSelectedRowIndex: true,
setVisibility: true,
},
Expand All @@ -88,11 +89,16 @@ describe("Setter class test", () => {
expect(Object.keys(methodMap)).toEqual([
"setVisibility",
"setSelectedRowIndex",
"setPageNumber",
"setData",
]);

globalContext.Table1.setVisibility(true);

expect(globalContext.Table1.isVisible).toEqual(true);

globalContext.Table1.setPageNumber(2);

expect(globalContext.Table1.pageNo).toEqual(2);
});
});
Loading