Skip to content

Commit

Permalink
feat: add labels for projects (#4446)
Browse files Browse the repository at this point in the history
* add labels for projects

* feat: add labels for projects

* feat: add labels for projects
  • Loading branch information
mayzhang2000 committed Sep 30, 2020
1 parent bccaefd commit 712df19
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as React from 'react';
import {FormApi, Text} from 'react-form';
import {RouteComponentProps} from 'react-router';

import {CheckboxField, DataLoader, EditablePanel, ErrorNotification, Page, Query} from '../../../shared/components';
import {CheckboxField, DataLoader, EditablePanel, ErrorNotification, MapInputField, Page, Query} from '../../../shared/components';
import {AppContext, Consumer} from '../../../shared/context';
import {Groups, Project, ResourceKinds} from '../../../shared/models';
import {CreateJWTTokenParams, DeleteJWTTokenParams, ProjectRoleParams, services} from '../../../shared/services';
Expand Down Expand Up @@ -442,6 +442,7 @@ export class ProjectDetails extends React.Component<RouteComponentProps<{name: s
private async saveProject(updatedProj: Project) {
try {
const proj = await services.projects.get(updatedProj.metadata.name);
proj.metadata.labels = updatedProj.metadata.labels;
proj.spec = updatedProj.spec;
this.loader.setData(await services.projects.updateProj(proj));
} catch (e) {
Expand Down Expand Up @@ -472,6 +473,13 @@ export class ProjectDetails extends React.Component<RouteComponentProps<{name: s
title: 'DESCRIPTION',
view: proj.spec.description,
edit: (formApi: FormApi) => <FormField formApi={formApi} field='spec.description' component={Text} />
},
{
title: 'LABELS',
view: Object.keys(proj.metadata.labels || {})
.map(label => `${label}=${proj.metadata.labels[label]}`)
.join(' '),
edit: (formApi: FormApi) => <FormField formApi={formApi} field='metadata.labels' component={MapInputField} />
}
]}
/>
Expand Down
3 changes: 2 additions & 1 deletion ui/src/app/shared/services/projects-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as models from '../models';
export interface ProjectParams {
name: string;
description: string;
labels: {[name: string]: string};
sourceRepos: string[];
destinations: models.ApplicationDestination[];
roles: models.ProjectRole[];
Expand Down Expand Up @@ -72,7 +73,7 @@ function paramsToProjRole(params: ProjectRoleParams): models.ProjectRole {

function paramsToProj(params: ProjectParams) {
return {
metadata: {name: params.name},
metadata: {name: params.name, labels: params.labels},
spec: {
description: params.description,
sourceRepos: params.sourceRepos,
Expand Down

0 comments on commit 712df19

Please sign in to comment.