Revert "Add Enable Flattened custom result index checkbox (#830) (#833)" (#862)

jackiehanyang · web-flow · commit 77785e77947d · 2024-09-03T13:02:36.000-07:00
* Revert "Add Enable Flattened custom result index checkbox (#830) (#833)" This reverts commit f53450c. * update snapshot Signed-off-by: Jackie Han <jkhanjob@gmail.com> --------- Signed-off-by: Jackie Han <jkhanjob@gmail.com>
diff --git a/public/models/interfaces.ts b/public/models/interfaces.ts
@@ -194,7 +194,6 @@ export type Detector = {
   resultIndexMinAge?: number;
   resultIndexMinSize?: number;
   resultIndexTtl?: number;
-  flattenCustomResultIndex?: boolean;
   filterQuery: { [key: string]: any };
   featureAttributes: FeatureAttributes[];
   windowDelay: { period: Schedule };
diff --git a/public/pages/DefineDetector/components/CustomResultIndex/CustomResultIndex.tsx b/public/pages/DefineDetector/components/CustomResultIndex/CustomResultIndex.tsx
@@ -66,16 +66,6 @@ function CustomResultIndex(props: CustomResultIndexProps) {
     }
   },[customResultIndexConditionsEnabled])
 
-  const hintTextStyle = {
-    color: '#69707d',
-    fontSize: '12px',
-    lineHeight: '16px',
-    fontWeight: 'normal',
-    fontFamily: 'Helvetica, sans-serif',
-    textAlign: 'left',
-    width: '400px',
-};
-
   return (
     <ContentPanel
       title={
@@ -146,48 +136,25 @@ function CustomResultIndex(props: CustomResultIndexProps) {
                 </EuiCompressedFormRow>
               </EuiFlexItem>
             ) : null}
+
+            {enabled ? (
+              <EuiFlexItem>
+                <EuiCheckbox
+                  id={'resultIndexConditionCheckbox'}
+                  label="Enable custom result index lifecycle management"
+                  checked={customResultIndexConditionsEnabled}
+                  onChange={() => {
+                    setCustomResultIndexConditionsEnabled(!customResultIndexConditionsEnabled);
+                  }}
+                />
+              </EuiFlexItem>
+            ) : null}
           </EuiFlexGroup>
         )}
       </Field>
 
