This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5_beta
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit e3588ee98401de87fc367bb3e8f7a969dab3911e
Author: Qian Xia <lauraxiaq...@gmail.com>
AuthorDate: Thu Jul 20 15:04:02 2023 +0800
KYLIN-5659 refine SecurityProfile locals
---
kystudio/src/components/admin/Group/index.vue | 10 +++++-----
kystudio/src/components/admin/Group/locales.js | 2 +-
kystudio/src/components/admin/User/index.vue | 2 +-
kystudio/src/components/admin/User/locales.js | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/kystudio/src/components/admin/Group/index.vue
b/kystudio/src/components/admin/Group/index.vue
index f122878928..36cc253bf3 100644
--- a/kystudio/src/components/admin/Group/index.vue
+++ b/kystudio/src/components/admin/Group/index.vue
@@ -2,7 +2,7 @@
<div class="security-group" v-loading="isLoadingUserGroups">
<div class="ksd-title-label ksd-mt-20
ksd-mrl-20">{{$t('userGroupsList')}}</div>
<el-row class="ksd-mb-10 ksd-mt-10 ksd-mrl-20">
- <el-button type="primary" size="medium"
v-if="groupActions.includes('addGroup')" :disabled="!isTestingSecurityProfile"
icon="el-ksd-icon-add_22"
@click="editGroup('new')">{{$t('kylinLang.common.new')}}</el-button>
+ <el-button type="primary" size="medium"
v-if="groupActions.includes('addGroup')&&isTestingSecurityProfile"
icon="el-ksd-icon-add_22"
@click="editGroup('new')">{{$t('kylinLang.common.new')}}</el-button>
<div style="width:240px;" class="ksd-fright">
<el-input class="show-search-btn"
size="medium"
@@ -14,7 +14,7 @@
</el-input>
</div>
</el-row>
- <el-alert class="ksd-mb-16 ksd-ml-20" type="info"
+ <el-alert class="ksd-mb-16 ksd-ml-20" type="tip" show-icon
v-if="!isTestingSecurityProfile"
:title="$t('securityProfileTip')"
:closable="false">
@@ -42,14 +42,14 @@
{{scope.row.users && scope.row.users.length || 0}}
</template>
</el-table-column>
- <el-table-column v-if="groupActions.includes('editGroup') &&
groupActions.includes('deleteGroup')"
+ <el-table-column v-if="(groupActions.includes('editGroup') ||
groupActions.includes('deleteGroup')) && isTestingSecurityProfile"
:label="$t('kylinLang.common.action')" :width="83">
<template slot-scope="scope">
<el-tooltip :content="$t('assignUsers')" effect="dark"
placement="top" v-show="scope.row.group_name!=='ALL_USERS' &&
groupActions.includes('editGroup')">
- <i class="el-icon-ksd-table_assign ksd-fs-14 ksd-mr-10"
:class="{'is-disabled': !isTestingSecurityProfile}" @click="editGroup('assign',
scope.row)"></i>
+ <i class="el-icon-ksd-table_assign ksd-fs-14 ksd-mr-10"
@click="editGroup('assign', scope.row)"></i>
</el-tooltip><span>
</span><el-tooltip :content="$t('kylinLang.common.drop')"
effect="dark" placement="top" v-show="(scope.row.group_name!=='ROLE_ADMIN' &&
scope.row.group_name!=='ALL_USERS') && groupActions.includes('deleteGroup')">
- <i class="el-icon-ksd-table_delete ksd-fs-14"
:class="{'is-disabled': !isTestingSecurityProfile}"
@click="dropGroup(scope.row)"></i>
+ <i class="el-icon-ksd-table_delete ksd-fs-14"
@click="dropGroup(scope.row)"></i>
</el-tooltip>
</template>
</el-table-column>
diff --git a/kystudio/src/components/admin/Group/locales.js
b/kystudio/src/components/admin/Group/locales.js
index de90c7ab04..a89d660496 100644
--- a/kystudio/src/components/admin/Group/locales.js
+++ b/kystudio/src/components/admin/Group/locales.js
@@ -10,6 +10,6 @@ export default {
userGroupsList: 'User Group',
groupFilter: 'Search by user group name',
userGroup: 'User Group',
- securityProfileTip: 'The current mode doesn\'t allow managing users/user
groups, including operations such as creating, editing, deleting, assigning,
and changing passwords.'
+ securityProfileTip: 'The current user/user group is managed using an
external system as this page is read-only. Please go to the relevant management
system if you need to edit it.'
}
}
diff --git a/kystudio/src/components/admin/User/index.vue
b/kystudio/src/components/admin/User/index.vue
index 2e9923d28e..b8f7a27d2b 100644
--- a/kystudio/src/components/admin/User/index.vue
+++ b/kystudio/src/components/admin/User/index.vue
@@ -32,7 +32,7 @@
</el-col>
</el-row>
- <el-alert class="ksd-mb-16" type="info"
+ <el-alert class="ksd-mb-16" type="tip" show-icon
v-if="!isTestingSecurityProfile"
:title="$t('securityProfileTip')"
:closable="false">
diff --git a/kystudio/src/components/admin/User/locales.js
b/kystudio/src/components/admin/User/locales.js
index 7d4eff330a..3363cd3587 100644
--- a/kystudio/src/components/admin/User/locales.js
+++ b/kystudio/src/components/admin/User/locales.js
@@ -3,7 +3,7 @@ export default {
back: 'Back',
user: 'User',
userName: 'Search by username',
- securityProfileTip: 'The current mode doesn\'t allow managing users/user
groups, including operations such as adding, editing, deleting, assigning, and
changing passwords.',
+ securityProfileTip: 'The current user/user group is managed using an
external system as this page is read-only. Please go to the relevant management
system if you need to edit it.',
admin: 'System Admin',
status: 'Status',
action: 'Actions',
