Reapply ember-can upgrade (#3111)

* chore: 🤖 reapply previous ember-can upgrade from #3093

* chore: 🤖 add missing ember-inflector dependency

* chore: 🤖 move @ember/string to be a dependency in desktop

* chore: 🤖 re-run pnpm install to resolve lockfile dupe key error

* chore: 🤖 remove unused abilities service injections

Co-Authored-By: Lisbet Alvarez <107949262+lisbet-alvarez@users.noreply.github.com>

---------

Co-authored-by: Lisbet Alvarez <107949262+lisbet-alvarez@users.noreply.github.com>

ui/desktop/app/app.js

@@ -13,11 +13,12 @@ import {
   importSync,
   isTesting,
 } from '@embroider/macros';
+import { extendResolver } from 'ember-can';
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;
-  Resolver = Resolver;
+  Resolver = extendResolver(Resolver);
 }
 
 loadInitializers(App, config.modulePrefix);

ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js

@@ -25,7 +25,7 @@ export default class ScopesScopeProjectsSessionsIndexController extends Controll
   @service ipc;
   @service session;
   @service router;
-  @service can;
+  @service abilities;
 
   // =attributes
 
@@ -129,7 +129,7 @@ export default class ScopesScopeProjectsSessionsIndexController extends Controll
   async cancelSession(session) {
     let updatedSession = session;
     // fetch session from API to verify we have most up to date record
-    if (this.can.can('read session', session)) {
+    if (this.abilities.can('read session', session)) {
       updatedSession = await this.store.findRecord('session', session.id, {
         reload: true,
       });

ui/desktop/app/controllers/scopes/scope/projects/targets/index.js

@@ -24,7 +24,7 @@ export default class ScopesScopeProjectsTargetsIndexController extends Controlle
   @service router;
   @service session;
   @service store;
-  @service can;
+  @service abilities;
   @service intl;
   @service rdp;
 
@@ -300,7 +300,7 @@ export default class ScopesScopeProjectsTargetsIndexController extends Controlle
   async cancelSession(session) {
     let updatedSession = session;
     // fetch session from API to verify we have most up to date record
-    if (this.can.can('read session', session)) {
+    if (this.abilities.can('read session', session)) {
       updatedSession = await this.store.findRecord('session', session.id, {
         reload: true,
       });

ui/desktop/app/routes/scopes/scope/projects/targets/index.js

@@ -17,7 +17,7 @@ const { __electronLog } = globalThis;
 export default class ScopesScopeProjectsTargetsIndexRoute extends Route {
   // =services
 
-  @service can;
+  @service abilities;
   @service clusterUrl;
   @service resourceFilterStore;
   @service router;
@@ -148,7 +148,7 @@ export default class ScopesScopeProjectsTargetsIndexRoute extends Route {
       const { totalItems, isLoadIncomplete, isCacheRefreshing } = targets.meta;
       // Filter out targets to which users do not have the connect ability
       targets = targets.filter((target) =>
-        this.can.can('connect target', target),
+        this.abilities.can('connect target', target),
       );
 
       const aliasPromise = this.store.query('alias', {

ui/desktop/package.json

@@ -42,9 +42,11 @@
   },
   "dependencies": {
     "@babel/runtime": "7.27.6",
+    "@ember/string": "^4.0.0",
     "@xterm/addon-canvas": "^0.7.0",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.5.0",
+    "ember-inflector": "^6.0.0",
     "ember-named-blocks-polyfill": "^0.2.5",
     "lodash": "^4.17.23",
     "uuid": "^11.0.3"
@@ -55,7 +57,6 @@
     "@babel/plugin-proposal-decorators": "^7.24.7",
     "@ember/optional-features": "^2.1.0",
     "@ember/render-modifiers": "^2.0.4",
-    "@ember/string": "^4.0.0",
     "@ember/test-helpers": "^5.2.1",
     "@embroider/macros": "^1.18.1",
     "@faker-js/faker": "^8.0.2",

ui/desktop/tests/unit/abilities/collection-test.js

@@ -11,7 +11,7 @@ module('Unit | Abilities | model', function (hooks) {
 
   test('it reflects when a resource may be navigated to based on list and create actions', function (assert) {
     assert.expect(4);
-    const service = this.owner.lookup('service:can');
+    const service = this.owner.lookup('service:abilities');
     const model = {
       authorized_collection_actions: { foobars: [] },
     };