From b0ec46ece5fa797397a25d87922a5f4e73bd97ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Csneha122=E2=80=9D?= <“sneha@appsmith.com”> Date: Tue, 27 May 2025 18:24:35 +0530 Subject: [PATCH 1/4] fix: explicit automatic actions should be included in layout on load actions --- .../repositories/ce/CustomNewActionRepositoryCEImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java index 124767a75871..8f169f872bd5 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java @@ -182,9 +182,10 @@ public Flux findUnpublishedActionsByNameInAndPageId( public Flux findUnpublishedActionsByPageIdAndRunbehaviourSetByUserOnPageLoad( String pageId, AclPermission permission) { BridgeQuery q = Bridge.or( - // First condition: new runBehaviour = ON_PAGE_LOAD - Bridge.equal( - NewAction.Fields.unpublishedAction_runBehaviour, RunBehaviourEnum.ON_PAGE_LOAD), + // First condition: new runBehaviour = ON_PAGE_LOAD or AUTOMATIC + Bridge.in( + NewAction.Fields.unpublishedAction_runBehaviour, + List.of(RunBehaviourEnum.ON_PAGE_LOAD, RunBehaviourEnum.AUTOMATIC)), // Second condition: legacy executeOnLoad = true Bridge.isTrue(NewAction.Fields.unpublishedAction_executeOnLoad)) .isTrue(NewAction.Fields.unpublishedAction_userSetOnLoad) From 6665e015686259a7fe4b19d22e5871c38451d97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Csneha122=E2=80=9D?= <“sneha@appsmith.com”> Date: Tue, 27 May 2025 18:51:16 +0530 Subject: [PATCH 2/4] server build issue fixed --- .../server/repositories/ce/CustomNewActionRepositoryCEImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java index 8f169f872bd5..7af73cc39880 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java @@ -185,7 +185,7 @@ public Flux findUnpublishedActionsByPageIdAndRunbehaviourSetByUserOnP // First condition: new runBehaviour = ON_PAGE_LOAD or AUTOMATIC Bridge.in( NewAction.Fields.unpublishedAction_runBehaviour, - List.of(RunBehaviourEnum.ON_PAGE_LOAD, RunBehaviourEnum.AUTOMATIC)), + List.of(RunBehaviourEnum.ON_PAGE_LOAD.name(), RunBehaviourEnum.AUTOMATIC.name())), // Second condition: legacy executeOnLoad = true Bridge.isTrue(NewAction.Fields.unpublishedAction_executeOnLoad)) .isTrue(NewAction.Fields.unpublishedAction_userSetOnLoad) From 0193f3f9c4ffffa6bb1eb095aa82c5d2181d2a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Csneha122=E2=80=9D?= <“sneha@appsmith.com”> Date: Wed, 28 May 2025 16:03:52 +0530 Subject: [PATCH 3/4] issue fixed --- .../server/onload/internal/OnLoadExecutablesUtilCEImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java index ea6da0f5fc4e..dcd051781858 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java @@ -1308,8 +1308,7 @@ private Mono> addWidgetRelationshipToGraph( } private boolean hasUserSetExecutableToNotRunOnPageLoad(Executable executable) { - if (TRUE.equals(executable.getUserSetOnLoad()) - && executable.getRunBehaviour() != RunBehaviourEnum.ON_PAGE_LOAD) { + if (TRUE.equals(executable.getUserSetOnLoad()) && executable.getRunBehaviour() == RunBehaviourEnum.MANUAL) { return true; } From 0eca6f90a21ab10faaf7794a98567ccce4bef541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Csneha122=E2=80=9D?= <“sneha@appsmith.com”> Date: Thu, 29 May 2025 13:13:56 +0530 Subject: [PATCH 4/4] handled for null case as well --- .../server/onload/internal/OnLoadExecutablesUtilCEImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java index dcd051781858..2cecaaa05113 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/onload/internal/OnLoadExecutablesUtilCEImpl.java @@ -1308,7 +1308,9 @@ private Mono> addWidgetRelationshipToGraph( } private boolean hasUserSetExecutableToNotRunOnPageLoad(Executable executable) { - if (TRUE.equals(executable.getUserSetOnLoad()) && executable.getRunBehaviour() == RunBehaviourEnum.MANUAL) { + if (TRUE.equals(executable.getUserSetOnLoad()) + && (executable.getRunBehaviour() == null + || RunBehaviourEnum.MANUAL.equals(executable.getRunBehaviour()))) { return true; }