Merge pull request #499 from openziti/496-tag-editor

Add Tag Editor to other entity pages
openziti · Sep 19, 2024 · 7e0554b · 7e0554b
2 parents eb05598 + 28ad26c
commit 7e0554b
Show file tree

Hide file tree

Showing 21 changed files with 78 additions and 24 deletions.
diff --git a/projects/ziti-console-lib/src/lib/features/custom-tags/custom-tags.component.ts b/projects/ziti-console-lib/src/lib/features/custom-tags/custom-tags.component.ts
@@ -14,15 +14,15 @@
     limitations under the License.
 */
 
-import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges} from '@angular/core';
 import {isEmpty, map, unset} from "lodash";
 
 @Component({
   selector: 'lib-custom-tags',
   templateUrl: './custom-tags.component.html',
   styleUrls: ['./custom-tags.component.scss']
 })
-export class CustomTagsComponent implements OnInit {
+export class CustomTagsComponent implements OnInit, OnChanges {
 
   @Input() tags: any = {};
   @Output() tagsChange: EventEmitter<any> = new EventEmitter<any>();
@@ -39,6 +39,10 @@ export class CustomTagsComponent implements OnInit {
     this.updateTagsArray();
   }
 
+  ngOnChanges(changes: SimpleChanges) {
+    this.updateTagsArray()
+  }
+
   updateTagsArray() {
     this.tagsArray = map(this.tags, (value, key) => {
       return {name: key, value: value}

diff --git a/...le-lib/src/lib/features/projectable-forms/configuration/configuration-form.component.html b/...le-lib/src/lib/features/projectable-forms/configuration/configuration-form.component.html
@@ -82,6 +82,17 @@
                         ></lib-config-editor>
                     </div>
                 </lib-form-field-container>
+                <lib-form-field-toggle [(toggleOn)]="showMore" (toggleOnChange)="showMoreChanged($event)" style="margin: 0px 10px"></lib-form-field-toggle>
+                <div [hidden]="!showMore" class="form-group-column">
+                    <lib-form-field-container
+                            [title]="'Custom Tags'"
+                            [label]="'OPTIONAL'"
+                            class="form-field-advanced"
+                            *ngIf="!hideTags"
+                    >
+                        <lib-custom-tags [(tags)]="formData.tags"></lib-custom-tags>
+                    </lib-form-field-container>
+                </div>
             </div>
             <div class="form-group-column two-fifths">
                 <lib-form-field-container

diff --git a/...sole-lib/src/lib/features/projectable-forms/configuration/configuration-form.component.ts b/...sole-lib/src/lib/features/projectable-forms/configuration/configuration-form.component.ts
@@ -239,6 +239,7 @@ export class ConfigurationFormComponent extends ProjectableForm implements OnIni
             name: this.formData?.name || '',
             configTypeId: this.formData?.configTypeId || '',
             data: this.formData?.data || {},
+            tags: this.formData?.tags
         };
         this._apiData = data;
         return this._apiData;

diff --git a/.../lib/features/projectable-forms/edge-router-policy/edge-router-policy-form.component.html b/.../lib/features/projectable-forms/edge-router-policy/edge-router-policy-form.component.html
@@ -67,6 +67,17 @@
                         <option value="AllOf">AllOf</option>
                     </select>
                 </lib-form-field-container>
+                <lib-form-field-toggle [(toggleOn)]="showMore" (toggleOnChange)="showMoreChanged($event)" style="margin: 0px 10px"></lib-form-field-toggle>
+                <div [hidden]="!showMore" class="form-group-column">
+                    <lib-form-field-container
+                            [title]="'Custom Tags'"
+                            [label]="'OPTIONAL'"
+                            class="form-field-advanced"
+                            *ngIf="!hideTags"
+                    >
+                        <lib-custom-tags [(tags)]="formData.tags"></lib-custom-tags>
+                    </lib-form-field-container>
+                </div>
             </div>
             <div class="form-group-column two-fifths">
                 <lib-form-field-container

diff --git a/...rc/lib/features/projectable-forms/edge-router-policy/edge-router-policy-form.component.ts b/...rc/lib/features/projectable-forms/edge-router-policy/edge-router-policy-form.component.ts
@@ -51,7 +51,6 @@ export class EdgeRouterPolicyFormComponent extends ProjectableForm implements On
   identitiesLoading = false;
   postureChecksLoading = false;
 
-  showMore = false;
   settings: any = {};
 
   override entityType = 'edge-router-policies';
@@ -297,7 +296,8 @@ ${this.formData.id ? '--request PATCH \\' : ''}
       edgeRouterRoles: this.svc.getSelectedRoles(this.selectedEdgeRouterRoleAttributes, this.selectedEdgeRouterNamedAttributes, this.svc.edgeRouterNamedAttributesMap),
       identityRoles: this.svc.getSelectedRoles(this.selectedIdentityRoleAttributes, this.selectedIdentityNamedAttributes, this.svc.identityNamedAttributesMap),
       semantic: this.formData.semantic,
-      type: this.formData.type
+      type: this.formData.type,
+      tags: this.formData.tags
     }
     return data;
   }

diff --git a/...-console-lib/src/lib/features/projectable-forms/edge-router/edge-router-form.component.ts b/...-console-lib/src/lib/features/projectable-forms/edge-router/edge-router-form.component.ts
@@ -51,7 +51,6 @@ export class EdgeRouterFormComponent extends ProjectableForm implements OnInit,
     {id: 'default', name: 'Default'}
   ];
 
-  showMore = false;
   settings: any = {};
 
   constructor(

diff --git a/...s/ziti-console-lib/src/lib/features/projectable-forms/identity/identity-form.component.ts b/...s/ziti-console-lib/src/lib/features/projectable-forms/identity/identity-form.component.ts
@@ -69,7 +69,6 @@ export class IdentityFormComponent extends ProjectableForm implements OnInit, On
   servicePoliciesLoading = false;
   authPolicies: any = [];
 
-  showMore = false;
   formView = 'simple';
   enrollmentType = 'ott';
   enrollmentCA;
@@ -311,12 +310,12 @@ export class IdentityFormComponent extends ProjectableForm implements OnInit, On
       type: this.formData?.type?.name || this.formData?.type || '',
       appData: this.formData?.appData || '',
       isAdmin: this.formData?.isAdmin || '',
-      roleAttributes: this.formData.roleAttributes || '',
-      authPolicyId: this.formData.authPolicyId || '',
-      externalId: this.formData.externalId || '',
-      defaultHostingCost: this.formData.defaultHostingCost || '0',
-      defaultHostingPrecedence: this.formData.defaultHostingPrecedence || 'defaultHostingPrecedence',
-      tags: this.formData.tags || ''
+      roleAttributes: this.formData?.roleAttributes || '',
+      authPolicyId: this.formData?.authPolicyId || '',
+      externalId: this.formData?.externalId || '',
+      defaultHostingCost: this.formData?.defaultHostingCost || '0',
+      defaultHostingPrecedence: this.formData?.defaultHostingPrecedence || 'defaultHostingPrecedence',
+      tags: this.formData?.tags
     };
     if (!this.isEditing) {
       data.enrollment = this.formData.enrollment || {ott: true};

diff --git a/projects/ziti-console-lib/src/lib/features/projectable-forms/projectable-form.class.ts b/projects/ziti-console-lib/src/lib/features/projectable-forms/projectable-form.class.ts
@@ -73,6 +73,7 @@ export abstract class ProjectableForm extends ExtendableComponent implements DoC
     apiOptions = [{id: 'cli', label: 'Copy as CLI'}, {id: 'curl', label: 'Copy as CURL'}];
     basePath = '';
     previousRoute;
+    showMore = false;
 
     checkDataChangeDebounced = debounce(this.checkDataChange, 100, {maxWait: 100});
 

diff --git a/...ojectable-forms/service-edge-router-policy/service-edge-router-policy-form.component.html b/...ojectable-forms/service-edge-router-policy/service-edge-router-policy-form.component.html
@@ -67,6 +67,17 @@
                         <option value="AllOf">AllOf</option>
                     </select>
                 </lib-form-field-container>
+                <lib-form-field-toggle [(toggleOn)]="showMore" (toggleOnChange)="showMoreChanged($event)" style="margin: 0px 10px"></lib-form-field-toggle>
+                <div [hidden]="!showMore" class="form-group-column">
+                    <lib-form-field-container
+                            [title]="'Custom Tags'"
+                            [label]="'OPTIONAL'"
+                            class="form-field-advanced"
+                            *ngIf="!hideTags"
+                    >
+                        <lib-custom-tags [(tags)]="formData.tags"></lib-custom-tags>
+                    </lib-form-field-container>
+                </div>
             </div>
             <div class="form-group-column two-fifths">
                 <lib-form-field-container

diff --git a/...projectable-forms/service-edge-router-policy/service-edge-router-policy-form.component.ts b/...projectable-forms/service-edge-router-policy/service-edge-router-policy-form.component.ts
@@ -50,7 +50,6 @@ export class ServiceEdgeRouterPolicyFormComponent extends ProjectableForm implem
   edgeRoutersLoading = false;
   servicesLoading = false;
 
-  showMore = false;
   settings: any = {};
 
   override entityType = 'service-edge-router-policies';
@@ -295,7 +294,8 @@ ${this.formData.id ? '--request PATCH \\' : ''}
       appData: this.formData?.appData || '',
       edgeRouterRoles: this.svc.getSelectedRoles(this.selectedEdgeRouterRoleAttributes, this.selectedEdgeRouterNamedAttributes, this.svc.edgeRouterNamedAttributesMap),
       serviceRoles: this.svc.getSelectedRoles(this.selectedServiceRoleAttributes, this.selectedServiceNamedAttributes, this.svc.serviceNamedAttributesMap),
-      semantic: this.formData.semantic,
+      semantic: this.formData?.semantic,
+      tags: this.formData?.tags
     }
     return data;
   }

