Merge 962943e into 03e13af

goharbor · Nov 23, 2017 · 14c5312 · 14c5312
2 parents 03e13af + 962943e
commit 14c5312
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts
@@ -118,7 +118,6 @@ export class CreateEditEndpointComponent implements AfterViewChecked, OnDestroy
 
     setInsecureValue($event: any) {
         this.target.insecure = !$event;
-        this.endpointHasChanged  = true;
     }
 
     ngOnDestroy(): void {
@@ -157,6 +156,8 @@ export class CreateEditEndpointComponent implements AfterViewChecked, OnDestroy
         this.target = this.initEndpoint();
         this.initVal = this.initEndpoint();
         this.formValues = null;
+
+        this.inlineAlert.close();
     }
 
     //Forcely refresh the view
@@ -212,6 +213,12 @@ export class CreateEditEndpointComponent implements AfterViewChecked, OnDestroy
             payload.username = this.target.username;
             payload.password = this.target.password;
             payload.insecure = this.target.insecure;
+        }else if (this.checkboxHasChanged) {
+            payload.insecure = this.target.insecure;
+            payload.id = this.target.id;
+            delete payload.username;
+            delete payload.password;
+            delete payload.name;
         } else {
             payload.id = this.target.id;
         }
@@ -301,6 +308,8 @@ export class CreateEditEndpointComponent implements AfterViewChecked, OnDestroy
             payload.password = this.target.password;
         }else {
             delete payload.endpoint;
+            delete payload.username;
+            delete payload.password;
         }
         if (this.checkboxHasChanged) {
             payload.insecure = this.target.insecure;

diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json
@@ -31,7 +31,7 @@
         "clarity-icons": "^0.9.8",
         "clarity-ui": "^0.9.8",
         "core-js": "^2.4.1",
-        "harbor-ui": "0.5.10",
+        "harbor-ui": "0.5.14",
         "intl": "^1.2.5",
         "mutationobserver-shim": "^0.3.2",
         "ngx-cookie": "^1.0.0",