chore: external merge request from Contributor by rahulbarwal · Pull Request #36878 · appsmithorg/appsmith

rahulbarwal · 2024-10-15T08:13:29Z

Description

Issue: #16584

Original PR: #36849
EE PR: https://github.com/appsmithorg/appsmith-ee/pull/5358

Warning

If no issue exists, please create an issue first, and check with the maintainers if the issue is valid.

Automation

/ok-to-test tags="@tag.All"

🔍 Cypress test results

Caution

If you modify the content in this section, you are likely to disrupt the CI result for your PR.

Communication

Should the DevRel and Marketing teams inform users about this change?

Yes
No

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/11588111041
Commit: f40199d
Cypress dashboard.
Tags: @tag.All
Spec:

Wed, 30 Oct 2024 09:05:46 UTC

…ith-filter' into external-contri/fix/16584-table-edit-with-filter

coderabbitai · 2024-10-15T08:13:37Z

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Walkthrough

The pull request introduces significant enhancements to the derived.js file in the TableWidgetV2 component. Key modifications include improved logic for row selection and filtering, validation of editable cells, and the proper handling of indices. The test suite for these functionalities has also been expanded to cover new scenarios and edge cases, ensuring robust validation of the table's behavior under various conditions.

Changes

File	Change Summary
`app/client/src/widgets/TableWidgetV2/widget/derived.js`	Enhanced methods for row selection, filtering, validation, and header sorting. Updated method signatures.
`app/client/src/widgets/TableWidgetV2/widget/derived.test.js`	Added new test cases for filtering and editing functionality; enhanced existing tests for edge cases.

Assessment against linked issues

Objective	Addressed	Explanation
Improve filtering accuracy when editing rows with active filters (36849)	✅
Ensure that original row data is used for filtering evaluations (36849)	✅
Validate the functionality of new filtering logic in tests (36849)	✅

Possibly related PRs

feat: Allow filtering of table select column label #36755: Enhances filtering for select column labels, related to the getFilteredTableData function.
feat: Allow table search to include label and value for tables with select column type #36061: Improves search functionality for select columns, aligning with updates to row selection and filtering methods.
fix: Incorrect updation of selctedRowIndex when primary column is set. #36393: Addresses handling of selected row indices, relevant to updates on row selection and updates.
test: Update Inline_editing_3_spec.js to include expected JSON parsing #36721: Focuses on inline editing tests, indirectly relating to the overall functionality of the table widget.

Suggested labels

Task, Bug, Enhancement, Widgets Product, Production, Needs Triaging, Medium, Table Widget V2, ok-to-test, Widgets & Accelerators Pod

Suggested reviewers

ApekshaBhosale
sagar-qa007

In the realm of tables, where data does dwell,
Filters and rows weave a magical spell.
With edits and checks, the logic refined,
Ensuring each cell is perfectly aligned.
So raise up your glasses, let’s cheer with delight,
For the TableWidgetV2, it’s shining so bright! ✨

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

coderabbitai

Actionable comments posted: 2

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 3032adc and be21c62.

📒 Files selected for processing (2)

app/client/src/widgets/TableWidgetV2/widget/derived.js (1 hunks)
app/client/src/widgets/TableWidgetV2/widget/derived.test.js (2 hunks)

🧰 Additional context used

🔇 Additional comments (2)

app/client/src/widgets/TableWidgetV2/widget/derived.js (1)

814-818: Great job incorporating originalRow into filter conditions

By evaluating the filter conditions against both originalRow and displayedRow, you ensure that filtering remains accurate even when rows have been edited. This approach effectively handles scenarios where the displayed data may differ from the original data, enhancing the functionality of the table when editing while filters are applied.

app/client/src/widgets/TableWidgetV2/widget/derived.test.js (1)

199-204: Well done initializing the 'tableData' in inputWithDisplayText

You have correctly structured the tableData, which will be beneficial for your tests involving display text.

coderabbitai · 2024-10-15T08:21:49Z

