Correlation rules field matching and time window support (#804)

* added ux for group by field and time window Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * improved validation Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * check for null values Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * addressed PR comments Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> --------- Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
opensearch-project · Nov 30, 2023 · 51d73c8 · 51d73c8
1 parent 4479c68
commit 51d73c8
Show file tree

Hide file tree

Showing 6 changed files with 429 additions and 166 deletions.
diff --git a/public/components/ContentPanel/ContentPanel.tsx b/public/components/ContentPanel/ContentPanel.tsx
@@ -38,7 +38,7 @@ const renderSubTitleText = (subTitleText: string | JSX.Element): JSX.Element | n
   return subTitleText;
 };
 
-const ContentPanel: React.SFC<ContentPanelProps> = ({
+const ContentPanel = ({
   title = '',
   titleSize = 'm',
   subTitleText = '',
@@ -48,7 +48,7 @@ const ContentPanel: React.SFC<ContentPanelProps> = ({
   children,
   hideHeaderBorder = false,
   className = '',
-}) => (
+}: ContentPanelProps): JSX.Element => (
   <EuiPanel
     style={{ paddingLeft: '0px', paddingRight: '0px', ...panelStyles }}
     className={className}

diff --git a/public/components/FormFieldHeader/FormFieldHeader.tsx b/public/components/FormFieldHeader/FormFieldHeader.tsx
@@ -14,13 +14,13 @@ export interface FormFieldHeaderProps {
   toolTipText?: string;
 }
 
-export const FormFieldHeader: React.FC<FormFieldHeaderProps> = ({
+export const FormFieldHeader = ({
   headerTitle = '',
   optionalField = false,
   toolTipIconType = 'questionInCircle',
   toolTipPosition = 'top',
   toolTipText = '',
-}) => {
+}: FormFieldHeaderProps): JSX.Element => {
   return (
     <EuiText size={'s'}>
       <strong>{headerTitle}</strong>

diff --git a/public/pages/Correlations/containers/CorrelationRuleFormModel.ts b/public/pages/Correlations/containers/CorrelationRuleFormModel.ts
@@ -7,6 +7,7 @@ import { CorrelationRuleModel } from '../../../../types';
 
 export const correlationRuleStateDefaultValue: CorrelationRuleModel = {
   name: '',
+  time_window: 60000,
   queries: [
     {
       logType: '',
@@ -18,6 +19,7 @@ export const correlationRuleStateDefaultValue: CorrelationRuleModel = {
         },
       ],
       index: '',
+      field: '',
     },
     {
       logType: '',
@@ -29,6 +31,7 @@ export const correlationRuleStateDefaultValue: CorrelationRuleModel = {
         },
       ],
       index: '',
+      field: '',
     },
   ],
 };