diff --git a/src/views/settings/Terminal/TerminalDetail.vue b/src/views/settings/Terminal/TerminalDetail.vue
index 7c966aed6..1ec0dd086 100644
--- a/src/views/settings/Terminal/TerminalDetail.vue
+++ b/src/views/settings/Terminal/TerminalDetail.vue
@@ -2,7 +2,7 @@
-
+
diff --git a/src/views/settings/Terminal/TerminalList.vue b/src/views/settings/Terminal/TerminalList.vue
index 3ef4d454b..f4be05a13 100644
--- a/src/views/settings/Terminal/TerminalList.vue
+++ b/src/views/settings/Terminal/TerminalList.vue
@@ -40,11 +40,13 @@ export default {
visible: false,
iFormSetting: {
url: '/api/v1/terminal/terminals/',
+ getUrl: () => '/api/v1/terminal/terminals/',
fields: [
['', ['command_storage', 'replay_storage']]
],
fieldsMeta: {
command_storage: {
+ label: this.$t('sessions.commandStorage'),
component: Select2,
el: {
ajax: {
@@ -54,6 +56,7 @@ export default {
}
},
replay_storage: {
+ label: this.$t('sessions.replayStorage'),
component: Select2,
el: {
ajax: {
diff --git a/src/views/settings/Terminal/index.vue b/src/views/settings/Terminal/index.vue
index f4c86336e..03c5340bd 100644
--- a/src/views/settings/Terminal/index.vue
+++ b/src/views/settings/Terminal/index.vue
@@ -13,6 +13,8 @@ import TerminalList from './TerminalList'
import ReplayStorage from './Storage/ReplayStorage'
import CommandStorage from './Storage/CommandStorage'
import Monitor from './Monitor'
+import EndpointList from './Endpoint/EndpointList'
+import EndpointRuleList from './EndpointRule/EndpointRuleList'
export default {
components: {
@@ -21,7 +23,9 @@ export default {
Monitor,
TerminalList,
ReplayStorage,
- CommandStorage
+ CommandStorage,
+ EndpointList,
+ EndpointRuleList
},
data() {
return {
@@ -53,6 +57,20 @@ export default {
hidden: () => {
return !(this.$hasPerm('terminal.view_status') && this.$store.getters.hasValidLicense)
}
+ },
+ {
+ title: this.$t('xpack.Endpoint'),
+ name: 'EndpointList',
+ hidden: () => {
+ return !this.$hasPerm('terminal.view_endpoint')
+ }
+ },
+ {
+ title: this.$t('xpack.EndpointRule'),
+ name: 'EndpointRuleList',
+ hidden: () => {
+ return !this.$hasPerm('terminal.view_endpointrule')
+ }
}
]
}
diff --git a/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue b/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
index 148514f7e..0c0f88f8d 100644
--- a/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
+++ b/src/views/tickets/RequestApplicationPerm/CreateUpdate.vue
@@ -12,6 +12,8 @@ import { GenericCreateUpdatePage } from '@/layout/components'
import Select2 from '@/components/FormFields/Select2'
import { getDaysFuture } from '@/utils/common'
import { Required } from '@/components/DataForm/rules'
+import { ApplicationCascader } from '@/views/applications/const'
+
export default {
components: {
GenericCreateUpdatePage
@@ -108,69 +110,7 @@ export default {
rules: [Required],
el: {
multiple: false,
- options: [
- {
- label: this.$t(`applications.applicationsCategory.db`),
- value: 'db',
- children: [
- {
- label: 'MySQL',
- value: 'mysql'
- },
- {
- label: 'Oracle',
- value: 'oracle'
- },
- {
- label: 'PostgreSQL',
- value: 'postgresql'
- },
- {
- label: 'MariaDB',
- value: 'mariadb'
- },
- {
- label: 'SQLServer',
- value: 'sqlserver'
- },
- {
- label: 'Redis',
- value: 'redis'
- }
- ]
- },
- {
- label: this.$t(`applications.applicationsCategory.cloud`),
- value: 'cloud',
- children: [
- {
- label: 'Kubernetes',
- value: 'k8s'
- }
- ]
- },
- {
- label: this.$t(`applications.applicationsCategory.remote_app`),
- value: 'remote_app',
- children: [
- {
- label: 'MySQL Workbench',
- value: 'mysql_workbench'
- },
- {
- label: 'vSphere Client',
- value: 'vmware_client'
- },
- {
- label: 'Custom',
- value: 'custom'
- }, {
- label: 'Chrome',
- value: 'chrome'
- }
- ]
- }
- ]
+ options: ApplicationCascader
},
on: {
change: ([event], updateForm) => {
@@ -197,9 +137,10 @@ export default {
hidden: (form) => {
this.org_id = form['org_id']
apply_category_type = this.apply_category_type
+ const fieldsMeta = this.fieldsMeta.meta.fieldsMeta
if (apply_category_type) {
- this.fieldsMeta.meta.fieldsMeta.apply_applications.el.ajax.url = `/api/v1/applications/applications/suggestions/?oid=${vm.org_id}&category=${apply_category_type[0]}&type=${apply_category_type[1]}`
- this.fieldsMeta.meta.fieldsMeta.apply_system_users.el.ajax.url = apply_category_type[0] === 'remote_app' ? `/api/v1/assets/system-users/suggestions/?oid=${vm.org_id}&protocol=rdp` : `/api/v1/assets/system-users/suggestions/?oid=${vm.org_id}&protocol=${apply_category_type[1]}`
+ fieldsMeta.apply_applications.el.ajax.url = `/api/v1/applications/applications/suggestions/?oid=${vm.org_id}&category=${apply_category_type[0]}&type=${apply_category_type[1]}`
+ fieldsMeta.apply_system_users.el.ajax.url = apply_category_type[0] === 'remote_app' ? `/api/v1/assets/system-users/suggestions/?oid=${vm.org_id}&protocol=rdp` : `/api/v1/assets/system-users/suggestions/?oid=${vm.org_id}&protocol=${apply_category_type[1]}`
}
}
}
diff --git a/src/views/tickets/TicketFlow/components/Details.vue b/src/views/tickets/TicketFlow/components/Details.vue
index 5503df10c..ff95b3cfc 100644
--- a/src/views/tickets/TicketFlow/components/Details.vue
+++ b/src/views/tickets/TicketFlow/components/Details.vue
@@ -5,14 +5,14 @@
-
-
-
+
+
+
-
+
@@ -22,14 +22,14 @@
-
+
-
+
-
+
diff --git a/src/views/tickets/TicketFlow/components/GenericTicketDetail.vue b/src/views/tickets/TicketFlow/components/GenericTicketDetail.vue
index 4e4e96b6d..a74ed9492 100644
--- a/src/views/tickets/TicketFlow/components/GenericTicketDetail.vue
+++ b/src/views/tickets/TicketFlow/components/GenericTicketDetail.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/views/tickets/components/Details.vue b/src/views/tickets/components/Details.vue
index 0394bf613..6bbe1c99b 100644
--- a/src/views/tickets/components/Details.vue
+++ b/src/views/tickets/components/Details.vue
@@ -5,36 +5,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -74,4 +62,10 @@ export default {
font-size: 13px;
line-height: 2.5;
}
+.item-label {
+ margin-right: 4px;
+}
+.item-label, .item-text {
+ display: inline-block;
+}
diff --git a/src/views/tickets/components/GenericTicketDetail.vue b/src/views/tickets/components/GenericTicketDetail.vue
index 5233cb691..754f94c03 100644
--- a/src/views/tickets/components/GenericTicketDetail.vue
+++ b/src/views/tickets/components/GenericTicketDetail.vue
@@ -1,13 +1,13 @@
-
-
+
+
-
+
diff --git a/src/views/tickets/components/Session.vue b/src/views/tickets/components/Session.vue
index 3326ffc9a..52e528344 100644
--- a/src/views/tickets/components/Session.vue
+++ b/src/views/tickets/components/Session.vue
@@ -37,7 +37,7 @@
{{ $t('sessions.terminate') }}
@@ -45,7 +45,7 @@
{{ $t('sessions.Monitor') }}
@@ -117,9 +117,6 @@ export default {
onMonitor() {
const joinUrl = `/luna/monitor/${this.session.id}`
window.open(joinUrl, 'height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')
- },
- asDisabled(type) {
- return (type || true) || !this.$hasPerm('tickets.view_ticket')
}
}
diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index 5d4a94b36..b9d7838d3 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -77,7 +77,7 @@ export default {
nodesDeps: {
'view_console': ['rbac.view_console'],
'view_audit': ['rbac.view_audit'],
- 'view_workspace': ['rbac.view_workspace'],
+ 'view_workbench': ['rbac.view_workbench'],
'view_setting': ['settings.view_setting'],
'cloud_import': ['assets.view_asset'],
'terminal_node': ['settings.change_terminal'],
diff --git a/src/views/users/Role/RoleDetail/RoleUsers.vue b/src/views/users/Role/RoleDetail/RoleUsers.vue
index b4278ff26..27de06712 100644
--- a/src/views/users/Role/RoleDetail/RoleUsers.vue
+++ b/src/views/users/Role/RoleDetail/RoleUsers.vue
@@ -31,6 +31,7 @@ export default {
return {
loading: true,
relationConfig: {
+ disabled: !this.$hasPerm('rbac.add_systemrolebinding'),
icon: 'fa-user',
title: this.$t('common.Members'),
objectsAjax: {
diff --git a/src/views/users/Role/RoleDetail/index.vue b/src/views/users/Role/RoleDetail/index.vue
index 0e78ccc09..f6829c3a7 100644
--- a/src/views/users/Role/RoleDetail/index.vue
+++ b/src/views/users/Role/RoleDetail/index.vue
@@ -36,10 +36,10 @@ export default {
activeMenu: 'RoleInfo',
actions: {
canDelete: () => {
- return vm.hasPermNotBuiltinNotRootOrg(this.role, `rbac.delete_${scopeRole}`)
+ return vm.hasPermNotBuiltin(this.role, `rbac.delete_${scopeRole}`)
},
canUpdate: () => {
- return vm.hasPermNotBuiltinNotRootOrg(this.role, `rbac.change_${scopeRole}`)
+ return vm.hasPermNotBuiltin(this.role, `rbac.change_${scopeRole}`)
},
updateRoute: {
name: this.$route.name.replace('Detail', 'Update'),
@@ -62,10 +62,8 @@ export default {
}
},
methods: {
- hasPermNotBuiltinNotRootOrg(row, perm) {
- return !row['builtin'] &&
- this.$hasPerm(perm) &&
- !this.$isRootOrg()
+ hasPermNotBuiltin(row, perm) {
+ return !row['builtin'] && this.$hasPerm(perm)
}
}
}
diff --git a/src/views/users/Role/RoleList/BaseRoleList.vue b/src/views/users/Role/RoleList/BaseRoleList.vue
index 701cfcb0d..d4205a101 100644
--- a/src/views/users/Role/RoleList/BaseRoleList.vue
+++ b/src/views/users/Role/RoleList/BaseRoleList.vue
@@ -60,10 +60,10 @@ export default {
actions: {
formatterArgs: {
canUpdate: ({ row }) => {
- return this.hasPermNotBuiltinNotRootOrg(row, `rbac.change_${row.scope}role`)
+ return this.hasPermNotBuiltin(row, `rbac.change_${row.scope}role`)
},
canDelete: ({ row }) => {
- return this.hasPermNotBuiltinNotRootOrg(row, `rbac.delete_${row.scope}role`)
+ return this.hasPermNotBuiltin(row, `rbac.delete_${row.scope}role`)
},
updateRoute: {
name: 'RoleUpdate',
@@ -108,8 +108,8 @@ export default {
}
},
methods: {
- hasPermNotBuiltinNotRootOrg(row, perm) {
- return !row['builtin'] && this.$hasPerm(perm) && !this.$isRootOrg()
+ hasPermNotBuiltin(row, perm) {
+ return !row['builtin'] && this.$hasPerm(perm)
}
}
}
diff --git a/src/views/users/Role/RoleList/index.vue b/src/views/users/Role/RoleList/index.vue
index 323be929c..416cb017a 100644
--- a/src/views/users/Role/RoleList/index.vue
+++ b/src/views/users/Role/RoleList/index.vue
@@ -3,22 +3,16 @@
{{ Title }}
-
-
-