Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 18:25:56 +01:00
Code Issues Projects Releases Wiki Activity

Update the name checking for the robot account (#19645)

Browse Source 
1. Fixes #19612

Signed-off-by: AllForNothing <shijun.sun@broadcom.com>
This commit is contained in:
Shijun Sun 2023-12-05 11:01:40 +08:00 committed by GitHub
parent 3c56f2d1a0
commit 7fee99b5fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.html
View File

@ -269,7 +269,7 @@
<ng-template clrPageTitle>{{
'ROBOT_ACCOUNT.SELECT_PROJECT_PERMISSIONS' | translate
}}</ng-template>
<inline-alert class="modal-title"></inline-alert>
<inline-alert></inline-alert>
<form class="clr-form clr-form-horizontal pb-0 pt-0">
<section class="form-block">
<div class="clr-form-control mt-1">

8
src/portal/src/app/base/left-side-nav/system-robot-accounts/new-robot/new-robot.component.ts
View File

@ -16,6 +16,7 @@ import {
distinctUntilChanged,
filter,
finalize,
map,
switchMap,
} from 'rxjs/operators';
import {
@ -119,7 +120,6 @@ export class NewRobotComponent implements OnInit, OnDestroy {
if (!this._nameSubscription) {
this._nameSubscription = this._nameSubject
.pipe(
debounceTime(500),
distinctUntilChanged(),
filter(name => {
if (
@ -131,6 +131,11 @@ export class NewRobotComponent implements OnInit, OnDestroy {
}
return name?.length > 0;
}),
map(name => {
this.checkNameOnGoing = !!name;
return name;
}),
debounceTime(500),
switchMap(name => {
this.isNameExisting = false;
this.checkNameOnGoing = true;
@ -490,6 +495,7 @@ export class NewRobotComponent implements OnInit, OnDestroy {
}
clrWizardPageOnLoad() {
this.inlineAlertComponent.close();
this.showPage3 = true;
}

3
src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.html
View File

@ -235,13 +235,14 @@
</clr-wizard-page>
<clr-wizard-page
(clrWizardPageOnLoad)="clrWizardPageOnLoad()"
(clrWizardPageOnCommit)="save()"
[clrWizardPagePreventDefaultNext]="true"
[clrWizardPageNextDisabled]="disabled()">
<ng-template clrPageTitle>{{
'ROBOT_ACCOUNT.SELECT_PERMISSIONS' | translate
}}</ng-template>
<inline-alert class="modal-title"></inline-alert>
<inline-alert></inline-alert>
<form class="clr-form clr-form-horizontal mt-1">
<section class="form-block">
<robot-permissions-panel

11
src/portal/src/app/base/project/robot-account/add-robot/add-robot.component.ts
View File

@ -12,6 +12,7 @@ import {
distinctUntilChanged,
filter,
finalize,
map,
switchMap,
} from 'rxjs/operators';
import { MessageHandlerService } from '../../../../shared/services/message-handler.service';
@ -87,7 +88,6 @@ export class AddRobotComponent implements OnInit, OnDestroy {
if (!this._nameSubscription) {
this._nameSubscription = this._nameSubject
.pipe(
debounceTime(500),
distinctUntilChanged(),
filter(name => {
if (
@ -99,6 +99,11 @@ export class AddRobotComponent implements OnInit, OnDestroy {
}
return name?.length > 0;
}),
map(name => {
this.checkNameOnGoing = !!name;
return name;
}),
debounceTime(500),
switchMap(name => {
this.isNameExisting = false;
this.checkNameOnGoing = true;
@ -295,5 +300,9 @@ export class AddRobotComponent implements OnInit, OnDestroy {
return new Date() >= this.calculateExpiresAt();
}
clrWizardPageOnLoad() {
this.inlineAlertComponent.close();
}
protected readonly PermissionSelectPanelModes = PermissionSelectPanelModes;
}