Skip to content

fix: generate crud run behaviour updates #40792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sneha122 merged 4 commits into from
May 30, 2025
Merged

fix: generate crud run behaviour updates #40792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7556808
fix: generate crud run behaviour updates
May 28, 2025
ed2504b
flag explicitly mocked to be false
May 29, 2025
9dcaac1
feature flag check happens only once
May 29, 2025
e07e202
Merge branch 'release' into fix/generate-crud-run-behaviour
May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...ith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolutionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.appsmith.server.plugins.base.PluginService;
import com.appsmith.server.services.AnalyticsService;
import com.appsmith.server.services.ApplicationPageService;
import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.LayoutActionService;
import com.appsmith.server.services.SessionUserService;
import com.appsmith.server.solutions.ce.CreateDBTablePageSolutionCEImpl;
Expand Down Expand Up @@ -37,7 +38,8 @@ public CreateDBTablePageSolutionImpl(
PagePermission pagePermission,
DatasourceStructureSolution datasourceStructureSolution,
EnvironmentPermission environmentPermission,
JsonSchemaMigration jsonSchemaMigration) {
JsonSchemaMigration jsonSchemaMigration,
FeatureFlagService featureFlagService) {
super(
datasourceService,
datasourceStorageService,
Expand All @@ -55,6 +57,7 @@ public CreateDBTablePageSolutionImpl(
pagePermission,
datasourceStructureSolution,
environmentPermission,
jsonSchemaMigration);
jsonSchemaMigration,
featureFlagService);
}
}
64 changes: 40 additions & 24 deletions ...erver/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.appsmith.external.constants.AnalyticsEvents;
import com.appsmith.external.converters.HttpMethodConverter;
import com.appsmith.external.converters.ISOStringToInstantConverter;
import com.appsmith.external.enums.FeatureFlagEnum;
import com.appsmith.external.git.constants.ce.RefType;
import com.appsmith.external.helpers.AppsmithBeanUtils;
import com.appsmith.external.models.ActionConfiguration;
Expand Down Expand Up @@ -39,6 +40,7 @@
import com.appsmith.server.plugins.base.PluginService;
import com.appsmith.server.services.AnalyticsService;
import com.appsmith.server.services.ApplicationPageService;
import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.LayoutActionService;
import com.appsmith.server.services.SessionUserService;
import com.appsmith.server.solutions.ApplicationPermission;
Expand Down Expand Up @@ -96,6 +98,7 @@ public class CreateDBTablePageSolutionCEImpl implements CreateDBTablePageSolutio
private final DatasourceStructureSolution datasourceStructureSolution;
private final EnvironmentPermission environmentPermission;
private final JsonSchemaMigration jsonSchemaMigration;
private final FeatureFlagService featureFlagService;

private static final String FILE_PATH = "CRUD-DB-Table-Template-Application.json";

Expand Down Expand Up @@ -441,30 +444,43 @@ public Mono<CRUDPageResponseDTO> createPageFromDBTable(
String tableNameInAction = tuple.getT5();
String savedPageId = tuple.getT6();
log.debug("Going to clone actions from template application for page {}", savedPageId);
return cloneActionsFromTemplateApplication(
datasourceStorage,
tableNameInAction,
savedPageId,
templateActionList,
mappedColumnsAndTableName,
deletedWidgets,
pluginSpecificParams,
templateAutogeneratedKey.toString())
.flatMap(actionDTO -> StringUtils.equals(actionDTO.getName(), SELECT_QUERY)
|| StringUtils.equals(actionDTO.getName(), FIND_QUERY)
|| StringUtils.equals(actionDTO.getName(), LIST_QUERY)
? layoutActionService.setRunBehaviour(
actionDTO.getId(), RunBehaviourEnum.ON_PAGE_LOAD)
: Mono.just(actionDTO))
.then(applicationPageService
.getPage(savedPageId, false)
.flatMap(pageDTO -> {
CRUDPageResponseDTO crudPage = new CRUDPageResponseDTO();
crudPage.setPage(pageDTO);
createSuccessMessageAndSetAsset(plugin, crudPage);
return sendGenerateCRUDPageAnalyticsEvent(
crudPage, datasourceStorage, plugin.getName());
}));
return featureFlagService
.check(FeatureFlagEnum.release_reactive_actions_enabled)
.flatMap(isEnabled -> {
RunBehaviourEnum runBehaviour = (isEnabled != null && isEnabled)
? RunBehaviourEnum.AUTOMATIC
: RunBehaviourEnum.ON_PAGE_LOAD;
return cloneActionsFromTemplateApplication(
datasourceStorage,
tableNameInAction,
savedPageId,
templateActionList,
mappedColumnsAndTableName,
deletedWidgets,
pluginSpecificParams,
templateAutogeneratedKey.toString())
.flatMap(actionDTO -> {
if (StringUtils.equals(actionDTO.getName(), SELECT_QUERY)
|| StringUtils.equals(actionDTO.getName(), FIND_QUERY)
|| StringUtils.equals(actionDTO.getName(), LIST_QUERY)) {
// Use the previously fetched flag value
// This preserves the contract and documents the intention
return layoutActionService.setRunBehaviour(
actionDTO.getId(), runBehaviour);
} else {
return Mono.just(actionDTO);
}
})
.then(applicationPageService
.getPage(savedPageId, false)
.flatMap(pageDTO -> {
CRUDPageResponseDTO crudPage = new CRUDPageResponseDTO();
crudPage.setPage(pageDTO);
createSuccessMessageAndSetAsset(plugin, crudPage);
return sendGenerateCRUDPageAnalyticsEvent(
crudPage, datasourceStorage, plugin.getName());
}));
});
});
}

