Skip to content

Commit

Permalink
Import bulk action types NOT via index.ts
Browse files Browse the repository at this point in the history
  • Loading branch information
banderror committed Oct 20, 2022
1 parent 25cc4f8 commit 66dc2ad
Show file tree
Hide file tree
Showing 37 changed files with 54 additions and 58 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import * as t from 'io-ts';

import { NonEmptyArray, TimeDuration, enumeration } from '@kbn/securitysolution-io-ts-types';
import { NonEmptyArray, TimeDuration } from '@kbn/securitysolution-io-ts-types';
import {
RuleActionGroup,
RuleActionId,
Expand All @@ -31,8 +31,6 @@ export enum BulkAction {
'edit' = 'edit',
}

export const bulkAction = enumeration('BulkAction', BulkAction);

export enum BulkActionEditType {
'add_tags' = 'add_tags',
'delete_tags' = 'delete_tags',
Expand Down Expand Up @@ -115,8 +113,8 @@ export const BulkActionEditPayloadRuleActions = t.type({
}),
});

export type BulkActionEditPayloadSchedule = t.TypeOf<typeof BulkActionEditPayloadSchedule>;
export const BulkActionEditPayloadSchedule = t.type({
type BulkActionEditPayloadSchedule = t.TypeOf<typeof BulkActionEditPayloadSchedule>;
const BulkActionEditPayloadSchedule = t.type({
type: t.literal(BulkActionEditType.set_schedule),
value: t.type({
interval: TimeDuration({ allowedUnits: ['s', 'm', 'h'] }),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
* 2.0.
*/

export * from './api/rules/bulk_actions/request_schema';

export * from './api/rules/bulk_crud/bulk_create_rules/request_schema';
export * from './api/rules/bulk_crud/bulk_delete_rules/request_schema';
export * from './api/rules/bulk_crud/bulk_patch_rules/request_schema';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import {
import type { RulesReferencedByExceptionListsSchema } from '../../../../common/detection_engine/rule_exceptions';
import { DETECTION_ENGINE_RULES_EXCEPTIONS_REFERENCE_URL } from '../../../../common/detection_engine/rule_exceptions';

import type { BulkActionEditPayload } from '../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../common/detection_engine/rule_management';
import type { BulkActionEditPayload } from '../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { BulkAction } from '../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';

import type {
RuleResponse,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
import type { UseMutationOptions } from '@tanstack/react-query';
import { useMutation } from '@tanstack/react-query';
import { BulkAction } from '../../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import type { BulkActionProps, BulkActionResponse } from '../api';
import { performBulkAction } from '../api';
import { useInvalidateFetchPrebuiltRulesStatusQuery } from './use_fetch_prebuilt_rules_status_query';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import type { ErrorToastOptions } from '@kbn/core-notifications-browser';
import { BulkAction } from '../../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import * as i18n from '../../../../detections/pages/detection_engine/rules/translations';
import type { BulkActionSummary } from '../../api/api';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { useCallback } from 'react';
import type { BulkActionResponse, BulkActionSummary } from '..';
import { BulkAction } from '../../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import type { HTTPError } from '../../../../../common/detection_engine/types';
import type { UseAppToasts } from '../../../../common/hooks/use_app_toasts';
import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import type { NavigateToAppOptions } from '@kbn/core/public';
import { useCallback } from 'react';
import type { BulkActionResponse, BulkActionSummary } from '..';
import { APP_UI_ID } from '../../../../../common/constants';
import type { BulkActionEditPayload } from '../../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../../common/detection_engine/rule_management';
import type { BulkActionEditPayload } from '../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { BulkAction } from '../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import type { HTTPError } from '../../../../../common/detection_engine/types';
import { SecurityPageName } from '../../../../app/types';
import { getEditRuleUrl } from '../../../../common/components/link_to/redirect_to_detection_engine';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { EuiConfirmModal } from '@elastic/eui';

import * as i18n from '../../../../../detections/pages/detection_engine/rules/translations';
import { BulkActionRuleErrorsList } from './bulk_action_rule_errors_list';
import { BulkAction } from '../../../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { assertUnreachable } from '../../../../../../common/utility_types';

import type { BulkActionForConfirmation, DryRunResult } from './types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { render, screen } from '@testing-library/react';
import { BulkActionRuleErrorsList } from './bulk_action_rule_errors_list';
import { BulkActionsDryRunErrCode } from '../../../../../../common/constants';
import type { DryRunResult } from './types';
import { BulkAction } from '../../../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';

const Wrapper: FC = ({ children }) => {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { EuiSpacer } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';

import { BulkActionsDryRunErrCode } from '../../../../../../common/constants';
import { BulkAction } from '../../../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';

import type { DryRunResult, BulkActionForConfirmation } from './types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import React from 'react';

import type { BulkActionEditPayload } from '../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management';
import type { BulkActionEditPayload } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';

import { IndexPatternsForm } from './forms/index_patterns_form';
import { TagsForm } from './forms/tags_form';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import * as i18n from '../../../../../../detections/pages/detection_engine/rules
import { DEFAULT_INDEX_KEY } from '../../../../../../../common/constants';
import { useKibana } from '../../../../../../common/lib/kibana';

import { BulkActionEditType } from '../../../../../../../common/detection_engine/rule_management';
import type { BulkActionEditPayload } from '../../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import type { BulkActionEditPayload } from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';

import type { FormSchema } from '../../../../../../shared_imports';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import {
getUseField,
Field,
} from '../../../../../../shared_imports';
import { BulkActionEditType } from '../../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import type {
BulkActionEditPayload,
ThrottleForBulkActions,
} from '../../../../../../../common/detection_engine/rule_management';
} from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { NOTIFICATION_THROTTLE_RULE } from '../../../../../../../common/constants';

import { BulkEditFormWrapper } from './bulk_edit_form_wrapper';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import { EuiCallOut } from '@elastic/eui';
import React, { useCallback } from 'react';
import type { BulkActionEditPayload } from '../../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../../common/detection_engine/rule_management';
import type { BulkActionEditPayload } from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { BulkActionEditType } from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { ScheduleItem } from '../../../../../../detections/components/rules/schedule_item_form';
import type { FormSchema } from '../../../../../../shared_imports';
import { UseField, useForm } from '../../../../../../shared_imports';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { EuiCallOut, EuiFormRow } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import React, { useMemo } from 'react';

import type { BulkActionEditPayload } from '../../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../../common/detection_engine/rule_management';
import type { BulkActionEditPayload } from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { BulkActionEditType } from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import * as i18n from '../../../../../../detections/pages/detection_engine/rules/translations';
import { caseInsensitiveSort } from '../../helpers';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { EuiCallOut } from '@elastic/eui';
import type { FormSchema } from '../../../../../../shared_imports';
import { useForm, UseField } from '../../../../../../shared_imports';
import { PickTimeline } from '../../../../../../detections/components/rules/pick_timeline';
import type { BulkActionEditPayload } from '../../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../../common/detection_engine/rule_management';
import type { BulkActionEditPayload } from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { BulkActionEditType } from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';

import { BulkEditFormWrapper } from './bulk_edit_form_wrapper';
import { bulkApplyTimelineTemplate as i18n } from '../translations';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import type { BulkActionsDryRunErrCode } from '../../../../../../common/constants';
import type { BulkAction } from '../../../../../../common/detection_engine/rule_management';
import type { BulkAction } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';

/**
* Only 2 bulk actions are supported for for confirmation dry run modal:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import type { Toast } from '@kbn/core/public';
import { toMountPoint } from '@kbn/kibana-react-plugin/public';
import { euiThemeVars } from '@kbn/ui-theme';
import React, { useCallback } from 'react';
import type { BulkActionEditPayload } from '../../../../../../common/detection_engine/rule_management';
import type { BulkActionEditPayload } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import {
BulkAction,
BulkActionEditType,
} from '../../../../../../common/detection_engine/rule_management';
} from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { isMlRule } from '../../../../../../common/machine_learning/helpers';
import { useAppToasts } from '../../../../../common/hooks/use_app_toasts';
import { BULK_RULE_ACTIONS } from '../../../../../common/lib/apm/user_actions';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useMutation } from '@tanstack/react-query';
import type {
BulkAction,
BulkActionEditType,
} from '../../../../../../common/detection_engine/rule_management';
} from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import type { BulkActionResponse } from '../../../../rule_management/logic';
import { performBulkAction } from '../../../../rule_management/logic';
import { computeDryRunPayload } from './utils/compute_dry_run_payload';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { useAsyncConfirmation } from '../rules_table/use_async_confirmation';
import type {
BulkActionEditPayload,
BulkActionEditType,
} from '../../../../../../common/detection_engine/rule_management';
} from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { useBoolState } from '../../../../../common/hooks/use_bool_state';

export const useBulkEditFormFlyout = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import {
BulkAction,
BulkActionEditType,
} from '../../../../../../../common/detection_engine/rule_management';
} from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';

import { computeDryRunPayload } from './compute_dry_run_payload';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
* 2.0.
*/

import type { BulkActionEditPayload } from '../../../../../../../common/detection_engine/rule_management';
import type { BulkActionEditPayload } from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import {
BulkAction,
BulkActionEditType,
} from '../../../../../../../common/detection_engine/rule_management';
} from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { assertUnreachable } from '../../../../../../../common/utility_types';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import type { DefaultItemAction } from '@elastic/eui';
import { EuiToolTip } from '@elastic/eui';
import React from 'react';
import { BulkAction } from '../../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
import { SINGLE_RULE_ACTIONS } from '../../../../common/lib/apm/user_actions';
import { useStartTransaction } from '../../../../common/lib/apm/use_start_transaction';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { noop } from 'lodash';
import React, { useCallback, useMemo } from 'react';
import styled from 'styled-components';
import { APP_UI_ID, SecurityPageName } from '../../../../../common/constants';
import { BulkAction } from '../../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { getRulesUrl } from '../../../../common/components/link_to/redirect_to_detection_engine';
import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
import { useBoolState } from '../../../../common/hooks/use_bool_state';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSwitch } from '@elasti
import { noop } from 'lodash';
import React, { useCallback, useMemo, useState } from 'react';
import styled from 'styled-components';
import { BulkAction } from '../../../../../common/detection_engine/rule_management';
import { BulkAction } from '../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { SINGLE_RULE_ACTIONS } from '../../../../common/lib/apm/user_actions';
import { useStartTransaction } from '../../../../common/lib/apm/use_start_transaction';
import { useExecuteBulkAction } from '../../../../detection_engine/rule_management/logic/bulk_actions/use_execute_bulk_action';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
BulkAction,
PerformBulkActionRequestBody,
PerformBulkActionRequestQuery,
} from '../../../../../../../common/detection_engine/rule_management';
} from '../../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import type { SetupPlugins } from '../../../../../../plugin';
import type { SecuritySolutionPluginRouter } from '../../../../../../types';
import { buildRouteValidation } from '../../../../../../utils/build_validation/route_validation';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { bulkEditActionToRulesClientOperation } from './action_to_rules_client_operation';

describe('bulkEditActionToRulesClientOperation', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import type { BulkEditOperation } from '@kbn/alerting-plugin/server';

import type { BulkActionEditForRuleAttributes } from '../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management';
import type { BulkActionEditForRuleAttributes } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { assertUnreachable } from '../../../../../../common/utility_types';

import { transformToAlertThrottle, transformToNotifyWhen } from '../../normalization/rule_actions';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import {
import type {
BulkActionEditPayload,
BulkActionEditPayloadRuleActions,
} from '../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management';
} from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';

import type { MlAuthz } from '../../../../machine_learning/authz';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import { addItemsToArray, deleteItemsFromArray, ruleParamsModifier } from './rule_params_modifier';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import type { RuleAlertType } from '../../../rule_schema';

describe('addItemsToArray', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import moment from 'moment';
import { parseInterval } from '@kbn/data-plugin/common/search/aggs/utils/date_interval_utils';
import type { RuleAlertType } from '../../../rule_schema';
import type { BulkActionEditForRuleParams } from '../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management';
import type { BulkActionEditForRuleParams } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { invariant } from '../../../../../../common/utils/invariant';

export const addItemsToArray = <T>(arr: T[], items: T[]): T[] =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* 2.0.
*/

import type { BulkActionEditPayload } from '../../../../../../common/detection_engine/rule_management';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management';
import type { BulkActionEditPayload } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';

import { splitBulkEditActions } from './split_bulk_edit_actions';

Expand Down
Loading

0 comments on commit 66dc2ad

Please sign in to comment.