diff --git a/src/pages/user-center/containers/Credentials/actions/Create.jsx b/src/pages/user-center/containers/Credentials/actions/Create.jsx index 2ee63745..7460528e 100644 --- a/src/pages/user-center/containers/Credentials/actions/Create.jsx +++ b/src/pages/user-center/containers/Credentials/actions/Create.jsx @@ -19,7 +19,6 @@ import moment from 'moment'; import globalRootStore from 'stores/root'; import { toJS } from 'mobx'; import FileSaver from 'file-saver'; -import rolePermission from 'resources/keystone/role'; export class Create extends ModalAction { static id = 'create-application_credentials'; @@ -38,10 +37,6 @@ export class Create extends ModalAction { return t('Create Application Credentials'); } - get rolePermissions() { - return rolePermission; - } - onSubmit = (values) => { if (values.expires_at) { values.expires_at = values.expires_at.clone().endOf('day'); @@ -73,7 +68,7 @@ export class Create extends ModalAction { const roles = toJS(globalRootStore.roles); return roles.map((i) => ({ - label: this.rolePermissions[i.name] || i.name, + label: i.name, value: i.id, })); } diff --git a/src/pages/user-center/containers/Credentials/index.jsx b/src/pages/user-center/containers/Credentials/index.jsx index 9f41abd6..2e52e2ad 100644 --- a/src/pages/user-center/containers/Credentials/index.jsx +++ b/src/pages/user-center/containers/Credentials/index.jsx @@ -14,11 +14,9 @@ import React from 'react'; import { observer, inject } from 'mobx-react'; -import { Row, Col } from 'antd'; import Base from 'containers/List'; import { CredentialStore } from 'stores/keystone/credential'; import globalRootStore from 'stores/root'; -import rolePermission from 'resources/keystone/role'; import { actionConfigs, detailConfigs } from './actions'; export class Credentials extends Base { @@ -31,25 +29,6 @@ export class Credentials extends Base { return this.inDetailPage && this.path.includes('user-admin/detail'); } - updateFetchParamsByPage = (params) => { - if (!this.isUserDetail) { - params.id = globalRootStore.user.user.id; - } - return params; - }; - - get rolePermissions() { - return rolePermission; - } - - get isFilterByBackend() { - return true; - } - - get isSortByBackend() { - return true; - } - get policy() { return 'identity:get_application_credential'; } @@ -90,17 +69,9 @@ export class Credentials extends Base { { title: t('Roles'), dataIndex: 'roles', - render: (roles) => ( - - {roles.map((i) => ( - - {this.rolePermissions[i.name] || i.name} - - ))} - - ), - stringify: (values) => - values.map((i) => this.rolePermissions[i.name] || i.name).join('\n'), + render: (roles) => + (roles || []).map((role) =>
{role.name}
), + stringify: (values) => values.map((i) => i.name).join('\n'), }, ]; return ret; @@ -115,6 +86,16 @@ export class Credentials extends Base { ]; return filters; } + + updateFetchParams = (params) => { + if (!this.isUserDetail) { + return { + ...params, + id: globalRootStore.user.user.id, + }; + } + return params; + }; } export default inject('rootStore')(observer(Credentials)); diff --git a/src/stores/keystone/credential.js b/src/stores/keystone/credential.js index 8b488a21..f41f155c 100644 --- a/src/stores/keystone/credential.js +++ b/src/stores/keystone/credential.js @@ -27,9 +27,9 @@ export class CredentialStore extends Base { return client.keystone.users.applicationCredentials; } - get paramsFuncPage() { + get paramsFunc() { return (params) => { - const { current, id, ...rest } = params; + const { current, id, all_projects, ...rest } = params; return rest; }; }