Merge pull request #555 from openziti/release-3.6.2

Release 3.6.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "io.netfoundry.zac",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "Ziti Administration Console",
   "main": "server.js",
   "type": "module",

projects/app-ziti-console/src/app/services/node-settings.service.ts

@@ -152,6 +152,7 @@ export class NodeSettingsService extends SettingsServiceClass {
                             growler.error("Invalid Edge Controller: " + body.error);
                         } else {
                             this.apiVersions = body.data.apiVersions;
+                            this.zitiSemver = body.data?.version?.replace("v", "");
                         }
                     } catch (e) {
                         growler.error("Invalid Edge Controller: " + body);

projects/ziti-console-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openziti/ziti-console-lib",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/openziti/ziti-console"

projects/ziti-console-lib/src/lib/assets/styles/icons.css

@@ -157,4 +157,7 @@
 }
 .icon-minus:before {
   content: "\e91e";
+}
+.icon-Policies:before {
+  content: "\e92e";
 }

projects/ziti-console-lib/src/lib/features/sidebars/side-toolbar/side-toolbar.component.ts

@@ -54,6 +54,7 @@ export class SideToolbarComponent {
     this.zacService.initZac();
     app.init();
     this.zacService.initZACButtonListener();
+    this.settingsService.initApiVersions(this.settingsService?.settings?.selectedEdgeController);
     this.settingsService.settingsChange.subscribe((results:any) => {
       this.hideNav = results.hideNav;
       this.initSideBar();

projects/ziti-console-lib/src/lib/pages/services/services-page.component.ts

@@ -30,6 +30,7 @@ import {ServicePolicyFormService} from "../../features/projectable-forms/service
 import semver from 'semver';
 import {SETTINGS_SERVICE, SettingsService} from "../../services/settings.service";
 import {Subscription} from "rxjs";
+import {isEmpty} from "lodash";
 
 @Component({
   selector: 'lib-services',
@@ -161,12 +162,13 @@ export class ServicesPageComponent extends ListPageComponent implements OnInit,
     });
     const countLabel = selectedItems.length > 1 ? selectedItems.length : '';
     this.selectedItems = selectedItems;
+    const showSecondaryConfirm = !isEmpty(this.settingsService?.zitiSemver) && semver.gte(this.settingsService?.zitiSemver, '1.1.8')
     this.confirmData = {
       appendId: 'DeleteServices',
       title: 'Delete Services',
       message: `Are you sure you would like to delete the following ${countLabel} ${entityTypeLabel}?`,
       bulletList: selectedNames,
-      showSecondaryConfirm: semver.gte(this.settingsService?.zitiSemver, '1.1.8'),
+      showSecondaryConfirm: showSecondaryConfirm,
       secondaryConfirmLabel: 'Delete all orphaned associated configs and service policies?',
       secondaryConfirmed: false,
       secondaryInfoLabel: `Choosing this option will also delete any associated configs and/or service policies that ONLY make reference to these selected services`,

release-notes.md

@@ -1,3 +1,16 @@
+# app-ziti-console-v3.6.2
+# ziti-console-lib-v0.6.3
+
+## Feature/Improvements
+* [Issue #548](https://github.com/openziti/ziti-console/issues/548) - Optionally delete unused/orphaned entities when deleting a Service
+*
+## Bug Fixes
+* [Issue #550](https://github.com/openziti/ziti-console/issues/550) - Fix filtering of configs based on config type when editing a service
+* [Issue #546](https://github.com/openziti/ziti-console/issues/546) - Fix download of Certificate Authority JWT
+* [Issue #553](https://github.com/openziti/ziti-console/issues/553) - Fix synchronization of pagination controls when applying filters to list pages
+* [Issue #544](https://github.com/openziti/ziti-console/pull/544) - prune and ignore hard-coded lib version.ts file
+
+
 # app-ziti-console-v3.6.1
 # ziti-console-lib-v0.6.2