@openziti/ziti-console-lib 0.4.3 → 0.4.4

package/fesm2022/openziti-ziti-console-lib.mjs

@@ -8,7 +8,7 @@ import * as i1$1 from '@angular/common/http';
 import { HttpClient, HttpClientModule } from '@angular/common/http';
 import * as i1 from 'ngx-logger';
 import { NgxLoggerLevel } from 'ngx-logger';
-import _, { isNumber, includes, isNil, defer, set, invoke, get, debounce, isEmpty, isNaN as isNaN$1, cloneDeep, unset, isBoolean, keys, forEach, isEqual, slice, delay, isFunction, map as map$1, forOwn, isString, some, filter, sortedUniq, invert, isArray } from 'lodash';
+import _, { isNumber, includes, isNil, defer, set, invoke, get, debounce, isEmpty, isNaN as isNaN$1, cloneDeep, unset, isBoolean, keys, forEach, isEqual, delay, isFunction, map as map$1, forOwn, isString, some, filter, sortedUniq, invert, isArray } from 'lodash';
 import { __decorate, __param } from 'tslib';
 import * as i1$4 from '@angular/common';
 import { CommonModule } from '@angular/common';
@@ -2421,6 +2421,7 @@ let ListPageServiceClass = class ListPageServiceClass {
         this.csvDownloadService = csvDownloadService;
         this.extensionService = extensionService;
         this.router = router;
+        this.basePath = '';
         this.headerComponentParams = {
             filterType: 'TEXTINPUT',
             enableSorting: true
@@ -2483,6 +2484,15 @@ let ListPageServiceClass = class ListPageServiceClass {
                 }
             }
         });
