Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5057 from pengpengshui/projectcheck 

Fix create project name doesn't have tooltip #5000
This commit is contained in:
Qian Deng 2018-05-30 23:25:27 -04:00 committed by GitHub
parent aec9fabefb 56e438b9c3
commit 82b57971c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui_ng/src/app/project/create-project/create-project.component.html
View File

@ -1,7 +1,7 @@
<clr-modal [(clrModalOpen)]="createProjectOpened" [clrModalStaticBackdrop]="staticBackdrop" [clrModalClosable]="closable">
<h3 class="modal-title">{{'PROJECT.NEW_PROJECT' | translate}}</h3>
<inline-alert class="modal-title"></inline-alert>
<div class="modal-body" style="height: 16.8em; overflow-y: hidden;">
<div class="modal-body" style="height: 12.8em; overflow-y: hidden;">
<form #projectForm="ngForm">
<section class="form-block">
<div class="form-group" style="padding-left: 135px;">

26
src/ui_ng/src/app/project/create-project/create-project.component.ts
View File

@ -16,7 +16,6 @@ import {
EventEmitter,
Output,
ViewChild,
AfterViewChecked,
OnInit,
OnDestroy
} from "@angular/core";
@ -41,7 +40,7 @@ import { ProjectService } from "../project.service";
templateUrl: "create-project.component.html",
styleUrls: ["create-project.scss"]
})
export class CreateProjectComponent implements AfterViewChecked, OnInit, OnDestroy {
export class CreateProjectComponent implements OnInit, OnDestroy {
projectForm: NgForm;
@ -74,10 +73,10 @@ export class CreateProjectComponent implements AfterViewChecked, OnInit, OnDestr
ngOnInit(): void {
this.proNameChecker
.debounceTime(500)
.debounceTime(300)
.subscribe((name: string) => {
let cont = this.currentForm.controls["create_project_name"];
if (cont && this.hasChanged) {
if (cont) {
this.isNameValid = cont.valid;
if (this.isNameValid) {
// Check exiting from backend
@ -141,27 +140,8 @@ export class CreateProjectComponent implements AfterViewChecked, OnInit, OnDestr
onCancel() {
this.createProjectOpened = false;
this.projectForm.reset();
}
ngAfterViewChecked(): void {
this.projectForm = this.currentForm;
if (this.projectForm) {
this.projectForm.valueChanges.subscribe(data => {
for (let i = 0; i < data.length; i++) {
let origin = this.initVal[i];
let current = data[i];
if (current && current !== origin) {
this.hasChanged = true;
break;
} else {
this.hasChanged = false;
this.inlineAlert.close();
}
}
});
}
}
newProject() {
this.project = new Project();