Skip to content

Commit 93912e7

Browse files
committed
remove userHasNoPermissions function and remove tests, replace with just not canUserCRUD
1 parent ad80e2d commit 93912e7

File tree

6 files changed

+16
-48
lines changed

6 files changed

+16
-48
lines changed

x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/create/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { StepScheduleRule } from '../components/step_schedule_rule';
2424
import { StepRuleActions } from '../components/step_rule_actions';
2525
import { DetectionEngineHeaderPage } from '../../components/detection_engine_header_page';
2626
import * as RuleI18n from '../translations';
27-
import { redirectToDetections, getActionMessageParams, userHasNoPermissions } from '../helpers';
27+
import { redirectToDetections, getActionMessageParams } from '../helpers';
2828
import {
2929
AboutStepRule,
3030
DefineStepRule,
@@ -271,7 +271,7 @@ const CreateRulePageComponent: React.FC = () => {
271271

272272
if (redirectToDetections(isSignalIndexExists, isAuthenticated, hasEncryptionKey)) {
273273
return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}`} />;
274-
} else if (userHasNoPermissions(canUserCRUD)) {
274+
} else if (!canUserCRUD) {
275275
return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules`} />;
276276
}
277277

x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/index.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import * as detectionI18n from '../../translations';
5353
import { ReadOnlyCallOut } from '../components/read_only_callout';
5454
import { RuleSwitch } from '../components/rule_switch';
5555
import { StepPanel } from '../components/step_panel';
56-
import { getStepsData, redirectToDetections, userHasNoPermissions } from '../helpers';
56+
import { getStepsData, redirectToDetections } from '../helpers';
5757
import * as ruleI18n from '../translations';
5858
import * as i18n from './translations';
5959
import { GlobalTime } from '../../../../containers/global_time';
@@ -224,7 +224,7 @@ const RuleDetailsPageComponent: FC<PropsFromRedux> = ({
224224
return (
225225
<>
226226
{hasIndexWrite != null && !hasIndexWrite && <NoWriteSignalsCallOut />}
227-
{userHasNoPermissions(canUserCRUD) && <ReadOnlyCallOut />}
227+
{!canUserCRUD && <ReadOnlyCallOut />}
228228
<WithSource sourceId="default" indexToAdd={indexToAdd}>
229229
{({ indicesExist, indexPattern }) => {
230230
return indicesExistOrDataTemporarilyUnavailable(indicesExist) ? (
@@ -261,7 +261,7 @@ const RuleDetailsPageComponent: FC<PropsFromRedux> = ({
261261
<EuiFlexItem grow={false}>
262262
<RuleSwitch
263263
id={rule?.id ?? '-1'}
264-
isDisabled={userHasNoPermissions(canUserCRUD)}
264+
isDisabled={!canUserCRUD}
265265
enabled={rule?.enabled ?? false}
266266
optionLabel={i18n.ACTIVATE_RULE}
267267
onChange={handleOnChangeEnabledRule}
@@ -274,15 +274,15 @@ const RuleDetailsPageComponent: FC<PropsFromRedux> = ({
274274
<EuiButton
275275
href={getEditRuleUrl(ruleId ?? '')}
276276
iconType="controlsHorizontal"
277-
isDisabled={userHasNoPermissions(canUserCRUD) ?? true}
277+
isDisabled={!canUserCRUD}
278278
>
279279
{ruleI18n.EDIT_RULE_SETTINGS}
280280
</EuiButton>
281281
</EuiFlexItem>
282282
<EuiFlexItem grow={false}>
283283
<RuleActionsOverflow
284284
rule={rule}
285-
userHasNoPermissions={userHasNoPermissions(canUserCRUD)}
285+
userHasNoPermissions={!canUserCRUD}
286286
/>
287287
</EuiFlexItem>
288288
</EuiFlexGroup>

x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@ import { StepDefineRule } from '../components/step_define_rule';
3333
import { StepScheduleRule } from '../components/step_schedule_rule';
3434
import { StepRuleActions } from '../components/step_rule_actions';
3535
import { formatRule } from '../create/helpers';
36-
import {
37-
getStepsData,
38-
redirectToDetections,
39-
getActionMessageParams,
40-
userHasNoPermissions,
41-
} from '../helpers';
36+
import { getStepsData, redirectToDetections, getActionMessageParams } from '../helpers';
4237
import * as ruleI18n from '../translations';
4338
import {
4439
RuleStep,
@@ -347,7 +342,7 @@ const EditRulePageComponent: FC = () => {
347342

348343
if (redirectToDetections(isSignalIndexExists, isAuthenticated, hasEncryptionKey)) {
349344
return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}`} />;
350-
} else if (userHasNoPermissions(canUserCRUD)) {
345+
} else if (!canUserCRUD) {
351346
return <Redirect to={`/${DETECTION_ENGINE_PAGE_NAME}/rules/id/${ruleId}`} />;
352347
}
353348

x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -338,27 +338,4 @@ describe('rule helpers', () => {
338338
expect(result).toEqual(aboutRuleDetailsData);
339339
});
340340
});
341-
342-
describe('userHasNoPermissions', () => {
343-
test("returns false when user's CRUD operations are null", () => {
344-
const result: boolean = userHasNoPermissions(null);
345-
const userHasNoPermissionsExpectedResult = false;
346-
347-
expect(result).toEqual(userHasNoPermissionsExpectedResult);
348-
});
349-
350-
test('returns true when user cannot CRUD', () => {
351-
const result: boolean = userHasNoPermissions(false);
352-
const userHasNoPermissionsExpectedResult = true;
353-
354-
expect(result).toEqual(userHasNoPermissionsExpectedResult);
355-
});
356-
357-
test('returns false when user can CRUD', () => {
358-
const result: boolean = userHasNoPermissions(true);
359-
const userHasNoPermissionsExpectedResult = false;
360-
361-
expect(result).toEqual(userHasNoPermissionsExpectedResult);
362-
});
363-
});
364341
});

x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/helpers.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,3 @@ export const getActionMessageParams = memoizeOne((ruleType: RuleType | undefined
267267
...actionMessageRuleParams.map(param => `context.rule.${param}`),
268268
];
269269
});
270-
271-
// typed as null not undefined as the initial state for this value is null.
272-
export const userHasNoPermissions = (canUserCRUD: boolean | null): boolean =>
273-
canUserCRUD != null ? !canUserCRUD : false;

x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/index.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { AllRules } from './all';
2323
import { ImportDataModal } from '../../../components/import_data_modal';
2424
import { ReadOnlyCallOut } from './components/read_only_callout';
2525
import { UpdatePrePackagedRulesCallOut } from './components/pre_packaged_rules/update_callout';
26-
import { getPrePackagedRuleStatus, redirectToDetections, userHasNoPermissions } from './helpers';
26+
import { getPrePackagedRuleStatus, redirectToDetections } from './helpers';
2727
import * as i18n from './translations';
2828

2929
type Func = (refreshPrePackagedRule?: boolean) => void;
@@ -90,7 +90,7 @@ const RulesPageComponent: React.FC = () => {
9090

9191
return (
9292
<>
93-
{userHasNoPermissions(canUserCRUD) && <ReadOnlyCallOut />}
93+
{!canUserCRUD && <ReadOnlyCallOut />}
9494
<ImportDataModal
9595
checkBoxLabel={i18n.OVERWRITE_WITH_SAME_NAME}
9696
closeModal={() => setShowImportModal(false)}
@@ -120,7 +120,7 @@ const RulesPageComponent: React.FC = () => {
120120
<EuiButton
121121
iconType="indexOpen"
122122
isLoading={loadingCreatePrePackagedRules}
123-
isDisabled={userHasNoPermissions(canUserCRUD) || loading}
123+
isDisabled={!canUserCRUD || loading}
124124
onClick={handleCreatePrePackagedRules}
125125
>
126126
{i18n.LOAD_PREPACKAGED_RULES}
@@ -133,7 +133,7 @@ const RulesPageComponent: React.FC = () => {
133133
data-test-subj="reloadPrebuiltRulesBtn"
134134
iconType="plusInCircle"
135135
isLoading={loadingCreatePrePackagedRules}
136-
isDisabled={userHasNoPermissions(canUserCRUD) || loading}
136+
isDisabled={!canUserCRUD || loading}
137137
onClick={handleCreatePrePackagedRules}
138138
>
139139
{i18n.RELOAD_MISSING_PREPACKAGED_RULES(rulesNotInstalled ?? 0)}
@@ -143,7 +143,7 @@ const RulesPageComponent: React.FC = () => {
143143
<EuiFlexItem grow={false}>
144144
<EuiButton
145145
iconType="importAction"
146-
isDisabled={userHasNoPermissions(canUserCRUD) || loading}
146+
isDisabled={!canUserCRUD || loading}
147147
onClick={() => {
148148
setShowImportModal(true);
149149
}}
@@ -157,7 +157,7 @@ const RulesPageComponent: React.FC = () => {
157157
fill
158158
href={getCreateRuleUrl()}
159159
iconType="plusInCircle"
160-
isDisabled={userHasNoPermissions(canUserCRUD) || loading}
160+
isDisabled={!canUserCRUD || loading}
161161
>
162162
{i18n.ADD_NEW_RULE}
163163
</EuiButton>
@@ -175,7 +175,7 @@ const RulesPageComponent: React.FC = () => {
175175
createPrePackagedRules={createPrePackagedRules}
176176
loading={loading || prePackagedRuleLoading}
177177
loadingCreatePrePackagedRules={loadingCreatePrePackagedRules}
178-
hasNoPermissions={userHasNoPermissions(canUserCRUD)}
178+
hasNoPermissions={!canUserCRUD}
179179
refetchPrePackagedRulesStatus={handleRefetchPrePackagedRulesStatus}
180180
rulesCustomInstalled={rulesCustomInstalled}
181181
rulesInstalled={rulesInstalled}

0 commit comments

Comments
 (0)