Skip to content

Remove License Requirement for Enterprise Search App Search Meta Engines #127046

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

Merged
markjhoy merged 2 commits into from
Mar 7, 2022
Merged

Remove License Requirement for Enterprise Search App Search Meta Engines #127046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9ebb4e
Remove license for enterprise search meta engines
markjhoy Mar 7, 2022
1487ad8
missed a flag for the unit test
markjhoy Mar 7, 2022
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
6 changes: 3 additions & 3 deletions ...ns/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe('getRoleAbilities', () => {
// Has access
canViewAccountCredentials: true,
canManageEngines: true,
canManageMetaEngines: true,
// Does not have access
canViewMetaEngines: false,
canViewEngineAnalytics: false,
Expand All @@ -35,7 +36,6 @@ describe('getRoleAbilities', () => {
canViewMetaEngineSourceEngines: false,
canViewSettings: false,
canViewRoleMappings: false,
canManageMetaEngines: false,
canManageLogSettings: false,
canManageSettings: false,
canManageEngineCrawler: false,
Expand Down Expand Up @@ -81,10 +81,10 @@ describe('getRoleAbilities', () => {
expect(myRole.canManageMetaEngines).toEqual(true);
});

it('returns false when the user can manage any engines but the account does not have a platinum license', () => {
it('returns true when the user can manage any engines but the account does not have a platinum license', () => {
const myRole = getRoleAbilities({ ...mockRole, ...canManageEngines }, false);

expect(myRole.canManageMetaEngines).toEqual(false);
expect(myRole.canManageMetaEngines).toEqual(true);
});

it('returns false when has a platinum license but the user cannot manage any engines', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...plugins/enterprise_search/public/applications/app_search/utils/role/get_role_abilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const getRoleAbilities = (role: Account['role'], hasPlatinumLicense = fal
canViewSettings: myRole.can('view', 'account_settings'),
canViewRoleMappings: myRole.can('view', 'role_mappings'),
canManageEngines: myRole.can('manage', 'account_engines'),
canManageMetaEngines: hasPlatinumLicense && myRole.can('manage', 'account_engines'),
canManageMetaEngines: myRole.can('manage', 'account_engines'),
canManageLogSettings: myRole.can('manage', 'account_log_settings'),
canManageSettings: myRole.can('manage', 'account_settings'),
canManageEngineCrawler: myRole.can('manage', 'engine_crawler'),
Expand Down