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.

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

[Security Solution][Detections] Related Integrations & Required Fields Feedback & Fixes #133050

Merged
merged 19 commits into from
Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
51749f0
Refactors to common component and addresses feedback from review
spong May 26, 2022
97caff0
Merge branch 'main' of github.com:elastic/kibana into related-integra…
spong May 31, 2022
be87c92
Cleaning up tests
spong May 31, 2022
0580bb1
Removes unused var
spong May 31, 2022
48a5bd6
Merge branch 'main' of github.com:elastic/kibana into related-integra…
spong Jun 2, 2022
c3b8256
Fixes missing FieldIcon and hover label issue, and hides fields from …
spong Jun 2, 2022
6416dbb
Adds Kibana Advanced Setting for displaying Related Integrations on t…
spong Jun 2, 2022
da951f0
Updates general docs with new kibana advanced setting, and adds tests…
spong Jun 3, 2022
005724e
Adds enabled badge, additional tests, and fixes version logic
spong Jun 4, 2022
f7571b3
Merge branch 'main' of github.com:elastic/kibana into related-integra…
spong Jun 4, 2022
4dd34da
Merge branch 'main' of github.com:elastic/kibana into related-integra…
spong Jun 6, 2022
551d9d2
Merge branch 'main' of github.com:elastic/kibana into related-integra…
spong Jun 6, 2022
bfccd5a
Removes kbn-field-types in favor of adding in another PR, and combine…
spong Jun 6, 2022
6737fb4
Slight copy update
spong Jun 6, 2022
6da880b
Merge branch 'main' of github.com:elastic/kibana into related-integra…
spong Jun 8, 2022
b0ba541
Fixes version mismatch bug and fixes icon styling
spong Jun 8, 2022
82f58bb
Merge branch 'main' of github.com:elastic/kibana into related-integra…
spong Jun 8, 2022
6217ca3
Adds remaining version test cases, and suppressing error toast
spong Jun 9, 2022
238949c
Skips test after suppressing error scenario
spong Jun 9, 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
1 change: 1 addition & 0 deletions packages/kbn-field-types/src/kbn_field_types_factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const createKbnFieldTypes = (): KbnFieldType[] => [
esTypes: [
ES_FIELD_TYPES.STRING,
ES_FIELD_TYPES.TEXT,
ES_FIELD_TYPES.MATCH_ONLY_TEXT,
ES_FIELD_TYPES.KEYWORD,
ES_FIELD_TYPES.VERSION,
ES_FIELD_TYPES._TYPE,
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-field-types/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export enum ES_FIELD_TYPES {

STRING = 'string',
TEXT = 'text',
MATCH_ONLY_TEXT = 'match_only_text',
KEYWORD = 'keyword',
VERSION = 'version',

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import {
} from '@elastic/eui';
import { ALERT_RISK_SCORE } from '@kbn/rule-data-utils';

import { castEsToKbnFieldTypeName } from '@kbn/field-types';

import { isEmpty } from 'lodash/fp';
import React from 'react';
import styled from 'styled-components';
Expand Down Expand Up @@ -556,7 +558,7 @@ export const buildRequiredFieldsDescription = (
label: string,
requiredFields: RequiredFieldArray
): ListItems[] => {
if (requiredFields == null) {
if (isEmpty(requiredFields)) {
return [];
}

Expand All @@ -569,7 +571,11 @@ export const buildRequiredFieldsDescription = (
<EuiFlexItem grow={false}>
<EuiFlexGroup alignItems="center" gutterSize={'xs'}>
<EuiFlexItem grow={false}>
<FieldIcon data-test-subj="field-type-icon" type={rF.type} />
<FieldIcon
data-test-subj="field-type-icon"
type={castEsToKbnFieldTypeName(rF.type)}
label={rF.type}
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<FieldTypeText grow={false} size={'s'}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import styled from 'styled-components';
import { ThreatMapping, Threats, Type } from '@kbn/securitysolution-io-ts-alerting-types';
import { DataViewBase, Filter, FilterStateStore } from '@kbn/es-query';
import { FilterManager } from '@kbn/data-plugin/public';
import { buildRelatedIntegrationsDescription } from './required_integrations_description';
import { buildRelatedIntegrationsDescription } from '../related_integrations/integrations_description';
import type {
RelatedIntegrationArray,
RequiredFieldArray,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,3 @@ export const EQL_TIMESTAMP_FIELD_LABEL = i18n.translate(
defaultMessage: 'Timestamp field',
}
);

export const RELATED_INTEGRATIONS_INSTALLED = i18n.translate(
'xpack.securitySolution.detectionEngine.ruleDescription.relatedIntegrationsInstalledDescription',
{
defaultMessage: 'Installed',
}
);

export const RELATED_INTEGRATIONS_UNINSTALLED = i18n.translate(
'xpack.securitySolution.detectionEngine.ruleDescription.relatedIntegrationsUninstalledDescription',
{
defaultMessage: 'Uninstalled',
}
);
Loading