From 9afd0c9c3c341b714fcaedd0122c45d96a39c99c Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Wed, 5 Apr 2017 18:37:27 +0800
Subject: [PATCH 1/4] fix gauge bug

---
 src/ui_ng/angular-cli.json                       |  2 +-
 .../src/app/shared/gauge/gauge.component.ts      | 16 ++++++++++------
 .../statictics/statistics-panel.component.html   |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/ui_ng/angular-cli.json b/src/ui_ng/angular-cli.json
index a33a2dbf0..e68629169 100644
--- a/src/ui_ng/angular-cli.json
+++ b/src/ui_ng/angular-cli.json
@@ -28,8 +28,8 @@
             "../node_modules/clarity-icons/clarity-icons.min.js",
             "../node_modules/web-animations-js/web-animations.min.js"
         ],
+        "environmentSource": "environments/environment.ts",
         "environments": {
-            "source": "environments/environment.ts",
             "dev": "environments/environment.ts",
             "prod": "environments/environment.prod.ts"
         }
diff --git a/src/ui_ng/src/app/shared/gauge/gauge.component.ts b/src/ui_ng/src/app/shared/gauge/gauge.component.ts
index 398c3e4e3..f945fca94 100644
--- a/src/ui_ng/src/app/shared/gauge/gauge.component.ts
+++ b/src/ui_ng/src/app/shared/gauge/gauge.component.ts
@@ -29,7 +29,7 @@ export class GaugeComponent implements AfterViewInit {
       private _colorTwo: string;
       private _size: string = "small"; //Support small, medium, large
       private _title: string = "UNKNOWN"; //Lang key
-      private _used: number = 0;
+      private _free: number = 0;
       private _threasHold: number = 0;
 
       /**
@@ -127,12 +127,12 @@ export class GaugeComponent implements AfterViewInit {
       }
 
       @Input()
-      get used(): number {
-            return this._used;
+      get free(): number {
+            return this._free;
       }
 
-      set used(u: number) {
-            this._used = u;
+      set free(u: number) {
+            this._free = u;
             this.determineColors();
       }
 
@@ -156,7 +156,11 @@ export class GaugeComponent implements AfterViewInit {
       private determineColors() {
             let percent: number = 0;
             if (this._threasHold !== 0) {
-                  percent = (this._used / this._threasHold) * 100;
+                  let used:number = this._threasHold - this._free;
+                  if(used < 0){
+                        used = 0;
+                  }
+                  percent = (used / this._threasHold) * 100;
             }
 
             while (percent > 100) {
diff --git a/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html b/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html
index ad42bcc70..7fbbd7d25 100644
--- a/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html
+++ b/src/ui_ng/src/app/shared/statictics/statistics-panel.component.html
@@ -37,7 +37,7 @@
         </div>
         <div class="statistic-item-divider" [hidden]="!isValidSession || !isValidStorage"></div>
         <div class="statistic-block" [hidden]="!isValidSession || !isValidStorage">
-            <esxc-gauge [used]="freeStorage" [threasHold]="totalStorage" [size]="small" [title]='"STATISTICS.STORAGE"' [animate]="true">
+            <esxc-gauge [free]="freeStorage" [threasHold]="totalStorage" [size]="small" [title]='"STATISTICS.STORAGE"' [animate]="true">
             </esxc-gauge>
         </div>
     </div>

From 39cfaf4be3bc2d78558febb2dcc51774ebf39c80 Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Wed, 5 Apr 2017 19:00:02 +0800
Subject: [PATCH 2/4] fix free storage info bug

---
 src/ui_ng/src/app/shared/gauge/gauge.component.html | 2 +-
 src/ui_ng/src/app/shared/gauge/gauge.component.ts   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ui_ng/src/app/shared/gauge/gauge.component.html b/src/ui_ng/src/app/shared/gauge/gauge.component.html
index 372bf8f41..51c36e082 100644
--- a/src/ui_ng/src/app/shared/gauge/gauge.component.html
+++ b/src/ui_ng/src/app/shared/gauge/gauge.component.html
@@ -5,7 +5,7 @@
         <div #barTwo class="esxc-gauge-circle-fill esxc-gauge-bar-two"></div>
         <div class="esxc-gauge-circle-inner" [ngStyle]="{'background-color': backgroundColor}">
             <div class="esxc-gauge-circle-caption">
-                <span class="esxc-value">{{used}}</span>
+                <span class="esxc-value">{{free}}</span>
             </div>
         </div>
     </div>
diff --git a/src/ui_ng/src/app/shared/gauge/gauge.component.ts b/src/ui_ng/src/app/shared/gauge/gauge.component.ts
index f945fca94..8f6e5a275 100644
--- a/src/ui_ng/src/app/shared/gauge/gauge.component.ts
+++ b/src/ui_ng/src/app/shared/gauge/gauge.component.ts
@@ -136,6 +136,10 @@ export class GaugeComponent implements AfterViewInit {
             this.determineColors();
       }
 
+      get used(): number {
+            return this._threasHold - this._free;
+      }
+
       @Input()
       get threasHold(): number {
             return this._threasHold;
@@ -156,8 +160,8 @@ export class GaugeComponent implements AfterViewInit {
       private determineColors() {
             let percent: number = 0;
             if (this._threasHold !== 0) {
-                  let used:number = this._threasHold - this._free;
-                  if(used < 0){
+                  let used: number = this._threasHold - this._free;
+                  if (used < 0) {
                         used = 0;
                   }
                   percent = (used / this._threasHold) * 100;

From b361e6332d8e886766bb09137726b5fd609abfe4 Mon Sep 17 00:00:00 2001
From: Steven Zou <szou@vmware.com>
Date: Wed, 5 Apr 2017 19:11:16 +0800
Subject: [PATCH 3/4] change free to used

---
 src/ui_ng/src/app/shared/gauge/gauge.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui_ng/src/app/shared/gauge/gauge.component.html b/src/ui_ng/src/app/shared/gauge/gauge.component.html
index 51c36e082..372bf8f41 100644
--- a/src/ui_ng/src/app/shared/gauge/gauge.component.html
+++ b/src/ui_ng/src/app/shared/gauge/gauge.component.html
@@ -5,7 +5,7 @@
         <div #barTwo class="esxc-gauge-circle-fill esxc-gauge-bar-two"></div>
         <div class="esxc-gauge-circle-inner" [ngStyle]="{'background-color': backgroundColor}">
             <div class="esxc-gauge-circle-caption">
-                <span class="esxc-value">{{free}}</span>
+                <span class="esxc-value">{{used}}</span>
             </div>
         </div>
     </div>

From f6c4137af1f76cf234adb12bb34f600c2d2ef8ef Mon Sep 17 00:00:00 2001
From: wy65701436 <wangyan@vmware.com>
Date: Wed, 5 Apr 2017 22:53:09 -0700
Subject: [PATCH 4/4] fix issue 1916

---
 make/docker-compose.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/docker-compose.tpl b/make/docker-compose.tpl
index e3eb6c0be..72338c915 100644
--- a/make/docker-compose.tpl
+++ b/make/docker-compose.tpl
@@ -7,7 +7,7 @@ services:
     volumes:
       - /var/log/harbor/:/var/log/docker/:z
     ports:
-      - 1514:514
+      - 127.0.0.1:1514:514
     networks:
       - harbor
   registry: