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

Jump to bottom

[SIEM] [Detection Engine] remove all unknowns from all rules table props #62327

Merged
merged 5 commits into from
Apr 3, 2020
Merged

[SIEM] [Detection Engine] remove all unknowns from all rules table props #62327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08e77d8
remove all unknowns from all rules table props
dhurley14 Apr 2, 2020
f7e7cd0
Merge branch 'master' into fix-monitoring-types
elasticmachine Apr 2, 2020
d11eb70
update sorting property type remove optional, also remove unnecessary…
dhurley14 Apr 2, 2020
cd705ec
Merge branch 'fix-monitoring-types' of github.com:dhurley14/kibana in…
dhurley14 Apr 2, 2020
d20a621
fixes type mismatch for sorting and rulesStatuses
dhurley14 Apr 2, 2020
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
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/use_rule_status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type Func = (ruleId: string) => void;
export type ReturnRuleStatus = [boolean, RuleStatus | null, Func | null];
export interface ReturnRulesStatuses {
loading: boolean;
rulesStatuses: RuleStatusRowItemType[] | null;
rulesStatuses: RuleStatusRowItemType[];
}

/**
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ export type RuleStatusRowItemType = RuleStatus & {
name: string;
id: string;
};
type RulesColumns = EuiBasicTableColumn<Rule> | EuiTableActionsColumnType<Rule>;
type RulesStatusesColumns = EuiBasicTableColumn<RuleStatusRowItemType>;
export type RulesColumns = EuiBasicTableColumn<Rule> | EuiTableActionsColumnType<Rule>;
export type RulesStatusesColumns = EuiBasicTableColumn<RuleStatusRowItemType>;

interface GetColumns {
dispatch: React.Dispatch<Action>;
Expand Down
6 changes: 3 additions & 3 deletions x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/all/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { Loader } from '../../../../components/loader';
import { Panel } from '../../../../components/panel';
import { PrePackagedRulesPrompt } from '../components/pre_packaged_rules/load_empty_prompt';
import { GenericDownloader } from '../../../../components/generic_downloader';
import { AllRulesTables } from '../components/all_rules_tables';
import { AllRulesTables, SortingType } from '../components/all_rules_tables';
import { getPrePackagedRuleStatus } from '../helpers';
import * as i18n from '../translations';
import { EuiBasicTableOnChange } from '../types';
Expand Down Expand Up @@ -128,7 +128,7 @@ export const AllRules = React.memo<AllRulesProps>(
});

const sorting = useMemo(
() => ({ sort: { field: 'enabled', direction: filterOptions.sortOrder } }),
(): SortingType => ({ sort: { field: 'enabled', direction: filterOptions.sortOrder } }),
[filterOptions.sortOrder]
);

Expand Down Expand Up @@ -330,7 +330,7 @@ export const AllRules = React.memo<AllRulesProps>(
euiBasicTableSelectionProps={euiBasicTableSelectionProps}
hasNoPermissions={hasNoPermissions}
monitoringColumns={monitoringColumns}
paginationMemo={paginationMemo}
pagination={paginationMemo}
rules={rules}
rulesColumns={rulesColumns}
rulesStatuses={rulesStatuses}
Expand Down
57 changes: 43 additions & 14 deletions ...cy/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,59 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { EuiBasicTable, EuiTab, EuiTabs, EuiEmptyPrompt } from '@elastic/eui';
import {
EuiBasicTable,
EuiBasicTableColumn,
EuiTab,
EuiTabs,
EuiEmptyPrompt,
Direction,
EuiTableSelectionType,
} from '@elastic/eui';
import React, { useMemo, memo, useState } from 'react';
import styled from 'styled-components';

import { EuiBasicTableOnChange } from '../../types';
import * as i18n from '../../translations';
import { RuleStatusRowItemType } from '../../../../../pages/detection_engine/rules/all/columns';
import { Rules } from '../../../../../containers/detection_engine/rules';
import {
RulesColumns,
RuleStatusRowItemType,
} from '../../../../../pages/detection_engine/rules/all/columns';
import { Rule, Rules } from '../../../../../containers/detection_engine/rules';

// EuiBasicTable give me a hardtime with adding the ref attributes so I went the easy way
// after few hours of fight with typescript !!!! I lost :(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const MyEuiBasicTable = styled(EuiBasicTable as any)`` as any;

export interface SortingType {
sort: {
field: 'enabled';
direction: Direction;
};
}

interface AllRulesTablesProps {
euiBasicTableSelectionProps: unknown;
euiBasicTableSelectionProps: EuiTableSelectionType<Rule>;
hasNoPermissions: boolean;
monitoringColumns: unknown;
paginationMemo: unknown;
monitoringColumns: Array<EuiBasicTableColumn<RuleStatusRowItemType>>;
pagination: {
pageIndex: number;
pageSize: number;
totalItemCount: number;
pageSizeOptions: number[];
};
rules: Rules;
rulesColumns: unknown;
rulesStatuses: RuleStatusRowItemType[] | null;
sorting: unknown;
tableOnChangeCallback: unknown;
tableRef?: unknown;
rulesColumns: RulesColumns[];
rulesStatuses: RuleStatusRowItemType[];
sorting: {
sort: {
field: 'enabled';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw in cases they used type EuiTableSortingType but then again I know we're limiting it to only sort the enabled field. Maybe something like EuiTableSortingType<Pick<Rule, 'enabled'>> (that might be off).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since EuiTableSortingType has sorting as optional, @XavierM mentioned that it might be better to explicitly type this field out, rather than using the eui type.

direction: Direction;
};
};
tableOnChangeCallback: ({ page, sort }: EuiBasicTableOnChange) => void;
tableRef?: React.MutableRefObject<EuiBasicTable | undefined>;
}

enum AllRulesTabs {
Expand All @@ -52,7 +81,7 @@ const AllRulesTablesComponent: React.FC<AllRulesTablesProps> = ({
euiBasicTableSelectionProps,
hasNoPermissions,
monitoringColumns,
paginationMemo,
pagination,
rules,
rulesColumns,
rulesStatuses,
Expand Down Expand Up @@ -95,7 +124,7 @@ const AllRulesTablesComponent: React.FC<AllRulesTablesProps> = ({
items={rules ?? []}
noItemsMessage={emptyPrompt}
onChange={tableOnChangeCallback}
pagination={paginationMemo}
pagination={pagination}
ref={tableRef}
sorting={sorting}
selection={hasNoPermissions ? undefined : euiBasicTableSelectionProps}
Expand All @@ -110,7 +139,7 @@ const AllRulesTablesComponent: React.FC<AllRulesTablesProps> = ({
items={rulesStatuses}
noItemsMessage={emptyPrompt}
onChange={tableOnChangeCallback}
pagination={paginationMemo}
pagination={pagination}
sorting={sorting}
/>
)}
Expand Down