From c88b705c8ba63859ad8ebed9060bf747e5c35104 Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Wed, 29 Mar 2017 20:32:31 +0800
Subject: [PATCH 01/12] Fix matched lang issue and some i18n messages.

---
 src/ui_ng/src/app/base/navigator/navigator.component.html | 4 ++--
 src/ui_ng/src/app/replication/replication.component.html  | 2 +-
 src/ui_ng/src/i18n/lang/en-us-lang.json                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ui_ng/src/app/base/navigator/navigator.component.html b/src/ui_ng/src/app/base/navigator/navigator.component.html
index f64098287..1a4b62634 100644
--- a/src/ui_ng/src/app/base/navigator/navigator.component.html
+++ b/src/ui_ng/src/app/base/navigator/navigator.component.html
@@ -18,8 +18,8 @@
                 <clr-icon shape="caret down"></clr-icon>
             </button>
             <div class="dropdown-menu">
-                <a href="javascript:void(0)" clrDropdownItem (click)='switchLanguage("en-us")' [class.lang-selected]='matchLang("en")'>English</a>
-                <a href="javascript:void(0)" clrDropdownItem (click)='switchLanguage("zh-cn")' [class.lang-selected]='matchLang("zh")'>中文简体</a>
+                <a href="javascript:void(0)" clrDropdownItem (click)='switchLanguage("en-us")' [class.lang-selected]='matchLang("en-us")'>English</a>
+                <a href="javascript:void(0)" clrDropdownItem (click)='switchLanguage("zh-cn")' [class.lang-selected]='matchLang("zh-cn")'>中文简体</a>
             </div>
         </clr-dropdown>
         <clr-dropdown [clrMenuPosition]="'bottom-right'" class="dropdown" *ngIf="isSessionValid">
diff --git a/src/ui_ng/src/app/replication/replication.component.html b/src/ui_ng/src/app/replication/replication.component.html
index 1b31732ca..f485a1b3d 100644
--- a/src/ui_ng/src/app/replication/replication.component.html
+++ b/src/ui_ng/src/app/replication/replication.component.html
@@ -30,7 +30,7 @@
             <h5 class="flex-items-xs-bottom option-left-down" style="margin-left: 14px;">{{'REPLICATION.REPLICATION_JOBS' | translate}}</h5>
             <div class="flex-items-xs-bottom option-right-down">
                 <button class="btn btn-link" (click)="toggleSearchJobOptionalName(currentJobSearchOption)">{{toggleJobSearchOption[currentJobSearchOption] | translate}}</button>
-                <grid-filter filterPlaceholder='{{"REPLICATION.FILTER_POLICIES_PLACEHOLDER" | translate}}' (filter)="doSearchJobs($event)"></grid-filter>
+                <grid-filter filterPlaceholder='{{"REPLICATION.FILTER_JOBS_PLACEHOLDER" | translate}}' (filter)="doSearchJobs($event)"></grid-filter>
                 <a href="javascript:void(0)" (click)="refreshJobs()">
                     <clr-icon shape="refresh"></clr-icon>
                 </a>
diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json
index fcf96164b..fdbec0e1f 100644
--- a/src/ui_ng/src/i18n/lang/en-us-lang.json
+++ b/src/ui_ng/src/i18n/lang/en-us-lang.json
@@ -203,7 +203,7 @@
         "FILTER_JOBS_PLACEHOLDER": "Filter Jobs",
         "DELETION_TITLE": "Confirm Rule Deletion",
         "DELETION_SUMMARY": "Do you want to delete rule {{param}}?",
-        "FILTER_TARGETS_PLACEHOLDER": "Filter Targets",
+        "FILTER_TARGETS_PLACEHOLDER": "Filter Endpoints",
         "DELETION_TITLE_TARGET": "Confirm Endpoint Deletion",
         "DELETION_SUMMARY_TARGET": "Do you want to delete the endpoint {{param}}?",
         "ADD_POLICY": "New Replication Rule",

From a1b3fe8a2781566f072b46b8e0e60311cfa935c4 Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Thu, 30 Mar 2017 15:51:00 +0800
Subject: [PATCH 02/12] Fix UX issues.

---
 .../create-project.component.html             |  7 ++-
 .../project/create-project/create-project.css | 12 +++++
 .../add-member/add-member.component.css       |  4 ++
 .../add-member/add-member.component.html      |  2 +-
 .../member/add-member/add-member.component.ts |  3 +-
 .../project-detail.component.css              |  7 +++
 .../project-detail.component.html             |  2 +-
 .../src/app/project/project.component.ts      | 12 +++--
 .../create-edit-destination.component.css     |  4 ++
 .../create-edit-destination.component.html    | 14 +++---
 .../create-edit-destination.component.ts      |  3 +-
 .../list-job/list-job.component.ts            |  9 ++++
 .../create-edit-policy.component.css          |  4 ++
 .../create-edit-policy.component.html         | 22 ++++-----
 .../create-edit-policy.component.ts           |  9 +++-
 .../list-policy/list-policy.component.ts      |  8 +++-
 src/ui_ng/src/i18n/lang/en-us-lang.json       | 13 +++--
 src/ui_ng/src/i18n/lang/zh-cn-lang.json       | 47 ++++++++++---------
 18 files changed, 128 insertions(+), 54 deletions(-)
 create mode 100644 src/ui_ng/src/app/project/member/add-member/add-member.component.css
 create mode 100644 src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.css
 create mode 100644 src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.css

diff --git a/src/ui_ng/src/app/project/create-project/create-project.component.html b/src/ui_ng/src/app/project/create-project/create-project.component.html
index 785ba7fe9..97f838bb2 100644
--- a/src/ui_ng/src/app/project/create-project/create-project.component.html
+++ b/src/ui_ng/src/app/project/create-project/create-project.component.html
@@ -1,12 +1,12 @@
 <clr-modal [(clrModalOpen)]="createProjectOpened" [clrModalStaticBackdrop]="staticBackdrop" [clrModalClosable]="closable">
   <h3 class="modal-title">{{'PROJECT.NEW_PROJECT' | translate}}</h3>
   <inline-alert class="modal-title" (confirmEvt)="confirmCancel($event)"></inline-alert>
-  <div class="modal-body">
+  <div class="modal-body" style="height: 12.8em; overflow-y: hidden;">
     <form #projectForm="ngForm">
       <section class="form-block">
         <div class="form-group">
           <label for="create_project_name" class="col-md-4 form-group-label-override">{{'PROJECT.NAME' | translate}}</label>
-          <label for="create_project_name" aria-haspopup="true" role="tooltip" [class.invalid]="projectName.invalid && (projectName.dirty || projectName.touched)" [class.valid]="projectName.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-right">
+          <label for="create_project_name" aria-haspopup="true" role="tooltip" [class.invalid]="projectName.invalid && (projectName.dirty || projectName.touched)" [class.valid]="projectName.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-left">
             <input type="text" id="create_project_name"  [(ngModel)]="project.name" name="name" size="20" required minlength="2" #projectName="ngModel" targetExists="PROJECT_NAME">
             <span class="tooltip-content" *ngIf="projectName.errors && projectName.errors.required && (projectName.dirty || projectName.touched)">
               {{'PROJECT.NAME_IS_REQUIRED' | translate}}
@@ -26,6 +26,9 @@
             <label for="create_project_public"></label>
           </div>
         </div>
+        <p class="inline-help-public">
+          {{'PROJECT.INLINE_HELP_PUBLIC' | translate }}
+        </p>
       </section>
     </form>
   </div>
diff --git a/src/ui_ng/src/app/project/create-project/create-project.css b/src/ui_ng/src/app/project/create-project/create-project.css
index e69de29bb..0445cdd02 100644
--- a/src/ui_ng/src/app/project/create-project/create-project.css
+++ b/src/ui_ng/src/app/project/create-project/create-project.css
@@ -0,0 +1,12 @@
+.inline-help-public {
+  color: #CCCCCC;
+  font-size: 12px;
+  letter-spacing: 0.01em;
+  margin-top: 0;
+  padding: 0 14px;
+}
+
+.form-group-label-override {
+    font-size: 14px;
+    font-weight: 400;
+}
\ No newline at end of file
diff --git a/src/ui_ng/src/app/project/member/add-member/add-member.component.css b/src/ui_ng/src/app/project/member/add-member/add-member.component.css
new file mode 100644
index 000000000..0bcac82e9
--- /dev/null
+++ b/src/ui_ng/src/app/project/member/add-member/add-member.component.css
@@ -0,0 +1,4 @@
+.form-group-label-override {
+    font-size: 14px;
+    font-weight: 400;
+}
\ No newline at end of file
diff --git a/src/ui_ng/src/app/project/member/add-member/add-member.component.html b/src/ui_ng/src/app/project/member/add-member/add-member.component.html
index 55764ae35..9da8644b1 100644
--- a/src/ui_ng/src/app/project/member/add-member/add-member.component.html
+++ b/src/ui_ng/src/app/project/member/add-member/add-member.component.html
@@ -6,7 +6,7 @@
       <section class="form-block">
         <div class="form-group">
           <label for="member_name" class="col-md-4 form-group-label-override">{{'MEMBER.NAME' | translate}}</label>
-          <label for="member_name" aria-haspopup="true" role="tooltip" [class.invalid]="memberName.invalid && (memberName.dirty || memberName.touched)" [class.valid]="memberName.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-right">
+          <label for="member_name" aria-haspopup="true" role="tooltip" [class.invalid]="memberName.invalid && (memberName.dirty || memberName.touched)" [class.valid]="memberName.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-left">
             <input type="text" id="member_name"  [(ngModel)]="member.username" name="name" size="20" #memberName="ngModel" required targetExists="MEMBER_NAME" [projectId]="projectId">
             <span class="tooltip-content" *ngIf="memberName.errors && memberName.errors.required && (memberName.dirty || memberName.touched)">
               {{ 'MEMBER.USERNAME_IS_REQUIRED' | translate }}
diff --git a/src/ui_ng/src/app/project/member/add-member/add-member.component.ts b/src/ui_ng/src/app/project/member/add-member/add-member.component.ts
index 0e44b09ab..f998a7796 100644
--- a/src/ui_ng/src/app/project/member/add-member/add-member.component.ts
+++ b/src/ui_ng/src/app/project/member/add-member/add-member.component.ts
@@ -13,7 +13,8 @@ import { Member } from '../member';
 
 @Component({
   selector: 'add-member',
-  templateUrl: 'add-member.component.html'
+  templateUrl: 'add-member.component.html',
+  styleUrls: [ 'add-member.component.css' ]
 })
 export class AddMemberComponent implements AfterViewChecked {
 
diff --git a/src/ui_ng/src/app/project/project-detail/project-detail.component.css b/src/ui_ng/src/app/project/project-detail/project-detail.component.css
index 3e47b01ad..25f27c693 100644
--- a/src/ui_ng/src/app/project/project-detail/project-detail.component.css
+++ b/src/ui_ng/src/app/project/project-detail/project-detail.component.css
@@ -5,4 +5,11 @@
 
 .sub-nav-bg-color {
   background-color: #fafafa;
+}
+
+.role-label {
+  color: #CCCCCC;
+  font-size: 14px;
+  font-style: italic;
+  letter-spacing: 0.01em;
 }
\ No newline at end of file
diff --git a/src/ui_ng/src/app/project/project-detail/project-detail.component.html b/src/ui_ng/src/app/project/project-detail/project-detail.component.html
index 1fff58b6a..f14d118f7 100644
--- a/src/ui_ng/src/app/project/project-detail/project-detail.component.html
+++ b/src/ui_ng/src/app/project/project-detail/project-detail.component.html
@@ -1,7 +1,7 @@
 <a *ngIf="hasSignedIn" [routerLink]="['/harbor', 'projects']">&lt; {{'PROJECT_DETAIL.PROJECTS' | translate}}</a>
 <a *ngIf="!hasSignedIn" [routerLink]="['/harbor', 'sign-in']">&lt; {{'SEARCH.BACK' | translate}}</a>
 
-<h1 class="sub-header-title">{{currentProject.name}} <span class="badge badge-light-blue" *ngIf="isMember">{{roleName | translate}}</span>  <span class="badge badge-purple" *ngIf="isSystemAdmin">{{ 'MEMBER.SYS_ADMIN' | translate}}</span></h1>
+<h1 class="sub-header-title">{{currentProject.name}} <span class="role-label" *ngIf="isMember">{{roleName | translate}}</span>  <span class="role-label" *ngIf="isSystemAdmin">{{ 'MEMBER.SYS_ADMIN' | translate}}</span></h1>
 <nav class="subnav sub-nav-bg-color">
   <ul class="nav">
     <li class="nav-item">
diff --git a/src/ui_ng/src/app/project/project.component.ts b/src/ui_ng/src/app/project/project.component.ts
index 24aef2259..70e740276 100644
--- a/src/ui_ng/src/app/project/project.component.ts
+++ b/src/ui_ng/src/app/project/project.component.ts
@@ -75,8 +75,14 @@ export class ProjectComponent implements OnInit, OnDestroy {
             console.log('Successful delete project with ID:' + projectId);
             this.retrieve();
           },
-          error =>this.messageHandlerService.handleError(error)
-          );
+          error =>{
+            if(error && error.status === 412) {
+              this.messageHandlerService.showError('PROJECT.FAILED_TO_DELETE_PROJECT', '');
+            } else {
+              this.messageHandlerService.handleError(error);
+            }
+          }
+        );
       }
     });
     