+        router.events.subscribe((event) => {
+            if (event => event instanceof NavigationEnd) {
+                if (!event?.snapshot?.routeConfig?.path) {
+                    return;
+                }
+                const pathSegments = event.snapshot.routeConfig.path.split('/');
+                this.basePath = pathSegments[0];
+            }
+        });
     }
     initMenuActions() {
         if (this.extensionService.listActions) {
@@ -2544,22 +2554,12 @@ let ListPageServiceClass = class ListPageServiceClass {
         }
         return text?.length > 0;
     }
-    openEditForm(itemId = '', baseUrl) {
+    openEditForm(itemId = '', basePath) {
         if (isEmpty(itemId)) {
             itemId = 'create';
         }
-        baseUrl = baseUrl ? baseUrl : this.getBaseURLPath();
-        this.router?.navigateByUrl(`${baseUrl}${itemId}`);
-    }
-    getBaseURLPath() {
-        let path = '';
-        window.location.pathname.split('/').forEach(segment => {
-            if (isEmpty(segment)) {
-                return;
-            }
-            path += `${segment}/`;
-        });
-        return path;
+        basePath = basePath ? basePath : this.basePath;
+        this.router?.navigateByUrl(`${basePath}${itemId}`);
     }
 };
 ListPageServiceClass = __decorate([
@@ -3075,16 +3075,16 @@ class TableCellNameComponent {
         return true;
     }
     linkClicked(event) {
-        this.router.navigateByUrl(`${this.cellParams.pathRoot}${this.item.id}`);
+        this.router.navigateByUrl(`${this.cellParams.pathRoot}/${this.item.id}`);
         event.stopPropagation();
         event.preventDefault();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TableCellNameComponent, deps: [{ token: i3$2.MatDialog }, { token: i3.Router }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: TableCellNameComponent, selector: "lib-table-cell-name", ngImport: i0, template: "<span class=\"cell-name-container\">\n    <a href=\"./{{cellParams.pathRoot}}{{item.id}}\" (click)=\"linkClicked($event)\">\n        <div class=\"col cell-name-renderer\" data-id=\"{{item.id}}\">\n            <div *ngIf=\"cellParams.showIdentityIcons\" class=\"cell-status-container\">\n                <span class=\"circle {{item.hasApiSession}}\" title=\"Api Session\"></span>\n                <span class=\"circle {{item.hasEdgeRouterConnection}}\" title=\"Edge Router Connected\"></span>\n            </div>\n            <div *ngIf=\"cellParams.showRouterIcons\" class=\"cell-status-container\">\n                <span class=\"circle {{item.isVerified}}\" title=\"Api Session\"></span>\n                <span class=\"circle {{item.isOnline}}\" title=\"Edge Router Connected\"></span>\n            </div>\n            <strong>{{item.name}}</strong>\n        </div>\n    </a>\n</span>\n", styles: [".cell-name-renderer{display:flex;flex-direction:row;gap:5px}.cell-name-container{display:flex;flex-direction:row;flex-wrap:nowrap}.cell-status-container{position:relative;display:flex;align-items:center;justify-content:center;gap:4px}\n"], dependencies: [{ kind: "directive", type: i1$4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: TableCellNameComponent, selector: "lib-table-cell-name", ngImport: i0, template: "<span class=\"cell-name-container\">\n    <a href=\"./{{cellParams.pathRoot}}/{{item.id}}\" (click)=\"linkClicked($event)\">\n        <div class=\"col cell-name-renderer\" data-id=\"{{item.id}}\">\n            <div *ngIf=\"cellParams.showIdentityIcons\" class=\"cell-status-container\">\n                <span class=\"circle {{item.hasApiSession}}\" title=\"Api Session\"></span>\n                <span class=\"circle {{item.hasEdgeRouterConnection}}\" title=\"Edge Router Connected\"></span>\n            </div>\n            <div *ngIf=\"cellParams.showRouterIcons\" class=\"cell-status-container\">\n                <span class=\"circle {{item.isVerified}}\" title=\"Api Session\"></span>\n                <span class=\"circle {{item.isOnline}}\" title=\"Edge Router Connected\"></span>\n            </div>\n            <strong>{{item.name}}</strong>\n        </div>\n    </a>\n</span>\n", styles: [".cell-name-renderer{display:flex;flex-direction:row;gap:5px}.cell-name-container{display:flex;flex-direction:row;flex-wrap:nowrap}.cell-status-container{position:relative;display:flex;align-items:center;justify-content:center;gap:4px}\n"], dependencies: [{ kind: "directive", type: i1$4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: TableCellNameComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'lib-table-cell-name', template: "<span class=\"cell-name-container\">\n    <a href=\"./{{cellParams.pathRoot}}{{item.id}}\" (click)=\"linkClicked($event)\">\n        <div class=\"col cell-name-renderer\" data-id=\"{{item.id}}\">\n            <div *ngIf=\"cellParams.showIdentityIcons\" class=\"cell-status-container\">\n                <span class=\"circle {{item.hasApiSession}}\" title=\"Api Session\"></span>\n                <span class=\"circle {{item.hasEdgeRouterConnection}}\" title=\"Edge Router Connected\"></span>\n            </div>\n            <div *ngIf=\"cellParams.showRouterIcons\" class=\"cell-status-container\">\n                <span class=\"circle {{item.isVerified}}\" title=\"Api Session\"></span>\n                <span class=\"circle {{item.isOnline}}\" title=\"Edge Router Connected\"></span>\n            </div>\n            <strong>{{item.name}}</strong>\n        </div>\n    </a>\n</span>\n", styles: [".cell-name-renderer{display:flex;flex-direction:row;gap:5px}.cell-name-container{display:flex;flex-direction:row;flex-wrap:nowrap}.cell-status-container{position:relative;display:flex;align-items:center;justify-content:center;gap:4px}\n"] }]
+            args: [{ selector: 'lib-table-cell-name', template: "<span class=\"cell-name-container\">\n    <a href=\"./{{cellParams.pathRoot}}/{{item.id}}\" (click)=\"linkClicked($event)\">\n        <div class=\"col cell-name-renderer\" data-id=\"{{item.id}}\">\n            <div *ngIf=\"cellParams.showIdentityIcons\" class=\"cell-status-container\">\n                <span class=\"circle {{item.hasApiSession}}\" title=\"Api Session\"></span>\n                <span class=\"circle {{item.hasEdgeRouterConnection}}\" title=\"Edge Router Connected\"></span>\n            </div>\n            <div *ngIf=\"cellParams.showRouterIcons\" class=\"cell-status-container\">\n                <span class=\"circle {{item.isVerified}}\" title=\"Api Session\"></span>\n                <span class=\"circle {{item.isOnline}}\" title=\"Edge Router Connected\"></span>\n            </div>\n            <strong>{{item.name}}</strong>\n        </div>\n    </a>\n</span>\n", styles: [".cell-name-renderer{display:flex;flex-direction:row;gap:5px}.cell-name-container{display:flex;flex-direction:row;flex-wrap:nowrap}.cell-status-container{position:relative;display:flex;align-items:center;justify-content:center;gap:4px}\n"] }]
         }], ctorParameters: function () { return [{ type: i3$2.MatDialog }, { type: i3.Router }]; } });
 
 /*
@@ -4325,7 +4325,7 @@ class ConfigurationsPageService extends ListPageServiceClass {
                 headerComponent: TableColumnDefaultComponent,
                 headerComponentParams: this.headerComponentParams,
                 cellRenderer: TableCellNameComponent,
-                cellRendererParams: { pathRoot: 'configs/' },
+                cellRendererParams: { pathRoot: this.basePath },
                 onCellClicked: (data) => {
                     if (this.hasSelectedText()) {
                         return;
@@ -5245,7 +5245,7 @@ class IdentitiesPageService extends ListPageServiceClass {
                 headerComponent: TableColumnDefaultComponent,
                 headerComponentParams: this.headerComponentParams,
                 cellRenderer: TableCellNameComponent,
-                cellRendererParams: { pathRoot: this.getBaseURLPath(), showIdentityIcons: true },
+                cellRendererParams: { pathRoot: this.basePath, showIdentityIcons: true },
                 onCellClicked: (data) => {
                     if (this.hasSelectedText()) {
                         return;
@@ -5804,7 +5804,7 @@ class EdgeRoutersPageService extends ListPageServiceClass {
                 headerComponent: TableColumnDefaultComponent,
                 headerComponentParams: this.headerComponentParams,
                 cellRenderer: TableCellNameComponent,
-                cellRendererParams: { pathRoot: this.getBaseURLPath(), showRouterIcons: true },
+                cellRendererParams: { pathRoot: this.basePath, showRouterIcons: true },
                 onCellClicked: (data) => {
                     if (this.hasSelectedText()) {
                         return;
@@ -7755,6 +7755,7 @@ class ProjectableForm extends ExtendableComponent {
         this.initData = {};
         this._dataChange = false;
         this.apiOptions = [{ id: 'cli', label: 'Copy as CLI' }, { id: 'curl', label: 'Copy as CURL' }];
+        this.basePath = '';
         this.checkDataChangeDebounced = debounce(this.checkDataChange, 100, { maxWait: 100 });
         this.subscription = new Subscription();
         this.subscription.add(this.route?.params?.subscribe(params => {
@@ -7763,6 +7764,15 @@ class ProjectableForm extends ExtendableComponent {
                 this.entityId = id;
             }
         }));
+        this.subscription.add(router.events.subscribe((event) => {
+            if (event => event instanceof NavigationEnd) {
+                if (!event?.snapshot?.routeConfig?.path) {
+                    return;
+                }
+                const pathSegments = event.snapshot.routeConfig.path.split('/');
+                this.basePath = pathSegments[0];
+            }
+        }));
     }
     ngAfterViewInit() {
         super.ngAfterViewInit();
@@ -7886,8 +7896,7 @@ class ProjectableForm extends ExtendableComponent {
         }
     }
     returnToListPage() {
-        const baseUrl = this.getBaseURLPath();
-        this.router?.navigateByUrl(`${baseUrl}`);
+        this.router?.navigateByUrl(`${this.basePath}`);
     }
     ngDoCheck() {
         this.checkDataChangeDebounced();
@@ -7940,18 +7949,6 @@ class ProjectableForm extends ExtendableComponent {
             return results.data;
         });
     }
-    getBaseURLPath() {
-        let path = '';
-        const urlSegments = window.location.pathname.split('/');
-        const baseSegments = slice(urlSegments, 0, urlSegments.length - 1);
-        baseSegments.forEach(segment => {
-            if (isEmpty(segment)) {
-                return;
-            }
-            path += `/${segment}`;
-        });
-        return path;
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ProjectableForm, deps: [{ token: GrowlerService }, { token: SHAREDZ_EXTENSION }, { token: ZITI_DATA_SERVICE }, { token: i3.Router }, { token: i3.ActivatedRoute }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: ProjectableForm, selector: "ng-component", inputs: { isModal: "isModal", entityId: "entityId", formData: "formData" }, outputs: { close: "close", dataChange: "dataChange" }, viewQueries: [{ propertyName: "nameFieldInput", first: true, predicate: ["nameFieldInput"], descendants: true }], usesInheritance: true, ngImport: i0, template: '', isInline: true, styles: [""] }); }
 }
@@ -10682,6 +10679,7 @@ class ServicesPageService extends ListPageServiceClass {
             { name: 'Download Selected', action: 'download-selected' },
         ];
         this.resourceType = 'services';
+        this.basePath = '/services/advanced';
         this.validate = (formData) => {
             return Promise.resolve({ passed: true });
         };
@@ -10702,7 +10700,7 @@ class ServicesPageService extends ListPageServiceClass {
                 headerComponent: TableColumnDefaultComponent,
                 headerComponentParams: this.headerComponentParams,
                 cellRenderer: TableCellNameComponent,
-                cellRendererParams: { pathRoot: 'services/advanced/' },
+                cellRendererParams: { pathRoot: '/services/advanced' },
                 onCellClicked: (data) => {
                     if (this.hasSelectedText()) {
                         return;
@@ -16279,7 +16277,7 @@ class EdgeRouterPoliciesPageService extends ListPageServiceClass {
                 headerComponent: TableColumnDefaultComponent,
                 headerComponentParams: this.headerComponentParams,
                 cellRenderer: TableCellNameComponent,
-                cellRendererParams: { pathRoot: 'router-policies/' },
+                cellRendererParams: { pathRoot: this.basePath },
                 onCellClicked: (data) => {
                     if (this.hasSelectedText()) {
                         return;
@@ -16797,7 +16795,7 @@ class ServicePoliciesPageService extends ListPageServiceClass {
                 headerComponent: TableColumnDefaultComponent,
                 headerComponentParams: this.headerComponentParams,
                 cellRenderer: TableCellNameComponent,
-                cellRendererParams: { pathRoot: 'service-policies/' },
+                cellRendererParams: { pathRoot: this.basePath },
                 onCellClicked: (data) => {
                     if (this.hasSelectedText()) {
                         return;
@@ -18292,7 +18290,7 @@ class ServiceEdgeRouterPoliciesPageService extends ListPageServiceClass {
                 headerComponent: TableColumnDefaultComponent,
                 headerComponentParams: this.headerComponentParams,
                 cellRenderer: TableCellNameComponent,
-                cellRendererParams: { pathRoot: 'service-router-policies/' },
+                cellRendererParams: { pathRoot: this.basePath },
                 onCellClicked: (data) => {
                     if (this.hasSelectedText()) {
                         return;
@@ -19345,7 +19343,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }] });
 
 const VERSION = {
-    "version": "3.4.2"
+    "version": "3.4.3"
 };
 
 /*