From 9b4654c76f6b5f59b1a8c4d037a336f40098f7cc Mon Sep 17 00:00:00 2001
From: Christopher Henn <chris@chrishenn.net>
Date: Thu, 31 May 2018 10:04:53 -0700
Subject: [PATCH] Display message when TagList is empty

Co-authored-by: Andrew Watkins <andrew.watkinz@gmail.com>
Co-authored-by: Chris Henn <chris.henn@influxdata.com>
---
 ui/src/ifql/components/TagList.tsx            | 38 +++++++++++++------
 ui/src/ifql/components/TagValueList.tsx       |  4 +-
 ui/src/ifql/components/TagValueListItem.tsx   | 26 +++++++------
 .../time-machine/ifql-explorer.scss           |  7 +++-
 4 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/ui/src/ifql/components/TagList.tsx b/ui/src/ifql/components/TagList.tsx
index 6fabaf3f2f..f0936fbf80 100644
--- a/ui/src/ifql/components/TagList.tsx
+++ b/ui/src/ifql/components/TagList.tsx
@@ -1,4 +1,4 @@
-import React, {PureComponent} from 'react'
+import React, {PureComponent, MouseEvent} from 'react'
 
 import {SchemaFilter, Service} from 'src/types'
 import TagListItem from 'src/ifql/components/TagListItem'
@@ -24,18 +24,32 @@ export default class TagList extends PureComponent<Props, State> {
   public render() {
     const {db, service, tags, filter} = this.props
 
+    if (tags.length) {
+      return (
+        <>
+          {tags.map(t => (
+            <TagListItem
+              key={t}
+              db={db}
+              tagKey={t}
+              service={service}
+              filter={filter}
+            />
+          ))}
+        </>
+      )
+    }
+
     return (
-      <>
-        {tags.map(t => (
-          <TagListItem
-            key={t}
-            db={db}
-            tagKey={t}
-            service={service}
-            filter={filter}
-          />
-        ))}
-      </>
+      <div className="ifql-schema-tree ifql-tree-node">
+        <div className="ifql-schema-item no-hover" onClick={this.handleClick}>
+          <div className="no-results">No more tag keys.</div>
+        </div>
+      </div>
     )
   }
+
+  private handleClick(e: MouseEvent<HTMLDivElement>) {
+    e.stopPropagation()
+  }
 }
diff --git a/ui/src/ifql/components/TagValueList.tsx b/ui/src/ifql/components/TagValueList.tsx
index 63f91eab3b..da18390626 100644
--- a/ui/src/ifql/components/TagValueList.tsx
+++ b/ui/src/ifql/components/TagValueList.tsx
@@ -61,12 +61,12 @@ export default class TagValueList extends PureComponent<Props> {
   }
 
   private get buttonValue(): string | JSX.Element {
-    const {isLoadingMoreValues, loadMoreCount} = this.props
+    const {isLoadingMoreValues, loadMoreCount, tagKey} = this.props
 
     if (isLoadingMoreValues) {
       return <LoadingSpinner />
     }
 
-    return `Load next ${loadMoreCount} values`
+    return `Load next ${loadMoreCount} values for ${tagKey}`
   }
 }
diff --git a/ui/src/ifql/components/TagValueListItem.tsx b/ui/src/ifql/components/TagValueListItem.tsx
index 37407bd9b4..81056dd154 100644
--- a/ui/src/ifql/components/TagValueListItem.tsx
+++ b/ui/src/ifql/components/TagValueListItem.tsx
@@ -48,18 +48,20 @@ class TagValueListItem extends PureComponent<Props, State> {
             {this.isLoading && <LoaderSkeleton />}
             {!this.isLoading && (
               <>
-                <div className="ifql-schema--filter">
-                  <input
-                    className="form-control input-sm"
-                    placeholder={`Filter within ${db}`}
-                    type="text"
-                    spellCheck={false}
-                    autoComplete="off"
-                    value={searchTerm}
-                    onClick={this.handleInputClick}
-                    onChange={this.onSearch}
-                  />
-                </div>
+                {!!this.tags.length && (
+                  <div className="ifql-schema--filter">
+                    <input
+                      className="form-control input-sm"
+                      placeholder={`Filter within ${db}`}
+                      type="text"
+                      spellCheck={false}
+                      autoComplete="off"
+                      value={searchTerm}
+                      onClick={this.handleInputClick}
+                      onChange={this.onSearch}
+                    />
+                  </div>
+                )}
                 <TagList
                   db={db}
                   service={service}
diff --git a/ui/src/style/components/time-machine/ifql-explorer.scss b/ui/src/style/components/time-machine/ifql-explorer.scss
index d117f9928f..f5c5a0ad93 100644
--- a/ui/src/style/components/time-machine/ifql-explorer.scss
+++ b/ui/src/style/components/time-machine/ifql-explorer.scss
@@ -113,7 +113,10 @@ $ifql-tree-line: 2px;
   }
   .increase-values-limit {
     margin-left: 8px;
-    width: 160px;
+    padding: 0 10px;
+  }
+  .no-results {
+    margin-left: 8px;
   }
 }
 
@@ -268,4 +271,4 @@ $ifql-tree-line: 2px;
     -webkit-transform: scale(1.0);
     transform: scale(1.0);
   }
-}
\ No newline at end of file
+}