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

Fixes bug in argocd repo list and tidy up UI (#2307)

Browse source
This commit is contained in:
Alex Collins 2019-09-13 12:07:35 -07:00 committed by GitHub
parent dc322f8a1f
commit dfb44373bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/argocd/commands/repo.go
View file

@ -186,7 +186,7 @@ func NewRepoRemoveCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command
// Print table of repo info
func printRepoTable(repos appsv1.Repositories) {
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
_, _ = fmt.Fprintf(w, "TYPE\nNAME\nREPO\tINSECURE\tLFS\tUSER\tSTATUS\tMESSAGE\n")
_, _ = fmt.Fprintf(w, "TYPE\tNAME\tREPO\tINSECURE\tLFS\tUSER\tSTATUS\tMESSAGE\n")
for _, r := range repos {
var username string
if r.Username == "" {

17
ui/src/app/settings/components/repos-list/repos-list.tsx
View file

@ -66,20 +66,26 @@ export class ReposList extends React.Component<RouteComponentProps<any>> {
<div className='argo-table-list'>
<div className='argo-table-list__head'>
<div className='row'>
<div className='columns small-5'>REPOSITORY</div>
<div className='columns small-2'>TYPE</div>
<div className='columns small-1'/>
<div className='columns small-1'>TYPE</div>
<div className='columns small-2'>NAME</div>
<div className='columns small-5'>REPOSITORY</div>
<div className='columns small-3'>CONNECTION STATUS</div>
</div>
</div>
{repos.map((repo) => (
<div className='argo-table-list__row' key={repo.repo}>
<div className='row'>
<div className='columns small-5'>
<i className={'icon argo-icon-' + repo.type}/> <Repo url={repo.repo}/>
<div className='columns small-1'>
<i className={'icon argo-icon-' + (repo.type || 'git')}/>
</div>
<div className='columns small-1'>
{repo.type || 'git'}
</div>
<div className='columns small-2'>{repo.type}</div>
<div className='columns small-2'>{repo.name}</div>
<div className='columns small-5'>
<Repo url={repo.repo}/>
</div>
<div className='columns small-3'>
<ConnectionStateIcon
state={repo.connectionState}/> {repo.connectionState.status}
@ -182,7 +188,6 @@ export class ReposList extends React.Component<RouteComponentProps<any>> {
getApi={(api) => this.formApiSSH = api}
validateError={(params: NewSSHRepoParams) => ({
url: !params.url && 'Repo URL is required',
sshPrivateKey: !params.sshPrivateKey && 'SSH private key data is required for connecting SSH repositories',
})}>
{(formApi) => (
<form onSubmit={formApi.submitForm} role='form' className='repos-list width-control'>