From 8067b229e7b4704379931443e772b979023c4a2a Mon Sep 17 00:00:00 2001 From: John Cowen Date: Fri, 13 Nov 2020 15:55:40 +0000 Subject: [PATCH] ui: Search/sort improvements (#9183) --- .../consul/intention/search-bar/index.hbs | 6 +- .../components/consul/nspace/list/index.hbs | 110 +++++++++--------- .../consul/policy/search-bar/index.hbs | 6 +- .../consul/service/search-bar/index.hbs | 14 +-- .../consul/token/search-bar/index.hbs | 8 +- .../app/controllers/dc/acls/policies/index.js | 3 +- .../app/controllers/dc/acls/tokens/index.js | 2 + .../consul-ui/app/controllers/dc/kv/index.js | 1 + .../app/controllers/dc/services/index.js | 3 +- .../dc/services/show/intentions/index.js | 1 + .../app/filter/predicates/intention.js | 18 +-- .../consul-ui/app/filter/predicates/node.js | 18 +-- .../consul-ui/app/filter/predicates/policy.js | 41 +++---- .../app/filter/predicates/service-instance.js | 30 ++--- .../app/filter/predicates/service.js | 94 ++++----------- .../consul-ui/app/filter/predicates/token.js | 31 ++--- .../app/routes/dc/acls/policies/index.js | 5 +- .../app/routes/dc/acls/roles/index.js | 3 +- .../app/routes/dc/acls/tokens/index.js | 9 +- .../app/routes/dc/intentions/index.js | 1 + .../consul-ui/app/routes/dc/kv/index.js | 6 +- .../consul-ui/app/routes/dc/nodes/index.js | 4 +- .../consul-ui/app/routes/dc/nspaces/index.js | 7 +- .../consul-ui/app/routes/dc/services/index.js | 11 +- .../app/routes/dc/services/show/instances.js | 3 + .../dc/services/show/intentions/index.js | 2 + .../app/templates/dc/acls/policies/index.hbs | 4 +- .../app/templates/dc/acls/tokens/index.hbs | 4 +- .../app/templates/dc/nspaces/index.hbs | 60 +++++----- .../app/templates/dc/services/index.hbs | 4 +- .../consul-ui/app/utils/filter/index.js | 56 +++++++++ .../unit/filter/predicates/service-test.js | 12 +- 32 files changed, 287 insertions(+), 290 deletions(-) create mode 100644 ui/packages/consul-ui/app/utils/filter/index.js diff --git a/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.hbs index 0c3e87ddaa..630376dde7 100644 --- a/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/intention/search-bar/index.hbs @@ -1,4 +1,7 @@ -
+ Allow + {{/let}} diff --git a/ui/packages/consul-ui/app/components/consul/nspace/list/index.hbs b/ui/packages/consul-ui/app/components/consul/nspace/list/index.hbs index ad7e9b2385..d5fcc588ed 100644 --- a/ui/packages/consul-ui/app/components/consul/nspace/list/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/nspace/list/index.hbs @@ -1,57 +1,59 @@ {{#if (gt items.length 0)}} - - -{{#if item.DeletedAt}} -

- Deleting {{item.Name}}... -

-{{else}} - {{item.Name}} -{{/if}} - - -
-
Description
-
- {{item.Description}} -
-
- {{#if (env 'CONSUL_ACLS_ENABLED')}} - + + + {{#if item.DeletedAt}} +

+ Deleting {{item.Name}}... +

+ {{else}} + {{item.Name}} {{/if}} - - -{{#if (not item.DeletedAt)}} - - - - Edit - - - {{#if (not-eq item.Name 'default') }} - - - Delete - - - - - Confirm delete - - -

- Are you sure you want to delete this namespace? -

- - - Delete - - - - - {{/if}} - -{{/if}} - - + + +
+
Description
+
+ {{item.Description}} +
+
+ {{#if (env 'CONSUL_ACLS_ENABLED')}} + + {{/if}} + + + {{#if (not item.DeletedAt)}} + + + + Edit + + + {{#if (not-eq item.Name 'default') }} + + + Delete + + + + + Confirm delete + + +

+ Are you sure you want to delete this namespace? +

+ + + Delete + + + + + {{/if}} + + {{/if}} + + +{{else}} + {{yield to="empty"}} {{/if}} \ No newline at end of file diff --git a/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.hbs index 88e3482005..0bddc4fcb9 100644 --- a/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/policy/search-bar/index.hbs @@ -28,7 +28,7 @@ @@ -38,8 +38,8 @@ {{#let components.Optgroup components.Option as |Optgroup Option|}} - - + + {{/let}} diff --git a/ui/packages/consul-ui/app/components/consul/service/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/service/search-bar/index.hbs index d093ed1bcc..79e9066d3f 100644 --- a/ui/packages/consul-ui/app/components/consul/service/search-bar/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/service/search-bar/index.hbs @@ -27,7 +27,7 @@ @@ -37,15 +37,15 @@ {{#let components.Optgroup components.Option as |Optgroup Option|}} - + - - - + + + - - + + {{/let}} diff --git a/ui/packages/consul-ui/app/components/consul/token/search-bar/index.hbs b/ui/packages/consul-ui/app/components/consul/token/search-bar/index.hbs index 87fdfe9201..52618e5402 100644 --- a/ui/packages/consul-ui/app/components/consul/token/search-bar/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/token/search-bar/index.hbs @@ -7,7 +7,7 @@
@@ -17,9 +17,9 @@ {{#let components.Optgroup components.Option as |Optgroup Option|}} - - - + + + {{/let}} diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/policies/index.js b/ui/packages/consul-ui/app/controllers/dc/acls/policies/index.js index 7bdef42018..58e6fef2ba 100644 --- a/ui/packages/consul-ui/app/controllers/dc/acls/policies/index.js +++ b/ui/packages/consul-ui/app/controllers/dc/acls/policies/index.js @@ -1,9 +1,10 @@ import Controller from '@ember/controller'; + export default class IndexController extends Controller { queryParams = { sortBy: 'sort', dc: 'dc', - type: 'type', + kind: 'kind', search: { as: 'filter', replace: true, diff --git a/ui/packages/consul-ui/app/controllers/dc/acls/tokens/index.js b/ui/packages/consul-ui/app/controllers/dc/acls/tokens/index.js index 9913cb8263..e6dbcbeff5 100644 --- a/ui/packages/consul-ui/app/controllers/dc/acls/tokens/index.js +++ b/ui/packages/consul-ui/app/controllers/dc/acls/tokens/index.js @@ -1,7 +1,9 @@ import Controller from '@ember/controller'; + export default class IndexController extends Controller { queryParams = { sortBy: 'sort', + kind: 'kind', search: { as: 'filter', replace: true, diff --git a/ui/packages/consul-ui/app/controllers/dc/kv/index.js b/ui/packages/consul-ui/app/controllers/dc/kv/index.js index 75478cd616..9913cb8263 100644 --- a/ui/packages/consul-ui/app/controllers/dc/kv/index.js +++ b/ui/packages/consul-ui/app/controllers/dc/kv/index.js @@ -1,6 +1,7 @@ import Controller from '@ember/controller'; export default class IndexController extends Controller { queryParams = { + sortBy: 'sort', search: { as: 'filter', replace: true, diff --git a/ui/packages/consul-ui/app/controllers/dc/services/index.js b/ui/packages/consul-ui/app/controllers/dc/services/index.js index aec83dc462..be63cf699f 100644 --- a/ui/packages/consul-ui/app/controllers/dc/services/index.js +++ b/ui/packages/consul-ui/app/controllers/dc/services/index.js @@ -6,9 +6,10 @@ export default class IndexController extends Controller { sortBy: 'sort', status: 'status', source: 'source', - type: 'type', + kind: 'kind', search: { as: 'filter', + replace: true, }, }; diff --git a/ui/packages/consul-ui/app/controllers/dc/services/show/intentions/index.js b/ui/packages/consul-ui/app/controllers/dc/services/show/intentions/index.js index 9913cb8263..49b2a9262b 100644 --- a/ui/packages/consul-ui/app/controllers/dc/services/show/intentions/index.js +++ b/ui/packages/consul-ui/app/controllers/dc/services/show/intentions/index.js @@ -2,6 +2,7 @@ import Controller from '@ember/controller'; export default class IndexController extends Controller { queryParams = { sortBy: 'sort', + access: 'access', search: { as: 'filter', replace: true, diff --git a/ui/packages/consul-ui/app/filter/predicates/intention.js b/ui/packages/consul-ui/app/filter/predicates/intention.js index fd7e7ffce0..2d01570401 100644 --- a/ui/packages/consul-ui/app/filter/predicates/intention.js +++ b/ui/packages/consul-ui/app/filter/predicates/intention.js @@ -1,9 +1,9 @@ -export default () => ({ accesses = [] }) => item => { - if (accesses.length > 0) { - if (accesses.includes(item.Action)) { - return true; - } - return false; - } - return true; -}; +import { andOr } from 'consul-ui/utils/filter'; + +export default andOr({ + accesses: { + allow: (item, value) => item.Action === value, + deny: (item, value) => item.Action === value, + 'app-aware': (item, value) => typeof item.Action === 'undefined', + }, +}); diff --git a/ui/packages/consul-ui/app/filter/predicates/node.js b/ui/packages/consul-ui/app/filter/predicates/node.js index 7effc140a1..0b41f17b41 100644 --- a/ui/packages/consul-ui/app/filter/predicates/node.js +++ b/ui/packages/consul-ui/app/filter/predicates/node.js @@ -1,8 +1,10 @@ -export default () => ({ statuses = [] }) => { - return item => { - if (statuses.length > 0 && !statuses.includes(item.Status)) { - return false; - } - return true; - }; -}; +import setHelpers from 'mnemonist/set'; +import { andOr } from 'consul-ui/utils/filter'; + +export default andOr({ + statuses: { + passing: (item, value) => item.Status === value, + warning: (item, value) => item.Status === value, + critical: (item, value) => item.Status === value, + }, +}); diff --git a/ui/packages/consul-ui/app/filter/predicates/policy.js b/ui/packages/consul-ui/app/filter/predicates/policy.js index f7bd68fd5e..c5b65b0dc0 100644 --- a/ui/packages/consul-ui/app/filter/predicates/policy.js +++ b/ui/packages/consul-ui/app/filter/predicates/policy.js @@ -1,28 +1,15 @@ import setHelpers from 'mnemonist/set'; -export default () => ({ dcs = [], types = [] }) => { - const typeIncludes = ['global-management', 'standard'].reduce((prev, item) => { - prev[item] = types.includes(item); - return prev; - }, {}); - const selectedDcs = new Set(dcs); - return item => { - let type = true; - let dc = true; - if (types.length > 0) { - type = false; - if (typeIncludes['global-management'] && item.isGlobalManagement) { - type = true; - } - if (typeIncludes['standard'] && !item.isGlobalManagement) { - type = true; - } - } - if (dcs.length > 0) { - // if datacenters is undefined it means the policy is applicable to all datacenters - dc = - typeof item.Datacenters === 'undefined' || - setHelpers.intersectionSize(selectedDcs, new Set(item.Datacenters)) > 0; - } - return type && dc; - }; -}; +import { andOr } from 'consul-ui/utils/filter'; + +export default andOr({ + kinds: { + 'global-management': (item, value) => item.isGlobalManagement, + standard: (item, value) => !item.isGlobalManagement, + }, + dcs: (item, values) => { + return ( + typeof item.Datacenters === 'undefined' || + setHelpers.intersectionSize(values, new Set(item.Datacenters)) > 0 + ); + }, +}); diff --git a/ui/packages/consul-ui/app/filter/predicates/service-instance.js b/ui/packages/consul-ui/app/filter/predicates/service-instance.js index 09d05c130b..2bd09d631f 100644 --- a/ui/packages/consul-ui/app/filter/predicates/service-instance.js +++ b/ui/packages/consul-ui/app/filter/predicates/service-instance.js @@ -1,19 +1,13 @@ import setHelpers from 'mnemonist/set'; -export default () => ({ sources = [], statuses = [] }) => { - const uniqueSources = new Set(sources); - return item => { - if (statuses.length > 0) { - if (statuses.includes(item.Status)) { - return true; - } - return false; - } - if (sources.length > 0) { - if (setHelpers.intersectionSize(uniqueSources, new Set(item.ExternalSources || [])) !== 0) { - return true; - } - return false; - } - return true; - }; -}; +import { andOr } from 'consul-ui/utils/filter'; + +export default andOr({ + statuses: { + passing: (item, value) => item.Status === value, + warning: (item, value) => item.Status === value, + critical: (item, value) => item.Status === value, + }, + sources: (item, values) => { + return setHelpers.intersectionSize(values, new Set(item.ExternalSources || [])) !== 0; + }, +}); diff --git a/ui/packages/consul-ui/app/filter/predicates/service.js b/ui/packages/consul-ui/app/filter/predicates/service.js index ed0a77ed9f..7be04d7bce 100644 --- a/ui/packages/consul-ui/app/filter/predicates/service.js +++ b/ui/packages/consul-ui/app/filter/predicates/service.js @@ -1,71 +1,25 @@ import setHelpers from 'mnemonist/set'; -export default () => ({ instances = [], sources = [], statuses = [], types = [] }) => { - const uniqueSources = new Set(sources); - const typeIncludes = [ - 'ingress-gateway', - 'terminating-gateway', - 'mesh-gateway', - 'service', - 'in-mesh', - 'not-in-mesh', - ].reduce((prev, item) => { - prev[item] = types.includes(item); - return prev; - }, {}); - const instanceIncludes = ['registered', 'not-registered'].reduce((prev, item) => { - prev[item] = instances.includes(item); - return prev; - }, {}); - return item => { - if (statuses.length > 0) { - if (statuses.includes(item.MeshStatus)) { - return true; - } - return false; - } - if (instances.length > 0) { - if (item.InstanceCount > 0) { - if (instanceIncludes['registered']) { - return true; - } - } else { - if (instanceIncludes['not-registered']) { - return true; - } - } - return false; - } - if (types.length > 0) { - if (typeIncludes['ingress-gateway'] && item.Kind === 'ingress-gateway') { - return true; - } - if (typeIncludes['terminating-gateway'] && item.Kind === 'terminating-gateway') { - return true; - } - if (typeIncludes['mesh-gateway'] && item.Kind === 'mesh-gateway') { - return true; - } - if (typeIncludes['service'] && typeof item.Kind === 'undefined') { - return true; - } - if (typeIncludes['in-mesh']) { - if (item.InMesh) { - return true; - } - } - if (typeIncludes['not-in-mesh']) { - if (!item.InMesh) { - return true; - } - } - return false; - } - if (sources.length > 0) { - if (setHelpers.intersectionSize(uniqueSources, new Set(item.ExternalSources || [])) !== 0) { - return true; - } - return false; - } - return true; - }; -}; +import { andOr } from 'consul-ui/utils/filter'; + +export default andOr({ + kinds: { + 'ingress-gateway': (item, value) => item.Kind === value, + 'terminating-gateway': (item, value) => item.Kind === value, + 'mesh-gateway': (item, value) => item.Kind === value, + service: (item, value) => !item.Kind, + 'in-mesh': (item, value) => item.InMesh, + 'not-in-mesh': (item, value) => !item.InMesh, + }, + statuses: { + passing: (item, value) => item.MeshStatus === value, + warning: (item, value) => item.MeshStatus === value, + critical: (item, value) => item.MeshStatus === value, + }, + instances: { + registered: (item, value) => item.InstanceCount > 0, + 'not-registered': (item, value) => item.InstanceCount === 0, + }, + sources: (item, values) => { + return setHelpers.intersectionSize(values, new Set(item.ExternalSources || [])) !== 0; + }, +}); diff --git a/ui/packages/consul-ui/app/filter/predicates/token.js b/ui/packages/consul-ui/app/filter/predicates/token.js index e50b1f2919..cf85f2ce11 100644 --- a/ui/packages/consul-ui/app/filter/predicates/token.js +++ b/ui/packages/consul-ui/app/filter/predicates/token.js @@ -1,21 +1,10 @@ -export default () => ({ types = [] }) => { - const typeIncludes = ['global-management', 'global', 'local'].reduce((prev, item) => { - prev[item] = types.includes(item); - return prev; - }, {}); - return item => { - if (types.length > 0) { - if (typeIncludes['global-management'] && item.isGlobalManagement) { - return true; - } - if (typeIncludes['global'] && !item.Local) { - return true; - } - if (typeIncludes['local'] && item.Local) { - return true; - } - return false; - } - return true; - }; -}; +import setHelpers from 'mnemonist/set'; +import { andOr } from 'consul-ui/utils/filter'; + +export default andOr({ + kinds: { + 'global-management': (item, value) => item.isGlobalManagement, + global: (item, value) => !item.Local, + local: (item, value) => item.Local, + }, +}); diff --git a/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js b/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js index a4ec3c8be5..b137798efc 100644 --- a/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js +++ b/ui/packages/consul-ui/app/routes/dc/acls/policies/index.js @@ -5,11 +5,12 @@ import { hash } from 'rsvp'; import WithPolicyActions from 'consul-ui/mixins/policy/with-actions'; export default class IndexRoute extends Route.extend(WithPolicyActions) { - @service('repository/policy') - repo; + @service('repository/policy') repo; queryParams = { sortBy: 'sort', + dc: 'dc', + kind: 'kind', search: { as: 'filter', replace: true, diff --git a/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js b/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js index 089938cd60..0f8c2fa3eb 100644 --- a/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js +++ b/ui/packages/consul-ui/app/routes/dc/acls/roles/index.js @@ -5,8 +5,7 @@ import { hash } from 'rsvp'; import WithRoleActions from 'consul-ui/mixins/role/with-actions'; export default class IndexRoute extends Route.extend(WithRoleActions) { - @service('repository/role') - repo; + @service('repository/role') repo; queryParams = { sortBy: 'sort', diff --git a/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js b/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js index f241199bbf..78e3c18ef1 100644 --- a/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js +++ b/ui/packages/consul-ui/app/routes/dc/acls/tokens/index.js @@ -3,15 +3,14 @@ import Route from 'consul-ui/routing/route'; import { hash } from 'rsvp'; import { get } from '@ember/object'; import WithTokenActions from 'consul-ui/mixins/token/with-actions'; -export default class IndexRoute extends Route.extend(WithTokenActions) { - @service('repository/token') - repo; - @service('settings') - settings; +export default class IndexRoute extends Route.extend(WithTokenActions) { + @service('repository/token') repo; + @service('settings') settings; queryParams = { sortBy: 'sort', + kind: 'kind', search: { as: 'filter', replace: true, diff --git a/ui/packages/consul-ui/app/routes/dc/intentions/index.js b/ui/packages/consul-ui/app/routes/dc/intentions/index.js index 19dbbf216c..412a53ad4b 100644 --- a/ui/packages/consul-ui/app/routes/dc/intentions/index.js +++ b/ui/packages/consul-ui/app/routes/dc/intentions/index.js @@ -3,6 +3,7 @@ import Route from 'consul-ui/routing/route'; export default class IndexRoute extends Route { queryParams = { sortBy: 'sort', + access: 'access', search: { as: 'filter', replace: true, diff --git a/ui/packages/consul-ui/app/routes/dc/kv/index.js b/ui/packages/consul-ui/app/routes/dc/kv/index.js index efdf56bca2..28668d01b1 100644 --- a/ui/packages/consul-ui/app/routes/dc/kv/index.js +++ b/ui/packages/consul-ui/app/routes/dc/kv/index.js @@ -5,16 +5,16 @@ import { get, action } from '@ember/object'; import isFolder from 'consul-ui/utils/isFolder'; export default class IndexRoute extends Route { + @service('repository/kv') repo; + queryParams = { + sortBy: 'sort', search: { as: 'filter', replace: true, }, }; - @service('repository/kv') - repo; - beforeModel() { // we are index or folder, so if the key doesn't have a trailing slash // add one to force a fake findBySlug diff --git a/ui/packages/consul-ui/app/routes/dc/nodes/index.js b/ui/packages/consul-ui/app/routes/dc/nodes/index.js index 0ccf913ab3..9b6a926f64 100644 --- a/ui/packages/consul-ui/app/routes/dc/nodes/index.js +++ b/ui/packages/consul-ui/app/routes/dc/nodes/index.js @@ -3,11 +3,11 @@ import Route from 'consul-ui/routing/route'; import { hash } from 'rsvp'; export default class IndexRoute extends Route { - @service('data-source/service') - data; + @service('data-source/service') data; queryParams = { sortBy: 'sort', + status: 'status', search: { as: 'filter', replace: true, diff --git a/ui/packages/consul-ui/app/routes/dc/nspaces/index.js b/ui/packages/consul-ui/app/routes/dc/nspaces/index.js index 72c380c953..39505ec67c 100644 --- a/ui/packages/consul-ui/app/routes/dc/nspaces/index.js +++ b/ui/packages/consul-ui/app/routes/dc/nspaces/index.js @@ -4,11 +4,8 @@ import { hash } from 'rsvp'; import WithNspaceActions from 'consul-ui/mixins/nspace/with-actions'; export default class IndexRoute extends Route.extend(WithNspaceActions) { - @service('data-source/service') - data; - - @service('repository/nspace') - repo; + @service('data-source/service') data; + @service('repository/nspace') repo; queryParams = { sortBy: 'sort', diff --git a/ui/packages/consul-ui/app/routes/dc/services/index.js b/ui/packages/consul-ui/app/routes/dc/services/index.js index d999f25b9a..7328daeb7f 100644 --- a/ui/packages/consul-ui/app/routes/dc/services/index.js +++ b/ui/packages/consul-ui/app/routes/dc/services/index.js @@ -3,18 +3,17 @@ import Route from 'consul-ui/routing/route'; import { hash } from 'rsvp'; export default class IndexRoute extends Route { - @service('data-source/service') - data; + @service('data-source/service') data; queryParams = { + sortBy: 'sort', + status: 'status', + source: 'source', + kind: 'kind', search: { as: 'filter', replace: true, }, - // temporary support of old style status - status: { - as: 'status', - }, }; model(params) { diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/instances.js b/ui/packages/consul-ui/app/routes/dc/services/show/instances.js index e280065e08..52a39ab822 100644 --- a/ui/packages/consul-ui/app/routes/dc/services/show/instances.js +++ b/ui/packages/consul-ui/app/routes/dc/services/show/instances.js @@ -2,6 +2,9 @@ import Route from 'consul-ui/routing/route'; export default class InstancesRoute extends Route { queryParams = { + sortBy: 'sort', + status: 'status', + source: 'source', search: { as: 'filter', replace: true, diff --git a/ui/packages/consul-ui/app/routes/dc/services/show/intentions/index.js b/ui/packages/consul-ui/app/routes/dc/services/show/intentions/index.js index c3d6057299..a1bd388778 100644 --- a/ui/packages/consul-ui/app/routes/dc/services/show/intentions/index.js +++ b/ui/packages/consul-ui/app/routes/dc/services/show/intentions/index.js @@ -2,6 +2,8 @@ import Route from 'consul-ui/routing/route'; export default class IndexRoute extends Route { queryParams = { + sortBy: 'sort', + access: 'access', search: { as: 'filter', replace: true, diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs index c7821f9bcc..d3a996826e 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/index.hbs @@ -4,7 +4,7 @@ {{title 'Access Controls'}} {{/if}} {{#let (hash - types=(if type (split type ',') undefined) + kinds=(if kind (split kind ',') undefined) dcs=(if dc (split dc ',') undefined) ) as |filters|}} {{#let (or sortBy "Name:asc") as |sort|}} @@ -45,7 +45,7 @@ @filter={{filters}} @onfilter={{hash dc=(action (mut dc) value="target.selectedItems") - type=(action (mut type) value="target.selectedItems") + kind=(action (mut kind) value="target.selectedItems") }} /> {{/if}} diff --git a/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs b/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs index 06c07ebaf6..2758450378 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/tokens/index.hbs @@ -5,7 +5,7 @@ {{/if}} {{#let (hash - types=(if type (split type ',') undefined) + kinds=(if kind (split kind ',') undefined) ) as |filters|}} {{#let (or sortBy "CreateTime:desc") as |sort|}} {{/if}} diff --git a/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs b/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs index cd3523bf33..32bd2627a1 100644 --- a/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/nspaces/index.hbs @@ -32,39 +32,41 @@ {{#let (sort-by (comparator 'nspace' sort) items) as |sorted|}} - + - - -

- {{#if (gt items.length 0)}} - No namespaces found - {{else}} - Welcome to Namespaces - {{/if}} -

- - -

- {{#if (gt items.length 0)}} - No namespaces where found matching that search, or you may not have access to view the namespaces you are searching for. - {{else}} - There don't seem to be any namespaces, or you may not have access to view namespaces yet. - {{/if}} -

- - -
  • - Documentation on namespaces -
    • -
  • - Read the guide -
    • -     -     + <:empty> + + +

    + {{#if (gt items.length 0)}} + No namespaces found + {{else}} + Welcome to Namespaces + {{/if}} +

    +     + +

    + {{#if (gt items.length 0)}} + No namespaces where found matching that search, or you may not have access to view the namespaces you are searching for. + {{else}} + There don't seem to be any namespaces, or you may not have access to view namespaces yet. + {{/if}} +

    +     + +
  • + Documentation on namespaces +
    • +
  • + Read the guide +
    • +     +     +     diff --git a/ui/packages/consul-ui/app/templates/dc/services/index.hbs b/ui/packages/consul-ui/app/templates/dc/services/index.hbs index b18eca890a..53e5747c87 100644 --- a/ui/packages/consul-ui/app/templates/dc/services/index.hbs +++ b/ui/packages/consul-ui/app/templates/dc/services/index.hbs @@ -2,7 +2,7 @@ {{#let (hash statuses=(if status (split status ',') undefined) - types=(if type (split type ',') undefined) + kinds=(if kind (split kind ',') undefined) sources=(if source (split source ',') undefined) ) as |filters|}} {{#let (or sortBy "Name:asc") as |sort|}} @@ -32,7 +32,7 @@ @filter={{filters}} @onfilter={{hash status=(action (mut status) value="target.selectedItems") - type=(action (mut type) value="target.selectedItems") + kind=(action (mut kind) value="target.selectedItems") source=(action (mut source) value="target.selectedItems") }} /> diff --git a/ui/packages/consul-ui/app/utils/filter/index.js b/ui/packages/consul-ui/app/utils/filter/index.js new file mode 100644 index 0000000000..89fcde58b4 --- /dev/null +++ b/ui/packages/consul-ui/app/utils/filter/index.js @@ -0,0 +1,56 @@ +import setHelpers from 'mnemonist/set'; + +const createPossibles = function(predicates) { + // create arrays of allowed values + return Object.entries(predicates).reduce((prev, [key, value]) => { + if (typeof value !== 'function') { + prev[key] = new Set(Object.keys(value)); + } else { + prev[key] = null; + } + return prev; + }, {}); +}; +const sanitize = function(values, possibles) { + return Object.keys(possibles).reduce((prev, key) => { + // only set the value if the value has a length of > 0 + const value = typeof values[key] === 'undefined' ? [] : values[key]; + if (value.length > 0) { + if (possibles[key] !== null) { + // only include possible values + prev[key] = [...setHelpers.intersection(possibles[key], new Set(value))]; + } else { + // only unique values + prev[key] = [...new Set(value)]; + } + } + return prev; + }, {}); +}; +const execute = function(item, values, predicates) { + // every/and the top level values + return Object.entries(values).every(([key, values]) => { + let predicate = predicates[key]; + if (typeof predicate === 'function') { + return predicate(item, values); + } else { + // if the top level values can have multiple values some/or them + return values.some(val => predicate[val](item, val)); + } + }); +}; +// exports a function that requires a hash of predicates passed in +export const andOr = predicates => { + // figure out all possible values from the hash of predicates + const possibles = createPossibles(predicates); + return () => values => { + // this is what is called post injection + // the actual user values are passed in here so 'sanitize' them which is + // basically checking against the possibles + values = sanitize(values, possibles); + // this is your actual filter predicate + return item => { + return execute(item, values, predicates); + }; + }; +}; diff --git a/ui/packages/consul-ui/tests/unit/filter/predicates/service-test.js b/ui/packages/consul-ui/tests/unit/filter/predicates/service-test.js index 55d243610f..e1e6cd7ef6 100644 --- a/ui/packages/consul-ui/tests/unit/filter/predicates/service-test.js +++ b/ui/packages/consul-ui/tests/unit/filter/predicates/service-test.js @@ -97,7 +97,7 @@ module('Unit | Filter | Predicates | service', function() { expected = [items[0]]; actual = items.filter( predicate({ - types: ['ingress-gateway'], + kinds: ['ingress-gateway'], }) ); assert.deepEqual(actual, expected); @@ -105,7 +105,7 @@ module('Unit | Filter | Predicates | service', function() { expected = [items[1]]; actual = items.filter( predicate({ - types: ['mesh-gateway'], + kinds: ['mesh-gateway'], }) ); assert.deepEqual(actual, expected); @@ -113,7 +113,7 @@ module('Unit | Filter | Predicates | service', function() { expected = items; actual = items.filter( predicate({ - types: ['ingress-gateway', 'mesh-gateway', 'service'], + kinds: ['ingress-gateway', 'mesh-gateway', 'service'], }) ); assert.deepEqual(actual, expected); @@ -141,7 +141,7 @@ module('Unit | Filter | Predicates | service', function() { expected = [items[0]]; actual = items.filter( predicate({ - types: ['ingress-gateway'], + kinds: ['ingress-gateway'], statuses: ['passing'], instances: ['registered'], }) @@ -151,7 +151,7 @@ module('Unit | Filter | Predicates | service', function() { expected = [items[1]]; actual = items.filter( predicate({ - types: ['mesh-gateway'], + kinds: ['mesh-gateway'], statuses: ['warning'], instances: ['registered'], }) @@ -161,7 +161,7 @@ module('Unit | Filter | Predicates | service', function() { expected = items; actual = items.filter( predicate({ - types: ['ingress-gateway', 'mesh-gateway', 'service'], + kinds: ['ingress-gateway', 'mesh-gateway', 'service'], statuses: ['passing', 'warning', 'critical'], instances: ['registered', 'not-registered'], })