remove unused log; new id sort function

DanHolli · Mar 25, 2023 · e0aba02 · e0aba02
1 parent c5a6d3b
commit e0aba02
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 33 deletions.
diff --git a/src/app/http-api.interceptor.ts b/src/app/http-api.interceptor.ts
@@ -6,13 +6,13 @@ import {
   HttpInterceptor, HttpResponse
 } from '@angular/common/http';
 import {catchError, mergeMap, Observable, of} from 'rxjs';
-import {Router} from '@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {NzMessageService} from 'ng-zorro-antd/message';
 
 @Injectable()
 export class HttpApiInterceptor implements HttpInterceptor {
 
-  constructor(private router: Router, private msg: NzMessageService) {
+  constructor(private router: Router, private msg: NzMessageService, private route: ActivatedRoute) {
   }
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
@@ -32,7 +32,6 @@ export class HttpApiInterceptor implements HttpInterceptor {
       if (error.status === 404 || error.status == 0) {
         this.router.navigateByUrl('/login');
       }
-      console.log(error)
       return of(error)
     }));
   }

diff --git a/src/app/views/machine-manager/machine-manager.component.ts b/src/app/views/machine-manager/machine-manager.component.ts
@@ -51,7 +51,7 @@ export class MachineManagerComponent implements OnInit {
 
   getList() {
     this.api.machineList(this.user).subscribe(x => {
-      this.machines = x.machines.sort(this.compare('id', true));
+      this.machines = x.machines.sort((a: any, b: any) => parseInt(a.id) - parseInt(b.id));
       this.getRoutes();
       if (this.tagEditMachine.id) {
         this.tagEditMachine = this.machines.find(x => x.id == this.tagEditMachine.id);
@@ -90,19 +90,6 @@ export class MachineManagerComponent implements OnInit {
     })
   }
 
-  compare(property: string, asc: boolean) {
-    return function (value1: { [x: string]: any; }, value2: { [x: string]: any; }) {
-      let a = value1[property]
-      let b = value2[property]
-      // 默认升序
-      if (asc == undefined) {
-        return a - b
-      } else {
-        return asc ? a - b : b - a
-      }
-    }
-  }
-
   onExpandChange(id: string, checked: boolean): void {
     if (checked) {
       this.expandSet.add(id);
@@ -179,7 +166,7 @@ export class MachineManagerComponent implements OnInit {
       nzFooter: null
     }).afterClose.subscribe(x => {
       if (x) {
-        this.api.machineRegister(this.user, 'nodekey:' + x.replace('nodekey:','')).subscribe(x => {
+        this.api.machineRegister(this.user, 'nodekey:' + x.replace('nodekey:', '')).subscribe(x => {
           this.msg.success('Register machine success');
           this.getList();
         })

diff --git a/src/app/views/user-manager/user-manager.component.ts b/src/app/views/user-manager/user-manager.component.ts
@@ -26,30 +26,16 @@ export class UserManagerComponent implements OnInit {
 
   getList() {
     this.api.userList().subscribe(x => {
-      this.users = x.users.sort(this.compare('id', true));
+      this.users = x.users.sort((a: any, b: any) => parseInt(a.id) - parseInt(b.id));
     });
   }
 
   getPreAuthKeys(user: string) {
     this.api.preAuthKeyList(user).subscribe(x => {
       this.preAuthKeys[user] = x.preAuthKeys;
-      console.log(x.preAuthKeys)
     })
   }
 
-  compare(property: string, asc: boolean) {
-    return function (value1: { [x: string]: any; }, value2: { [x: string]: any; }) {
-      let a = value1[property]
-      let b = value2[property]
-      // 默认升序
-      if (asc == undefined) {
-        return a - b
-      } else {
-        return asc ? a - b : b - a
-      }
-    }
-  }
-
   onExpandChange(name: string, checked: boolean): void {
     if (checked) {
       this.expandSet.add(name);