From 267f0a7bbd386a008297c0037285db3d112bfc31 Mon Sep 17 00:00:00 2001 From: nixocio Date: Wed, 7 Jul 2021 10:15:28 -0400 Subject: [PATCH] Update RBAC sidebar Update RBAC sidebar. Do the following: * Expose read-only applications to normal users in the UI * Expose read-only credential types to normal users in the UI closes:https://github.com/ansible/awx/issues/10432 closes:https://github.com/ansible/awx/issues/10433 --- awx/ui_next/src/routeConfig.jsx | 2 -- awx/ui_next/src/routeConfig.test.jsx | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/awx/ui_next/src/routeConfig.jsx b/awx/ui_next/src/routeConfig.jsx index 5d29072fcd..9366370d4d 100644 --- a/awx/ui_next/src/routeConfig.jsx +++ b/awx/ui_next/src/routeConfig.jsx @@ -171,9 +171,7 @@ function getRouteConfig(userProfile = {}) { return routeConfig; deleteRouteGroup('settings'); deleteRoute('management_jobs'); - deleteRoute('credential_types'); if (userProfile?.isOrgAdmin) return routeConfig; - deleteRoute('applications'); deleteRoute('instance_groups'); if (!userProfile?.isNotificationAdmin) deleteRoute('notification_templates'); diff --git a/awx/ui_next/src/routeConfig.test.jsx b/awx/ui_next/src/routeConfig.test.jsx index b4382bbcd0..ebdf6d8653 100644 --- a/awx/ui_next/src/routeConfig.test.jsx +++ b/awx/ui_next/src/routeConfig.test.jsx @@ -90,6 +90,7 @@ describe('getRouteConfig', () => { '/organizations', '/users', '/teams', + '/credential_types', '/notification_templates', '/instance_groups', '/applications', @@ -117,7 +118,9 @@ describe('getRouteConfig', () => { '/organizations', '/users', '/teams', + '/credential_types', '/notification_templates', + '/applications', '/execution_environments', ]); }); @@ -139,6 +142,8 @@ describe('getRouteConfig', () => { '/organizations', '/users', '/teams', + '/credential_types', + '/applications', '/execution_environments', ]); }); @@ -160,6 +165,8 @@ describe('getRouteConfig', () => { '/organizations', '/users', '/teams', + '/credential_types', + '/applications', '/execution_environments', ]); }); @@ -185,7 +192,9 @@ describe('getRouteConfig', () => { '/organizations', '/users', '/teams', + '/credential_types', '/notification_templates', + '/applications', '/execution_environments', ]); }); @@ -211,6 +220,7 @@ describe('getRouteConfig', () => { '/organizations', '/users', '/teams', + '/credential_types', '/notification_templates', '/instance_groups', '/applications', @@ -239,6 +249,7 @@ describe('getRouteConfig', () => { '/organizations', '/users', '/teams', + '/credential_types', '/notification_templates', '/instance_groups', '/applications',