Skip to content

Commit 1c1647a

Browse files
jackiehanyangjackiehanyang
committed
Revert "Add Enable Flattened custom result index checkbox (#830) (#833)"
This reverts commit f53450c.
1 parent 56b45b2 commit 1c1647a

File tree

15 files changed

+17
-306
lines changed

15 files changed

+17
-306
lines changed

‎public/models/interfaces.ts

-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ export type Detector = {
194194
resultIndexMinAge?: number;
195195
resultIndexMinSize?: number;
196196
resultIndexTtl?: number;
197-
flattenCustomResultIndex?: boolean;
198197
filterQuery: { [key: string]: any };
199198
featureAttributes: FeatureAttributes[];
200199
windowDelay: { period: Schedule };

‎public/pages/DefineDetector/components/CustomResultIndex/CustomResultIndex.tsx

+15-48
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,6 @@ function CustomResultIndex(props: CustomResultIndexProps) {
6666
}
6767
},[customResultIndexConditionsEnabled])
6868

69-
const hintTextStyle = {
70-
color: '#69707d',
71-
fontSize: '12px',
72-
lineHeight: '16px',
73-
fontWeight: 'normal',
74-
fontFamily: 'Helvetica, sans-serif',
75-
textAlign: 'left',
76-
width: '400px',
77-
};
78-
7969
return (
8070
<ContentPanel
8171
title={
@@ -146,48 +136,25 @@ function CustomResultIndex(props: CustomResultIndexProps) {
146136
</EuiCompressedFormRow>
147137
</EuiFlexItem>
148138
) : null}
139+
140+
{enabled ? (
141+
<EuiFlexItem>
142+
<EuiCheckbox
143+
id={'resultIndexConditionCheckbox'}
144+
label="Enable custom result index lifecycle management"
145+
checked={customResultIndexConditionsEnabled}
146+
onChange={() => {
147+
setCustomResultIndexConditionsEnabled(!customResultIndexConditionsEnabled);
148+
}}
149+
/>
150+
</EuiFlexItem>
151+
) : null}
149152
</EuiFlexGroup>
150153
)}
151154
</Field>
152155

