@openziti/ziti-console-lib 0.3.0 → 0.3.1

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

@@ -2513,6 +2513,7 @@ let ListPageServiceClass = class ListPageServiceClass {
             paging.noSearch = false;
             paging.searchOn = filters[idx].columnId;
             paging.filter = filters[idx].value;
+            paging.rawFilter = true;
         }
         return this.dataService.get(resourceType, paging, filters);
     }
@@ -6143,7 +6144,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-const CSV_COLUMNS$3 = [
+const CSV_COLUMNS$4 = [
     { label: 'Name', path: 'name' },
     { label: 'Roles', path: 'roleAttributes' },
     { label: 'Online', path: 'hasApiSession' },
@@ -6551,7 +6552,7 @@ class IdentitiesPageService extends ListPageServiceClass {
         });
     }
     downloadItems(selectedItems) {
-        this.csvDownloadService.download('identities', selectedItems, CSV_COLUMNS$3, false, false, undefined, false);
+        this.csvDownloadService.download('identities', selectedItems, CSV_COLUMNS$4, false, false, undefined, false);
     }
     openUpdate(item) {
         this.modalType = 'identity';
@@ -6737,7 +6738,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     args: [EDGE_ROUTER_EXTENSION_SERVICE]
                 }] }]; } });
 
-const CSV_COLUMNS$2 = [
+const CSV_COLUMNS$3 = [
     { label: 'Name', path: 'name' },
     { label: 'Attributes', path: 'roleAttributes' },
     { label: 'Verified', path: 'isVerified' },
@@ -7004,7 +7005,7 @@ class EdgeRoutersPageService extends ListPageServiceClass {
         });
     }
     downloadItems(selectedItems) {
-        this.csvDownloadService.download('edge-routers', selectedItems, CSV_COLUMNS$2, false, false, undefined, false);
+        this.csvDownloadService.download('edge-routers', selectedItems, CSV_COLUMNS$3, false, false, undefined, false);
     }
     reenroll(router) {
         const data = {
@@ -11120,7 +11121,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-const CSV_COLUMNS$1 = [
+const CSV_COLUMNS$2 = [
     { label: 'Name', path: 'name' },
     { label: 'Created At', path: 'createdAt' }
 ];
@@ -11270,7 +11271,7 @@ class ServicesPageService extends ListPageServiceClass {
         });
     }
     downloadItems(selectedItems) {
-        this.csvDownloadService.download('services', selectedItems, CSV_COLUMNS$1, false, false, undefined, false);
+        this.csvDownloadService.download('services', selectedItems, CSV_COLUMNS$2, false, false, undefined, false);
     }
     openUpdate(item) {
         this.modalType = 'service';
@@ -13005,11 +13006,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-const CSV_COLUMNS = [
+const CSV_COLUMNS$1 = [
     { label: 'Name', path: 'name' },
     { label: 'Created At', path: 'createdAt' }
 ];
-class ServicePoliciesPageService extends ListPageServiceClass {
+class EdgeRouterPoliciesPageService extends ListPageServiceClass {
     constructor(settings, filterService, zitiService, csvDownloadService, growlerService, dialogForm, extService) {
         super(settings, filterService, csvDownloadService, extService);
         this.zitiService = zitiService;
@@ -13018,14 +13019,14 @@ class ServicePoliciesPageService extends ListPageServiceClass {
         this.dialogForm = dialogForm;
         this.extService = extService;
         this.paging = this.DEFAULT_PAGING;
-        this.modalType = 'service-policy';
+        this.modalType = 'edge-router-policy';
         this.serviceType = '';
         this.selectedServicePolicy = new Service();
-        this.serviceRoleAttributes = [];
-        this.serviceNamedAttributes = [];
-        this.serviceNamedAttributesMap = {};
-        this.selectedServiceRoleAttributes = [];
-        this.selectedServiceNamedAttributes = [];
+        this.routerRoleAttributes = [];
+        this.routerNamedAttributes = [];
+        this.routerNamedAttributesMap = {};
+        this.selectedRouterRoleAttributes = [];
+        this.selectedRouterNamedAttributes = [];
         this.identityRoleAttributes = [];
         this.identityNamedAttributes = [];
         this.identityNamedAttributesMap = {};
@@ -13049,16 +13050,16 @@ class ServicePoliciesPageService extends ListPageServiceClass {
             { name: 'Download All', action: 'download-all' },
             { name: 'Download Selected', action: 'download-selected' },
         ];
-        this.resourceType = 'service-policies';
+        this.resourceType = 'edge-router-policies';
         this.validate = (formData) => {
             return Promise.resolve({ passed: true });
         };
         this.filterService.filtersChanged.subscribe(filters => {
-            let serviceFilter, identityFilter, postureFilter;
+            let routerFilter, identityFilter, postureFilter;
             filters.forEach((filter) => {
                 switch (filter.columnId) {
-                    case 'serviceRoles':
-                        serviceFilter = true;
+                    case 'edgeRouterRoles':
+                        routerFilter = true;
                         break;
                     case 'identityRoles':
                         identityFilter = true;
@@ -13068,9 +13069,9 @@ class ServicePoliciesPageService extends ListPageServiceClass {
                         break;
                 }
             });
-            if (!serviceFilter) {
-                this.selectedServiceRoleAttributes = [];
-                this.selectedServiceNamedAttributes = [];
+            if (!routerFilter) {
+                this.selectedRouterRoleAttributes = [];
+                this.selectedRouterNamedAttributes = [];
             }
             if (!identityFilter) {
                 this.selectedIdentityRoleAttributes = [];
@@ -13083,29 +13084,29 @@ class ServicePoliciesPageService extends ListPageServiceClass {
             filterType: 'DATETIME',
         };
         const self = this;
-        const serviceRolesHeaderComponentParams = {
+        const routerRolesHeaderComponentParams = {
             filterType: 'ATTRIBUTE',
             enableSorting: true,
             getRoleAttributes: () => {
-                return self.serviceRoleAttributes;
+                return self.routerRoleAttributes;
             },
             getNamedAttributes: () => {
-                return self.serviceNamedAttributes;
+                return self.routerNamedAttributes;
             },
             getSelectedRoleAttributes: () => {
-                return self.selectedServiceRoleAttributes;
+                return self.selectedRouterRoleAttributes;
             },
             getSelectedNamedAttributes: () => {
-                return self.selectedServiceNamedAttributes;
+                return self.selectedRouterNamedAttributes;
             },
             setSelectedRoleAttributes: (attributes) => {
-                self.selectedServiceRoleAttributes = attributes;
+                self.selectedRouterRoleAttributes = attributes;
             },
             setSelectedNamedAttributes: (attributes) => {
-                self.selectedServiceNamedAttributes = attributes;
+                self.selectedRouterNamedAttributes = attributes;
             },
             getNamedAttributesMap: () => {
-                return self.serviceNamedAttributesMap;
+                return self.routerNamedAttributesMap;
             }
         };
         const identityRolesHeaderComponentParams = {
@@ -13204,11 +13205,11 @@ class ServicePoliciesPageService extends ListPageServiceClass {
                 width: 300,
             },
             {
-                colId: 'serviceRoles',
-                field: 'serviceRoles',
-                headerName: 'Service Attributes',
+                colId: 'edgeRouterRoles',
+                field: 'edgeRouterRoles',
+                headerName: 'Router Attributes',
                 headerComponent: TableColumnDefaultComponent,
-                headerComponentParams: serviceRolesHeaderComponentParams,
+                headerComponentParams: routerRolesHeaderComponentParams,
                 onCellClicked: (data) => {
                     if (this.hasSelectedText()) {
                         return;
@@ -13241,25 +13242,6 @@ class ServicePoliciesPageService extends ListPageServiceClass {
                 sortable: false,
                 filter: false,
             },
-            {
-                colId: 'postureCheckRoles',
-                field: 'postureCheckRoles',
-                headerName: 'Posture Check Attributes',
-                headerComponent: TableColumnDefaultComponent,
-                headerComponentParams: postureRolesHeaderComponentParams,
-                onCellClicked: (data) => {
-                    if (this.hasSelectedText()) {
-                        return;
-                    }
-                    this.serviceType = '';
-                    this.openUpdate(data.data);
-                },
-                resizable: true,
-                cellRenderer: this.rolesRenderer,
-                cellClass: 'nf-cell-vert-align tCol',
-                sortable: false,
-                filter: false,
-            },
             {
                 colId: 'semantic',
                 field: 'semantic',
@@ -13280,26 +13262,6 @@ class ServicePoliciesPageService extends ListPageServiceClass {
                 cellClass: 'nf-cell-vert-align tCol',
                 width: 100,
             },
-            {
-                colId: 'type',
-                field: 'type',
-                headerName: 'Type',
-                headerComponent: TableColumnDefaultComponent,
-                //headerComponentParams: typeHeaderComponentParams,
-                onCellClicked: (data) => {
-                    if (this.hasSelectedText()) {
-                        return;
-                    }
-                    this.serviceType = '';
-                    this.openUpdate(data.data);
-                },
-                resizable: true,
-                cellRenderer: (row) => {
-                    return row.data?.type;
-                },
-                cellClass: 'nf-cell-vert-align tCol',
-                width: 100,
-            },
             {
                 colId: 'createdAt',
                 field: 'createdAt',
@@ -13325,7 +13287,7 @@ class ServicePoliciesPageService extends ListPageServiceClass {
     getData(filters, sort, page) {
         // we can customize filters or sorting here before moving on...
         this.paging.page = page || this.paging.page;
-        return super.getTableData('service-policies', this.paging, filters, sort)
+        return super.getTableData('edge-router-policies', this.paging, filters, sort)
             .then((results) => {
             return this.processData(results);
         });
@@ -13346,9 +13308,9 @@ class ServicePoliciesPageService extends ListPageServiceClass {
             return row;
         });
     }
-    getServiceRoleAttributes() {
-        return this.zitiService.get('service-role-attributes', {}, []).then((result) => {
-            this.serviceRoleAttributes = result.data;
+    getEdgeRouterRoleAttributes() {
+        return this.zitiService.get('edge-router-role-attributes', {}, []).then((result) => {
+            this.routerRoleAttributes = result.data;
             return result;
         });
     }
@@ -13363,12 +13325,12 @@ class ServicePoliciesPageService extends ListPageServiceClass {
         });
     }
     getServiceNamedAttributes() {
-        return this.zitiService.get('services', {}, []).then((result) => {
-            const namedAttributes = result.data.map((service) => {
-                this.serviceNamedAttributesMap[service.name] = service.id;
-                return service.name;
+        return this.zitiService.get('edge-routers', {}, []).then((result) => {
+            const namedAttributes = result.data.map((router) => {
+                this.routerNamedAttributesMap[router.name] = router.id;
+                return router.name;
             });
-            this.serviceNamedAttributes = namedAttributes;
+            this.routerNamedAttributes = namedAttributes;
             return namedAttributes;
         });
     }
@@ -13391,16 +13353,16 @@ class ServicePoliciesPageService extends ListPageServiceClass {
     downloadAllItems() {
         const paging = cloneDeep(this.paging);
         paging.total = this.totalCount;
-        super.getTableData('service-policies', paging, undefined, undefined)
+        super.getTableData('edge-router-policies', paging, undefined, undefined)
             .then((results) => {
             return this.downloadItems(results?.data);
         });
     }
     downloadItems(selectedItems) {
-        this.csvDownloadService.download('service-policies', selectedItems, CSV_COLUMNS, false, false, undefined, false);
+        this.csvDownloadService.download('edge-router-policies', selectedItems, CSV_COLUMNS$1, false, false, undefined, false);
     }
     openUpdate(item) {
-        this.modalType = 'service-policies';
+        this.modalType = 'edge-router-policies';
         if (item) {
             this.selectedServicePolicy = item;
             this.selectedServicePolicy.badges = [];
@@ -13411,10 +13373,10 @@ class ServicePoliciesPageService extends ListPageServiceClass {
         }
         this.sideModalOpen = true;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePoliciesPageService, deps: [{ token: SETTINGS_SERVICE }, { token: DataTableFilterService }, { token: ZITI_DATA_SERVICE }, { token: CsvDownloadService }, { token: GrowlerService }, { token: i3$1.MatDialog }, { token: SHAREDZ_EXTENSION }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePoliciesPageService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EdgeRouterPoliciesPageService, deps: [{ token: SETTINGS_SERVICE }, { token: DataTableFilterService }, { token: ZITI_DATA_SERVICE }, { token: CsvDownloadService }, { token: GrowlerService }, { token: i3$1.MatDialog }, { token: SHAREDZ_EXTENSION }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EdgeRouterPoliciesPageService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePoliciesPageService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EdgeRouterPoliciesPageService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -13887,17 +13849,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-class ServicePoliciesPageComponent extends ListPageComponent {
+class EdgeRouterPoliciesPageComponent extends ListPageComponent {
     constructor(svc, filterService, dialogForm, tabNames, consoleEvents, zacWrapperService) {
         super(filterService, svc, consoleEvents, dialogForm);
         this.svc = svc;
         this.tabNames = tabNames;
         this.zacWrapperService = zacWrapperService;
-        this.serviceType = '';
-        this.serviceRoleAttributes = [];
+        this.routerRoleAttributes = [];
         this.identityRoleAttributes = [];
         this.formDataChanged = false;
-        this.title = 'Manage Service Policies';
+        this.title = 'Manage Edge Router Policies';
         let userLang = navigator.language || 'en-us';
         userLang = userLang.toLowerCase();
     }
@@ -13919,7 +13880,7 @@ class ServicePoliciesPageComponent extends ListPageComponent {
                 const selectedItems = this.rowData.filter((row) => {
                     return row.selected;
                 });
-                const label = selectedItems.length > 1 ? 'services' : 'service';
+                const label = selectedItems.length > 1 ? 'services' : 'edge router';
                 this.openBulkDelete(selectedItems, label);
                 break;
             default:
@@ -13952,8 +13913,8 @@ class ServicePoliciesPageComponent extends ListPageComponent {
         }
     }
     getRoleAttributes() {
-        this.svc.getServiceRoleAttributes().then((result) => {
-            this.serviceRoleAttributes = result.data;
+        this.svc.getEdgeRouterRoleAttributes().then((result) => {
+            this.routerRoleAttributes = result.data;
         });
         this.svc.getIdentityRoleAttributes().then((result) => {
             this.identityRoleAttributes = result.data;
@@ -13963,7 +13924,7 @@ class ServicePoliciesPageComponent extends ListPageComponent {
         this.svc.getPostureNamedAttributes();
     }
     deleteItem(item) {
-        this.openBulkDelete([item], 'service-policies');
+        this.openBulkDelete([item], 'edge-router-policies');
     }
     closeModal(event) {
         this.svc.sideModalOpen = false;
@@ -13977,13 +13938,13 @@ class ServicePoliciesPageComponent extends ListPageComponent {
     serviceTypeSelected(event) {
         this.svc.serviceType = event;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePoliciesPageComponent, deps: [{ token: ServicePoliciesPageService }, { token: DataTableFilterService }, { token: i3$1.MatDialog }, { token: TabNameService }, { token: ConsoleEventsService }, { token: ZAC_WRAPPER_SERVICE }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: ServicePoliciesPageComponent, selector: "lib-service-policies-page", usesInheritance: true, ngImport: i0, template: "<div class=\"ziti-page-container ziti-service-policies-container\">\n    <lib-list-page-header [title]=\"title\"\n                          [tabs]=\"tabs\"\n                          [showAdd]=\"!itemsSelected\"\n                          (actionClicked)=\"headerActionClicked($event)\"></lib-list-page-header>\n\n    <lib-data-table [tableId]=\"'configurations'\"\n                    [rowData]=\"rowData\"\n                    [columnDefinitions]=\"columnDefs\"\n                    (actionRequested)=\"tableAction($event)\"\n                    [startCount]=\"startCount\"\n                    [endCount]=\"endCount\"\n                    [totalCount]=\"totalCount\"\n                    [emptyMsg]=\"'No Service Policies defined, Click the plus to add a Service Policy.'\"\n                    [filterApplied]=\"filterApplied\"\n                    [menuItems]=\"svc.menuItems\"\n                    (gridReady)=\"gridReady($event)\"\n    >\n    </lib-data-table>\n\n    <lib-side-modal [(open)]=\"svc.sideModalOpen\" [showClose]=\"false\">\n        <lib-service-policy-form\n                *ngIf=\"svc.sideModalOpen\"\n                [formData]=\"svc.selectedServicePolicy\"\n                [serviceRoleAttributes]=\"svc.serviceRoleAttributes\"\n                [serviceNamedAttributes]=\"svc.serviceNamedAttributes\"\n                [serviceNamedAttributesMap]=\"svc.serviceNamedAttributesMap\"\n                [identityRoleAttributes]=\"svc.identityRoleAttributes\"\n                [identityNamedAttributes]=\"svc.identityNamedAttributes\"\n                [identityNamedAttributesMap]=\"svc.identityNamedAttributesMap\"\n                [postureRoleAttributes]=\"svc.postureRoleAttributes\"\n                [postureNamedAttributes]=\"svc.postureNamedAttributes\"\n                [postureNamedAttributesMap]=\"svc.postureNamedAttributesMap\"\n                (close)=\"closeModal($event)\"\n                (dataChange)=\"dataChanged($event)\">\n        </lib-service-policy-form>\n    </lib-side-modal>\n</div>\n", styles: [""], dependencies: [{ kind: "directive", type: i1$4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: ListPageHeaderComponent, selector: "lib-list-page-header", inputs: ["title", "tabs", "showAdd", "hideAction"], outputs: ["actionClicked"] }, { kind: "component", type: DataTableComponent, selector: "lib-data-table", inputs: ["rowData", "expandRowData", "collapseRowData", "rowValidation", "isTimeSearchAvailable", "isLoading", "tableId", "options", "validateService", "rowsToggled", "tableRefreshCount", "view", "serverSideDataSource", "allowDownload", "startCount", "endCount", "totalCount", "emptyMsg", "filterApplied", "menuItems", "headerActions", "noItemsClass", "entityTypeName", "showNoItemsAdd", "currentPage", "noItemsImage", "columnDefinitions", "refreshCount"], outputs: ["actionRequested", "gridReady", "dragStart", "dragLeave", "pageChanged"] }, { kind: "component", type: SideModalComponent, selector: "lib-side-modal", inputs: ["showClose", "open"], outputs: ["openChange"] }, { kind: "component", type: ServicePolicyFormComponent, selector: "lib-service-policy-form", inputs: ["formData", "serviceRoleAttributes", "serviceNamedAttributes", "serviceNamedAttributesMap", "identityRoleAttributes", "identityNamedAttributes", "identityNamedAttributesMap", "postureRoleAttributes", "postureNamedAttributes", "postureNamedAttributesMap"], outputs: ["close"] }] }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EdgeRouterPoliciesPageComponent, deps: [{ token: EdgeRouterPoliciesPageService }, { token: DataTableFilterService }, { token: i3$1.MatDialog }, { token: TabNameService }, { token: ConsoleEventsService }, { token: ZAC_WRAPPER_SERVICE }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: EdgeRouterPoliciesPageComponent, selector: "lib-edge-router-policies-page", usesInheritance: true, ngImport: i0, template: "<div class=\"ziti-page-container edge-router-policies-container\">\n    <lib-list-page-header [title]=\"title\"\n                          [tabs]=\"tabs\"\n                          [showAdd]=\"!itemsSelected\"\n                          (actionClicked)=\"headerActionClicked($event)\"></lib-list-page-header>\n\n    <lib-data-table [tableId]=\"'edge-router-policies'\"\n                    [rowData]=\"rowData\"\n                    [columnDefinitions]=\"columnDefs\"\n                    (actionRequested)=\"tableAction($event)\"\n                    [startCount]=\"startCount\"\n                    [endCount]=\"endCount\"\n                    [totalCount]=\"totalCount\"\n                    [emptyMsg]=\"'No Edge Router Policies defined, Click the plus to add a Edge Router Policy.'\"\n                    [filterApplied]=\"filterApplied\"\n                    [menuItems]=\"svc.menuItems\"\n                    (gridReady)=\"gridReady($event)\"\n    >\n    </lib-data-table>\n\n    <lib-side-modal [(open)]=\"svc.sideModalOpen\" [showClose]=\"false\">\n        <lib-service-policy-form\n                *ngIf=\"svc.sideModalOpen\"\n                [formData]=\"svc.selectedServicePolicy\"\n                [serviceRoleAttributes]=\"svc.routerRoleAttributes\"\n                [serviceNamedAttributes]=\"svc.routerNamedAttributes\"\n                [serviceNamedAttributesMap]=\"svc.routerNamedAttributesMap\"\n                [identityRoleAttributes]=\"svc.identityRoleAttributes\"\n                [identityNamedAttributes]=\"svc.identityNamedAttributes\"\n                [identityNamedAttributesMap]=\"svc.identityNamedAttributesMap\"\n                [postureRoleAttributes]=\"svc.postureRoleAttributes\"\n                [postureNamedAttributes]=\"svc.postureNamedAttributes\"\n                [postureNamedAttributesMap]=\"svc.postureNamedAttributesMap\"\n                (close)=\"closeModal($event)\"\n                (dataChange)=\"dataChanged($event)\">\n        </lib-service-policy-form>\n    </lib-side-modal>\n</div>\n", styles: [""], dependencies: [{ kind: "directive", type: i1$4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: ListPageHeaderComponent, selector: "lib-list-page-header", inputs: ["title", "tabs", "showAdd", "hideAction"], outputs: ["actionClicked"] }, { kind: "component", type: DataTableComponent, selector: "lib-data-table", inputs: ["rowData", "expandRowData", "collapseRowData", "rowValidation", "isTimeSearchAvailable", "isLoading", "tableId", "options", "validateService", "rowsToggled", "tableRefreshCount", "view", "serverSideDataSource", "allowDownload", "startCount", "endCount", "totalCount", "emptyMsg", "filterApplied", "menuItems", "headerActions", "noItemsClass", "entityTypeName", "showNoItemsAdd", "currentPage", "noItemsImage", "columnDefinitions", "refreshCount"], outputs: ["actionRequested", "gridReady", "dragStart", "dragLeave", "pageChanged"] }, { kind: "component", type: SideModalComponent, selector: "lib-side-modal", inputs: ["showClose", "open"], outputs: ["openChange"] }, { kind: "component", type: ServicePolicyFormComponent, selector: "lib-service-policy-form", inputs: ["formData", "serviceRoleAttributes", "serviceNamedAttributes", "serviceNamedAttributesMap", "identityRoleAttributes", "identityNamedAttributes", "identityNamedAttributesMap", "postureRoleAttributes", "postureNamedAttributes", "postureNamedAttributesMap"], outputs: ["close"] }] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePoliciesPageComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: EdgeRouterPoliciesPageComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'lib-service-policies-page', template: "<div class=\"ziti-page-container ziti-service-policies-container\">\n    <lib-list-page-header [title]=\"title\"\n                          [tabs]=\"tabs\"\n                          [showAdd]=\"!itemsSelected\"\n                          (actionClicked)=\"headerActionClicked($event)\"></lib-list-page-header>\n\n    <lib-data-table [tableId]=\"'configurations'\"\n                    [rowData]=\"rowData\"\n                    [columnDefinitions]=\"columnDefs\"\n                    (actionRequested)=\"tableAction($event)\"\n                    [startCount]=\"startCount\"\n                    [endCount]=\"endCount\"\n                    [totalCount]=\"totalCount\"\n                    [emptyMsg]=\"'No Service Policies defined, Click the plus to add a Service Policy.'\"\n                    [filterApplied]=\"filterApplied\"\n                    [menuItems]=\"svc.menuItems\"\n                    (gridReady)=\"gridReady($event)\"\n    >\n    </lib-data-table>\n\n    <lib-side-modal [(open)]=\"svc.sideModalOpen\" [showClose]=\"false\">\n        <lib-service-policy-form\n                *ngIf=\"svc.sideModalOpen\"\n                [formData]=\"svc.selectedServicePolicy\"\n                [serviceRoleAttributes]=\"svc.serviceRoleAttributes\"\n                [serviceNamedAttributes]=\"svc.serviceNamedAttributes\"\n                [serviceNamedAttributesMap]=\"svc.serviceNamedAttributesMap\"\n                [identityRoleAttributes]=\"svc.identityRoleAttributes\"\n                [identityNamedAttributes]=\"svc.identityNamedAttributes\"\n                [identityNamedAttributesMap]=\"svc.identityNamedAttributesMap\"\n                [postureRoleAttributes]=\"svc.postureRoleAttributes\"\n                [postureNamedAttributes]=\"svc.postureNamedAttributes\"\n                [postureNamedAttributesMap]=\"svc.postureNamedAttributesMap\"\n                (close)=\"closeModal($event)\"\n                (dataChange)=\"dataChanged($event)\">\n        </lib-service-policy-form>\n    </lib-side-modal>\n</div>\n" }]
-        }], ctorParameters: function () { return [{ type: ServicePoliciesPageService }, { type: DataTableFilterService }, { type: i3$1.MatDialog }, { type: TabNameService }, { type: ConsoleEventsService }, { type: ZacWrapperServiceClass, decorators: [{
+            args: [{ selector: 'lib-edge-router-policies-page', template: "<div class=\"ziti-page-container edge-router-policies-container\">\n    <lib-list-page-header [title]=\"title\"\n                          [tabs]=\"tabs\"\n                          [showAdd]=\"!itemsSelected\"\n                          (actionClicked)=\"headerActionClicked($event)\"></lib-list-page-header>\n\n    <lib-data-table [tableId]=\"'edge-router-policies'\"\n                    [rowData]=\"rowData\"\n                    [columnDefinitions]=\"columnDefs\"\n                    (actionRequested)=\"tableAction($event)\"\n                    [startCount]=\"startCount\"\n                    [endCount]=\"endCount\"\n                    [totalCount]=\"totalCount\"\n                    [emptyMsg]=\"'No Edge Router Policies defined, Click the plus to add a Edge Router Policy.'\"\n                    [filterApplied]=\"filterApplied\"\n                    [menuItems]=\"svc.menuItems\"\n                    (gridReady)=\"gridReady($event)\"\n    >\n    </lib-data-table>\n\n    <lib-side-modal [(open)]=\"svc.sideModalOpen\" [showClose]=\"false\">\n        <lib-service-policy-form\n                *ngIf=\"svc.sideModalOpen\"\n                [formData]=\"svc.selectedServicePolicy\"\n                [serviceRoleAttributes]=\"svc.routerRoleAttributes\"\n                [serviceNamedAttributes]=\"svc.routerNamedAttributes\"\n                [serviceNamedAttributesMap]=\"svc.routerNamedAttributesMap\"\n                [identityRoleAttributes]=\"svc.identityRoleAttributes\"\n                [identityNamedAttributes]=\"svc.identityNamedAttributes\"\n                [identityNamedAttributesMap]=\"svc.identityNamedAttributesMap\"\n                [postureRoleAttributes]=\"svc.postureRoleAttributes\"\n                [postureNamedAttributes]=\"svc.postureNamedAttributes\"\n                [postureNamedAttributesMap]=\"svc.postureNamedAttributesMap\"\n                (close)=\"closeModal($event)\"\n                (dataChange)=\"dataChanged($event)\">\n        </lib-service-policy-form>\n    </lib-side-modal>\n</div>\n" }]
+        }], ctorParameters: function () { return [{ type: EdgeRouterPoliciesPageService }, { type: DataTableFilterService }, { type: i3$1.MatDialog }, { type: TabNameService }, { type: ConsoleEventsService }, { type: ZacWrapperServiceClass, decorators: [{
                     type: Inject,
                     args: [ZAC_WRAPPER_SERVICE]
                 }] }]; } });
@@ -14003,163 +13964,721 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-function playerFactory() {
-    return import(/* webpackChunkName: 'lottie-web' */ 'lottie-web');
-}
-class OpenZitiConsoleLibModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: OpenZitiConsoleLibModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.2.12", ngImport: i0, type: OpenZitiConsoleLibModule, declarations: [ZacWrapperComponent,
-            SafePipe,
-            ExtendableComponent,
-            StringInputComponent,
-            NumberInputComponent,
-            BooleanToggleInputComponent,
-            ObjectComponent,
-            SelectorInputComponent,
-            TextListInputComponent,
-            CheckboxListInputComponent,
-            ProtocolAddressPortInputComponent,
-            SideToolbarComponent,
-            SideNavbarComponent,
-            SideBannerComponent,
-            PasswordInputComponent,
-            ConfigurationFormComponent,
-            ConfigurationsPageComponent,
-            ListPageHeaderComponent,
-            FilterBarComponent,
-            ListPageFormComponent,
-            IdentitiesPageComponent,
-            EdgeRoutersPageComponent,
-            DataTableComponent,
-            TableCellSelectComponent,
-            TableColumnSelectComponent,
-            TableCellMenuComponent,
-            TableColumnMenuComponent,
-            TableColumnDefaultComponent,
-            TableColumnFilterComponent,
-            IdentityFormComponent,
-            EdgeRouterFormComponent,
-            HiddenColumnsBarComponent,
-            FilterBarComponent,
-            ExtendableComponent,
-            ConfirmComponent,
-            NoItemsComponent,
-            SideModalComponent,
-            FormHeaderComponent,
-            FormFieldContainerComponent,
-            PreviewListComponent,
-            LoadingIndicatorComponent,
-            FormFieldToggleComponent,
-            JsonViewComponent,
-            TagSelectorComponent,
-            QrCodeComponent,
-            TableCellTokenComponent,
-            OSTooltipComponent,
-            SDKTooltipComponent,
-            OverridesComponent,
-            ResetEnrollmentComponent,
-            IdentityServicePathComponent,
-            CustomTagsComponent,
-            ServicesPageComponent,
-            ServiceFormComponent,
-            PortRangesComponent,
-            ForwardingConfigComponent,
-            CardListComponent,
-            SimpleServiceComponent,
-            CardComponent,
-            CreationSummaryDialogComponent,
-            ConfigEditorComponent,
-            ServicePoliciesPageComponent,
-            ServicePolicyFormComponent], imports: [CommonModule,
-            FormsModule,
-            MatDialogModule,
-            HttpClientModule,
-            ZacRoutingModule,
-            ChipsModule,
-            CalendarModule,
-            AgGridModule,
-            QRCodeModule,
-            ClickOutsideModule,
-            NgJsonEditorModule,
-            MatTooltipModule,
-            MatAutocompleteModule, i1$2.LottieModule, DropdownModule], exports: [ZacWrapperComponent,
-            ExtendableComponent,
-            SideToolbarComponent,
-            SideNavbarComponent,
-            SideBannerComponent,
-            StringInputComponent,
-            SelectorInputComponent,
-            PasswordInputComponent,
-            NumberInputComponent,
-            BooleanToggleInputComponent,
-            ObjectComponent,
-            TextListInputComponent,
-            CheckboxListInputComponent,
-            ProtocolAddressPortInputComponent,
-            ConfigurationsPageComponent,
-            ConfigurationFormComponent,
-            EdgeRouterFormComponent,
-            IdentitiesPageComponent,
-            EdgeRoutersPageComponent,
-            ServicesPageComponent,
-            ZacRoutingModule,
-            SideModalComponent,
-            IdentityFormComponent,
-            LoadingIndicatorComponent,
-            GrowlerModule,
-            FormFieldContainerComponent,
-            FormFieldToggleComponent,
-            ServiceFormComponent,
-            ServicePoliciesPageComponent,
-            ServicePolicyFormComponent] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: OpenZitiConsoleLibModule, providers: [
-            { provide: SHAREDZ_EXTENSION, useClass: ExtensionsNoopService },
-            { provide: ZITI_NAVIGATOR, useValue: {} },
-            {
-                provide: APP_INITIALIZER,
-                useFactory: onAppInit,
-                deps: [Injector],
-                multi: true
-            },
-        ], imports: [CommonModule,
-            FormsModule,
-            MatDialogModule,
-            HttpClientModule,
-            ZacRoutingModule,
-            ChipsModule,
-            CalendarModule,
-            AgGridModule,
-            QRCodeModule,
-            ClickOutsideModule,
-            NgJsonEditorModule,
-            MatTooltipModule,
-            MatAutocompleteModule,
-            LottieModule.forRoot({ player: playerFactory }),
-            DropdownModule, ZacRoutingModule,
-            GrowlerModule] }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: OpenZitiConsoleLibModule, decorators: [{
-            type: NgModule,
-            args: [{
-                    declarations: [
-                        ZacWrapperComponent,
-                        SafePipe,
-                        ExtendableComponent,
-                        StringInputComponent,
-                        NumberInputComponent,
-                        BooleanToggleInputComponent,
-                        ObjectComponent,
-                        SelectorInputComponent,
-                        TextListInputComponent,
-                        CheckboxListInputComponent,
-                        ProtocolAddressPortInputComponent,
-                        SideToolbarComponent,
-                        SideNavbarComponent,
-                        SideBannerComponent,
-                        PasswordInputComponent,
-                        ConfigurationFormComponent,
-                        ConfigurationsPageComponent,
-                        ListPageHeaderComponent,
+const CSV_COLUMNS = [
+    { label: 'Name', path: 'name' },
+    { label: 'Created At', path: 'createdAt' }
+];
+class ServicePoliciesPageService extends ListPageServiceClass {
+    constructor(settings, filterService, zitiService, csvDownloadService, growlerService, dialogForm, extService) {
+        super(settings, filterService, csvDownloadService, extService);
+        this.zitiService = zitiService;
+        this.csvDownloadService = csvDownloadService;
+        this.growlerService = growlerService;
+        this.dialogForm = dialogForm;
+        this.extService = extService;
+        this.paging = this.DEFAULT_PAGING;
+        this.modalType = 'service-policy';
+        this.serviceType = '';
+        this.selectedServicePolicy = new Service();
+        this.serviceRoleAttributes = [];
+        this.serviceNamedAttributes = [];
+        this.serviceNamedAttributesMap = {};
+        this.selectedServiceRoleAttributes = [];
+        this.selectedServiceNamedAttributes = [];
+        this.identityRoleAttributes = [];
+        this.identityNamedAttributes = [];
+        this.identityNamedAttributesMap = {};
+        this.selectedIdentityRoleAttributes = [];
+        this.selectedIdentityNamedAttributes = [];
+        this.postureRoleAttributes = [];
+        this.postureNamedAttributes = [];
+        this.postureNamedAttributesMap = {};
+        this.selectedPostureRoleAttributes = [];
+        this.selectedPostureNamedAttributes = [];
+        this.columnFilters = {
+            name: '',
+            os: '',
+            createdAt: '',
+        };
+        this.menuItems = [
+            { name: 'Edit', action: 'update' },
+            { name: 'Delete', action: 'delete' },
+        ];
+        this.tableHeaderActions = [
+            { name: 'Download All', action: 'download-all' },
+            { name: 'Download Selected', action: 'download-selected' },
+        ];
+        this.resourceType = 'service-policies';
+        this.validate = (formData) => {
+            return Promise.resolve({ passed: true });
+        };
+        this.filterService.filtersChanged.subscribe(filters => {
+            let serviceFilter, identityFilter, postureFilter;
+            filters.forEach((filter) => {
+                switch (filter.columnId) {
+                    case 'serviceRoles':
+                        serviceFilter = true;
+                        break;
+                    case 'identityRoles':
+                        identityFilter = true;
+                        break;
+                    case 'postureRoles':
+                        postureFilter = true;
+                        break;
+                }
+            });
+            if (!serviceFilter) {
+                this.selectedServiceRoleAttributes = [];
+                this.selectedServiceNamedAttributes = [];
+            }
+            if (!identityFilter) {
+                this.selectedIdentityRoleAttributes = [];
+                this.selectedIdentityNamedAttributes = [];
+            }
+        });
+    }
+    initTableColumns() {
+        const createdAtHeaderComponentParams = {
+            filterType: 'DATETIME',
+        };
+        const self = this;
+        const serviceRolesHeaderComponentParams = {
+            filterType: 'ATTRIBUTE',
+            enableSorting: true,
+            getRoleAttributes: () => {
+                return self.serviceRoleAttributes;
+            },
+            getNamedAttributes: () => {
+                return self.serviceNamedAttributes;
+            },
+            getSelectedRoleAttributes: () => {
+                return self.selectedServiceRoleAttributes;
+            },
+            getSelectedNamedAttributes: () => {
+                return self.selectedServiceNamedAttributes;
+            },
+            setSelectedRoleAttributes: (attributes) => {
+                self.selectedServiceRoleAttributes = attributes;
+            },
+            setSelectedNamedAttributes: (attributes) => {
+                self.selectedServiceNamedAttributes = attributes;
+            },
+            getNamedAttributesMap: () => {
+                return self.serviceNamedAttributesMap;
+            }
+        };
+        const identityRolesHeaderComponentParams = {
+            filterType: 'ATTRIBUTE',
+            enableSorting: true,
+            getRoleAttributes: () => {
+                return self.identityRoleAttributes;
+            },
+            getNamedAttributes: () => {
+                return self.identityNamedAttributes;
+            },
+            getSelectedRoleAttributes: () => {
+                return self.selectedIdentityRoleAttributes;
+            },
+            getSelectedNamedAttributes: () => {
+                return self.selectedIdentityNamedAttributes;
+            },
+            setSelectedRoleAttributes: (attributes) => {
+                self.selectedIdentityRoleAttributes = attributes;
+            },
+            setSelectedNamedAttributes: (attributes) => {
+                self.selectedIdentityNamedAttributes = attributes;
+            },
+            getNamedAttributesMap: () => {
+                return self.identityNamedAttributesMap;
+            }
+        };
+        const postureRolesHeaderComponentParams = {
+            filterType: 'ATTRIBUTE',
+            enableSorting: true,
+            getRoleAttributes: () => {
+                return self.postureRoleAttributes;
+            },
+            getNamedAttributes: () => {
+                return self.postureNamedAttributes;
+            },
+            getSelectedRoleAttributes: () => {
+                return self.selectedPostureRoleAttributes;
+            },
+            getSelectedNamedAttributes: () => {
+                return self.selectedPostureNamedAttributes;
+            },
+            setSelectedRoleAttributes: (attributes) => {
+                self.selectedPostureRoleAttributes = attributes;
+            },
+            setSelectedNamedAttributes: (attributes) => {
+                self.selectedPostureNamedAttributes = attributes;
+            },
+            getNamedAttributesMap: () => {
+                return self.postureNamedAttributesMap;
+            }
+        };
+        const semanticHeaderComponentParams = {
+            filterType: 'SELECT',
+            enableSorting: true,
+            filterOptions: [
+                { label: 'Any Of', value: 'AnyOf', columnId: 'semantic' },
+                { label: 'All Of', value: 'AllOf', columnId: 'semantic' },
+            ],
+            getFilterOptions: () => {
+                return semanticHeaderComponentParams.filterOptions;
+            }
+        };
+        const typeHeaderComponentParams = {
+            filterType: 'SELECT',
+            enableSorting: true,
+            filterOptions: [
+                { label: 'Dial', value: 'Dial', columnId: 'type' },
+                { label: 'Bind', value: 'Bind', columnId: 'type' },
+            ],
+            getFilterOptions: () => {
+                return typeHeaderComponentParams.filterOptions;
+            }
+        };
+        return [
+            {
+                colId: 'name',
+                field: 'name',
+                headerName: 'Name',
+                headerComponent: TableColumnDefaultComponent,
+                headerComponentParams: this.headerComponentParams,
+                onCellClicked: (data) => {
+                    if (this.hasSelectedText()) {
+                        return;
+                    }
+                    this.serviceType = 'advanced';
+                    this.openUpdate(data.data);
+                },
+                resizable: true,
+                cellRenderer: this.nameColumnRenderer,
+                cellClass: 'nf-cell-vert-align tCol',
+                sortable: true,
+                filter: true,
+                sortColumn: this.sort.bind(this),
+                sortDir: 'asc',
+                width: 300,
+            },
+            {
+                colId: 'serviceRoles',
+                field: 'serviceRoles',
+                headerName: 'Service Attributes',
+                headerComponent: TableColumnDefaultComponent,
+                headerComponentParams: serviceRolesHeaderComponentParams,
+                onCellClicked: (data) => {
+                    if (this.hasSelectedText()) {
+                        return;
+                    }
+                    this.serviceType = '';
+                    this.openUpdate(data.data);
+                },
+                resizable: true,
+                cellRenderer: this.rolesRenderer,
+                cellClass: 'nf-cell-vert-align tCol',
+                sortable: false,
+                filter: false,
+            },
+            {
+                colId: 'identityRoles',
+                field: 'identityRoles',
+                headerName: 'Identity Attributes',
+                headerComponent: TableColumnDefaultComponent,
+                headerComponentParams: identityRolesHeaderComponentParams,
+                onCellClicked: (data) => {
+                    if (this.hasSelectedText()) {
+                        return;
+                    }
+                    this.serviceType = '';
+                    this.openUpdate(data.data);
+                },
+                resizable: true,
+                cellRenderer: this.rolesRenderer,
+                cellClass: 'nf-cell-vert-align tCol',
+                sortable: false,
+                filter: false,
+            },
+            {
+                colId: 'postureCheckRoles',
+                field: 'postureCheckRoles',
+                headerName: 'Posture Check Attributes',
+                headerComponent: TableColumnDefaultComponent,
+                headerComponentParams: postureRolesHeaderComponentParams,
+                onCellClicked: (data) => {
+                    if (this.hasSelectedText()) {
+                        return;
+                    }
+                    this.serviceType = '';
+                    this.openUpdate(data.data);
+                },
+                resizable: true,
+                cellRenderer: this.rolesRenderer,
+                cellClass: 'nf-cell-vert-align tCol',
+                sortable: false,
+                filter: false,
+            },
+            {
+                colId: 'semantic',
+                field: 'semantic',
+                headerName: 'Semantic',
+                headerComponent: TableColumnDefaultComponent,
+                headerComponentParams: semanticHeaderComponentParams,
+                onCellClicked: (data) => {
+                    if (this.hasSelectedText()) {
+                        return;
+                    }
+                    this.serviceType = '';
+                    this.openUpdate(data.data);
+                },
+                resizable: true,
+                cellRenderer: (row) => {
+                    return row.data?.semantic === 'AnyOf' ? 'Any Of' : 'All Of';
+                },
+                cellClass: 'nf-cell-vert-align tCol',
+                width: 100,
+            },
+            {
+                colId: 'type',
+                field: 'type',
+                headerName: 'Type',
+                headerComponent: TableColumnDefaultComponent,
+                //headerComponentParams: typeHeaderComponentParams,
+                onCellClicked: (data) => {
+                    if (this.hasSelectedText()) {
+                        return;
+                    }
+                    this.serviceType = '';
+                    this.openUpdate(data.data);
+                },
+                resizable: true,
+                cellRenderer: (row) => {
+                    return row.data?.type;
+                },
+                cellClass: 'nf-cell-vert-align tCol',
+                width: 100,
+            },
+            {
+                colId: 'createdAt',
+                field: 'createdAt',
+                headerName: 'Created At',
+                headerComponent: TableColumnDefaultComponent,
+                headerComponentParams: createdAtHeaderComponentParams,
+                valueFormatter: this.createdAtFormatter,
+                resizable: true,
+                sortable: true,
+                sortColumn: this.sort.bind(this),
+                cellClass: 'nf-cell-vert-align tCol',
+                onCellClicked: (data) => {
+                    if (this.hasSelectedText()) {
+                        return;
+                    }
+                    this.serviceType = '';
+                    this.openUpdate(data.data);
+                },
+                hide: true
+            }
+        ];
+    }
+    getData(filters, sort, page) {
+        // we can customize filters or sorting here before moving on...
+        this.paging.page = page || this.paging.page;
+        return super.getTableData('service-policies', this.paging, filters, sort)
+            .then((results) => {
+            return this.processData(results);
+        });
+    }
+    processData(results) {
+        if (!isEmpty(results?.data)) {
+            //pre-process data before rendering
+            results.data = this.addActionsPerRow(results);
+        }
+        if (!isEmpty(results?.meta?.pagination)) {
+            this.totalCount = results.meta?.pagination.totalCount;
+        }
+        return results;
+    }
+    addActionsPerRow(results) {
+        return results.data.map((row) => {
+            row.actionList = ['update', 'delete'];
+            return row;
+        });
+    }
+    getServiceRoleAttributes() {
+        return this.zitiService.get('service-role-attributes', {}, []).then((result) => {
+            this.serviceRoleAttributes = result.data;
+            return result;
+        });
+    }
+    getIdentityNamedAttributes() {
+        return this.zitiService.get('identities', { rawFilter: true, filter: '', sort: 'name', order: 'asc', total: -1, page: 1 }, []).then((result) => {
+            const namedAttributes = result.data.map((identity) => {
+                this.identityNamedAttributesMap[identity.name] = identity.id;
+                return identity.name;
+            });
+            this.identityNamedAttributes = namedAttributes;
+            return namedAttributes;
+        });
+    }
+    getServiceNamedAttributes() {
+        return this.zitiService.get('services', { rawFilter: true, filter: '', sort: 'name', order: 'asc', total: -1, page: 1 }, []).then((result) => {
+            const namedAttributes = result.data.map((service) => {
+                this.serviceNamedAttributesMap[service.name] = service.id;
+                return service.name;
+            });
+            this.serviceNamedAttributes = namedAttributes;
+            return namedAttributes;
+        });
+    }
+    getIdentityRoleAttributes() {
+        return this.zitiService.get('identity-role-attributes', {}, []).then((result) => {
+            this.identityRoleAttributes = result.data;
+            return result;
+        });
+    }
+    getPostureNamedAttributes() {
+        return this.zitiService.get('posture-checks', {}, []).then((result) => {
+            const namedAttributes = result.data.map((postureCheck) => {
+                this.postureNamedAttributesMap[postureCheck.name] = postureCheck.id;
+                return postureCheck.name;
+            });
+            this.postureNamedAttributes = namedAttributes;
+            return namedAttributes;
+        });
+    }
+    downloadAllItems() {
+        const paging = cloneDeep(this.paging);
+        paging.total = this.totalCount;
+        super.getTableData('service-policies', paging, undefined, undefined)
+            .then((results) => {
+            return this.downloadItems(results?.data);
+        });
+    }
+    downloadItems(selectedItems) {
+        this.csvDownloadService.download('service-policies', selectedItems, CSV_COLUMNS, false, false, undefined, false);
+    }
+    openUpdate(item) {
+        this.modalType = 'service-policies';
+        if (item) {
+            this.selectedServicePolicy = item;
+            this.selectedServicePolicy.badges = [];
+            unset(this.selectedServicePolicy, '_links');
+        }
+        else {
+            this.selectedServicePolicy = new Service();
+        }
+        this.sideModalOpen = true;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePoliciesPageService, deps: [{ token: SETTINGS_SERVICE }, { token: DataTableFilterService }, { token: ZITI_DATA_SERVICE }, { token: CsvDownloadService }, { token: GrowlerService }, { token: i3$1.MatDialog }, { token: SHAREDZ_EXTENSION }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePoliciesPageService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePoliciesPageService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: SettingsServiceClass, decorators: [{
+                    type: Inject,
+                    args: [SETTINGS_SERVICE]
+                }] }, { type: DataTableFilterService }, { type: ZitiDataService, decorators: [{
+                    type: Inject,
+                    args: [ZITI_DATA_SERVICE]
+                }] }, { type: CsvDownloadService }, { type: GrowlerService }, { type: i3$1.MatDialog }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: [SHAREDZ_EXTENSION]
+                }] }]; } });
+
+/*
+    Copyright NetFoundry Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+class ServicePoliciesPageComponent extends ListPageComponent {
+    constructor(svc, filterService, dialogForm, tabNames, consoleEvents, zacWrapperService) {
+        super(filterService, svc, consoleEvents, dialogForm);
+        this.svc = svc;
+        this.tabNames = tabNames;
+        this.zacWrapperService = zacWrapperService;
+        this.serviceType = '';
+        this.serviceRoleAttributes = [];
+        this.identityRoleAttributes = [];
+        this.formDataChanged = false;
+        this.title = 'Manage Service Policies';
+        let userLang = navigator.language || 'en-us';
+        userLang = userLang.toLowerCase();
+    }
+    ngOnInit() {
+        super.ngOnInit();
+        this.getRoleAttributes();
+        this.tabs = this.tabNames.getTabs('policies');
+    }
+    headerActionClicked(action) {
+        switch (action) {
+            case 'add':
+                this.svc.serviceType = '';
+                this.svc.openUpdate();
+                break;
+            case 'edit':
+                this.svc.openUpdate();
+                break;
+            case 'delete':
+                const selectedItems = this.rowData.filter((row) => {
+                    return row.selected;
+                });
+                const label = selectedItems.length > 1 ? 'services' : 'service';
+                this.openBulkDelete(selectedItems, label);
+                break;
+            default:
+        }
+    }
+    tableAction(event) {
+        switch (event?.action) {
+            case 'toggleAll':
+            case 'toggleItem':
+                this.itemToggled(event.item);
+                break;
+            case 'update':
+                this.svc.serviceType = 'advanced';
+                this.svc.openUpdate(event.item);
+                break;
+            case 'create':
+                this.svc.openUpdate();
+                break;
+            case 'delete':
+                this.deleteItem(event.item);
+                break;
+            case 'download-all':
+                this.svc.downloadAllItems();
+                break;
+            case 'download-selected':
+                this.svc.downloadItems(this.selectedItems);
+                break;
+            default:
+                break;
+        }
+    }
+    getRoleAttributes() {
+        this.svc.getServiceRoleAttributes().then((result) => {
+            this.serviceRoleAttributes = result.data;
+        });
+        this.svc.getIdentityRoleAttributes().then((result) => {
+            this.identityRoleAttributes = result.data;
+        });
+        this.svc.getServiceNamedAttributes();
+        this.svc.getIdentityNamedAttributes();
+        this.svc.getPostureNamedAttributes();
+    }
+    deleteItem(item) {
+        this.openBulkDelete([item], 'service-policies');
+    }
+    closeModal(event) {
+        this.svc.sideModalOpen = false;
+        if (event?.refresh) {
+            this.refreshData();
+        }
+    }
+    dataChanged(event) {
+        this.formDataChanged = event;
+    }
+    serviceTypeSelected(event) {
+        this.svc.serviceType = event;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePoliciesPageComponent, deps: [{ token: ServicePoliciesPageService }, { token: DataTableFilterService }, { token: i3$1.MatDialog }, { token: TabNameService }, { token: ConsoleEventsService }, { token: ZAC_WRAPPER_SERVICE }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.12", type: ServicePoliciesPageComponent, selector: "lib-service-policies-page", usesInheritance: true, ngImport: i0, template: "<div class=\"ziti-page-container ziti-service-policies-container\">\n    <lib-list-page-header [title]=\"title\"\n                          [tabs]=\"tabs\"\n                          [showAdd]=\"!itemsSelected\"\n                          (actionClicked)=\"headerActionClicked($event)\"></lib-list-page-header>\n\n    <lib-data-table [tableId]=\"'configurations'\"\n                    [rowData]=\"rowData\"\n                    [columnDefinitions]=\"columnDefs\"\n                    (actionRequested)=\"tableAction($event)\"\n                    [startCount]=\"startCount\"\n                    [endCount]=\"endCount\"\n                    [totalCount]=\"totalCount\"\n                    [emptyMsg]=\"'No Service Policies defined, Click the plus to add a Service Policy.'\"\n                    [filterApplied]=\"filterApplied\"\n                    [menuItems]=\"svc.menuItems\"\n                    (gridReady)=\"gridReady($event)\"\n    >\n    </lib-data-table>\n\n    <lib-side-modal [(open)]=\"svc.sideModalOpen\" [showClose]=\"false\">\n        <lib-service-policy-form\n                *ngIf=\"svc.sideModalOpen\"\n                [formData]=\"svc.selectedServicePolicy\"\n                [serviceRoleAttributes]=\"svc.serviceRoleAttributes\"\n                [serviceNamedAttributes]=\"svc.serviceNamedAttributes\"\n                [serviceNamedAttributesMap]=\"svc.serviceNamedAttributesMap\"\n                [identityRoleAttributes]=\"svc.identityRoleAttributes\"\n                [identityNamedAttributes]=\"svc.identityNamedAttributes\"\n                [identityNamedAttributesMap]=\"svc.identityNamedAttributesMap\"\n                [postureRoleAttributes]=\"svc.postureRoleAttributes\"\n                [postureNamedAttributes]=\"svc.postureNamedAttributes\"\n                [postureNamedAttributesMap]=\"svc.postureNamedAttributesMap\"\n                (close)=\"closeModal($event)\"\n                (dataChange)=\"dataChanged($event)\">\n        </lib-service-policy-form>\n    </lib-side-modal>\n</div>\n", styles: [""], dependencies: [{ kind: "directive", type: i1$4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: ListPageHeaderComponent, selector: "lib-list-page-header", inputs: ["title", "tabs", "showAdd", "hideAction"], outputs: ["actionClicked"] }, { kind: "component", type: DataTableComponent, selector: "lib-data-table", inputs: ["rowData", "expandRowData", "collapseRowData", "rowValidation", "isTimeSearchAvailable", "isLoading", "tableId", "options", "validateService", "rowsToggled", "tableRefreshCount", "view", "serverSideDataSource", "allowDownload", "startCount", "endCount", "totalCount", "emptyMsg", "filterApplied", "menuItems", "headerActions", "noItemsClass", "entityTypeName", "showNoItemsAdd", "currentPage", "noItemsImage", "columnDefinitions", "refreshCount"], outputs: ["actionRequested", "gridReady", "dragStart", "dragLeave", "pageChanged"] }, { kind: "component", type: SideModalComponent, selector: "lib-side-modal", inputs: ["showClose", "open"], outputs: ["openChange"] }, { kind: "component", type: ServicePolicyFormComponent, selector: "lib-service-policy-form", inputs: ["formData", "serviceRoleAttributes", "serviceNamedAttributes", "serviceNamedAttributesMap", "identityRoleAttributes", "identityNamedAttributes", "identityNamedAttributesMap", "postureRoleAttributes", "postureNamedAttributes", "postureNamedAttributesMap"], outputs: ["close"] }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: ServicePoliciesPageComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'lib-service-policies-page', template: "<div class=\"ziti-page-container ziti-service-policies-container\">\n    <lib-list-page-header [title]=\"title\"\n                          [tabs]=\"tabs\"\n                          [showAdd]=\"!itemsSelected\"\n                          (actionClicked)=\"headerActionClicked($event)\"></lib-list-page-header>\n\n    <lib-data-table [tableId]=\"'configurations'\"\n                    [rowData]=\"rowData\"\n                    [columnDefinitions]=\"columnDefs\"\n                    (actionRequested)=\"tableAction($event)\"\n                    [startCount]=\"startCount\"\n                    [endCount]=\"endCount\"\n                    [totalCount]=\"totalCount\"\n                    [emptyMsg]=\"'No Service Policies defined, Click the plus to add a Service Policy.'\"\n                    [filterApplied]=\"filterApplied\"\n                    [menuItems]=\"svc.menuItems\"\n                    (gridReady)=\"gridReady($event)\"\n    >\n    </lib-data-table>\n\n    <lib-side-modal [(open)]=\"svc.sideModalOpen\" [showClose]=\"false\">\n        <lib-service-policy-form\n                *ngIf=\"svc.sideModalOpen\"\n                [formData]=\"svc.selectedServicePolicy\"\n                [serviceRoleAttributes]=\"svc.serviceRoleAttributes\"\n                [serviceNamedAttributes]=\"svc.serviceNamedAttributes\"\n                [serviceNamedAttributesMap]=\"svc.serviceNamedAttributesMap\"\n                [identityRoleAttributes]=\"svc.identityRoleAttributes\"\n                [identityNamedAttributes]=\"svc.identityNamedAttributes\"\n                [identityNamedAttributesMap]=\"svc.identityNamedAttributesMap\"\n                [postureRoleAttributes]=\"svc.postureRoleAttributes\"\n                [postureNamedAttributes]=\"svc.postureNamedAttributes\"\n                [postureNamedAttributesMap]=\"svc.postureNamedAttributesMap\"\n                (close)=\"closeModal($event)\"\n                (dataChange)=\"dataChanged($event)\">\n        </lib-service-policy-form>\n    </lib-side-modal>\n</div>\n" }]
+        }], ctorParameters: function () { return [{ type: ServicePoliciesPageService }, { type: DataTableFilterService }, { type: i3$1.MatDialog }, { type: TabNameService }, { type: ConsoleEventsService }, { type: ZacWrapperServiceClass, decorators: [{
+                    type: Inject,
+                    args: [ZAC_WRAPPER_SERVICE]
+                }] }]; } });
+
+/*
+    Copyright NetFoundry Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+function playerFactory() {
+    return import(/* webpackChunkName: 'lottie-web' */ 'lottie-web');
+}
+class OpenZitiConsoleLibModule {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: OpenZitiConsoleLibModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.2.12", ngImport: i0, type: OpenZitiConsoleLibModule, declarations: [ZacWrapperComponent,
+            SafePipe,
+            ExtendableComponent,
+            StringInputComponent,
+            NumberInputComponent,
+            BooleanToggleInputComponent,
+            ObjectComponent,
+            SelectorInputComponent,
+            TextListInputComponent,
+            CheckboxListInputComponent,
+            ProtocolAddressPortInputComponent,
+            SideToolbarComponent,
+            SideNavbarComponent,
+            SideBannerComponent,
+            PasswordInputComponent,
+            ConfigurationFormComponent,
+            ConfigurationsPageComponent,
+            ListPageHeaderComponent,
+            FilterBarComponent,
+            ListPageFormComponent,
+            IdentitiesPageComponent,
+            EdgeRoutersPageComponent,
+            DataTableComponent,
+            TableCellSelectComponent,
+            TableColumnSelectComponent,
+            TableCellMenuComponent,
+            TableColumnMenuComponent,
+            TableColumnDefaultComponent,
+            TableColumnFilterComponent,
+            IdentityFormComponent,
+            EdgeRouterFormComponent,
+            HiddenColumnsBarComponent,
+            FilterBarComponent,
+            ExtendableComponent,
+            ConfirmComponent,
+            NoItemsComponent,
+            SideModalComponent,
+            FormHeaderComponent,
+            FormFieldContainerComponent,
+            PreviewListComponent,
+            LoadingIndicatorComponent,
+            FormFieldToggleComponent,
+            JsonViewComponent,
+            TagSelectorComponent,
+            QrCodeComponent,
+            TableCellTokenComponent,
+            OSTooltipComponent,
+            SDKTooltipComponent,
+            OverridesComponent,
+            ResetEnrollmentComponent,
+            IdentityServicePathComponent,
+            CustomTagsComponent,
+            ServicesPageComponent,
+            ServiceFormComponent,
+            PortRangesComponent,
+            ForwardingConfigComponent,
+            CardListComponent,
+            SimpleServiceComponent,
+            CardComponent,
+            CreationSummaryDialogComponent,
+            ConfigEditorComponent,
+            ServicePoliciesPageComponent,
+            ServicePolicyFormComponent,
+            EdgeRouterPoliciesPageComponent], imports: [CommonModule,
+            FormsModule,
+            MatDialogModule,
+            HttpClientModule,
+            ZacRoutingModule,
+            ChipsModule,
+            CalendarModule,
+            AgGridModule,
+            QRCodeModule,
+            ClickOutsideModule,
+            NgJsonEditorModule,
+            MatTooltipModule,
+            MatAutocompleteModule, i1$2.LottieModule, DropdownModule], exports: [ZacWrapperComponent,
+            ExtendableComponent,
+            SideToolbarComponent,
+            SideNavbarComponent,
+            SideBannerComponent,
+            StringInputComponent,
+            SelectorInputComponent,
+            PasswordInputComponent,
+            NumberInputComponent,
+            BooleanToggleInputComponent,
+            ObjectComponent,
+            TextListInputComponent,
+            CheckboxListInputComponent,
+            ProtocolAddressPortInputComponent,
+            ConfigurationsPageComponent,
+            ConfigurationFormComponent,
+            EdgeRouterFormComponent,
+            IdentitiesPageComponent,
+            EdgeRoutersPageComponent,
+            ServicesPageComponent,
+            ZacRoutingModule,
+            SideModalComponent,
+            IdentityFormComponent,
+            LoadingIndicatorComponent,
+            GrowlerModule,
+            FormFieldContainerComponent,
+            FormFieldToggleComponent,
+            ServiceFormComponent,
+            ServicePoliciesPageComponent,
+            ServicePolicyFormComponent,
+            EdgeRouterPoliciesPageComponent] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: OpenZitiConsoleLibModule, providers: [
+            { provide: SHAREDZ_EXTENSION, useClass: ExtensionsNoopService },
+            { provide: ZITI_NAVIGATOR, useValue: {} },
+            {
+                provide: APP_INITIALIZER,
+                useFactory: onAppInit,
+                deps: [Injector],
+                multi: true
+            },
+        ], imports: [CommonModule,
+            FormsModule,
+            MatDialogModule,
+            HttpClientModule,
+            ZacRoutingModule,
+            ChipsModule,
+            CalendarModule,
+            AgGridModule,
+            QRCodeModule,
+            ClickOutsideModule,
+            NgJsonEditorModule,
+            MatTooltipModule,
+            MatAutocompleteModule,
+            LottieModule.forRoot({ player: playerFactory }),
+            DropdownModule, ZacRoutingModule,
+            GrowlerModule] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: OpenZitiConsoleLibModule, decorators: [{
+            type: NgModule,
+            args: [{
+                    declarations: [
+                        ZacWrapperComponent,
+                        SafePipe,
+                        ExtendableComponent,
+                        StringInputComponent,
+                        NumberInputComponent,
+                        BooleanToggleInputComponent,
+                        ObjectComponent,
+                        SelectorInputComponent,
+                        TextListInputComponent,
+                        CheckboxListInputComponent,
+                        ProtocolAddressPortInputComponent,
+                        SideToolbarComponent,
+                        SideNavbarComponent,
+                        SideBannerComponent,
+                        PasswordInputComponent,
+                        ConfigurationFormComponent,
+                        ConfigurationsPageComponent,
+                        ListPageHeaderComponent,
                         FilterBarComponent,
                         ListPageFormComponent,
                         IdentitiesPageComponent,
@@ -14204,7 +14723,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                         CreationSummaryDialogComponent,
                         ConfigEditorComponent,
                         ServicePoliciesPageComponent,
-                        ServicePolicyFormComponent
+                        ServicePolicyFormComponent,
+                        EdgeRouterPoliciesPageComponent
                     ],
                     imports: [
                         CommonModule,
@@ -14253,7 +14773,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                         FormFieldToggleComponent,
                         ServiceFormComponent,
                         ServicePoliciesPageComponent,
-                        ServicePolicyFormComponent
+                        ServicePolicyFormComponent,
+                        EdgeRouterPoliciesPageComponent
                     ],
                     providers: [
                         { provide: SHAREDZ_EXTENSION, useClass: ExtensionsNoopService },
@@ -14269,7 +14790,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
         }] });
 
 const VERSION = {
-    "version": "3.3.0"
+    "version": "3.3.1"
 };
 
 /*
@@ -15325,6 +15846,8 @@ class NodeDataService extends ZitiDataService {
     get(type, paging, filters = [], url) {
         const nodeServerURL = window.location.origin;
         const serviceUrl = nodeServerURL + '/api/data';
+        const urlFilter = this.getUrlFilter(paging, filters);
+        paging.filter = urlFilter;
         const body = { paging: paging, type: type, url: url };
         return firstValueFrom(this.httpClient.post(serviceUrl, body, {}).pipe(catchError((err) => {
             const error = "Server Not Accessible";
@@ -15332,19 +15855,7 @@ class NodeDataService extends ZitiDataService {
                 throw ({ error: err.code });
             throw ({ error: error });
         }), map((results) => {
-            if (filters.length > 0) {
-                filters.forEach((filter) => {
-                    let newData = [];
-                    if (filter.columnId !== 'name' && !isEmpty(filter.value)) {
-                        results.data.forEach(row => {
-                            if (get(row, filter.columnId)?.indexOf(filter.value) >= 0)
-                                newData.push(row);
-                        });
-                        results.data = newData;
-                    }
-                });
-            }
-            else if (results.error) {
+            if (results.error) {
                 this.handleError(results);
             }
             return results;
@@ -15491,10 +16002,13 @@ class NodeDataService extends ZitiDataService {
             return schema.result;
         });
     }
-    getUrlFilter(paging) {
+    getUrlFilter(paging, filters) {
         let urlFilter = '';
         let toSearchOn = "name";
-        let noSearch = false;
+        let noSearch = filters?.length <= 0;
+        if (isEmpty(paging)) {
+            paging = {};
+        }
         if (paging && paging.sort != null) {
             if (paging.searchOn)
                 toSearchOn = paging.searchOn;
@@ -15502,23 +16016,57 @@ class NodeDataService extends ZitiDataService {
                 noSearch = true;
             if (!paging.filter)
                 paging.filter = "";
-            paging.filter = paging.filter.split('#').join('');
-            if (noSearch) {
-                if (paging.page !== -1)
-                    urlFilter = "?limit=" + paging.total + "&offset=" + ((paging.page - 1) * paging.total) + "&sort=" + paging.sort + " " + paging.order;
+            if (!isArray(paging.filter) && isNaN(paging.filter)) {
+                paging.filter = paging.filter.split('#').join('');
+            }
+        }
+        filters.forEach((filter, index) => {
+            let filterVal = '';
+            switch (filter.type) {
+                case 'TEXTINPUT':
+                    filterVal = `${filter.columnId} contains "${filter.value}"`;
+                    break;
+                case 'SELECT':
+                case 'COMBO':
+                    const val = isNumber(filter.value) ? `${filter.value}` : `"${filter.value}"`;
+                    filterVal = `${filter.columnId} = ${val}`;
+                    break;
+                case 'DATETIME':
+                    paging.rawFilter = true;
+                    filterVal = `${filter.columnId} >= datetime(${filter.value[0]}) and ${filter.columnId} <= datetime(${filter.value[1]})`;
+                    break;
+                case 'ATTRIBUTE':
+                    paging.rawFilter = true;
+                    filterVal = this.getAttributeFilter(filter.value, filter.columnId);
+                    break;
+                default:
+                    filterVal = `${filter.columnId} contains "${filter.value}"`;
+                    break;
+            }
+            if (index <= 0) {
+                urlFilter = `${filterVal}`;
             }
             else {
-                if (paging.page !== -1)
-                    urlFilter = "?filter=(" + toSearchOn + " contains \"" + paging.filter + "\")&limit=" + paging.total + "&offset=" + ((paging.page - 1) * paging.total) + "&sort=" + paging.sort + " " + paging.order;
-                if (paging.params) {
-                    for (const key in paging.params) {
-                        urlFilter += ((urlFilter.length === 0) ? "?" : "&") + key + "=" + paging.params[key];
-                    }
-                }
+                urlFilter += ` and ${filterVal}`;
             }
-        }
+        });
         return urlFilter;
     }
+    getAttributeFilter(val, columnId) {
+        let filter = '';
+        if (isArray(val)) {
+            val.forEach((attr, index) => {
+                if (index > 0) {
+                    filter += ' or ';
+                }
+                filter += `anyOf(${columnId}) = "${attr}"`;
+            });
+        }
+        else {
+            filter = `anyOf(${columnId}) = "${val}"`;
+        }
+        return filter;
+    }
     handleError(results) {
         if (results?.errorObj?.code === 'UNAUTHORIZED') {
             localStorage.removeItem('ziti.settings');
@@ -15809,5 +16357,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { BooleanToggleInputComponent, COMPONENTS, CheckboxListInputComponent, ConfigurationFormComponent, ConfigurationsPageComponent, CsvDownloadService, DEACTIVATE_GUARD, DeactivateGuardService, EDGE_ROUTER_EXTENSION_SERVICE, EdgeRouter, EdgeRouterFormComponent, EdgeRouterFormService, EdgeRoutersPageComponent, EdgeRoutersPageService, ExtendableComponent, ExtensionsNoopService, FormFieldContainerComponent, FormFieldToggleComponent, FormHeaderComponent, GrowlerComponent, GrowlerModel, GrowlerModule, GrowlerService, IDENTITY_EXTENSION_SERVICE, IdentitiesPageComponent, IdentitiesPageService, Identity, IdentityFormComponent, IdentityFormService, ListPageComponent, ListPageServiceClass, LoadingIndicatorComponent, LoggerService, LoginServiceClass, NodeDataService, NodeWrapperService, NoopLoginService, NoopTabInterceptorService, NumberInputComponent, ObjectComponent, OpenZitiConsoleLibModule, PasswordInputComponent, ProjectableForm, ProtocolAddressPortInputComponent, ResetEnrollmentService, SERVICE_EXTENSION_SERVICE, SERVICE_POLICY_EXTENSION_SERVICE, SETTINGS_SERVICE, SHAREDZ_EXTENSION, SelectorInputComponent, ServiceFormComponent, ServiceFormService, ServicePoliciesPageComponent, ServicePoliciesPageService, ServicePolicyFormComponent, ServicePolicyFormService, ServicesPageComponent, ServicesPageService, SettingsService, SettingsServiceClass, SideBannerComponent, SideModalComponent, SideNavbarComponent, SideToolbarComponent, StringInputComponent, TabNameService, TextListInputComponent, VERSION, ZAC_LOGIN_SERVICE, ZAC_WRAPPER_SERVICE, ZITI_DATA_SERVICE, ZITI_DOMAIN_CONTROLLER, ZITI_NAVIGATOR, ZITI_TAB_OVERRIDES, ZITI_URLS, ZacRoutingModule, ZacWrapperComponent, ZacWrapperService, ZacWrapperServiceClass, ZitiControllerDataService, ZitiDataService, playerFactory };
+export { BooleanToggleInputComponent, COMPONENTS, CheckboxListInputComponent, ConfigurationFormComponent, ConfigurationsPageComponent, CsvDownloadService, DEACTIVATE_GUARD, DeactivateGuardService, EDGE_ROUTER_EXTENSION_SERVICE, EdgeRouter, EdgeRouterFormComponent, EdgeRouterFormService, EdgeRouterPoliciesPageComponent, EdgeRouterPoliciesPageService, EdgeRoutersPageComponent, EdgeRoutersPageService, ExtendableComponent, ExtensionsNoopService, FormFieldContainerComponent, FormFieldToggleComponent, FormHeaderComponent, GrowlerComponent, GrowlerModel, GrowlerModule, GrowlerService, IDENTITY_EXTENSION_SERVICE, IdentitiesPageComponent, IdentitiesPageService, Identity, IdentityFormComponent, IdentityFormService, ListPageComponent, ListPageServiceClass, LoadingIndicatorComponent, LoggerService, LoginServiceClass, NodeDataService, NodeWrapperService, NoopLoginService, NoopTabInterceptorService, NumberInputComponent, ObjectComponent, OpenZitiConsoleLibModule, PasswordInputComponent, ProjectableForm, ProtocolAddressPortInputComponent, ResetEnrollmentService, SERVICE_EXTENSION_SERVICE, SERVICE_POLICY_EXTENSION_SERVICE, SETTINGS_SERVICE, SHAREDZ_EXTENSION, SelectorInputComponent, ServiceFormComponent, ServiceFormService, ServicePoliciesPageComponent, ServicePoliciesPageService, ServicePolicyFormComponent, ServicePolicyFormService, ServicesPageComponent, ServicesPageService, SettingsService, SettingsServiceClass, SideBannerComponent, SideModalComponent, SideNavbarComponent, SideToolbarComponent, StringInputComponent, TabNameService, TextListInputComponent, VERSION, ZAC_LOGIN_SERVICE, ZAC_WRAPPER_SERVICE, ZITI_DATA_SERVICE, ZITI_DOMAIN_CONTROLLER, ZITI_NAVIGATOR, ZITI_TAB_OVERRIDES, ZITI_URLS, ZacRoutingModule, ZacWrapperComponent, ZacWrapperService, ZacWrapperServiceClass, ZitiControllerDataService, ZitiDataService, playerFactory };
 //# sourceMappingURL=openziti-ziti-console-lib.mjs.map