Skip to content

fix: fix validation for datasource in action import and save flow #34754

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnaghHegde merged 2 commits into from
Jul 8, 2024
Merged

fix: fix validation for datasource in action import and save flow #34754

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
389c15a
add datasource validation for action in import flow
AnaghHegde Jul 5, 2024
72dc336
refactor isDryOps flag usage in action validate flow
AnaghHegde Jul 5, 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
2 changes: 2 additions & 0 deletions ...appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public interface NewActionServiceCE extends CrudService<NewAction, String> {

Mono<NewAction> validateAction(NewAction newAction);

Mono<NewAction> validateAction(NewAction newAction, boolean isDryOps);
Comment thread
AnaghHegde marked this conversation as resolved.

Mono<Void> bulkValidateAndInsertActionInRepository(List<NewAction> newActionList);

Mono<Void> bulkValidateAndUpdateActionInRepository(List<NewAction> newActionList);
Expand Down
19 changes: 13 additions & 6 deletions ...mith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,11 @@ public Mono<ActionDTO> validateAndSaveActionToRepository(NewAction newAction) {

@Override
public Mono<NewAction> validateAction(NewAction newAction) {
return validateAction(newAction, false);
}

@Override
public Mono<NewAction> validateAction(NewAction newAction, boolean isDryOps) {
this.setGitSyncIdInNewAction(newAction);

ActionDTO action = newAction.getUnpublishedAction();
Expand Down Expand Up @@ -373,10 +378,12 @@ public Mono<NewAction> validateAction(NewAction newAction) {
datasourceMono = datasourceService
.findById(action.getDatasource().getId())
.switchIfEmpty(Mono.defer(() -> {
action.setIsValid(false);
invalids.add(AppsmithError.NO_RESOURCE_FOUND.getMessage(
FieldName.DATASOURCE,
action.getDatasource().getId()));
if (!isDryOps) {

@nidhi-nair nidhi-nair Jul 5, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When would this validation happen in case of dryOps?

@AnaghHegde AnaghHegde Jul 5, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When the datasource is attached to action, we fetch datasource from db and update the workspaceId for action.

action.setIsValid(false);
invalids.add(AppsmithError.NO_RESOURCE_FOUND.getMessage(
FieldName.DATASOURCE,
action.getDatasource().getId()));
}
return Mono.just(action.getDatasource());
}))
.map(datasource -> {
Expand Down Expand Up @@ -441,15 +448,15 @@ public Mono<NewAction> validateAction(NewAction newAction) {
@Override
public Mono<Void> bulkValidateAndInsertActionInRepository(List<NewAction> newActionList) {
return Flux.fromIterable(newActionList)
.flatMap(this::validateAction)
.flatMap(newAction -> validateAction(newAction, true))
.collectList()
.flatMap(repository::bulkInsert);
}

@Override
public Mono<Void> bulkValidateAndUpdateActionInRepository(List<NewAction> newActionList) {
return Flux.fromIterable(newActionList)
.flatMap(this::validateAction)
.flatMap(newAction -> validateAction(newAction, true))
.collectList()
.flatMap(repository::bulkUpdate);
}
Expand Down
1 change: 1 addition & 0 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 @@ -571,6 +571,7 @@ private void updateDatasourceInAction(
.findFirst()
.orElse(datasource);
datasource.setIsAutoGenerated(false);
newAction.setWorkspaceId(datasource.getWorkspaceId());
Comment thread
AnaghHegde marked this conversation as resolved.
}

newAction.getUnpublishedAction().setDatasource(datasource);
Expand Down