Commit a2544975 authored by Oleksii Savran's avatar Oleksii Savran

Merge branch '644-admin-user-cann-t-open-permission-popup-on-the-oauth-page' into 'master'

Fix: Admin user cann`t open permission popup on the "OAuth" page;

Closes #644

See merge request genesys-pgr/genesys-ui!631
parents a8178f97 08b10723
......@@ -109,23 +109,23 @@ const adminRoutes = [
},
},
{
path: '/oauth/:clientId(.+@.+)',
path: '/oauth/:clientId(.+@.+)/edit',
component: Loadable({
loader: () => import(/* webpackMode:"lazy", webpackChunkName: "user" */'user/ui/admin/OAuthDisplayPage'),
loader: () => import(/* webpackMode:"lazy", webpackChunkName: "user" */'user/ui/admin/OAuthEditPage'),
}),
exact: true,
extraProps: {
title: 'OAuth details',
title: 'Edit OAuth client',
},
},
{
path: '/oauth/:clientId(.+@.+)/edit',
path: '/oauth/:clientId(.+@.+)',
component: Loadable({
loader: () => import(/* webpackMode:"lazy", webpackChunkName: "user" */'user/ui/admin/OAuthEditPage'),
loader: () => import(/* webpackMode:"lazy", webpackChunkName: "user" */'user/ui/admin/OAuthDisplayPage'),
}),
exact: true,
extraProps: {
title: 'Edit OAuth client',
title: 'OAuth details',
},
},
{
......
......@@ -22,7 +22,6 @@ import Loading from 'ui/common/Loading';
import { PageContents } from 'ui/layout/PageLayout';
import ActionButton from 'ui/common/buttons/ActionButton';
import ButtonBar from 'ui/common/buttons/ButtonBar';
import Permissions from 'ui/common/permission/Permissions';
import { Button } from '@material-ui/core';
import OAuthClientCard from './c/OAuthClientCard';
import { ScrollToTopOnMount } from 'ui/common/page/scrollers';
......@@ -103,7 +102,6 @@ class DisplayPage extends React.Component<IDisplayPageProps, any> {
buttons={
<ButtonBar>
<Link to={ `/admin/oauth/${ oAuthClient.clientId }/edit` }><Button variant="contained">{ t('common:action.edit') }</Button></Link>
<Permissions variant="contained" clazz={ OAuthClient.clazz } id={ oAuthClient.id }/>
<ActionButton title={ t('common:action.delete') } action={ this.handleDelete }/>
<Link to="/admin/oauth"><Button variant="contained">{ t('common:action.back') }</Button></Link>
</ButtonBar>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment