updated cypress test

Signed-off-by: Amardeepsingh Siglani <[email protected]>
amsiglan · May 8, 2024 · b809e1a · b809e1a
1 parent 9d4246e
commit b809e1a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/cypress/integration/3_alerts.spec.js b/cypress/integration/3_alerts.spec.js
@@ -222,7 +222,8 @@ describe('Alerts', () => {
       // and matches each entry with the corresponding element line.
       const document = JSON.stringify(JSON.parse('{"winlog.event_id": 2003}'), null, 2);
       const documentLines = document.split('\n');
-      cy.get('[data-test-subj="finding-details-flyout-rule-document"]')
+      cy.get('[data-test-subj="finding-details-flyout-document-toggle-0"]').click({ force: true });
+      cy.get('[data-test-subj="finding-details-flyout-rule-document-0"]')
         .get('[class="euiCodeBlock__line"]')
         .each((lineElement, lineIndex) => {
           let line = lineElement.text();

diff --git a/public/pages/Findings/components/FindingDetailsFlyout.tsx b/public/pages/Findings/components/FindingDetailsFlyout.tsx
@@ -49,7 +49,7 @@ import { OpenSearchService, IndexPatternsService, CorrelationService } from '../
 import { RuleTableItem } from '../../Rules/utils/helpers';
 import { CreateIndexPatternForm } from './CreateIndexPatternForm';
 import { FindingItemType } from '../containers/Findings/Findings';
-import { CorrelationFinding, FindingDocument, RuleItemInfoBase } from '../../../../types';
+import { CorrelationFinding, FindingDocumentItem, RuleItemInfoBase } from '../../../../types';
 import { FindingFlyoutTabId, FindingFlyoutTabs } from '../utils/constants';
 import { DataStore } from '../../../store/DataStore';
 import { CorrelationsTable } from './CorrelationsTable/CorrelationsTable';
@@ -318,7 +318,7 @@ export default class FindingDetailsFlyout extends Component<
     return patternId;
   };
 
-  toggleDocumentDetails(item: FindingDocument) {
+  toggleDocumentDetails(item: FindingDocumentItem) {
     const docIdToExpandedRowMapValues = { ...this.state.docIdToExpandedRowMap };
     let formattedDocument = '';
     try {
@@ -335,7 +335,7 @@ export default class FindingDetailsFlyout extends Component<
           <EuiCodeBlock
             language="json"
             isCopyable
-            data-test-subj={`finding-details-flyout-rule-document-${item.id}`}
+            data-test-subj={`finding-details-flyout-rule-document-${item.itemIdx}`}
           >
             {formattedDocument}
           </EuiCodeBlock>
@@ -352,10 +352,10 @@ export default class FindingDetailsFlyout extends Component<
     } = this.props;
     const { indexPatternId, docIdToExpandedRowMap } = this.state;
     const relatedDocIdsSet = new Set(related_doc_ids);
-    const relatedDocuments: FindingDocument[] = [];
+    const relatedDocuments: FindingDocumentItem[] = [];
     document_list.forEach((documentInfo) => {
       if (documentInfo.found && relatedDocIdsSet.has(documentInfo.id)) {
-        relatedDocuments.push(documentInfo);
+        relatedDocuments.push({ ...documentInfo, itemIdx: relatedDocuments.length });
       }
     });
 
@@ -378,18 +378,15 @@ export default class FindingDetailsFlyout extends Component<
 
     const actions = [
       {
-        render: ({ id }: FindingDocument) => (
+        render: ({ id }: FindingDocumentItem) => (
           <EuiToolTip title="View surrounding documents">
             <EuiButtonIcon
               // isLoading={isDocumentLoading}
               iconType={'popout'}
               data-test-subj={'finding-details-flyout-view-surrounding-documents'}
               onClick={() => {
                 if (indexPatternId) {
-                  window.open(
-                    `discover#/context/${indexPatternId}/${related_doc_ids[0]}`,
-                    '_blank'
-                  );
+                  window.open(`discover#/context/${indexPatternId}/${id}`, '_blank');
                 } else {
                   this.setState({ ...this.state, isCreateIndexPatternModalVisible: true });
                 }
@@ -400,14 +397,15 @@ export default class FindingDetailsFlyout extends Component<
       },
     ];
 
-    const documentsColumns: EuiBasicTableColumn<FindingDocument>[] = [
+    const documentsColumns: EuiBasicTableColumn<FindingDocumentItem>[] = [
       {
         name: '',
-        render: (item: FindingDocument) => (
+        render: (item: FindingDocumentItem) => (
           <EuiButtonIcon
             onClick={() => this.toggleDocumentDetails(item)}
             aria-label={docIdToExpandedRowMap[item.id] ? 'Collapse' : 'Expand'}
             iconType={docIdToExpandedRowMap[item.id] ? 'arrowUp' : 'arrowDown'}
+            data-test-subj={`finding-details-flyout-document-toggle-${item.itemIdx}`}
           />
         ),
         width: '30',

diff --git a/types/Finding.ts b/types/Finding.ts
@@ -31,6 +31,10 @@ export interface FindingDocument {
   document: string;
 }
 
+export interface FindingDocumentItem extends FindingDocument {
+  itemIdx: number;
+}
+
 /**
  * API interfaces
  */