updated log types; fixed bugs

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
opensearch-project · Oct 13, 2023 · 4983178 · 4983178
1 parent f90e49b
commit 4983178
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 32 deletions.
diff --git a/public/pages/Correlations/containers/CreateCorrelationRule.tsx b/public/pages/Correlations/containers/CreateCorrelationRule.tsx
@@ -189,6 +189,11 @@ export const CreateCorrelationRule: React.FC<CreateCorrelationRuleProps> = (
     formikErrors: FormikErrors<CorrelationRuleModel>,
     props: any
   ) => {
+    const logTypeOptions = ruleTypes.map(({ value, label }) => ({
+      value,
+      label,
+    }));
+
     return (
       <>
         {correlationQueries.map((query, queryIdx) => {
@@ -274,10 +279,7 @@ export const CreateCorrelationRule: React.FC<CreateCorrelationRuleProps> = (
                       isInvalid={isInvalidInputForQuery('logType')}
                       placeholder="Select a log type"
                       data-test-subj={'rule_type_dropdown'}
-                      options={ruleTypes.map(({ label }) => ({
-                        value: label.toLowerCase(),
-                        label,
-                      }))}
+                      options={logTypeOptions}
                       singleSelection={{ asPlainText: true }}
                       onChange={(e) => {
                         props.handleChange(`queries[${queryIdx}].logType`)(
@@ -293,7 +295,7 @@ export const CreateCorrelationRule: React.FC<CreateCorrelationRuleProps> = (
                                 label:
                                   ruleTypes.find(
                                     (logType) =>
-                                      logType.label.toLowerCase() === query.logType.toLowerCase()
+                                      logType.value.toLowerCase() === query.logType.toLowerCase()
                                   )?.label || query.logType,
                               },
                             ]

diff --git a/public/pages/Correlations/utils/constants.tsx b/public/pages/Correlations/utils/constants.tsx
@@ -8,6 +8,7 @@ import { CorrelationGraphData } from '../../../../types';
 import { ruleSeverity, ruleTypes } from '../../Rules/utils/constants';
 import { FilterItem } from '../components/FilterGroup';
 import { EuiIcon } from '@elastic/eui';
+import { getLogTypeLabel } from '../../LogTypes/utils/helpers';
 
 export const graphRenderOptions = {
   nodes: {
@@ -49,8 +50,8 @@ export const graphRenderOptions = {
 
 export const getDefaultLogTypeFilterItemOptions: () => FilterItem[] = () =>
   Object.values(ruleTypes).map((type) => ({
-    name: `${type.label}`,
-    id: type.label.toLowerCase(),
+    name: getLogTypeLabel(type.label),
+    id: type.value.toLowerCase(),
     checked: 'on',
   }));
 

diff --git a/...es/CreateDetector/components/DefineDetector/components/DetectionRules/utils/constants.tsx b/...es/CreateDetector/components/DefineDetector/components/DetectionRules/utils/constants.tsx
@@ -7,6 +7,7 @@ import { EuiBasicTableColumn, EuiLink, EuiSwitch } from '@elastic/eui';
 import { capitalizeFirstLetter } from '../../../../../../../utils/helpers';
 import React, { ReactNode } from 'react';
 import { RuleItem } from '../types/interfaces';
+import { getLogTypeLabel } from '../../../../../../LogTypes/utils/helpers';
 
 export type ActiveToggleOnChangeEvent = React.BaseSyntheticEvent<
   React.MouseEvent<HTMLButtonElement>,
@@ -51,7 +52,7 @@ export const getRulesColumns = (
       name: 'Log type',
       width: '10%',
       sortable: true,
-      render: (logType: string) => capitalizeFirstLetter(logType),
+      render: (logType: string) => getLogTypeLabel(logType),
     },
     {
       field: 'library',

diff --git a/...c/pages/CreateDetector/components/DefineDetector/components/DetectorType/DetectorType.tsx b/...c/pages/CreateDetector/components/DefineDetector/components/DetectorType/DetectorType.tsx
@@ -32,7 +32,7 @@ export default class DetectorType extends Component<DetectorTypeProps, DetectorT
   constructor(props: DetectorTypeProps) {
     super(props);
 
-    this.detectorTypeOptions = ruleTypes.map(({ label }) => ({ value: label, label }));
+    this.detectorTypeOptions = ruleTypes.map(({ value, label }) => ({ value, label }));
     const detectorTypeIds = this.detectorTypeOptions.map((option) => option.value);
     this.state = {
       fieldTouched: false,

diff --git a/public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.tsx b/public/pages/Detectors/components/DetectorBasicDetailsView/DetectorBasicDetailsView.tsx
@@ -10,6 +10,7 @@ import { createTextDetailsGroup, parseSchedule } from '../../../../utils/helpers
 import moment from 'moment';
 import { DEFAULT_EMPTY_DATA, logTypesWithDashboards } from '../../../../utils/constants';
 import { Detector } from '../../../../../types';
+import { getLogTypeLabel } from '../../../LogTypes/utils/helpers';
 
 export interface DetectorBasicDetailsViewProps {
   detector: Detector;
@@ -77,7 +78,7 @@ export const DetectorBasicDetailsView: React.FC<DetectorBasicDetailsViewProps> =
             </>
           ),
         },
-        { label: 'Log type', content: detector_type.toLowerCase() },
+        { label: 'Log type', content: getLogTypeLabel(detector_type.toLowerCase()) },
         {
           label: 'Detector dashboard',
           content: (dashboardId ? (

diff --git a/.../components/DetectorBasicDetailsView/__snapshots__/DetectorBasicDetailsView.test.tsx.snap b/.../components/DetectorBasicDetailsView/__snapshots__/DetectorBasicDetailsView.test.tsx.snap
@@ -258,7 +258,7 @@ Object {
                     data-test-subj="text-details-group-content-log-type"
                     id="some_html_id"
                   >
-                    detector_type
+                    Detector Type
                   </div>
                 </div>
               </div>
@@ -684,7 +684,7 @@ Object {
                   data-test-subj="text-details-group-content-log-type"
                   id="some_html_id"
                 >
-                  detector_type
+                  Detector Type
                 </div>
               </div>
             </div>

diff --git a/public/pages/Detectors/containers/Detector/__snapshots__/DetectorDetails.test.tsx.snap b/public/pages/Detectors/containers/Detector/__snapshots__/DetectorDetails.test.tsx.snap
@@ -1945,7 +1945,7 @@ exports[`<DetectorDetails /> spec renders the component 1`] = `
                                 onBlur={[Function]}
                                 onFocus={[Function]}
                               >
-                                detector_type
+                                Detector Type
                               </div>
                             </EuiText>
                           </div>

diff --git a/.../Detectors/containers/DetectorDetailsView/__snapshots__/DetectorDetailsView.test.tsx.snap b/.../Detectors/containers/DetectorDetailsView/__snapshots__/DetectorDetailsView.test.tsx.snap
@@ -988,7 +988,7 @@ exports[`<DetectorDetailsView /> spec renders the component 1`] = `
                               onBlur={[Function]}
                               onFocus={[Function]}
                             >
-                              detector_type
+                              Detector Type
                             </div>
                           </EuiText>
                         </div>

diff --git a/public/pages/Detectors/containers/Detectors/Detectors.tsx b/public/pages/Detectors/containers/Detectors/Detectors.tsx
@@ -297,7 +297,7 @@ export default class Detectors extends Component<DetectorsProps, DetectorsState>
         detectorHits.map((detector) => (detector._source.enabled ? 'Active' : 'Inactive'))
       ),
     ];
-    const logType = [...new Set(detectorHits.map((detector) => detector._source.detector_type))];
+    const logTypes = [...new Set(detectorHits.map((detector) => detector._source.detector_type))];
     const search = {
       box: {
         placeholder: 'Search threat detectors',
@@ -318,7 +318,7 @@ export default class Detectors extends Component<DetectorsProps, DetectorsState>
           type: 'field_value_selection',
           field: 'logType',
           name: 'Log type',
-          options: logType.map((logType) => ({
+          options: logTypes.map((logType) => ({
             value: logType,
             name: formatRuleType(logType),
           })),

diff --git a/public/pages/Detectors/containers/Detectors/__snapshots__/Detectors.test.tsx.snap b/public/pages/Detectors/containers/Detectors/__snapshots__/Detectors.test.tsx.snap
@@ -600,7 +600,7 @@ exports[`<Detectors /> spec renders the component 1`] = `
                         "name": "Log type",
                         "options": Array [
                           Object {
-                            "name": "-",
+                            "name": "Detector Type",
                             "value": "detector_type",
                           },
                         ],
@@ -671,7 +671,7 @@ exports[`<Detectors /> spec renders the component 1`] = `
                           "name": "Log type",
                           "options": Array [
                             Object {
-                              "name": "-",
+                              "name": "Detector Type",
                               "value": "detector_type",
                             },
                           ],
@@ -802,7 +802,7 @@ exports[`<Detectors /> spec renders the component 1`] = `
                                     "name": "Log type",
                                     "options": Array [
                                       Object {
-                                        "name": "-",
+                                        "name": "Detector Type",
                                         "value": "detector_type",
                                       },
                                     ],
@@ -977,7 +977,7 @@ exports[`<Detectors /> spec renders the component 1`] = `
                                         "name": "Log type",
                                         "options": Array [
                                           Object {
-                                            "name": "-",
+                                            "name": "Detector Type",
                                             "value": "detector_type",
                                           },
                                         ],
@@ -2136,7 +2136,7 @@ exports[`<Detectors /> spec renders the component 1`] = `
                                         <div
                                           className="euiTableCellContent euiTableCellContent--overflowingContent"
                                         >
-                                          -
+                                          Detector Type
                                         </div>
                                       </td>
                                     </EuiTableRowCell>

diff --git a/public/pages/LogTypes/utils/constants.ts b/public/pages/LogTypes/utils/constants.ts
@@ -23,7 +23,7 @@ export const defaultLogType: LogTypeBase = {
   tags: null,
 };
 
-export const logTypeLabels = {
+export const logTypeLabels: { [value: string]: string } = {
   cloudtrail: 'AWS Cloudtrail',
   dns: 'DNS',
   vpcflow: 'VPC Flow',

diff --git a/public/pages/LogTypes/utils/helpers.tsx b/public/pages/LogTypes/utils/helpers.tsx
@@ -8,6 +8,7 @@ import { EuiButtonIcon, EuiLink, EuiToolTip } from '@elastic/eui';
 import { LogType } from '../../../../types';
 import { capitalize, startCase } from 'lodash';
 import { logTypeLabels } from './constants';
+import { DEFAULT_EMPTY_DATA } from '../../../utils/constants';
 
 export const getLogTypesTableColumns = (
   showDetails: (id: string) => void,
@@ -52,6 +53,6 @@ export const getLogTypesTableColumns = (
   },
 ];
 
-export const getLogTypeLabel = (name: String) => {
-  return logTypeLabels[name] || startCase(name);
+export const getLogTypeLabel = (name: string) => {
+  return !name ? DEFAULT_EMPTY_DATA : logTypeLabels[name.toLowerCase()] || startCase(name);
 };
diff --git a/public/pages/Overview/components/Widgets/Summary.tsx b/public/pages/Overview/components/Widgets/Summary.tsx
@@ -25,6 +25,7 @@ import { AlertItem, FindingItem } from '../../models/interfaces';
 import { createSelectComponent, renderVisualization } from '../../../../utils/helpers';
 import { ROUTES } from '../../../../utils/constants';
 import { ChartContainer } from '../../../../components/Charts/ChartContainer';
+import { getLogTypeLabel } from '../../../LogTypes/utils/helpers';
 
 export interface SummaryProps {
   findings: FindingItem[];
@@ -96,7 +97,7 @@ export const Summary: React.FC<SummaryProps> = ({
         time: getTimeWithMinPrecision(alert.time),
         alert: 1,
         finding: 0,
-        logType: alert.logType,
+        logType: getLogTypeLabel(alert.logType),
       });
     });
 
@@ -105,7 +106,7 @@ export const Summary: React.FC<SummaryProps> = ({
         time: getTimeWithMinPrecision(finding.time),
         alert: 0,
         finding: 1,
-        logType: finding.logType,
+        logType: getLogTypeLabel(finding.logType),
       });
     });
 

diff --git a/public/pages/Rules/utils/helpers.tsx b/public/pages/Rules/utils/helpers.tsx
@@ -56,7 +56,7 @@ export const getRulesTableColumns = (
       width: '10%',
       truncateText: true,
       render: (category: string) =>
-        ruleTypes.find((ruleType) => ruleType.label.toLowerCase() === category)?.label ||
+        ruleTypes.find((ruleType) => ruleType.value.toLowerCase() === category)?.label ||
         DEFAULT_EMPTY_DATA,
     },
     {

diff --git a/public/store/RulesStore.ts b/public/store/RulesStore.ts
@@ -112,7 +112,7 @@ export class RulesStore implements IRulesStore {
 
     if (!terms) {
       terms = {
-        'rule.category': ruleTypes.map(({ label }) => label.toLowerCase()),
+        'rule.category': ruleTypes.map(({ value }) => value.toLowerCase()),
       };
     } else if (terms['rule.category']) {
       terms['rule.category'] = terms['rule.category'].map((category) => category.toLowerCase());

diff --git a/public/utils/helpers.tsx b/public/utils/helpers.tsx
@@ -296,10 +296,7 @@ export const getPlugins = async (opensearchService: OpenSearchService) => {
 };
 
 export const formatRuleType = (matchingRuleType: string) => {
-  const type = ruleTypes.find(
-    (ruleType) => ruleType.label.toLowerCase() === matchingRuleType.toLowerCase()
-  )?.label;
-  return type === undefined ? DEFAULT_EMPTY_DATA : getLogTypeLabel(type);
+  return getLogTypeLabel(matchingRuleType);
 };
 
 export const getSeverityBadge = (severity: string) => {