Skip to content

Commit f64331b

Browse files
Removing all unique usages of cps picker in READ_ONLY mode
1 parent 4a7771d commit f64331b

8 files changed

Lines changed: 24 additions & 53 deletions

File tree

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_creation_ui/pages/rule_creation/index.tsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,27 @@
66
*/
77

88
import {
9+
EuiAccordion,
910
EuiButton,
1011
EuiButtonEmpty,
11-
EuiAccordion,
12+
EuiFlexGroup,
13+
EuiFlexItem,
1214
EuiHorizontalRule,
1315
EuiPanel,
14-
EuiSpacer,
15-
EuiFlexGroup,
1616
EuiResizableContainer,
17-
EuiFlexItem,
17+
EuiSpacer,
1818
} from '@elastic/eui';
19-
import React, { memo, useCallback, useRef, useState, useMemo, useEffect } from 'react';
19+
import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
2020
import styled from 'styled-components';
2121

22-
import { ProjectRoutingAccess, useRouteBasedCpsPickerAccess } from '@kbn/cps-utils';
2322
import { ruleTypeMappings } from '@kbn/securitysolution-rules';
2423
import { useGetEndpointExceptionsPerPolicyOptIn } from '../../../../management/hooks/artifacts/use_endpoint_per_policy_opt_in';
2524
import { EndpointExceptionsMovedCallout } from '../../../../exceptions/components/endpoint_exceptions_moved_callout';
2625
import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
2726
import {
27+
isEsqlRule,
2828
isMlRule,
2929
isThreatMatchRule,
30-
isEsqlRule,
3130
} from '../../../../../common/detection_engine/utils';
3231
import { useCreateRule } from '../../../rule_management/logic';
3332
import type { RuleCreateProps } from '../../../../../common/api/detection_engine/model/rule_schema';
@@ -53,9 +52,9 @@ import {
5352
} from '../../../rule_creation/components/step_rule_actions';
5453
import * as RuleI18n from '../../../common/translations';
5554
import {
56-
redirectToDetections,
5755
getActionMessageParams,
5856
MaxWidthEuiFlexItem,
57+
redirectToDetections,
5958
} from '../../../common/helpers';
6059
import type { DefineStepRule } from '../../../common/types';
6160
import { RuleStep } from '../../../common/types';
@@ -118,9 +117,8 @@ const MyEuiPanel = styled(EuiPanel)<{
118117
MyEuiPanel.displayName = 'MyEuiPanel';
119118

120119
const CreateRulePageComponent: React.FC<{}> = () => {
121-
const { application, triggersActionsUi, cps } = useKibana().services;
120+
const { application, triggersActionsUi } = useKibana().services;
122121
const { navigateToApp } = application;
123-
useRouteBasedCpsPickerAccess(ProjectRoutingAccess.READONLY, { application, cps });
124122
const [{ loading: userInfoLoading, isSignalIndexExists, isAuthenticated, hasEncryptionKey }] =
125123
useUserData();
126124
const canEditRules = useUserPrivileges().rulesPrivileges.rules.edit;

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_creation_ui/pages/rule_editing/index.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ import { FormattedMessage } from '@kbn/i18n-react';
2222
import type { FC } from 'react';
2323
import React, { memo, useCallback, useMemo, useRef, useState } from 'react';
2424
import { useParams } from 'react-router-dom';
25-
26-
import { ProjectRoutingAccess, useRouteBasedCpsPickerAccess } from '@kbn/cps-utils';
2725
import { ruleTypeMappings } from '@kbn/securitysolution-rules';
2826
import { ENDPOINT_ARTIFACT_LISTS } from '@kbn/securitysolution-list-constants';
2927
import { useGetEndpointExceptionsPerPolicyOptIn } from '../../../../management/hooks/artifacts/use_endpoint_per_policy_opt_in';
@@ -86,9 +84,8 @@ import { RuleCreationEventTypes } from '../../../../common/lib/telemetry/types';
8684

8785
const EditRulePageComponent: FC<{ rule: RuleResponse }> = ({ rule }) => {
8886
const { addSuccess } = useAppToasts();
89-
const { application, triggersActionsUi, cps, telemetry, aiRuleCreation } = useKibana().services;
87+
const { application, triggersActionsUi, telemetry, aiRuleCreation } = useKibana().services;
9088
const { navigateToApp } = application;
91-
useRouteBasedCpsPickerAccess(ProjectRoutingAccess.READONLY, { application, cps });
9289
const [{ loading: userInfoLoading, isSignalIndexExists, isAuthenticated, hasEncryptionKey }] =
9390
useUserData();
9491
const { loading: listsConfigLoading, needsConfiguration: needsListsConfiguration } =

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_details_ui/pages/rule_details/index.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import {
3939
tableDefaults,
4040
TableId,
4141
} from '@kbn/securitysolution-data-table';
42-
import { ProjectRoutingAccess, useRouteBasedCpsPickerAccess } from '@kbn/cps-utils';
4342
import { PageScope } from '../../../../data_view_manager/constants';
4443
import { RuleCustomizationsContextProvider } from '../../../rule_management/components/rule_details/rule_customizations_diff/rule_customizations_context';
4544
import { useGroupTakeActionsItems } from '../../../../detections/hooks/alerts_table/use_group_take_action_items';
@@ -236,14 +235,12 @@ export const RuleDetailsPage = connector(
236235
clearEventsLoading,
237236
clearSelected,
238237
}: DetectionEngineComponentProps) {
239-
const { application, cps, timelines: timelinesUi, spaces: spacesApi } = useKibana().services;
238+
const { application, timelines: timelinesUi, spaces: spacesApi } = useKibana().services;
240239
const {
241240
navigateToApp,
242241
capabilities: { actions },
243242
} = application;
244243

245-
useRouteBasedCpsPickerAccess(ProjectRoutingAccess.READONLY, { application, cps });
246-
247244
const dispatch = useDispatch();
248245
const containerElement = useRef<HTMLDivElement | null>(null);
249246
const getTable = useMemo(() => dataTableSelectors.getTableByIdSelector(), []);

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/index.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
import { EuiSpacer } from '@elastic/eui';
99
import React from 'react';
10-
import { ProjectRoutingAccess, useRouteBasedCpsPickerAccess } from '@kbn/cps-utils';
11-
import { useKibana } from '../../../../common/lib/kibana';
1210
import { useRouteSpy } from '../../../../common/utils/route/use_route_spy';
1311
import { useSyncRulesTableSavedState } from './rules_table/use_sync_rules_table_saved_state';
1412
import { RulesTables } from './rules_tables';
@@ -30,8 +28,6 @@ export const AllRules = React.memo(() => {
3028
useSyncRulesTableSavedState();
3129
const [{ tabName }] = useRouteSpy();
3230

33-
const { application, cps } = useKibana().services;
34-
useRouteBasedCpsPickerAccess(ProjectRoutingAccess.READONLY, { application, cps });
3531
if (tabName !== AllRulesTabs.updates) {
3632
return (
3733
<>

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/add_rules/index.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
*/
77

88
import React from 'react';
9-
10-
import { ProjectRoutingAccess, useRouteBasedCpsPickerAccess } from '@kbn/cps-utils';
119
import { redirectToDetections } from '../../../common/helpers';
1210
import { SecurityPageName } from '../../../../app/types';
1311
import { HeaderPage } from '../../../../common/components/header_page';
@@ -28,12 +26,11 @@ import { MissingDetectionsPrivilegesCallOut } from '../../../../detections/compo
2826
import { getDetectionEngineUrl } from '../../../../common/components/link_to';
2927

3028
const AddRulesPageComponent: React.FC = () => {
31-
const { application, cps } = useKibana().services;
29+
const { application } = useKibana().services;
3230
const { navigateToApp } = application;
3331

3432
const [{ isSignalIndexExists, isAuthenticated, hasEncryptionKey }] = useUserData();
3533
const { needsConfiguration: needsListsConfiguration } = useListsConfig();
36-
useRouteBasedCpsPickerAccess(ProjectRoutingAccess.READONLY, { application, cps });
3734

3835
if (
3936
redirectToDetections(

x-pack/solutions/security/plugins/security_solution/public/detection_engine/rule_management_ui/pages/coverage_overview/index.tsx

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,21 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7+
78
import React from 'react';
8-
import { useRouteBasedCpsPickerAccess, ProjectRoutingAccess } from '@kbn/cps-utils';
99
import { SecuritySolutionPageWrapper } from '../../../../common/components/page_wrapper';
1010
import { SpyRoute } from '../../../../common/utils/route/spy_routes';
1111
import { SecurityPageName } from '../../../../app/types';
1212
import { CoverageOverviewDashboardContextProvider } from './coverage_overview_dashboard_context';
1313
import { CoverageOverviewDashboard } from './coverage_overview_dashboard';
14-
import { useKibana } from '../../../../common/lib/kibana';
15-
16-
export const CoverageOverviewPage = () => {
17-
const { application, cps } = useKibana().services;
18-
useRouteBasedCpsPickerAccess(ProjectRoutingAccess.READONLY, { application, cps });
1914

20-
return (
21-
<>
22-
<CoverageOverviewDashboardContextProvider>
23-
<SecuritySolutionPageWrapper data-test-subj="coverageOverviewPage">
24-
<CoverageOverviewDashboard />
25-
</SecuritySolutionPageWrapper>
26-
</CoverageOverviewDashboardContextProvider>
27-
<SpyRoute pageName={SecurityPageName.coverageOverview} />
28-
</>
29-
);
30-
};
15+
export const CoverageOverviewPage = () => (
16+
<>
17+
<CoverageOverviewDashboardContextProvider>
18+
<SecuritySolutionPageWrapper data-test-subj="coverageOverviewPage">
19+
<CoverageOverviewDashboard />
20+
</SecuritySolutionPageWrapper>
21+
</CoverageOverviewDashboardContextProvider>
22+
<SpyRoute pageName={SecurityPageName.coverageOverview} />
23+
</>
24+
);

x-pack/solutions/security/plugins/security_solution/public/exceptions/pages/list_detail_view/index.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7+
78
import type { FC } from 'react';
89
import React, { useCallback, useMemo, useState } from 'react';
910

@@ -15,7 +16,6 @@ import {
1516
import { EuiSkeletonText } from '@elastic/eui';
1617
import { useParams } from 'react-router-dom';
1718
import { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types';
18-
import { ProjectRoutingAccess, useRouteBasedCpsPickerAccess } from '@kbn/cps-utils';
1919
import { SecurityPageName } from '../../../../common/constants';
2020
import { SpyRoute } from '../../../common/utils/route/spy_routes';
2121
import { ReferenceErrorModal } from '../../../common/components/reference_error_modal';
@@ -25,17 +25,11 @@ import { NotFoundPage } from '../../../app/404';
2525
import { AutoDownload } from '../../../common/components/auto_download/auto_download';
2626
import { LinkToRuleDetails, ListWithSearch, ManageRules } from '../../components';
2727
import { useListDetailsView } from '../../hooks';
28-
import { useKibana } from '../../../common/lib/kibana';
2928
import * as i18n from '../../translations';
3029
import type { CheckExceptionTtlActionTypes } from '../../components/expired_exceptions_list_items_modal';
3130
import { IncludeExpiredExceptionsModal } from '../../components/expired_exceptions_list_items_modal';
3231

3332
export const ListsDetailViewComponent: FC = () => {
34-
const {
35-
services: { application, cps },
36-
} = useKibana();
37-
useRouteBasedCpsPickerAccess(ProjectRoutingAccess.READONLY, { application, cps });
38-
3933
const { detailName: exceptionListId } = useParams<{
4034
detailName: string;
4135
}>();

x-pack/solutions/security/plugins/security_solution/public/exceptions/pages/shared_lists/index.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import type { ExceptionListFilter, NamespaceType } from '@kbn/securitysolution-i
2929
import { ExceptionListTypeEnum } from '@kbn/securitysolution-io-ts-list-types';
3030
import { useApi, useExceptionLists } from '@kbn/securitysolution-list-hooks';
3131
import { EmptyViewerState, ViewerStatus } from '@kbn/securitysolution-exception-list-components';
32-
import { ProjectRoutingAccess, useRouteBasedCpsPickerAccess } from '@kbn/cps-utils';
3332

3433
import { ENDPOINT_ARTIFACT_LISTS } from '@kbn/securitysolution-list-constants';
3534
import { useGetEndpointExceptionsPerPolicyOptIn } from '../../../management/hooks/artifacts/use_endpoint_per_policy_opt_in';
@@ -106,10 +105,9 @@ export const SharedLists = React.memo(() => {
106105
const canWriteEndpointExceptions = useEndpointExceptionsCapability('crudEndpointExceptions');
107106

108107
const {
109-
services: { http, application, cps, notifications, timelines },
108+
services: { http, application, notifications, timelines },
110109
} = useKibana();
111110
const { navigateToApp } = application;
112-
useRouteBasedCpsPickerAccess(ProjectRoutingAccess.READONLY, { application, cps });
113111
const { exportExceptionList, deleteExceptionList, duplicateExceptionList } = useApi(http);
114112

115113
const [showReferenceErrorModal, setShowReferenceErrorModal] = useState(false);

0 commit comments

Comments
 (0)