diff --git a/src/portal/lib/src/service/interface.ts b/src/portal/lib/src/service/interface.ts index dfbd94a03..448e8e0e5 100644 --- a/src/portal/lib/src/service/interface.ts +++ b/src/portal/lib/src/service/interface.ts @@ -434,3 +434,8 @@ export interface HttpOptionTextInterface { withCredentials?: boolean; } +export interface ProjectRootInterface { + NAME: string; + VALUE: number; + LABEL: string; +} diff --git a/src/portal/lib/src/shared/shared.const.ts b/src/portal/lib/src/shared/shared.const.ts index 83d599368..506b40257 100644 --- a/src/portal/lib/src/shared/shared.const.ts +++ b/src/portal/lib/src/shared/shared.const.ts @@ -84,3 +84,35 @@ export const LabelColor = [ { 'color': '#F52F52', 'textColor': 'black' }, { 'color': '#FF5501', 'textColor': 'black' }, { 'color': '#F57600', 'textColor': 'black' }, { 'color': '#FFDC0B', 'textColor': 'black' }, ]; + +export const CONFIG_AUTH_MODE = { + HTTP_AUTH: "http_auth", + LDAP_AUTH: "ldap_auth" +}; +export const PROJECT_ROOTS = [ + { + NAME: "admin", + VALUE: 1, + LABEL: "GROUP.PROJECT_ADMIN" + }, + { + NAME: "master", + VALUE: 4, + LABEL: "GROUP.PROJECT_MASTER" + }, + { + NAME: "developer", + VALUE: 2, + LABEL: "GROUP.DEVELOPER" + }, + { + NAME: "guest", + VALUE: 3, + LABEL: "GROUP.GUEST" + } +]; + +export enum GroupType { + LDAP_TYPE = 1, + HTTP_TYPE = 2 +} diff --git a/src/portal/src/app/app-config.service.ts b/src/portal/src/app/app-config.service.ts index e75944290..7ee3639aa 100644 --- a/src/portal/src/app/app-config.service.ts +++ b/src/portal/src/app/app-config.service.ts @@ -19,7 +19,7 @@ import { CookieService } from 'ngx-cookie'; import { AppConfig } from './app-config'; import { CookieKeyOfAdmiral, HarborQueryParamKey } from './shared/shared.const'; import { maintainUrlQueryParmas } from './shared/shared.utils'; -import { HTTP_GET_OPTIONS} from '@harbor/ui'; +import { HTTP_GET_OPTIONS , CONFIG_AUTH_MODE} from '@harbor/ui'; import { map, catchError } from "rxjs/operators"; import { Observable, throwError as observableThrowError } from "rxjs"; export const systemInfoEndpoint = "/api/systeminfo"; @@ -67,7 +67,10 @@ export class AppConfigService { } public isLdapMode(): boolean { - return this.configurations && this.configurations.auth_mode === 'ldap_auth'; + return this.configurations && this.configurations.auth_mode === CONFIG_AUTH_MODE.LDAP_AUTH; + } + public isHttpAuthMode(): boolean { + return this.configurations && this.configurations.auth_mode === CONFIG_AUTH_MODE.HTTP_AUTH; } // Return the reconstructed admiral url diff --git a/src/portal/src/app/base/harbor-shell/harbor-shell.component.html b/src/portal/src/app/base/harbor-shell/harbor-shell.component.html index eb3810d11..637fab370 100644 --- a/src/portal/src/app/base/harbor-shell/harbor-shell.component.html +++ b/src/portal/src/app/base/harbor-shell/harbor-shell.component.html @@ -28,7 +28,7 @@ {{'SIDE_NAV.SYSTEM_MGMT.USER' | translate}} - + {{'SIDE_NAV.SYSTEM_MGMT.GROUP' | translate}} diff --git a/src/portal/src/app/base/harbor-shell/harbor-shell.component.ts b/src/portal/src/app/base/harbor-shell/harbor-shell.component.ts index 6a818b51c..f65a0f291 100644 --- a/src/portal/src/app/base/harbor-shell/harbor-shell.component.ts +++ b/src/portal/src/app/base/harbor-shell/harbor-shell.component.ts @@ -54,6 +54,8 @@ export class HarborShellComponent implements OnInit, OnDestroy { searchSub: Subscription; searchCloseSub: Subscription; + isLdapMode: boolean; + isHttpAuthMode: boolean; constructor( private route: ActivatedRoute, @@ -63,6 +65,11 @@ export class HarborShellComponent implements OnInit, OnDestroy { private appConfigService: AppConfigService) { } ngOnInit() { + if (this.appConfigService.isLdapMode()) { + this.isLdapMode = true; + } else if (this.appConfigService.isHttpAuthMode()) { + this.isHttpAuthMode = true; + } this.searchSub = this.searchTrigger.searchTriggerChan$.subscribe(searchEvt => { if (searchEvt && searchEvt.trim() !== "") { this.isSearchResultsOpened = true; @@ -70,7 +77,7 @@ export class HarborShellComponent implements OnInit, OnDestroy { }); this.searchCloseSub = this.searchTrigger.searchCloseChan$.subscribe(close => { - this.isSearchResultsOpened = false; + this.isSearchResultsOpened = false; }); } @@ -97,11 +104,6 @@ export class HarborShellComponent implements OnInit, OnDestroy { return account != null && account.has_admin_role; } - public get isLdapMode(): boolean { - let appConfig = this.appConfigService.getConfig(); - return appConfig.auth_mode === 'ldap_auth'; - } - public get isUserExisting(): boolean { let account = this.session.getCurrentUser(); return account != null; diff --git a/src/portal/src/app/group/add-group-modal/add-group-modal.component.html b/src/portal/src/app/group/add-group-modal/add-group-modal.component.html index 3f3c778c8..b3dca6233 100644 --- a/src/portal/src/app/group/add-group-modal/add-group-modal.component.html +++ b/src/portal/src/app/group/add-group-modal/add-group-modal.component.html @@ -1,11 +1,12 @@ -

