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

Fixed a unit test. #576

Merged
merged 5 commits into from
Jun 15, 2023
Merged

Fixed a unit test. #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b9950a
Fixed a unit test that started failing after bump tp node 18.
AWSHurneyt Jun 15, 2023
0d6c440
Fixed a unit test that started failing after bump tp node 18.
AWSHurneyt Jun 15, 2023
962648b
Bumped lint-staged version.
AWSHurneyt Jun 15, 2023
2823639
Fixed a unit test that started failing after bump tp node 18.
AWSHurneyt Jun 15, 2023
2cdc642
Updated snapshot.
AWSHurneyt Jun 15, 2023
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
"cypress": "^6.0.0",
"husky": "^3.0.0",
"lint-staged": "^10.0.0",
"lint-staged": "^10.2.0",
AWSHurneyt marked this conversation as resolved.
Show resolved Hide resolved
"@babel/plugin-transform-modules-commonjs": "^7.16.5"
},
"dependencies": {
Expand Down
48 changes: 9 additions & 39 deletions public/components/Flyout/flyouts/components/AlertsDashboardFlyoutComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,8 @@ export default class AlertsDashboardFlyoutComponent extends Component {
const { location, monitors, monitor_id } = this.props;
const monitor = _.get(_.find(monitors, { _id: monitor_id }), '_source');
const monitorType = _.get(monitor, 'monitor_type', MONITOR_TYPE.QUERY_LEVEL);
const {
alertState,
from,
search,
severityLevel,
size,
sortDirection,
sortField,
} = getURLQueryParams(location);
const { alertState, from, search, severityLevel, size, sortDirection, sortField } =
getURLQueryParams(location);

this.state = {
alerts: [],
Expand All @@ -93,16 +86,8 @@ export default class AlertsDashboardFlyoutComponent extends Component {
}

componentDidMount() {
const {
alertState,
page,
search,
severityLevel,
size,
sortDirection,
sortField,
monitorIds,
} = this.state;
const { alertState, page, search, severityLevel, size, sortDirection, sortField, monitorIds } =
this.state;
this.getAlerts(
page * size,
size,
Expand Down Expand Up @@ -175,15 +160,8 @@ export default class AlertsDashboardFlyoutComponent extends Component {

getAlerts = async () => {
amsiglan marked this conversation as resolved.
Show resolved Hide resolved
this.setState({ loading: true, tabContent: undefined });
const {
from,
search,
sortField,
sortDirection,
severityLevel,
alertState,
monitorIds,
} = this.state;
const { from, search, sortField, sortDirection, severityLevel, alertState, monitorIds } =
this.state;

const { httpClient, history, notifications, triggerID } = this.props;

Expand All @@ -201,7 +179,7 @@ export default class AlertsDashboardFlyoutComponent extends Component {
const queryParamsString = queryString.stringify(params);
history.replace({ ...this.props.location, search: queryParamsString });

httpClient.get('../api/alerting/alerts', { query: params }).then((resp) => {
httpClient.get('../api/alerting/alerts', { query: params })?.then((resp) => {
amsiglan marked this conversation as resolved.
Show resolved Hide resolved
if (resp.ok) {
const { alerts } = resp;
const filteredAlerts = _.filter(alerts, { trigger_id: triggerID });
Expand Down Expand Up @@ -250,16 +228,8 @@ export default class AlertsDashboardFlyoutComponent extends Component {
.catch((error) => error)
);

const {
page,
size,
search,
sortField,
sortDirection,
severityLevel,
alertState,
monitorIds,
} = this.state;
const { page, size, search, sortField, sortDirection, severityLevel, alertState, monitorIds } =
this.state;
await this.getAlerts(
page * size,
size,
Expand Down
3 changes: 3 additions & 0 deletions public/components/Flyout/flyouts/components/AlertsDashboardFlyoutComponent.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import React from 'react';
import { shallow } from 'enzyme';
import AlertsDashboardFlyoutComponent from './AlertsDashboardFlyoutComponent';
import { historyMock, httpClientMock } from '../../../../../test/mocks';

describe('AlertsDashboardFlyoutComponent', () => {
test('renders', () => {
Expand All @@ -14,6 +15,8 @@ describe('AlertsDashboardFlyoutComponent', () => {
location={{ pathname: '/dashboard', search: '' }}
flyout={{ type: 'message', payload: null }}
onClose={jest.fn()}
history={historyMock}
amsiglan marked this conversation as resolved.
Show resolved Hide resolved
httpClient={httpClientMock}
/>
);
expect(wrapper).toMatchSnapshot();
Expand Down
10 changes: 5 additions & 5 deletions ...nents/Flyout/flyouts/components/__snapshots__/AlertsDashboardFlyoutComponent.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ exports[`AlertsDashboardFlyoutComponent renders 1`] = `
}
}
>
Loading conditions...
-
</p>
</EuiText>
</EuiFlexItem>
Expand Down Expand Up @@ -128,7 +128,7 @@ exports[`AlertsDashboardFlyoutComponent renders 1`] = `
Filters
</strong>
<p>
Loading filters...
-
</p>
</EuiText>
</EuiFlexItem>
Expand All @@ -141,7 +141,7 @@ exports[`AlertsDashboardFlyoutComponent renders 1`] = `
Group by
</strong>
<p>
Loading groups...
-
</p>
</EuiText>
</EuiFlexItem>
Expand Down Expand Up @@ -231,8 +231,8 @@ exports[`AlertsDashboardFlyoutComponent renders 1`] = `
isSelectable={true}
itemId={[Function]}
items={Array []}
loading={true}
noItemsMessage="Loading alerts..."
loading={false}
noItemsMessage="No alerts."
onChange={[Function]}
pagination={
Object {
Expand Down