Skip to content

Commit 0dcd661

Browse files
committed
fix height and ftr tests
1 parent f633c97 commit 0dcd661

10 files changed

Lines changed: 19 additions & 36 deletions

File tree

x-pack/platform/plugins/shared/cases/public/components/case_view/components/attachment_accordion.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
useEuiTheme,
1616
} from '@elastic/eui';
1717
import { css } from '@emotion/react';
18-
import React from 'react';
18+
import React, { useCallback, useState } from 'react';
1919

2020
interface AttachmentAccordionProps {
2121
id: string;
@@ -27,14 +27,18 @@ interface AttachmentAccordionProps {
2727
export const AttachmentAccordion = ({ id, title, count, children }: AttachmentAccordionProps) => {
2828
const { euiTheme } = useEuiTheme();
2929
const accordionId = useGeneratedHtmlId({ prefix: `case-view-attachment-${id}` });
30+
// Controlled isOpen so we can fully unmount children when collapsed
31+
const [isOpen, setIsOpen] = useState(true);
32+
const onToggle = useCallback((nextIsOpen: boolean) => setIsOpen(nextIsOpen), []);
3033
return (
3134
<EuiFlexItem grow={false}>
3235
<EuiPanel hasBorder>
3336
<EuiAccordion
3437
id={accordionId}
3538
data-test-subj={`case-view-attachment-accordion-${id}`}
3639
buttonProps={{ 'data-test-subj': `case-view-attachment-accordion-toggle-${id}` }}
37-
initialIsOpen
40+
forceState={isOpen ? 'open' : 'closed'}
41+
onToggle={onToggle}
3842
buttonContent={
3943
<EuiText size="s">
4044
<h4
@@ -57,7 +61,7 @@ export const AttachmentAccordion = ({ id, title, count, children }: AttachmentAc
5761
</EuiText>
5862
}
5963
>
60-
{children}
64+
{isOpen ? children : null}
6165
</EuiAccordion>
6266
</EuiPanel>
6367
</EuiFlexItem>

x-pack/platform/plugins/shared/cases/public/components/case_view/components/case_view_observables.tsx

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
* 2.0.
66
*/
77
import React, { useCallback, useMemo } from 'react';
8-
9-
import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
10-
118
import type { CaseUI } from '../../../../common/ui/types';
12-
139
import { ObservablesTable } from '../../observables/observables_table';
1410
import { useCaseObservables } from '../use_case_observables';
1511
import type { OnUpdateFields } from '../types';
@@ -47,19 +43,11 @@ export const CaseViewObservables = ({
4743
);
4844

4945
return (
50-
<EuiFlexGroup>
51-
<EuiFlexItem>
52-
<EuiFlexGroup>
53-
<EuiFlexItem>
54-
<ObservablesTable
55-
caseData={caseDataWithFilteredObservables}
56-
isLoading={isLoading || isLoadingObservables}
57-
onExtractObservablesChanged={onExtractObservablesChanged}
58-
/>
59-
</EuiFlexItem>
60-
</EuiFlexGroup>
61-
</EuiFlexItem>
62-
</EuiFlexGroup>
46+
<ObservablesTable
47+
caseData={caseDataWithFilteredObservables}
48+
isLoading={isLoading || isLoadingObservables}
49+
onExtractObservablesChanged={onExtractObservablesChanged}
50+
/>
6351
);
6452
};
6553

x-pack/platform/test/functional_with_es_ssl/apps/cases/group1/view_case.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,8 +913,6 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
913913
});
914914

915915
it('adds a file to the case', async () => {
916-
await testSubjects.existOrFail('case-view-attachment-accordion-file');
917-
918916
await cases.casesFilesTable.addFile(require.resolve('./elastic_logo.png'));
919917

920918
// make sure the uploaded file is displayed on the table

x-pack/platform/test/screenshot_creation/apps/response_ops_docs/stack_cases/details_view.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ export default function ({ getService }: FtrProviderContext) {
3131
1400,
3232
1024
3333
);
34-
const filesTab = await testSubjects.find('case-view-tab-title-files');
35-
await filesTab.click();
34+
const attachmentsTab = await testSubjects.find('case-view-tab-title-attachments');
35+
await attachmentsTab.click();
36+
await testSubjects.existOrFail('case-view-attachment-accordion-file');
3637
await commonScreenshots.takeScreenshot('cases-files', screenshotDirectories, 1400, 1024);
3738
});
3839
});

x-pack/solutions/observability/test/screenshot_creation/apps/response_ops_docs/observability_cases/list_view.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ export default function ({ getPageObject, getService }: FtrProviderContext) {
8989
await common.navigateToUrlWithBrowserHistory('observability', `/cases/${caseIdMonitoring}`);
9090
const attachmentsTab = await testSubjects.find('case-view-tab-title-attachments');
9191
await attachmentsTab.click();
92-
const filesTab = await testSubjects.find('case-view-tab-title-files');
93-
await filesTab.click();
92+
await testSubjects.existOrFail('case-view-attachment-accordion-file');
9493
await commonScreenshots.takeScreenshot(
9594
'observabiity-case-files',
9695
screenshotDirectories,

x-pack/solutions/observability/test/serverless/functional/test_suites/cases/view_case.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,6 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
397397
});
398398

399399
it('adds a file to the case', async () => {
400-
await testSubjects.existOrFail('case-view-attachment-accordion-file');
401-
402400
await cases.casesFilesTable.addFile(require.resolve('./note.txt'));
403401

404402
const uploadedFileName = await testSubjects.getVisibleText('cases-files-name-text');

x-pack/solutions/observability/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/cases/list_view.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ export default function ({ getPageObject, getPageObjects, getService }: FtrProvi
7878
await pageObjects.svlCommonNavigation.sidenav.toggle(true);
7979
const attachmentsTab = await testSubjects.find('case-view-tab-title-attachments');
8080
await attachmentsTab.click();
81-
const filesTab = await testSubjects.find('case-view-tab-title-files');
82-
await filesTab.click();
8381
await cases.casesFilesTable.addFile(require.resolve('./testfile.png'));
8482
await testSubjects.getVisibleText('cases-files-name-link');
8583
await svlCommonScreenshots.takeScreenshot(

x-pack/solutions/security/test/screenshot_creation/apps/response_ops_docs/security_cases/list_view.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ export default function ({ getPageObject, getService, getPageObjects }: FtrProvi
7878
});
7979
await commonScreenshots.takeScreenshot('cases-ui-open', screenshotDirectories, 1400, 1024);
8080

81-
const filesTab = await testSubjects.find('case-view-tab-title-files');
82-
await filesTab.click();
81+
const attachmentsTab = await testSubjects.find('case-view-tab-title-attachments');
82+
await attachmentsTab.click();
83+
await testSubjects.existOrFail('case-view-attachment-accordion-file');
8384
await commonScreenshots.takeScreenshot('cases-files', screenshotDirectories, 1400, 1024);
8485
});
8586
});

