ui: Fix ember-can

ui/packages/consul-ui/app/abilities/license.js

@@ -3,7 +3,4 @@ import BaseAbility from './base';
 export default class LicenseAbility extends BaseAbility {
   resource = 'operator';
   segmented = false;
-  get is() {
-    return this.read;
-  }
 }

ui/packages/consul-ui/app/abilities/service.js → ui/packages/consul-ui/app/abilities/zervice.js

@@ -1,6 +1,6 @@
 import BaseAbility from './base';
 
-export default class ServiceAbility extends BaseAbility {
+export default class ZerviceAbility extends BaseAbility {
   resource = 'service';
 
   get isLinkable() {

ui/packages/consul-ui/app/helpers/can.js

@@ -0,0 +1,9 @@
+import Helper from 'ember-can/helpers/can';
+
+export default class extends Helper {
+  _addAbilityObserver(ability, propertyName) {
+    if(!this.isDestroyed && !this.isDestroying) {
+      super._addAbilityObserver(...arguments);
+    }
+  }
+}

ui/packages/consul-ui/app/helpers/is.js

@@ -3,8 +3,8 @@ import { get } from '@ember/object';
 
 import { camelize } from '@ember/string';
 export const is = (helper, [abilityString, model], properties) => {
-  let { abilityName, propertyName } = helper.can.parse(abilityString);
-  let ability = helper.can.abilityFor(abilityName, model, properties);
+  let { abilityName, propertyName } = helper.abilities.parse(abilityString);
+  let ability = helper.abilities.abilityFor(abilityName, model, properties);
 
   if(typeof ability.getCharacteristicProperty === 'function') {
     propertyName = ability.getCharacteristicProperty(propertyName);

ui/packages/consul-ui/app/helpers/test.js

@@ -1,5 +1,5 @@
-import Helper from 'ember-can/helpers/can';
-import { is } from 'consul-ui/helpers/is';
+import Helper from './can';
+import { is } from './is';
 
 export default class extends Helper {
   compute([abilityString, model], properties) {

ui/packages/consul-ui/app/services/can.js → ui/packages/consul-ui/app/services/abilities.js

@@ -1,10 +1,10 @@
 import Service from 'ember-can/services/can';
 
-export default class CanService extends Service {
+export default class AbilitiesService extends Service {
   parse(str) {
     // It's nicer to talk about SSO but technically its part of the authMethod
     // ability, we probably only need 'use SSO' but if we need more, reassess
     // the `replace`
-    return super.parse(str.replace('use SSO', 'use authMethods'));
+    return super.parse(str.replace('use SSO', 'use authMethods').replace('service', 'zervice'));
   }
 }

ui/packages/consul-ui/app/services/repository/permission.js

@@ -59,7 +59,7 @@ const REQUIRED_PERMISSIONS = [
 ];
 export default class PermissionService extends RepositoryService {
   @service('env') env;
-  @service('can') _can;
+  @service('abilities') _can;
 
   // TODO: move this to the store, if we want it to use ember-data
   // currently this overwrites an inherited permissions service (this service)

ui/packages/consul-ui/app/templates/dc/show.hbs

@@ -23,7 +23,7 @@ as |route|>
               href=(href-to 'dc.show.health')
               selected=(is-href 'dc.show.health')
             )
-(if (and (is 'license') (not (is 'hcp')))
+(if (and (can 'read license') (not (is 'hcp')))
             (hash
               label=(compute (fn route.t 'license.title'))
               href=(href-to 'dc.show.license')

ui/packages/consul-ui/package.json

@@ -91,7 +91,7 @@
     "deepmerge": "^4.2.2",
     "ember-assign-helper": "^0.3.0",
     "ember-auto-import": "^1.5.3",
-    "ember-can": "^3.0.0",
+    "ember-can": "^4.1.0",
     "ember-changeset-conditional-validations": "^0.6.0",
     "ember-changeset-validations": "~3.9.0",
     "ember-cli": "~3.20.2",