refactor: update action collection body handling in API and services

app/client/src/sagas/JSPaneSagas.ts

@@ -670,24 +670,19 @@ function* handleUpdateJSCollectionBody(
     actionPayload.payload.id,
   );
 
-  // @ts-expect-error: Object jsCollection is possibly undefined
-  jsCollection["body"] = actionPayload.payload.body;
   try {
     if (jsCollection) {
-      // TODO: Fix this the next time the file is edited
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const response: ApiResponse<any> =
+      const response: ApiResponse<JSCollection> =
         yield JSActionAPI.updateJSCollectionBody(
           jsCollection.id,
-          jsCollection.body,
+          actionPayload.payload.body,
         );
       const isValidResponse: boolean = yield validateResponse(response);
 
       if (isValidResponse) {
-        // since server is not sending the info about whether the js collection is main or not
-        // we are retaining it manually
+        const serverData = response.data;
         const updatedJSCollection: JSCollection = {
-          ...jsCollection,
+          ...serverData,
           isMainJSCollection: !!jsCollection.isMainJSCollection,
         };
 

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ActionCollectionControllerCE.java

@@ -117,7 +117,7 @@ public Mono<ResponseDTO<ActionCollectionDTO>> updateActionCollection(
 
     @JsonView(Views.Public.class)
     @PutMapping("/{id}/body")
-    public Mono<ResponseDTO<Integer>> updateActionCollectionBody(
+    public Mono<ResponseDTO<ActionCollectionDTO>> updateActionCollectionBody(
             @PathVariable String id, @Valid @RequestBody ActionCollectionDTO resource) {
         log.debug("Going to update action collection body with id: {}", id);
         return layoutCollectionService

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCE.java

@@ -14,7 +14,7 @@ public interface LayoutCollectionServiceCE {
 
     Mono<ActionCollectionDTO> moveCollection(ActionCollectionMoveDTO actionCollectionMoveDTO);
 
-    Mono<Integer> updateUnpublishedActionCollectionBody(String id, ActionCollectionDTO actionCollectionDTO);
+    Mono<ActionCollectionDTO> updateUnpublishedActionCollectionBody(String id, ActionCollectionDTO actionCollectionDTO);
 
     Mono<ActionCollectionDTO> updateUnpublishedActionCollection(String id, ActionCollectionDTO actionCollectionDTO);
 

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

@@ -273,7 +273,8 @@ public Mono<ActionCollectionDTO> moveCollection(ActionCollectionMoveDTO actionCo
     }
 
     @Override
-    public Mono<Integer> updateUnpublishedActionCollectionBody(String id, ActionCollectionDTO actionCollectionDTO) {
+    public Mono<ActionCollectionDTO> updateUnpublishedActionCollectionBody(
+            String id, ActionCollectionDTO actionCollectionDTO) {
 
         if (id == null) {
             return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ID));
@@ -299,7 +300,13 @@ public Mono<Integer> updateUnpublishedActionCollectionBody(String id, ActionColl
             updateObj.set(path, actionCollectionDTO.getBody());
             updateObj.set(updatedAtPath, Instant.now());
 
-            return actionCollectionRepository.updateByIdWithoutPermissionCheck(dbActionCollection.getId(), updateObj);
+            return actionCollectionRepository
+                    .updateByIdWithoutPermissionCheck(dbActionCollection.getId(), updateObj)
+                    .then(actionCollectionService.findById(id, actionPermission.getEditPermission()))
+                    .flatMap(actionCollectionRepository::setUserPermissionsInObject)
+                    .flatMap(actionCollection ->
+                            actionCollectionService.generateActionCollectionByViewMode(actionCollection, false))
+                    .flatMap(dto -> actionCollectionService.populateActionCollectionByViewMode(dto, false));
         });
     }