Skip to content

chore: Remove unused param branchName on partial import method #39328

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
sharat87 merged 3 commits into from
Feb 20, 2025
Merged

chore: Remove unused param branchName on partial import method #39328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0f7080
chore: Remove unused param `branchName` on partial import method
sharat87 Feb 18, 2025
c2e8deb
chore: fix compile
sharat87 Feb 18, 2025
20b0791
chore: merge release branch
sharat87 Feb 20, 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
2 changes: 1 addition & 1 deletion ...mith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ public Mono<ResponseDTO<Application>> importApplicationPartially(
@PathVariable String branchedApplicationId,
@RequestParam(name = FieldName.PAGE_ID) String branchedPageId) {
return fileMono.flatMap(fileData -> partialImportService.importResourceInPage(
workspaceId, branchedApplicationId, branchedPageId, null, fileData))
workspaceId, branchedApplicationId, branchedPageId, fileData))
.map(fetchedResource -> new ResponseDTO<>(HttpStatus.CREATED, fetchedResource));
}

Expand Down
3 changes: 1 addition & 2 deletions ...er/src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@

public interface PartialImportServiceCE {

Mono<Application> importResourceInPage(
String workspaceId, String applicationId, String pageId, String branchName, Part file);
Mono<Application> importResourceInPage(String workspaceId, String applicationId, String pageId, Part file);

Mono<BuildingBlockResponseDTO> importBuildingBlock(BuildingBlockDTO buildingBlockDTO);
}
5 changes: 1 addition & 4 deletions ...rc/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.appsmith.external.models.CreatorContextType;
import com.appsmith.external.models.Datasource;
import com.appsmith.server.acl.AclPermission;
import com.appsmith.server.actioncollections.base.ActionCollectionService;
import com.appsmith.server.applications.base.ApplicationService;
import com.appsmith.server.constants.FieldName;
import com.appsmith.server.datasources.base.DatasourceService;
Expand Down Expand Up @@ -98,7 +97,6 @@ public class PartialImportServiceCEImpl implements PartialImportServiceCE {
private final WidgetRefactorUtil widgetRefactorUtil;
private final ApplicationPageService applicationPageService;
private final NewActionService newActionService;
private final ActionCollectionService actionCollectionService;
private final ArtifactBasedImportService<Application, ApplicationImportDTO, ApplicationJson>
applicationImportService;
private final DatasourceService datasourceService;
Expand All @@ -107,8 +105,7 @@ public class PartialImportServiceCEImpl implements PartialImportServiceCE {
private final DryOperationRepository dryOperationRepository;

@Override
public Mono<Application> importResourceInPage(
String workspaceId, String applicationId, String pageId, String branchName, Part file) {
public Mono<Application> importResourceInPage(String workspaceId, String applicationId, String pageId, Part file) {
Mono<User> currUserMono = sessionUserService.getCurrentUser();
return importService
.extractArtifactExchangeJson(file)
Expand Down
3 changes: 0 additions & 3 deletions .../src/main/java/com/appsmith/server/imports/internal/partial/PartialImportServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.appsmith.server.imports.internal.partial;

import com.appsmith.external.models.Datasource;
import com.appsmith.server.actioncollections.base.ActionCollectionService;
import com.appsmith.server.applications.base.ApplicationService;
import com.appsmith.server.datasources.base.DatasourceService;
import com.appsmith.server.domains.ActionCollection;
Expand Down Expand Up @@ -67,7 +66,6 @@ public PartialImportServiceImpl(
WidgetRefactorUtil widgetRefactorUtil,
ApplicationPageService applicationPageService,
NewActionService newActionService,
ActionCollectionService actionCollectionService,
ArtifactBasedImportService<Application, ApplicationImportDTO, ApplicationJson> applicationImportService,
DatasourceService datasourceService,
CustomJSLibService customJSLibService,
Expand Down Expand Up @@ -98,7 +96,6 @@ public PartialImportServiceImpl(
widgetRefactorUtil,
applicationPageService,
newActionService,
actionCollectionService,
applicationImportService,
datasourceService,
customJSLibService,
Expand Down
9 changes: 4 additions & 5 deletions ...appsmith-server/src/test/java/com/appsmith/server/solutions/PartialImportServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ public void testPartialImport_nonGitConnectedApp_success() {
Part filePart = createFilePart("test_assets/ImportExportServiceTest/partial-export-resource.json");

Mono<Tuple3<Application, List<NewAction>, List<ActionCollection>>> result = partialImportService
.importResourceInPage(workspaceId, testApplication.getId(), pageId, null, filePart)
.importResourceInPage(workspaceId, testApplication.getId(), pageId, filePart)
.flatMap(application -> {
Mono<List<NewAction>> actionList = newActionService
.findByPageId(pageId, Optional.empty())
Expand Down Expand Up @@ -338,7 +338,7 @@ public void testPartialImport_gitConnectedAppDefaultBranch_success() {

PageDTO finalSavedPage = savedPage;
Mono<Tuple3<Application, List<NewAction>, List<ActionCollection>>> result = partialImportService
.importResourceInPage(workspaceId, application.getId(), savedPage.getId(), "master", filePart)
.importResourceInPage(workspaceId, application.getId(), savedPage.getId(), filePart)
.flatMap(application1 -> {
Mono<List<NewAction>> actionList = newActionService
.findByPageId(finalSavedPage.getId(), Optional.empty())
Expand Down Expand Up @@ -398,9 +398,8 @@ public void testPartialImport_nameClashInAction_successWithNoNameDuplicates() {
Part filePart = createFilePart("test_assets/ImportExportServiceTest/partial-export-resource.json");

Mono<Tuple3<Application, List<NewAction>, List<ActionCollection>>> result = partialImportService
.importResourceInPage(workspaceId, testApplication.getId(), pageId, null, filePart)
.then(partialImportService.importResourceInPage(
workspaceId, testApplication.getId(), pageId, null, filePart))
.importResourceInPage(workspaceId, testApplication.getId(), pageId, filePart)
.then(partialImportService.importResourceInPage(workspaceId, testApplication.getId(), pageId, filePart))
.flatMap(application -> {
Mono<List<NewAction>> actionList = newActionService
.findByPageId(pageId, Optional.empty())
Expand Down
Loading