Merge remote-tracking branch 'upstream/master' into master-new

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:

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"
         }

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,15 +127,19 @@ export class GaugeComponent implements AfterViewInit {
       }
 
       @Input()
-      get used(): number {
+      get free(): number {
-            return this._used;
+            return this._free;
       }
 
-      set used(u: number) {
+      set free(u: number) {
-            this._used = u;
+            this._free = u;
             this.determineColors();
       }
 
+      get used(): number {
+            return this._threasHold - this._free;
+      }
+
       @Input()
       get threasHold(): number {
             return this._threasHold;
@@ -156,7 +160,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) {

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>