Skip to content

[CLEAN] Synthetic Benchmark PR #41217 - fix: updates the logic to not interfere with DSL when infinitescroll is enabled #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomerqodo wants to merge 1 commit into
base: base_pr_41217_20251204_8703
Choose a base branch
from
Open

[CLEAN] Synthetic Benchmark PR #41217 - fix: updates the logic to not interfere with DSL when infinitescroll is enabled #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion app/client/src/widgets/TableWidgetV2/component/cellComponents/HeaderCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,10 @@ const HeaderCellComponent = (props: HeaderProps) => {
const isColumnEditable =
props.column.columnProperties.isCellEditable &&
props.column.columnProperties.isEditable &&
isColumnTypeEditable(props.column.columnProperties.columnType);
isColumnTypeEditable(
props.column.columnProperties.columnType,
isInfiniteScrollEnabled,
);

const toggleColumnFreeze = (value: StickyType) => {
handleColumnFreeze &&
Expand Down
93 changes: 0 additions & 93 deletions app/client/src/widgets/TableWidgetV2/widget/__tests__/propertyUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
updateCustomColumnAliasOnLabelChange,
selectColumnOptionsValidation,
allowedFirstDayOfWeekRange,
updateCellEditabilityOnInfiniteScrollChange,
updateSearchSortFilterOnInfiniteScrollChange,
} from "../propertyUtils";
import _ from "lodash";
Expand Down Expand Up @@ -1151,96 +1150,4 @@ describe("Infinite Scroll Update Hooks - ", () => {
),
).toBeUndefined();
});

it("updateCellEditabilityOnInfiniteScrollChange - should disable cell editability when infinite scroll is enabled", () => {
// Setup mock primary columns
const props = {
primaryColumns: {
column1: {
id: "column1",
alias: "column1",
isEditable: true,
isCellEditable: true,
},
column2: {
id: "column2",
alias: "column2",
isEditable: true,
isCellEditable: true,
},
},
} as unknown as TableWidgetProps;

// When infinite scroll is enabled
expect(
updateCellEditabilityOnInfiniteScrollChange(
props,
"infiniteScrollEnabled",
true,
),
).toEqual([
{
propertyPath: "primaryColumns.column1.isCellEditable",
propertyValue: false,
},
{
propertyPath: "primaryColumns.column1.isEditable",
propertyValue: false,
},
{
propertyPath: "primaryColumns.column2.isCellEditable",
propertyValue: false,
},
{
propertyPath: "primaryColumns.column2.isEditable",
propertyValue: false,
},
]);

// When infinite scroll is disabled
expect(
updateCellEditabilityOnInfiniteScrollChange(
props,
"infiniteScrollEnabled",
false,
),
).toEqual([
{
propertyPath: "primaryColumns.column1.isCellEditable",
propertyValue: true,
},
{
propertyPath: "primaryColumns.column1.isEditable",
propertyValue: true,
},
{
propertyPath: "primaryColumns.column2.isCellEditable",
propertyValue: true,
},
{
propertyPath: "primaryColumns.column2.isEditable",
propertyValue: true,
},
]);

// Test with no primary columns
const propsWithoutColumns = {} as TableWidgetProps;

expect(
updateCellEditabilityOnInfiniteScrollChange(
propsWithoutColumns,
"infiniteScrollEnabled",
true,
),
).toBeUndefined();

// When some other value is passed
expect(
updateCellEditabilityOnInfiniteScrollChange(
props,
"infiniteScrollEnabled",
"some-other-value",
),
).toBeUndefined();
});
});
5 changes: 4 additions & 1 deletion app/client/src/widgets/TableWidgetV2/widget/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,7 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
getTableColumns = () => {
const {
columnWidthMap,
infiniteScrollEnabled,
isPreviewMode,
orderedTableColumns,
renderMode,
Expand All @@ -597,6 +598,7 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
componentWidth,
renderMode,
isPreviewMode,
infiniteScrollEnabled,
);
};

Expand Down Expand Up @@ -2067,7 +2069,8 @@ class TableWidgetV2 extends BaseWidget<TableWidgetProps, WidgetState> {
}

const isColumnEditable =
column.isEditable && isColumnTypeEditable(column.columnType);
column.isEditable &&
isColumnTypeEditable(column.columnType, this.props.infiniteScrollEnabled);
const alias = props.cell.column.columnProperties.alias;

const isCellEditable = isColumnEditable && cellProperties.isCellEditable;
Expand Down
5 changes: 4 additions & 1 deletion app/client/src/widgets/TableWidgetV2/widget/propertyConfig/PanelConfig/General.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,10 @@ export default {
const columnType = get(props, `${baseProperty}.columnType`, "");
const isDerived = get(props, `${baseProperty}.isDerived`, false);

return !isColumnTypeEditable(columnType) || isDerived;
return (
!isColumnTypeEditable(columnType, props.infiniteScrollEnabled) ||
isDerived
);
},
},
{
Expand Down
2 changes: 0 additions & 2 deletions app/client/src/widgets/TableWidgetV2/widget/propertyConfig/contentConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
totalRecordsCountValidation,
uniqueColumnNameValidation,
updateAllowAddNewRowOnInfiniteScrollChange,
updateCellEditabilityOnInfiniteScrollChange,
updateColumnOrderHook,
updateCustomColumnAliasOnLabelChange,
updateInlineEditingOptionDropdownVisibilityHook,
Expand Down Expand Up @@ -197,7 +196,6 @@ export default [
isTriggerProperty: false,
updateHook: composePropertyUpdateHook([
updateAllowAddNewRowOnInfiniteScrollChange,
updateCellEditabilityOnInfiniteScrollChange,
updateSearchSortFilterOnInfiniteScrollChange,
]),
dependencies: ["primaryColumns", "serverSidePaginationEnabled"],
Expand Down
43 changes: 0 additions & 43 deletions app/client/src/widgets/TableWidgetV2/widget/propertyUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,46 +1513,3 @@ export const updateSearchSortFilterOnInfiniteScrollChange = (

return;
};

// Disable cell editability when infinite scroll is enabled
export const updateCellEditabilityOnInfiniteScrollChange = (
props: TableWidgetProps,
propertyPath: string,
propertyValue: unknown,
): Array<{ propertyPath: string; propertyValue: unknown }> | undefined => {
if (!props.primaryColumns) return;

const updates: Array<{ propertyPath: string; propertyValue: unknown }> = [];

if (propertyValue === true) {
Object.entries(props.primaryColumns).forEach(([, column]) => {
const columnName = column.alias;

updates.push({
propertyPath: `primaryColumns.${columnName}.isCellEditable`,
propertyValue: false,
});

updates.push({
propertyPath: `primaryColumns.${columnName}.isEditable`,
propertyValue: false,
});
});
} else if (propertyValue === false) {
Object.entries(props.primaryColumns).forEach(([, column]) => {
const columnName = column.alias;

updates.push({
propertyPath: `primaryColumns.${columnName}.isCellEditable`,
propertyValue: true,
});

updates.push({
propertyPath: `primaryColumns.${columnName}.isEditable`,
propertyValue: true,
});
});
}

return updates.length > 0 ? updates : undefined;
};
11 changes: 11 additions & 0 deletions app/client/src/widgets/TableWidgetV2/widget/reactTableUtils/getColumnsPureFn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { RenderModes } from "constants/WidgetConstants";
import { StickyType } from "../../component/Constants";
import {
COLUMN_MIN_WIDTH,
ColumnTypes,
DEFAULT_COLUMN_WIDTH,
DEFAULT_COLUMN_NAME,
} from "../../constants";
Expand All @@ -21,6 +22,7 @@ export type getColumns = (
componentWidth: number,
renderMode: RenderMode,
isPreviewMode: boolean,
infiniteScrollEnabled?: boolean,
) => ReactTableColumnProps[];

//TODO: (Vamsi) need to unit test this function
Expand All @@ -32,6 +34,7 @@ export const getColumnsPureFn: getColumns = (
componentWidth,
renderMode,
isPreviewMode,
infiniteScrollEnabled = false,
) => {
let columns: ReactTableColumnProps[] = [];
const hiddenColumns: ReactTableColumnProps[] = [];
Expand All @@ -42,6 +45,14 @@ export const getColumnsPureFn: getColumns = (
// TODO: Fix this the next time the file is edited
// eslint-disable-next-line @typescript-eslint/no-explicit-any
orderedTableColumns.forEach((column: any) => {
// Skip EDIT_ACTIONS columns when infinite scroll is enabled
if (
infiniteScrollEnabled &&
column.columnType === ColumnTypes.EDIT_ACTIONS
) {
return;
}

const isHidden = !column.isVisible;

const columnData = {
Expand Down
7 changes: 5 additions & 2 deletions app/client/src/widgets/TableWidgetV2/widget/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,11 @@ const EdtiableColumnTypes: string[] = [
ColumnTypes.CURRENCY,
];

export function isColumnTypeEditable(columnType: string) {
return EdtiableColumnTypes.includes(columnType);
export function isColumnTypeEditable(
columnType: string,
isInfiniteScrollEnabled = false,
) {
return EdtiableColumnTypes.includes(columnType) && !isInfiniteScrollEnabled;
}

/*
Expand Down