Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: Add non-configured datasource to merge template to an existing app API response (#15918)

Browse Source 
Add unconfigured datasource to merge template to app API
This commit is contained in:
Anagh Hegde 2022-09-08 22:55:47 +05:30 committed by GitHub
parent 14140c10b7
commit 4d609a5b4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationTemplateControllerCE.java
View File

@ -66,7 +66,7 @@ public class ApplicationTemplateControllerCE {
} }
@PostMapping("{templateId}/merge/{applicationId}/{organizationId}") @PostMapping("{templateId}/merge/{applicationId}/{organizationId}")
public Mono<ResponseDTO<Application>> mergeTemplateWithApplication(@PathVariable String templateId, public Mono<ResponseDTO<ApplicationImportDTO>> mergeTemplateWithApplication(@PathVariable String templateId,
@PathVariable String applicationId, @PathVariable String applicationId,
@PathVariable String organizationId, @PathVariable String organizationId,
@RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName, @RequestHeader(name = FieldName.BRANCH_NAME, required = false) String branchName,

3
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCE.java
View File

@ -1,6 +1,5 @@
package com.appsmith.server.services.ce; package com.appsmith.server.services.ce;
import com.appsmith.server.domains.Application;
import com.appsmith.server.dtos.ApplicationImportDTO; import com.appsmith.server.dtos.ApplicationImportDTO;
import com.appsmith.server.dtos.ApplicationTemplate; import com.appsmith.server.dtos.ApplicationTemplate;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
@ -21,7 +20,7 @@ public interface ApplicationTemplateServiceCE {
Mono<ApplicationImportDTO> importApplicationFromTemplate(String templateId, String workspaceId); Mono<ApplicationImportDTO> importApplicationFromTemplate(String templateId, String workspaceId);
Mono<Application> mergeTemplateWithApplication(String templateId, String applicationId, String workspaceId, String branchName, List<String> pagesToImport); Mono<ApplicationImportDTO> mergeTemplateWithApplication(String templateId, String applicationId, String workspaceId, String branchName, List<String> pagesToImport);
Mono<ApplicationTemplate> getFilters(); Mono<ApplicationTemplate> getFilters();
} }

12
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java
View File

@ -236,11 +236,13 @@ public class ApplicationTemplateServiceCEImpl implements ApplicationTemplateServ
} }
@Override @Override
public Mono<Application> mergeTemplateWithApplication(String templateId, String applicationId, String organizationId, String branchName, List<String> pagesToImport) { public Mono<ApplicationImportDTO> mergeTemplateWithApplication(String templateId, String applicationId, String organizationId, String branchName, List<String> pagesToImport) {
return getApplicationJsonFromTemplate(templateId).flatMap(applicationJson -> return getApplicationJsonFromTemplate(templateId)
importExportApplicationService.mergeApplicationJsonWithApplication( .flatMap(applicationJson -> importExportApplicationService.mergeApplicationJsonWithApplication(
organizationId, applicationId, null, applicationJson, pagesToImport organizationId, applicationId, null, applicationJson, pagesToImport)
) )
); .flatMap(application -> importExportApplicationService.getApplicationImportDTO(
application.getId(), application.getWorkspaceId(), application)
);
} }
} }