Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-05-23 17:28:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix: global project info is missing in UI (#5861)

Browse source 
Signed-off-by: May Zhang <may_zhang@intuit.com>
This commit is contained in:
May Zhang 2021-03-26 09:36:55 -07:00 committed by GitHub
parent 86494a2800
commit 26af455a6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 89 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/application/application.go
View file

@ -736,7 +736,7 @@ func (s *Server) Watch(q *application.ApplicationQuery, ws application.Applicati
}
func (s *Server) validateAndNormalizeApp(ctx context.Context, app *appv1.Application, validate bool) error {
proj, err := s.appclientset.ArgoprojV1alpha1().AppProjects(s.ns).Get(ctx, app.Spec.GetProject(), metav1.GetOptions{})
proj, err := argo.GetAppProject(&app.Spec, applisters.NewAppProjectLister(s.projInformer.GetIndexer()), s.ns, s.settingsMgr)
if err != nil {
if apierr.IsNotFound(err) {
return status.Errorf(codes.InvalidArgument, "application references project %s which does not exist", app.Spec.Project)

20
ui/src/app/settings/components/project-details/project-details.tsx
View file

@ -50,6 +50,26 @@ function loadGlobal(name: string) {
merged.clusterResourceWhitelist = merged.clusterResourceWhitelist.concat(proj.spec.clusterResourceWhitelist || []);
merged.namespaceResourceBlacklist = merged.namespaceResourceBlacklist.concat(proj.spec.namespaceResourceBlacklist || []);
merged.namespaceResourceWhitelist = merged.namespaceResourceWhitelist.concat(proj.spec.namespaceResourceWhitelist || []);
merged.sourceRepos = merged.sourceRepos.concat(proj.spec.sourceRepos || []);
merged.destinations = merged.destinations.concat(proj.spec.destinations || []);
merged.sourceRepos = merged.sourceRepos.filter((item, index) => {
return (
index ===
merged.sourceRepos.findIndex(obj => {
return obj === item;
})
);
});
merged.destinations = merged.destinations.filter((item, index) => {
return (
index ===
merged.destinations.findIndex(obj => {
return obj.server === item.server && obj.namespace === item.namespace;
})
);
});
merged.clusterResourceBlacklist = merged.clusterResourceBlacklist.filter((item, index) => {
return (

69
ui/src/app/settings/components/project-details/resource-lists-panel.tsx
View file

@ -3,7 +3,7 @@ import * as React from 'react';
import {FormApi} from 'react-form';
import {EditablePanel} from '../../../shared/components';
import {GroupKind, Groups, Project, ProjectSpec, ResourceKinds} from '../../../shared/models';
import {ApplicationDestination, GroupKind, Groups, Project, ProjectSpec, ResourceKinds} from '../../../shared/models';
function removeEl(items: any[], index: number) {
return items.slice(0, index).concat(items.slice(index + 1));
@ -69,6 +69,71 @@ function viewList(type: field, proj: Project) {
);
}
const sourceReposInfoByField: {[type: string]: {title: string; helpText: string}} = {
sourceRepos: {
title: 'source repositories',
helpText: 'Git repositories where application manifests are permitted to be retrieved from'
}
};
function viewSourceReposInfoList(type: field, proj: Project) {
const info = sourceReposInfoByField[type];
const list = proj.spec[type] as Array<string>;
return (
<React.Fragment>
<p className='project-details__list-title'>
{info.title} {helpTip(info.helpText)}
</p>
{(list || []).length > 0 ? (
<React.Fragment>
{list.map((repo, i) => (
<div className='row white-box__details-row' key={i}>
<div className='columns small-12'>{repo}</div>
</div>
))}
</React.Fragment>
) : (
<p>The {info.title} is empty</p>
)}
</React.Fragment>
);
}
const destinationsInfoByField: {[type: string]: {title: string; helpText: string}} = {
destinations: {
title: 'destinations',
helpText: 'Cluster and namespaces where applications are permitted to be deployed to'
}
};
function viewDestinationsInfoList(type: field, proj: Project) {
const info = destinationsInfoByField[type];
const list = proj.spec[type] as Array<ApplicationDestination>;
return (
<React.Fragment>
<p className='project-details__list-title'>
{info.title} {helpTip(info.helpText)}
</p>
{(list || []).length > 0 ? (
<React.Fragment>
<div className='row white-box__details-row'>
<div className='columns small-4'>Server</div>
<div className='columns small-8'>Namespace</div>
</div>
{list.map((destination, i) => (
<div className='row white-box__details-row' key={i}>
<div className='columns small-4'>{destination.server}</div>
<div className='columns small-8'>{destination.namespace}</div>
</div>
))}
</React.Fragment>
) : (
<p>The {info.title} is empty</p>
)}
</React.Fragment>
);
}
function editList(type: field, formApi: FormApi) {
const info = infoByField[type];
@ -114,6 +179,8 @@ export const ResourceListsPanel = ({proj, saveProject, title}: {proj: Project; t
{Object.keys(infoByField).map(key => (
<React.Fragment key={key}>{viewList(key as field, proj)}</React.Fragment>
))}
{!proj.metadata && Object.keys(sourceReposInfoByField).map(key => <React.Fragment key={key}>{viewSourceReposInfoList(key as field, proj)}</React.Fragment>)}
{!proj.metadata && Object.keys(destinationsInfoByField).map(key => <React.Fragment key={key}>{viewDestinationsInfoList(key as field, proj)}</React.Fragment>)}
</React.Fragment>
}
edit={