@fleetbase/ember-core 0.1.5 → 0.1.7

package/addon/services/filters.js

@@ -6,6 +6,7 @@ import { isBlank } from '@ember/utils';
 import { computed, action, set, get } from '@ember/object';
 import { getOwner } from '@ember/application';
 import { format } from 'date-fns';
+import getWithDefault from '../utils/get-with-default';
 
 export default class FiltersService extends Service {
     @service router;
@@ -74,7 +75,7 @@ export default class FiltersService extends Service {
     }
 
     @action apply(controller) {
-        const currentQueryParams = this.getQueryParams();
+        const currentQueryParams = this.getQueryParams(controller);
         const updatableQueryParams = { ...currentQueryParams, ...this.pendingQueryParams };
 
         for (let queryParam in updatableQueryParams) {
@@ -88,8 +89,10 @@ export default class FiltersService extends Service {
     }
 
     @action reset(controller) {
-        this.clear((queryParam) => {
-            set(controller, queryParam, undefined);
+        const queryParams = this.getQueryParams(controller);
+
+        Object.keys(queryParams).forEach((queryParam) => {
+            this.removeFromController(controller, queryParam, undefined);
         });
     }
 
@@ -103,20 +106,18 @@ export default class FiltersService extends Service {
             return this.clear(queryParam, callback);
         }
 
-        if (isBlank(queryParam)) {
+        if (isBlank(queryParam) && Object.keys(currentQueryParams).length > 0) {
             return Object.keys(currentQueryParams).forEach((qp) => this.clear(callback, qp));
         }
 
-        if (isArray(queryParam)) {
+        if (isArray(queryParam) && !isBlank(queryParam)) {
             return queryParam.forEach((qp) => this.clear(callback, qp));
         }
 
-        if (typeof queryParam !== 'string') {
-            return;
+        if (typeof queryParam === 'string') {
+            set(this.pendingQueryParams, queryParam, undefined);
         }
 
-        set(this.pendingQueryParams, queryParam, undefined);
-
         if (typeof callback == 'function') {
             callback(queryParam);
         }
@@ -153,10 +154,29 @@ export default class FiltersService extends Service {
         return currentRoute.queryParams;
     }
 
-    @action getQueryParams() {
+    @action getQueryParams(controller) {
+        const queryParams = {};
+
+        if (controller) {
+            const controllerQueryParams = getWithDefault(controller, 'queryParams', []);
+
+            if (isArray(controllerQueryParams)) {
+                for (let i = 0; i < controllerQueryParams.length; i++) {
+                    const qp = controllerQueryParams.objectAt(i);
+
+                    if (this.managedQueryParams.includes(qp)) {
+                        continue;
+                    }
+
+                    queryParams[qp] = get(controller, qp);
+                }
+
+                return queryParams;
+            }
+        }
+
         const currentRoute = this.lookupCurrentRoute();
         const currentRouteQueryParams = Object.keys(currentRoute.queryParams);
-        const queryParams = {};
 
         for (let i = 0; i < currentRouteQueryParams.length; i++) {
             const queryParam = currentRouteQueryParams.objectAt(i);

package/addon/services/loader.js

@@ -2,31 +2,55 @@ import Service from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { later } from '@ember/runloop';
 
+/**
+ * Service for managing loading overlays.
+ *
+ * @class LoaderService
+ * @extends Service
+ */
 export default class LoaderService extends Service {
+    /**
+     * Tracks the routes that have been loaded.
+     *
+     * @type {Array}
+     * @tracked
+     */
     @tracked routesLoaded = [];
 
+    /**
+     * Shows the loader based on a condition.
+     *
+     * @param {String|HTMLElement} target - The loader target.
+     * @param {Object} options - Options for controlling the loader.
+     * @param {Function|null} condition - The condition to evaluate.
+     */
     showOnCondition(target, options = {}, condition = null) {
-        const { loadingMessage, opacity } = options;
-
         if (typeof condition === 'function') {
             condition = condition();
         }
 
         if (condition) {
-            this.showLoader(target, loadingMessage, opacity);
+            this.showLoader(target, options);
         }
     }
 
-    showOnInitialTransition(transition, target, loadingMessage = 'Loading...', opacity = 0.1) {
+    /**
+     * Shows loader during the initial route transition.
+     *
+     * @param {Object} transition - The Ember.js transition object.
+     * @param {String|HTMLElement} target - The loader target.
+     * @param {Object} options - Options for controlling the loader.
+     */
+    showOnInitialTransition(transition, target, options = { loadingMessage: 'Loading...', opacity: 0.1 }) {
         const route = transition.to.name;
         const isSameRoute = transition.from ? transition.to.name === transition.from.name : false;
 
         if (!this.routesLoaded.includes(route) || !isSameRoute) {
-            if (document.querySelectorAll(`.overloader`).length > 0) {
+            if (document.querySelectorAll('.overloader').length > 0) {
                 return;
             }
 
-            this.showLoader(target, loadingMessage, opacity);
+            this.showLoader(target, options);
 
             transition.finally(() => {
                 this.removeLoader(target);
@@ -39,20 +63,25 @@ export default class LoaderService extends Service {
     /**
      * Creates an HTML element node for a loading overlay with a message.
      *
-     * @param {String|HTMLElement} targetSelector
-     * @param {String} loadingMessage
-     * @return {HTMLElement} loader
+     * @param {String|HTMLElement} targetSelector - The loader target.
+     * @param {Object} options - Options for controlling the loader.
+     * @returns {HTMLElement} - The loader element.
      */
-    showLoader(targetSelector, loadingMessage = 'Loading...', opacity = 0.1) {
+    showLoader(targetSelector, options = {}) {
         let target = typeof targetSelector === 'string' ? document.querySelector(targetSelector) : targetSelector;
 
         if (!target) {
             target = document.body;
         }
 
+        const loadingMessage = typeof options.loadingMessage === 'string' ? options.loadingMessage : 'Loading...';
+        const opacity = typeof options.opacity === 'number' ? options.opacity : 0.1;
         const isDarkMode = document.body.dataset.theme ? document.body.dataset.theme === 'dark' : true;
+        const preserveTargetPosition = options.preserveTargetPosition === true;
 
-        target.style.position = 'relative';
+        if (!preserveTargetPosition) {
+            target.style.position = 'relative';
+        }
 
         let loader = document.createElement('div');
         loader.classList.add('overloader');
@@ -71,15 +100,21 @@ export default class LoaderService extends Service {
         return loader;
     }
 
-    show(loadingMessage = 'Loading...', opacity = 0.1) {
-        return this.showLoader(document.body, loadingMessage, opacity);
+    /**
+     * Shows a loader on the document body.
+     *
+     * @param {Object} options - Options for controlling the loader.
+     * @returns {HTMLElement} - The loader element.
+     */
+    show(options = { loadingMessage: 'Loading...', opacity: 0.1 }) {
+        return this.showLoader(document.body, options);
     }
 
     /**
-     * Creates an HTML element node for a loading overlay with a message.
+     * Removes a loader from a target.
      *
-     * @param {String|HTMLElement} targetSelector
-     * @return {Service} this
+     * @param {String|HTMLElement} targetSelector - The loader target.
+     * @returns {Service} - The current service instance.
      */
     removeLoader(targetSelector) {
         let target = typeof targetSelector === 'string' ? document.querySelector(targetSelector) : targetSelector;
@@ -114,9 +149,10 @@ export default class LoaderService extends Service {
     }
 
     /**
-     * Removes the all loader instances.
+     * Removes all loader instances after a delay.
      *
-     * @return {Service} this
+     * @param {Number} delay - The delay in milliseconds.
+     * @returns {Service} - The current service instance.
      */
     remove(delay = 0) {
         const loaders = document.querySelectorAll(`.overloader`);

package/addon/services/universe.js

@@ -447,6 +447,14 @@ export default class UniverseService extends Service.extend(Evented) {
         // create menu item
         const menuItem = this._createMenuItem(title, route, options);
 
+        // register menu item
+        if (!this[internalRegistryName]) {
+            this[internalRegistryName] = {
+                menuItems: [],
+                menuPanels: [],
+            };
+        }
+
         // register menu item
         this[internalRegistryName].menuItems.pushObject(menuItem);
 

package/addon/utils/inject-engine-service.js

@@ -0,0 +1,15 @@
+import { getOwner } from '@ember/application';
+
+export default function injectEngineService(target, engineName, serviceName, key = null) {
+    const owner = getOwner(target);
+    const universe = owner.lookup('service:universe');
+    const service = universe.getServiceFromEngine(engineName, serviceName);
+    const effectiveServiceName = key || serviceName;
+
+    Object.defineProperty(target, effectiveServiceName, {
+        value: service,
+        writable: false,
+        configurable: true,
+        enumerable: true,
+    });
+}

package/app/utils/inject-engine-service.js

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

package/package.json

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