From dbc5fd597e698206c4bf87ea7ea384027250479f Mon Sep 17 00:00:00 2001
From: Yaliang Wu <ylwu@amazon.com>
Date: Wed, 29 Apr 2020 20:27:46 -0700
Subject: [PATCH] fix detector configuration page style based on UX review
 comments

---
 .../containers/DetectorConfig.tsx             | 34 +++++++++----------
 .../DetectorConfig/containers/Features.tsx    | 33 ++++++++----------
 .../DetectorConfig/containers/MetaData.tsx    |  9 ++---
 .../DetectorDetail.test.tsx.snap              | 13 ++++++-
 4 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/public/pages/DetectorConfig/containers/DetectorConfig.tsx b/public/pages/DetectorConfig/containers/DetectorConfig.tsx
index b7ad44d2..9dd0962c 100644
--- a/public/pages/DetectorConfig/containers/DetectorConfig.tsx
+++ b/public/pages/DetectorConfig/containers/DetectorConfig.tsx
@@ -29,23 +29,21 @@ interface DetectorConfigProps extends RouteComponentProps {
 
 export const DetectorConfig = (props: DetectorConfigProps) => {
   return (
-    <div>
-      <EuiPage>
-        <EuiPageBody>
-          <EuiSpacer size="l" />
-          <MetaData
-            detectorId={props.detectorId}
-            detector={props.detector}
-            onEditDetector={props.onEditDetector}
-          />
-          <EuiSpacer />
-          <Features
-            detectorId={props.detectorId}
-            detector={props.detector}
-            onEditFeatures={props.onEditFeatures}
-          />
-        </EuiPageBody>
-      </EuiPage>
-    </div>
+    <EuiPage style={{ marginTop: '16px', paddingTop: '0px' }}>
+      <EuiPageBody>
+        <EuiSpacer size="l" />
+        <MetaData
+          detectorId={props.detectorId}
+          detector={props.detector}
+          onEditDetector={props.onEditDetector}
+        />
+        <EuiSpacer />
+        <Features
+          detectorId={props.detectorId}
+          detector={props.detector}
+          onEditFeatures={props.onEditFeatures}
+        />
+      </EuiPageBody>
+    </EuiPage>
   );
 };
diff --git a/public/pages/DetectorConfig/containers/Features.tsx b/public/pages/DetectorConfig/containers/Features.tsx
index 35cd10c8..464a2165 100644
--- a/public/pages/DetectorConfig/containers/Features.tsx
+++ b/public/pages/DetectorConfig/containers/Features.tsx
@@ -51,7 +51,7 @@ export class Features extends Component<FeaturesProps, FeaturesState> {
         () => false
       ),
       sortField: 'name',
-      sortDirection: 'desc',
+      sortDirection: 'asc',
     };
   }
 
@@ -175,7 +175,6 @@ export class Features extends Component<FeaturesProps, FeaturesState> {
 
     const getCellProps = () => {
       return {
-        className: 'featureText',
         textOnly: true,
       };
     };
@@ -187,27 +186,25 @@ export class Features extends Component<FeaturesProps, FeaturesState> {
         title={`Features (${featureNum})`}
         titleSize="s"
         subTitle={
-          <EuiText style={{ padding: '0px 10px' }} className="fieldsSubtitle">
-            Specify index fields that you want to find anomalies for by defining
-            features. A detector can discover anomalies across up to 5 features.
-            Once you define the features, you can preview your anomalies from a
-            sample feature output.{' '}
-            <EuiLink
-              href="https://opendistro.github.io/for-elasticsearch-docs/docs/ad/"
-              target="_blank"
-            >
-              Learn more &nbsp;
-              <EuiIcon size="s" type="popout" />
-            </EuiLink>
+          <EuiText className="anomaly-distribution-subtitle">
+            <p>
+              Specify index fields that you want to find anomalies for by
+              defining features. A detector can discover anomalies for up to 5
+              features. Once you define the features, you can preview your
+              anomalies from a sample feature output.{' '}
+              <EuiLink
+                href="https://opendistro.github.io/for-elasticsearch-docs/docs/ad/"
+                target="_blank"
+              >
+                Learn more &nbsp;
+                <EuiIcon size="s" type="popout" />
+              </EuiLink>
+            </p>
           </EuiText>
         }
         actions={[
           <EuiButton onClick={this.props.onEditFeatures}>Edit</EuiButton>,
         ]}
-        panelStyles={{
-          left: '10px',
-          width: '1120px',
-        }}
       >
         {featureNum == 0 ? (
           <EuiEmptyPrompt
diff --git a/public/pages/DetectorConfig/containers/MetaData.tsx b/public/pages/DetectorConfig/containers/MetaData.tsx
index cfb9211f..9f2bdf80 100644
--- a/public/pages/DetectorConfig/containers/MetaData.tsx
+++ b/public/pages/DetectorConfig/containers/MetaData.tsx
@@ -35,8 +35,7 @@ import {
 import React, { Component, FunctionComponent } from 'react';
 import { displayText } from '../../createDetector/components/DataFilters/utils/helpers';
 import { CodeModal } from '../components/CodeModal/CodeModal';
-import { renderTime } from '../../DetectorResults/utils/tableUtils';
-import { render } from 'enzyme';
+import moment from 'moment';
 
 interface MetaDataProps {
   detectorId: string;
@@ -73,7 +72,7 @@ export function toString(obj: any): string {
       return period.interval + ' ' + period.unit;
     } else if (typeof obj == 'number') {
       // epoch
-      return renderTime(obj);
+      return moment(obj).format('MM/DD/YY hh:mm A');
     }
   }
   return '-';
@@ -189,10 +188,6 @@ export const MetaData = (props: MetaDataProps) => {
       title="Detector configuration"
       titleSize="s"
       actions={[<EuiButton onClick={props.onEditDetector}>Edit</EuiButton>]}
-      panelStyles={{
-        left: '10px',
-        width: '1120px',
-      }}
     >
       <EuiFlexGrid columns={4} gutterSize="l" style={{ border: 'none' }}>
         <EuiFlexItem>
diff --git a/public/pages/DetectorDetail/containers/__tests__/__snapshots__/DetectorDetail.test.tsx.snap b/public/pages/DetectorDetail/containers/__tests__/__snapshots__/DetectorDetail.test.tsx.snap
index 1a05cffd..effaac75 100644
--- a/public/pages/DetectorDetail/containers/__tests__/__snapshots__/DetectorDetail.test.tsx.snap
+++ b/public/pages/DetectorDetail/containers/__tests__/__snapshots__/DetectorDetail.test.tsx.snap
@@ -159,6 +159,17 @@ exports[`<DetectorDetail /> spec detector detail renders detector detail compone
       </div>
     </div>
   </div>
-  <div />
+  <div
+    class="euiPage"
+    style="margin-top: 16px; padding-top: 0px;"
+  >
+    <div
+      class="euiPageBody"
+    >
+      <div
+        class="euiSpacer euiSpacer--l"
+      />
+    </div>
+  </div>
 </div>
 `;