@fleetbase/ember-core 0.2.22 → 0.3.0

package/addon/adapters/application.js

@@ -13,7 +13,7 @@ import getUserOptions from '../utils/get-user-options';
 import config from 'ember-get-config';
 
 if (isBlank(config.API.host)) {
-    config.API.host = `${window.location.protocol}//${window.location.hostname}:8000`;
+    config.API.host = `${window.location.protocol}//${window.location.hostname}`;
 }
 const DEFAULT_ERROR_MESSAGE = 'Oops! Something went wrong. Please try again or contact support if the issue persists.';
 export default class ApplicationAdapter extends RESTAdapter {

package/addon/services/crud.js

@@ -54,38 +54,38 @@ export default class CrudService extends Service {
      */
     @action delete(model, options = {}) {
         const modelName = getModelName(model, get(options, 'modelName'), { humanize: true, capitalizeWords: true });
+        const successNotification = options.successNotification || `${model.name ? modelName + " '" + model.name + "'" : "'" + modelName + "'"} has been deleted.`;
 
         this.modalsManager.confirm({
             title: `Are you sure to delete this ${modelName}?`,
             args: ['model'],
             model,
-            confirm: (modal) => {
-                if (typeof options.onConfirm === 'function') {
-                    options.onConfirm(model);
+            confirm: async (modal) => {
+                if (typeof options.onTrigger === 'function') {
+                    options.onTrigger(model);
                 }
 
                 modal.startLoading();
 
-                return model
-                    .destroyRecord()
-                    .then((model) => {
-                        this.notifications.success(options.successNotification || `${model.name ? modelName + " '" + model.name + "'" : "'" + modelName + "'"} has been deleted.`);
-                        if (typeof options.onSuccess === 'function') {
-                            options.onSuccess(model);
-                        }
-                    })
-                    .catch((error) => {
-                        this.notifications.serverError(error);
+                try {
+                    const response = await model.destroyRecord();
+                    this.notifications.success(successNotification);
+                    if (typeof options.onSuccess === 'function') {
+                        options.onSuccess(model);
+                    }
 
-                        if (typeof options.onError === 'function') {
-                            options.onError(error, model);
-                        }
-                    })
-                    .finally(() => {
-                        if (typeof options.callback === 'function') {
-                            options.callback(model);
-                        }
-                    });
+                    return response;
+                } catch (error) {
+                    this.notifications.serverError(error);
+
+                    if (typeof options.onError === 'function') {
+                        options.onError(error, model);
+                    }
+                } finally {
+                    if (typeof options.callback === 'function') {
+                        options.callback(model);
+                    }
+                }
             },
             ...options,
         });
@@ -135,10 +135,21 @@ export default class CrudService extends Service {
         const modelName = getModelName(firstModel, get(options, 'modelName'), { humanize: true, capitalizeWords: true });
         const count = selected.length;
         const actionMethod = (typeof options.actionMethod === 'string' ? options.actionMethod : `POST`).toLowerCase();
-        const fetchParams = getWithDefault(options, 'fetchParams', {});
-        const fetchOptions = getWithDefault(options, 'fetchOptions', {});
+        const modalTemplate = getWithDefault(options, 'template', 'modals/bulk-action-model');
+        const successMessage = options.successNotification ?? `${count} ${pluralize(count, modelName)} were updated successfully.`;
+
+        if (typeof options.resolveModelName === 'function') {
+            selected = selected.map((model) => {
+                const resolvedModelName = options.resolveModelName(model);
+                if (typeof resolvedModelName === 'string') {
+                    model.set('list_resolved_name', resolvedModelName);
+                }
+
+                return model;
+            });
+        }
 
-        this.modalsManager.show('modals/bulk-action-model', {
+        this.modalsManager.show(modalTemplate, {
             title: `Bulk ${verb} ${pluralize(modelName)}`,
             acceptButtonText: humanize(verb),
             args: ['selected'],
@@ -151,42 +162,49 @@ export default class CrudService extends Service {
                 selected.removeObject(model);
                 this.modalsManager.setOption('selected', selected);
             },
-            confirm: (modal) => {
+            confirm: async (modal) => {
                 const selected = modal.getOption('selected');
+                const fetchParams = modal.getOption('fetchParams', {});
+                const fetchOptions = modal.getOption('fetchOptions', {});
+                const callback = modal.getOption('callback');
 
-                if (typeof options.onConfirm === 'function') {
-                    options.onConfirm(selected);
+                if (typeof options.withSelected === 'function') {
+                    options.withSelected(selected);
                 }
 
                 modal.startLoading();
 
-                return this.fetch[actionMethod](
-                    options.actionPath,
-                    {
-                        ids: selected.map((model) => model.id),
-                        ...fetchParams,
-                    },
-                    fetchOptions
-                )
-                    .then((response) => {
-                        this.notifications.success(response.message ?? options.successNotification ?? `${count} ${pluralize(modelName, count)} were updated successfully.`);
-
-                        if (typeof options.onSuccess === 'function') {
-                            options.onSuccess(selected);
-                        }
-                    })
-                    .catch((error) => {
-                        this.notifications.serverError(error);
+                try {
+                    const response = await this.fetch.request(
+                        options.actionPath,
+                        actionMethod,
+                        {
+                            body: JSON.stringify({
+                                ids: selected.map((model) => model.id),
+                                ...fetchParams,
+                            }),
+                        },
+                        fetchOptions
+                    );
 
-                        if (typeof options.onError === 'function') {
-                            options.onError(error, selected);
-                        }
-                    })
-                    .finally(() => {
-                        if (typeof options.callback === 'function') {
-                            options.callback(selected);
-                        }
-                    });
+                    this.notifications.success(response.message ?? successMessage);
+                    if (typeof options.onSuccess === 'function') {
+                        options.onSuccess(selected);
+                    }
+
+                    return response;
+                } catch (error) {
+                    console.error(error.message, error);
+                    this.notifications.serverError(error);
+
+                    if (typeof options.onError === 'function') {
+                        options.onError(error, selected);
+                    }
+                } finally {
+                    if (typeof callback === 'function') {
+                        callback(selected);
+                    }
+                }
             },
             ...options,
         });

package/addon/services/current-user.js

@@ -7,6 +7,7 @@ import { computed, get } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { alias } from '@ember/object/computed';
 import { storageFor } from 'ember-local-storage';
+import { debug } from '@ember/debug';
 
 export default class CurrentUserService extends Service.extend(Evented) {
     @service session;
@@ -17,6 +18,7 @@ export default class CurrentUserService extends Service.extend(Evented) {
     @service intl;
 
     @tracked user = { id: 'anon' };
+    @tracked userSnapshot = { id: 'anon' };
     @tracked company = {};
     @tracked permissions = [];
     @tracked organizations = [];
@@ -24,16 +26,16 @@ export default class CurrentUserService extends Service.extend(Evented) {
     @tracked locale = 'en-us';
 
     @storageFor('user-options') options;
-    @alias('user.id') id;
-    @alias('user.name') name;
-    @alias('user.phone') phone;
-    @alias('user.email') email;
-    @alias('user.avatar_url') avatarUrl;
-    @alias('user.is_admin') isAdmin;
-    @alias('user.company_uuid') companyId;
-    @alias('user.company_name') companyName;
-    @alias('user.role_name') roleName;
-    @alias('user.role') role;
+    @alias('userSnapshot.id') id;
+    @alias('userSnapshot.name') name;
+    @alias('userSnapshot.phone') phone;
+    @alias('userSnapshot.email') email;
+    @alias('userSnapshot.avatar_url') avatarUrl;
+    @alias('userSnapshot.is_admin') isAdmin;
+    @alias('userSnapshot.company_uuid') companyId;
+    @alias('userSnapshot.company_name') companyName;
+    @alias('userSnapshot.role_name') roleName;
+    @alias('userSnapshot.role') role;
 
     @computed('id') get optionsPrefix() {
         return `${this.id}:`;
@@ -62,7 +64,10 @@ export default class CurrentUserService extends Service.extend(Evented) {
     async load() {
         if (this.session.isAuthenticated) {
             const user = await this.store.findRecord('user', 'me');
+            const snapshot = await this.getUserSnapshot(user);
+
             this.set('user', user);
+            this.set('userSnapshot', snapshot);
             this.trigger('user.loaded', user);
 
             // Set permissions
@@ -85,9 +90,11 @@ export default class CurrentUserService extends Service.extend(Evented) {
 
         try {
             const user = await this.store.queryRecord('user', { me: true });
+            const snapshot = await this.getUserSnapshot(user);
 
             // Set current user
             this.set('user', user);
+            this.set('userSnapshot', snapshot);
             this.trigger('user.loaded', user);
 
             // Set permissions
@@ -116,7 +123,7 @@ export default class CurrentUserService extends Service.extend(Evented) {
 
             return user;
         } catch (error) {
-            console.log(error.message);
+            debug(`Error loading current user : ${error.message}`);
             throw error;
         }
     }
@@ -257,4 +264,20 @@ export default class CurrentUserService extends Service.extend(Evented) {
     filledOption(key) {
         return !isBlank(this.getOption(key));
     }
+
+    async getUserSnapshot(user) {
+        const role = await user.get('role');
+        const snapshot = user.serialize({ includeId: true });
+
+        return {
+            ...snapshot,
+            id: snapshot.uuid,
+            company_name: user.get('company_name'),
+            role_name: user.get('role_name'),
+            role: {
+                ...role.serialize({ includeId: true }),
+                id: role.get('id'),
+            },
+        };
+    }
 }

package/addon/services/fetch.js

@@ -19,7 +19,7 @@ import isEmptyObject from '../utils/is-empty-object';
 import fetch from 'fetch';
 
 if (isBlank(config.API.host)) {
-    config.API.host = `${window.location.protocol}//${window.location.hostname}:8000`;
+    config.API.host = `${window.location.protocol}//${window.location.hostname}`;
 }
 
 export default class FetchService extends Service {
@@ -612,7 +612,7 @@ export default class FetchService extends Service {
         const headers = Object.assign(this.getHeaders(), options.headers ?? {});
         const method = options.method ?? 'GET';
         const credentials = options.credentials ?? this.credentials;
-        const baseUrl = `${options.host || this.host}/${options.namespace || this.namespace}`;
+        const baseUrl = options.externalRequest === true ? '' : `${options.host ?? this.host}/${options.namespace || this.namespace}`;
         const isReadOnlyRequest = ['GET', 'HEAD'].includes(method.toUpperCase());
         const params = isReadOnlyRequest && !isEmptyObject(query) ? `?${new URLSearchParams(query).toString()}` : '';
         const body = !isReadOnlyRequest ? JSON.stringify(query) : {};
@@ -628,7 +628,7 @@ export default class FetchService extends Service {
         }
 
         return new Promise((resolve, reject) => {
-            return fetch(`${baseUrl}/${path}${params}`, fetchOptions)
+            return fetch(`${baseUrl ? baseUrl + '/' : ''}${path}${params}`, fetchOptions)
                 .then((response) => {
                     options.fileName = this.getFilenameFromResponse(response, options.fileName);
                     options.mimeType = this.getMimeTypeFromResponse(response, options.mimeType);

package/addon/services/filters.js

@@ -170,7 +170,6 @@ export default class FiltersService extends Service {
 
                     queryParams[qp] = get(controller, qp);
                 }
-
                 return queryParams;
             }
         }

package/addon/utils/create-notification-key.js

@@ -0,0 +1,8 @@
+import { camelize } from '@ember/string';
+
+export default function createNotificationKey(definition, name) {
+    const withoutSlashes = definition.replace(/[\W_]+/g, '');
+    const key = `${camelize(withoutSlashes)}__${camelize(name)}`;
+
+    return key;
+}

package/addon/utils/is-authenticated.js

@@ -0,0 +1,25 @@
+/**
+ * Check whether the current browser session is authenticated.
+ *
+ * Reads the session payload Ember Simple Auth stores in
+ * localStorage (`ember_simple_auth-session`) and returns `true`
+ * only if it finds a bearer token.
+ *
+ * @return {boolean}  `true` when a user appears to be logged in, otherwise `false`.
+ */
+export default function isAuthenticated() {
+    try {
+        const rawSession = window.localStorage.getItem('ember_simple_auth-session');
+        if (!rawSession) {
+            return false; // nothing stored
+        }
+
+        const { authenticated } = JSON.parse(rawSession);
+
+        // Basic check: token must be a non-empty string
+        return typeof authenticated?.token === 'string' && authenticated.token.trim().length > 0;
+    } catch {
+        // Malformed JSON or restricted access to localStorage
+        return false;
+    }
+}

package/addon/utils/load-installed-extensions.js

@@ -1,5 +1,6 @@
-import loadExtensions from '../utils/load-extensions';
-import fleetbaseApiFetch from '../utils/fleetbase-api-fetch';
+import loadExtensions from './load-extensions';
+import fleetbaseApiFetch from './fleetbase-api-fetch';
+import isAuthenticated from './is-authenticated';
 
 export default async function loadInstalledExtensions(additionalCoreEngines = []) {
     const CORE_ENGINES = [
@@ -11,7 +12,12 @@ export default async function loadInstalledExtensions(additionalCoreEngines = []
         ...additionalCoreEngines,
     ];
     const INDEXED_ENGINES = await loadExtensions();
-    const INSTALLED_ENGINES = await fleetbaseApiFetch('get', 'engines', {}, { namespace: '~registry/v1', fallbackResponse: [] });
+    // const INSTALLED_ENGINES = await fleetbaseApiFetch('get', 'engines', {}, { namespace: '~registry/v1', fallbackResponse: [] });
+
+    let INSTALLED_ENGINES = [];
+    if (isAuthenticated()) {
+        INSTALLED_ENGINES = await fleetbaseApiFetch('GET', 'engines', {}, { namespace: '~registry/v1', fallbackResponse: [] });
+    }
 
     const isInstalledEngine = (engineName) => {
         return CORE_ENGINES.includes(engineName) || INSTALLED_ENGINES.find((pkg) => pkg.name === engineName);

package/addon/utils/timeout.js

@@ -0,0 +1,15 @@
+import { later } from '@ember/runloop';
+
+export default function timeout(ms = 300, options = {}) {
+    const response = options.response ? options.response : true;
+
+    return new Promise((resolve) => {
+        later(
+            this,
+            () => {
+                resolve(response);
+            },
+            ms
+        );
+    });
+}

package/app/utils/create-notification-key.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/ember-core/utils/create-notification-key';

package/app/utils/is-authenticated.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/ember-core/utils/is-authenticated';

package/app/utils/timeout.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/ember-core/utils/timeout';

package/package.json

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