diff --git a/...-lib/src/lib/features/projectable-forms/service-policy/service-policy-form.component.html b/...-lib/src/lib/features/projectable-forms/service-policy/service-policy-form.component.html
@@ -92,6 +92,17 @@
                         <option value="AllOf">AllOf</option>
                     </select>
                 </lib-form-field-container>
+                <lib-form-field-toggle [(toggleOn)]="showMore" (toggleOnChange)="showMoreChanged($event)" style="margin: 0px 10px"></lib-form-field-toggle>
+                <div [hidden]="!showMore" class="form-group-column">
+                    <lib-form-field-container
+                            [title]="'Custom Tags'"
+                            [label]="'OPTIONAL'"
+                            class="form-field-advanced"
+                            *ngIf="!hideTags"
+                    >
+                        <lib-custom-tags [(tags)]="formData.tags"></lib-custom-tags>
+                    </lib-form-field-container>
+                </div>
             </div>
             <div class="form-group-column two-fifths">
                 <lib-form-field-container

diff --git a/...le-lib/src/lib/features/projectable-forms/service-policy/service-policy-form.component.ts b/...le-lib/src/lib/features/projectable-forms/service-policy/service-policy-form.component.ts
@@ -53,7 +53,6 @@ export class ServicePolicyFormComponent extends ProjectableForm implements OnIni
   identitiesLoading = false;
   postureChecksLoading = false;
 
