diff --git a/addons/api/addon/services/resource-filter-store.js b/addons/api/addon/services/resource-filter-store.js index 660fd8694..9dbca0f5e 100644 --- a/addons/api/addon/services/resource-filter-store.js +++ b/addons/api/addon/services/resource-filter-store.js @@ -34,7 +34,6 @@ export class ResourceFilter { ); }) .flat(); - console.log(this.#filterObject, clauses); return this.and(clauses); } diff --git a/ui/admin/app/routes/scopes/scope/auth-methods.js b/ui/admin/app/routes/scopes/scope/auth-methods.js index 687c5ef81..74753f340 100644 --- a/ui/admin/app/routes/scopes/scope/auth-methods.js +++ b/ui/admin/app/routes/scopes/scope/auth-methods.js @@ -4,6 +4,7 @@ import { action } from '@ember/object'; import loading from 'ember-loading/decorator'; import { confirm } from 'core/decorators/confirm'; import { notifySuccess, notifyError } from 'core/decorators/notify'; +import { resourceFilterParam } from 'core/decorators/resource-filter-param'; export default class ScopesScopeAuthMethodsRoute extends Route { // =services @@ -12,6 +13,11 @@ export default class ScopesScopeAuthMethodsRoute extends Route { @service notify; @service session; @service can; + @service resourceFilterStore; + + // =attributes + + @resourceFilterParam(['password', 'oidc']) type; // =methods @@ -32,7 +38,12 @@ export default class ScopesScopeAuthMethodsRoute extends Route { if ( this.can.can('list collection', scope, { collection: 'auth-methods' }) ) { - return this.store.query('auth-method', { scope_id }); + const { type } = this; + return this.resourceFilterStore.queryBy( + 'auth-method', + { type }, + { scope_id } + ); } } @@ -185,4 +196,9 @@ export default class ScopesScopeAuthMethodsRoute extends Route { const value = { from, to }; array.addObject(value); } + + @action + filterBy(field, value) { + this[field] = value; + } } 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 f4e285c77..0234133bb 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -52,6 +52,38 @@ {{/unless}} {{/if}} + {{#if (feature-flag 'filter')}} + + + {{#with + (resource-filter-param 'scopes.scope.auth-methods' 'type') + as |filter| + }} + + + + + + + + {{/with}} + + + {{/if}} +