Fixed: Fix the issue of k8s missing the assistant tool

Author: ZhaoJiSen

src/app/elements/asset-tree/asset-tree.component.ts

@@ -238,9 +238,9 @@ export class ElementAssetTreeComponent implements OnInit {
       return;
     }
 
-    // if (treeNode.meta.data.platform_type === 'k8s') {
-    //   return connectOnNewPage(treeNode, 'auto');
-    // }
+    if (treeNode.meta.data.platform_type === 'k8s') {
+      return connectOnNewPage(treeNode, 'auto');
+    }
 
     if (this.isOpenNewWindow) {
       connectOnNewPage(treeNode, 'auto');

src/app/elements/chat/chat.component.ts

@@ -55,8 +55,8 @@ export class ElementChatComponent implements OnInit, OnDestroy, AfterViewInit {
   get isShowSetting() {
     const connectMethods = ['koko', 'lion', 'tinker', 'panda'];
 
-    // sftp 不展示设置按钮
-    if (this.currentView.protocol === 'sftp') {
+    // sftp 或 k8s 不展示设置按钮
+    if (this.currentView.protocol === 'sftp' || this.currentView.protocol === 'k8s') {
       return false;
     }
 

src/app/elements/connect/connect.component.ts

@@ -153,11 +153,12 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
       return;
     }
 
-    if (connToken.protocol === 'k8s') {
-      const url = `${window.location.protocol}//${window.location.host}/luna/k8s/${connToken.id}?asset=${asset.id}`;
-      window.open(url);
-      return;
-    }
+    // if (connToken.protocol === 'k8s') {
+      // const url = `${window.location.protocol}//${window.location.host}/luna/k8s/${connToken.id}?asset=${asset.id}`;
+      // window.open(url);
+      // return;
+      // console.log('k8s', this.viewSrv)
+    // }
 
     // 分屏连接
     if (splitConnect) {
@@ -168,7 +169,9 @@ export class ElementConnectComponent implements OnInit, OnDestroy {
     if (connectMethod.value.endsWith('_guide')) {
       return this.createWebView(asset, connectInfo, connToken);
     }
+
     let appletConnectMethod = connectOption ? connectOption['appletConnectMethod'] : 'web';
+
     if (!this._settingSvc.hasXPack()) {
       appletConnectMethod = 'web';
     }

src/app/pages/connect/connect.component.html

@@ -1,6 +1,7 @@
-<div #contentWindow *ngIf="isDirect">
-  <app-face-monitor></app-face-monitor>
+<app-face-monitor></app-face-monitor>
+<elements-chat></elements-chat>
 
+<div #contentWindow *ngIf="isDirect">
   <div class="terminal-connect" *ngIf="view && view.connectMethod?.component === 'koko'">
     <div *ngIf="view.connectMethod?.value === 'web_sftp'" style="height: 100%; width: 100%">
       <elements-content-window *ngIf="view" [view]="view"></elements-content-window>

src/app/pages/connect/connect.component.ts

@@ -328,7 +328,6 @@ export class PagesConnectComponent implements OnInit, OnDestroy {
         'node'
       );
     } else if (view) {
-      // 普通模式接收视图
       this.view = view;
       this.view.active = true;
     }