Expand Down
133 changes: 133 additions & 0 deletions ...th-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.appsmith.server.solutions;

import com.appsmith.external.enums.FeatureFlagEnum;
import com.appsmith.external.git.constants.ce.RefType;
import com.appsmith.external.models.ActionConfiguration;
import com.appsmith.external.models.ActionDTO;
Expand Down Expand Up @@ -40,6 +41,7 @@
import com.appsmith.server.repositories.PluginRepository;
import com.appsmith.server.services.ApplicationPageService;
import com.appsmith.server.services.DatasourceStructureService;
import com.appsmith.server.services.FeatureFlagService;
import com.appsmith.server.services.WorkspaceService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
Expand All @@ -50,6 +52,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.security.test.context.support.WithUserDetails;
import org.springframework.test.annotation.DirtiesContext;
import reactor.core.publisher.Mono;
Expand All @@ -67,6 +70,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;

@Slf4j
Expand Down Expand Up @@ -176,6 +180,9 @@ public class CreateDBTablePageSolutionTests {

private final CRUDPageResourceDTO resource = new CRUDPageResourceDTO();

@SpyBean
private FeatureFlagService featureFlagService;

@BeforeEach
public void setup() {

Expand Down Expand Up @@ -694,6 +701,132 @@ public void createPageWithValidPageIdForMySqlDS() {
.verifyComplete();
}

@Test
@WithUserDetails(value = "api_user")
public void createPageWithValidPageIdForMySqlDS_FeatureFlagEnabled() {
doReturn(Mono.just(true)).when(featureFlagService).check(FeatureFlagEnum.release_reactive_actions_enabled);

resource.setApplicationId(testApp.getId());
PageDTO newPage = new PageDTO();
newPage.setApplicationId(testApp.getId());
newPage.setName("crud-admin-page-mysql-ff-enabled");
StringBuilder pluginName = new StringBuilder();

Mono<Datasource> datasourceMono = pluginRepository.findByName("MySQL").flatMap(plugin -> {
pluginName.append(plugin.getName());
Datasource datasource = new Datasource();
datasource.setPluginId(plugin.getId());
datasource.setWorkspaceId(testWorkspace.getId());
datasource.setName("MySql-CRUD-Page-Table-DS-FF-Enabled");

HashMap<String, DatasourceStorageDTO> storages = new HashMap<>();
storages.put(
testDefaultEnvironmentId,
new DatasourceStorageDTO(null, testDefaultEnvironmentId, datasourceConfiguration));
datasource.setDatasourceStorages(storages);

return datasourceService.create(datasource).flatMap(datasource1 -> {
DatasourceStorageStructure datasourceStorageStructure = new DatasourceStorageStructure();
datasourceStorageStructure.setDatasourceId(datasource1.getId());
datasourceStorageStructure.setEnvironmentId(testDefaultEnvironmentId);
datasourceStorageStructure.setStructure(structure);

return datasourceStructureService
.save(datasourceStorageStructure)
.thenReturn(datasource1);
});
});

Mono<CRUDPageResponseDTO> resultMono = datasourceMono
.flatMap(datasource1 -> {
resource.setDatasourceId(datasource1.getId());
return applicationPageService.createPage(newPage);
})
.flatMap(savedPage ->
solution.createPageFromDBTable(savedPage.getId(), resource, testDefaultEnvironmentId));

StepVerifier.create(resultMono.zipWhen(crudPageResponseDTO ->
getActions(crudPageResponseDTO.getPage().getId())))
.assertNext(tuple -> {
CRUDPageResponseDTO crudPageResponseDTO = tuple.getT1();
List<NewAction> actions = tuple.getT2();
for (NewAction action : actions) {
String name = action.getUnpublishedAction().getName();
if (SELECT_QUERY.equals(name) || FIND_QUERY.equals(name) || LIST_QUERY.equals(name)) {
assertThat(action.getUnpublishedAction().getRunBehaviour())
.isEqualTo(RunBehaviourEnum.AUTOMATIC);
} else {
assertThat(action.getUnpublishedAction().getRunBehaviour())
.isEqualTo(RunBehaviourEnum.MANUAL);
}
}
})
.verifyComplete();
}

@Test
@WithUserDetails(value = "api_user")
public void createPageWithValidPageIdForMySqlDS_FeatureFlagDisabled() {
doReturn(Mono.just(false)).when(featureFlagService).check(FeatureFlagEnum.release_reactive_actions_enabled);

resource.setApplicationId(testApp.getId());
PageDTO newPage = new PageDTO();
newPage.setApplicationId(testApp.getId());
newPage.setName("crud-admin-page-mysql-ff-disabled");
StringBuilder pluginName = new StringBuilder();

Mono<Datasource> datasourceMono = pluginRepository.findByName("MySQL").flatMap(plugin -> {
pluginName.append(plugin.getName());
Datasource datasource = new Datasource();
datasource.setPluginId(plugin.getId());
datasource.setWorkspaceId(testWorkspace.getId());
datasource.setName("MySql-CRUD-Page-Table-DS-FF-Disabled");

HashMap<String, DatasourceStorageDTO> storages = new HashMap<>();
storages.put(
testDefaultEnvironmentId,
new DatasourceStorageDTO(null, testDefaultEnvironmentId, datasourceConfiguration));
datasource.setDatasourceStorages(storages);

return datasourceService.create(datasource).flatMap(datasource1 -> {
DatasourceStorageStructure datasourceStorageStructure = new DatasourceStorageStructure();
datasourceStorageStructure.setDatasourceId(datasource1.getId());
datasourceStorageStructure.setEnvironmentId(testDefaultEnvironmentId);
datasourceStorageStructure.setStructure(structure);

return datasourceStructureService
.save(datasourceStorageStructure)
.thenReturn(datasource1);
});
});

Mono<CRUDPageResponseDTO> resultMono = datasourceMono
.flatMap(datasource1 -> {
resource.setDatasourceId(datasource1.getId());
return applicationPageService.createPage(newPage);
})
.flatMap(savedPage ->
solution.createPageFromDBTable(savedPage.getId(), resource, testDefaultEnvironmentId));

StepVerifier.create(resultMono.zipWhen(crudPageResponseDTO ->
getActions(crudPageResponseDTO.getPage().getId())))
.assertNext(tuple -> {
CRUDPageResponseDTO crudPageResponseDTO = tuple.getT1();
List<NewAction> actions = tuple.getT2();
for (NewAction action : actions) {
String name = action.getUnpublishedAction().getName();
if (SELECT_QUERY.equals(name) || FIND_QUERY.equals(name) || LIST_QUERY.equals(name)) {
assertThat(action.getUnpublishedAction().getRunBehaviour())
.isEqualTo(RunBehaviourEnum.ON_PAGE_LOAD);
} else {
assertThat(action.getUnpublishedAction().getRunBehaviour())
.isEqualTo(RunBehaviourEnum.MANUAL);
}
}
})
.verifyComplete();
}

@Test
@WithUserDetails(value = "api_user")
public void createPageWithValidPageIdForRedshiftDS() {
Expand Down