-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ui: Add filtered by in Nspaces, Legacy ACLs, Tokens, Roles and Polici…
…es (#9531)
- Loading branch information
Showing
20 changed files
with
978 additions
and
663 deletions.
There are no files selected for viewing
180 changes: 124 additions & 56 deletions
180
ui/packages/consul-ui/app/components/consul/acl/search-bar/index.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,127 @@ | ||
| <form | ||
| class="consul-acl-search-bar filter-bar" | ||
| <SearchBar | ||
| class="consul-acl-search-bar" | ||
| ...attributes | ||
| @filter={{@filter}} | ||
| > | ||
| <div class="search"> | ||
| <FreetextFilter | ||
| @onsearch={{action @onsearch}} | ||
| @value={{@search}} | ||
| @placeholder="Search" | ||
| /> | ||
| </div> | ||
| <div class="filters"> | ||
| <PopoverSelect | ||
| @position="left" | ||
| @onchange={{action @onfilter.kind}} | ||
| @multiple={{true}} | ||
| as |components|> | ||
| <BlockSlot @name="selected"> | ||
| <span> | ||
| Type | ||
| </span> | ||
| </BlockSlot> | ||
| <BlockSlot @name="options"> | ||
| {{#let components.Optgroup components.Option as |Optgroup Option|}} | ||
| <Option @value="management" @selected={{contains 'management' @filter.kinds}}>Management</Option> | ||
| <Option @value="client" @selected={{contains 'service' @filter.kinds}}>Client</Option> | ||
| <:status as |search|> | ||
|
|
||
| {{#let | ||
|
|
||
| (t (concat "components.consul.acl.search-bar." search.status.key) | ||
| default=(array | ||
| (concat "common.search." search.status.key) | ||
| (concat "common.consul." search.status.key) | ||
| ) | ||
| ) | ||
|
|
||
| (t (concat "components.consul.acl.search-bar." search.status.value) | ||
| default=(array | ||
| (concat "common.search." search.status.value) | ||
| (concat "common.consul." search.status.value) | ||
| (concat "common.brand." search.status.value) | ||
| ) | ||
| ) | ||
|
|
||
| as |key value|}} | ||
| <search.RemoveFilter | ||
| aria-label={{t "common.ui.remove" item=(concat key " " value)}} | ||
| > | ||
| <dl> | ||
| <dt>{{key}}</dt> | ||
| <dd>{{value}}</dd> | ||
| </dl> | ||
| </search.RemoveFilter> | ||
| {{/let}} | ||
| </BlockSlot> | ||
| </PopoverSelect> | ||
| </div> | ||
| <div class="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 "Name:asc" "A to Z") | ||
| (array "Name:desc" "Z to A") | ||
| )) | ||
| as |selectable| | ||
| }} | ||
| {{get selectable @sort}} | ||
| {{/let}} | ||
| </span> | ||
| </BlockSlot> | ||
| <BlockSlot @name="options"> | ||
| {{#let components.Optgroup components.Option as |Optgroup Option|}} | ||
| <Option @value="Name:asc" @selected={{eq "Name:asc" @sort}}>A to Z</Option> | ||
| <Option @value="Name:desc" @selected={{eq "Name:desc" @sort}}>Z to A</Option> | ||
| {{/let}} | ||
| </BlockSlot> | ||
| </PopoverSelect> | ||
| </div> | ||
| </form> | ||
|
|
||
| </:status> | ||
| <:search as |search|> | ||
| <search.Search | ||
| @onsearch={{action @onsearch}} | ||
| @value={{@search}} | ||
| @placeholder={{t "common.search.search"}} | ||
| > | ||
| {{#if @filter.searchproperty}} | ||
| <search.Select | ||
| class="type-search-properties" | ||
| @position="right" | ||
| @onchange={{action @filter.searchproperty.change}} | ||
| @multiple={{true}} | ||
| @required={{true}} | ||
| as |components|> | ||
| <BlockSlot @name="selected"> | ||
| <span> | ||
| {{t "common.search.searchproperty"}} | ||
| </span> | ||
| </BlockSlot> | ||
| <BlockSlot @name="options"> | ||
| {{#let components.Optgroup components.Option as |Optgroup Option|}} | ||
| {{#each @filter.searchproperty.default as |prop|}} | ||
| <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}> | ||
| {{t (concat "common.consul." (lowercase prop))}} | ||
| </Option> | ||
| {{/each}} | ||
| {{/let}} | ||
| </BlockSlot> | ||
| </search.Select> | ||
| {{/if}} | ||
| </search.Search> | ||
| </:search> | ||
| <:filter as |search|> | ||
| <search.Select | ||
| class="type-status" | ||
| @position="left" | ||
| @onchange={{action @filter.kind.change}} | ||
| @multiple={{true}} | ||
| as |components|> | ||
| <BlockSlot @name="selected"> | ||
| <span> | ||
| {{t "components.consul.acl.search-bar.kind.name"}} | ||
| </span> | ||
| </BlockSlot> | ||
| <BlockSlot @name="options"> | ||
| {{#let components.Optgroup components.Option as |Optgroup Option|}} | ||
| {{#each (array "management" "client") as |state|}} | ||
| <Option class="value-{{state}}" @value={{state}} @selected={{contains state @filter.status.value}}> | ||
| {{t (concat "components.acl.search-bar.kind.options." state) | ||
| default=(array | ||
| (concat "common.search." state) | ||
| ) | ||
| }} | ||
| </Option> | ||
| {{/each}} | ||
| {{/let}} | ||
| </BlockSlot> | ||
| </search.Select> | ||
| </:filter> | ||
| <:sort as |search|> | ||
| <search.Select | ||
| class="type-sort" | ||
| data-test-sort-control | ||
| @position="right" | ||
| @onchange={{action @sort.change}} | ||
| @multiple={{false}} | ||
| @required={{true}} | ||
| as |components|> | ||
| <BlockSlot @name="selected"> | ||
| <span> | ||
| {{#let (from-entries (array | ||
| (array "Name:asc" (t "common.sort.alpha.asc")) | ||
| (array "Name:desc" (t "common.sort.alpha.desc")) | ||
| )) | ||
| as |selectable| | ||
| }} | ||
| {{get selectable @sort.value}} | ||
| {{/let}} | ||
| </span> | ||
| </BlockSlot> | ||
| <BlockSlot @name="options"> | ||
| {{#let components.Optgroup components.Option as |Optgroup Option|}} | ||
| <Optgroup @label={{t "common.consul.name"}}> | ||
| <Option @value="Name:asc" @selected={{eq "Name:asc" @sort.value}}>{{t "common.sort.alpha.asc"}}</Option> | ||
| <Option @value="Name:desc" @selected={{eq "Name:desc" @sort.value}}>{{t "common.sort.alpha.desc"}}</Option> | ||
| </Optgroup> | ||
| {{/let}} | ||
| </BlockSlot> | ||
| </search.Select> | ||
| </:sort> | ||
| </SearchBar> |
137 changes: 86 additions & 51 deletions
137
ui/packages/consul-ui/app/components/consul/nspace/search-bar/index.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,98 @@ | ||
| <form | ||
| class="consul-nspace-search-bar filter-bar" | ||
| <SearchBar | ||
| class="consul-nspace-search-bar" | ||
| ...attributes | ||
| @filter={{@filter}} | ||
| > | ||
| <div class="search"> | ||
| <FreetextFilter | ||
| @onsearch={{action @onsearch}} | ||
| @value={{@search}} | ||
| @placeholder="Search" | ||
| > | ||
| <PopoverSelect | ||
| class="type-search-properties" | ||
| <:status as |search|> | ||
|
|
||
| {{#let | ||
|
|
||
| (t (concat "components.consul.nspace.search-bar." search.status.key) | ||
| default=(array | ||
| (concat "common.search." search.status.key) | ||
| (concat "common.consul." search.status.key) | ||
| ) | ||
| ) | ||
|
|
||
| (t (concat "components.consul.nspace.search-bar." search.status.value) | ||
| default=(array | ||
| (concat "common.search." search.status.value) | ||
| (concat "common.consul." search.status.value) | ||
| (concat "common.brand." search.status.value) | ||
| ) | ||
| ) | ||
|
|
||
| as |key value|}} | ||
| <search.RemoveFilter | ||
| aria-label={{t "common.ui.remove" item=(concat key " " value)}} | ||
| > | ||
| <dl> | ||
| <dt>{{key}}</dt> | ||
| <dd>{{value}}</dd> | ||
| </dl> | ||
| </search.RemoveFilter> | ||
| {{/let}} | ||
|
|
||
| </:status> | ||
| <:search as |search|> | ||
| <search.Search | ||
| @onsearch={{action @onsearch}} | ||
| @value={{@search}} | ||
| @placeholder={{t "common.search.search"}} | ||
| > | ||
| <search.Select | ||
| class="type-search-properties" | ||
| @position="right" | ||
| @onchange={{action @filter.searchproperty.change}} | ||
| @multiple={{true}} | ||
| @required={{true}} | ||
| as |components|> | ||
| <BlockSlot @name="selected"> | ||
| <span> | ||
| {{t "common.search.searchproperty"}} | ||
| </span> | ||
| </BlockSlot> | ||
| <BlockSlot @name="options"> | ||
| {{#let components.Optgroup components.Option as |Optgroup Option|}} | ||
| {{#each @filter.searchproperty.default as |prop|}} | ||
| <Option @value={{prop}} @selected={{contains prop @filter.searchproperty.value}}> | ||
| {{t (concat "common.consul." (lowercase prop))}} | ||
| </Option> | ||
| {{/each}} | ||
| {{/let}} | ||
| </BlockSlot> | ||
| </search.Select> | ||
| </search.Search> | ||
| </:search> | ||
| <:sort as |search|> | ||
| <search.Select | ||
| class="type-sort" | ||
| data-test-sort-control | ||
| @position="right" | ||
| @onchange={{action @onfilter.searchproperty}} | ||
| @multiple={{true}} | ||
| @onchange={{action @sort.change}} | ||
| @multiple={{false}} | ||
| @required={{true}} | ||
| as |components|> | ||
| <BlockSlot @name="selected"> | ||
| <span> | ||
| Search across | ||
| {{#let (from-entries (array | ||
| (array "Name:asc" (t "common.sort.alpha.asc")) | ||
| (array "Name:desc" (t "common.sort.alpha.desc")) | ||
| )) | ||
| as |selectable| | ||
| }} | ||
| {{get selectable @sort.value}} | ||
| {{/let}} | ||
| </span> | ||
| </BlockSlot> | ||
| <BlockSlot @name="options"> | ||
| {{#let components.Optgroup components.Option as |Optgroup Option|}} | ||
| <Option @value="Name" @selected={{contains 'Name' @filter.searchproperties}}>Name</Option> | ||
| <Option @value="Description" @selected={{contains 'Description' @filter.searchproperties}}>Description</Option> | ||
| <Option @value="Policy" @selected={{contains 'Policy' @filter.searchproperties}}>Policy</Option> | ||
| <Option @value="Role" @selected={{contains 'Role' @filter.searchproperties}}>Role</Option> | ||
| <Optgroup @label={{t "common.consul.name"}}> | ||
| <Option @value="Name:asc" @selected={{eq "Name:asc" @sort.value}}>{{t "common.sort.alpha.asc"}}</Option> | ||
| <Option @value="Name:desc" @selected={{eq "Name:desc" @sort.value}}>{{t "common.sort.alpha.desc"}}</Option> | ||
| </Optgroup> | ||
| {{/let}} | ||
| </BlockSlot> | ||
| </PopoverSelect> | ||
| </FreetextFilter> | ||
| </div> | ||
| <div class="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 "Name:asc" "A to Z") | ||
| (array "Name: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="Name"> | ||
| <Option @value="Name:asc" @selected={{eq "Name:asc" @sort}}>A to Z</Option> | ||
| <Option @value="Name:desc" @selected={{eq "Name:desc" @sort}}>Z to A</Option> | ||
| </Optgroup> | ||
| {{/let}} | ||
| </BlockSlot> | ||
| </PopoverSelect> | ||
| </div> | ||
| </form> | ||
| </search.Select> | ||
| </:sort> | ||
| </SearchBar> |
Oops, something went wrong.