fixed order exports, added import template downloads, added bulk order search, patched filters

Author: roncodes

addon/components/modals/bulk-assign-driver.hbs

@@ -25,5 +25,8 @@
                 </div>
             </ModelSelect>
         </InputGroup>
+        <InputGroup>
+            <Checkbox @value={{@options.notifyDriver}} @label="Notify driver" @onToggle={{@options.toggleNotifyDriver}} @alignItems="center" @labelClass="mb-0i" />
+        </InputGroup>
     </div>
 </Modals::BulkActionModel>

addon/controllers/management/contacts/index.js

@@ -337,6 +337,9 @@ export default class ManagementContactsIndexController extends BaseController {
             onImportCompleted: () => {
                 this.hostRouter.refresh();
             },
+            onImportTemplate: () => {
+                window.open('https://flb-assets.s3.ap-southeast-1.amazonaws.com/import-templates/Fleetbase_Contact_Import_Template.xlsx');
+            },
         });
     }
 

addon/controllers/management/drivers/index.js

@@ -468,6 +468,9 @@ export default class ManagementDriversIndexController extends BaseController {
             onImportCompleted: () => {
                 this.hostRouter.refresh();
             },
+            onImportTemplate: () => {
+                window.open('https://flb-assets.s3.ap-southeast-1.amazonaws.com/import-templates/Fleetbase_Driver_Import_Template.xlsx');
+            },
         });
     }
 

addon/controllers/management/fuel-reports/index.js

@@ -315,6 +315,9 @@ export default class ManagementFuelReportsIndexController extends BaseController
             onImportCompleted: () => {
                 this.hostRouter.refresh();
             },
+            onImportTemplate: () => {
+                window.open('https://flb-assets.s3.ap-southeast-1.amazonaws.com/import-templates/Fleetbase_Fuel_Report_Import_Template.xlsx');
+            },
         });
     }
 

addon/controllers/management/issues/index.js

@@ -372,6 +372,9 @@ export default class ManagementIssuesIndexController extends BaseController {
             onImportCompleted: () => {
                 this.hostRouter.refresh();
             },
+            onImportTemplate: () => {
+                window.open('https://flb-assets.s3.ap-southeast-1.amazonaws.com/import-templates/Fleetbase_Issue_Import_Template.xlsx');
+            },
         });
     }
 

addon/controllers/management/places/index.js

@@ -423,6 +423,9 @@ export default class ManagementPlacesIndexController extends BaseController {
             onImportCompleted: () => {
                 this.hostRouter.refresh();
             },
+            onImportTemplate: () => {
+                window.open('https://flb-assets.s3.ap-southeast-1.amazonaws.com/import-templates/Fleetbase_Place_Import_Template.xlsx');
+            },
         });
     }
 

addon/controllers/management/vehicles/index.js

@@ -490,6 +490,9 @@ export default class ManagementVehiclesIndexController extends BaseController {
             onImportCompleted: () => {
                 this.hostRouter.refresh();
             },
+            onImportTemplate: () => {
+                window.open('https://flb-assets.s3.ap-southeast-1.amazonaws.com/import-templates/Fleetbase_Vehicle_Import_Template.xlsx');
+            },
         });
     }
 

addon/controllers/management/vendors/index.js

@@ -422,6 +422,9 @@ export default class ManagementVendorsIndexController extends BaseController {
             onImportCompleted: () => {
                 this.hostRouter.refresh();
             },
+            onImportTemplate: () => {
+                window.open('https://flb-assets.s3.ap-southeast-1.amazonaws.com/import-templates/Fleetbase_Vendor_Import_Template.xlsx');
+            },
         });
     }
 

addon/controllers/operations/orders/index.js

@@ -8,7 +8,6 @@ import { isArray } from '@ember/array';
 import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
