refactor: update action collection body handling in API and services by sebastianiv21 · Pull Request #41573 · appsmithorg/appsmith

sebastianiv21 · 2026-02-23T19:44:45Z

Description

Tip

Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team).

Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR.

Changed the return type of updateActionCollectionBody in ActionCollectionControllerCE to return Mono<ResponseDTO<ActionCollectionDTO>> instead of Mono<ResponseDTO<Integer>>.
Updated updateUnpublishedActionCollectionBody method signature in LayoutCollectionServiceCE and its implementation to return Mono<ActionCollectionDTO>.
Refactored the handling of the action collection body update to ensure the correct data is returned and processed.

This refactor improves type safety and ensures that the updated action collection data is correctly handled across the application.

Fixes #Issue Number
or
Fixes Issue URL

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

Tip

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

Mon, 23 Feb 2026 21:32:46 UTC

Communication

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

Yes
No

Summary by CodeRabbit

Bug Fixes
- More reliable action collection body updates with consistent merging of server responses and preserved local flags.
- Fixed state handling to avoid unintended local mutations during save.
Improvements
- API now returns full action collection details after updates, improving data accuracy and visibility.
- Update flow now returns the populated, permission-aware collection so the client receives the updated view.

- Changed the return type of `updateActionCollectionBody` in `ActionCollectionControllerCE` to return `Mono<ResponseDTO<ActionCollectionDTO>>` instead of `Mono<ResponseDTO<Integer>>`. - Updated `updateUnpublishedActionCollectionBody` method signature in `LayoutCollectionServiceCE` and its implementation to return `Mono<ActionCollectionDTO>`. - Refactored the handling of the action collection body update to ensure the correct data is returned and processed. This refactor improves type safety and ensures that the updated action collection data is correctly handled across the application.

coderabbitai · 2026-02-23T19:45:25Z

Walkthrough

The API endpoint for updating action collection bodies now returns the full updated ActionCollectionDTO instead of an Integer; backend service flow fetches and converts the updated collection before returning. Frontend saga stops mutating local collection, sends the new body in the request, and merges the server DTO with local flags on success.

Changes

Cohort / File(s)	Summary
Frontend saga `app/client/src/sagas/JSPaneSagas.ts`	Removed direct mutation of `jsCollection.body`; send updated body via action payload; on success merge server `ActionCollectionDTO` with local `isMainJSCollection` and dispatch `updateJSCollectionBodySuccess`.
Controller `app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionCollectionControllerCE.java`	Changed `updateActionCollectionBody` return type from `Mono<ResponseDTO<Integer>>` to `Mono<ResponseDTO<ActionCollectionDTO>>`.
Service API (interface) `app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCE.java`	Changed `updateUnpublishedActionCollectionBody` return type from `Mono<Integer>` to `Mono<ActionCollectionDTO>`.
Service implementation `app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java`	Updated implementation to return the updated `ActionCollectionDTO`: after update by ID, fetch the updated collection, resolve permissions, generate and populate view-model (`generateActionCollectionByViewMode` / `populateActionCollectionByViewMode`) before returning.

Sequence Diagram

sequenceDiagram
    participant Client as Frontend Saga
    participant API as Server Controller
    participant Service as Service Layer
    participant DB as Database

    Client->>API: PATCH /action-collection/{id} (body in payload)
    API->>Service: updateUnpublishedActionCollectionBody(id, dto)
    Service->>DB: Update collection body
    Service->>DB: Fetch updated collection by ID
    Service->>Service: resolve permissions / generate & populate view-model
    Service-->>API: Return ActionCollectionDTO
    API-->>Client: ResponseDTO<ActionCollectionDTO>
    Client->>Client: Merge server DTO with local isMainJSCollection
    Client->>Client: Dispatch updateJSCollectionBodySuccess

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Poem

✨ The payload flies to server-side,
A fuller DTO now rides the tide,
Frontend keeps its local flag,
Merges data—no more ragged patch,
Harmony restored, both ends allied.

🚥 Pre-merge checks | ✅ 1 | ❌ 2

❌ Failed checks (1 warning, 1 inconclusive)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.
Description check	❓ Inconclusive	The PR description lacks critical information required by the template, including a specific issue reference and motivation context.	Replace placeholder 'Fixes #`Issue Number`' with an actual issue link, add motivation/context for the type safety changes, and clarify dependencies if any exist.