@@ -121,7 +127,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
         this.changedProjects = response.json();
       },
       error => this.messageHandlerService.handleError(error)
-      );
+    );
   }
 
   openModal(): void {
diff --git a/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.css b/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.css
new file mode 100644
index 000000000..0bcac82e9
--- /dev/null
+++ b/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.css
@@ -0,0 +1,4 @@
+.form-group-label-override {
+    font-size: 14px;
+    font-weight: 400;
+}
\ No newline at end of file
diff --git a/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.html b/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.html
index 51ffb79ab..d2ec17401 100644
--- a/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.html
+++ b/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.html
@@ -2,7 +2,7 @@
   <h3 class="modal-title">{{modalTitle}}</h3>
   <inline-alert class="modal-title" (confirmEvt)="confirmCancel($event)"></inline-alert>
   <div class="modal-body">
-    <div class="alert alert-danger" *ngIf="!editable">
+    <div class="alert alert-warning" *ngIf="!editable">
       <div class="alert-item">
         <span class="alert-text">
           {{'DESTINATION.CANNOT_EDIT' | translate}}
@@ -13,8 +13,8 @@
       <section class="form-block">
         <div class="form-group">
           <label for="destination_name" class="col-md-4 form-group-label-override">{{ 'DESTINATION.NAME' | translate }}<span style="color: red">*</span></label>
-          <label class="col-md-8" for="destination_name" aria-haspopup="true" role="tooltip" [class.invalid]="targetName.errors && (targetName.dirty || targetName.touched)" [class.valid]="targetName.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-right">
-            <input type="text" id="destination_name" [disabled]="testOngoing || !editable" [(ngModel)]="target.name" name="targetName" size="20" #targetName="ngModel" value="" required> 
+          <label class="col-md-8" for="destination_name" aria-haspopup="true" role="tooltip" [class.invalid]="targetName.errors && (targetName.dirty || targetName.touched)" [class.valid]="targetName.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-left">
+            <input type="text" id="destination_name" [disabled]="testOngoing" [readonly]="!editable" [(ngModel)]="target.name" name="targetName" size="20" #targetName="ngModel" value="" required> 
             <span class="tooltip-content" *ngIf="targetName.errors && targetName.errors.required && (targetName.dirty || targetName.touched)">
               {{ 'DESTINATION.NAME_IS_REQUIRED' | translate }}
             </span>
@@ -22,8 +22,8 @@
         </div>
         <div class="form-group">
           <label for="destination_url" class="col-md-4 form-group-label-override">{{ 'DESTINATION.URL' | translate }}<span style="color: red">*</span></label>
-          <label class="col-md-8" for="destination_url" aria-haspopup="true" role="tooltip" [class.invalid]="targetEndpoint.errors && (targetEndpoint.dirty || targetEndpoint.touched)" [class.valid]="targetEndpoint.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-right">
-            <input type="text" id="destination_url" [disabled]="testOngoing || !editable" [(ngModel)]="target.endpoint" size="20" name="endpointUrl" #targetEndpoint="ngModel" required>
+          <label class="col-md-8" for="destination_url" aria-haspopup="true" role="tooltip" [class.invalid]="targetEndpoint.errors && (targetEndpoint.dirty || targetEndpoint.touched)" [class.valid]="targetEndpoint.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-left">
+            <input type="text" id="destination_url" [disabled]="testOngoing" [readonly]="!editable" [(ngModel)]="target.endpoint" size="20" name="endpointUrl" #targetEndpoint="ngModel" required>
             <span class="tooltip-content" *ngIf="targetEndpoint.errors && targetEndpoint.errors.required && (targetEndpoint.dirty || targetEndpoint.touched)">
               {{ 'DESTINATION.URL_IS_REQUIRED' | translate }}
             </span>
@@ -31,11 +31,11 @@
         </div>
         <div class="form-group">
           <label for="destination_username" class="col-md-4 form-group-label-override">{{ 'DESTINATION.USERNAME' | translate }}</label>
-          <input type="text" class="col-md-8" id="destination_username" [disabled]="testOngoing || !editable" [(ngModel)]="target.username" size="20" name="username" #username="ngModel">
+          <input type="text" class="col-md-8" id="destination_username" [disabled]="testOngoing" [readonly]="!editable" [(ngModel)]="target.username" size="20" name="username" #username="ngModel">
         </div>
         <div class="form-group">
           <label for="destination_password" class="col-md-4 form-group-label-override">{{ 'DESTINATION.PASSWORD' | translate }}</label>
-          <input type="password" class="col-md-8" id="destination_password" [disabled]="testOngoing || !editable" [(ngModel)]="target.password" size="20" name="password" #password="ngModel">
+          <input type="password" class="col-md-8" id="destination_password" [disabled]="testOngoing" [readonly]="!editable" [(ngModel)]="target.password" size="20" name="password" #password="ngModel">
         </div>
         <div class="form-group">
           <label for="spin" class="col-md-4"></label>
diff --git a/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.ts b/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.ts
index ac8f26d05..0e55f7d63 100644
--- a/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.ts
+++ b/src/ui_ng/src/app/replication/create-edit-destination/create-edit-destination.component.ts
@@ -13,7 +13,8 @@ import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'create-edit-destination',
-  templateUrl: './create-edit-destination.component.html'
+  templateUrl: './create-edit-destination.component.html',
+  styleUrls: [ 'create-edit-destination.component.css' ]
 })
 export class CreateEditDestinationComponent implements AfterViewChecked {
 
diff --git a/src/ui_ng/src/app/replication/list-job/list-job.component.ts b/src/ui_ng/src/app/replication/list-job/list-job.component.ts
index 2ca7cc570..f57299d8e 100644
--- a/src/ui_ng/src/app/replication/list-job/list-job.component.ts
+++ b/src/ui_ng/src/app/replication/list-job/list-job.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input, Output, EventEmitter } from '@angular/core';
 import { Job } from '../job';
 import { State } from 'clarity-angular';