-import fromStore from '@fleetbase/ember-core/decorators/from-store';
 
 export default class OperationsOrdersIndexController extends BaseController {
     @service currentUser;
@@ -52,6 +51,8 @@ export default class OperationsOrdersIndexController extends BaseController {
         'scheduled_at',
         'status',
         'type',
+        'without_driver',
+        'bulk_query',
         'layout',
         'drawerOpen',
         'drawerTab',
@@ -289,6 +290,27 @@ export default class OperationsOrdersIndexController extends BaseController {
      */
     @tracked statusOptions = [];
 
+    /**
+     * Filterable sorder configs.
+     *
+     * @type {Array}
+     */
+    @tracked orderConfigs = [];
+
+    /**
+     * Free text input for a bulk query.
+     *
+     * @type {String}
+     */
+    @tracked bulkSearchValue = '';
+
+    /**
+     * Actual bulk query.
+     *
+     * @type {String}
+     */
+    @tracked bulk_query = '';
+
     /**
      * Flag to determine if the layout is 'map'
      *
@@ -317,13 +339,6 @@ export default class OperationsOrdersIndexController extends BaseController {
      */
     @equal('layout', 'analytics') isAnalyticsLayout;
 
-    /**
-     * All available order configs.
-     *
-     * @memberof OperationsOrdersIndexController
-     */
-    @fromStore('order-config', { limit: -1 }) orderConfigs;
-
     /**
      * All columns applicable for orders
      *
@@ -437,6 +452,7 @@ export default class OperationsOrdersIndexController extends BaseController {
             filterComponent: 'filter/model',
             filterComponentPlaceholder: 'Select vehicle for order',
             filterParam: 'vehicle',
+            modelNamePath: 'display_name',
             model: 'vehicle',
         },
         {
@@ -567,7 +583,9 @@ export default class OperationsOrdersIndexController extends BaseController {
             label: '',
             cellComponent: 'table/cell/base',
             filterParam: 'without_driver',
-            filterComponenr: 'checkbox',
+            filterComponent: 'filter/checkbox',
+            filterLabel: 'Without Driver Assigned',
+            noFilterLabel: true,
             filterable: true,
             hidden: true,
         },
@@ -626,6 +644,7 @@ export default class OperationsOrdersIndexController extends BaseController {
         super(...arguments);
         this.listenForOrderEvents();
         this.getOrderStatusOptions.perform();
+        this.getOrderConfigs.perform();
     }
 
     @task *getOrderStatusOptions() {
@@ -636,6 +655,14 @@ export default class OperationsOrdersIndexController extends BaseController {
         }
     }
 
+    @task *getOrderConfigs() {
+        try {
+            this.orderConfigs = yield this.store.query('order-config', { limit: -1 });
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
+    }
+
     /**
      * Listen for incoming order events to refresh listing.
      *
@@ -683,9 +710,6 @@ export default class OperationsOrdersIndexController extends BaseController {
             // Listed on company channel
             const channel = socket.subscribe(channelId);
 
-            // Events which should trigger refresh
-            const listening = ['order.ready', 'order.driver_assigned'];
-
             // Listen for channel subscription
             (async () => {
                 for await (let output of channel) {
@@ -702,11 +726,7 @@ export default class OperationsOrdersIndexController extends BaseController {
                     }
 
                     if (event === 'order.ready') {
-                        const order = await findOrder(data.id);
-
-                        if (order) {
-                            order.reload();
-                        }
+                        this.hostRouter.refresh();
                     }
                 }
             })();
@@ -1123,6 +1143,13 @@ export default class OperationsOrdersIndexController extends BaseController {
             return;
         }
 
+        const updateFetchParams = (key, value) => {
+            const current = this.modalsManager.getOption('fetchParams') ?? {};
+            const next = value === undefined ? Object.fromEntries(Object.entries(current).filter(([k]) => k !== key)) : { ...current, [key]: value };
+
+            this.modalsManager.setOption('fetchParams', next);
+        };
+
         this.crud.bulkAction('assign driver', selected, {
             template: 'modals/bulk-assign-driver',
             acceptButtonText: 'Assign Driver to Orders',
@@ -1133,14 +1160,20 @@ export default class OperationsOrdersIndexController extends BaseController {
             actionPath: 'orders/bulk-assign-driver',
             actionMethod: 'PATCH',
             driverAssigned: null,
+            notifyDriver: true,
             fetchParams: {},
             resolveModelName: (model) => `${model.get('tracking_number.tracking_number')} - ${model.get('public_id')}`,
             selectDriver: (driver) => {
                 this.modalsManager.setOptions({
                     driverAssigned: driver,
                     acceptButtonDisabled: driver ? false : true,
-                    fetchParams: driver ? { driver: driver.id } : {},
                 });
+
+                updateFetchParams('driver', driver?.id);
+            },
+            toggleNotifyDriver: (checked) => {
+                this.modalsManager.setOption('notifyDriver', checked);
+                updateFetchParams('silent', !checked);
             },
             withSelected: (orders) => {
                 const driverAssigned = this.modalsManager.getOption('driverAssigned');
@@ -1174,4 +1207,13 @@ export default class OperationsOrdersIndexController extends BaseController {
             this.activeOrdersCount = response.orders_in_progress;
         });
     }
+
+    @action commitBulkQuery() {
+        this.bulk_query = this.bulkSearchValue;
+    }
+
+    @action removeBulkQuery() {
+        this.bulkSearchValue = '';
+        this.bulk_query = null;
+    }
 }

addon/routes/management/contacts/index.js

@@ -1,7 +1,6 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import { action, set } from '@ember/object';
-import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
+import { action } from '@ember/object';
 
 export default class ManagementContactsIndexRoute extends Route {
     @service store;
@@ -30,13 +29,6 @@ export default class ManagementContactsIndexRoute extends Route {
         });
     }
 
-    @action willTransition(transition) {
-        if (isNestedRouteTransition(transition)) {
-            set(this.queryParams, 'page.refreshModel', false);
-            set(this.queryParams, 'sort.refreshModel', false);
-        }
-    }
-
     model(params) {
         return this.store.query('contact', { ...params, type: 'contact' });
     }