x-pack/solutions/security/test/serverless/functional/test_suites/ftr/cases/view_case.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,6 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
394394
await testSubjects.click('case-view-tab-title-attachments');
395395
});
396396
it('adds a file to the case', async () => {
397-
await testSubjects.existOrFail('case-view-attachment-accordion-file');
398-
399397
await cases.casesFilesTable.addFile(require.resolve('./note.txt'));
400398

401399
const uploadedFileName = await testSubjects.getVisibleText('cases-files-name-text');

x-pack/solutions/security/test/serverless/functional/test_suites/screenshot_creation/response_ops_docs/cases/list_view.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ export default function ({ getPageObject, getPageObjects, getService }: FtrProvi
8686
await svlCommonScreenshots.takeScreenshot('cases-ui-open', screenshotDirectories, 1400, 1024);
8787
const attachmentsTab = await testSubjects.find('case-view-tab-title-attachments');
8888
await attachmentsTab.click();
89-
const filesTab = await testSubjects.find('case-view-tab-title-files');
90-
await filesTab.click();
9189
await cases.casesFilesTable.addFile(require.resolve('./testfile.png'));
9290
await testSubjects.getVisibleText('cases-files-name-link');
9391
await svlCommonScreenshots.takeScreenshot('cases-files', screenshotDirectories, 1400, 1024);

0 commit comments

Comments
 (0)