Merge pull request #70 from fleetbase/dev-v0.3.10

Remove usage of `window.Fleetbase`

Author: roncodes

addon/library/subject-custom-fields.js

@@ -242,7 +242,7 @@ export default class SubjectCustomFields {
         let existingMany = subject.hasMany?.('custom_field_values')?.value?.() ?? null;
 
         // If asked or not loaded, fetch from API (scoped to subject)
-        if (reloadExisting || !existingMany) {
+        if ((reloadExisting || !existingMany) && subjectId) {
             try {
                 existingMany = await this.store.query('custom-field-value', {
                     subject_uuid: subjectId,

addon/services/legacy-universe.js

@@ -155,7 +155,6 @@ export default class LegacyUniverseService extends Service.extend(Evented) {
      * @return {void}
      */
     setApplicationInstance(instance) {
-        window.Fleetbase = instance;
         this.applicationInstance = instance;
     }
 

addon/services/universe.js

@@ -212,7 +212,7 @@ export default class UniverseService extends Service.extend(Evented) {
      * @returns {ApplicationInstance} The application instance
      */
     getApplicationInstance() {
-        return this.applicationInstance ?? window.Fleetbase;
+        return this.applicationInstance;
     }
 
     /**

addon/services/universe/extension-manager.js

@@ -1,4 +1,4 @@
-import Service from '@ember/service';
+import Service, { inject as service } from '@ember/service';
 import Evented from '@ember/object/evented';
 import { tracked } from '@glimmer/tracking';
 import { getOwner } from '@ember/application';
@@ -22,6 +22,7 @@ import ExtensionBootState from '../../contracts/extension-boot-state';
  * @extends Service
  */
 export default class ExtensionManagerService extends Service.extend(Evented) {
+    @service universe;
     /**
      * Reference to the root Ember Application Instance.
      * Used for registering components/services to the application container
@@ -84,14 +85,14 @@ export default class ExtensionManagerService extends Service.extend(Evented) {
      * @returns {Application}
      */
     #getApplication() {
-        // First priority: use applicationInstance if set
-        if (this.applicationInstance) {
-            return this.applicationInstance;
+        // First priority use the universe application instance
+        if (this.universe.applicationInstance) {
+            return this.universe.applicationInstance;
         }
 
-        // Second priority: window.Fleetbase
-        if (typeof window !== 'undefined' && window.Fleetbase) {
-            return window.Fleetbase;
+        // Second priority: use applicationInstance if set
+        if (this.applicationInstance) {
+            return this.applicationInstance;
         }
 
         // Third priority: try to get application from owner

addon/services/universe/hook-service.js

@@ -1,4 +1,4 @@
-import Service from '@ember/service';
+import Service, { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { getOwner } from '@ember/application';
 import Hook from '../../contracts/hook';
@@ -14,6 +14,8 @@ import HookRegistry from '../../contracts/hook-registry';
  * @extends Service
  */
 export default class HookService extends Service {
+    @service universe;
+
     /**
      * Reference to the root Ember Application Instance.
      * Used for registering components/services to the application container
@@ -69,14 +71,14 @@ export default class HookService extends Service {
      * @returns {Application}
      */
     #getApplication() {
-        // First priority: use applicationInstance if set
-        if (this.applicationInstance) {
-            return this.applicationInstance;
+        // First priority use the universe application instance
+        if (this.universe.applicationInstance) {
+            return this.universe.applicationInstance;
         }
 
-        // Second priority: window.Fleetbase
-        if (typeof window !== 'undefined' && window.Fleetbase) {
-            return window.Fleetbase;
+        // Second priority: use applicationInstance if set
+        if (this.applicationInstance) {
+            return this.applicationInstance;
         }
 
         // Third priority: try to get application from owner

addon/services/universe/registry-service.js

@@ -82,21 +82,16 @@ export default class RegistryService extends Service {
         let application = this.applicationInstance;
 
         if (!application) {
-            // Second priority: window.Fleetbase
-            if (typeof window !== 'undefined' && window.Fleetbase) {
-                application = window.Fleetbase;
+            // Second priority: try to get from owner
+            const owner = getOwner(this);
+            if (owner && owner.application) {
+                application = owner.application;
             } else {
-                // Third priority: try to get from owner
-                const owner = getOwner(this);
-                if (owner && owner.application) {
-                    application = owner.application;
-                } else {
-                    warn('[RegistryService] Could not find application instance for registry initialization', {
-                        id: 'registry-service.no-application',
-                    });
-                    // Return a new instance as fallback (won't be shared)
-                    return new UniverseRegistry();
-                }
+                warn('[RegistryService] Could not find application instance for registry initialization', {
+                    id: 'registry-service.no-application',
+                });
+                // Return a new instance as fallback (won't be shared)
+                return new UniverseRegistry();
             }
         }
 
@@ -489,7 +484,7 @@ export default class RegistryService extends Service {
      * );
      */
     async registerHelper(helperName, helperClassOrTemplateHelper, options = {}) {
-        const owner = this.applicationInstance || (typeof window !== 'undefined' && window.Fleetbase) || getOwner(this);
+        const owner = this.applicationInstance || getOwner(this);
 
         if (!owner) {
             warn('No owner available for helper registration. Cannot register helper.', {
@@ -539,7 +534,7 @@ export default class RegistryService extends Service {
      * @returns {Promise<Function|Class|null>} The loaded helper or null if failed
      */
     async #loadHelperFromEngine(templateHelper) {
-        const owner = this.applicationInstance || (typeof window !== 'undefined' && window.Fleetbase) || getOwner(this);
+        const owner = this.applicationInstance || getOwner(this);
 
         if (!owner) {
             return null;

addon/utils/inject-engine-service.js

@@ -35,7 +35,7 @@ function automaticServiceResolution(service, target, owner) {
 }
 
 function _getOwner(target) {
-    return window.Fleetbase ?? getOwner(target);
+    return getOwner(target);
 }
 
 export default function injectEngineService(target, engineName, serviceName, options = {}) {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/ember-core",
-    "version": "0.3.9",
+    "version": "0.3.10",
     "description": "Provides all the core services, decorators and utilities for building a Fleetbase extension for the Console.",
     "keywords": [
         "fleetbase-core",