-  showMore = false;
   settings: any = {};
 
   override entityType = 'service-policies';
@@ -295,8 +294,9 @@ export class ServicePolicyFormComponent extends ProjectableForm implements OnIni
       serviceRoles: this.svc.getSelectedRoles(this.selectedServiceRoleAttributes, this.selectedServiceNamedAttributes, this.svc.serviceNamedAttributesMap),
       identityRoles: this.svc.getSelectedRoles(this.selectedIdentityRoleAttributes, this.selectedIdentityNamedAttributes, this.svc.identityNamedAttributesMap),
       postureCheckRoles: this.svc.getSelectedRoles(this.selectedPostureRoleAttributes, this.selectedPostureNamedAttributes, this.svc.postureNamedAttributesMap),
-      semantic: this.formData.semantic,
-      type: this.formData.type
+      semantic: this.formData?.semantic,
+      type: this.formData?.type,
+      tags: this.formData?.tags
     }
     return data;
   }

diff --git a/...cts/ziti-console-lib/src/lib/features/projectable-forms/service/service-form.component.ts b/...cts/ziti-console-lib/src/lib/features/projectable-forms/service/service-form.component.ts
@@ -91,7 +91,6 @@ export class ServiceFormComponent extends ProjectableForm implements OnInit, OnC
     {id: 'tcp', name: 'TCP'}
   ];
 
-  showMore = false;
   formView = 'simple';
   formDataInvalid = false;
   settings: any = {};

