@fleetbase/ember-core 0.1.0 → 0.1.2

package/addon/adapters/application.js

@@ -40,25 +40,21 @@ export default class ApplicationAdapter extends RESTAdapter {
      *
      * @var {String}
      */
-    get host() {
-        return get(config, 'API.host');
-    }
+    @tracked host;
 
     /**
      * The default namespace for adapter
      *
      * @var {String}
      */
-    get namespace() {
-        return get(config, 'API.namespace');
-    }
+    @tracked namespace;
 
     /**
      * Credentials
      *
      * @var {String}
      */
-    credentials = 'include';
+    @tracked credentials = 'include';
 
     /**
      * Mutable headers property.
@@ -68,31 +64,23 @@ export default class ApplicationAdapter extends RESTAdapter {
     @tracked _headers;
 
     /**
-     * The headers to send with request.
-     *
-     * @var {Object}
+     * Creates an instance of ApplicationAdapter.
+     * @memberof ApplicationAdapter
      */
-    get headers() {
-        if (this._headers) {
-            return this._headers;
-        }
+    constructor() {
+        super(...arguments);
 
-        return this.getHeaders();
-    }
-
-    /**
-     * Setter fucntion to overwrite headers.
-     */
-    set headers(headers) {
-        this._headers = headers;
+        this.host = get(config, 'API.host');
+        this.namespace = get(config, 'API.namespace');
+        this.headers = this.setupHeaders();
     }
 
     /**
-     * Gets headers that should be sent with request.
+     * Setup headers that should be sent with request.
      *
      * @return {Object}
      */
-    getHeaders() {
+    setupHeaders() {
         const headers = {};
         const userId = this.session.data.authenticated.user;
         const userOptions = getUserOptions();
@@ -127,20 +115,8 @@ export default class ApplicationAdapter extends RESTAdapter {
             headers['Access-Console-Sandbox-Key'] = testKey;
         }
 
-        return headers;
-    }
-
-    /**
-     * Gets fresh headers and sets them.
-     *
-     * @return {Object}
-     */
-    refreshHeaders() {
-        const headers = this.getHeaders();
-
         this.headers = headers;
-
-        return headers;
+        return this.headers;
     }
 
     /**
@@ -153,7 +129,7 @@ export default class ApplicationAdapter extends RESTAdapter {
      * @return {Object}
      */
     ajaxOptions(url, type, options) {
-        this.refreshHeaders();
+        this.setupHeaders();
 
         const ajaxOptions = super.ajaxOptions(url, type, options);
         ajaxOptions.credentials = this.credentials;

package/addon/exports/host-services.js

@@ -14,6 +14,7 @@ const hostServices = [
     'notifications',
     'fileQueue',
     'universe',
+    'intl',
     { hostRouter: 'router' },
 ];
 

package/addon/exports/services.js

@@ -15,6 +15,7 @@ const services = [
     'hostRouter',
     'fileQueue',
     'universe',
+    'intl',
 ];
 
 export default services;

package/addon/services/theme.js

@@ -1,6 +1,7 @@
 import Service from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
+import { computed } from '@ember/object';
 import { dasherize } from '@ember/string';
 import { isArray } from '@ember/array';
 import { getOwner } from '@ember/application';
@@ -32,19 +33,23 @@ export default class ThemeService extends Service {
      *
      * @var {String}
      */
-    get activeTheme() {
+    @computed('currentTheme', 'initialTheme') get activeTheme() {
         const userSetTheme = this.currentUser.getOption(`theme`);
 
         if (userSetTheme) {
             return userSetTheme;
         }
 
+        if (this.initialTheme) {
+            return this.initialTheme;
+        }
+
         if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
             return 'dark';
         }
 
         // default to dark theme
-        return 'dark';
+        return this.currentTheme;
     }
 
     /**
@@ -56,12 +61,19 @@ export default class ThemeService extends Service {
     }
 
     /**
-     * Current theme, defaults to light, active theme represents the theme set by user OS
+     * Current theme, defaults to dark, active theme represents the theme set by user OS
      *
      * @var {String}
      */
     @tracked currentTheme = 'dark';
 
+    /**
+     * The initially set theme
+     *
+     * @var {String}
+     */
+    @tracked initialTheme;
+
     /**
      * The current route name as style class
      *
@@ -116,6 +128,7 @@ export default class ThemeService extends Service {
      * @void
      */
     initialize(options = {}) {
+        this.initialTheme = options?.theme;
         this.setTheme(this.activeTheme);
         this.setEnvironment();
         this.resetScroll();
@@ -125,6 +138,19 @@ export default class ThemeService extends Service {
         // remove route class as exiting
         this.router.on('routeWillChange', this.routeWillChange.bind(this));
         // remove console-loader
+        this.removeConsoleLoader();
+        // run a `onInit` callback if provided
+        if (typeof options.onInit === 'function') {
+            options.onInit(this);
+        }
+    }
+
+    /**
+     * Remove the console-loader
+     *
+     * @memberof ThemeService
+     */
+    removeConsoleLoader() {
         const consoleLoader = document.getElementById(`console-loader`);
         if (consoleLoader) {
             consoleLoader.remove();

package/addon/services/universe.js

@@ -12,6 +12,7 @@ import RSVP from 'rsvp';
 
 export default class UniverseService extends Service.extend(Evented) {
     @service router;
+    @service intl;
     @tracked headerMenuItems = [];
     @tracked organizationMenuItems = [];
     @tracked userMenuItems = [];
@@ -527,4 +528,13 @@ export default class UniverseService extends Service.extend(Evented) {
             return engineInstance;
         });
     }
+
+    /**
+     * Alias for intl service `t`
+     *
+     * @memberof UniverseService
+     */
+    t() {
+        this.intl.t(...arguments);
+    }
 }

package/addon/utils/console-url.js

@@ -2,55 +2,39 @@ import config from '@fleetbase/console/config/environment';
 import { isBlank } from '@ember/utils';
 
 const isDevelopment = ['local', 'development'].includes(config.environment);
-const isProduction = ['production'].includes(config.environment);
 
-function queryString(params) {
+export function queryString(params) {
     return Object.keys(params)
-        .map((key) => `${key}=${params[key]}`)
+        .map((key) => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`)
         .join('&');
 }
 
-function extractHostAndPort(url) {
+export function extractHostAndPort(url) {
     try {
-        const parsedUrl = new URL(url);
-        const host = parsedUrl.hostname;
-        const port = parsedUrl.port;
-
-        return {
-            host: host,
-            port: port || null,
-        };
+        const { hostname: host, port = null } = new URL(url);
+        return { host, port };
     } catch (error) {
-        console.error('Invalid URL:', error);
-        return null;
+        return { host: null, port: null };
     }
 }
 
-export default function consoleUrl(path = '', queryParams = {}, subdomain = 'console', host = 'fleetbase.io') {
-    let parsedHost = extractHostAndPort(host);
-    let url = isDevelopment ? 'http://' : 'https://';
-
-    if (subdomain) {
-        url += subdomain + '.';
-    }
-
-    let urlParams = !isBlank(queryParams) ? queryString(queryParams) : '';
-
-    if (!isProduction && !isDevelopment) {
-        url += `${config.environment}.`;
+export default function consoleUrl(path = '', queryParams = {}, subdomain = null, host = null) {
+    if (subdomain === null || host === null) {
+        const { hostname, host: currentHost } = window.location;
+        if (subdomain === null) {
+            const parts = hostname.split('.');
+            subdomain = parts.length > 2 ? parts[0] : null;
+        }
+        if (host === null) {
+            host = currentHost;
+        }
     }
 
-    url += parsedHost.host;
-
-    if (parsedHost.port) {
-        url += `:${parsedHost.port}`;
-    }
-
-    url += `/${path}`;
-
-    if (urlParams) {
-        url += `?${urlParams}`;
-    }
+    const { host: parsedHost, port } = extractHostAndPort(host);
+    const protocol = isDevelopment ? 'http://' : 'https://';
+    const urlParams = !isBlank(queryParams) ? queryString(queryParams) : '';
+    const portSegment = port ? `:${port}` : '';
+    const pathSegment = path.startsWith('/') ? path : `/${path}`;
 
-    return url;
+    return `${protocol}${subdomain ? subdomain + '.' : ''}${parsedHost}${portSegment}${pathSegment}${urlParams ? '?' + urlParams : ''}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/ember-core",
-    "version": "0.1.0",
+    "version": "0.1.2",
     "description": "Provides all the core services, decorators and utilities for building a Fleetbase extension for the Console.",
     "keywords": [
         "fleetbase-core",
@@ -27,10 +27,13 @@
         "start": "ember serve",
         "test": "npm-run-all lint test:*",
         "test:ember": "ember test",
-        "test:ember-compatibility": "ember try:each"
+        "test:ember-compatibility": "ember try:each",
+        "publish:npm": "npm config set registry https://registry.npmjs.org/ && npm publish",
+        "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "date-fns": "^2.29.2",
+        "date-fns": "^2.30.0",
+        "ember-intl": "^6.0.0-beta.6",
         "ember-auto-import": "^2.4.2",
         "ember-cli-babel": "^7.26.11",
         "ember-cli-htmlbars": "^6.1.0",