From 42104f6047bd39b91ac55bd6252b8944b43d24f3 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 11 Jun 2020 16:48:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9profile=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E6=9B=B4=E6=96=B0remote=20?=
 =?UTF-8?q?apps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GenericCreateUpdateForm/index.vue      |  8 ++++----
 src/userviews/users/UserProfile/ProfileInfo.vue       | 11 ++++++++---
 .../applications/RemoteApp/RemoteAppCreateUpdate.vue  |  2 +-
 .../CommandFilterDetail/RulesCreateUpdate.vue         |  9 ++-------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue
index a64a02cf7..1288923aa 100644
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -5,7 +5,7 @@
     :method="method"
     :form="form"
     :fields="fields"
-    :url="totalUrl"
+    :url="iUrl"
     :is-submitting="isSubmitting"
     v-bind="$attrs"
     v-on="$listeners"
@@ -116,7 +116,7 @@ export default {
     method() {
       return this.getMethod(this)
     },
-    totalUrl() {
+    iUrl() {
       return this.getUrl()
     }
   },
@@ -137,7 +137,7 @@ export default {
       return handler(values)
     },
     defaultPerformSubmit(validValues) {
-      return this.$axios[this.method](this.totalUrl, validValues)
+      return this.$axios[this.method](this.iUrl, validValues)
     },
     defaultOnSubmit(validValues) {
       const performSubmit = this.performSubmit || this.defaultPerformSubmit
@@ -178,7 +178,7 @@ export default {
       return object
     },
     async getObjectDetail() {
-      return this.$axios.get(this.totalUrl)
+      return this.$axios.get(this.iUrl)
     }
   }
 }
diff --git a/src/userviews/users/UserProfile/ProfileInfo.vue b/src/userviews/users/UserProfile/ProfileInfo.vue
index b562de63c..d89a1df17 100644
--- a/src/userviews/users/UserProfile/ProfileInfo.vue
+++ b/src/userviews/users/UserProfile/ProfileInfo.vue
@@ -9,7 +9,7 @@
   </el-row>
 </template>a
 
-<script>
+<script type="text/jsx">
 import DetailCard from '@/components/DetailCard'
 import QuickActions from '@/components/QuickActions'
 import { toSafeLocalDateStr } from '@/utils/common'