diff --git a/projects/ziti-console-lib/src/lib/features/wrappers/zac-wrapper-service.class.ts b/projects/ziti-console-lib/src/lib/features/wrappers/zac-wrapper-service.class.ts
@@ -44,6 +44,8 @@ export abstract class ZacWrapperServiceClass {
     initZACPersonalSettings() {
         if (!this.settingsService?.supportedFeatures?.tags) {
             localStorage.setItem("hideTags", "yes");
+        } else {
+            localStorage.removeItem("hideTags")
         }
         if (localStorage.getItem("primaryColor")!=null) {
             document.documentElement.style.setProperty("--primary", localStorage.getItem("primaryColor"));

diff --git a/projects/ziti-console-lib/src/lib/features/wrappers/zac-wrapper.component.ts b/projects/ziti-console-lib/src/lib/features/wrappers/zac-wrapper.component.ts
@@ -17,7 +17,7 @@
 import {Component, Inject, OnDestroy, OnInit, ViewChild} from '@angular/core';
 import {Router, NavigationEnd} from '@angular/router';
 import {ZAC_WRAPPER_SERVICE, ZacWrapperServiceClass} from "./zac-wrapper-service.class";
-import {delay, invoke, isEmpty, defer, set, get} from 'lodash';
+import {cloneDeep, delay, invoke, isEmpty, defer, set, get} from 'lodash';
 import {Subscription} from "rxjs";
 import {SettingsService, SETTINGS_SERVICE} from "../../services/settings.service";
 import {LoggerService} from "../messaging/logger.service";
@@ -71,8 +71,9 @@ export class ZacWrapperComponent implements OnInit, OnDestroy {
     );
     this.subscription.add(
       this.settingsService.settingsChange.subscribe(async (results:any) => {
+        const hasSession = !isEmpty(results?.session?.id);
         const controllerChanged = this.settings?.session?.controllerDomain !== results?.session?.controllerDomain;
-        if ((this.waitingForSession && !this.pageLoading) || controllerChanged) {
+        if (hasSession && (!this.pageLoading || controllerChanged)) {
           this.pageLoading = true;
           this.pageHtml = undefined;
           defer(async () => {
@@ -81,7 +82,7 @@ export class ZacWrapperComponent implements OnInit, OnDestroy {
             this.pageLoading = false;
           });
         }
-        this.settings = results;
+        this.settings = cloneDeep(results);
       })
     );
     this.subscription.add(

diff --git a/projects/ziti-console-lib/src/lib/features/wrappers/zac-wrapper.service.ts b/projects/ziti-console-lib/src/lib/features/wrappers/zac-wrapper.service.ts
@@ -936,13 +936,13 @@ export class ZacWrapperService extends ZacWrapperServiceClass {
 
     handleError(result: any) {
         this.loggerService.error(result);
-        const error = result;
+        const error = result.error ? result.error : result;
         let message = '';
         if (error.cause&&error.causeMessage&&error.causeMessage.length>0) message = error.causeMessage;
         else if (error.cause&&error.cause.message&&error.cause.message.length>0) message = error.cause.message;
         else if (error.cause&&error.cause.reason&&error.cause.reason.length>0) message = error.cause.reason;
         else if (error.message&&error.message.length>0) message = error.message;
         else message = error;
-        return {error: message};
+        return {error: message, data: []};
     }
 }
diff --git a/projects/ziti-console-lib/src/lib/models/config.ts b/projects/ziti-console-lib/src/lib/models/config.ts
@@ -2,4 +2,5 @@ export class Config {
     name = '';
     data = {};
     configTypeId = '';
+    tags: any = {};
 };
diff --git a/projects/ziti-console-lib/src/lib/models/edge-router-policy.ts b/projects/ziti-console-lib/src/lib/models/edge-router-policy.ts
@@ -3,4 +3,5 @@ export class EdgeRouterPolicy {
     edgeRouterRoles: any[] = [];
     identityRoles: any[] = [];
     semantic = 'AnyOf';
+    tags: any = {}
 };
diff --git a/projects/ziti-console-lib/src/lib/models/service-edge-router-policy.ts b/projects/ziti-console-lib/src/lib/models/service-edge-router-policy.ts
@@ -3,4 +3,5 @@ export class ServiceEdgeRouterPolicy {
     edgeRouterRoles: any[] = [];
     serviceRoles: any[] = [];
     semantic = 'AnyOf';
+    tags: any = {};
 };
diff --git a/projects/ziti-console-lib/src/lib/models/service-policy.ts b/projects/ziti-console-lib/src/lib/models/service-policy.ts
@@ -5,4 +5,5 @@ export class ServicePolicy {
     postureCheckRoles: any[] = [];
     semantic = 'AnyOf';
     type = 'Bind';
+    tags: any = {};
 };
diff --git a/projects/ziti-console-lib/src/lib/services/settings-service.class.ts b/projects/ziti-console-lib/src/lib/services/settings-service.class.ts
@@ -66,7 +66,7 @@ export abstract class SettingsServiceClass {
 
     public supportedFeatures: any = {
         organization: false,
-        tags: false,
+        tags: true,
         customFields: false,
         mailer: false,
         recipes: false