Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed Search UI access for Editor role #103951

Closed
wants to merge 1 commit into from
Closed

Removed Search UI access for Editor role #103951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...ns/enterprise_search/public/applications/app_search/components/engine/engine_nav.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,10 @@ describe('useEngineNav', () => {
});

it('returns a Search UI nav item', () => {
setMockValues({ ...values, myRole: { canManageEngineSearchUi: true } });
setMockValues({
...values,
myRole: { canManageEngineSearchUi: true, canViewAccountCredentials: true },
});
expect(useEngineNav()).toEqual([
...BASE_NAV,
{
Expand Down
7 changes: 6 additions & 1 deletion ...plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const useEngineNav = () => {
const isEngineRoute = !!useRouteMatch(ENGINE_PATH);
const {
myRole: {
canViewAccountCredentials,
canViewEngineAnalytics,
canViewEngineDocuments,
canViewEngineSchema,
Expand Down Expand Up @@ -275,7 +276,11 @@ export const useEngineNav = () => {
});
}

if (canManageEngineSearchUi) {
/* TODO: In 8.0, this should change to just canManageEngineSearchUi and access to Search UI should be removed from
the Editor role. As of 7.14, we are hiding this page from Editors this way to stay backward compatible with ent-search,
where Editors should still have access. Editors technically have access to this page but do not have access to
credentials, which are required for the page to work. */
if (canManageEngineSearchUi && canViewAccountCredentials) {
navItems.push({
id: 'searchUI',
name: SEARCH_UI_TITLE,
Expand Down
5 changes: 4 additions & 1 deletion ...enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,10 @@ describe('EngineRouter', () => {
});

it('renders a search ui view', () => {
setMockValues({ ...values, myRole: { canManageEngineSearchUi: true } });
setMockValues({
...values,
myRole: { canManageEngineSearchUi: true, canViewAccountCredentials: true },
});
const wrapper = shallow(<EngineRouter />);

expect(wrapper.find(SearchUI)).toHaveLength(1);
Expand Down
7 changes: 6 additions & 1 deletion ...gins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ import { EngineLogic, getEngineBreadcrumbs } from './';
export const EngineRouter: React.FC = () => {
const {
myRole: {
canViewAccountCredentials,
canViewEngineAnalytics,
canViewEngineDocuments,
canViewEngineSchema,
Expand Down Expand Up @@ -150,7 +151,11 @@ export const EngineRouter: React.FC = () => {
<ResultSettings />
</Route>
)}
{canManageEngineSearchUi && (
{/* TODO: In 8.0, this should change to just canManageEngineSearchUi and access to Search UI should be removed from
the Editor role. As of 7.14, we are hiding this page from Editors this way to stay backward compatible with ent-search,
where Editors should still have access. Editors technically have access to this page but do not have access to
credentials, which are required for the page to work. */}
{canManageEngineSearchUi && canViewAccountCredentials && (
<Route path={ENGINE_SEARCH_UI_PATH}>
<SearchUI />
</Route>
Expand Down