@@ -99,8 +99,13 @@ export default {
           key: this.$t('users.IsActive')
         },
         {
-          value: `${this.object.public_key_comment} ${this.object.public_key_hash_md5}`,
-          key: 'SSHKey'
+          value: this.object,
+          key: 'SSHKey',
+          formatter: (item, val) => {
+            const comment = val.public_key_comment
+            const md5 = val.public_key_hash_md5
+            return <span>{ comment } <br /> { md5 }</span>
+          }
         },
         {
           value: this.object.mfa_level_display,
diff --git a/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue b/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
index 83c105ddc..59830812b 100644
--- a/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
+++ b/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue
@@ -11,7 +11,7 @@ export default {
     GenericCreateUpdatePage
   },
   data() {
-    const appType = this.$route.query.type
+    const appType = this.$route.query.type || 'chrome'
     const fieldsMap = REMOTE_APP_TYPE_FIELDS_MAP[appType]
     const appTypeMeta = REMOTE_APP_TYPE_META_MAP[appType]
     const pathInitial = REMOTE_APP_PATH_DEFAULT_MAP[appType]
diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue b/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue
index 40472fc2f..c92f1f158 100644
--- a/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue
+++ b/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue
@@ -15,7 +15,7 @@ export default {
   name: 'RulesCreateUpdate',
   components: { GenericCreateUpdatePage },
   data() {
-    const filterId = this.$route.query.filter
+    const filterId = this.$route.query.filter || '00000000-0000-0000-0000-000000000000'
     const regexPlaceholder = 'rm.*|reboot|shutdown'
     const commandPlaceholder = 'rm\rreboot'
     const commandHelpText = this.$t('assets.CommandFilterRuleContentHelpText')
@@ -41,7 +41,7 @@ export default {
             multiple: false
           }
         },
-        'action.value': {
+        type: {
           on: {
             change: ([val]) => {
               if (val === 'command') {
@@ -81,11 +81,6 @@ export default {
       },
       url: `/api/v1/assets/cmd-filters/${filterId}/rules/`
     }
-  },
-  computed: {
-  },
-  mounted() {
-    console.log(this.url)
   }
 }
 </script>

From a20e1c16181d5ad03f0591a583285430e20d03e8 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 11 Jun 2020 17:56:13 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?org=E5=90=8E=E9=9C=80=E8=A6=81=E5=88=B7=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=9B=B4=E6=96=B0form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GenericCreateUpdateForm/index.vue         | 85 +++++++++----------
 src/store/modules/users.js                    |  6 ++
 src/views/xpack/InterfaceSettings.vue         | 15 +---
 .../xpack/Org/OrganizationCreateUpdate.vue    | 10 ++-
 src/views/xpack/router.js                     | 15 ++--
 5 files changed, 69 insertions(+), 62 deletions(-)

diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue
index 1288923aa..491ecda72 100644
--- a/src/layout/components/GenericCreateUpdateForm/index.vue
+++ b/src/layout/components/GenericCreateUpdateForm/index.vue
@@ -4,7 +4,6 @@
     ref="form"
     :method="method"
     :form="form"
-    :fields="fields"
     :url="iUrl"
     :is-submitting="isSubmitting"
     v-bind="$attrs"
@@ -24,12 +23,6 @@ export default {
       type: String,
       default: ''
     },
-    fields: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
     object: {
       type: Object,
       default: null
@@ -48,7 +41,9 @@ export default {
     },
     performSubmit: {
       type: Function,
-      default: null
+      default(validValues) {
+        return this.$axios[this.method](this.iUrl, validValues)
+      }
     },
     createSuccessMsg: {
       type: String,
@@ -76,6 +71,12 @@ export default {
         return { name: routeName }
       }
     },
+    getNextRoute: {
+      type: Function,
+      default(res, method) {
+        return method === 'post' ? this.createSuccessNextRoute : this.updateSuccessNextRoute
+      }
+    },
     getMethod: {
       type: Function,
       default: function() {
@@ -87,12 +88,6 @@ export default {
         }
       }
     },
-    getNextRoute: {
-      type: Function,
-      default(res, method) {
-        return method === 'post' ? this.createSuccessNextRoute : this.updateSuccessNextRoute
-      }
-    },
     getUrl: {
       type: Function,
       default: function() {
@@ -103,6 +98,33 @@ export default {
         }
         return url
       }
+    },
+    onPerformSuccess: {
+      type: Function,
+      default(res, method, vm) {
+        const msg = method === 'post' ? this.createSuccessMsg : this.updateSuccessMsg
+        const route = this.getNextRoute(res, method)
+        this.$emit('submitSuccess', res)
+        this.$message.success(msg)
+        setTimeout(() => this.$router.push(route), 100)
+      }
+    },
+    onPerformError: {
+      type: Function,
+      default(error, method, vm) {
+        this.$emit('submitError', error)
+        const response = error.response
+        const data = response.data
+        if (response.status === 400) {
+          for (const key of Object.keys(data)) {
+            let value = data[key]
+            if (value instanceof Array) {
+              value = value.join(';')
+            }
+            this.$refs.form.setFieldError(key, value)
+          }
+        }
+      }
     }
   },
   data() {
@@ -120,7 +142,7 @@ export default {
       return this.getUrl()
     }
   },
-  async mounted() {
+  async created() {
     this.loading = true
     try {
       const values = await this.getFormValue()
@@ -136,36 +158,12 @@ export default {
       values = this.cleanFormValue(values)
       return handler(values)
     },
-    defaultPerformSubmit(validValues) {
-      return this.$axios[this.method](this.iUrl, validValues)
-    },
     defaultOnSubmit(validValues) {
-      const performSubmit = this.performSubmit || this.defaultPerformSubmit
-      const msg = this.method === 'post' ? this.createSuccessMsg : this.updateSuccessMsg
-      const event = this.method === 'post' ? 'createSuccess' : 'updateSuccess'
       this.isSubmitting = true
-      performSubmit(validValues).then((res) => {
-        const route = this.getNextRoute(res, this.method)
-        this.$emit(event, res)
-        this.$emit('submitSuccess', res)
-        this.$message.success(msg)
-        setTimeout(() => this.$router.push(route), 100)
-      }).catch(error => {
-        this.$emit('submitError', error)
-        const response = error.response
-        const data = response.data
-        if (response.status === 400) {
-          for (const key of Object.keys(data)) {
-            let value = data[key]
-            if (value instanceof Array) {
-              value = value.join(';')
-            }
-            this.$refs.form.setFieldError(key, value)
-          }
-        }
-      }).finally(() => {
-        this.isSubmitting = false
-      })
+      this.performSubmit(validValues)
+        .then((res) => this.onPerformSuccess.bind(this)(res, this.method, this))
+        .catch((error) => this.onPerformError(error, this.method, this))
+        .finally(() => { this.isSubmitting = false })
     },
     async getFormValue() {
       if (this.method !== 'put') {
@@ -174,6 +172,7 @@ export default {
       let object = this.object
       if (object === null) {
         object = await this.getObjectDetail()
+        this.$emit('update:object', object)
       }
       return object
     },
diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index aa120f1c8..f30f90ba4 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -37,6 +37,9 @@ const mutations = {
   SET_ORGS: (state, orgs) => {
     state.orgs = orgs
   },
+  ADD_ORG: (state, org) => {
+    state.orgs.push(org)
+  },
   SET_ROLES(state, roles) {
     state.roles = roles
   },
@@ -119,6 +122,9 @@ const actions = {
       }).catch((e) => reject(e))
     })
   },
+  addAdminOrg({ commit, state }, org) {
+    commit('ADD_ORG', org)
+  },
   // user logout
   logout({ commit, state }) {
     return new Promise((resolve, reject) => {
diff --git a/src/views/xpack/InterfaceSettings.vue b/src/views/xpack/InterfaceSettings.vue
index 29b1c4035..e63859dcf 100644
--- a/src/views/xpack/InterfaceSettings.vue
+++ b/src/views/xpack/InterfaceSettings.vue
@@ -1,5 +1,5 @@
 <template>
-  <TabPage :submenu="submenu" :active-menu="activeMenu">
+  <Page>
     <IBox v-if="!loading">
       <GenericCreateUpdateForm
         :fields="fields"
@@ -11,11 +11,11 @@
         :more-buttons="moreButtons"
       />
     </IBox>
-  </TabPage>
+  </Page>
 </template>
 
 <script>
-import { TabPage } from '@/layout/components'
+import { Page } from '@/layout/components'
 import { IBox, UploadField } from '@/components'
 import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm'
 import { getInterfaceInfo, postInterface, restoreInterface } from '@/views/xpack/api'
@@ -24,7 +24,7 @@ export default {
   name: 'InterfaceSettings',
   components: {
     IBox,
-    TabPage,
+    Page,
     GenericCreateUpdateForm
   },
   data() {
@@ -32,13 +32,6 @@ export default {
       loading: true,
       files: {},
       interfaceInfo: {},
-      activeMenu: 'interface',
-      submenu: [
-        {
-          title: this.$t('xpack.InterfaceSettings'),
-          name: 'interface'
-        }
-      ],
       successUrl: { name: 'Settings' },
       fields: [
         ['', ['login_title']],
diff --git a/src/views/xpack/Org/OrganizationCreateUpdate.vue b/src/views/xpack/Org/OrganizationCreateUpdate.vue
index 50adcd82e..d9524a772 100644
--- a/src/views/xpack/Org/OrganizationCreateUpdate.vue
+++ b/src/views/xpack/Org/OrganizationCreateUpdate.vue
@@ -15,7 +15,10 @@ export default {
         initial: {
         },
         url: '/api/v1/orgs/orgs/',
-        fields: ['name', 'admins', 'auditors', 'users', 'comment'],
+        fields: [
+          [this.$t('common.Basic'), ['name', 'comment']],
+          [this.$t('common.Members'), ['admins', 'auditors', 'users']]
+        ],
         fieldsMeta: {
           admins: {
             label: this.$t('xpack.Admin'),
@@ -53,6 +56,11 @@ export default {
               }
             }
           }
+        },
+        onPerformSuccess(res, method) {
+          const org = { id: res.id, name: res.name }
+          this.$store.dispatch('users/addAdminOrg', org)
+          return this.$router.push({ name: 'OrganizationList' })
         }
       }
     }
diff --git a/src/views/xpack/router.js b/src/views/xpack/router.js
index ad479eec9..cc4d7a2dd 100644
--- a/src/views/xpack/router.js
+++ b/src/views/xpack/router.js
@@ -165,24 +165,24 @@ export default {
           path: '',
           component: () => import('@/views/xpack/Org/OrganizationList'),
           name: 'OrganizationList',
-          meta: { title: i18n.t('xpack.Organization.OrganizationList') }
+          meta: { title: i18n.t('xpack.Organization.OrganizationList'), activeMenu: '/xpack/orgs' }
         },
         {
-          path: 'orgs/create',
+          path: 'create',
           component: () => import('@/views/xpack/Org/OrganizationCreateUpdate'),
           name: 'OrganizationCreate',
           hidden: true,
           meta: { title: i18n.t('xpack.Organization.OrganizationCreate'), activeMenu: '/xpack/orgs', action: 'create' }
         },
         {
-          path: 'orgs/:id/update',
+          path: ':id/update',
           component: () => import('@/views/xpack/Org/OrganizationCreateUpdate'),
           name: 'OrganizationUpdate',
           hidden: true,
           meta: { title: i18n.t('xpack.Organization.OrganizationUpdate'), activeMenu: '/xpack/orgs', action: 'update' }
         },
         {
-          path: 'orgs/:id',
+          path: ':id',
           component: () => import('@/views/xpack/Org/OrganizationDetail/index'),
           name: 'OrganizationDetail',
           hidden: true,
@@ -193,16 +193,17 @@ export default {
     {
       path: 'vault',
       component: empty,
-      meta: { title: i18n.t('xpack.Vault.Vault'), activeMenu: '/xpack/vault/vault' },
+      redirect: '',
+      meta: { },
       children: [
         {
-          path: 'vault',
+          path: '',
           component: () => import('@/views/xpack/Vault/VaultList.vue'),
           name: 'VaultList',
           meta: { title: i18n.t('xpack.Vault.Vault'), activeMenu: '/xpack/vault/vault' }
         },
         {
-          path: 'vault/create',
+          path: 'create',
           component: () => import('@/views/xpack/Vault/VaultCreate'),
           name: 'VaultCreate',
           meta: { title: i18n.t('xpack.Vault.Create'), activeMenu: '/xpack/vault/vault' },

From f66ed529853c5b80b321ccda3ed6d52872d6e593 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Thu, 11 Jun 2020 13:46:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[Fix]=20=E4=BC=9A=E8=AF=9D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86/=E5=91=BD=E4=BB=A4=E8=AE=B0=E5=BD=95=20=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E4=B8=8A=E4=BC=A0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sessions/CommandList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index fdd8e40a8..efa8b8c9e 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -75,6 +75,7 @@ export default {
       headerActions: {
         hasLeftActions: false,
         hasExport: false,
+        hasImport: false,
         hasDatePicker: true,
         datePicker: {
           dateStart: dateFrom,

From 083802e0163224759b6aa4b30f9ca04a7fdf6b34 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Thu, 11 Jun 2020 17:58:40 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[Fix]=20=E4=BC=9A=E8=AF=9D=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86/=E9=A3=8E=E9=99=A9=E7=AD=89=E7=BA=A7=20=E7=94=B1?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=94=B9=E4=B8=BA=E6=96=87=E5=AD=97=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json             |  5 ++++-
 src/i18n/langs/en.json             |  5 ++++-
 src/views/sessions/CommandList.vue | 16 ++++++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index baadde8de..cbee0662e 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -538,7 +538,10 @@
     "terminate": "终断",
     "test": "测试",
     "type": "类型",
-    "user": "用户"
+    "user": "用户",
+    "riskLevels": {
+      "common": "普通"
+    }
   },
   "setting": {
     "Secret": "密钥",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 9456b78bd..066124528 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -533,7 +533,10 @@
     "terminate": "Terminate",
     "test": "Test",
     "type": "Type",
-    "user": "Use"
+    "user": "Use",
+    "riskLevels": {
+      "common": "common"
+    }
   },
   "setting": {
     "Basic": "Basic setting",
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index efa8b8c9e..024e93ebd 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -6,7 +6,7 @@
 import { GenericListPage } from '@/layout/components'
 import { getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
 import { OutputExpandFormatter } from './formatters'
-import { DetailFormatter } from '@/components/ListTable/formatters'
+import { DetailFormatter, BooleanFormatter } from '@/components/ListTable/formatters'
 
 export default {
   components: {
@@ -38,7 +38,19 @@ export default {
             label: this.$t('sessions.command')
           },
           risk_level: {
-            label: this.$t('sessions.riskLevel')
+            label: this.$t('sessions.riskLevel'),
+            formatter: BooleanFormatter,
+            formatterArgs: {
+              hasTips: true,
+              tips(val) {
+                switch (val) {
+                  case 0:
+                    return vm.$t('sessions.riskLevels.common')
+                  default:
+                    return vm.$t('sessions.riskLevels.common')
+                }
+              }
+            }
           },
           user: {
             label: this.$t('sessions.user')