Merge pull request #1224 from jumpserver/dev

v4.6.0
jumpserver · Jan 15, 2025 · b2ce9b2 · b2ce9b2
2 parents 87b22d0 + ebbbbac
commit b2ce9b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "license": "GPLv3",
   "scripts": {
     "ng": "ng",
+    "dev": "NODE_OPTIONS=--openssl-legacy-provider ng serve --hmr --proxy-config proxy.conf.json --host 0.0.0.0 --base-href=/luna/ --disable-host-check",
     "start": "NODE_OPTIONS=--openssl-legacy-provider ng serve --hmr --proxy-config proxy.conf.json --host 0.0.0.0 --base-href=/luna/ --disable-host-check",
     "build": "NODE_OPTIONS=--openssl-legacy-provider ng build --prod --base-href=/luna/ --output-path 'luna'",
     "extract": "ngx-translate-extract --input ./src --output ./src/assets/i18n/*.json  --sort --format namespaced-json",

diff --git a/src/app/elements/content/content.component.ts b/src/app/elements/content/content.component.ts
@@ -7,6 +7,7 @@ import {ElementCommandDialogComponent} from '@app/elements/content/command-dialo
 import {ElementSendCommandWithVariableDialogComponent} from '@app/elements/content/send-command-with-variable-dialog/send-command-with-variable-dialog.component';
 import {fromEvent, Subscription} from 'rxjs';
 import * as jQuery from 'jquery/dist/jquery.min.js';
+import * as _ from 'lodash';
 
 @Component({
   selector: 'elements-content',
@@ -92,6 +93,10 @@ export class ElementContentComponent implements OnInit, OnDestroy {
   }
 
   handleKeyDownTabChange() {
+    const debouncedSwitch = _.debounce((key: string) => {
+      this.viewSrv.keyboardSwitchTab(key);
+    }, 500);
+
     this.keyboardSubscription = fromEvent(window, 'keydown').subscribe((event: any) => {
       if (event.altKey && event.shiftKey && (event.key === 'ArrowRight' || event.key === 'ArrowLeft') && this.viewList.length > 1) {
         let key = '';
@@ -100,7 +105,7 @@ export class ElementContentComponent implements OnInit, OnDestroy {
         } else if (event.key === 'ArrowLeft') {
           key = 'alt+shift+left';
         }
-        this.viewSrv.keyboardSwitchTab(key);
+        debouncedSwitch(key);
       }
     });
   }

diff --git a/src/app/services/connect-token/acl-dialog/acl-dialog.component.html b/src/app/services/connect-token/acl-dialog/acl-dialog.component.html
@@ -23,7 +23,7 @@ <h2 mat-dialog-title> {{ 'Login reminder' | translate }} </h2>
 
     <div *ngSwitchCase="'acl_face_online_not_supported'">
       <mat-dialog-content>
-        <div class="error-message">{{ 'ACL action "Face Online" not supported for this asset.' |translate }}</div>
+        <div class="error-message">{{errorDetail }}</div>
       </mat-dialog-content>
       <mat-dialog-actions>
         <button (click)="closeDialog()" mat-raised-button>{{ "Close" | translate }}</button>

diff --git a/src/app/services/connect-token/acl-dialog/acl-dialog.component.ts b/src/app/services/connect-token/acl-dialog/acl-dialog.component.ts
@@ -49,6 +49,9 @@ export class ElementACLDialogComponent implements OnInit {
     if (Array.isArray(error)) {
       error = error.join(' ');
     } else if (typeof error === 'object') {
+      if (error.detail) {
+        error = error.detail;
+      }
       error = JSON.stringify(error);
     }
     return error;