@fleetbase/ember-core 0.3.19 → 0.3.20

package/addon/authenticators/fleetbase.js

@@ -61,8 +61,8 @@ export default class FleetbaseAuthenticator extends Base {
      * @param {boolean} remember
      * @param {string} path
      */
-    authenticate(credentials = {}, remember = false, path = 'auth/login') {
-        return this.fetch.post(path, { ...credentials, remember }).then((response) => {
+    authenticate(credentials = {}, remember = false, path = 'auth/login', options = {}) {
+        return this.fetch.post(path, { ...credentials, remember }, options).then((response) => {
             if (response.errors) {
                 const errorMessage = getWithDefault(response.errors, '0', 'Authentication failed!');
                 const errorCode = getWithDefault(response, 'code');

package/addon/services/chat.js

@@ -9,6 +9,7 @@ export default class ChatService extends Service.extend(Evented) {
     @service store;
     @service currentUser;
     @service appCache;
+    @service fetch;
     @tracked channels = [];
     @tracked openChannels = [];
 
@@ -72,7 +73,28 @@ export default class ChatService extends Service.extend(Evented) {
         return this.openChannels;
     }
 
-    createChatChannel(name) {
+    createChatChannel(name, participants = []) {
+        return this.fetch
+            .post(
+                'chat-channels',
+                {
+                    chatChannel: {
+                        name,
+                        participants,
+                    },
+                },
+                {
+                    normalizeToEmberData: true,
+                    normalizeModelType: 'chatChannel',
+                }
+            )
+            .then((chatChannelRecord) => {
+                this.trigger('chat.created', chatChannelRecord);
+                return chatChannelRecord;
+            });
+    }
+
+    createEmptyChatChannel(name) {
         const chatChannelRecord = this.store.createRecord('chat-channel', { name });
         return chatChannelRecord.save().finally(() => {
             this.trigger('chat.created', chatChannelRecord);

package/addon/services/current-user.js

@@ -3,7 +3,7 @@ import Evented from '@ember/object/evented';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { dasherize } from '@ember/string';
-import { computed, get } from '@ember/object';
+import { get } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { alias } from '@ember/object/computed';
 import { storageFor } from 'ember-local-storage';
@@ -60,8 +60,29 @@ export default class CurrentUserService extends Service.extend(Evented) {
     @alias('userSnapshot.role_name') roleName;
     @alias('userSnapshot.role') role;
 
-    @computed('id') get optionsPrefix() {
-        return `${this.id}:`;
+    get authenticatedOptionOwnerId() {
+        const authenticatedUserId = this.session?.data?.authenticated?.user;
+
+        if (this.session?.isAuthenticated && authenticatedUserId) {
+            return authenticatedUserId;
+        }
+
+        try {
+            const localStorageSession = JSON.parse(window.localStorage.getItem('ember_simple_auth-session'));
+            const authenticatedSession = localStorageSession?.authenticated;
+
+            if (authenticatedSession?.token && authenticatedSession?.user) {
+                return authenticatedSession.user;
+            }
+        } catch (error) {
+            // Ignore malformed session storage and fall back to the current snapshot.
+        }
+
+        return null;
+    }
+
+    get optionsPrefix() {
+        return `${this.authenticatedOptionOwnerId || this.id || 'anon'}:`;
     }
 
     get latitude() {
@@ -93,7 +114,7 @@ export default class CurrentUserService extends Service.extend(Evented) {
             const user = await this.store.findRecord('user', 'me');
 
             // set user
-            this.setUser(user);
+            await this.setUser(user);
 
             // Load preferences
             await this.loadPreferences();
@@ -114,7 +135,7 @@ export default class CurrentUserService extends Service.extend(Evented) {
             const user = await this.store.queryRecord('user', { me: true });
 
             // set user
-            this.setUser(user);
+            await this.setUser(user);
 
             // Load user whois data
             await this.loadWhois();
@@ -348,6 +369,7 @@ export default class CurrentUserService extends Service.extend(Evented) {
         // Set current user
         this.set('user', user);
         this.set('userSnapshot', snapshot);
+        this.theme.syncThemeFromCurrentUser();
 
         // Resolve the organization for event payload
         const organization = this.store.peekRecord('company', user.get('company_uuid'));

package/addon/services/fetch.js

@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { get, set } from '@ember/object';
 import { isBlank } from '@ember/utils';
-import { dasherize } from '@ember/string';
+import { dasherize, underscore } from '@ember/string';
 import { isArray } from '@ember/array';
 import { singularize, pluralize } from 'ember-inflector';
 import { task } from 'ember-concurrency';
@@ -186,11 +186,16 @@ export default class FetchService extends Service {
         }
 
         const type = dasherize(singularize(modelType));
+        const pluralizedModelType = pluralize(underscore(modelType));
 
         if (isArray(payload)) {
             return payload.map((instance) => this.store.push(this.store.normalize(type, instance)));
         }
 
+        if (isArray(payload[pluralizedModelType])) {
+            return payload[pluralizedModelType].map((instance) => this.store.push(this.store.normalize(type, instance)));
+        }
+
         if (isArray(payload[modelType])) {
             return payload[modelType].map((instance) => this.store.push(this.store.normalize(type, instance)));
         }

package/addon/services/theme.js

@@ -2,7 +2,6 @@ import Service from '@ember/service';
 import Evented from '@ember/object/evented';
 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';
@@ -35,8 +34,8 @@ export default class ThemeService extends Service.extend(Evented) {
      *
      * @var {String}
      */
-    @computed('currentTheme', 'initialTheme') get activeTheme() {
-        const userSetTheme = this.currentUser.getOption(`theme`);
+    get activeTheme() {
+        const userSetTheme = this.currentUser.getOption('theme');
 
         if (userSetTheme) {
             return userSetTheme;
@@ -67,7 +66,7 @@ export default class ThemeService extends Service.extend(Evented) {
      *
      * @var {String}
      */
-    @tracked currentTheme = 'dark';
+    @tracked currentTheme = this.currentUser.getOption('theme', 'dark');
 
     /**
      * The initially set theme
@@ -131,7 +130,7 @@ export default class ThemeService extends Service.extend(Evented) {
      */
     initialize(options = {}) {
         this.initialTheme = options?.theme;
-        this.setTheme(this.activeTheme);
+        this.applyTheme(this.activeTheme, { persist: false });
         this.setEnvironment();
         this.resetScroll();
         this.setRoutebodyClassNames(options.bodyClassNames && isArray(options.bodyClassNames) ? options.bodyClassNames : []);
@@ -203,10 +202,32 @@ export default class ThemeService extends Service.extend(Evented) {
      * @void
      */
     setTheme(theme = 'light') {
+        this.applyTheme(theme);
+    }
+
+    /**
+     * Synchronize the active theme from the current user-scoped preference.
+     *
+     * @void
+     */
+    syncThemeFromCurrentUser() {
+        this.applyTheme(this.activeTheme, { persist: false });
+    }
+
+    /**
+     * Apply a theme consistently to service state and document body.
+     *
+     * @void
+     */
+    applyTheme(theme = 'light', options = {}) {
+        const persist = options.persist !== false;
+
         debug(`Theme was changed to: ${theme}`);
-        document.body.classList.remove(`${this.currentTheme}-theme`);
+        document.body.classList.remove('light-theme', 'dark-theme');
         document.body.classList.add(`${theme}-theme`);
-        this.currentUser.setOption('theme', theme);
+        if (persist) {
+            this.currentUser.setOption('theme', theme);
+        }
         this.activeTheme = theme;
         this.trigger('theme.changed', theme);
     }

package/package.json

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