Skip to content

Commit 2189a54

Browse files
committed
cleanup
Signed-off-by: Jackie Han <jkhanjob@gmail.com>
1 parent 2cea066 commit 2189a54

File tree

10 files changed

+18
-54
lines changed

10 files changed

+18
-54
lines changed

public/pages/DefineDetector/components/Datasource/DataSource.tsx

+1-12
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import { DetectorDefinitionFormikValues } from '../../models/interfaces';
3232
import { ModelConfigurationFormikValues } from '../../../ConfigureModel/models/interfaces';
3333
import { INITIAL_MODEL_CONFIGURATION_VALUES } from '../../../ConfigureModel/utils/constants';
3434
import { FILTER_TYPES } from '../../../../models/interfaces';
35-
import { getNotifications, getSavedObjectsClient } from '../../../../services';
3635

3736
interface DataSourceProps {
3837
formikProps: FormikProps<DetectorDefinitionFormikValues>;
@@ -45,13 +44,6 @@ interface DataSourceProps {
4544
}
4645

4746
export function DataSource(props: DataSourceProps) {
48-
const [selectedDataSource, setSelectedDataSource] = useState<string>();
49-
50-
const onSelectedDataSource = (e) => {
51-
const dataConnectionId = e[0] ? e[0].id : undefined;
52-
setSelectedDataSource(dataConnectionId);
53-
console.log(dataConnectionId);
54-
}
5547
const dispatch = useDispatch();
5648
const [indexName, setIndexName] = useState<string>(
5749
props.formikProps.values.index[0]?.label
@@ -103,7 +95,6 @@ export function DataSource(props: DataSourceProps) {
10395

10496
return (
10597
<ContentPanel title="Data Source" titleSize="s">
106-
10798
{props.isEdit && isDifferentIndex() ? (
10899
<div>
109100
<EuiCallOut
@@ -115,11 +106,9 @@ export function DataSource(props: DataSourceProps) {
115106
<EuiSpacer />
116107
</div>
117108
) : null}
118-
119109
<Field name="index" validate={validateIndex}>
120110
{({ field, form }: FieldProps) => {
121111
return (
122-
123112
<FormattedFormRow
124113
title="Index"
125114
hint="Choose an index or index pattern as the data source."
@@ -178,4 +167,4 @@ export function DataSource(props: DataSourceProps) {
178167
/>
179168
</ContentPanel>
180169
);
181-
}
170+
}

public/pages/DefineDetector/components/NameAndDescription/NameAndDescription.tsx

+1-14
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,11 @@ import ContentPanel from '../../../../components/ContentPanel/ContentPanel';
1616
import { getError, isInvalid } from '../../../../utils/utils';
1717
import { validateDetectorDesc } from './utils/validation';
1818
import { FormattedFormRow } from '../../../../components/FormattedFormRow/FormattedFormRow';
19-
import { useState } from 'react';
20-
import { getNotifications, getSavedObjectsClient } from '../../../../services';
21-
import { ClusterSelector } from '../../../../../../../src/plugins/data_source_management/public';
2219

2320
interface NameAndDescriptionProps {
2421
onValidateDetectorName: (detectorName: string) => Promise<any>;
2522
}
26-
27-
2823
function NameAndDescription(props: NameAndDescriptionProps) {
29-
const [selectedDataSource, setSelectedDataSource] = useState<string>();
30-
31-
const onSelectedDataSource = (e) => {
32-
const dataConnectionId = e[0] ? e[0].id : undefined;
33-
setSelectedDataSource(dataConnectionId);
34-
console.log(dataConnectionId);
35-
}
3624
return (
3725
<ContentPanel title="Detector details" titleSize="s">
3826
<Field name="name" validate={props.onValidateDetectorName}>
@@ -56,7 +44,6 @@ function NameAndDescription(props: NameAndDescriptionProps) {
5644
</FormattedFormRow>
5745
)}
5846
</Field>
59-
6047
<Field name="description" validate={validateDetectorDesc}>
6148
{({ field, form }: FieldProps) => (
6249
<FormattedFormRow
@@ -85,4 +72,4 @@ function NameAndDescription(props: NameAndDescriptionProps) {
8572
);
8673
}
8774

88-
export default NameAndDescription;
75+
export default NameAndDescription;

public/pages/DefineDetector/containers/DefineDetector.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,10 @@ export const DefineDetector = (props: DefineDetectorProps) => {
249249
</EuiPageHeaderSection>
250250
</EuiPageHeader>
251251
<Fragment>
252-
253252
<NameAndDescription
254253
onValidateDetectorName={handleValidateName}
255254
/>
256255
<EuiSpacer />
257-
258256
<DataSource
259257
formikProps={formikProps}
260258
origIndex={

public/pages/DetectorDetail/containers/DetectorDetail.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
* SPDX-License-Identifier: Apache-2.0
43
*

public/pages/DetectorsList/components/ListFilters/ListFilters.tsx

-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ interface ListFiltersProps {
3535
onPageClick: (pageNumber: number) => void;
3636
}
3737
export const ListFilters = (props: ListFiltersProps) => (
38-
3938
<EuiFlexGroup gutterSize="s">
4039
<EuiFlexItem grow={false} style={{ width: '40%' }}>
4140
<EuiFieldSearch
@@ -63,7 +62,6 @@ export const ListFilters = (props: ListFiltersProps) => (
6362
fullWidth={true}
6463
/>
6564
</EuiFlexItem>
66-
6765
<EuiFlexItem>
6866
<EuiComboBox
6967
id="selectedIndices"
@@ -82,8 +80,6 @@ export const ListFilters = (props: ListFiltersProps) => (
8280
fullWidth={true}
8381
/>
8482
</EuiFlexItem>
85-
86-
8783
{props.pageCount > 1 ? (
8884
<EuiFlexItem grow={false} style={{ justifyContent: 'center' }}>
8985
<EuiPagination

public/pages/Overview/containers/AnomalyDetectionOverview.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import {
3232
import { SAMPLE_TYPE } from '../../../../server/utils/constants';
3333
import {
3434
GET_SAMPLE_INDICES_QUERY,
35-
getSampleDetectorsQueryParamsWithDataSouceId,
3635
} from '../../utils/constants';
3736
import { AppState } from '../../../redux/reducers';
3837
import { getDetectorList } from '../../../redux/reducers/ad';
@@ -64,6 +63,7 @@ import { MDSQueryParams } from 'server/models/types';
6463
import { RouteComponentProps } from 'react-router-dom';
6564
import queryString from 'querystring';
6665
import { getURLQueryParams } from '../../../../public/pages/DetectorsList/utils/helpers';
66+
import { getSampleDetectorsQueryParamsWithDataSouceId } from '../../../../public/pages/utils/helpers';
6767

6868
interface AnomalyDetectionOverviewProps extends RouteComponentProps {
6969
dataSourceEnabled: boolean;
@@ -125,7 +125,6 @@ export function AnomalyDetectionOverview(props: AnomalyDetectionOverviewProps) {
125125
if (props.dataSourceEnabled ? MDSOverviewState.selectedDataSourceId : true) {
126126
fetchData();
127127
}
128-
129128
}, [MDSOverviewState]);
130129

131130
// fetch smaple detectors and sample indices

public/pages/main/Main.tsx

+2-5
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export function Main(props: MainProps) {
5959
};
6060
const dashboardHref = dataSourceId ? `#${APP_PATH.DASHBOARD}?dataSourceId=${dataSourceId}` : `#${APP_PATH.DASHBOARD}`;
6161
const overviewHref = dataSourceId ? `#${APP_PATH.OVERVIEW}?dataSourceId=${dataSourceId}` : `#${APP_PATH.OVERVIEW}`;
62-
62+
6363
const sideNav = [
6464
{
6565
name: Navigation.AnomalyDetection,
@@ -176,10 +176,7 @@ export function Main(props: MainProps) {
176176
/>
177177
)
178178
}
179-
/>
180-
181-
182-
179+
/>
183180
</Switch>
184181
</EuiPageBody>
185182
</EuiPage>

public/pages/utils/constants.ts

-12
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@ export const GET_ALL_DETECTORS_QUERY_PARAMS = {
6565
sortField: 'name',
6666
};
6767

68-
69-
export const getSampleDetectorsQueryParamsWithDataSouceId = (dataSourceId: string) => (
70-
{
71-
from: 0,
72-
search: 'sample',
73-
indices: '',
74-
size: MAX_DETECTORS,
75-
sortDirection: SORT_DIRECTION.ASC,
76-
sortField: 'name',
77-
dataSourceId: dataSourceId,
78-
});
79-
8068
export const GET_SAMPLE_DETECTORS_QUERY_PARAMS = {
8169
from: 0,
8270
search: 'sample',

public/pages/utils/helpers.ts

+12-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* GitHub history for details.
1010
*/
1111

12-
import { CatIndex, IndexAlias, MDSQueryParams } from '../../../server/models/types';
12+
import { CatIndex, IndexAlias } from '../../../server/models/types';
1313
import sortBy from 'lodash/sortBy';
1414
import { DetectorListItem } from '../../models/interfaces';
1515
import { SORT_DIRECTION } from '../../../server/utils/constants';
@@ -128,3 +128,14 @@ export const getAllDetectorsQueryParamsWithDataSourceId = (
128128
sortField: 'name',
129129
dataSourceId: dataSourceId,
130130
});
131+
132+
export const getSampleDetectorsQueryParamsWithDataSouceId = (dataSourceId: string) => (
133+
{
134+
from: 0,
135+
search: 'sample',
136+
indices: '',
137+
size: MAX_DETECTORS,
138+
sortDirection: SORT_DIRECTION.ASC,
139+
sortField: 'name',
140+
dataSourceId: dataSourceId,
141+
});

public/redux/reducers/ad.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
import handleActions from '../utils/handleActions';
1919
import { Detector, DetectorListItem } from '../../models/interfaces';
2020
import { AD_NODE_API } from '../../../utils/constants';
21-
import { GetDetectorsQueryParams, MDSQueryParams } from '../../../server/models/types';
21+
import { GetDetectorsQueryParams } from '../../../server/models/types';
2222
import { cloneDeep, get } from 'lodash';
2323
import moment from 'moment';
2424
import { DETECTOR_STATE } from '../../../server/utils/constants';

0 commit comments

Comments
 (0)