✅ Passed checks (1 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title accurately describes the main refactoring change: updating the return types and handling of action collection body updates across the API controller and service layers.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

📝 Generate docstrings (stacked PR)
📝 Generate docstrings (commit on current branch)

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch fix/jsobject-config-execution

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

coderabbitai

Actionable comments posted: 1

🧹 Nitpick comments (1)

app/client/src/sagas/JSPaneSagas.ts (1)

675-687: Guard against missing response.data before object spread.

If response.data is null/undefined, {...serverData} throws and the saga fails despite a “successful” response. Add a fallback to the existing jsCollection.

Proposed fix

-      const serverData = response.data;
-      const updatedJSCollection: JSCollection = {
-        ...serverData,
+      const serverData = response.data ?? jsCollection;
+      const updatedJSCollection: JSCollection = {
+        ...serverData,
         isMainJSCollection: !!jsCollection.isMainJSCollection,
       };

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@app/client/src/sagas/JSPaneSagas.ts` around lines 675 - 687, The saga assumes
response.data exists and spreads it into updatedJSCollection, which will throw
if response.data is null/undefined; update the success branch in the generator
(the code around JSActionAPI.updateJSCollectionBody / validateResponse) to use a
safe fallback (e.g., const serverData = response.data || jsCollection) before
creating updatedJSCollection so you spread a defined object and retain existing
jsCollection fields when the server returns no data.

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Inline comments:
In
`@app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java`:
- Around line 303-308: The returned ActionCollectionDTO from
LayoutCollectionServiceCEImpl's update flow currently loses userPermissions;
after updateByIdWithoutPermissionCheck and after you generate/populate the DTO
via actionCollectionService.findById -> generateActionCollectionByViewMode ->
populateActionCollectionByViewMode, call
actionCollectionRepository.setUserPermissionsInObject(dbActionCollection.getId(),
dto) (or the repository method that enriches the DTO with userPermissions) to
set userPermissions into the ActionCollectionDTO before returning it so the
client retains permission info.

---

Nitpick comments:
In `@app/client/src/sagas/JSPaneSagas.ts`:
- Around line 675-687: The saga assumes response.data exists and spreads it into
updatedJSCollection, which will throw if response.data is null/undefined; update
the success branch in the generator (the code around
JSActionAPI.updateJSCollectionBody / validateResponse) to use a safe fallback
(e.g., const serverData = response.data || jsCollection) before creating
updatedJSCollection so you spread a defined object and retain existing
jsCollection fields when the server returns no data.

ℹ️ Review info

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 55ac824 and c14f7a3.

📒 Files selected for processing (4)

app/client/src/sagas/JSPaneSagas.ts
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionCollectionControllerCE.java
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCE.java
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java

...mith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java

- Added a new step in the action collection update process to set user permissions in the updated object. - This change ensures that user permissions are correctly applied after an action collection is updated, improving the overall integrity of permission management. This enhancement contributes to a more robust and secure handling of user permissions within the application.

sebastianiv21 · 2026-02-23T20:20:18Z

/build-deploy-preview skip-tests=true

github-actions · 2026-02-23T20:21:17Z

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

github-actions · 2026-02-23T20:33:06Z

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

sebastianiv21 added the ok-to-test Required label for CI label Feb 23, 2026

coderabbitai bot reviewed Feb 23, 2026

View reviewed changes

...mith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java Show resolved Hide resolved

sebastianiv21 requested review from sondermanish and subrata71 February 23, 2026 22:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

refactor: update action collection body handling in API and services#41573

refactor: update action collection body handling in API and services#41573
sebastianiv21 wants to merge 2 commits intoreleasefrom
fix/jsobject-config-execution

sebastianiv21 commented Feb 23, 2026 •

edited by github-actions bot

Loading

Uh oh!

coderabbitai bot commented Feb 23, 2026 •

edited

Loading

❌ Failed checks (1 warning, 1 inconclusive)

Uh oh!

coderabbitai bot left a comment

Uh oh!

Uh oh!

sebastianiv21 commented Feb 23, 2026

Uh oh!

github-actions bot commented Feb 23, 2026

Uh oh!

github-actions bot commented Feb 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Comments

Conversation

sebastianiv21 commented Feb 23, 2026 • 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

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Sequence Diagram

Estimated code review effort

Poem

❌ Failed checks (1 warning, 1 inconclusive)

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sebastianiv21 commented Feb 23, 2026

Uh oh!

github-actions bot commented Feb 23, 2026

Uh oh!

github-actions bot commented Feb 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

sebastianiv21 commented Feb 23, 2026 •

edited by github-actions bot

Loading

coderabbitai bot commented Feb 23, 2026 •

edited

Loading