deps: update Angular to v17 (#298)

Ahoo-Wang · Nov 20, 2023 · 4207f9c · 4207f9c
1 parent 820e55d
commit 4207f9c
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 46 deletions.
diff --git a/cosky-dashboard/package.json b/cosky-dashboard/package.json
@@ -10,27 +10,27 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^15.2.0",
-    "@angular/common": "^15.2.0",
-    "@angular/compiler": "^15.2.0",
-    "@angular/core": "^15.2.0",
-    "@angular/forms": "^15.2.0",
-    "@angular/platform-browser": "^15.2.0",
-    "@angular/platform-browser-dynamic": "^15.2.0",
-    "@angular/router": "^15.2.0",
+    "@angular/animations": "^17.0.3",
+    "@angular/common": "^17.0.3",
+    "@angular/compiler": "^17.0.3",
+    "@angular/core": "^17.0.3",
+    "@angular/forms": "^17.0.3",
+    "@angular/platform-browser": "^17.0.3",
+    "@angular/platform-browser-dynamic": "^17.0.3",
+    "@angular/router": "^17.0.3",
     "echarts": "^5.4.2",
     "file-saver": "^2.0.5",
-    "monaco-editor": "^0.34.1",
-    "ng-zorro-antd": "^15.1.1",
-    "ngx-monaco-editor-v2": "^15.0.1",
+    "monaco-editor": "^0.44.0",
+    "ng-zorro-antd": "^17.0.0",
+    "ngx-monaco-editor-v2": "^17.0.1",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
-    "zone.js": "~0.12.0"
+    "zone.js": "~0.14.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^15.2.4",
-    "@angular/cli": "~15.2.4",
-    "@angular/compiler-cli": "^15.2.0",
+    "@angular-devkit/build-angular": "^17.0.1",
+    "@angular/cli": "~17.0.1",
+    "@angular/compiler-cli": "^17.0.3",
     "@types/file-saver": "^2.0.5",
     "@types/jasmine": "~4.3.0",
     "jasmine-core": "~4.6.0",
@@ -39,6 +39,6 @@
     "karma-coverage": "~2.2.0",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~4.9.4"
+    "typescript": "~5.2.2"
   }
-}
+}
diff --git a/cosky-dashboard/src/app/components/authenticated/authenticated.component.html b/cosky-dashboard/src/app/components/authenticated/authenticated.component.html
@@ -24,39 +24,39 @@ <h1>{{title}}</h1>
       </a>
     </div>
     <ul nz-menu nzTheme="dark" nzMode="inline" [nzInlineCollapsed]="isCollapsed">
-      <li nz-menu-item nzMatchRouter>
+      <li nz-menu-item nzMatchRouter routerLink="/home">
         <i nz-icon nzType="dashboard"></i>
-        <span><a routerLink="/home">Dashboard</a></span>
+        <span>Dashboard</span>
       </li>
-      <li nz-menu-item nzMatchRouter>
+      <li nz-menu-item nzMatchRouter routerLink="/topology">
         <i nz-icon nzType="radar-chart"></i>
-        <span><a routerLink="/topology">Topology</a></span>
+        <span>Topology</span>
       </li>
-      <li nz-menu-item nzMatchRouter>
+      <li nz-menu-item nzMatchRouter routerLink="/config">
         <i nz-icon nzType="file"></i>
-        <span><a routerLink="/config">Configuration</a></span>
+        <span>Configuration</span>
       </li>
-      <li nz-menu-item nzMatchRouter>
+      <li nz-menu-item nzMatchRouter routerLink="/service">
         <i nz-icon nzType="cloud-server"></i>
-        <span><a routerLink="/service">Service</a></span>
+        <span>Service</span>
       </li>
-      <li nz-menu-item nzMatchRouter>
+      <li nz-menu-item nzMatchRouter routerLink="/namespace">
         <i nz-icon nzType="partition"></i>
-        <span><a routerLink="/namespace">Namespace</a></span>
+        <span>Namespace</span>
       </li>
       <li nz-submenu nzTitle="Security" nzIcon="security-scan">
         <ul>
-          <li nz-menu-item nzMatchRouter>
+          <li nz-menu-item nzMatchRouter routerLink="/user">
             <i nz-icon nzType="user"></i>
-            <span><a routerLink="/user">User</a></span>
+            <span>User</span>
           </li>
-          <li nz-menu-item nzMatchRouter>
+          <li nz-menu-item nzMatchRouter routerLink="/role">
             <i nz-icon nzType="security-scan"></i>
-            <span><a routerLink="/role">Role</a></span>
+            <span>Role</span>
           </li>
-          <li nz-menu-item nzMatchRouter>
+          <li nz-menu-item nzMatchRouter routerLink="/audit-log">
             <i nz-icon nzType="audit"></i>
-            <span><a routerLink="/audit-log">Audit Log</a></span>
+            <span>Audit Log</span>
           </li>
         </ul>
       </li>

diff --git a/cosky-dashboard/src/app/components/authenticated/authenticated.component.scss b/cosky-dashboard/src/app/components/authenticated/authenticated.component.scss
@@ -26,19 +26,15 @@
   position: relative;
   z-index: 10;
   min-height: 100vh;
-  box-shadow: 2px 0 6px rgba(0,21,41,.35);
+  box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
 }
 
 .header-trigger {
   height: 64px;
   padding: 20px 24px;
   font-size: 20px;
   cursor: pointer;
-  transition: all .3s,padding 0s;
-}
-
-.trigger:hover {
-  color: #1890ff;
+  transition: all .3s, padding 0s;
 }
 
 .sidebar-logo {
@@ -63,7 +59,7 @@
   color: #fff;
   font-weight: 600;
   font-size: 14px;
-  font-family: Avenir,Helvetica Neue,Arial,Helvetica,sans-serif;
+  font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
   vertical-align: middle;
 }
 
@@ -78,7 +74,7 @@ nz-header {
   height: 64px;
   padding: 0;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 }
 
 nz-content {

diff --git a/cosky-dashboard/src/app/security/AuthGuard.ts b/cosky-dashboard/src/app/security/AuthGuard.ts
@@ -11,18 +11,16 @@
  * limitations under the License.
  */
 
-import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree} from "@angular/router";
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree } from "@angular/router";
 import {Observable} from "rxjs";
 import {LOGIN_PATH, SecurityService} from "./SecurityService";
 import {Injectable} from "@angular/core";
-import {NzMessageService} from "ng-zorro-antd/message";
-import {AuthenticateClient} from "../api/authenticate/AuthenticateClient";
 import {map} from "rxjs/operators";
 
 @Injectable({
   providedIn: 'root',
 })
-export class AuthGuard implements CanActivate {
+export class AuthGuard  {
 
   constructor(private securityService: SecurityService
     , private router: Router) {

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@
 # limitations under the License.
 #
 group=me.ahoo.cosky
-version=4.1.1
+version=4.2.0
 description=High-performance, low-cost microservice governance platform. Service Discovery and Configuration Service.
 website=https://github.com/Ahoo-Wang/cosky
 issues=https://github.com/Ahoo-Wang/cosky/issues