diff --git a/addons/core/translations/actions/en-us.yaml b/addons/core/translations/actions/en-us.yaml index 144ced636..118c5f601 100644 --- a/addons/core/translations/actions/en-us.yaml +++ b/addons/core/translations/actions/en-us.yaml @@ -35,3 +35,4 @@ close: Close toggle-secret: Toggle secret visibility minimize: Minimize fullscreen: Fullscreen +clear-all-filters: Clear all filters diff --git a/addons/rose/addon/styles/rose/components/toolbar/_toolbar.scss b/addons/rose/addon/styles/rose/components/toolbar/_toolbar.scss index cf6bd1491..80dd508c0 100644 --- a/addons/rose/addon/styles/rose/components/toolbar/_toolbar.scss +++ b/addons/rose/addon/styles/rose/components/toolbar/_toolbar.scss @@ -6,8 +6,11 @@ $xxxxs: sizing.rems(xxxxs); // 1 .rose-toolbar { background-color: var(--ui-gray-subtler-6); + padding: $xxs + $xxxxs; - .rose-form { - padding: $xxs + $xxxxs; + button { + display: inline-block; + font-weight: normal; + vertical-align: middle; } } diff --git a/ui/admin/app/routes/scopes/scope/auth-methods.js b/ui/admin/app/routes/scopes/scope/auth-methods.js index 74753f340..e83a95911 100644 --- a/ui/admin/app/routes/scopes/scope/auth-methods.js +++ b/ui/admin/app/routes/scopes/scope/auth-methods.js @@ -197,8 +197,21 @@ export default class ScopesScopeAuthMethodsRoute extends Route { array.addObject(value); } + /** + * Sets the specified resource filter field to the specified value. + * @param {string} field + * @param value + */ @action filterBy(field, value) { this[field] = value; } + + /** + * Clears and filter selections. + */ + @action + clearAllFilters() { + this.type = []; + } } diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index 2d15d30f2..d6075980e 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -72,6 +72,16 @@ {{/with}} + + {{#if + (has-resource-filter-param-selections 'scopes.scope.auth-methods') + }} + {{t 'actions.clear-all-filters'}} + {{/if}} {{/if}}