{{'GROUP.IMPORT_LDAP_GROUP' | translate}}

+

{{'GROUP.IMPORT_LDAP_GROUP' | translate}}

+

{{'GROUP.IMPORT_HTTP_GROUP' | translate}}

{{'GROUP.EDIT' | translate}}

-
+
-
+
diff --git a/src/portal/src/app/group/add-group-modal/add-group-modal.component.ts b/src/portal/src/app/group/add-group-modal/add-group-modal.component.ts index a82398bb1..1095aa692 100644 --- a/src/portal/src/app/group/add-group-modal/add-group-modal.component.ts +++ b/src/portal/src/app/group/add-group-modal/add-group-modal.component.ts @@ -1,13 +1,15 @@ -import {finalize} from 'rxjs/operators'; +import { finalize } from 'rxjs/operators'; import { Subscription } from "rxjs"; import { Component, OnInit, EventEmitter, Output, ChangeDetectorRef, OnDestroy, ViewChild } from "@angular/core"; import { NgForm } from "@angular/forms"; +import { GroupType } from "@harbor/ui"; import { GroupService } from "../group.service"; import { MessageHandlerService } from "./../../shared/message-handler/message-handler.service"; import { SessionService } from "./../../shared/session.service"; import { UserGroup } from "./../group"; +import { AppConfigService } from "../../app-config.service"; @Component({ selector: "hbr-add-group-modal", @@ -19,7 +21,7 @@ export class AddGroupModalComponent implements OnInit, OnDestroy { mode = "create"; dnTooltip = 'TOOLTIP.ITEM_REQUIRED'; - group: UserGroup = new UserGroup(); + group: UserGroup; formChangeSubscription: Subscription; @@ -30,25 +32,36 @@ export class AddGroupModalComponent implements OnInit, OnDestroy { @Output() dataChange = new EventEmitter(); + isLdapMode: boolean; + isHttpAuthMode: boolean; constructor( private session: SessionService, private msgHandler: MessageHandlerService, + private appConfigService: AppConfigService, private groupService: GroupService, private cdr: ChangeDetectorRef - ) {} + ) { } - ngOnInit() { } + ngOnInit() { + if (this.appConfigService.isLdapMode()) { + this.isLdapMode = true; + } + if (this.appConfigService.isHttpAuthMode()) { + this.isHttpAuthMode = true; + } + this.group = new UserGroup(this.isLdapMode ? GroupType.LDAP_TYPE : GroupType.HTTP_TYPE); + } ngOnDestroy() { } public get isDNInvalid(): boolean { let dnControl = this.groupForm.controls['ldap_group_dn']; - return dnControl && dnControl.invalid && (dnControl.dirty || dnControl.touched); + return dnControl && dnControl.invalid && (dnControl.dirty || dnControl.touched); } public get isNameInvalid(): boolean { let dnControl = this.groupForm.controls['group_name']; - return dnControl && dnControl.invalid && (dnControl.dirty || dnControl.touched); + return dnControl && dnControl.invalid && (dnControl.dirty || dnControl.touched); } public get isFormValid(): boolean { @@ -83,7 +96,7 @@ export class AddGroupModalComponent implements OnInit, OnDestroy { let groupCopy = Object.assign({}, this.group); this.groupService .createGroup(groupCopy).pipe( - finalize(() => this.close())) + finalize(() => this.close())) .subscribe( res => { this.msgHandler.showSuccess("GROUP.ADD_GROUP_SUCCESS"); @@ -97,7 +110,7 @@ export class AddGroupModalComponent implements OnInit, OnDestroy { let groupCopy = Object.assign({}, this.group); this.groupService .editGroup(groupCopy).pipe( - finalize(() => this.close())) + finalize(() => this.close())) .subscribe( res => { this.msgHandler.showSuccess("GROUP.EDIT_GROUP_SUCCESS"); @@ -108,7 +121,7 @@ export class AddGroupModalComponent implements OnInit, OnDestroy { } resetGroup() { - this.group = new UserGroup(); + this.group = new UserGroup(this.isLdapMode ? GroupType.LDAP_TYPE : GroupType.HTTP_TYPE); this.groupForm.reset(); } } diff --git a/src/portal/src/app/group/group.component.html b/src/portal/src/app/group/group.component.html index 3404557a8..1371e3c18 100644 --- a/src/portal/src/app/group/group.component.html +++ b/src/portal/src/app/group/group.component.html @@ -15,18 +15,18 @@  {{'GROUP.ADD' | translate}} - {{'GROUP.NAME' | translate}} {{'GROUP.TYPE' | translate}} - {{'GROUP.DN' | translate}} + {{'GROUP.DN' | translate}} {{group.group_name}} {{groupToSring(group.group_type) | translate}} - {{group.ldap_group_dn}} + {{group.ldap_group_dn}} diff --git a/src/portal/src/app/group/group.component.ts b/src/portal/src/app/group/group.component.ts index fad3e0efd..91d2ddc33 100644 --- a/src/portal/src/app/group/group.component.ts +++ b/src/portal/src/app/group/group.component.ts @@ -4,7 +4,7 @@ import { flatMap, catchError } from "rxjs/operators"; import { SessionService } from "./../shared/session.service"; import { TranslateService } from "@ngx-translate/core"; import { Component, OnInit, ViewChild, OnDestroy } from "@angular/core"; -import { operateChanges, OperateInfo, OperationService, OperationState, errorHandler as errorHandFn } from "@harbor/ui"; +import { operateChanges, OperateInfo, OperationService, OperationState, errorHandler as errorHandFn, GroupType } from "@harbor/ui"; import { ConfirmationTargets, @@ -19,6 +19,8 @@ import { UserGroup } from "./group"; import { GroupService } from "./group.service"; import { MessageHandlerService } from "../shared/message-handler/message-handler.service"; import { throwError as observableThrowError } from "rxjs"; +import { AppConfigService } from '../app-config.service'; + @Component({ selector: "app-group", templateUrl: "./group.component.html", @@ -35,6 +37,7 @@ export class GroupComponent implements OnInit, OnDestroy { delSub: Subscription; batchOps = 'idle'; batchInfos = new Map(); + isLdapMode: boolean; @ViewChild(AddGroupModalComponent) newGroupModal: AddGroupModalComponent; @@ -46,10 +49,14 @@ export class GroupComponent implements OnInit, OnDestroy { private msgHandler: MessageHandlerService, private session: SessionService, private translateService: TranslateService, + private appConfigService: AppConfigService ) { } ngOnInit() { this.loadData(); + if (this.appConfigService.isLdapMode()) { + this.isLdapMode = true; + } this.delSub = this.operateDialogService.confirmationConfirm$.subscribe( message => { if ( @@ -150,7 +157,13 @@ export class GroupComponent implements OnInit, OnDestroy { } groupToSring(type: number) { - if (type === 1) { return 'GROUP.LDAP_TYPE'; } else { return 'UNKNOWN'; } + if (type === GroupType.LDAP_TYPE) { + return 'GROUP.LDAP_TYPE'; + } else if (type === GroupType.HTTP_TYPE) { + return 'GROUP.HTTP_TYPE'; + } else { + return 'UNKNOWN'; + } } doFilter(groupName: string): void { @@ -162,6 +175,12 @@ export class GroupComponent implements OnInit, OnDestroy { } get canEditGroup(): boolean { + return ( + this.selectedGroups.length === 1 && + this.session.currentUser.has_admin_role && this.isLdapMode + ); + } + get canDeleteGroup(): boolean { return ( this.selectedGroups.length === 1 && this.session.currentUser.has_admin_role diff --git a/src/portal/src/app/group/group.ts b/src/portal/src/app/group/group.ts index 855681162..2c3e417ba 100644 --- a/src/portal/src/app/group/group.ts +++ b/src/portal/src/app/group/group.ts @@ -4,9 +4,9 @@ export class UserGroup { group_type: number; ldap_group_dn?: string; - constructor() { + constructor(groupType) { { - this.group_type = 1; + this.group_type = groupType; } } } diff --git a/src/portal/src/app/project/member/add-group/add-group.component.ts b/src/portal/src/app/project/member/add-group/add-group.component.ts index 7caa85764..6ba6747c2 100644 --- a/src/portal/src/app/project/member/add-group/add-group.component.ts +++ b/src/portal/src/app/project/member/add-group/add-group.component.ts @@ -30,7 +30,7 @@ export class AddGroupComponent implements OnInit { currentTerm = ''; selectedRole = 1; - group = new UserGroup(); + group = new UserGroup(1); selectedGroups: UserGroup[] = []; groups: UserGroup[] = []; totalCount = 0; @@ -89,7 +89,7 @@ export class AddGroupComponent implements OnInit { resetModaldata() { this.createGroupMode = false; - this.group = new UserGroup(); + this.group = new UserGroup(1); this.selectedRole = 1; this.selectedGroups = []; this.groups = []; diff --git a/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.html b/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.html new file mode 100644 index 000000000..8d5584795 --- /dev/null +++ b/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.html @@ -0,0 +1,36 @@ + +

{{'GROUP.NEW_MEMBER' | translate}}

+ +
+ + + +
+
+ + + +
+
+ +
+ + +
+
+
+ +
+
+ + +
+ \ No newline at end of file diff --git a/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.scss b/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.scss new file mode 100644 index 000000000..948f4c35b --- /dev/null +++ b/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.scss @@ -0,0 +1,8 @@ +.form-group-label-override { + font-size: 14px; + font-weight: 400; +} +.padding-0 { + padding: 0; +} + diff --git a/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.spec.ts b/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.spec.ts new file mode 100644 index 000000000..041e19642 --- /dev/null +++ b/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AddHttpAuthGroupComponent } from './add-http-auth-group.component'; + +describe('AddHttpAuthGroupComponent', () => { + let component: AddHttpAuthGroupComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AddHttpAuthGroupComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AddHttpAuthGroupComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.ts b/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.ts new file mode 100644 index 000000000..65f4111fe --- /dev/null +++ b/src/portal/src/app/project/member/add-http-auth-group/add-http-auth-group.component.ts @@ -0,0 +1,120 @@ +import { finalize } from 'rxjs/operators'; +// Copyright (c) 2017 VMware, Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +import { + Component, + Input, + EventEmitter, + Output, + ViewChild, + OnInit +} from '@angular/core'; +import { NgForm } from '@angular/forms'; + + + +import { TranslateService } from '@ngx-translate/core'; + +import { InlineAlertComponent } from '../../../shared/inline-alert/inline-alert.component'; +import { UserService } from '../../../user/user.service'; + + +import { errorHandler as errorHandFn, PROJECT_ROOTS, ProjectRootInterface } from "@harbor/ui"; + +import { MemberService } from '../member.service'; +import { UserGroup } from "./../../../group/group"; + + +@Component({ + selector: 'add-http-auth-group', + templateUrl: './add-http-auth-group.component.html', + styleUrls: ['./add-http-auth-group.component.scss'], + providers: [UserService] +}) + +export class AddHttpAuthGroupComponent implements OnInit { + projectRoots: ProjectRootInterface[]; + member_group: UserGroup = { group_name: '', group_type: 2 }; + role_id: number; + addHttpAuthOpened: boolean; + + memberForm: NgForm; + + staticBackdrop: boolean = true; + closable: boolean = false; + + @ViewChild('memberForm') + currentForm: NgForm; + + @ViewChild(InlineAlertComponent) + inlineAlert: InlineAlertComponent; + + @Input() projectId: number; + @Output() added = new EventEmitter(); + + checkOnGoing: boolean = false; + + constructor(private memberService: MemberService, + private translateService: TranslateService) { } + + ngOnInit(): void { + this.projectRoots = PROJECT_ROOTS; + } + + createGroupAsMember() { + this.checkOnGoing = true; + this.memberService.addGroupMember(this.projectId, this.member_group, this.role_id) + .pipe( + finalize(() => { + this.checkOnGoing = false; + } + )) + .subscribe( + res => { + this.role_id = null; + this.addHttpAuthOpened = false; + this.added.emit(true); + }, + err => { + let errorMessageKey: string = errorHandFn(err); + this.translateService + .get(errorMessageKey) + .subscribe(errorMessage => this.inlineAlert.showInlineError(errorMessage)); + this.added.emit(false); + } + ); + } + onSubmit(): void { + this.createGroupAsMember(); + } + + onCancel() { + this.role_id = null; + this.addHttpAuthOpened = false; + } + + + openAddMemberModal(): void { + this.currentForm.reset(); + this.addHttpAuthOpened = true; + this.role_id = 1; + } + + + public get isValid(): boolean { + return this.currentForm && + this.currentForm.valid && + !this.checkOnGoing; + } +} diff --git a/src/portal/src/app/project/member/member.component.html b/src/portal/src/app/project/member/member.component.html index 1b6c15255..d979e0494 100644 --- a/src/portal/src/app/project/member/member.component.html +++ b/src/portal/src/app/project/member/member.component.html @@ -16,7 +16,7 @@ - @@ -53,4 +53,5 @@
+
\ No newline at end of file diff --git a/src/portal/src/app/project/member/member.component.ts b/src/portal/src/app/project/member/member.component.ts index 0526b9049..959e24441 100644 --- a/src/portal/src/app/project/member/member.component.ts +++ b/src/portal/src/app/project/member/member.component.ts @@ -17,8 +17,10 @@ import { Component, OnInit, ViewChild, OnDestroy, ChangeDetectionStrategy, Chang import { ActivatedRoute, Router } from "@angular/router"; import { Subscription, forkJoin, Observable } from "rxjs"; import { TranslateService } from "@ngx-translate/core"; -import { operateChanges, OperateInfo, OperationService, OperationState, UserPermissionService, USERSTATICPERMISSION, ErrorHandler - , errorHandler as errorHandFn } from "@harbor/ui"; +import { + operateChanges, OperateInfo, OperationService, OperationState, UserPermissionService, USERSTATICPERMISSION, ErrorHandler + , errorHandler as errorHandFn +} from "@harbor/ui"; import { MessageHandlerService } from "../../shared/message-handler/message-handler.service"; import { ConfirmationTargets, ConfirmationState, ConfirmationButtons } from "../../shared/shared.const"; @@ -30,6 +32,7 @@ import { Project } from "../../project/project"; import { Member } from "./member"; import { SessionUser } from "../../shared/session-user"; import { AddGroupComponent } from './add-group/add-group.component'; +import { AddHttpAuthGroupComponent } from './add-http-auth-group/add-http-auth-group.component'; import { MemberService } from "./member.service"; import { AddMemberComponent } from "./add-member/add-member.component"; import { AppConfigService } from "../../app-config.service"; @@ -56,16 +59,18 @@ export class MemberComponent implements OnInit, OnDestroy { isDelete = false; isChangeRole = false; loading = false; - isLdapMode: boolean = false; isChangingRole = false; batchChangeRoleInfos = {}; - + isLdapMode: boolean; + isHttpAuthMode: boolean; @ViewChild(AddMemberComponent) addMemberComponent: AddMemberComponent; @ViewChild(AddGroupComponent) addGroupComponent: AddGroupComponent; + @ViewChild(AddHttpAuthGroupComponent) + addHttpAuthGroupComponent: AddHttpAuthGroupComponent; hasCreateMemberPermission: boolean; hasUpdateMemberPermission: boolean; hasDeleteMemberPermission: boolean; @@ -108,13 +113,15 @@ export class MemberComponent implements OnInit, OnDestroy { // Get current user from registered resolver. this.currentUser = this.session.getCurrentUser(); this.retrieve(this.projectId, ""); + // get member permission rule + this.getMemberPermissionRule(this.projectId); if (this.appConfigService.isLdapMode()) { this.isLdapMode = true; } - // get member permission rule - this.getMemberPermissionRule(this.projectId); + if (this.appConfigService.isHttpAuthMode()) { + this.isHttpAuthMode = true; + } } - doSearch(searchMember: string) { this.searchMember = searchMember; this.retrieve(this.projectId, this.searchMember); @@ -172,7 +179,11 @@ export class MemberComponent implements OnInit, OnDestroy { // Add group openAddGroupModal() { - this.addGroupComponent.open(); + if (this.isLdapMode) { + this.addGroupComponent.open(); + } else { + this.addHttpAuthGroupComponent.openAddMemberModal(); + } } addedGroup(result: boolean) { this.searchMember = ""; @@ -188,10 +199,10 @@ export class MemberComponent implements OnInit, OnDestroy { return this.memberService .changeMemberRole(projectId, member.id, roleId) .pipe(map(() => this.batchChangeRoleInfos[member.id] = 'done') - , catchError(error => { - this.messageHandlerService.handleError(error + ": " + member.entity_name); - return observableThrowError(error); - })); + , catchError(error => { + this.messageHandlerService.handleError(error + ": " + member.entity_name); + return observableThrowError(error); + })); }; // Preparation for members role change diff --git a/src/portal/src/app/project/project.module.ts b/src/portal/src/app/project/project.module.ts index fb180988f..893de018b 100644 --- a/src/portal/src/app/project/project.module.ts +++ b/src/portal/src/app/project/project.module.ts @@ -38,6 +38,7 @@ import { ProjectLabelComponent } from "../project/project-label/project-label.co import { HelmChartModule } from './helm-chart/helm-chart.module'; import { RobotAccountComponent } from './robot-account/robot-account.component'; import { AddRobotComponent } from './robot-account/add-robot/add-robot.component'; +import { AddHttpAuthGroupComponent } from './member/add-http-auth-group/add-http-auth-group.component'; @NgModule({ imports: [ @@ -59,7 +60,8 @@ import { AddRobotComponent } from './robot-account/add-robot/add-robot.component ProjectLabelComponent, AddGroupComponent, RobotAccountComponent, - AddRobotComponent + AddRobotComponent, + AddHttpAuthGroupComponent ], exports: [ProjectComponent, ListProjectComponent], providers: [ProjectRoutingResolver, MemberService, RobotService] diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index b881f3037..8f535fbc1 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -328,6 +328,7 @@ "GROUP": "Group", "GROUPS": "Groups", "IMPORT_LDAP_GROUP": "Import LDAP Group", + "IMPORT_HTTP_GROUP": "New HTTP Group", "ADD": "New Group", "EDIT": "Edit", "DELETE": "Delete", @@ -340,8 +341,17 @@ "ADD_GROUP_SUCCESS": "Add group success", "EDIT_GROUP_SUCCESS": "Edit group success", "LDAP_TYPE": "LDAP", + "HTTP_TYPE": "HTTP", "OF": "of", - "ITEMS": "items" + "ITEMS": "items", + "NEW_MEMBER": "New Group Member", + "NEW_USER_INFO": "Add a group to be a member of this project with specified role", + "ROLE": "Role", + "SYS_ADMIN": "System Admin", + "PROJECT_ADMIN": "Project Admin", + "PROJECT_MASTER": "Master", + "DEVELOPER": "Developer", + "GUEST": "Guest" }, "AUDIT_LOG": { "USERNAME": "Username", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index dec43b75d..4c99975bc 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -329,6 +329,7 @@ "GROUP": "Group", "GROUPS": "Groups", "IMPORT_LDAP_GROUP": "Import LDAP Group", + "IMPORT_HTTP_GROUP": "New HTTP Group", "ADD": "Add", "EDIT": "Edit", "DELETE": "Delete", @@ -340,8 +341,17 @@ "ADD_GROUP_SUCCESS": "Add group success", "EDIT_GROUP_SUCCESS": "Edit group success", "LDAP_TYPE": "LDAP", + "HTTP_TYPE": "HTTP", "OF": "of", - "ITEMS": "items" + "ITEMS": "items", + "NEW_MEMBER": "New Group Member", + "NEW_USER_INFO": "Add a group to be a member of this project with specified role", + "ROLE": "Role", + "SYS_ADMIN": "System Admin", + "PROJECT_ADMIN": "Project Admin", + "PROJECT_MASTER": "Master", + "DEVELOPER": "Developer", + "GUEST": "Guest" }, "AUDIT_LOG": { "USERNAME": "Nombre de usuario", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index ff89db84e..2a21a04c9 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -321,6 +321,7 @@ "Group": "Group", "GROUPS": "Groups", "IMPORT_LDAP_GROUP": "Import LDAP Group", + "IMPORT_HTTP_GROUP": "New HTTP Group", "ADD": "Add", "EDIT": "Edit", "DELETE": "Delete", @@ -333,8 +334,17 @@ "ADD_GROUP_SUCCESS": "Add group success", "EDIT_GROUP_SUCCESS": "Edit group success", "LDAP_TYPE": "LDAP", + "HTTP_TYPE": "HTTP", "OF": "of", - "ITEMS": "items" + "ITEMS": "items", + "NEW_MEMBER": "New Group Member", + "NEW_USER_INFO": "Add a group to be a member of this project with specified role", + "ROLE": "Role", + "SYS_ADMIN": "System Admin", + "PROJECT_ADMIN": "Project Admin", + "PROJECT_MASTER": "Master", + "DEVELOPER": "Developer", + "GUEST": "Guest" }, "AUDIT_LOG": { "USERNAME": "Nom d'utilisateur", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index f4629c83f..ff4384eec 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -326,6 +326,7 @@ "GROUP": "Grupo", "GROUPS": "Grupos", "IMPORT_LDAP_GROUP": "Importar grupo do LDAP", + "IMPORT_HTTP_GROUP": "New HTTP Group", "ADD": "Novo Grupo", "EDIT": "Editar", "DELETE": "Remover", @@ -338,8 +339,17 @@ "ADD_GROUP_SUCCESS": "Grupo adicionado com sucesso", "EDIT_GROUP_SUCCESS": "Grupo editado com sucesso", "LDAP_TYPE": "LDAP", + "HTTP_TYPE": "HTTP", "OF": "de", - "ITEMS": "itens" + "ITEMS": "itens", + "NEW_MEMBER": "New Group Member", + "NEW_USER_INFO": "Add a group to be a member of this project with specified role", + "ROLE": "Role", + "SYS_ADMIN": "System Admin", + "PROJECT_ADMIN": "Project Admin", + "PROJECT_MASTER": "Master", + "DEVELOPER": "Developer", + "GUEST": "Guest" }, "AUDIT_LOG": { "USERNAME": "Nome do usuário", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 617dc6b24..4d88dc63d 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -327,6 +327,7 @@ "GROUP": "组", "GROUPS": "组", "IMPORT_LDAP_GROUP": "导入LDAP组", + "IMPORT_HTTP_GROUP": "新建HTTP组", "ADD": "新增", "EDIT": "编辑", "DELETE": "删除", @@ -339,8 +340,17 @@ "ADD_GROUP_SUCCESS": "添加组成功", "EDIT_GROUP_SUCCESS": "修改组成功", "LDAP_TYPE": "LDAP", + "HTTP_TYPE": "HTTP", "OF": "共计", - "ITEMS": "条记录" + "ITEMS": "条记录", + "NEW_MEMBER": "新建组成员", + "NEW_USER_INFO": "添加一个组作为具有指定角色的此项目的成员", + "ROLE": "权限", + "SYS_ADMIN": "系统管理员", + "PROJECT_ADMIN": "项目管理员", + "PROJECT_MASTER": "维护人员", + "DEVELOPER": "开发者", + "GUEST": "访客" }, "AUDIT_LOG": { "USERNAME": "用户名",