-      <EuiFlexGroup direction="column">
-        <EuiFlexItem>
-          { enabled ? (
-            <Field
-              name="flattenCustomResultIndex">
-            {({ field, form }: FieldProps) => (
-              <EuiFlexGroup>
-                <EuiFlexItem>
-                  <EuiCompressedCheckbox
-                    id={'flattenCustomResultIndex'}
-                    label="Enable flattened custom result index"
-                    checked={field.value ? field.value : get(props.formikProps, 'values.flattenCustomResultIndex')}
-                    {...field}
-                  />
-                  <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>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            )}
-          </Field>) : null}
-        </EuiFlexItem>
-        <EuiFlexItem>
-          {enabled ? (
-            <EuiFlexItem>
-              <EuiCompressedCheckbox
-                id={'resultIndexConditionCheckbox'}
-                label="Enable custom result index lifecycle management"
-                checked={customResultIndexConditionsEnabled}
-                onChange={() => {
-                  setCustomResultIndexConditionsEnabled(!customResultIndexConditionsEnabled);
-                }}
-              />
-            </EuiFlexItem>
-          ) : null}
-        </EuiFlexItem>
-      </EuiFlexGroup>
-
-      { (enabled && customResultIndexConditionsEnabled) ? (<Field
-        name="resultIndexMinAge"
+      { (enabled && customResultIndexConditionsEnabled) ? (<Field 
+        name="resultIndexMinAge" 
         validate={(enabled && customResultIndexConditionsEnabled) ? validateEmptyOrPositiveInteger : null}
         >
         {({ field, form }: FieldProps) => (
diff --git a/public/pages/DefineDetector/containers/DefineDetector.tsx b/public/pages/DefineDetector/containers/DefineDetector.tsx
@@ -229,7 +229,6 @@ export const DefineDetector = (props: DefineDetectorProps) => {
       formikProps.setFieldTouched('resultIndexMinAge');
       formikProps.setFieldTouched('resultIndexMinSize');
       formikProps.setFieldTouched('resultIndexTtl');
-      formikProps.setFieldTouched('flattenCustomResultIndex');
       formikProps.validateForm().then((errors) => {
         if (isEmpty(errors)) {
           if (props.isEdit) {
diff --git a/public/pages/DefineDetector/containers/__tests__/__snapshots__/DefineDetector.test.tsx.snap b/public/pages/DefineDetector/containers/__tests__/__snapshots__/DefineDetector.test.tsx.snap
@@ -974,16 +974,6 @@ exports[`<DefineDetector /> Full creating detector definition renders the compon
               </div>
             </div>
           </div>
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
-          >
-            <div
-              class="euiFlexItem"
-            />
-            <div
-              class="euiFlexItem"
-            />
-          </div>
         </div>
       </div>
     </div>
@@ -1963,16 +1953,6 @@ exports[`<DefineDetector /> empty creating detector definition renders the compo
               </div>
             </div>
           </div>
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
-          >
-            <div
-              class="euiFlexItem"
-            />
-            <div
-              class="euiFlexItem"
-            />
-          </div>
         </div>
       </div>
     </div>
@@ -2985,16 +2965,6 @@ exports[`<DefineDetector /> empty editing detector definition renders the compon
               </div>
             </div>
           </div>
-          <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
-          >
-            <div
-              class="euiFlexItem"
-            />
-            <div
-              class="euiFlexItem"
-            />
-          </div>
         </div>
       </div>
     </div>
diff --git a/public/pages/DefineDetector/models/interfaces.ts b/public/pages/DefineDetector/models/interfaces.ts
@@ -25,5 +25,4 @@ export interface DetectorDefinitionFormikValues {
   resultIndexMinAge?: number | string;
   resultIndexMinSize?: number | string;
   resultIndexTtl?:number | string;
-  flattenCustomResultIndex?: boolean;
 }
diff --git a/public/pages/DefineDetector/utils/__tests__/helpers.test.tsx b/public/pages/DefineDetector/utils/__tests__/helpers.test.tsx
@@ -44,7 +44,6 @@ describe('detectorDefinitionToFormik', () => {
       resultIndexMinAge: randomDetector.resultIndexMinAge,
       resultIndexMinSize: randomDetector.resultIndexMinSize,
       resultIndexTtl: randomDetector.resultIndexTtl,
-      flattenCustomResultIndex: randomDetector.flattenCustomResultIndex,
     });
   });
   test('should return if detector does not have metadata', () => {
@@ -65,7 +64,6 @@ describe('detectorDefinitionToFormik', () => {
       resultIndexMinAge: randomDetector.resultIndexMinAge,
       resultIndexMinSize: randomDetector.resultIndexMinSize,
       resultIndexTtl: randomDetector.resultIndexTtl,
-      flattenCustomResultIndex: randomDetector.flattenCustomResultIndex,
     });
   });
   test("upgrade old detector's filters to include filter type", () => {
diff --git a/public/pages/DefineDetector/utils/constants.tsx b/public/pages/DefineDetector/utils/constants.tsx
@@ -46,6 +46,5 @@ export const INITIAL_DETECTOR_DEFINITION_VALUES: DetectorDefinitionFormikValues
     resultIndex: undefined,
     resultIndexMinAge: 7,
     resultIndexMinSize: 51200,
-    resultIndexTtl: 60,
-    flattenCustomResultIndex: false,
+    resultIndexTtl: 60
   };
diff --git a/public/pages/DefineDetector/utils/helpers.ts b/public/pages/DefineDetector/utils/helpers.ts
@@ -48,7 +48,6 @@ export function detectorDefinitionToFormik(
     resultIndexMinAge: get(ad, 'resultIndexMinAge', undefined),
     resultIndexMinSize:get(ad, 'resultIndexMinSize', undefined),
     resultIndexTtl: get(ad, 'resultIndexTtl', undefined),
-    flattenCustomResultIndex: get(ad, 'flattenCustomResultIndex', false),
   };
 }
 
@@ -126,7 +125,6 @@ export function formikToDetectorDefinition(
     resultIndexMinAge: values.resultIndexMinAge,
     resultIndexMinSize: values.resultIndexMinSize,
     resultIndexTtl: values.resultIndexTtl,
-    flattenCustomResultIndex: values.flattenCustomResultIndex,
   } as Detector;
 
   return detectorBody;
diff --git a/public/pages/DetectorConfig/containers/__tests__/__snapshots__/DetectorConfig.test.tsx.snap b/public/pages/DetectorConfig/containers/__tests__/__snapshots__/DetectorConfig.test.tsx.snap
@@ -432,40 +432,6 @@ exports[`<DetectorConfig /> spec renders rules 1`] = `
                 </div>
               </div>
             </div>
-            <div
-              class="euiFlexItem"
-            >
-              <div
-                class="euiFormRow euiFormRow--compressed"
-                id="random_html_id-row"
-                style="width: 250px;"
-              >
-                <div
-                  class="euiFormRow__labelWrapper"
-                >
-                  <label
-                    class="euiFormLabel euiFormRow__label"
-                    for="random_html_id"
-                  >
-                    Flatten custom result index
-                  </label>
-                </div>
-                <div
-                  class="euiFormRow__fieldWrapper"
-                >
-                  <div
-                    class="euiText euiText--medium"
-                    id="random_html_id"
-                  >
-                    <p
-                      class="enabled"
-                    >
-                      -
-                    </p>
-                  </div>
-                </div>
-              </div>
-            </div>
             <div
               class="euiFlexItem"
             >
@@ -1890,40 +1856,6 @@ exports[`<DetectorConfig /> spec renders the component 1`] = `
                 </div>
               </div>
             </div>
-            <div
-              class="euiFlexItem"
-            >
-              <div
-                class="euiFormRow euiFormRow--compressed"
-                id="random_html_id-row"
-                style="width: 250px;"
-              >
-                <div
-                  class="euiFormRow__labelWrapper"
-                >
-                  <label
-                    class="euiFormLabel euiFormRow__label"
-                    for="random_html_id"
-                  >
-                    Flatten custom result index
-                  </label>
-                </div>
-                <div
-                  class="euiFormRow__fieldWrapper"
-                >
-                  <div
-                    class="euiText euiText--medium"
-                    id="random_html_id"
-                  >
-                    <p
-                      class="enabled"
-                    >
-                      Yes
-                    </p>
-                  </div>
-                </div>
-              </div>
-            </div>
             <div
               class="euiFlexItem"
             >
@@ -3321,40 +3253,6 @@ exports[`<DetectorConfig /> spec renders the component with 2 custom and 1 simpl
                 </div>
               </div>
             </div>
-            <div
-              class="euiFlexItem"
-            >
-              <div
-                class="euiFormRow euiFormRow--compressed"
-                id="random_html_id-row"
-                style="width: 250px;"
-              >
-                <div
-                  class="euiFormRow__labelWrapper"
-                >
-                  <label
-                    class="euiFormLabel euiFormRow__label"
-                    for="random_html_id"
-                  >
-                    Flatten custom result index
-                  </label>
-                </div>
-                <div
-                  class="euiFormRow__fieldWrapper"
-                >
-                  <div
-                    class="euiText euiText--medium"
-                    id="random_html_id"
-                  >
-                    <p
-                      class="enabled"
-                    >
-                      Yes
-                    </p>
-                  </div>
-                </div>
-              </div>
-            </div>
             <div
               class="euiFlexItem"
             >
diff --git a/public/pages/ReviewAndCreate/components/DetectorDefinitionFields/DetectorDefinitionFields.tsx b/public/pages/ReviewAndCreate/components/DetectorDefinitionFields/DetectorDefinitionFields.tsx
@@ -137,8 +137,7 @@ export const DetectorDefinitionFields = (
   const minSize = (minSizeValue === undefined) ? '-' : minSizeValue + " MB";
   const ttlValue = get(props, 'detector.resultIndexTtl', undefined);
   const ttl = (ttlValue === undefined) ? '-' : ttlValue + " Days";
-  const flattenCustomResultIndex = get(props, 'detector.flattenCustomResultIndex', undefined);
-  const flatten = (flattenCustomResultIndex === undefined) ? '-' : flattenCustomResultIndex ? 'Yes' : 'No';
+
 
   return (
     <ContentPanel
@@ -226,12 +225,6 @@ export const DetectorDefinitionFields = (
             description={get(props, 'detector.resultIndex', '-')}
           />
         </EuiFlexItem>
-        <EuiFlexItem>
-          <ConfigCell
-            title="Flatten custom result index"
-            description={flatten}
-          />
-        </EuiFlexItem>
         <EuiFlexItem>
           <ConfigCell
             title="Custom result index min age"
diff --git a/public/pages/ReviewAndCreate/components/__tests__/DetectorDefinitionFields.test.tsx b/public/pages/ReviewAndCreate/components/__tests__/DetectorDefinitionFields.test.tsx
@@ -58,7 +58,6 @@ const testDetector = {
   resultIndexMinAge: 7,
   resultIndexMinSize: 51200,
   resultIndexTtl: 60,
-  flattenCustomResultIndex: true,
 } as Detector;
 
 describe('<AdditionalSettings /> spec', () => {
@@ -86,7 +85,6 @@ describe('<AdditionalSettings /> spec', () => {
     getByText('test-timefield');
     getByText('1 Minutes');
     getByText('opensearch-ad-plugin-result-test');
-    getByText('Yes')
     getByText('7 Days');
     getByText('51200 MB');
     getByText('60 Days');
diff --git a/public/pages/ReviewAndCreate/components/__tests__/__snapshots__/DetectorDefinitionFields.test.tsx.snap b/public/pages/ReviewAndCreate/components/__tests__/__snapshots__/DetectorDefinitionFields.test.tsx.snap
diff --git a/public/pages/ReviewAndCreate/containers/__tests__/__snapshots__/ReviewAndCreate.test.tsx.snap b/public/pages/ReviewAndCreate/containers/__tests__/__snapshots__/ReviewAndCreate.test.tsx.snap
diff --git a/public/pages/ReviewAndCreate/utils/helpers.ts b/public/pages/ReviewAndCreate/utils/helpers.ts
diff --git a/public/redux/reducers/__tests__/utils.ts b/public/redux/reducers/__tests__/utils.ts

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,4 @@ export interface DetectorDefinitionFormikValues {`
`25`	`25`	`resultIndexMinAge?: number \| string;`
`26`	`26`	`resultIndexMinSize?: number \| string;`
`27`	`27`	`resultIndexTtl?:number \| string;`
`28`		`- flattenCustomResultIndex?: boolean;`
`29`	`28`	`}`