app/client/src/widgets/TableWidgetV2/widget/derived.js

            ConditionFunctions[props.filters[i].condition];

          if (conditionFunction) {
+            const originalRow = props.tableData[row.__originalIndex__];


⚠️ Potential issue

Ensure originalRow is defined to prevent potential errors

It's important to verify that originalRow is valid before using it in the condition function. If row.__originalIndex__ does not correspond to a valid index in props.tableData, originalRow could be undefined, leading to runtime errors. Consider adding a check to ensure that originalRow is defined.

coderabbitai · 2024-10-15T08:21:50Z

app/client/src/widgets/TableWidgetV2/widget/derived.test.js

+    const expected = [
+      { id: 234, name: "Khadija Khafaga", __originalIndex__: 2 },
+      { id: 123, name: "Hamza Anas", __originalIndex__: 1 },
+    ];
+
+    let result = getFilteredTableData(input, moment, _);
+
+    expect(result).toStrictEqual(expected);


⚠️ Potential issue

Please revisit the expected results in your test case

After changing the name from "Hamza Khafaga" to "Hamza Anas", the row no longer meets the filter condition contains "Khafaga". Therefore, it should not appear in the filtered results. Let's update the expected results to reflect this change.

Apply this diff to correct the expected results:

const expected = [ { id: 234, name: "Khadija Khafaga", __originalIndex__: 2 }, - { id: 123, name: "Hamza Anas", __originalIndex__: 1 }, ];

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

const expected = [

{ id: 234, name: "Khadija Khafaga", __originalIndex__: 2 },

{ id: 123, name: "Hamza Anas", __originalIndex__: 1 },

];

let result = getFilteredTableData(input, moment, _);

expect(result).toStrictEqual(expected);

const expected = [

{ id: 234, name: "Khadija Khafaga", __originalIndex__: 2 },

];

let result = getFilteredTableData(input, moment, _);

expect(result).toStrictEqual(expected);

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

…o external-contri/fix/16584-table-edit-with-filter

rahulbarwal · 2024-10-16T05:26:42Z

/build-deploy-preview skip-tests=true

github-actions · 2024-10-16T05:27:05Z

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/11359473512.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 36878.
recreate: .

github-actions · 2024-10-16T05:39:37Z

Deploy-Preview-URL: https://ce-36878.dp.appsmith.com

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

…o external-contri/fix/16584-table-edit-with-filter

rahulbarwal · 2024-10-21T06:55:52Z

/build-deploy-preview skip-tests=true

github-actions · 2024-10-21T06:56:15Z

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/11434813360.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 36878.
recreate: .

github-actions · 2024-10-21T07:09:14Z

Deploy-Preview-URL: https://ce-36878.dp.appsmith.com

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

…o external-contri/fix/16584-table-edit-with-filter

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

…o external-contri/fix/16584-table-edit-with-filter

rahulbarwal · 2024-10-24T09:48:41Z

/build-deploy-preview skip-tests=true

github-actions · 2024-10-24T09:49:03Z

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/11496843091.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 36878.
recreate: .

github-actions · 2024-10-24T10:02:41Z

Deploy-Preview-URL: https://ce-36878.dp.appsmith.com

…o external-contri/fix/16584-table-edit-with-filter

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

…o external-contri/fix/16584-table-edit-with-filter

rahulbarwal · 2024-10-30T12:07:53Z

Closing as original PR is merged.

anasKhafaga and others added 5 commits October 14, 2024 15:23

fix(#16584): filterTableData source of truth

72f3828

test: add unit test for editing a record in filter state

4d5c7e8

fix: enhance unit test case

fbcd17f

fix(test): compatibility with filtering via displyed text

b08abe7

Merge remote-tracking branch 'contributor-fork/fix/16584-table-edit-w…

be21c62

…ith-filter' into external-contri/fix/16584-table-edit-with-filter

rahulbarwal self-assigned this Oct 15, 2024

github-actions bot added the skip-changelog Adding this label to a PR prevents it from being listed in the changelog label Oct 15, 2024

rahulbarwal marked this pull request as draft October 15, 2024 08:14

coderabbitai bot reviewed Oct 15, 2024

View reviewed changes

anasKhafaga and others added 3 commits October 15, 2024 13:57

fix(linting): CI lint and prettier tasks

39d4e5e

Merge branch 'fix/16584-table-edit-with-filter' of https://github.com…

946bf9c

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

3a7a853

…o external-contri/fix/16584-table-edit-with-filter

rahulbarwal added the ok-to-test Required label for CI label Oct 16, 2024

anasKhafaga and others added 5 commits October 16, 2024 11:19

fix(search): disappearing record with searchKey applied

6869df8

Merge branch 'fix/16584-table-edit-with-filter' of https://github.com…

6e21427

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

fix(e2e): update failing e2e test cases to expect the correct behavior

6632e4a

Merge branch 'fix/16584-table-edit-with-filter' of https://github.com…

315f8db

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

483a5cb

…o external-contri/fix/16584-table-edit-with-filter

anasKhafaga and others added 5 commits October 22, 2024 13:55

chore(e2e): use the suitable apis to dispatch actions and run assertions

01e008f

Merge branch 'fix/16584-table-edit-with-filter' of https://github.com…

12c9ff5

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

524b4af

…o external-contri/fix/16584-table-edit-with-filter

fix(sorting): case of editing while sorting is applied

d89cb67

test(sorting): add unit test for editing when sorting is applied

163e7b6

rahulbarwal added 2 commits October 24, 2024 15:17

Merge branch 'fix/16584-table-edit-with-filter' of https://github.com…

ce56829

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

8c3eee8

…o external-contri/fix/16584-table-edit-with-filter

rahulbarwal and others added 6 commits October 25, 2024 10:18

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

b9377d9

…o external-contri/fix/16584-table-edit-with-filter

fix(sorting): handle sorting by label

c10dd6a

Merge branch 'fix/16584-table-edit-with-filter' of https://github.com…

5a9f249

…/anasKhafaga/appsmith into external-contri/fix/16584-table-edit-with-filter

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

03ad4e0

…o external-contri/fix/16584-table-edit-with-filter

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

7591aea

…o external-contri/fix/16584-table-edit-with-filter

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

f40199d

…o external-contri/fix/16584-table-edit-with-filter

rahulbarwal added ok-to-test Required label for CI and removed ok-to-test Required label for CI labels Oct 30, 2024

rahulbarwal mentioned this pull request Oct 30, 2024

fix(#16584): filterTableData source of truth #36849

Merged

2 tasks

rahulbarwal closed this Oct 30, 2024

Conversation

rahulbarwal commented Oct 15, 2024 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Automation

🔍 Cypress test results

Communication

Uh oh!

coderabbitai bot commented Oct 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Walkthrough

Changes

Assessment against linked issues

Possibly related PRs

Suggested labels

Suggested reviewers

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

Documentation and Community

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Oct 15, 2024

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot Oct 15, 2024

Choose a reason for hiding this comment

Uh oh!

rahulbarwal commented Oct 16, 2024

Uh oh!

github-actions bot commented Oct 16, 2024

Uh oh!

github-actions bot commented Oct 16, 2024

Uh oh!

rahulbarwal commented Oct 21, 2024

Uh oh!

github-actions bot commented Oct 21, 2024

Uh oh!

github-actions bot commented Oct 21, 2024

Uh oh!

rahulbarwal commented Oct 24, 2024

Uh oh!

github-actions bot commented Oct 24, 2024

Uh oh!

github-actions bot commented Oct 24, 2024

Uh oh!

rahulbarwal commented Oct 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

rahulbarwal commented Oct 15, 2024 •

edited by github-actions bot

Loading

coderabbitai bot commented Oct 15, 2024 •

edited

Loading