fix: Fixes CREATE_JS_ACTION_ERROR error that disallows creating js objects or updating actions on certain git connected apps

[nidhi-nair]

Description

When a user develops on a feature branch, merges to master, and then deletes the original branch, the "default entity" associated to all the entities created in the feature branch would now be pointing to a resource that has been deleted on the database. These entities could be NewPage, NewAction, ActionCollection, or ModuleInstances.

The issue that this PR fixes had to do with the fact that any create or update operation on collections and actions respectively would attempt to first retrieve one such deleted resource that was the default entity wrt the current branch and failures in this operation would not even cause exceptions in the flow but simply return to the client side with 2xx responses.

It is possible that other operations of this nature might exist through the code base, but we'll pick them up on an as needed basis since we're hoping to remove all need for such manipulation with the default resources tech debt resolution.

Fixes #30868

Automation

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

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/9007055258
Commit: 57b3311
Cypress dashboard url: Click here!

Communication

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

• Yes
• No

[coderabbitai]

Walkthrough

Walkthrough

The recent updates focus on enhancing the management of actions and layouts within branched environments. Key changes include the introduction of generic type declarations, improved retrieval and handling of branch-specific details in actions, and refined methods for updating action collections based on branch contexts. These modifications aim to streamline operations and ensure consistency across different versions and branches of projects.

Changes

File Path	Change Summary
.../actioncollections/base/ActionCollectionServiceCEImpl.java	Updated generic type declaration for HashSet.
.../services/ce/LayoutActionServiceCEImpl.java	Enhanced updateActionBasedOnContextType to handle branch-specific details and page layouts.
.../services/ce/LayoutCollectionServiceCEImpl.java	Optimized action collection updates and method calls for branch-specific contexts, and removed unnecessary imports.

---

Recent Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 0a58544 and 57b3311.

Files selected for processing (3)

• app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java (1 hunks)
• app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java (2 hunks)
• app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java (4 hunks)

Additional comments not posted (3)

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java (1)

Line range hint 267-291: Ensure correct handling of branchName and defaultPageId in updateActionBasedOnContextType.

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java (1)

153-171: Ensure correct handling of branchName and defaultPageId in validateAndCreateActionCollectionDomain.

app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java (1)

638-638: Ensure type safety with generics in Set instantiation.

The change from Set<Policy> actionCollectionPolicies = new HashSet; to Set<Policy> actionCollectionPolicies = new HashSet<>(); ensures type safety and clarity in policy management. This is a good practice in Java to avoid raw type usage which can lead to ClassCastException at runtime if used incorrectly.

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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>.
  • 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 generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @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.

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 as PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

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