fixed log type labels; cypress tests

Signed-off-by: Amardeepsingh Siglani <[email protected]>
opensearch-project · Jul 31, 2023 · e44d3cc · e44d3cc
1 parent 91d7014
commit e44d3cc
Show file tree

Hide file tree

Showing 17 changed files with 87 additions and 183 deletions.
diff --git a/cypress/integration/1_detectors.spec.js b/cypress/integration/1_detectors.spec.js
@@ -117,7 +117,6 @@ const fillDetailsForm = (detectorName, dataSource) => {
   getDataSourceField().selectComboboxItem(dataSource);
   getLogTypeField().selectComboboxItem(cypressLogTypeDns);
   getLogTypeField().blur();
-  // selectDnsLogType();
 };
 
 const createDetector = (detectorName, dataSource, expectFailure) => {

diff --git a/cypress/integration/3_alerts.spec.js b/cypress/integration/3_alerts.spec.js
@@ -118,7 +118,7 @@ describe('Alerts', () => {
         expect($tr, `timestamp`).to.contain(date);
         expect($tr, `rule name`).to.contain('Cypress USB Rule');
         expect($tr, `detector name`).to.contain(testDetector.name);
-        expect($tr, `log type`).to.contain('Windows');
+        expect($tr, `log type`).to.contain('windows');
       });
 
       // Close the flyout

diff --git a/cypress/integration/4_findings.spec.js b/cypress/integration/4_findings.spec.js
@@ -52,7 +52,7 @@ describe('Findings', () => {
     cy.contains('No items found').should('not.exist');
 
     // Check for expected findings
-    cy.contains('Windows');
+    cy.contains('windows');
     cy.contains('High');
   });
 

diff --git a/public/pages/Correlations/containers/CorrelationsContainer.tsx b/public/pages/Correlations/containers/CorrelationsContainer.tsx
@@ -6,7 +6,7 @@ import { CorrelationFinding, CorrelationGraphData, DateTimeFilter } from '../../
 import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import {
-  defaultLogTypeFilterItemOptions,
+  getDefaultLogTypeFilterItemOptions,
   defaultSeverityFilterItemOptions,
   emptyGraphData,
   getAbbrFromLogType,
@@ -85,7 +85,7 @@ export class Correlations extends React.Component<CorrelationsProps, Correlation
     this.state = {
       recentlyUsedRanges: [DEFAULT_DATE_RANGE],
       graphData: { ...emptyGraphData },
-      logTypeFilterOptions: [...defaultLogTypeFilterItemOptions],
+      logTypeFilterOptions: [...getDefaultLogTypeFilterItemOptions()],
       severityFilterOptions: [...defaultSeverityFilterItemOptions],
       specificFindingInfo: undefined,
       loadingGraphData: false,

diff --git a/public/pages/Correlations/containers/CreateCorrelationRule.tsx b/public/pages/Correlations/containers/CreateCorrelationRule.tsx
@@ -274,7 +274,10 @@ export const CreateCorrelationRule: React.FC<CreateCorrelationRuleProps> = (
                       isInvalid={isInvalidInputForQuery('logType')}
                       placeholder="Select a log type"
                       data-test-subj={'rule_type_dropdown'}
-                      options={ruleTypes.map(({ value, label }) => ({ value, label }))}
+                      options={ruleTypes.map(({ label }) => ({
+                        value: label.toLowerCase(),
+                        label,
+                      }))}
                       singleSelection={{ asPlainText: true }}
                       onChange={(e) => {
                         props.handleChange(`queries[${queryIdx}].logType`)(
@@ -283,7 +286,18 @@ export const CreateCorrelationRule: React.FC<CreateCorrelationRuleProps> = (
                       }}
                       onBlur={props.handleBlur(`queries[${queryIdx}].logType`)}
                       selectedOptions={
-                        query.logType ? [{ value: query.logType, label: query.logType }] : []
+                        query.logType
+                          ? [
+                              {
+                                value: query.logType,
+                                label:
+                                  ruleTypes.find(
+                                    (logType) =>
+                                      logType.label.toLowerCase() === query.logType.toLowerCase()
+                                  )?.label || query.logType,
+                              },
+                            ]
+                          : []
                       }
                       isClearable={true}
                       onCreateOption={(e) => {

diff --git a/public/pages/Correlations/utils/constants.tsx b/public/pages/Correlations/utils/constants.tsx
@@ -47,15 +47,12 @@ export const graphRenderOptions = {
   },
 };
 
-export const defaultLogTypeFilterItemOptions: FilterItem[] = Object.values(ruleTypes).map(
-  (type) => {
-    return {
-      name: `${type.abbr}: ${type.label}`,
-      id: type.value,
-      checked: 'on',
-    };
-  }
-);
+export const getDefaultLogTypeFilterItemOptions: () => FilterItem[] = () =>
+  Object.values(ruleTypes).map((type) => ({
+    name: `${type.label}`,
+    id: type.label.toLowerCase(),
+    checked: 'on',
+  }));
 
 export const defaultSeverityFilterItemOptions: FilterItem[] = Object.values(ruleSeverity).map(
   (sev) => {

diff --git a/public/pages/LogTypes/components/LogTypeDetailsTab.tsx b/public/pages/LogTypes/components/LogTypeDetailsTab.tsx
@@ -64,7 +64,7 @@ export const LogTypeDetailsTab: React.FC<LogTypeDetailsTabProps> = ({
                       })
                     }
                     placeholder="Enter name for log type"
-                    disabled={!isEditMode || !!logTypeDetails.detectionRules}
+                    disabled={!isEditMode || !!logTypeDetails.detectionRulesCount}
                   />
                 </EuiFormRow>
                 <EuiSpacer />

diff --git a/public/pages/LogTypes/components/LogTypeForm.tsx b/public/pages/LogTypes/components/LogTypeForm.tsx
@@ -84,7 +84,8 @@ export const LogTypeForm: React.FC<LogTypeFormProps> = ({
             updateErrors(newLogType);
           }}
           placeholder="Enter name for the log type"
-          disabled={!isEditMode || !!logTypeDetails.detectionRules}
+          readOnly={!isEditMode}
+          disabled={isEditMode && !!logTypeDetails.detectionRulesCount}
         />
       </EuiFormRow>
       <EuiSpacer />
@@ -100,7 +101,7 @@ export const LogTypeForm: React.FC<LogTypeFormProps> = ({
             updateErrors(newLogType);
           }}
           placeholder="Description of the log type"
-          disabled={!isEditMode}
+          readOnly={!isEditMode}
         />
       </EuiFormRow>
       {isEditMode ? (

diff --git a/public/pages/LogTypes/containers/CreateLogType.tsx b/public/pages/LogTypes/containers/CreateLogType.tsx
@@ -48,7 +48,7 @@ export const CreateLogType: React.FC<CreateLogTypeProps> = ({ history, notificat
       hideHeaderBorder={true}
     >
       <LogTypeForm
-        logTypeDetails={{ ...logTypeDetails, id: '', detectionRules: 0 }}
+        logTypeDetails={{ ...logTypeDetails, id: '', detectionRulesCount: 0 }}
         isEditMode={true}
         confirmButtonText={'Create rule category'}
         notifications={notifications}

diff --git a/public/pages/LogTypes/containers/LogType.tsx b/public/pages/LogTypes/containers/LogType.tsx
@@ -59,7 +59,7 @@ export const LogType: React.FC<LogTypeProps> = ({ notifications, history }) => {
 
   const updateRules = useCallback(async (details: LogTypeItem, intialDetails: LogTypeItem) => {
     const rulesRes = await DataStore.rules.getAllRules({
-      'rule.category': [logTypeId],
+      'rule.category': [details.name.toLowerCase()],
     });
     const ruleItems = rulesRes.map((rule) => ({
       title: rule._source.title,
@@ -74,22 +74,15 @@ export const LogType: React.FC<LogTypeProps> = ({ notifications, history }) => {
     setLoadingRules(false);
     setLogTypeDetails({
       ...details,
-      detectionRules: ruleItems.length,
+      detectionRulesCount: ruleItems.length,
     });
     setInitialLogTypeDetails({
       ...intialDetails,
-      detectionRules: ruleItems.length,
+      detectionRulesCount: ruleItems.length,
     });
   }, []);
 
   useEffect(() => {
-    context?.chrome.setBreadcrumbs([
-      BREADCRUMBS.SECURITY_ANALYTICS,
-      BREADCRUMBS.DETECTORS,
-      BREADCRUMBS.LOG_TYPES,
-      { text: logTypeId },
-    ]);
-
     const getLogTypeDetails = async () => {
       const details = await DataStore.logTypes.getLogType(logTypeId);
 
@@ -98,7 +91,14 @@ export const LogType: React.FC<LogTypeProps> = ({ notifications, history }) => {
         return;
       }
 
-      updateRules(details, details);
+      context?.chrome.setBreadcrumbs([
+        BREADCRUMBS.SECURITY_ANALYTICS,
+        BREADCRUMBS.DETECTORS,
+        BREADCRUMBS.LOG_TYPES,
+        { text: details.name },
+      ]);
+      const logTypeItem = { ...details, detectionRulesCount: details.detectionRules.length };
+      updateRules(logTypeItem, logTypeItem);
     };
 
     getLogTypeDetails();
@@ -152,7 +152,7 @@ export const LogType: React.FC<LogTypeProps> = ({ notifications, history }) => {
       {showDeleteModal && (
         <DeleteLogTypeModal
           logTypeName={logTypeDetails.name}
-          detectionRulesCount={logTypeDetails.detectionRules}
+          detectionRulesCount={logTypeDetails.detectionRulesCount}
           closeModal={() => setShowDeleteModal(false)}
           onConfirm={deleteLogType}
         />
@@ -186,7 +186,9 @@ export const LogType: React.FC<LogTypeProps> = ({ notifications, history }) => {
           </EuiFlexItem>
           <EuiFlexItem>
             <EuiDescriptionList
-              listItems={[{ title: 'Detection rules', description: logTypeDetails.detectionRules }]}
+              listItems={[
+                { title: 'Detection rules', description: logTypeDetails.detectionRulesCount },
+              ]}
             />
           </EuiFlexItem>
           <EuiFlexItem>

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

diff --git a/public/services/LogTypeService.ts b/public/services/LogTypeService.ts
@@ -28,8 +28,22 @@ export default class LogTypeService {
 
   searchLogTypes = async (id?: string): Promise<ServerResponse<SearchLogTypesResponse>> => {
     const url = `..${API.LOGTYPE_BASE}/_search`;
-    const query = id ? JSON.stringify({ terms: { _id: [id] } }) : undefined;
-    return (await this.httpClient.post(url, { body: query })) as ServerResponse<
+    const query = id
+      ? {
+          terms: { _id: [id] },
+        }
+      : {
+          bool: {
+            must: {
+              query_string: {
+                query:
+                  '(source: Sigma and !(name: others*) and !(name: test*)) or (source: Custom)',
+              },
+            },
+          },
+        };
+    const queryString = JSON.stringify(query);
+    return (await this.httpClient.post(url, { body: queryString })) as ServerResponse<
       SearchLogTypesResponse
     >;
   };