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: disable More button for multiple sources #11971

Merged
merged 7 commits into from
Jan 27, 2023
Merged

fix: disable More button for multiple sources #11971

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d71bab4
disable More button for multiple sources
ishitasequeira Jan 12, 2023
ef69472
address comments
ishitasequeira Jan 12, 2023
9232584
Addressed merge conflicts
ishitasequeira Jan 16, 2023
c78b093
Merge branch 'master' into disable-more-button-multisource
ishitasequeira Jan 18, 2023
1d9de22
Merge branch 'master' into disable-more-button-multisource
ishitasequeira Jan 19, 2023
92a548d
Merge branch 'master' into disable-more-button-multisource
ishitasequeira Jan 19, 2023
1ad0a42
Merge branch 'master' into disable-more-button-multisource
ishitasequeira Jan 23, 2023
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
12 changes: 8 additions & 4 deletions ui/src/app/applications/components/application-status-panel/application-status-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {Timestamp} from '../../../shared/components/timestamp';
import * as models from '../../../shared/models';
import {services} from '../../../shared/services';
import {ApplicationSyncWindowStatusIcon, ComparisonStatusIcon, getAppDefaultSource, getAppOperationState} from '../utils';
import {getConditionCategory, HealthStatusIcon, OperationState, syncStatusMessage} from '../utils';
import {getConditionCategory, HealthStatusIcon, OperationState, syncStatusMessage, helpTip} from '../utils';
import {RevisionMetadataPanel} from './revision-metadata-panel';

import './application-status-panel.scss';
Expand All @@ -30,13 +30,14 @@ const sectionLabel = (info: SectionInfo) => (
</label>
);

const sectionHeader = (info: SectionInfo, onClick?: () => any) => {
const sectionHeader = (info: SectionInfo, hasMultipleSources: boolean, onClick?: () => any) => {
return (
<div style={{display: 'flex', alignItems: 'center'}}>
{sectionLabel(info)}
{onClick && (
<button className='argo-button argo-button--base-o argo-button--sm application-status-panel__more-button' onClick={onClick}>
MORE
<button className='argo-button argo-button--base-o argo-button--sm application-status-panel__more-button' onClick={onClick} disabled={hasMultipleSources}>
{hasMultipleSources && helpTip('More details are not supported for apps with multiple sources')}
&nbsp; MORE
</button>
)}
</div>
Expand Down Expand Up @@ -65,6 +66,7 @@ export const ApplicationStatusPanel = ({application, showOperation, showConditio
const warnings = cntByCategory.get('warning');
const errors = cntByCategory.get('error');
const source = getAppDefaultSource(application);
const hasMultipleSources = application.spec.sources && application.spec.sources.length > 0;
return (
<div className='application-status-panel row'>
<div className='application-status-panel__item'>
Expand All @@ -83,6 +85,7 @@ export const ApplicationStatusPanel = ({application, showOperation, showConditio
title: 'CURRENT SYNC STATUS',
helpContent: 'Whether or not the version of your app is up to date with your repo. You may wish to sync your app if it is out-of-sync.'
},
hasMultipleSources,
source.chart ? null : () => showMetadataInfo(application.status.sync ? application.status.sync.revision : '')
)}
<div className='application-status-panel__item-value'>
Expand Down Expand Up @@ -115,6 +118,7 @@ export const ApplicationStatusPanel = ({application, showOperation, showConditio
daysSinceLastSynchronized +
' days since last sync. Click for the status of that sync.'
},
hasMultipleSources,
source.chart ? null : () => showMetadataInfo(appOperationState.syncResult ? appOperationState.syncResult.revision : '')
)}
<div className={`application-status-panel__item-value application-status-panel__item-value--${appOperationState.phase}`}>
Expand Down