diff --git a/ui/admin/app/abilities/collection.js b/ui/admin/app/abilities/collection.js index 1da414d43..820e43903 100644 --- a/ui/admin/app/abilities/collection.js +++ b/ui/admin/app/abilities/collection.js @@ -1,11 +1,6 @@ import CollectionAbility from 'api/abilities/collection'; -import { inject as service } from '@ember/service'; export default class OverrideCollectionAbility extends CollectionAbility { - // =services - - @service features; - // =permissions /** @@ -16,15 +11,4 @@ export default class OverrideCollectionAbility extends CollectionAbility { get canNavigate() { return this.canList || this.canCreate; } - - // =methods - - /** - * If the capabilities feature flag is disabled, actions are always - * authorized. This mimics pre-capabilities behavior. - */ - hasAuthorizedCollectionAction() { - if (!this.features.isEnabled('capabilities')) return true; - return super.hasAuthorizedCollectionAction(...arguments); - } } diff --git a/ui/admin/app/abilities/model.js b/ui/admin/app/abilities/model.js index 0081f7d57..041ccf792 100644 --- a/ui/admin/app/abilities/model.js +++ b/ui/admin/app/abilities/model.js @@ -1,19 +1,3 @@ import ModelAbility from 'api/abilities/model'; -import { inject as service } from '@ember/service'; -export default class OverrideModelAbility extends ModelAbility { - // =services - - @service features; - - // =methods - - /** - * If the capabilities feature flag is disabled, actions are always - * authorized. This mimics pre-capabilities behavior. - */ - hasAuthorizedAction() { - if (!this.features.isEnabled('capabilities')) return true; - return super.hasAuthorizedAction(...arguments); - } -} +export default class OverrideModelAbility extends ModelAbility {} diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index dc951f583..f5d8c53b9 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -95,7 +95,6 @@ module.exports = function (environment) { 'oidc-account-crud': true, search: false, filter: true, - capabilities: true, 'credential-store': true, 'managed-groups': true, }, diff --git a/ui/desktop/app/abilities/collection.js b/ui/desktop/app/abilities/collection.js index 1da414d43..820e43903 100644 --- a/ui/desktop/app/abilities/collection.js +++ b/ui/desktop/app/abilities/collection.js @@ -1,11 +1,6 @@ import CollectionAbility from 'api/abilities/collection'; -import { inject as service } from '@ember/service'; export default class OverrideCollectionAbility extends CollectionAbility { - // =services - - @service features; - // =permissions /** @@ -16,15 +11,4 @@ export default class OverrideCollectionAbility extends CollectionAbility { get canNavigate() { return this.canList || this.canCreate; } - - // =methods - - /** - * If the capabilities feature flag is disabled, actions are always - * authorized. This mimics pre-capabilities behavior. - */ - hasAuthorizedCollectionAction() { - if (!this.features.isEnabled('capabilities')) return true; - return super.hasAuthorizedCollectionAction(...arguments); - } } diff --git a/ui/desktop/app/abilities/model.js b/ui/desktop/app/abilities/model.js index 0081f7d57..041ccf792 100644 --- a/ui/desktop/app/abilities/model.js +++ b/ui/desktop/app/abilities/model.js @@ -1,19 +1,3 @@ import ModelAbility from 'api/abilities/model'; -import { inject as service } from '@ember/service'; -export default class OverrideModelAbility extends ModelAbility { - // =services - - @service features; - - // =methods - - /** - * If the capabilities feature flag is disabled, actions are always - * authorized. This mimics pre-capabilities behavior. - */ - hasAuthorizedAction() { - if (!this.features.isEnabled('capabilities')) return true; - return super.hasAuthorizedAction(...arguments); - } -} +export default class OverrideModelAbility extends ModelAbility {} diff --git a/ui/desktop/config/environment.js b/ui/desktop/config/environment.js index c2d5f9c19..ab199e29e 100644 --- a/ui/desktop/config/environment.js +++ b/ui/desktop/config/environment.js @@ -58,7 +58,6 @@ module.exports = function (environment) { oidc: true, search: false, filter: true, - capabilities: true, 'credential-store': false, }, };