From e4240d7a8f601817e28167ac72d6a193c84a8361 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <32935519+BaiJiangJie@users.noreply.github.com>
Date: Tue, 7 Sep 2021 18:16:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=9A=E8=AF=9D=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8=E9=A1=B5=E9=9D=A2=20(#1003?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 添加配置 SECURITY_SESSION_SHARE

* fix: 添加会话活动页面

* fix: 添加会话活动页面

* fix: 添加会话活动页面

* fix: 添加会话活动页面
---
 src/i18n/langs/cn.json                        |  3 +-
 src/i18n/langs/en.json                        |  4 +-
 .../SessionDetail/SessionJoinRecords.vue      | 50 +++++++++++++++++++
 src/views/sessions/SessionDetail/index.vue    | 11 +++-
 src/views/settings/Security.vue               |  2 +-
 5 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 src/views/sessions/SessionDetail/SessionJoinRecords.vue

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index ddb030712..5647ba345 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -649,7 +649,7 @@
     "ApplicationPermissionUpdate": "更新应用授权规则",
     "RemoteAppUpdate": "更新远程应用",
     "ReplayStorageUpdate": "更新录像存储",
-    "SessionDetail": "会话详情",
+    "Detail": "详情",
     "SessionOffline": "历史会话",
     "SessionOnline": "在线会话",
     "Sessions": "会话管理",
@@ -701,6 +701,7 @@
     "target": "目标",
     "bucket": "桶名称",
     "command": "命令",
+    "Activity": "活动",
     "commandStorage": "命令存储",
     "comment": "备注",
     "containerName": "容器名称",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 70e1ae1bb..5c06843fd 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -641,7 +641,8 @@
     "ApplicationPermissionUpdate": "Application permission update",
     "RemoteAppUpdate": "Remote app update",
     "ReplayStorageUpdate": "Replay storage update",
-    "SessionDetail": "Sessions detail",
+    "Detail": "Detail",
+    "Activity": "Activity",
     "SessionOffline": "Sessions offline",
     "SessionOnline": "Sessions online",
     "Sessions": "Sessions",
@@ -688,6 +689,7 @@
     "target": "Target",
     "bucket": "Bucket",
     "command": "Command",
+    "Activity": "Activity",
     "commandStorage": "Command storage",
     "comment": "Comment",
     "containerName": "Container name",
diff --git a/src/views/sessions/SessionDetail/SessionJoinRecords.vue b/src/views/sessions/SessionDetail/SessionJoinRecords.vue
new file mode 100644
index 000000000..a3e4df3c4
--- /dev/null
+++ b/src/views/sessions/SessionDetail/SessionJoinRecords.vue
@@ -0,0 +1,50 @@
+<template>
+  <ListTable :table-config="tableConfig" :header-actions="headerActions" />
+</template>
+
+<script>
+import ListTable from '@/components/ListTable'
+
+export default {
+  name: 'SessionJoinRecords',
+  components: {
+    ListTable
+  },
+  props: {
+    object: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: `/api/v1/terminal/session-join-records/?session=${this.object.id}`,
+        columns: [
+          'joiner_display', 'verify_code', 'reason', 'is_success', 'is_finished',
+          'date_joined', 'date_left', 'org_name'
+        ],
+        columnsShow: {
+          min: ['joiner_display', 'is_success', 'reason'],
+          default: [
+            'joiner_display', 'verify_code', 'is_success', 'reason', 'is_finished', 'date_joined', 'date_left'
+          ]
+        },
+        columnsMeta: {
+        }
+      },
+      headerActions: {
+        hasImport: false,
+        hasLeftActions: false,
+        searchConfig: {
+          exclude: ['date_joined', 'date_left']
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/sessions/SessionDetail/index.vue b/src/views/sessions/SessionDetail/index.vue
index 2b433fa28..1f9b072a5 100644
--- a/src/views/sessions/SessionDetail/index.vue
+++ b/src/views/sessions/SessionDetail/index.vue
@@ -16,12 +16,15 @@
 import { GenericDetailPage } from '@/layout/components'
 import SessionCommands from './SessionCommands'
 import SessionDetailInfo from './SessionDetailInfo'
+import SessionJoinRecords from './SessionJoinRecords'
+
 export default {
   name: 'SessionDetail',
   components: {
     GenericDetailPage,
     SessionCommands,
-    SessionDetailInfo
+    SessionDetailInfo,
+    SessionJoinRecords
   },
   data() {
     return {
@@ -29,12 +32,16 @@ export default {
       activeSubMenu: 'SessionDetailInfo',
       submenu: [
         {
-          title: this.$t('route.SessionDetail'),
+          title: this.$t('route.Detail'),
           name: 'SessionDetailInfo'
         },
         {
           title: this.$t('sessions.command'),
           name: 'SessionCommands'
+        },
+        {
+          title: this.$t('sessions.Activity'),
+          name: 'SessionJoinRecords'
         }
       ]
     }
diff --git a/src/views/settings/Security.vue b/src/views/settings/Security.vue
index dbbc2bff7..1118011ed 100644
--- a/src/views/settings/Security.vue
+++ b/src/views/settings/Security.vue
@@ -27,7 +27,7 @@ export default {
           this.$t('common.Basic'),
           [
             'SECURITY_COMMAND_EXECUTION', 'SECURITY_SERVICE_ACCOUNT_REGISTRATION',
-            'SECURITY_MAX_IDLE_TIME', 'SECURITY_WATERMARK_ENABLED'
+            'SECURITY_MAX_IDLE_TIME', 'SECURITY_WATERMARK_ENABLED', 'SECURITY_SESSION_SHARE'
           ]
         ],
         [