cleanup

Signed-off-by: Jackie Han <jkhanjob@gmail.com>

Author: jackiehanyang

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

@@ -32,7 +32,6 @@ import { DetectorDefinitionFormikValues } from '../../models/interfaces';
 import { ModelConfigurationFormikValues } from '../../../ConfigureModel/models/interfaces';
 import { INITIAL_MODEL_CONFIGURATION_VALUES } from '../../../ConfigureModel/utils/constants';
 import { FILTER_TYPES } from '../../../../models/interfaces';
-import { getNotifications, getSavedObjectsClient } from '../../../../services';
 
 interface DataSourceProps {
   formikProps: FormikProps<DetectorDefinitionFormikValues>;
@@ -45,13 +44,6 @@ interface DataSourceProps {
 }
 
 export function DataSource(props: DataSourceProps) {
-  const [selectedDataSource, setSelectedDataSource] = useState<string>();
-
-  const onSelectedDataSource = (e) => {
-    const dataConnectionId = e[0] ? e[0].id : undefined;
-    setSelectedDataSource(dataConnectionId);
-    console.log(dataConnectionId);
-  }
   const dispatch = useDispatch();
   const [indexName, setIndexName] = useState<string>(
     props.formikProps.values.index[0]?.label
@@ -103,7 +95,6 @@ export function DataSource(props: DataSourceProps) {
 
   return (
     <ContentPanel title="Data Source" titleSize="s">
-      
       {props.isEdit && isDifferentIndex() ? (
         <div>
           <EuiCallOut
@@ -115,11 +106,9 @@ export function DataSource(props: DataSourceProps) {
           <EuiSpacer />
         </div>
       ) : null}
-      
       <Field name="index" validate={validateIndex}>
         {({ field, form }: FieldProps) => {
           return (
-            
             <FormattedFormRow
               title="Index"
               hint="Choose an index or index pattern as the data source."
@@ -178,4 +167,4 @@ export function DataSource(props: DataSourceProps) {
       />
     </ContentPanel>
   );
-}
+}

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

@@ -16,23 +16,11 @@ import ContentPanel from '../../../../components/ContentPanel/ContentPanel';
 import { getError, isInvalid } from '../../../../utils/utils';
 import { validateDetectorDesc } from './utils/validation';
 import { FormattedFormRow } from '../../../../components/FormattedFormRow/FormattedFormRow';
-import { useState } from 'react';
-import { getNotifications, getSavedObjectsClient } from '../../../../services';
-import { ClusterSelector } from '../../../../../../../src/plugins/data_source_management/public';
 
 interface NameAndDescriptionProps {
   onValidateDetectorName: (detectorName: string) => Promise<any>;
 }
-
-
 function NameAndDescription(props: NameAndDescriptionProps) {
-  const [selectedDataSource, setSelectedDataSource] = useState<string>();
-
-  const onSelectedDataSource = (e) => {
-    const dataConnectionId = e[0] ? e[0].id : undefined;
-    setSelectedDataSource(dataConnectionId);
-    console.log(dataConnectionId);
-  }
   return (
     <ContentPanel title="Detector details" titleSize="s">
       <Field name="name" validate={props.onValidateDetectorName}>
@@ -56,7 +44,6 @@ function NameAndDescription(props: NameAndDescriptionProps) {
           </FormattedFormRow>
         )}
       </Field>
-     
       <Field name="description" validate={validateDetectorDesc}>
         {({ field, form }: FieldProps) => (
           <FormattedFormRow
@@ -85,4 +72,4 @@ function NameAndDescription(props: NameAndDescriptionProps) {
   );
 }
 
-export default NameAndDescription;
+export default NameAndDescription;

public/pages/DefineDetector/containers/DefineDetector.tsx

@@ -249,12 +249,10 @@ export const DefineDetector = (props: DefineDetectorProps) => {
                 </EuiPageHeaderSection>
               </EuiPageHeader>
               <Fragment>
-                
                 <NameAndDescription
                   onValidateDetectorName={handleValidateName}
                 />
                 <EuiSpacer />
-              
                 <DataSource
                   formikProps={formikProps}
                   origIndex={

public/pages/DetectorDetail/containers/DetectorDetail.tsx

@@ -1,4 +1,3 @@
-
 /*
  * SPDX-License-Identifier: Apache-2.0
  *

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

@@ -35,7 +35,6 @@ interface ListFiltersProps {
   onPageClick: (pageNumber: number) => void;
 }
 export const ListFilters = (props: ListFiltersProps) => (
-  
   <EuiFlexGroup gutterSize="s">
     <EuiFlexItem grow={false} style={{ width: '40%' }}>
       <EuiFieldSearch
@@ -63,7 +62,6 @@ export const ListFilters = (props: ListFiltersProps) => (
         fullWidth={true}
       />
     </EuiFlexItem>
-    
     <EuiFlexItem>
       <EuiComboBox
         id="selectedIndices"
@@ -82,8 +80,6 @@ export const ListFilters = (props: ListFiltersProps) => (
         fullWidth={true}
       />
     </EuiFlexItem>
-  
-
     {props.pageCount > 1 ? (
       <EuiFlexItem grow={false} style={{ justifyContent: 'center' }}>
         <EuiPagination

public/pages/Overview/containers/AnomalyDetectionOverview.tsx

@@ -32,7 +32,6 @@ import {
 import { SAMPLE_TYPE } from '../../../../server/utils/constants';
 import {
   GET_SAMPLE_INDICES_QUERY,
-  getSampleDetectorsQueryParamsWithDataSouceId,
 } from '../../utils/constants';
 import { AppState } from '../../../redux/reducers';
 import { getDetectorList } from '../../../redux/reducers/ad';
@@ -64,6 +63,7 @@ import { MDSQueryParams } from 'server/models/types';
 import { RouteComponentProps } from 'react-router-dom';
 import queryString from 'querystring';
 import { getURLQueryParams } from '../../../../public/pages/DetectorsList/utils/helpers';
+import { getSampleDetectorsQueryParamsWithDataSouceId } from '../../../../public/pages/utils/helpers';
 
 interface AnomalyDetectionOverviewProps extends RouteComponentProps {
   dataSourceEnabled: boolean;
@@ -125,7 +125,6 @@ export function AnomalyDetectionOverview(props: AnomalyDetectionOverviewProps) {
     if (props.dataSourceEnabled ? MDSOverviewState.selectedDataSourceId : true) {
       fetchData();
     }
-
   }, [MDSOverviewState]);
 
   // fetch smaple detectors and sample indices

public/pages/main/Main.tsx

@@ -59,7 +59,7 @@ export function Main(props: MainProps) {
   };
   const dashboardHref = dataSourceId ? `#${APP_PATH.DASHBOARD}?dataSourceId=${dataSourceId}` : `#${APP_PATH.DASHBOARD}`;
   const overviewHref = dataSourceId ? `#${APP_PATH.OVERVIEW}?dataSourceId=${dataSourceId}` : `#${APP_PATH.OVERVIEW}`;
-  
+
   const sideNav = [
     {
       name: Navigation.AnomalyDetection,
@@ -176,10 +176,7 @@ export function Main(props: MainProps) {
                       />
                     )
                   }
-                />        
-
-
-                  
+                />
               </Switch>
             </EuiPageBody>
           </EuiPage>

public/pages/utils/constants.ts

@@ -65,18 +65,6 @@ export const GET_ALL_DETECTORS_QUERY_PARAMS = {
   sortField: 'name',
 };
 
-
-export const getSampleDetectorsQueryParamsWithDataSouceId = (dataSourceId: string) => (
-  {
-  from: 0,
-  search: 'sample',
-  indices: '',
-  size: MAX_DETECTORS,
-  sortDirection: SORT_DIRECTION.ASC,
-  sortField: 'name',
-  dataSourceId: dataSourceId,
-});
-
 export const GET_SAMPLE_DETECTORS_QUERY_PARAMS = {
   from: 0,
   search: 'sample',

public/pages/utils/helpers.ts

@@ -9,7 +9,7 @@
  * GitHub history for details.
  */
 
-import { CatIndex, IndexAlias, MDSQueryParams } from '../../../server/models/types';
+import { CatIndex, IndexAlias } from '../../../server/models/types';
 import sortBy from 'lodash/sortBy';
 import { DetectorListItem } from '../../models/interfaces';
 import { SORT_DIRECTION } from '../../../server/utils/constants';
@@ -128,3 +128,14 @@ export const getAllDetectorsQueryParamsWithDataSourceId = (
   sortField: 'name',
   dataSourceId: dataSourceId,
 });
+
+export const getSampleDetectorsQueryParamsWithDataSouceId = (dataSourceId: string) => (
+  {
+  from: 0,
+  search: 'sample',
+  indices: '',
+  size: MAX_DETECTORS,
+  sortDirection: SORT_DIRECTION.ASC,
+  sortField: 'name',
+  dataSourceId: dataSourceId,
+});

public/redux/reducers/ad.ts

@@ -18,7 +18,7 @@ import {
 import handleActions from '../utils/handleActions';
 import { Detector, DetectorListItem } from '../../models/interfaces';
 import { AD_NODE_API } from '../../../utils/constants';
-import { GetDetectorsQueryParams, MDSQueryParams } from '../../../server/models/types';
+import { GetDetectorsQueryParams } from '../../../server/models/types';
 import { cloneDeep, get } from 'lodash';
 import moment from 'moment';
 import { DETECTOR_STATE } from '../../../server/utils/constants';