From f68d989d846d2197ba9ae25e92abbc02540ea988 Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Thu, 12 Nov 2020 18:45:11 +0000
Subject: [PATCH] ui: Upstream Instance Search and Sort (#9172)

* ui: Add predicate, comparator and necessary files for the search/sort

* Implement search and sort for upstream instance list

* ui: Tweak CSS so its all part of the component

* Remove the old proxy test attribute
---
 .../consul/upstream-instance/list/index.hbs   | 116 ++++++++++--------
 .../consul/upstream-instance/list/index.js    |  24 ++++
 .../consul/upstream-instance/list/index.scss  |  18 ++-
 .../upstream-instance/list/pageobject.js      |  11 ++
 .../upstream-instance/search-bar/index.hbs    |  41 +++++++
 .../dc/services/instance/upstreams.js         |  11 ++
 .../routes/dc/services/instance/upstreams.js  |   8 ++
 .../search/predicates/upstream-instance.js    |  12 ++
 ui/packages/consul-ui/app/services/search.js  |   3 +
 ui/packages/consul-ui/app/services/sort.js    |   2 +
 .../app/sort/comparators/upstream-instance.js |   7 ++
 .../consul-ui/app/styles/components.scss      |   2 +
 .../app/styles/components/composite-row.scss  |   4 +-
 .../dc/services/instance/upstreams.hbs        |  32 ++++-
 ui/packages/consul-ui/tests/pages.js          |   6 +-
 .../tests/pages/dc/services/instance.js       |   7 +-
 16 files changed, 239 insertions(+), 65 deletions(-)
 create mode 100644 ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.js
 create mode 100644 ui/packages/consul-ui/app/components/consul/upstream-instance/list/pageobject.js
 create mode 100644 ui/packages/consul-ui/app/components/consul/upstream-instance/search-bar/index.hbs
 create mode 100644 ui/packages/consul-ui/app/controllers/dc/services/instance/upstreams.js
 create mode 100644 ui/packages/consul-ui/app/search/predicates/upstream-instance.js
 create mode 100644 ui/packages/consul-ui/app/sort/comparators/upstream-instance.js

diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs
index 0b90b4312..cf5a08726 100644
--- a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.hbs
@@ -1,52 +1,66 @@
-<ul data-test-proxy-upstreams class="consul-upstream-instance-list">
-{{#each @items as |item|}}
-  <li>
-    <div class="header">
-      <p data-test-destination-name>
-        {{item.DestinationName}}
-      </p>
-    </div>
-    <div class="detail">
-  {{#if (env 'CONSUL_NSPACES_ENABLED')}}
-    {{#if (not-eq item.DestinationType 'prepared_query')}}
-      <dl class="nspace">
-        <dt>
-          <Tooltip>
-            Namespace
-          </Tooltip>
-        </dt>
-        <dd>
-          {{or item.DestinationNamespace 'default'}}
-        </dd>
-      </dl>
-    {{/if}}
+<div
+  class="consul-upstream-instance-list"
+  ...attributes
+>
+  {{#if (gt this.items.length 0)}}
+    <ul>
+    {{#each this.items as |item|}}
+      <li>
+        <div class="header">
+          <p>
+            {{item.DestinationName}}
+          </p>
+        </div>
+        <div class="detail">
+      {{#if (env 'CONSUL_NSPACES_ENABLED')}}
+        {{#if (not-eq item.DestinationType 'prepared_query')}}
+          <dl class="nspace">
+            <dt>
+              <Tooltip>
+                Namespace
+              </Tooltip>
+            </dt>
+            <dd>
+              {{or item.DestinationNamespace 'default'}}
+            </dd>
+          </dl>
+        {{/if}}
+      {{/if}}
+        {{#if (and (not-eq item.Datacenter @dc) (not-eq item.Datacenter ""))}}
+          <dl class="datacenter">
+            <dt>
+              <Tooltip>
+                Datacenter
+              </Tooltip>
+            </dt>
+            <dd>
+              {{item.Datacenter}}
+            </dd>
+          </dl>
+        {{/if}}
+        {{#if (gt item.LocalBindPort 0)}}
+{{#let (concat (or item.LocalBindAddress '127.0.0.1') ':' item.LocalBindPort) as |combinedAddress|}}
+          <dl class="local-bind-address">
+            <dt>
+              <span>
+                Address
+              </span>
+            </dt>
+            <dd>
+              <CopyButton
+                @value={{combinedAddress}}
+                @name="Address"
+              />
+                {{combinedAddress}}
+            </dd>
+          </dl>
+{{/let}}
+        {{/if}}
+        </div>
+      </li>
+    {{/each}}
+    </ul>
+  {{else}}
+    {{yield api to="empty"}}
   {{/if}}
-    {{#if (and (not-eq item.Datacenter @dc) (not-eq item.Datacenter ""))}}
-      <dl class="datacenter">
-        <dt>
-          <Tooltip>
-            Datacenter
-          </Tooltip>
-        </dt>
-        <dd>
-          {{item.Datacenter}}
-        </dd>
-      </dl>
-    {{/if}}
-    {{#if (gt item.LocalBindPort 0)}}
-    {{#let (concat (or item.LocalBindAddress '127.0.0.1') ':' item.LocalBindPort) as |combinedAddress|}}
-      <span>
-        <CopyButton
-          @value={{combinedAddress}}
-          @name="Address"
-        />
-        <span>
-          {{combinedAddress}}
-        </span>
-      </span>
-    {{/let}}
-    {{/if}}
-    </div>
-  </li>
-{{/each}}
-</ul>
+</div>
diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.js b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.js
new file mode 100644
index 000000000..a02657584
--- /dev/null
+++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.js
@@ -0,0 +1,24 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { sort } from '@ember/object/computed';
+
+export default class ConsulUpstreamInstanceList extends Component {
+  @service('sort') sort;
+  @service('search') search;
+
+  @sort('searched', 'comparator') sorted;
+
+  get items() {
+    return this.sorted;
+  }
+  get searched() {
+    if (typeof this.args.search === 'undefined') {
+      return this.args.items;
+    }
+    const predicate = this.search.predicate('upstream-instance');
+    return this.args.items.filter(predicate(this.args.search));
+  }
+  get comparator() {
+    return this.sort.comparator('upstream-instance')(this.args.sort);
+  }
+}
diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss
index 983f72b9c..ea1017138 100644
--- a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss
+++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/index.scss
@@ -1,6 +1,14 @@
-.consul-upstream-instance-list > li {
-  @extend %composite-row;
+.consul-upstream-instance-list {
+  li {
+    @extend %composite-row;
+  }
+  dl {
+    @extend %icon-definition;
+  }
+  dl.datacenter dt::before {
+    @extend %with-user-organization-mask, %as-pseudo;
+  }
+  dl.nspace dt::before {
+    @extend %with-folder-outline-mask, %as-pseudo;
+  }
 }
-.consul-upstream-instance-list > ul {
-  border-top: 1px solid $gray-200;
-}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/list/pageobject.js b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/pageobject.js
new file mode 100644
index 000000000..552200a39
--- /dev/null
+++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/list/pageobject.js
@@ -0,0 +1,11 @@
+export default (collection, text) => (scope = '.consul-upstream-instance-list') => {
+  return {
+    scope,
+    item: collection('li', {
+      name: text('.header p'),
+      nspace: text('.nspace dd'),
+      datacenter: text('.datacenter dd'),
+      localAddress: text('.local-address dd'),
+    }),
+  };
+};
diff --git a/ui/packages/consul-ui/app/components/consul/upstream-instance/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/upstream-instance/search-bar/index.hbs
new file mode 100644
index 000000000..fee027149
--- /dev/null
+++ b/ui/packages/consul-ui/app/components/consul/upstream-instance/search-bar/index.hbs
@@ -0,0 +1,41 @@
+<form
+  class="consul-upstream-instance-search-bar filter-bar"
+  ...attributes
+>
+  <FreetextFilter
+    @onsearch={{action @onsearch}}
+    @value={{@search}}
+    @placeholder="Search"
+  />
+  <div class="sort">
+{{#let (or @sort 'DestinationName:asc') as |sort|}}
+    <PopoverSelect
+      class="type-sort"
+      data-test-sort-control
+      @position="right"
+      @onchange={{action @onsort}}
+      @multiple={{false}}
+    as |components|>
+      <BlockSlot @name="selected">
+        <span>
+          {{#let (from-entries (array
+              (array "DestinationName:asc" "A to Z")
+              (array "DestinationName:desc" "Z to A")
+            ))
+          as |selectable|}}
+            {{get selectable sort}}
+          {{/let}}
+        </span>
+      </BlockSlot>
+      <BlockSlot @name="options">
+{{#let components.Optgroup components.Option as |Optgroup Option|}}
+        <Optgroup @label="Service Name">
+          <Option @value="DestinationName:asc" @selected={{eq "DestinationName:asc" sort}}>A to Z</Option>
+          <Option @value="DestinationName:desc" @selected={{eq "DestinationName:desc" sort}}>Z to A</Option>
+        </Optgroup>
+{{/let}}
+      </BlockSlot>
+    </PopoverSelect>
+{{/let}}
+  </div>
+</form>
diff --git a/ui/packages/consul-ui/app/controllers/dc/services/instance/upstreams.js b/ui/packages/consul-ui/app/controllers/dc/services/instance/upstreams.js
new file mode 100644
index 000000000..ecb092564
--- /dev/null
+++ b/ui/packages/consul-ui/app/controllers/dc/services/instance/upstreams.js
@@ -0,0 +1,11 @@
+import Controller from '@ember/controller';
+
+export default class DcServicesInstanceUpstreamsController extends Controller {
+  queryParams = {
+    sortBy: 'sort',
+    search: {
+      as: 'filter',
+      replace: true,
+    },
+  };
+}
diff --git a/ui/packages/consul-ui/app/routes/dc/services/instance/upstreams.js b/ui/packages/consul-ui/app/routes/dc/services/instance/upstreams.js
index babaa3071..7dece4286 100644
--- a/ui/packages/consul-ui/app/routes/dc/services/instance/upstreams.js
+++ b/ui/packages/consul-ui/app/routes/dc/services/instance/upstreams.js
@@ -1,6 +1,14 @@
 import Route from 'consul-ui/routing/route';
 
 export default class UpstreamsRoute extends Route {
+  queryParams = {
+    sortBy: 'sort',
+    search: {
+      as: 'filter',
+      replace: true,
+    },
+  };
+
   model() {
     const parent = this.routeName
       .split('.')
diff --git a/ui/packages/consul-ui/app/search/predicates/upstream-instance.js b/ui/packages/consul-ui/app/search/predicates/upstream-instance.js
new file mode 100644
index 000000000..2d1a993df
--- /dev/null
+++ b/ui/packages/consul-ui/app/search/predicates/upstream-instance.js
@@ -0,0 +1,12 @@
+export default () => term => item => {
+  const lowerTerm = term.toLowerCase();
+  return Object.entries(item)
+    .filter(([key, value]) => key !== 'DestinationType')
+    .some(
+      ([key, value]) =>
+        value
+          .toString()
+          .toLowerCase()
+          .indexOf(lowerTerm) !== -1
+    );
+};
diff --git a/ui/packages/consul-ui/app/services/search.js b/ui/packages/consul-ui/app/services/search.js
index 1f807725b..78f236b72 100644
--- a/ui/packages/consul-ui/app/services/search.js
+++ b/ui/packages/consul-ui/app/services/search.js
@@ -1,6 +1,8 @@
 import Service from '@ember/service';
 
 import intention from 'consul-ui/search/predicates/intention';
+import upstreamInstance from 'consul-ui/search/predicates/upstream-instance';
+
 import token from 'consul-ui/search/filters/token';
 import policy from 'consul-ui/search/filters/policy';
 import role from 'consul-ui/search/filters/role';
@@ -29,6 +31,7 @@ const searchables = {
 };
 const predicates = {
   intention: intention(),
+  ['upstream-instance']: upstreamInstance(),
 };
 export default class SearchService extends Service {
   searchable(name) {
diff --git a/ui/packages/consul-ui/app/services/sort.js b/ui/packages/consul-ui/app/services/sort.js
index c18cff2a9..eed4eb05d 100644
--- a/ui/packages/consul-ui/app/services/sort.js
+++ b/ui/packages/consul-ui/app/services/sort.js
@@ -1,6 +1,7 @@
 import Service from '@ember/service';
 import service from 'consul-ui/sort/comparators/service';
 import serviceInstance from 'consul-ui/sort/comparators/service-instance';
+import upstreamInstance from 'consul-ui/sort/comparators/upstream-instance';
 import kv from 'consul-ui/sort/comparators/kv';
 import check from 'consul-ui/sort/comparators/check';
 import intention from 'consul-ui/sort/comparators/intention';
@@ -13,6 +14,7 @@ import node from 'consul-ui/sort/comparators/node';
 const comparators = {
   service: service(),
   serviceInstance: serviceInstance(),
+  ['upstream-instance']: upstreamInstance(),
   kv: kv(),
   check: check(),
   intention: intention(),
diff --git a/ui/packages/consul-ui/app/sort/comparators/upstream-instance.js b/ui/packages/consul-ui/app/sort/comparators/upstream-instance.js
new file mode 100644
index 000000000..560d8a57a
--- /dev/null
+++ b/ui/packages/consul-ui/app/sort/comparators/upstream-instance.js
@@ -0,0 +1,7 @@
+const directionify = arr => {
+  return arr.reduce((prev, item) => prev.concat([`${item}:asc`, `${item}:desc`]), []);
+};
+export default () => key => {
+  const comparables = directionify(['DestinationName']);
+  return [comparables.find(item => item === key) || comparables[0]];
+};
diff --git a/ui/packages/consul-ui/app/styles/components.scss b/ui/packages/consul-ui/app/styles/components.scss
index c91c69bfe..b25af87ff 100644
--- a/ui/packages/consul-ui/app/styles/components.scss
+++ b/ui/packages/consul-ui/app/styles/components.scss
@@ -56,10 +56,12 @@
 @import 'consul-ui/components/modal-dialog';
 
 @import 'consul-ui/components/consul/discovery-chain';
+@import 'consul-ui/components/consul/upstream-instance/list';
 @import 'consul-ui/components/consul/exposed-path/list';
 @import 'consul-ui/components/consul/external-source';
 @import 'consul-ui/components/consul/kind';
 @import 'consul-ui/components/consul/intention';
+
 @import 'consul-ui/components/role-selector';
 @import 'consul-ui/components/topology-metrics';
 @import 'consul-ui/components/topology-metrics/popover';
diff --git a/ui/packages/consul-ui/app/styles/components/composite-row.scss b/ui/packages/consul-ui/app/styles/components/composite-row.scss
index ab929c61c..56c5263fd 100644
--- a/ui/packages/consul-ui/app/styles/components/composite-row.scss
+++ b/ui/packages/consul-ui/app/styles/components/composite-row.scss
@@ -1,6 +1,5 @@
 @import './composite-row/index';
 
-.consul-upstream-instance-list > li,
 .list-collection > ul > li:not(:first-child) {
   @extend %composite-row;
 }
@@ -33,8 +32,7 @@
 .consul-service-instance-list .detail {
   overflow-x: visible !important;
 }
-.consul-intention-permission-list > ul,
-.consul-upstream-instance-list > ul {
+.consul-intention-permission-list > ul {
   border-top: 1px solid $gray-200;
 }
 .consul-service-instance-list .port dt,
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
index df4f8f78b..3708b3f22 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/upstreams.hbs
@@ -1,7 +1,37 @@
 <div class="tab-section">
   <div role="tabpanel">
+{{#let (or sortBy "DestinationName:asc") as |sort|}}
   {{#if (gt proxy.Service.Proxy.Upstreams.length 0)}}
-    <Consul::UpstreamInstance::List @items={{proxy.Service.Proxy.Upstreams}} @dc={{dc}} @nspace={{nspace}} />
+    <input type="checkbox" id="toolbar-toggle" />
+    <Consul::UpstreamInstance::SearchBar
+      @search={{search}}
+      @onsearch={{action (mut search) value="target.value"}}
+
+      @sort={{sort}}
+      @onsort={{action (mut sortBy) value="target.selected"}}
+    />
+    <Consul::UpstreamInstance::List
+      @search={{search}}
+      @sort={{sort}}
+      @items={{proxy.Service.Proxy.Upstreams}}
+      @dc={{dc}}
+      @nspace={{nspace}}
+    >
+      <:empty>
+        <EmptyState>
+          <BlockSlot @name="body">
+            <p>
+              {{#if search.length}}
+                No upstreams where found matching that search.
+              {{else}}
+                This service has no upstreams.
+              {{/if}}
+            </p>
+          </BlockSlot>
+        </EmptyState>
+      </:empty>
+    </Consul::UpstreamInstance::List>
   {{/if}}
+{{/let}}
   </div>
 </div>
\ No newline at end of file
diff --git a/ui/packages/consul-ui/tests/pages.js b/ui/packages/consul-ui/tests/pages.js
index f4671f2c5..fda98b6ef 100644
--- a/ui/packages/consul-ui/tests/pages.js
+++ b/ui/packages/consul-ui/tests/pages.js
@@ -40,6 +40,7 @@ import popoverSelectFactory from 'consul-ui/components/popover-select/pageobject
 import morePopoverMenuFactory from 'consul-ui/components/more-popover-menu/pageobject';
 
 import tokenListFactory from 'consul-ui/components/token-list/pageobject';
+import consulUpstreamInstanceListFactory from 'consul-ui/components/consul/upstream-instance/list/pageobject';
 import consulTokenListFactory from 'consul-ui/components/consul/token/list/pageobject';
 import consulRoleListFactory from 'consul-ui/components/consul/role/list/pageobject';
 import consulPolicyListFactory from 'consul-ui/components/consul/policy/list/pageobject';
@@ -94,6 +95,7 @@ const morePopoverMenu = morePopoverMenuFactory(clickable);
 const popoverSelect = popoverSelectFactory(clickable, collection);
 const emptyState = emptyStateFactory(isPresent);
 
+const consulUpstreamInstanceList = consulUpstreamInstanceListFactory(collection, text);
 const consulIntentionList = consulIntentionListFactory(
   collection,
   clickable,
@@ -159,7 +161,9 @@ export default {
   service: create(
     service(visitable, attribute, collection, text, consulIntentionList, catalogToolbar, tabgroup)
   ),
-  instance: create(instance(visitable, attribute, collection, text, tabgroup)),
+  instance: create(
+    instance(visitable, alias, attribute, collection, text, tabgroup, consulUpstreamInstanceList)
+  ),
   nodes: create(nodes(visitable, text, clickable, attribute, collection, popoverSelect)),
   node: create(node(visitable, deletable, clickable, attribute, collection, tabgroup, text)),
   kvs: create(kvs(visitable, creatable, consulKvList)),
diff --git a/ui/packages/consul-ui/tests/pages/dc/services/instance.js b/ui/packages/consul-ui/tests/pages/dc/services/instance.js
index 54c5e1992..33ec95697 100644
--- a/ui/packages/consul-ui/tests/pages/dc/services/instance.js
+++ b/ui/packages/consul-ui/tests/pages/dc/services/instance.js
@@ -1,4 +1,4 @@
-export default function(visitable, attribute, collection, text, tabs) {
+export default function(visitable, alias, attribute, collection, text, tabs, upstreams) {
   return {
     visit: visitable('/:dc/services/:service/instances/:node/:id'),
     externalSource: attribute('data-test-external-source', '[data-test-external-source]', {
@@ -6,9 +6,8 @@ export default function(visitable, attribute, collection, text, tabs) {
     }),
     tabs: tabs('tab', ['health-checks', 'upstreams', 'exposed-paths', 'addresses', 'tags-&-meta']),
     checks: collection('[data-test-checks] li'),
-    upstreams: collection('[data-test-proxy-upstreams] > li', {
-      name: text('[data-test-destination-name]'),
-    }),
+    upstreams: alias('upstreamInstances.item'),
+    upstreamInstances: upstreams(),
     exposedPaths: collection('[data-test-proxy-exposed-paths] > tbody tr', {
       combinedAddress: text('[data-test-combined-address]'),
     }),