153-
<EuiFlexGroup direction="column">
154-
<EuiFlexItem>
155-
{ enabled ? (
156-
<Field
157-
name="flattenCustomResultIndex">
158-
{({ field, form }: FieldProps) => (
159-
<EuiFlexGroup>
160-
<EuiFlexItem>
161-
<EuiCompressedCheckbox
162-
id={'flattenCustomResultIndex'}
163-
label="Enable flattened custom result index"
164-
checked={field.value ? field.value : get(props.formikProps, 'values.flattenCustomResultIndex')}
165-
{...field}
166-
/>
167-
<p style={hintTextStyle}>Flattening the custom result index will make it easier to query them on the dashboard. It also allows you to perform term aggregations on categorical fields.</p>
168-
</EuiFlexItem>
169-
</EuiFlexGroup>
170-
)}
171-
</Field>) : null}
172-
</EuiFlexItem>
173-
<EuiFlexItem>
174-
{enabled ? (
175-
<EuiFlexItem>
176-
<EuiCompressedCheckbox
177-
id={'resultIndexConditionCheckbox'}
178-
label="Enable custom result index lifecycle management"
179-
checked={customResultIndexConditionsEnabled}
180-
onChange={() => {
181-
setCustomResultIndexConditionsEnabled(!customResultIndexConditionsEnabled);
182-
}}
183-
/>
184-
</EuiFlexItem>
185-
) : null}
186-
</EuiFlexItem>
187-
</EuiFlexGroup>
188-
189-
{ (enabled && customResultIndexConditionsEnabled) ? (<Field
190-
name="resultIndexMinAge"
156+
{ (enabled && customResultIndexConditionsEnabled) ? (<Field
157+
name="resultIndexMinAge"
191158
validate={(enabled && customResultIndexConditionsEnabled) ? validateEmptyOrPositiveInteger : null}
192159
>
193160
{({ field, form }: FieldProps) => (

‎public/pages/DefineDetector/containers/DefineDetector.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ export const DefineDetector = (props: DefineDetectorProps) => {
229229
formikProps.setFieldTouched('resultIndexMinAge');
230230
formikProps.setFieldTouched('resultIndexMinSize');
231231
formikProps.setFieldTouched('resultIndexTtl');
232-
formikProps.setFieldTouched('flattenCustomResultIndex');
233232
formikProps.validateForm().then((errors) => {
234233
if (isEmpty(errors)) {
235234
if (props.isEdit) {

‎public/pages/DefineDetector/containers/__tests__/__snapshots__/DefineDetector.test.tsx.snap

-30
Original file line numberDiff line numberDiff line change
@@ -974,16 +974,6 @@ exports[`<DefineDetector /> Full creating detector definition renders the compon
974974
</div>
975975
</div>
976976
</div>
977-
<div
978-
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
979-
>
980-
<div
981-
class="euiFlexItem"
982-
/>
983-
<div
984-
class="euiFlexItem"
985-
/>
986-
</div>
987977
</div>
988978
</div>
989979
</div>
@@ -1963,16 +1953,6 @@ exports[`<DefineDetector /> empty creating detector definition renders the compo
19631953
</div>
19641954
</div>
19651955
</div>
1966-
<div
1967-
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
1968-
>
1969-
<div
1970-
class="euiFlexItem"
1971-
/>
1972-
<div
1973-
class="euiFlexItem"
1974-
/>
1975-
</div>
19761956
</div>
19771957
</div>
19781958
</div>
@@ -2985,16 +2965,6 @@ exports[`<DefineDetector /> empty editing detector definition renders the compon
29852965
</div>
29862966
</div>
29872967
</div>
2988-
<div
2989-
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
2990-
>
2991-
<div
2992-
class="euiFlexItem"
2993-
/>
2994-
<div
2995-
class="euiFlexItem"
2996-
/>
2997-
</div>
29982968
</div>
29992969
</div>
30002970
</div>

‎public/pages/DefineDetector/models/interfaces.ts

-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,4 @@ export interface DetectorDefinitionFormikValues {
2525
resultIndexMinAge?: number | string;
2626
resultIndexMinSize?: number | string;
2727
resultIndexTtl?:number | string;
28-
flattenCustomResultIndex?: boolean;
2928
}

‎public/pages/DefineDetector/utils/__tests__/helpers.test.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ describe('detectorDefinitionToFormik', () => {
4444
resultIndexMinAge: randomDetector.resultIndexMinAge,
4545
resultIndexMinSize: randomDetector.resultIndexMinSize,
4646
resultIndexTtl: randomDetector.resultIndexTtl,
47-
flattenCustomResultIndex: randomDetector.flattenCustomResultIndex,
4847
});
4948
});
5049
test('should return if detector does not have metadata', () => {
@@ -65,7 +64,6 @@ describe('detectorDefinitionToFormik', () => {
6564
resultIndexMinAge: randomDetector.resultIndexMinAge,
6665
resultIndexMinSize: randomDetector.resultIndexMinSize,
6766
resultIndexTtl: randomDetector.resultIndexTtl,
68-
flattenCustomResultIndex: randomDetector.flattenCustomResultIndex,
6967
});
7068
});
7169
test("upgrade old detector's filters to include filter type", () => {

‎public/pages/DefineDetector/utils/constants.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,5 @@ export const INITIAL_DETECTOR_DEFINITION_VALUES: DetectorDefinitionFormikValues
4646
resultIndex: undefined,
4747
resultIndexMinAge: 7,
4848
resultIndexMinSize: 51200,
49-
resultIndexTtl: 60,
50-
flattenCustomResultIndex: false,
49+
resultIndexTtl: 60
5150
};

‎public/pages/DefineDetector/utils/helpers.ts

-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export function detectorDefinitionToFormik(
4848
resultIndexMinAge: get(ad, 'resultIndexMinAge', undefined),
4949
resultIndexMinSize:get(ad, 'resultIndexMinSize', undefined),
5050
resultIndexTtl: get(ad, 'resultIndexTtl', undefined),
51-
flattenCustomResultIndex: get(ad, 'flattenCustomResultIndex', false),
5251
};
5352
}
5453

@@ -126,7 +125,6 @@ export function formikToDetectorDefinition(
126125
resultIndexMinAge: values.resultIndexMinAge,
127126
resultIndexMinSize: values.resultIndexMinSize,
128127
resultIndexTtl: values.resultIndexTtl,
129-
flattenCustomResultIndex: values.flattenCustomResultIndex,
130128
} as Detector;
131129

132130
return detectorBody;

‎public/pages/DetectorConfig/containers/__tests__/__snapshots__/DetectorConfig.test.tsx.snap

-68
Original file line numberDiff line numberDiff line change
@@ -1890,40 +1890,6 @@ exports[`<DetectorConfig /> spec renders the component 1`] = `
18901890
</div>
18911891
</div>
18921892
</div>
1893-
<div
1894-
class="euiFlexItem"
1895-
>
1896-
<div
1897-
class="euiFormRow euiFormRow--compressed"
1898-
id="random_html_id-row"
1899-
style="width: 250px;"
1900-
>
1901-
<div
1902-
class="euiFormRow__labelWrapper"
1903-
>
1904-
<label
1905-
class="euiFormLabel euiFormRow__label"
1906-
for="random_html_id"
1907-
>
1908-
Flatten custom result index
1909-
</label>
1910-
</div>
1911-
<div
1912-
class="euiFormRow__fieldWrapper"
1913-
>
1914-
<div
1915-
class="euiText euiText--medium"
1916-
id="random_html_id"
1917-
>
1918-
<p
1919-
class="enabled"
1920-
>
1921-
Yes
1922-
</p>
1923-
</div>
1924-
</div>
1925-
</div>
1926-
</div>
19271893
<div
19281894
class="euiFlexItem"
19291895
>
@@ -3321,40 +3287,6 @@ exports[`<DetectorConfig /> spec renders the component with 2 custom and 1 simpl
33213287
</div>
33223288
</div>
33233289
</div>
3324-
<div
3325-
class="euiFlexItem"
3326-
>
3327-
<div
3328-
class="euiFormRow euiFormRow--compressed"
3329-
id="random_html_id-row"
3330-
style="width: 250px;"
3331-
>
3332-
<div
3333-
class="euiFormRow__labelWrapper"
3334-
>
3335-
<label
3336-
class="euiFormLabel euiFormRow__label"
3337-
for="random_html_id"
3338-
>
3339-
Flatten custom result index
3340-
</label>
3341-
</div>
3342-
<div
3343-
class="euiFormRow__fieldWrapper"
3344-
>
3345-
<div
3346-
class="euiText euiText--medium"
3347-
id="random_html_id"
3348-
>
3349-
<p
3350-
class="enabled"
3351-
>
3352-
Yes
3353-
</p>
3354-
</div>
3355-
</div>
3356-
</div>
3357-
</div>
33583290
<div
33593291
class="euiFlexItem"
33603292
>

‎public/pages/ReviewAndCreate/components/DetectorDefinitionFields/DetectorDefinitionFields.tsx

+1-8
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ export const DetectorDefinitionFields = (
137137
const minSize = (minSizeValue === undefined) ? '-' : minSizeValue + " MB";
138138
const ttlValue = get(props, 'detector.resultIndexTtl', undefined);
139139
const ttl = (ttlValue === undefined) ? '-' : ttlValue + " Days";
140-
const flattenCustomResultIndex = get(props, 'detector.flattenCustomResultIndex', undefined);
141-
const flatten = (flattenCustomResultIndex === undefined) ? '-' : flattenCustomResultIndex ? 'Yes' : 'No';
140+
142141

143142
return (
144143
<ContentPanel
@@ -226,12 +225,6 @@ export const DetectorDefinitionFields = (
226225
description={get(props, 'detector.resultIndex', '-')}
227226
/>
228227
</EuiFlexItem>
229-
<EuiFlexItem>
230-
<ConfigCell
231-
title="Flatten custom result index"
232-
description={flatten}
233-
/>
234-
</EuiFlexItem>
235228
<EuiFlexItem>
236229
<ConfigCell
237230
title="Custom result index min age"

‎public/pages/ReviewAndCreate/components/__tests__/DetectorDefinitionFields.test.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ const testDetector = {
5858
resultIndexMinAge: 7,
5959
resultIndexMinSize: 51200,
6060
resultIndexTtl: 60,
61-
flattenCustomResultIndex: true,
6261
} as Detector;
6362

6463
describe('<AdditionalSettings /> spec', () => {
@@ -86,7 +85,6 @@ describe('<AdditionalSettings /> spec', () => {
8685
getByText('test-timefield');
8786
getByText('1 Minutes');
8887
getByText('opensearch-ad-plugin-result-test');
89-
getByText('Yes')
9088
getByText('7 Days');
9189
getByText('51200 MB');
9290
getByText('60 Days');

‎public/pages/ReviewAndCreate/components/__tests__/__snapshots__/DetectorDefinitionFields.test.tsx.snap

-68
Original file line numberDiff line numberDiff line change
@@ -342,40 +342,6 @@ exports[`<AdditionalSettings /> spec renders the component in create mode (no ID
342342
</div>
343343
</div>
344344
</div>
345-
<div
346-
class="euiFlexItem"
347-
>
348-
<div
349-
class="euiFormRow euiFormRow--compressed"
350-
id="random_html_id-row"
351-
style="width: 250px;"
352-
>
353-
<div
354-
class="euiFormRow__labelWrapper"
355-
>
356-
<label
357-
class="euiFormLabel euiFormRow__label"
358-
for="random_html_id"
359-
>
360-
Flatten custom result index
361-
</label>
362-
</div>
363-
<div
364-
class="euiFormRow__fieldWrapper"
365-
>
366-
<div
367-
class="euiText euiText--medium"
368-
id="random_html_id"
369-
>
370-
<p
371-
class="enabled"
372-
>
373-
Yes
374-
</p>
375-
</div>
376-
</div>
377-
</div>
378-
</div>
379345
<div
380346
class="euiFlexItem"
381347
>
@@ -896,40 +862,6 @@ exports[`<AdditionalSettings /> spec renders the component in edit mode (with ID
896862
</div>
897863
</div>
898864
</div>
899-
<div
900-
class="euiFlexItem"
901-
>
902-
<div
903-
class="euiFormRow euiFormRow--compressed"
904-
id="random_html_id-row"
905-
style="width: 250px;"
906-
>
907-
<div
908-
class="euiFormRow__labelWrapper"
909-
>
910-
<label
911-
class="euiFormLabel euiFormRow__label"
912-
for="random_html_id"
913-
>
914-
Flatten custom result index
915-
</label>
916-
</div>
917-
<div
918-
class="euiFormRow__fieldWrapper"
919-
>
920-
<div
921-
class="euiText euiText--medium"
922-
id="random_html_id"
923-
>
924-
<p
925-
class="enabled"
926-
>
927-
Yes
928-
</p>
929-
</div>
930-
</div>
931-
</div>
932-
</div>
933865
<div
934866
class="euiFlexItem"
935867
>

0 commit comments

Comments
 (0)