Skip to content
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

fix: conditionally set FqN name for partial import #37694

Merged
merged 17 commits into from
Dec 12, 2024
Merged

fix: conditionally set FqN name for partial import #37694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
817ad74
conditionally set FqN name for partial import
AnaghHegde Nov 26, 2024
8cbc2fb
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
AnaghHegde Nov 26, 2024
d828985
Revert "conditionally set FqN name for partial import"
AnaghHegde Nov 27, 2024
b2627c2
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
AnaghHegde Nov 27, 2024
4bddc7f
set FqN and name same for non js actions
AnaghHegde Nov 27, 2024
e948632
update null check
AnaghHegde Nov 27, 2024
9802be5
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
AnaghHegde Nov 28, 2024
86411fc
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
AnaghHegde Dec 4, 2024
d0735b8
add plugin check while using the Fqn name
AnaghHegde Dec 4, 2024
6d6b24d
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
AnaghHegde Dec 5, 2024
5a320ba
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
AnaghHegde Dec 9, 2024
3254bc8
update the check for fetching name from action dto
AnaghHegde Dec 9, 2024
6d05520
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
AnaghHegde Dec 10, 2024
287c174
added tweaks
sondermanish Dec 11, 2024
9d7b7b8
merge with release
sondermanish Dec 11, 2024
c853ccf
added changes to import export setting
sondermanish Dec 11, 2024
e60ca39
spotless:fix
sondermanish Dec 12, 2024
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: 4 additions & 3 deletions ...erver/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import lombok.ToString;
import lombok.experimental.FieldNameConstants;
import org.springframework.data.annotation.Transient;
import org.springframework.util.StringUtils;

import java.time.Instant;
import java.util.HashMap;
Expand Down Expand Up @@ -199,11 +200,11 @@ public void setPolicies(Set<Policy> policies) {
@Override
@JsonView({Views.Internal.class})
public String getValidName() {
if (this.fullyQualifiedName == null) {
return this.name;
} else {
if (StringUtils.hasText(this.fullyQualifiedName)) {
return this.fullyQualifiedName;
}

return this.name;
}

@Override
Expand Down
11 changes: 9 additions & 2 deletions ...main/java/com/appsmith/server/newactions/importable/NewActionImportableServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.appsmith.external.models.ActionDTO;
import com.appsmith.external.models.Datasource;
import com.appsmith.external.models.PluginType;
import com.appsmith.external.models.Policy;
import com.appsmith.server.actioncollections.base.ActionCollectionService;
import com.appsmith.server.constants.FieldName;
Expand Down Expand Up @@ -482,11 +483,17 @@ private void updateActionNameBeforeMerge(
}
String oldId = newAction.getId().split("_")[1];
newAction.setId(newNameAction + "_" + oldId);

if (PluginType.JS.equals(newAction.getPluginType())) {
newAction.getUnpublishedAction().setFullyQualifiedName(newNameAction);
}

newAction.getUnpublishedAction().setName(newNameAction);
newAction.getUnpublishedAction().setFullyQualifiedName(newNameAction);
if (newAction.getPublishedAction() != null) {
newAction.getPublishedAction().setName(newNameAction);
newAction.getPublishedAction().setFullyQualifiedName(newNameAction);
if (PluginType.JS.equals(newAction.getPluginType())) {
newAction.getPublishedAction().setFullyQualifiedName(newNameAction);
}
}
mappedImportableResourcesDTO.getRefactoringNameReference().put(oldNameAction, newNameAction);
}
Expand Down
7 changes: 6 additions & 1 deletion ...main/java/com/appsmith/server/newactions/refactors/NewActionRefactoringServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,14 @@ public Mono<Void> updateRefactoredEntity(RefactorEntityNameDTO refactorEntityNam
.map(branchedAction -> newActionService.generateActionByViewMode(branchedAction, false))
.flatMap(action -> {
action.setName(refactorEntityNameDTO.getNewName());
if (StringUtils.hasLength(refactorEntityNameDTO.getCollectionName())) {
if (!PluginType.JS.equals(action.getPluginType())) {
return newActionService.updateUnpublishedAction(action.getId(), action);
}

if (StringUtils.hasText(refactorEntityNameDTO.getCollectionName())) {
action.setFullyQualifiedName(refactorEntityNameDTO.getNewFullyQualifiedName());
}

return newActionService.updateUnpublishedAction(action.getId(), action);
})
.then();
Expand Down
Loading