+import { MessageHandlerService } from '../../shared/message-handler/message-handler.service';
 
 @Component({
   selector: 'list-job',
@@ -12,10 +13,18 @@ export class ListJobComponent {
   @Input() totalPage: number;
   @Output() paginate = new EventEmitter<State>();
 
+  constructor(private messageHandlerService: MessageHandlerService) {}
+
   pageOffset: number = 1;
 
   refresh(state: State) {
     if(this.jobs) {
+      for(let i = 0; i < this.jobs.length; i++) {
+        let j = this.jobs[i];
+        if(j.status === 'retrying' || j.status === 'error') {
+          this.messageHandlerService.showError('', '');
+        }
+      }
       this.paginate.emit(state);
     }
   }
diff --git a/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.css b/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.css
new file mode 100644
index 000000000..0bcac82e9
--- /dev/null
+++ b/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.css
@@ -0,0 +1,4 @@
+.form-group-label-override {
+    font-size: 14px;
+    font-weight: 400;
+}
\ No newline at end of file
diff --git a/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.html b/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.html
index b9106ae5f..decb4832a 100644
--- a/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.html
+++ b/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.html
@@ -1,10 +1,10 @@
 <clr-modal [(clrModalOpen)]="createEditPolicyOpened" [clrModalStaticBackdrop]="staticBackdrop" [clrModalClosable]="closable">
   <h3 class="modal-title">{{modalTitle}}</h3>
   <inline-alert class="modal-title" (confirmEvt)="confirmCancel($event)"></inline-alert>
-  <div class="modal-body">
+  <div class="modal-body" style="max-height: 85vh;">
     <form #policyForm="ngForm">
       <section class="form-block">
-        <div class="alert alert-danger" *ngIf="readonly">
+        <div class="alert alert-warning" *ngIf="readonly">
           <div class="alert-item">
             <span class="alert-text">
               {{'REPLICATION.CANNOT_EDIT' | translate}}
@@ -13,8 +13,8 @@
         </div>
         <div class="form-group">
           <label for="policy_name" class="col-md-4 form-group-label-override">{{'REPLICATION.NAME' | translate}}<span style="color: red">*</span></label>
-          <label for="policy_name" class="col-md-8"  aria-haspopup="true" role="tooltip" [class.invalid]="name.errors && (name.dirty || name.touched)" [class.valid]="name.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-right">
-            <input type="text" id="policy_name" [(ngModel)]="createEditPolicy.name" name="name" #name="ngModel" required [disabled]="readonly">
+          <label for="policy_name" class="col-md-8"  aria-haspopup="true" role="tooltip" [class.invalid]="name.errors && (name.dirty || name.touched)" [class.valid]="name.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-left">
+            <input type="text" id="policy_name" [(ngModel)]="createEditPolicy.name" name="name" size="20" #name="ngModel" required [readonly]="readonly">
             <span class="tooltip-content" *ngIf="name.errors && name.errors.required && (name.dirty || name.touched)">
               {{'REPLICATION.NAME_IS_REQUIRED' | translate}}
             </span>
@@ -22,7 +22,7 @@
         </div>
         <div class="form-group">
           <label for="policy_description" class="col-md-4 form-group-label-override">{{'REPLICATION.DESCRIPTION' | translate}}</label>
-          <input type="text" class="col-md-8" id="policy_description" [(ngModel)]="createEditPolicy.description" name="description" size="20" #description="ngModel" [disabled]="readonly"> 
+          <textarea class="col-md-8" id="policy_description" row="3" [(ngModel)]="createEditPolicy.description" name="description" size="20" #description="ngModel" [readonly]="readonly"></textarea>
         </div>
         <div class="form-group">
           <label class="col-md-4 form-group-label-override">{{'REPLICATION.ENABLE' | translate}}</label>
@@ -38,7 +38,7 @@
               <option *ngFor="let t of targets" [value]="t.id" [selected]="t.id == createEditPolicy.targetId">{{t.name}}</option>
             </select>
           </div>
-          <label class="col-md-8" *ngIf="isCreateDestination" for="destination_name" aria-haspopup="true" role="tooltip" [class.invalid]="targetName.errors && (targetName.dirty || targetName.touched)" [class.valid]="targetName.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-right">
+          <label class="col-md-8" *ngIf="isCreateDestination" for="destination_name" aria-haspopup="true" role="tooltip" [class.invalid]="targetName.errors && (targetName.dirty || targetName.touched)" [class.valid]="targetName.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-left">
             <input type="text" id="destination_name" [(ngModel)]="createEditPolicy.targetName" name="targetName" size="8" #targetName="ngModel" value="" required> 
             <span class="tooltip-content" *ngIf="targetName.errors && targetName.errors.required && (targetName.dirty || targetName.touched)">
               {{'REPLICATION.DESTINATION_NAME_IS_REQUIRED' | translate}}
@@ -51,8 +51,8 @@
         </div>
         <div class="form-group">
           <label for="destination_url" class="col-md-4 form-group-label-override">{{'REPLICATION.DESTINATION_URL' | translate}}<span style="color: red">*</span></label>
-          <label for="destination_url" class="col-md-8" aria-haspopup="true" role="tooltip" [class.invalid]="endpointUrl.errors && (endpointUrl.dirty || endpointUrl.touched)" [class.valid]="endpointUrl.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-right">
-            <input type="text" id="destination_url" [disabled]="testOngoing || readonly" [(ngModel)]="createEditPolicy.endpointUrl" size="20" name="endpointUrl" required #endpointUrl="ngModel">
+          <label for="destination_url" class="col-md-8" aria-haspopup="true" role="tooltip" [class.invalid]="endpointUrl.errors && (endpointUrl.dirty || endpointUrl.touched)" [class.valid]="endpointUrl.valid" class="tooltip tooltip-validation tooltip-sm tooltip-bottom-left">
+            <input type="text" id="destination_url" [disabled]="testOngoing" [readonly]="readonly || !isCreateDestination" [(ngModel)]="createEditPolicy.endpointUrl" size="20" name="endpointUrl" required #endpointUrl="ngModel">
             <span class="tooltip-content" *ngIf="endpointUrl.errors && endpointUrl.errors.required && (endpointUrl.dirty || endpointUrl.touched)">
               {{'REPLICATION.DESTINATION_URL_IS_REQUIRED' | translate}}
             </span>
@@ -60,11 +60,11 @@
         </div>
         <div class="form-group">
           <label for="destination_username" class="col-md-4 form-group-label-override">{{'REPLICATION.DESTINATION_USERNAME' | translate}}</label>
-          <input type="text" class="col-md-8" id="destination_username" [disabled]="testOngoing || readonly" [(ngModel)]="createEditPolicy.username" size="20" name="username" #username="ngModel">
+          <input type="text" class="col-md-8" id="destination_username" [disabled]="testOngoing" [readonly]="readonly || !isCreateDestination" [(ngModel)]="createEditPolicy.username" size="20" name="username" #username="ngModel">
         </div>
         <div class="form-group">
           <label for="destination_password" class="col-md-4 form-group-label-override">{{'REPLICATION.DESTINATION_PASSWORD' | translate}}</label>
-          <input type="password" class="col-md-8" id="destination_password" [disabled]="testOngoing || readonly" [(ngModel)]="createEditPolicy.password" size="20" name="password" #password="ngModel">
+          <input type="password" class="col-md-8" id="destination_password" [disabled]="testOngoing" [readonly]="readonly || !isCreateDestination" [(ngModel)]="createEditPolicy.password" size="20" name="password" #password="ngModel">
         </div>
         <div class="form-group">
           <label for="spin" class="col-md-4"></label>
@@ -77,6 +77,6 @@
   <div class="modal-footer">
       <button type="button" class="btn btn-outline" (click)="testConnection()" [disabled]="testOngoing">{{'REPLICATION.TEST_CONNECTION' | translate}}</button>
       <button type="button" class="btn btn-outline" (click)="onCancel()">{{'BUTTON.CANCEL' | translate }}</button>
-      <button type="submit" class="btn btn-primary" [disabled]="!policyForm.form.valid" (click)="onSubmit()">{{'BUTTON.OK' | translate}}</button>
+      <button type="submit" class="btn btn-primary" [disabled]="!policyForm.form.valid || testOngoing || readonly" (click)="onSubmit()">{{'BUTTON.OK' | translate}}</button>
   </div>
 </clr-modal>
\ No newline at end of file
diff --git a/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.ts b/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.ts
index 8c0f3d119..d4b4a7174 100644
--- a/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.ts
+++ b/src/ui_ng/src/app/shared/create-edit-policy/create-edit-policy.component.ts
@@ -17,7 +17,8 @@ import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'create-edit-policy',
-  templateUrl: 'create-edit-policy.component.html'
+  templateUrl: 'create-edit-policy.component.html',
+  styleUrls: [ 'create-edit-policy.component.css' ]
 })
 export class CreateEditPolicyComponent implements OnInit, AfterViewChecked {
 
@@ -195,6 +196,8 @@ export class CreateEditPolicyComponent implements OnInit, AfterViewChecked {
             if(this.messageHandlerService.isAppLevel(error)) {
               this.messageHandlerService.handleError(error);
               this.createEditPolicyOpened = false;
+            } else if (error.status === 409) {
+              this.inlineAlert.showInlineError('REPLICATION.POLICY_ALREADY_EXISTS');
             } else {
               this.inlineAlert.showInlineError(error);
             }            
@@ -217,6 +220,8 @@ export class CreateEditPolicyComponent implements OnInit, AfterViewChecked {
             if(this.messageHandlerService.isAppLevel(error)) {
               this.messageHandlerService.handleError(error);
               this.createEditPolicyOpened = false;  
+            } else if (error.status === 409) {
+              this.inlineAlert.showInlineError('REPLICATION.POLICY_ALREADY_EXISTS');            
             } else {
               this.inlineAlert.showInlineError(error);
             }
@@ -240,6 +245,8 @@ export class CreateEditPolicyComponent implements OnInit, AfterViewChecked {
             if(this.messageHandlerService.isAppLevel(error)) {
               this.messageHandlerService.handleError(error);
               this.createEditPolicyOpened = false;
+            } else if (error.status === 409) {
+              this.inlineAlert.showInlineError('REPLICATION.POLICY_ALREADY_EXISTS');
             } else {
               this.inlineAlert.showInlineError(error);
             }
diff --git a/src/ui_ng/src/app/shared/list-policy/list-policy.component.ts b/src/ui_ng/src/app/shared/list-policy/list-policy.component.ts
index ee235217c..05c31e5e8 100644
--- a/src/ui_ng/src/app/shared/list-policy/list-policy.component.ts
+++ b/src/ui_ng/src/app/shared/list-policy/list-policy.component.ts
@@ -75,7 +75,13 @@ export class ListPolicyComponent implements OnDestroy {
                     console.log('Successful delete policy with ID:' + message.data);
                     this.reload.emit(true);
                   },
-                  error => this.messageHandlerService.handleError(error)
+                  error => {
+                    if(error && error.status === 412) {
+                      this.messageHandlerService.handleError('REPLICATION.FAILED_TO_DELETE_POLICY_ENABLED');
+                    } else {
+                      this.messageHandlerService.handleError(error);
+                    }
+                  }
                 );
         }
       }
diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json
index fdbec0e1f..deecfced7 100644
--- a/src/ui_ng/src/i18n/lang/en-us-lang.json
+++ b/src/ui_ng/src/i18n/lang/en-us-lang.json
@@ -145,7 +145,9 @@
         "REPLICATION_RULE": "Replication Rule",
         "CREATED_SUCCESS": "Created project successfully.",
         "DELETED_SUCCESS": "Deleted project successfully.",
-        "TOGGLED_SUCCESS": "Toggled project successfully."
+        "TOGGLED_SUCCESS": "Toggled project successfully.",
+        "FAILED_TO_DELETE_PROJECT": "Project contains repositories or replication rules can not be deleted.",
+        "INLINE_HELP_PUBLIC": "When a project is set to public, anyone has read permission to the repositories under this project, and the user does not need to run \"docker login\" before pulling images under this project."
     },
     "PROJECT_DETAIL": {
         "REPOSITORIES": "Repositories",
@@ -249,15 +251,18 @@
         "LOGS": "Logs",
         "ITEMS": "item(s)",
         "TOGGLE_ENABLE_TITLE": "Enable Rule",
-        "CONFIRM_TOGGLE_ENABLE_POLICY": "After enabling the replication rule, all repositories under the project will be replicated to the destination registry. Please confirm to continue.",
+        "CONFIRM_TOGGLE_ENABLE_POLICY": "After enabling the replication rule, all repositories under the project \nwill be replicated to the destination registry. \nPlease confirm to continue.",
         "TOGGLE_DISABLE_TITLE": "Disable Rule",
-        "CONFIRM_TOGGLE_DISABLE_POLICY": "After disabling the rule, all unfinished replication jobs of this rule will be stopped and canceled. Please confirm to continue.",
+        "CONFIRM_TOGGLE_DISABLE_POLICY": "After disabling the rule, all unfinished replication jobs of this rule \nwill be stopped and canceled. \nPlease confirm to continue.",
         "CREATED_SUCCESS": "Created replication rule successfully.",
         "UPDATED_SUCCESS": "Updated replication rule successfully.",
         "DELETED_SUCCESS": "Deleted replication rule successfully.",
         "DELETED_FAILED": "Deleted replication rule failed.",
         "TOGGLED_SUCCESS": "Toggled replication rule status successfully.",
-        "CANNOT_EDIT": "Replication rule cannot be changed while it is enabled."
+        "CANNOT_EDIT": "Replication rule cannot be changed while it is enabled.",
+        "POLICY_ALREADY_EXISTS": "Replication rule already exists.",
+        "FAILED_TO_DELETE_POLICY_ENABLED": "Cannot delete rule: rule has unfinished job(s) or rule is enabled.",
+        "FOUND_ERROR_IN_JOBS": "Found errors in the replication job(s), please check."
     },
     "DESTINATION": {
         "NEW_ENDPOINT": "New Endpoint",
diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
index b686682da..e86a1d7d4 100644
--- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json
+++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
@@ -127,7 +127,7 @@
         "PUBLIC": "公开",
         "PRIVATE": "私有",
         "MAKE": "设为",
-        "NEW_POLICY": "新建策略",
+        "NEW_POLICY": "新建规则",
         "DELETE": "删除",
         "MY_PROJECTS": "所有项目",
         "PUBLIC_PROJECTS": "公开项目",
@@ -142,10 +142,12 @@
         "DELETION_TITLE": "删除项目确认",
         "DELETION_SUMMARY": "你确认删除项目 {{param}}？",
         "FILTER_PLACEHOLDER": "过滤项目",
-        "REPLICATION_RULE": "复制策略",
+        "REPLICATION_RULE": "复制规则",
         "CREATED_SUCCESS": "创建项目成功。",
         "DELETED_SUCCESS": "删除项目成功。",
-        "TOGGLED_SUCCESS": "切换状态成功。"
+        "TOGGLED_SUCCESS": "切换状态成功。",
+        "FAILED_TO_DELETE_PROJECT": "项目包含镜像仓库或复制规则，无法删除。",
+        "INLINE_HELP_PUBLIC": "当项目设为公开后，任何人都有此项目下镜像的读权限。命令行用户不需要“docker login”就可以拉取此项目下的镜像。"
     },
     "PROJECT_DETAIL": {
         "REPOSITORIES": "镜像仓库",
@@ -196,19 +198,19 @@
         "FILTER_PLACEHOLDER": "过滤日志"
     },
     "REPLICATION": {
-        "REPLICATION_RULE": "复制策略",
-        "NEW_REPLICATION_RULE": "新建策略",
+        "REPLICATION_RULE": "复制规则",
+        "NEW_REPLICATION_RULE": "新建规则",
         "ENDPOINTS": "目标",
-        "FILTER_POLICIES_PLACEHOLDER": "过滤策略",
+        "FILTER_POLICIES_PLACEHOLDER": "过滤规则",
         "FILTER_JOBS_PLACEHOLDER": "过滤任务",
-        "DELETION_TITLE": "删除策略确认",
-        "DELETION_SUMMARY": "确认删除策略 {{param}}?",
+        "DELETION_TITLE": "删除规则确认",
+        "DELETION_SUMMARY": "确认删除规则 {{param}}?",
         "FILTER_TARGETS_PLACEHOLDER": "过滤目标",
         "DELETION_TITLE_TARGET": "删除目标确认",
         "DELETION_SUMMARY_TARGET": "确认删除目标 {{param}}?",
-        "ADD_POLICY": "新建策略",
-        "EDIT_POLICY": "修改策略",
-        "DELETE_POLICY": "删除策略",
+        "ADD_POLICY": "新建规则",
+        "EDIT_POLICY": "修改规则",
+        "DELETE_POLICY": "删除规则",
         "TEST_CONNECTION": "测试连接",
         "TESTING_CONNECTION": "正在测试连接...",
         "TEST_CONNECTION_SUCCESS": "测试连接成功。",
@@ -248,16 +250,19 @@
         "END_TIME": "结束时间",
         "LOGS": "日志",
         "ITEMS": "条记录",
-        "TOGGLE_ENABLE_TITLE": "启用策略",
-        "CONFIRM_TOGGLE_ENABLE_POLICY": "启用策略后，该项目下的所有镜像仓库将复制到目标实例。请确认继续。",
-        "TOGGLE_DISABLE_TITLE": "停用策略",
-        "CONFIRM_TOGGLE_DISABLE_POLICY": "停用策略后，所有未完成的复制任务将被终止和取消。请确认继续。",
-        "CREATED_SUCCESS": "创建复制策略成功。",
-        "UPDATED_SUCCESS": "更新复制策略成功。",
-        "DELETED_SUCCESS": "删除复制策略成功。",
-        "DELETED_FAILED": "删除复制策略失败。",
-        "TOGGLED_SUCCESS": "切换复制策略状态成功。",
-        "CANNOT_EDIT": "当复制规则启用时无法修改。"
+        "TOGGLE_ENABLE_TITLE": "启用规则",
+        "CONFIRM_TOGGLE_ENABLE_POLICY": "启用规则后，该项目下的所有镜像仓库将复制到目标实例。请确认继续。",
+        "TOGGLE_DISABLE_TITLE": "停用规则",
+        "CONFIRM_TOGGLE_DISABLE_POLICY": "停用规则后，所有未完成的复制任务将被终止和取消。请确认继续。",
+        "CREATED_SUCCESS": "创建复制规则成功。",
+        "UPDATED_SUCCESS": "更新复制规则成功。",
+        "DELETED_SUCCESS": "删除复制规则成功。",
+        "DELETED_FAILED": "删除复制规则失败。",
+        "TOGGLED_SUCCESS": "切换复制规则状态成功。",
+        "CANNOT_EDIT": "当复制规则启用时无法修改。",
+        "POLICY_ALREADY_EXISTS": "规则已存在。",
+        "FAILED_TO_DELETE_POLICY_ENABLED": "删除复制规则失败： 仍有未完成的任务或规则未停用。",
+        "FOUND_ERROR_IN_JOBS": "复制任务中包含错误，请检查。"
     },
     "DESTINATION": {
         "NEW_ENDPOINT": "新建目标",

From c3a35510fd6ddbc5e7907dd6152bf77eb28f7f3c Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Wed, 29 Mar 2017 15:19:55 +0800
Subject: [PATCH 03/12] fix sending email bug, fix #1834

---
 src/ui/controllers/base.go | 137 +++++++++++++++++++------------------
 src/ui/views/mail.tpl      |   7 ++
 2 files changed, 79 insertions(+), 65 deletions(-)
 create mode 100644 src/ui/views/mail.tpl

diff --git a/src/ui/controllers/base.go b/src/ui/controllers/base.go
index 4e8ddc9e9..44ad7203d 100644
--- a/src/ui/controllers/base.go
+++ b/src/ui/controllers/base.go
@@ -9,13 +9,13 @@ import (
 
 	"github.com/astaxie/beego"
 	"github.com/beego/i18n"
-	"github.com/vmware/harbor/src/common"
 	"github.com/vmware/harbor/src/common/dao"
 	"github.com/vmware/harbor/src/common/models"
 	"github.com/vmware/harbor/src/common/utils"
-	"github.com/vmware/harbor/src/common/utils/email"
+	email_util "github.com/vmware/harbor/src/common/utils/email"
 	"github.com/vmware/harbor/src/common/utils/log"
 	"github.com/vmware/harbor/src/ui/auth"
+	"github.com/vmware/harbor/src/ui/config"
 )
 
 // CommonController handles request from UI that doesn't expect a page, such as /SwitchLanguage /logout ...
@@ -87,72 +87,79 @@ func (cc *CommonController) UserExists() {
 // SendEmail verifies the Email address and contact SMTP server to send reset password Email.
 func (cc *CommonController) SendEmail() {
 
-	emailStr := cc.GetString("email")
-
-	pass, _ := regexp.MatchString(`^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$`, emailStr)
-
-	if !pass {
-		cc.CustomAbort(http.StatusBadRequest, "email_content_illegal")
-	} else {
-
-		queryUser := models.User{Email: emailStr}
-		exist, err := dao.UserExists(queryUser, "email")
-		if err != nil {
-			log.Errorf("Error occurred in UserExists: %v", err)
-			cc.CustomAbort(http.StatusInternalServerError, "Internal error.")
-		}
-		if !exist {
-			cc.CustomAbort(http.StatusNotFound, "email_does_not_exist")
-		}
-
-		messageTemplate, err := template.ParseFiles("views/reset-password-mail.tpl")
-		if err != nil {
-			log.Errorf("Parse email template file failed: %v", err)
-			cc.CustomAbort(http.StatusInternalServerError, err.Error())
-		}
-
-		message := new(bytes.Buffer)
-
-		harborURL := common.ExtEndpoint
-		if harborURL == "" {
-			harborURL = "localhost"
-		}
-		uuid := utils.GenerateRandomString()
-		err = messageTemplate.Execute(message, messageDetail{
-			Hint: cc.Tr("reset_email_hint"),
-			URL:  harborURL,
-			UUID: uuid,
-		})
-
-		if err != nil {
-			log.Errorf("Message template error: %v", err)
-			cc.CustomAbort(http.StatusInternalServerError, "internal_error")
-		}
-
-		config, err := beego.AppConfig.GetSection("mail")
-		if err != nil {
-			log.Errorf("Can not load app.conf: %v", err)
-			cc.CustomAbort(http.StatusInternalServerError, "internal_error")
-		}
-
-		mail := email.Mail{
-			From:    config["from"],
-			To:      []string{emailStr},
-			Subject: cc.Tr("reset_email_subject"),
-			Message: message.String()}
-
-		err = mail.SendMail()
-
-		if err != nil {
-			log.Errorf("Send email failed: %v", err)
-			cc.CustomAbort(http.StatusInternalServerError, "send_email_failed")
-		}
-
-		user := models.User{ResetUUID: uuid, Email: emailStr}
-		dao.UpdateUserResetUUID(user)
+	email := cc.GetString("email")
 
+	valid, err := regexp.MatchString(`^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$`, email)
+	if err != nil {
+		log.Errorf("failed to match regexp: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, "Internal error.")
 	}
 
+	if !valid {
+		cc.CustomAbort(http.StatusBadRequest, "invalid email")
+	}
+
+	queryUser := models.User{Email: email}
+	exist, err := dao.UserExists(queryUser, "email")
+	if err != nil {
+		log.Errorf("Error occurred in UserExists: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, "Internal error.")
+	}
+	if !exist {
+		log.Debugf("email %s not found", email)
+		cc.CustomAbort(http.StatusNotFound, "email_does_not_exist")
+	}
+
+	messageTemplate, err := template.ParseFiles("views/reset-password-mail.tpl")
+	if err != nil {
+		log.Errorf("Parse email template file failed: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, err.Error())
+	}
+
+	message := new(bytes.Buffer)
+
+	harborURL, err := config.ExtEndpoint()
+	if err != nil {
+		log.Errorf("failed to get domain name: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
+	}
+
+	uuid := utils.GenerateRandomString()
+	err = messageTemplate.Execute(message, messageDetail{
+		Hint: cc.Tr("reset_email_hint"),
+		URL:  harborURL,
+		UUID: uuid,
+	})
+
+	if err != nil {
+		log.Errorf("Message template error: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, "internal_error")
+	}
+
+	emailSettings, err := config.Email()
+	if err != nil {
+		log.Errorf("failed to get email configurations: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, "internal_error")
+	}
+
+	mail := email_util.Mail{
+		From:    emailSettings.From,
+		To:      []string{email},
+		Subject: cc.Tr("reset_email_subject"),
+		Message: message.String()}
+
+	err = mail.SendMail()
+
+	if err != nil {
+		log.Errorf("Send email failed: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, "send_email_failed")
+	}
+
+	user := models.User{ResetUUID: uuid, Email: email}
+	if err = dao.UpdateUserResetUUID(user); err != nil {
+		log.Errorf("failed to update user reset UUID: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
+	}
 }
 
 // ResetPassword handles request from the reset page and reset password
diff --git a/src/ui/views/mail.tpl b/src/ui/views/mail.tpl
new file mode 100644
index 000000000..7b54bc1b1
--- /dev/null
+++ b/src/ui/views/mail.tpl
@@ -0,0 +1,7 @@
+From: {{.From}}
+To: {{.To}}
+Subject: {{.Subject}}
+MIME-version: 1.0;
+Content-Type: text/html; charset="UTF-8"
+
+{{.Message}}

From 0d8060803646db6bab12216c4fdb4a8c7107bbc2 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Wed, 29 Mar 2017 17:45:08 +0800
Subject: [PATCH 04/12] add ut

---
 src/common/utils/email/mail.go      | 116 +++++++++-------------------
 src/common/utils/email/mail_test.go |  69 ++++++++++++++++-
 src/ui/controllers/base.go          |  22 +++---
 src/ui/views/mail.tpl               |   7 --
 4 files changed, 116 insertions(+), 98 deletions(-)
 delete mode 100644 src/ui/views/mail.tpl

diff --git a/src/common/utils/email/mail.go b/src/common/utils/email/mail.go
index 8df4eec96..41ada91d4 100644
--- a/src/common/utils/email/mail.go
+++ b/src/common/utils/email/mail.go
@@ -16,87 +16,34 @@
 package email
 
 import (
-	"bytes"
 	tlspkg "crypto/tls"
+	"fmt"
 	"net"
-	"strconv"
+	"net/smtp"
+	"strings"
 	"time"
 
-	"net/smtp"
-	"text/template"
-
-	"github.com/vmware/harbor/src/common/models"
 	"github.com/vmware/harbor/src/common/utils/log"
-	"github.com/vmware/harbor/src/ui/config"
 )
 
-// Mail holds information about content of Email
-type Mail struct {
-	From    string
-	To      []string
-	Subject string
-	Message string
-}
+// Send ...
+func Send(addr, identity, username, password string,
+	timeout int, tls, insecure bool, from string,
+	to []string, subject, message string) error {
 
-var mc *models.Email
-
-// SendMail sends Email according to the configurations
-func (m Mail) SendMail() error {
-	var err error
-	mc, err = config.Email()
-	if err != nil {
-		return err
-	}
-
-	mailTemplate, err := template.ParseFiles("views/mail.tpl")
-	if err != nil {
-		return err
-	}
-	mailContent := new(bytes.Buffer)
-	err = mailTemplate.Execute(mailContent, m)
-	if err != nil {
-		return err
-	}
-	content := mailContent.Bytes()
-
-	auth := smtp.PlainAuth(mc.Identity, mc.Username, mc.Password, mc.Host)
-	if mc.SSL {
-		err = sendMailWithTLS(m, auth, content)
-	} else {
-		err = sendMail(m, auth, content)
-	}
-
-	return err
-}
-
-func sendMail(m Mail, auth smtp.Auth, content []byte) error {
-	return smtp.SendMail(mc.Host+":"+strconv.Itoa(mc.Port), auth, m.From, m.To, content)
-}
-
-func sendMailWithTLS(m Mail, auth smtp.Auth, content []byte) error {
-	conn, err := tlspkg.Dial("tcp", mc.Host+":"+strconv.Itoa(mc.Port), nil)
-	if err != nil {
-		return err
-	}
-
-	client, err := smtp.NewClient(conn, mc.Host)
+	client, err := newClient(addr, identity, username,
+		password, timeout, tls, insecure)
 	if err != nil {
 		return err
 	}
 	defer client.Close()
 
-	if ok, _ := client.Extension("AUTH"); ok {
-		if err = client.Auth(auth); err != nil {
-			return err
-		}
-	}
-
-	if err = client.Mail(m.From); err != nil {
+	if err = client.Mail(from); err != nil {
 		return err
 	}
 
-	for _, to := range m.To {
-		if err = client.Rcpt(to); err != nil {
+	for _, t := range to {
+		if err = client.Rcpt(t); err != nil {
 			return err
 		}
 	}
@@ -106,7 +53,11 @@ func sendMailWithTLS(m Mail, auth smtp.Auth, content []byte) error {
 		return err
 	}
 
-	_, err = w.Write(content)
+	template := "From: %s\r\nTo: %s\r\nSubject: %s\r\nMIME-version: 1.0;\r\nContent-Type: text/html; charset=\"UTF-8\"\r\n\n%s\r\n"
+	data := fmt.Sprintf(template, from,
+		strings.Join(to, ","), subject, message)
+
+	_, err = w.Write([]byte(data))
 	if err != nil {
 		return err
 	}
@@ -126,18 +77,29 @@ func sendMailWithTLS(m Mail, auth smtp.Auth, content []byte) error {
 // Ping doesn't verify the server's certificate and hostname when
 // needed if the parameter insecure is ture
 func Ping(addr, identity, username, password string,
-	timeout int, tls, insecure bool) (err error) {
+	timeout int, tls, insecure bool) error {
+	client, err := newClient(addr, identity, username, password,
+		timeout, tls, insecure)
+	if err != nil {
+		return err
+	}
+	defer client.Close()
+	return nil
+}
+
+// caller needs to close the client
+func newClient(addr, identity, username, password string,
+	timeout int, tls, insecure bool) (*smtp.Client, error) {
 	log.Debugf("establishing TCP connection with %s ...", addr)
 	conn, err := net.DialTimeout("tcp", addr,
 		time.Duration(timeout)*time.Second)
 	if err != nil {
-		return
+		return nil, err
 	}
-	defer conn.Close()
 
 	host, _, err := net.SplitHostPort(addr)
 	if err != nil {
-		return
+		return nil, err
 	}
 
 	if tls {
@@ -147,9 +109,8 @@ func Ping(addr, identity, username, password string,
 			InsecureSkipVerify: insecure,
 		})
 		if err = tlsConn.Handshake(); err != nil {
-			return
+			return nil, err
 		}
-		defer tlsConn.Close()
 
 		conn = tlsConn
 	}
@@ -157,9 +118,8 @@ func Ping(addr, identity, username, password string,
 	log.Debugf("creating SMTP client for %s ...", host)
 	client, err := smtp.NewClient(conn, host)
 	if err != nil {
-		return
+		return nil, err
 	}
-	defer client.Close()
 
 	//try to swith to SSL/TLS
 	if !tls {
@@ -169,7 +129,7 @@ func Ping(addr, identity, username, password string,
 				ServerName:         host,
 				InsecureSkipVerify: insecure,
 			}); err != nil {
-				return
+				return nil, err
 			}
 		} else {
 			log.Debugf("the email server %s does not support STARTTLS", addr)
@@ -181,14 +141,14 @@ func Ping(addr, identity, username, password string,
 		// only support plain auth
 		if err = client.Auth(smtp.PlainAuth(identity,
 			username, password, host)); err != nil {
-			return
+			return nil, err
 		}
 	} else {
 		log.Debugf("the email server %s does not support AUTH, skip",
 			addr)
 	}
 
-	log.Debug("ping email server successfully")
+	log.Debug("create smtp client successfully")
 
-	return
+	return client, nil
 }
diff --git a/src/common/utils/email/mail_test.go b/src/common/utils/email/mail_test.go
index 3ece8d748..7f5e7d183 100644
--- a/src/common/utils/email/mail_test.go
+++ b/src/common/utils/email/mail_test.go
@@ -18,20 +18,81 @@ package email
 import (
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
+func TestSend(t *testing.T) {
+	addr := "smtp.gmail.com:465"
+	identity := ""
+	username := "harbortestonly@gmail.com"
+	password := "harborharbor"
+	timeout := 60
+	tls := true
+	insecure := false
+	from := "from"
+	to := []string{username}
+	subject := "subject"
+	message := "message"
+
+	// tls connection
+	tls = true
+	err := Send(addr, identity, username, password,
+		timeout, tls, insecure, from, to,
+		subject, message)
+	assert.Nil(t, err)
+
+	/*not work on travis
+	// non-tls connection
+	addr = "smtp.gmail.com:25"
+	tls = false
+	err = Send(addr, identity, username, password,
+		timeout, tls, insecure, from, to,
+		subject, message)
+	assert.Nil(t, err)
+	*/
+
+	//invalid username/password
+	username = "invalid_username"
+	err = Send(addr, identity, username, password,
+		timeout, tls, insecure, from, to,
+		subject, message)
+	if err == nil {
+		t.Errorf("there should be an auth error")
+	} else {
+		if !strings.Contains(err.Error(), "535") {
+			t.Errorf("unexpected error: %v", err)
+		}
+	}
+}
+
 func TestPing(t *testing.T) {
 	addr := "smtp.gmail.com:465"
 	identity := ""
-	username := "wrong_username"
-	password := "wrong_password"
-	timeout := 60
+	username := "harbortestonly@gmail.com"
+	password := "harborharbor"
+	timeout := 0
 	tls := true
 	insecure := false
 
-	// test secure connection
+	// tls connection
 	err := Ping(addr, identity, username, password,
 		timeout, tls, insecure)
+	assert.Nil(t, err)
+
+	/*not work on travis
+	// non-tls connection
+	addr = "smtp.gmail.com:25"
+	tls = false
+	err = Ping(addr, identity, username, password,
+		timeout, tls, insecure)
+	assert.Nil(t, err)
+	*/
+
+	//invalid username/password
+	username = "invalid_username"
+	err = Ping(addr, identity, username, password,
+		timeout, tls, insecure)
 	if err == nil {
 		t.Errorf("there should be an auth error")
 	} else {
diff --git a/src/ui/controllers/base.go b/src/ui/controllers/base.go
index 44ad7203d..64b9407bb 100644
--- a/src/ui/controllers/base.go
+++ b/src/ui/controllers/base.go
@@ -3,9 +3,11 @@ package controllers
 import (
 	"bytes"
 	"html/template"
+	"net"
 	"net/http"
 	"os"
 	"regexp"
+	"strconv"
 
 	"github.com/astaxie/beego"
 	"github.com/beego/i18n"
@@ -136,20 +138,22 @@ func (cc *CommonController) SendEmail() {
 		cc.CustomAbort(http.StatusInternalServerError, "internal_error")
 	}
 
-	emailSettings, err := config.Email()
+	settings, err := config.Email()
 	if err != nil {
 		log.Errorf("failed to get email configurations: %v", err)
 		cc.CustomAbort(http.StatusInternalServerError, "internal_error")
 	}
 
-	mail := email_util.Mail{
-		From:    emailSettings.From,
-		To:      []string{email},
-		Subject: cc.Tr("reset_email_subject"),
-		Message: message.String()}
-
-	err = mail.SendMail()
-
+	addr := net.JoinHostPort(settings.Host, strconv.Itoa(settings.Port))
+	err = email_util.Send(addr,
+		settings.Identity,
+		settings.Username,
+		settings.Password,
+		60, settings.SSL,
+		false, settings.From,
+		[]string{email},
+		cc.Tr("reset_email_subject"),
+		message.String())
 	if err != nil {
 		log.Errorf("Send email failed: %v", err)
 		cc.CustomAbort(http.StatusInternalServerError, "send_email_failed")
diff --git a/src/ui/views/mail.tpl b/src/ui/views/mail.tpl
deleted file mode 100644
index 7b54bc1b1..000000000
--- a/src/ui/views/mail.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-From: {{.From}}
-To: {{.To}}
-Subject: {{.Subject}}
-MIME-version: 1.0;
-Content-Type: text/html; charset="UTF-8"
-
-{{.Message}}

From 052bc429a721db43163a1eb2246432cb91c7b9fd Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Thu, 30 Mar 2017 13:51:56 +0800
Subject: [PATCH 05/12] update

---
 src/ui/controllers/base.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ui/controllers/base.go b/src/ui/controllers/base.go
index 64b9407bb..cfde32b41 100644
--- a/src/ui/controllers/base.go
+++ b/src/ui/controllers/base.go
@@ -112,6 +112,13 @@ func (cc *CommonController) SendEmail() {
 		cc.CustomAbort(http.StatusNotFound, "email_does_not_exist")
 	}
 
+	uuid := utils.GenerateRandomString()
+	user := models.User{ResetUUID: uuid, Email: email}
+	if err = dao.UpdateUserResetUUID(user); err != nil {
+		log.Errorf("failed to update user reset UUID: %v", err)
+		cc.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
+	}
+
 	messageTemplate, err := template.ParseFiles("views/reset-password-mail.tpl")
 	if err != nil {
 		log.Errorf("Parse email template file failed: %v", err)
@@ -126,7 +133,6 @@ func (cc *CommonController) SendEmail() {
 		cc.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
 	}
 
-	uuid := utils.GenerateRandomString()
 	err = messageTemplate.Execute(message, messageDetail{
 		Hint: cc.Tr("reset_email_hint"),
 		URL:  harborURL,
@@ -158,12 +164,6 @@ func (cc *CommonController) SendEmail() {
 		log.Errorf("Send email failed: %v", err)
 		cc.CustomAbort(http.StatusInternalServerError, "send_email_failed")
 	}
-
-	user := models.User{ResetUUID: uuid, Email: email}
-	if err = dao.UpdateUserResetUUID(user); err != nil {
-		log.Errorf("failed to update user reset UUID: %v", err)
-		cc.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
-	}
 }
 
 // ResetPassword handles request from the reset page and reset password

From 791aaa0724568b1b0cd126c3e41424f6a0d2b0e6 Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Thu, 30 Mar 2017 12:33:42 +0800
Subject: [PATCH 06/12] fix issues

---
 src/ui_ng/src/app/account/sign-in/sign-in.component.html | 3 +--
 src/ui_ng/src/app/account/sign-in/sign-in.component.ts   | 9 +++++++++
 .../src/app/base/navigator/navigator.component.html      | 2 +-
 .../confirmation-dialog.component.css                    | 2 +-
 .../confirmation-dialog.component.html                   | 4 ++--
 .../app/shared/inline-alert/inline-alert.component.css   | 5 +++++
 .../app/shared/inline-alert/inline-alert.component.html  | 4 ++--
 src/ui_ng/src/app/user/user.component.css                | 4 ++++
 src/ui_ng/src/app/user/user.component.html               | 2 +-
 src/ui_ng/src/app/user/user.component.ts                 | 3 +++
 src/ui_ng/src/i18n/lang/en-us-lang.json                  | 5 +++--
 src/ui_ng/src/i18n/lang/zh-cn-lang.json                  | 3 ++-
 12 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/ui_ng/src/app/account/sign-in/sign-in.component.html b/src/ui_ng/src/app/account/sign-in/sign-in.component.html
index 3cf3e4ba9..15cbd5af9 100644
--- a/src/ui_ng/src/app/account/sign-in/sign-in.component.html
+++ b/src/ui_ng/src/app/account/sign-in/sign-in.component.html
@@ -1,7 +1,6 @@
 <div class="login-wrapper login-wrapper-override">
     <form #signInForm="ngForm" class="login">
-        <label class="title">
-        VMware Harbor<span class="trademark">&#8482;</span>
+        <label class="title">{{appTitle | translate}}<span class="trademark">&#8482;</span>
     </label>
         <div class="login-group">
             <label for="username" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-left" [class.invalid]="userNameInput.invalid && (userNameInput.dirty || userNameInput.touched)">
diff --git a/src/ui_ng/src/app/account/sign-in/sign-in.component.ts b/src/ui_ng/src/app/account/sign-in/sign-in.component.ts
index 20beffc6f..681dae2f2 100644
--- a/src/ui_ng/src/app/account/sign-in/sign-in.component.ts
+++ b/src/ui_ng/src/app/account/sign-in/sign-in.component.ts
@@ -80,6 +80,15 @@ export class SignInComponent implements AfterViewChecked, OnInit {
         }
     }
 
+    //App title
+    public get appTitle(): string {
+        if(this.appConfig && this.appConfig.with_admiral){
+            return "APP_TITLE.VIC";
+        }
+
+        return "APP_TITLE.VMW_HARBOR";
+    }
+
     //For template accessing
     public get isError(): boolean {
         return this.signInStatus === signInStatusError;
diff --git a/src/ui_ng/src/app/base/navigator/navigator.component.html b/src/ui_ng/src/app/base/navigator/navigator.component.html
index 1a4b62634..27b555f2a 100644
--- a/src/ui_ng/src/app/base/navigator/navigator.component.html
+++ b/src/ui_ng/src/app/base/navigator/navigator.component.html
@@ -11,7 +11,7 @@
     </div>
     <global-search></global-search>
     <div class="header-actions">
-        <clr-dropdown class="dropdown bottom-left">
+        <clr-dropdown class="dropdown bottom-left" *ngIf="!isIntegrationMode">
             <button class="nav-icon" clrDropdownToggle style="width: 98px;">
                 <clr-icon shape="world" style="left:-8px;"></clr-icon>
                 <span style="padding-right: 8px;">{{currentLang}}</span>
diff --git a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.css b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.css
index 5e8336ec1..4f6c2933e 100644
--- a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.css
+++ b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.css
@@ -15,5 +15,5 @@
     display: inline-block;
     vertical-align: middle;
     width: 80%;
-    white-space: pre;
+    white-space: pre-wrap;
 }
\ No newline at end of file
diff --git a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html
index 47220c4c8..2d4f91f7c 100644
--- a/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html
+++ b/src/ui_ng/src/app/shared/confirmation-dialog/confirmation-dialog.component.html
@@ -7,7 +7,7 @@
         <div class="confirmation-content">{{dialogContent}}</div>
     </div>
     <div class="modal-footer">
-        <button type="button" class="btn btn-outline" (click)="cancel()">{{'BUTTON.NEGATIVE' | translate}}</button>
-        <button type="button" class="btn btn-primary" (click)="confirm()">{{'BUTTON.CONFIRM' | translate}}</button>
+        <button type="button" class="btn btn-outline" (click)="cancel()">{{'BUTTON.NO' | translate}}</button>
+        <button type="button" class="btn btn-primary" (click)="confirm()">{{'BUTTON.YES' | translate}}</button>
     </div>
 </clr-modal>
\ No newline at end of file
diff --git a/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.css b/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.css
index c170863bc..0d96e37ca 100644
--- a/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.css
+++ b/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.css
@@ -1,4 +1,9 @@
 .alert-text-blink {
     color: red;
     font-weight: bolder;
+}
+
+.alert-btn-link {
+    padding: 0px !important;
+    min-width: 30px !important;
 }
\ No newline at end of file
diff --git a/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.html b/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.html
index a33ed4ab1..668e5392d 100644
--- a/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.html
+++ b/src/ui_ng/src/app/shared/inline-alert/inline-alert.component.html
@@ -4,8 +4,8 @@
             {{errorMessage}}
         </span>
         <div class="alert-actions" *ngIf="showCancelAction">
-            <button class="btn alert-action" (click)="close()">{{'BUTTON.NO' | translate}}</button>
-            <button class="btn alert-action" (click)="confirmCancel()">{{'BUTTON.YES' | translate}}</button>
+            <button class="btn btn-sm btn-link alert-btn-link" (click)="close()">{{'BUTTON.NO' | translate}}</button>
+            <button class="btn btn-sm btn-link alert-btn-link" (click)="confirmCancel()">{{'BUTTON.YES' | translate}}</button>
         </div>
     </div>
 </clr-alert>
\ No newline at end of file
diff --git a/src/ui_ng/src/app/user/user.component.css b/src/ui_ng/src/app/user/user.component.css
index 0facbe86d..cbd04a9ad 100644
--- a/src/ui_ng/src/app/user/user.component.css
+++ b/src/ui_ng/src/app/user/user.component.css
@@ -30,4 +30,8 @@
     right: 2px;
     top: 12px;
     cursor: pointer;
+}
+
+.hide-create {
+    visibility: hidden !important;
 }
\ No newline at end of file
diff --git a/src/ui_ng/src/app/user/user.component.html b/src/ui_ng/src/app/user/user.component.html
index a2c1e1a3a..6410d3cf5 100644
--- a/src/ui_ng/src/app/user/user.component.html
+++ b/src/ui_ng/src/app/user/user.component.html
@@ -3,7 +3,7 @@
         <h2 class="custom-h2">{{'SIDE_NAV.SYSTEM_MGMT.USER' | translate}}</h2>
         <div class="action-panel-pos">
             <span>
-        <button *ngIf="canCreateUser" type="submit" class="btn btn-link custom-add-button" (click)="addNewUser()"><clr-icon shape="add"></clr-icon>  {{'USER.ADD_ACTION' | translate}}</button>
+        <button [class.hide-create]="!canCreateUser" type="submit" class="btn btn-link custom-add-button" (click)="addNewUser()"><clr-icon shape="add"></clr-icon>  {{'USER.ADD_ACTION' | translate}}</button>
       </span>
             <grid-filter class="filter-pos" filterPlaceholder='{{"USER.FILTER_PLACEHOLDER" | translate}}' (filter)="doFilter($event)"></grid-filter>
             <span class="refresh-btn" (click)="refreshUser()">
diff --git a/src/ui_ng/src/app/user/user.component.ts b/src/ui_ng/src/app/user/user.component.ts
index ffafc8a7d..a6d8f92f2 100644
--- a/src/ui_ng/src/app/user/user.component.ts
+++ b/src/ui_ng/src/app/user/user.component.ts
@@ -206,6 +206,9 @@ export class UserComponent implements OnInit, OnDestroy {
 
   //Add new user
   addNewUser(): void {
+    if (!this.canCreateUser) {
+      return;// No response to this hacking action
+    }
     this.newUserDialog.open();
   }
 
diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json
index deecfced7..684954433 100644
--- a/src/ui_ng/src/i18n/lang/en-us-lang.json
+++ b/src/ui_ng/src/i18n/lang/en-us-lang.json
@@ -1,5 +1,6 @@
 {
     "APP_TITLE": {
+        "VMW_HARBOR": "VMware Harbor",
         "HARBOR": "Harbor",
         "VIC": "vSphere Integrated Containers",
         "MGMT": "Management",
@@ -110,7 +111,7 @@
         "COLUMN_REG_NAME": "Registration time",
         "IS_ADMIN": "Yes",
         "IS_NOT_ADMIN": "No",
-        "ADD_USER_TITLE": "Add User",
+        "ADD_USER_TITLE": "New User",
         "SAVE_SUCCESS": "New user added successfully",
         "DELETION_TITLE": "Confirm user deletion",
         "DELETION_SUMMARY": "Do you want to delete user {{param}}?",
@@ -391,7 +392,7 @@
         "TEST_MAIL_FAILED": "Failed to verify mail server with error: {{param}}",
         "TEST_LDAP_FAILED": "Failed to verify LDAP server with error: {{param}}",
         "LEAVING_CONFIRMATION_TITLE": "Confirm to leave",
-        "LEAVING_CONFIRMATION_SUMMARY": "Changes have not been saved yet, do you really want to leave currnet page?"
+        "LEAVING_CONFIRMATION_SUMMARY": "Changes have not been saved yet,do you really want to leave currnet page?"
     },
     "PAGE_NOT_FOUND": {
         "MAIN_TITLE": "Page not found",
diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
index e86a1d7d4..6b7bd4ec6 100644
--- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json
+++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
@@ -1,5 +1,6 @@
 {
     "APP_TITLE": {
+        "VMW_HARBOR": "VMware Harbor",
         "HARBOR": "Harbor",
         "VIC": "vSphere Integrated Containers",
         "MGMT": "Management",
@@ -110,7 +111,7 @@
         "COLUMN_REG_NAME": "注册时间",
         "IS_ADMIN": "是",
         "IS_NOT_ADMIN": "否",
-        "ADD_USER_TITLE": "添加用户",
+        "ADD_USER_TITLE": "创建用户",
         "SAVE_SUCCESS": "添加用户成功",
         "DELETION_TITLE": "删除用户确认",
         "DELETION_SUMMARY": "你确认删除用户 {{param}}?",

From fc1ec482a46bfaca7561adc72d4749be185e1af1 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Thu, 30 Mar 2017 12:59:47 +0800
Subject: [PATCH 07/12] remove compress js flag

---
 make/common/templates/adminserver/env  | 1 -
 make/harbor.cfg                        | 4 ----
 make/prepare                           | 4 +---
 src/adminserver/systemcfg/systemcfg.go | 9 ---------
 src/common/const.go                    | 1 -
 src/common/models/config.go            | 1 -
 src/common/utils/ldap/ldap_test.go     | 1 -
 src/common/utils/test/adminserver.go   | 1 -
 src/ui/api/config.go                   | 2 --
 src/ui/auth/ldap/ldap_test.go          | 1 -
 10 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/make/common/templates/adminserver/env b/make/common/templates/adminserver/env
index 9b268f189..190acac5a 100644
--- a/make/common/templates/adminserver/env
+++ b/make/common/templates/adminserver/env
@@ -33,7 +33,6 @@ UI_SECRET=$ui_secret
 JOBSERVICE_SECRET=$jobservice_secret
 TOKEN_EXPIRATION=$token_expiration
 CFG_EXPIRATION=5
-USE_COMPRESSED_JS=$use_compressed_js
 GODEBUG=netdns=cgo
 ADMIRAL_URL=$admiral_url
 WITH_NOTARY=$with_notary
diff --git a/make/harbor.cfg b/make/harbor.cfg
index 8c9575585..b476812e4 100644
--- a/make/harbor.cfg
+++ b/make/harbor.cfg
@@ -11,10 +11,6 @@ ui_url_protocol = http
 #The password for the root user of mysql db, change this before any production use.
 db_password = root123
 
-#Determine whether the UI should use compressed js files. 
-#For production, set it to on. For development, set it to off.
-use_compressed_js = on
-
 #Maximum number of job workers in job service  
 max_job_workers = 3 
 
diff --git a/make/prepare b/make/prepare
index c298393d6..57da6cbbb 100755
--- a/make/prepare
+++ b/make/prepare
@@ -138,7 +138,6 @@ ldap_scope = rcp.get("configuration", "ldap_scope")
 ldap_timeout = rcp.get("configuration", "ldap_timeout")
 db_password = rcp.get("configuration", "db_password")
 self_registration = rcp.get("configuration", "self_registration")
-use_compressed_js = rcp.get("configuration", "use_compressed_js")
 if protocol == "https":
     cert_path = rcp.get("configuration", "ssl_cert")
     cert_key_path = rcp.get("configuration", "ssl_cert_key")
@@ -223,8 +222,7 @@ render(os.path.join(templates_dir, "adminserver", "env"),
         jobservice_secret=jobservice_secret,
         token_expiration=token_expiration,
         admiral_url=admiral_url,
-        with_notary=args.notary_mode,
-        use_compressed_js=use_compressed_js
+        with_notary=args.notary_mode
 	)
 
 render(os.path.join(templates_dir, "ui", "env"), 
diff --git a/src/adminserver/systemcfg/systemcfg.go b/src/adminserver/systemcfg/systemcfg.go
index 577221a81..1cef91005 100644
--- a/src/adminserver/systemcfg/systemcfg.go
+++ b/src/adminserver/systemcfg/systemcfg.go
@@ -98,10 +98,6 @@ var (
 			env:   "TOKEN_EXPIRATION",
 			parse: parseStringToInt,
 		},
-		common.UseCompressedJS: &parser{
-			env:   "USE_COMPRESSED_JS",
-			parse: parseStringToBool,
-		},
 		common.CfgExpiration: &parser{
 			env:   "CFG_EXPIRATION",
 			parse: parseStringToInt,
@@ -132,11 +128,6 @@ var (
 			env:   "MAX_JOB_WORKERS",
 			parse: parseStringToInt,
 		},
-		// TODO remove this config?
-		common.UseCompressedJS: &parser{
-			env:   "USE_COMPRESSED_JS",
-			parse: parseStringToBool,
-		},
 		common.CfgExpiration: &parser{
 			env:   "CFG_EXPIRATION",
 			parse: parseStringToInt,
diff --git a/src/common/const.go b/src/common/const.go
index 6c18fc58d..204b4f398 100644
--- a/src/common/const.go
+++ b/src/common/const.go
@@ -58,7 +58,6 @@ const (
 	TokenExpiration            = "token_expiration"
 	CfgExpiration              = "cfg_expiration"
 	JobLogDir                  = "job_log_dir"
-	UseCompressedJS            = "use_compressed_js"
 	AdminInitialPassword       = "admin_initial_password"
 	AdmiralEndpoint            = "admiral_url"
 	WithNotary                 = "with_notary"
diff --git a/src/common/models/config.go b/src/common/models/config.go
index 16f518d2b..491f1582f 100644
--- a/src/common/models/config.go
+++ b/src/common/models/config.go
@@ -92,7 +92,6 @@ type SystemCfg struct {
 	MaxJobWorkers              int             `json:"max_job_workers"`
 	JobLogDir                  string          `json:"job_log_dir"`
 	InitialAdminPwd            string          `json:"initial_admin_pwd,omitempty"`
-	CompressJS                 bool            `json:"compress_js"`      //TODO remove
 	TokenExpiration            int             `json:"token_expiration"` // in minute
 	SecretKey                  string          `json:"secret_key,omitempty"`
 	CfgExpiration              int             `json:"cfg_expiration"`
diff --git a/src/common/utils/ldap/ldap_test.go b/src/common/utils/ldap/ldap_test.go
index 60cf7c34a..a5767a005 100644
--- a/src/common/utils/ldap/ldap_test.go
+++ b/src/common/utils/ldap/ldap_test.go
@@ -63,7 +63,6 @@ var adminServerLdapTestConfig = map[string]interface{}{
 	//	config.TokenExpiration:            30,
 	common.CfgExpiration: 5,
 	//	config.JobLogDir:                  "/var/log/jobs",
-	//	config.UseCompressedJS:            true,
 	common.AdminInitialPassword: "password",
 }
 
diff --git a/src/common/utils/test/adminserver.go b/src/common/utils/test/adminserver.go
index 0a0741d1d..af2b96e70 100644
--- a/src/common/utils/test/adminserver.go
+++ b/src/common/utils/test/adminserver.go
@@ -57,7 +57,6 @@ var adminServerDefaultConfig = map[string]interface{}{
 	common.MaxJobWorkers:              3,
 	common.TokenExpiration:            30,
 	common.CfgExpiration:              5,
-	common.UseCompressedJS:            true,
 	common.AdminInitialPassword:       "password",
 	common.AdmiralEndpoint:            "http://www.vmware.com",
 	common.WithNotary:                 false,
diff --git a/src/ui/api/config.go b/src/ui/api/config.go
index 22ccea112..be9a8cb09 100644
--- a/src/ui/api/config.go
+++ b/src/ui/api/config.go
@@ -63,7 +63,6 @@ var (
 		common.TokenExpiration,
 		common.CfgExpiration,
 		common.JobLogDir,
-		common.UseCompressedJS,
 		common.AdminInitialPassword,
 	}
 
@@ -81,7 +80,6 @@ var (
 		common.EmailSSL,
 		common.SelfRegistration,
 		common.VerifyRemoteCert,
-		common.UseCompressedJS,
 	}
 
 	passwordKeys = []string{
diff --git a/src/ui/auth/ldap/ldap_test.go b/src/ui/auth/ldap/ldap_test.go
index 9b001ae55..e14227819 100644
--- a/src/ui/auth/ldap/ldap_test.go
+++ b/src/ui/auth/ldap/ldap_test.go
@@ -48,7 +48,6 @@ var adminServerLdapTestConfig = map[string]interface{}{
 	//	config.TokenExpiration:            30,
 	common.CfgExpiration: 5,
 	//	config.JobLogDir:                  "/var/log/jobs",
-	//	config.UseCompressedJS:            true,
 	common.AdminInitialPassword: "password",
 }
 

From 966b476d3640a78ebcee5f79c6f63b2fe82c8980 Mon Sep 17 00:00:00 2001
From: Wenkai Yin <yinw@vmware.com>
Date: Thu, 30 Mar 2017 11:04:09 +0800
Subject: [PATCH 08/12] mount ca dir to container, fix #1829

---
 .travis.yml                 | 4 ++--
 make/dev/docker-compose.yml | 1 +
 make/docker-compose.tpl     | 1 +
 src/ui/api/systeminfo.go    | 2 +-
 tests/testprepare.sh        | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd7588c36..d26364069 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,8 +74,8 @@ before_script:
   - sudo chmod 777 /tmp/registry.db
 
 script:
-  - sudo mkdir -p /harbor_storage/ca_download
-  - sudo mv ./tests/ca.crt /harbor_storage/ca_download
+  - sudo mkdir -p /etc/ui/ca/
+  - sudo mv ./tests/ca.crt /etc/ui/ca/
   - sudo mkdir -p /harbor
   - sudo mv ./VERSION /harbor/VERSION
   - sudo service mysql stop
diff --git a/make/dev/docker-compose.yml b/make/dev/docker-compose.yml
index 3079e5c1b..c25a4d7c8 100644
--- a/make/dev/docker-compose.yml
+++ b/make/dev/docker-compose.yml
@@ -69,6 +69,7 @@ services:
       - ../common/config/ui/app.conf:/etc/ui/app.conf
       - ../common/config/ui/private_key.pem:/etc/ui/private_key.pem
       - /data/secretkey:/etc/ui/key
+      - /data/ca_download/:/etc/ui/ca/
     depends_on:
       - log
       - adminserver
diff --git a/make/docker-compose.tpl b/make/docker-compose.tpl
index 302c15dd1..2cd98d09b 100644
--- a/make/docker-compose.tpl
+++ b/make/docker-compose.tpl
@@ -76,6 +76,7 @@ services:
       - ./common/config/ui/app.conf:/etc/ui/app.conf
       - ./common/config/ui/private_key.pem:/etc/ui/private_key.pem
       - /data/secretkey:/etc/ui/key
+      - /data/ca_download/:/etc/ui/ca/
     networks:
       - harbor
     depends_on:
diff --git a/src/ui/api/systeminfo.go b/src/ui/api/systeminfo.go
index 88dff92bc..0d8f7cb46 100644
--- a/src/ui/api/systeminfo.go
+++ b/src/ui/api/systeminfo.go
@@ -20,7 +20,7 @@ type SystemInfoAPI struct {
 	isAdmin       bool
 }
 
-const defaultRootCert = "/harbor_storage/ca_download/ca.crt"
+const defaultRootCert = "/etc/ui/ca/ca.crt"
 const harborVersionFile = "/harbor/VERSION"
 
 //SystemInfo models for system info.
diff --git a/tests/testprepare.sh b/tests/testprepare.sh
index cb337e2f9..e13de830c 100755
--- a/tests/testprepare.sh
+++ b/tests/testprepare.sh
@@ -2,7 +2,7 @@
 set -e
 cp tests/docker-compose.test.yml make/.
 
-mkdir /etc/ui
+mkdir -p /etc/ui
 cp make/common/config/ui/private_key.pem /etc/ui/.
 
 mkdir conf

From 9b9be0253c7979b24e242e0a7f7f6912acb6fbe6 Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Thu, 30 Mar 2017 13:24:15 +0800
Subject: [PATCH 09/12] fix issue 1860 and other minor remending

---
 .../account-settings-modal.component.html     |  3 +-
 .../password/reset-password.component.html    |  2 +-
 .../password/reset-password.component.ts      |  1 +
 .../app/account/sign-in/sign-in.component.ts  |  3 +-
 src/ui_ng/src/app/shared/email.directive.ts   | 33 +++++++++++++++++++
 .../new-user-form.component.html              |  3 +-
 src/ui_ng/src/app/shared/shared.module.ts     |  7 ++--
 src/ui_ng/src/app/user/user.component.ts      |  4 +--
 src/ui_ng/src/app/user/user.ts                |  4 +++
 src/ui_ng/src/i18n/lang/en-us-lang.json       |  6 ++--
 src/ui_ng/src/i18n/lang/zh-cn-lang.json       |  2 +-
 11 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 src/ui_ng/src/app/shared/email.directive.ts

diff --git a/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html b/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html
index 1bc7df843..9809cffd8 100644
--- a/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html
+++ b/src/ui_ng/src/app/account/account-settings/account-settings-modal.component.html
@@ -13,7 +13,8 @@
                     <label for="account_settings_email" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-left" [class.invalid]='!getValidationState("account_settings_email")'>
                       <input name="account_settings_email" type="text" #eamilInput="ngModel" [(ngModel)]="account.email" 
                       required 
-                      pattern='^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$' id="account_settings_email" size="30" 
+                      email
+                      id="account_settings_email" size="30" 
                       (input)='handleValidation("account_settings_email", false)' 
                       (focusout)='handleValidation("account_settings_email", true)'>
                       <span class="tooltip-content">
diff --git a/src/ui_ng/src/app/account/password/reset-password.component.html b/src/ui_ng/src/app/account/password/reset-password.component.html
index 8e85a6c12..5fa7b5c10 100644
--- a/src/ui_ng/src/app/account/password/reset-password.component.html
+++ b/src/ui_ng/src/app/account/password/reset-password.component.html
@@ -28,7 +28,7 @@
                     required
                     pattern="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?!.*\s).{8,20}$"
                     name="reNewPassword"
-                    [(ngModel)]="ngModel"
+                    [(ngModel)]="confirmPwd"
                     #reNewPassInput 
                     size="25"
                     (input)='handleValidation("reNewPassword", true)' 
diff --git a/src/ui_ng/src/app/account/password/reset-password.component.ts b/src/ui_ng/src/app/account/password/reset-password.component.ts
index 2b3db64e9..d4553e048 100644
--- a/src/ui_ng/src/app/account/password/reset-password.component.ts
+++ b/src/ui_ng/src/app/account/password/reset-password.component.ts
@@ -21,6 +21,7 @@ export class ResetPasswordComponent implements OnInit {
     };
     private resetUuid: string = "";
     private resetOk: boolean = false;
+    confirmPwd: string = "";
 
     @ViewChild("resetPwdForm") resetPwdForm: NgForm;
     @ViewChild(InlineAlertComponent)
diff --git a/src/ui_ng/src/app/account/sign-in/sign-in.component.ts b/src/ui_ng/src/app/account/sign-in/sign-in.component.ts
index 681dae2f2..5a9250077 100644
--- a/src/ui_ng/src/app/account/sign-in/sign-in.component.ts
+++ b/src/ui_ng/src/app/account/sign-in/sign-in.component.ts
@@ -162,7 +162,8 @@ export class SignInComponent implements AfterViewChecked, OnInit {
     private handleUserCreation(user: User): void {
         if (user) {
             this.currentForm.setValue({
-                "login_username": user.username
+                "login_username": user.username,
+                "login_password": ""
             });
 
         }
diff --git a/src/ui_ng/src/app/shared/email.directive.ts b/src/ui_ng/src/app/shared/email.directive.ts
new file mode 100644
index 000000000..a97143efb
--- /dev/null
+++ b/src/ui_ng/src/app/shared/email.directive.ts
@@ -0,0 +1,33 @@
+import { Directive } from '@angular/core';
+import { ValidatorFn, AbstractControl, Validator, NG_VALIDATORS, Validators } from '@angular/forms';
+
+const emailPattern = /^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+
+export function emailValidator(): ValidatorFn {
+    return (control: AbstractControl): { [key: string]: any } => {
+        const value: string = control.value
+        if (!value) {
+            return { 'email': false };
+        }
+
+        const regExp = new RegExp(emailPattern);
+        if(!regExp.test(value)){
+            return { 'email': false };
+        }
+        
+        return null;
+    }
+}
+
+@Directive({
+    selector: '[email]',
+    providers: [{ provide: NG_VALIDATORS, useExisting: EmailValidatorDirective, multi: true }]
+})
+
+export class EmailValidatorDirective implements Validator {
+    valFn = emailValidator();
+
+    validate(control: AbstractControl): { [key: string]: any } {
+        return this.valFn(control);
+    }
+}
\ No newline at end of file
diff --git a/src/ui_ng/src/app/shared/new-user-form/new-user-form.component.html b/src/ui_ng/src/app/shared/new-user-form/new-user-form.component.html
index d2605a7cc..f11100e26 100644
--- a/src/ui_ng/src/app/shared/new-user-form/new-user-form.component.html
+++ b/src/ui_ng/src/app/shared/new-user-form/new-user-form.component.html
@@ -17,7 +17,8 @@
                 <label for="email" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left" [class.invalid]='getValidationState("email")'>
                       <input name="email" type="text" #eamilInput="ngModel" [(ngModel)]="newUser.email" 
                       required 
-                      pattern='^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$' id="email" size="36"
+                      email
+                      id="email" size="36"
                       (input)='handleValidation("email", false)' 
                 (focusout)='handleValidation("email", true)'>
                       <span class="tooltip-content">
diff --git a/src/ui_ng/src/app/shared/shared.module.ts b/src/ui_ng/src/app/shared/shared.module.ts
index 88829d067..662bb3d57 100644
--- a/src/ui_ng/src/app/shared/shared.module.ts
+++ b/src/ui_ng/src/app/shared/shared.module.ts
@@ -38,6 +38,7 @@ import { ListProjectROComponent } from './list-project-ro/list-project-ro.compon
 import { ListRepositoryROComponent } from './list-repository-ro/list-repository-ro.component';
 
 import { MessageHandlerService } from './message-handler/message-handler.service';
+import { EmailValidatorDirective } from './email.directive';
 
 @NgModule({
   imports: [
@@ -60,7 +61,8 @@ import { MessageHandlerService } from './message-handler/message-handler.service
     StatisticsComponent,
     StatisticsPanelComponent,
     ListProjectROComponent,
-    ListRepositoryROComponent
+    ListRepositoryROComponent,
+    EmailValidatorDirective
   ],
   exports: [
     CoreModule,
@@ -79,7 +81,8 @@ import { MessageHandlerService } from './message-handler/message-handler.service
     StatisticsComponent,
     StatisticsPanelComponent,
     ListProjectROComponent,
-    ListRepositoryROComponent
+    ListRepositoryROComponent,
+    EmailValidatorDirective
   ],
   providers: [
     SessionService,
diff --git a/src/ui_ng/src/app/user/user.component.ts b/src/ui_ng/src/app/user/user.component.ts
index a6d8f92f2..66956b73f 100644
--- a/src/ui_ng/src/app/user/user.component.ts
+++ b/src/ui_ng/src/app/user/user.component.ts
@@ -130,9 +130,7 @@ export class UserComponent implements OnInit, OnDestroy {
     }
 
     //Value copy
-    let updatedUser: User = {
-      user_id: user.user_id
-    };
+    let updatedUser: User = new User(user.user_id);;
 
     if (user.has_admin_role === 0) {
       updatedUser.has_admin_role = 1;//Set as admin
diff --git a/src/ui_ng/src/app/user/user.ts b/src/ui_ng/src/app/user/user.ts
index e58688199..96095c682 100644
--- a/src/ui_ng/src/app/user/user.ts
+++ b/src/ui_ng/src/app/user/user.ts
@@ -5,6 +5,10 @@
  * @class User
  */
 export class User {
+    constructor(userId: number){
+        this.user_id = userId;
+    }
+
     user_id: number;
     username?: string;
     realname?: string;
diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json
index 684954433..1ce0dadca 100644
--- a/src/ui_ng/src/i18n/lang/en-us-lang.json
+++ b/src/ui_ng/src/i18n/lang/en-us-lang.json
@@ -112,7 +112,7 @@
         "IS_ADMIN": "Yes",
         "IS_NOT_ADMIN": "No",
         "ADD_USER_TITLE": "New User",
-        "SAVE_SUCCESS": "New user added successfully",
+        "SAVE_SUCCESS": "New user created successfully",
         "DELETION_TITLE": "Confirm user deletion",
         "DELETION_SUMMARY": "Do you want to delete user {{param}}?",
         "DELETE_SUCCESS": "User deleted successfully",
@@ -325,7 +325,7 @@
         "COPY": "Copy"
     },
     "ALERT": {
-        "FORM_CHANGE_CONFIRMATION": "Some changes are not saved yet, do you really want to cancel?"
+        "FORM_CHANGE_CONFIRMATION": "Some changes are not saved yet, do you want to cancel?"
     },
     "RESET_PWD": {
         "TITLE": "Reset Password",
@@ -392,7 +392,7 @@
         "TEST_MAIL_FAILED": "Failed to verify mail server with error: {{param}}",
         "TEST_LDAP_FAILED": "Failed to verify LDAP server with error: {{param}}",
         "LEAVING_CONFIRMATION_TITLE": "Confirm to leave",
-        "LEAVING_CONFIRMATION_SUMMARY": "Changes have not been saved yet,do you really want to leave currnet page?"
+        "LEAVING_CONFIRMATION_SUMMARY": "Changes have not been saved yet, do you want to leave currnet page?"
     },
     "PAGE_NOT_FOUND": {
         "MAIN_TITLE": "Page not found",
diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
index 6b7bd4ec6..1598b93e2 100644
--- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json
+++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json
@@ -112,7 +112,7 @@
         "IS_ADMIN": "是",
         "IS_NOT_ADMIN": "否",
         "ADD_USER_TITLE": "创建用户",
-        "SAVE_SUCCESS": "添加用户成功",
+        "SAVE_SUCCESS": "创建用户成功",
         "DELETION_TITLE": "删除用户确认",
         "DELETION_SUMMARY": "你确认删除用户 {{param}}?",
         "DELETE_SUCCESS": "删除用户成功",

From aa8edc5f15f122e051c38e7ac0d2e4d7bb928299 Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Thu, 30 Mar 2017 13:40:36 +0800
Subject: [PATCH 10/12] fix user constructor issue

---
 src/ui_ng/src/app/user/user.component.ts | 3 ++-
 src/ui_ng/src/app/user/user.ts           | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/ui_ng/src/app/user/user.component.ts b/src/ui_ng/src/app/user/user.component.ts
index 66956b73f..c6206aa69 100644
--- a/src/ui_ng/src/app/user/user.component.ts
+++ b/src/ui_ng/src/app/user/user.component.ts
@@ -130,7 +130,8 @@ export class UserComponent implements OnInit, OnDestroy {
     }
 
     //Value copy
-    let updatedUser: User = new User(user.user_id);;
+    let updatedUser: User = new User();
+    updatedUser.user_id = user.user_id;
 
     if (user.has_admin_role === 0) {
       updatedUser.has_admin_role = 1;//Set as admin
diff --git a/src/ui_ng/src/app/user/user.ts b/src/ui_ng/src/app/user/user.ts
index 96095c682..e58688199 100644
--- a/src/ui_ng/src/app/user/user.ts
+++ b/src/ui_ng/src/app/user/user.ts
@@ -5,10 +5,6 @@
  * @class User
  */
 export class User {
-    constructor(userId: number){
-        this.user_id = userId;
-    }
-
     user_id: number;
     username?: string;
     realname?: string;

From a2cfbc5519a198ed3264113df9ca54f53d0217fa Mon Sep 17 00:00:00 2001
From: Tan Jiang <jiangd@vmware.com>
Date: Wed, 29 Mar 2017 18:51:40 +0800
Subject: [PATCH 11/12] update nginx log format to include response time

---
 make/common/templates/nginx/nginx.http.conf  | 6 ++++++
 make/common/templates/nginx/nginx.https.conf | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/make/common/templates/nginx/nginx.http.conf b/make/common/templates/nginx/nginx.http.conf
index 980d9ece2..b776f7436 100644
--- a/make/common/templates/nginx/nginx.http.conf
+++ b/make/common/templates/nginx/nginx.http.conf
@@ -21,6 +21,12 @@ http {
     server ui:80;
   }
 
+  log_format timed_combined '$$remote_addr - '
+    '"$$request" $$status $$body_bytes_sent '
+    '"$$http_referer" "$$http_user_agent" '
+    '$$request_time $$upstream_response_time $$pipe';
+
+  access_log /dev/stdout timed_combined;
 
   server {
     listen 80;
diff --git a/make/common/templates/nginx/nginx.https.conf b/make/common/templates/nginx/nginx.https.conf
index 141961ecf..131aec466 100644
--- a/make/common/templates/nginx/nginx.https.conf
+++ b/make/common/templates/nginx/nginx.https.conf
@@ -21,6 +21,13 @@ http {
     server ui:80;
   }
   
+  log_format timed_combined '$$remote_addr - '
+    '"$$request" $$status $$body_bytes_sent '
+    '"$$http_referer" "$$http_user_agent" '
+    '$$request_time $$upstream_response_time $$pipe';
+
+  access_log /dev/stdout timed_combined;
+
   include /etc/nginx/conf.d/*.server.conf;
 
   server {

From b677e8338bcd52ac689cb5a79449107ffb437564 Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Thu, 30 Mar 2017 16:06:51 +0800
Subject: [PATCH 12/12] Fix list job error message.

---
 src/ui_ng/src/app/replication/list-job/list-job.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui_ng/src/app/replication/list-job/list-job.component.ts b/src/ui_ng/src/app/replication/list-job/list-job.component.ts
index f57299d8e..42db7932d 100644
--- a/src/ui_ng/src/app/replication/list-job/list-job.component.ts
+++ b/src/ui_ng/src/app/replication/list-job/list-job.component.ts
@@ -22,7 +22,7 @@ export class ListJobComponent {
       for(let i = 0; i < this.jobs.length; i++) {
         let j = this.jobs[i];
         if(j.status === 'retrying' || j.status === 'error') {
-          this.messageHandlerService.showError('', '');
+          this.messageHandlerService.showError('REPLICATION.FOUND_ERROR_IN_JOBS', '');
         }
       }
       this.paginate.emit(state);