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

Jump to bottom

fix: Unbreak termination of operation with apps in other namespaces #11724

Merged
merged 3 commits into from
Dec 16, 2022
Merged

fix: Unbreak termination of operation with apps in other namespaces #11724

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
7d8fe67
fix: Unbreak operation termination
jannfis Dec 15, 2022
c8e019a
Revert change to Dockerfile
jannfis Dec 15, 2022
625fe80
Merge branch 'master' of github.com:argoproj/argo-cd into fix/ui-app-…
jannfis Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...c/app/applications/components/application-operation-state/application-operation-state.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const ApplicationOperationState: React.StatelessComponent<Props> = ({appl
const confirmed = await ctx.apis.popup.confirm('Terminate operation', 'Are you sure you want to terminate operation?');
if (confirmed) {
try {
await services.applications.terminateOperation(application.metadata.name);
await services.applications.terminateOperation(application.metadata.name, application.metadata.namespace);
} catch (e) {
ctx.apis.notifications.show({
content: <ErrorNotification title='Unable to terminate operation' e={e} />,
Expand Down
1 change: 1 addition & 0 deletions ui/src/app/shared/services/applications-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ export class ApplicationsService {
public terminateOperation(applicationName: string, appNamespace: string): Promise<boolean> {
return requests
.delete(`/applications/${applicationName}/operation`)
.query({appNamespace})
.send()
.then(() => true);
}
Expand Down