@fleetbase/ember-core 0.1.6 → 0.1.8

package/addon/services/crud.js

@@ -1,12 +1,13 @@
 import Service from '@ember/service';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
+import { action, get } from '@ember/object';
 import { isArray } from '@ember/array';
 import { dasherize } from '@ember/string';
 import { later } from '@ember/runloop';
 import { pluralize } from 'ember-inflector';
 import { format as formatDate } from 'date-fns';
 import getModelName from '../utils/get-model-name';
+import getWithDefault from '../utils/get-with-default';
 import humanize from '../utils/humanize';
 import first from '../utils/first';
 
@@ -47,7 +48,7 @@ export default class CrudService extends Service {
      * @void
      */
     @action delete(model, options = {}) {
-        const modelName = getModelName(model, options?.modelName, { humanize: true, capitalizeWords: true });
+        const modelName = getModelName(model, get(options, 'modelName'), { humanize: true, capitalizeWords: true });
 
         this.modalsManager.confirm({
             title: `Are you sure to delete this ${modelName}?`,
@@ -98,7 +99,7 @@ export default class CrudService extends Service {
         }
 
         const firstModel = first(selected);
-        const modelName = getModelName(firstModel, options?.modelName, { humanize: true, capitalizeWords: true });
+        const modelName = getModelName(firstModel, get(options, 'modelName'), { humanize: true, capitalizeWords: true });
 
         // make sure all are the same type
         selected = selected.filter((m) => getModelName(m) === getModelName(firstModel));
@@ -126,9 +127,11 @@ export default class CrudService extends Service {
         }
 
         const firstModel = first(selected);
-        const modelName = getModelName(firstModel, options?.modelName, { humanize: true, capitalizeWords: true });
+        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', {});
 
         this.modalsManager.show('modals/bulk-action-model', {
             title: `Bulk ${verb} ${pluralize(modelName)}`,
@@ -152,9 +155,14 @@ export default class CrudService extends Service {
 
                 modal.startLoading();
 
-                return this.fetch[actionMethod](options.actionPath, {
-                    ids: selected.map((model) => model.id),
-                })
+                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.`);
 

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/package.json

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