From 74e48370740f9f6c605f58e00546e413a15fdcb2 Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Thu, 24 May 2018 15:34:53 -0700
Subject: [PATCH] Condense page header

---
 ui/src/logs/components/LogViewerHeader.tsx   | 44 ++++++++++++--------
 ui/src/logs/components/TimeRangeDropdown.tsx | 23 +++++++---
 ui/src/logs/containers/LogsPage.tsx          |  9 +---
 3 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/ui/src/logs/components/LogViewerHeader.tsx b/ui/src/logs/components/LogViewerHeader.tsx
index 33c72ef205..4ab7f5ebe9 100644
--- a/ui/src/logs/components/LogViewerHeader.tsx
+++ b/ui/src/logs/components/LogViewerHeader.tsx
@@ -26,24 +26,32 @@ class LogViewerHeader extends PureComponent<Props> {
   public render(): JSX.Element {
     const {timeRange} = this.props
     return (
-      <>
-        <Dropdown
-          className="dropdown-300"
-          items={this.sourceDropDownItems}
-          selected={this.selectedSource}
-          onChoose={this.handleChooseSource}
-        />
-        <Dropdown
-          className="dropdown-300"
-          items={this.namespaceDropDownItems}
-          selected={this.selectedNamespace}
-          onChoose={this.handleChooseNamespace}
-        />
-        <TimeRangeDropdown
-          onChooseTimeRange={this.handleChooseTimeRange}
-          selected={timeRange}
-        />
-      </>
+      <div className="page-header full-width">
+        <div className="page-header__container">
+          <div className="page-header__left">
+            <h1 className="page-header__title">Log Viewer</h1>
+          </div>
+          <div className="page-header__right">
+            <Dropdown
+              className="dropdown-300"
+              items={this.sourceDropDownItems}
+              selected={this.selectedSource}
+              onChoose={this.handleChooseSource}
+            />
+            <Dropdown
+              className="dropdown-180"
+              iconName="disks"
+              items={this.namespaceDropDownItems}
+              selected={this.selectedNamespace}
+              onChoose={this.handleChooseNamespace}
+            />
+            <TimeRangeDropdown
+              onChooseTimeRange={this.handleChooseTimeRange}
+              selected={timeRange}
+            />
+          </div>
+        </div>
+      </div>
     )
   }
 
diff --git a/ui/src/logs/components/TimeRangeDropdown.tsx b/ui/src/logs/components/TimeRangeDropdown.tsx
index 7aa1b27d87..2d85f41da9 100644
--- a/ui/src/logs/components/TimeRangeDropdown.tsx
+++ b/ui/src/logs/components/TimeRangeDropdown.tsx
@@ -56,16 +56,12 @@ class TimeRangeDropdown extends Component<Props, State> {
 
   public render() {
     const {selected, preventCustomTimeRange, page} = this.props
-    const {customTimeRange, isCustomTimeRangeOpen, isOpen} = this.state
+    const {customTimeRange, isCustomTimeRangeOpen} = this.state
 
     return (
       <ClickOutside onClickOutside={this.handleClickOutside}>
         <div className="time-range-dropdown">
-          <div
-            className={classnames('dropdown dropdown-290', {
-              open: isOpen,
-            })}
-          >
+          <div className={this.dropdownClassName}>
             <div
               className="btn btn-sm btn-default dropdown-toggle"
               onClick={this.toggleMenu}
@@ -132,6 +128,21 @@ class TimeRangeDropdown extends Component<Props, State> {
     )
   }
 
+  private get dropdownClassName(): string {
+    const {
+      isOpen,
+      customTimeRange: {lower, upper},
+    } = this.state
+
+    const absoluteTimeRange = !!lower || !!upper
+
+    return classnames('dropdown', {
+      'dropdown-290': absoluteTimeRange,
+      'dropdown-120': !absoluteTimeRange,
+      open: isOpen,
+    })
+  }
+
   private findTimeRangeInputValue = ({upper, lower}: TimeRange) => {
     if (upper && lower) {
       if (upper === 'now()') {
diff --git a/ui/src/logs/containers/LogsPage.tsx b/ui/src/logs/containers/LogsPage.tsx
index b48a1843b6..fcba7a54cb 100644
--- a/ui/src/logs/containers/LogsPage.tsx
+++ b/ui/src/logs/containers/LogsPage.tsx
@@ -33,14 +33,7 @@ class LogsPage extends PureComponent<Props> {
   public render() {
     return (
       <div className="page">
-        <div className="page-header full-width">
-          <div className="page-header__container">
-            <div className="page-header__left">
-              <h1 className="page-header__title">Log Viewer</h1>
-            </div>
-            <div className="page-header__right">{this.header}</div>
-          </div>
-        </div>
+        {this.header}
         <div className="page-contents logs-viewer">
           <GraphContainer thing="wooo" />
           <TableContainer thing="snooo" />