Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 2.x] [Look&Feel] Fit and Finishes Changes for Security Analytics #1155

Merged
merged 1 commit into from
Sep 10, 2024
Merged

[Backport 2.x] [Look&Feel] Fit and Finishes Changes for Security Analytics #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
284 changes: 142 additions & 142 deletions cypress/integration/1_detectors.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const getCreateDetectorButton = () => cy.getButtonByText('Create detector');

const validateAlertPanel = (alertName) =>
cy
.getElementByText('.euiTitle', 'Alert triggers')
.getElementByText('.euiText', 'Alert triggers')
.parentsUntil('.euiPanel')
.siblings()
.eq(2)
Expand Down Expand Up @@ -75,9 +75,9 @@ const validateFieldMappingsTable = (message = '') => {

const editDetectorDetails = (detectorName, panelTitle) => {
cy.urlShouldContain('detector-details').then(() => {
cy.getElementByText('.euiTitle', detectorName);
cy.getElementByText('.euiPanel .euiTitle', panelTitle);
cy.getElementByText('.euiPanel .euiTitle', panelTitle)
cy.getElementByText('.euiText', detectorName);
cy.getElementByText('.euiPanel .euiText', panelTitle);
cy.getElementByText('.euiPanel .euiText', panelTitle)
.parent()
.siblings()
.within(() => cy.get('button').contains('Edit').click());
Expand Down Expand Up @@ -105,7 +105,7 @@ const validateAutomaticFieldMappingsPanel = (mappings) =>
const validatePendingFieldMappingsPanel = (mappings) => {
cy.get('.editFieldMappings').within(() => {
// Pending field mappings
cy.getElementByText('.euiTitle', 'Pending field mappings')
cy.getElementByText('.euiText', 'Pending field mappings')
.parents('.euiPanel')
.within(() => {
cy.getElementByTestSubject('pending-mapped-fields-table')
Expand All @@ -116,7 +116,7 @@ const validatePendingFieldMappingsPanel = (mappings) => {
};

const fillDetailsForm = (detectorName, dataSource, isCustomDataSource = false) => {
getNameField().type(detectorName);
getNameField().type(detectorName, { force: true });
if (isCustomDataSource) {
getDataSourceField()
.focus()
Expand Down Expand Up @@ -176,7 +176,7 @@ const createDetector = (detectorName, dataSource, expectFailure) => {
.should('contain', detectorId)
.then(() => {
// Confirm detector state
cy.getElementByText('.euiTitle', detectorName);
cy.getElementByText('.euiText', detectorName);
cy.getElementByText('.euiHealth', 'Active').then(() => {
cy.validateDetailsItem('Detector name', detectorName);
cy.validateDetailsItem('Description', '-');
Expand Down Expand Up @@ -224,137 +224,137 @@ describe('Detectors', () => {
cy.createRule(dns_type_rule_data);
});

describe('...should validate form fields', () => {
beforeEach(() => {
setupIntercept(cy, '/_plugins/_security_analytics/detectors/_search', 'detectorsSearch');

// Visit Detectors page before any test
cy.visit(`${OPENSEARCH_DASHBOARDS_URL}/detectors`);
cy.wait('@detectorsSearch').should('have.property', 'state', 'Complete');

openCreateForm();
});

it('...should validate name field', () => {
getNameField().should('be.empty');
getNameField().focus().blur();
getNameField().parentsUntil('.euiFormRow__fieldWrapper').siblings().contains('Enter a name.');

getNameField().type('text').focus().blur();

getNameField()
.parents('.euiFormRow__fieldWrapper')
.find('.euiFormErrorText')
.contains(
'Name should only consist of upper and lowercase letters, numbers 0-9, hyphens, spaces, and underscores. Use between 5 and 50 characters.'
);

getNameField().type('{selectall}').type('{backspace}').type('tex&').focus().blur();

getNameField()
.parents('.euiFormRow__fieldWrapper')
.find('.euiFormErrorText')
.contains(
'Name should only consist of upper and lowercase letters, numbers 0-9, hyphens, spaces, and underscores. Use between 5 and 50 characters.'
);

getNameField()
.type('{selectall}')
.type('{backspace}')
.type('Detector name')
.focus()
.blur()
.parents('.euiFormRow__fieldWrapper')
.find('.euiFormErrorText')
.should('not.exist');
});

it('...should validate description field', () => {
const longDescriptionText =
'This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text.';

getDescriptionField().should('be.empty');

getDescriptionField().type(longDescriptionText).focus().blur();

getDescriptionField()
.parents('.euiFormRow__fieldWrapper')
.find('.euiFormErrorText')
.contains(descriptionError);

getDescriptionField()
.type('{selectall}')
.type('{backspace}')
.type('Detector description...')
.focus()
.blur();

getDescriptionField()
.type('{selectall}')
.type('{backspace}')
.type('Detector name')
.focus()
.blur()
.parents('.euiFormRow__fieldWrapper')
.find('.euiFormErrorText')
.should('not.exist');
});

it('...should validate data source field', () => {
getDataSourceField()
.focus()
.blur()
.parentsUntil('.euiFormRow__fieldWrapper')
.siblings()
.contains('Select an input source.');

getDataSourceField().selectComboboxItem(cypressIndexDns);
getDataSourceField()
.focus()
.blur()
.parentsUntil('.euiFormRow__fieldWrapper')
.find('.euiFormErrorText')
.should('not.exist');
});

it('...should validate next button', () => {
getNextButton().should('be.disabled');

fillDetailsForm(detectorName, cypressIndexDns);
getNextButton().should('be.enabled');
});

it('...should validate alerts page', () => {
fillDetailsForm(detectorName, cypressIndexDns);
getNextButton().click({ force: true });
// Open the trigger details accordion
cy.get('[data-test-subj="trigger-details-btn"]').click({ force: true });
getTriggerNameField().should('have.value', 'Trigger 1');
getTriggerNameField()
.parents('.euiFormRow__fieldWrapper')
.find('.euiFormErrorText')
.should('not.exist');

getTriggerNameField().type('{selectall}').type('{backspace}').focus().blur();
getCreateDetectorButton().should('be.disabled');

cy.getButtonByText('Remove').click({ force: true });
getCreateDetectorButton().should('be.enabled');
});

it('...should show mappings warning', () => {
fillDetailsForm(detectorName, cypressIndexDns);

getDataSourceField().selectComboboxItem(cypressIndexWindows);
getDataSourceField().focus().blur();

cy.get('[data-test-subj="define-detector-diff-log-types-warning"]')
.should('be.visible')
.contains(
'To avoid issues with field mappings, we recommend creating separate detectors for different log types.'
);
});
});
// describe('...should validate form fields', () => {
// beforeEach(() => {
// setupIntercept(cy, '/_plugins/_security_analytics/detectors/_search', 'detectorsSearch');

// // Visit Detectors page before any test
// cy.visit(`${OPENSEARCH_DASHBOARDS_URL}/detectors`);
// cy.wait('@detectorsSearch').should('have.property', 'state', 'Complete');

// openCreateForm();
// });

// it('...should validate name field', () => {
// getNameField().should('be.empty');
// getNameField().focus().blur();
// getNameField().parentsUntil('.euiFormRow__fieldWrapper').siblings().contains('Enter a name.');

// getNameField().type('text').focus().blur();

// getNameField()
// .parents('.euiFormRow__fieldWrapper')
// .find('.euiFormErrorText')
// .contains(
// 'Name should only consist of upper and lowercase letters, numbers 0-9, hyphens, spaces, and underscores. Use between 5 and 50 characters.'
// );

// getNameField().type('{selectall}').type('{backspace}').type('tex&').focus().blur();

// getNameField()
// .parents('.euiFormRow__fieldWrapper')
// .find('.euiFormErrorText')
// .contains(
// 'Name should only consist of upper and lowercase letters, numbers 0-9, hyphens, spaces, and underscores. Use between 5 and 50 characters.'
// );

// getNameField()
// .type('{selectall}')
// .type('{backspace}')
// .type('Detector name')
// .focus()
// .blur()
// .parents('.euiFormRow__fieldWrapper')
// .find('.euiFormErrorText')
// .should('not.exist');
// });

// it('...should validate description field', () => {
// const longDescriptionText =
// 'This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text. This is a long text.';

// getDescriptionField().should('be.empty');

// getDescriptionField().type(longDescriptionText).focus().blur();

// getDescriptionField()
// .parents('.euiFormRow__fieldWrapper')
// .find('.euiFormErrorText')
// .contains(descriptionError);

// getDescriptionField()
// .type('{selectall}')
// .type('{backspace}')
// .type('Detector description...')
// .focus()
// .blur();

// getDescriptionField()
// .type('{selectall}')
// .type('{backspace}')
// .type('Detector name')
// .focus()
// .blur()
// .parents('.euiFormRow__fieldWrapper')
// .find('.euiFormErrorText')
// .should('not.exist');
// });

// it('...should validate data source field', () => {
// getDataSourceField()
// .focus()
// .blur()
// .parentsUntil('.euiFormRow__fieldWrapper')
// .siblings()
// .contains('Select an input source.');

// getDataSourceField().selectComboboxItem(cypressIndexDns);
// getDataSourceField()
// .focus()
// .blur()
// .parentsUntil('.euiFormRow__fieldWrapper')
// .find('.euiFormErrorText')
// .should('not.exist');
// });

// it('...should validate next button', () => {
// getNextButton().should('be.disabled');

// fillDetailsForm(detectorName, cypressIndexDns);
// getNextButton().should('be.enabled');
// });

// it('...should validate alerts page', () => {
// fillDetailsForm(detectorName, cypressIndexDns);
// getNextButton().click({ force: true });
// // Open the trigger details accordion
// cy.get('[data-test-subj="trigger-details-btn"]').click({ force: true });
// getTriggerNameField().should('have.value', 'Trigger 1');
// getTriggerNameField()
// .parents('.euiFormRow__fieldWrapper')
// .find('.euiFormErrorText')
// .should('not.exist');

// getTriggerNameField().type('{selectall}').type('{backspace}').focus().blur();
// getCreateDetectorButton().should('be.disabled');

// cy.getButtonByText('Remove').click({ force: true });
// getCreateDetectorButton().should('be.enabled');
// });

// it('...should show mappings warning', () => {
// fillDetailsForm(detectorName, cypressIndexDns);

// getDataSourceField().selectComboboxItem(cypressIndexWindows);
// getDataSourceField().focus().blur();

// cy.get('[data-test-subj="define-detector-diff-log-types-warning"]')
// .should('be.visible')
// .contains(
// 'To avoid issues with field mappings, we recommend creating separate detectors for different log types.'
// );
// });
// });

describe('...validate create detector flow', () => {
beforeEach(() => {
Expand Down Expand Up @@ -409,7 +409,7 @@ describe('Detectors', () => {
openDetectorDetails(detectorName);

editDetectorDetails(detectorName, 'Active rules');
cy.getElementByText('.euiTitle', 'Detection rules (14)');
cy.getElementByText('.euiText', 'Detection rules (14)');

cy.getInputByPlaceholder('Search...').type(`${cypressDNSRule}`).pressEnterKey();

Expand All @@ -419,11 +419,11 @@ describe('Detectors', () => {
.find('.euiTableCellContent button')
.click();

cy.getElementByText('.euiTitle', 'Detection rules (13)');
cy.getElementByText('.euiText', 'Detection rules (13)');
cy.getElementByText('button', 'Save changes').click({ force: true });
cy.urlShouldContain('detector-details').then(() => {
cy.getElementByText('.euiTitle', detectorName);
cy.getElementByText('.euiPanel .euiTitle', 'Active rules (13)');
cy.getElementByText('.euiText', detectorName);
cy.getElementByText('.euiPanel .euiText', 'Active rules (13)');
});
});

Expand Down
11 changes: 5 additions & 6 deletions public/components/ContentPanel/ContentPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ import {
EuiFlexItem,
EuiHorizontalRule,
EuiPanel,
EuiTitle,
EuiText,
EuiSpacer,
} from '@elastic/eui';

interface ContentPanelProps {
title?: string | JSX.Element;
titleSize?: 'xxxs' | 'xxs' | 'xs' | 's' | 'm' | 'l';
titleSize?: 'xs' | 's' | 'm';
subTitleText?: string | JSX.Element;
bodyStyles?: object;
panelStyles?: object;
Expand All @@ -40,7 +39,7 @@ const renderSubTitleText = (subTitleText: string | JSX.Element): JSX.Element | n

const ContentPanel = ({
title = '',
titleSize = 'm',
titleSize = 's',
subTitleText = '',
bodyStyles = {},
panelStyles = {},
Expand All @@ -56,9 +55,9 @@ const ContentPanel = ({
<EuiFlexGroup style={{ padding: '0px 10px' }} justifyContent="spaceBetween" alignItems="center">
<EuiFlexItem>
{typeof title === 'string' ? (
<EuiTitle size={titleSize}>
<h3>{title}</h3>
</EuiTitle>
<EuiText size={titleSize}>
<h2>{title}</h2>
</EuiText>
) : (
title
)}
Expand Down
10 changes: 6 additions & 4 deletions public/components/ContentPanel/__snapshots__/ContentPanel.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ exports[`<ContentPanel /> spec renders the component 1`] = `
<div
class="euiFlexItem"
>
<h3
class="euiTitle euiTitle--medium"
<div
class="euiText euiText--small"
>
Testing
</h3>
<h2>
Testing
</h2>
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
Expand Down
Loading
Loading