diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java index ebe45d879b..8d3c39b1f0 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCE.java @@ -78,4 +78,6 @@ public interface ActionCollectionServiceCE extends CrudService validateAndSaveCollection(ActionCollection actionCollection); Mono generateActionCollectionViewDTO(ActionCollection actionCollection); + + Mono saveLastEditInformationInParent(ActionCollectionDTO actionCollectionDTO); } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java index 52c29faa7f..42ce7e7f3c 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java @@ -408,7 +408,9 @@ public class ActionCollectionServiceCEImpl extends BaseService + saveLastEditInformationInParent(actionCollectionDTO).thenReturn(actionCollectionDTO)); } @Override @@ -789,4 +791,10 @@ public class ActionCollectionServiceCEImpl extends BaseService actionDTO.getDefaultResources().getActionId(), ActionDTO::getId)); collectionDTO.setDefaultToBranchedActionIdsMap(actionIds); } + + @Override + public Mono saveLastEditInformationInParent(ActionCollectionDTO actionCollectionDTO) { + // Do nothing as this is already taken care for JS objects in the context of page + return Mono.empty().then(); + } } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java index 81e2c3d6a1..a6e7d5bc7d 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java @@ -157,4 +157,6 @@ public interface NewActionServiceCE extends CrudService { NewAction generateActionDomain(ActionDTO action); void updateDefaultResourcesInAction(NewAction newAction); + + Mono saveLastEditInformationInParent(ActionDTO actionDTO); } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java index 3ee9207c27..38569ca4f5 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java @@ -1861,4 +1861,10 @@ public class NewActionServiceCEImpl extends BaseService saveLastEditInformationInParent(ActionDTO actionDTO) { + // Do nothing as this is already taken care for actions in the context of page + return Mono.empty().then(); + } } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java index f4a5ac8c3a..1479f504ff 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutActionServiceCEImpl.java @@ -328,7 +328,10 @@ public class LayoutActionServiceCEImpl implements LayoutActionServiceCE { return newActionService .findByBranchNameAndDefaultActionId(branchName, defaultActionId, actionPermission.getDeletePermission()) .flatMap(branchedAction -> deleteUnpublishedAction(branchedAction.getId())) - .map(responseUtils::updateActionDTOWithDefaultResources); + .map(responseUtils::updateActionDTOWithDefaultResources) + .flatMap(actionDTO -> newActionService + .saveLastEditInformationInParent(actionDTO) + .thenReturn(actionDTO)); } @Override diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java index 094549eb46..14250f7965 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/LayoutCollectionServiceCEImpl.java @@ -132,7 +132,10 @@ public class LayoutCollectionServiceCEImpl implements LayoutCollectionServiceCE } return validateAndCreateActionCollectionDomain(collectionDTO, branchName) - .flatMap(actionCollection -> createCollection(actionCollection)) + .flatMap(actionCollection -> createCollection(actionCollection) + .flatMap(actionCollectionDTO -> actionCollectionService + .saveLastEditInformationInParent(actionCollectionDTO) + .thenReturn(actionCollectionDTO))) .map(actionCollectionDTO -> responseUtils.updateCollectionDTOWithDefaultResources(actionCollectionDTO)); } @@ -501,8 +504,11 @@ public class LayoutCollectionServiceCEImpl implements LayoutCollectionServiceCE savedActionCollection, actionCollectionService.getAnalyticsProperties(savedActionCollection))) .flatMap(actionCollection -> actionCollectionService .generateActionCollectionByViewMode(actionCollection, false) - .flatMap(actionCollectionDTO1 -> actionCollectionService.populateActionCollectionByViewMode( - actionCollection.getUnpublishedCollection(), false))) + .flatMap(actionCollectionDTO1 -> actionCollectionService + .populateActionCollectionByViewMode(actionCollection.getUnpublishedCollection(), false) + .flatMap(actionCollectionDTO2 -> actionCollectionService + .saveLastEditInformationInParent(actionCollectionDTO2) + .thenReturn(actionCollectionDTO2)))) .map(responseUtils::updateCollectionDTOWithDefaultResources) .flatMap(branchedActionCollection -> sendErrorReportsFromPageToCollection(branchedActionCollection)); }