Skip to content

fix: Update datasource deletion message for clarity #34822

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
yatinappsmith merged 2 commits into from
Jul 11, 2024
Merged

fix: Update datasource deletion message for clarity #34822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43ce6a6
fix: Update datasource deletion message for clarity
AnnaHariprasad5123 Jul 9, 2024
766dec4
fix: DataSourceServiceTest
AnnaHariprasad5123 Jul 11, 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: 1 addition & 1 deletion app/client/cypress/e2e/Regression/ServerSide/QueryPane/MySQL_Spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ describe(
after("Verify Deletion of the datasource", () => {
dataSources.DeleteDatasourceFromWithinDS(dsName, 409);
agHelper.ValidateToastMessage(
"Cannot delete datasource since it has 1 action(s) using it.",
"Cannot delete datasource since it has 1 query using it.",
); //table is 1 action
});

Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/support/Pages/DataSources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ export class DataSources {
this.agHelper.AssertContains(
responseStatus === 200
? "datasource deleted successfully"
: "action(s) using it",
: "Cannot delete datasource",
);
});
}
Expand Down
4 changes: 3 additions & 1 deletion ...th-server/src/main/java/com/appsmith/server/datasources/base/DatasourceServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,9 @@ public Mono<Datasource> archiveById(String id) {
.flatMap(objects -> {
final Long actionsCount = objects.getT2();
if (actionsCount > 0) {
return Mono.error(new AppsmithException(AppsmithError.DATASOURCE_HAS_ACTIONS, actionsCount));
String queryWord = actionsCount == 1 ? "query" : "queries";
return Mono.error(
new AppsmithException(AppsmithError.DATASOURCE_HAS_ACTIONS, actionsCount, queryWord));
}
return Mono.just(objects.getT1());
})
Expand Down
2 changes: 1 addition & 1 deletion app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ public enum AppsmithError {
DATASOURCE_HAS_ACTIONS(
409,
AppsmithErrorCode.DATASOURCE_HAS_ACTIONS.getCode(),
"Cannot delete datasource since it has {0} action(s) using it.",
"Cannot delete datasource since it has {0} {1} using it.",
AppsmithErrorAction.DEFAULT,
"Datasource cannot be deleted",
ErrorType.BAD_REQUEST,
Expand Down
3 changes: 2 additions & 1 deletion ...ver/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,8 @@ public void deleteDatasourceWithActions() {
})
.flatMap(datasource -> datasourceService.archiveById(datasource.getId()));

StepVerifier.create(datasourceMono).verifyErrorMessage(AppsmithError.DATASOURCE_HAS_ACTIONS.getMessage("1"));
StepVerifier.create(datasourceMono)
.verifyErrorMessage(AppsmithError.DATASOURCE_HAS_ACTIONS.getMessage("1", "query"));
}

@Test
Expand Down