diff --git a/ui/src/app/applications/components/application-details/application-details.tsx b/ui/src/app/applications/components/application-details/application-details.tsx index 26f5d0939b151..078b11db2c692 100644 --- a/ui/src/app/applications/components/application-details/application-details.tsx +++ b/ui/src/app/applications/components/application-details/application-details.tsx @@ -934,85 +934,78 @@ export class ApplicationDetails extends React.Component {prop.actionLabel}; - const actionMenus = [ + return [ { iconClassName: 'fa fa-info-circle', - title: , + title: , action: () => this.selectNode(fullName), disabled: !app.spec.source && (!app.spec.sources || app.spec.sources.length === 0) }, { iconClassName: 'fa fa-file-medical', - title: , + title: , action: () => this.selectNode(fullName, 0, 'diff'), disabled: app.status.sync.status === appModels.SyncStatuses.Synced || (!app.spec.source && (!app.spec.sources || app.spec.sources.length === 0)) - } - ]; - - if (!app.status.operationState?.finishedAt || app.status.operationState?.phase === 'Running') { - actionMenus.push({ - iconClassName: 'fa fa-stop', - title: , - action: async () => { - const confirmed = await this.context.apis.popup.confirm('Terminate Sync', 'Are you sure you want to terminate sync?'); - if (confirmed) { - try { - await services.applications.terminateOperation(app.metadata.name, app.metadata.namespace); - } catch (e) { - this.context.apis.notifications.show({ - content: , - type: NotificationType.Error - }); - } - } - }, - disabled: false - }); - } else { - actionMenus.push({ - iconClassName: 'fa fa-sync', - title: , - action: () => AppUtils.showDeploy('all', null, this.appContext.apis), - disabled: !app.spec.source && (!app.spec.sources || app.spec.sources.length === 0) - }); - } + }, - // Add refresh action - actionMenus.push( + !app.status.operationState?.finishedAt || app.status.operationState?.phase === 'Running' + ? { + iconClassName: 'fa fa-stop', + title: , + action: async () => { + const confirmed = await this.context.apis.popup.confirm('Terminate Sync', 'Are you sure you want to terminate sync?'); + if (confirmed) { + try { + await services.applications.terminateOperation(app.metadata.name, app.metadata.namespace); + } catch (e) { + this.context.apis.notifications.show({ + content: , + type: NotificationType.Error + }); + } + } + } + } + : { + iconClassName: 'fa fa-sync', + title: , + action: () => AppUtils.showDeploy('all', null, this.appContext.apis), + disabled: !app.spec.source && (!app.spec.sources || app.spec.sources.length === 0) + }, ...(app.status?.operationState?.phase === 'Running' && app.status.resources.find(r => r.requiresDeletionConfirmation) ? [ { iconClassName: 'fa fa-check', - title: , + title: , action: () => this.confirmDeletion(app, 'Confirm Prunning', 'Are you sure you want to confirm resources pruning?') } ] : []), { iconClassName: 'fa fa-info-circle', - title: , + title: , action: () => this.setOperationStatusVisible(true), disabled: !app.status.operationState }, { iconClassName: 'fa fa-history', - title: , + title: , action: () => { this.setRollbackPanelVisible(0); }, disabled: !app.status.operationState }, app.metadata.deletionTimestamp && - app.status.resources.find(r => r.requiresDeletionConfirmation) && - !((app.metadata.annotations || {})[appModels.AppDeletionConfirmedAnnotation] == 'true') + app.status.resources.find(r => r.requiresDeletionConfirmation) && + !((app.metadata.annotations || {})[appModels.AppDeletionConfirmedAnnotation] == 'true') ? { iconClassName: 'fa fa-check', - title: , + title: , action: () => this.confirmDeletion(app, 'Confirm Deletion', 'Are you sure you want to delete this application?') } : { iconClassName: 'fa fa-times-circle', - title: , + title: , action: () => this.deleteApplication(), disabled: !!app.metadata.deletionTimestamp }, @@ -1020,7 +1013,7 @@ export class ApplicationDetails extends React.Component - {' '} + {' '}