@fleetbase/fleetops-engine 0.0.3 → 0.0.5

package/addon/components/cell/driver-name.js

@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { action, get, computed } from '@ember/object';
 
 export default class CellDriverNameComponent extends Component {
-    @computed('args.column.modelPath', 'args.row') get driver() {
+    @computed('args.{column.modelPath,args.row}') get driver() {
         const { column, row } = this.args;
 
         if (typeof column?.modelPath === 'string') {

package/addon/components/custom-field.hbs

@@ -1,6 +1,6 @@
 <div class="custom-meta-field" ...attributes>
     {{#if this.isTextInput}}
-        <Input type="text" class="form-input w-full {{@inputClass}}" @value={{@value}} placeholder={{@placeholder}} />
+        <Input @type="text" class="form-input w-full {{@inputClass}}" @value={{@value}} placeholder={{@placeholder}} />
     {{/if}}
 
     {{#if this.isSelectInput}}

package/addon/components/fleet-driver-listing.hbs

@@ -2,7 +2,7 @@
     <div class="mb-2 flex items-center justify-between">
         <div class="flex items-center">
             <div class="fleet-driver-listing-search">
-                <Input @type="text" {{on "keyup" this.search}} placeholder="Search drivers in fleet" class="w-64 form-input form-input-sm" />
+                <Input @type="text" {{on "keyup" (perform this.search)}} placeholder="Search drivers in fleet" class="w-64 form-input form-input-sm" />
             </div>
 
             {{#if this.isLoading}}

package/addon/components/fleet-driver-listing.js

@@ -3,26 +3,27 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action, computed } from '@ember/object';
 import { isArray } from '@ember/array';
-import { task, timeout } from 'ember-concurrency';
+import { isBlank } from '@ember/utils';
+import { timeout } from 'ember-concurrency';
+import { task } from 'ember-concurrency-decorators';
 
 export default class FleetDriverListingComponent extends Component {
     @service store;
     @service appCache;
-
     @tracked drivers = [];
     @tracked selected = [];
     @tracked query;
     @tracked isLoading = false;
     @tracked isLoaded = false;
 
-    @computed ('selected.[]') get ids() {
-        return this.selected.map(selection => selection.id);
+    @computed('selected.[]') get ids() {
+        return this.selected.map((selection) => selection.id);
     }
 
     @action async setupComponent() {
         const { selected, fleet } = this.args;
 
-        this.selected = (isArray(selected) && selected.length) ? selected : [];
+        this.selected = isArray(selected) && selected.length ? selected : [];
         this.drivers = await this.queryFleetDrivers(fleet);
     }
 
@@ -95,23 +96,22 @@ export default class FleetDriverListingComponent extends Component {
     }
 
     @action toggleSelected(options = []) {
-        return options.map(option => {
+        return options.map((option) => {
             option.set('selected', this.ids.includes(option.id));
 
             return option;
         });
     }
 
-     @action search({ target }) {
-        const { value } = target;
+    @task({ restartable: true }) *search({ target: { value } }) {
         const { fleet } = this.args;
 
-        this.searchTask.perform(fleet, value);
-     }
- 
-     @task(function* (fleet, query) {
+        if (isBlank(value)) {
+            return;
+        }
+
         yield timeout(300);
- 
-        this.drivers = yield this.queryFleetDrivers(fleet, query);
-     }).restartable() searchTask;
+
+        this.drivers = yield this.queryFleetDrivers(fleet, value);
+    }
 }

package/addon/components/global-search.hbs

@@ -64,7 +64,7 @@
                                 {{/if}}
                             </div>
                             <div>
-                                <div class="grid grid-cols-8 gap-2">
+                                <div role="list" class="grid grid-cols-8 gap-2">
                                     {{#each result.payload.entities as |entity|}}
                                         <div role="listitem" title={{entity.name}}>
                                             <div class="mb-1.5">

package/addon/components/integrated-order-details.js

@@ -1,6 +1,6 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import { equal } from '@ember/object/computed';
 
 export default class IntegratedOrderDetailsComponent extends Component {

package/addon/components/leaflet-draw-control.js

@@ -1,6 +1,5 @@
 import BaseLayer from 'ember-leaflet/components/base-layer';
-import { getProperties, computed } from '@ember/object';
-import { run } from '@ember/runloop';
+import { computed } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import { scheduleOnce } from '@ember/runloop';
 import { classify, camelize } from '@ember/string';
@@ -25,7 +24,7 @@ export default class LeafletDrawControl extends BaseLayer {
 
     leafletOptions = ['draw', 'edit', 'remove', 'poly', 'position'];
 
-    @computed('args', 'leaflefEvents.[]', 'leafletEvents') get usedLeafletEvents() {
+    @computed('leafletEvents.[]', 'args') get usedLeafletEvents() {
         return this.leafletEvents.filter((eventName) => {
             eventName = camelize(eventName.replace(':', ' '));
             let methodName = `_${eventName}`;
@@ -35,7 +34,7 @@ export default class LeafletDrawControl extends BaseLayer {
         });
     }
 
-    @computed('args.draw', 'args.edit', 'args.remove', 'args.poly', 'args.position') get options() {
+    @computed('args.{draw,edit,remove,poly,position}') get options() {
         return {
             position: getWithDefault(this.args, 'position', 'topright'),
             draw: getWithDefault(this.args, 'draw', { marker: false, circlemarker: false, circle: false, polyline: false }),

package/addon/components/live-map.js

@@ -9,10 +9,8 @@ import { alias } from '@ember/object/computed';
 import { guidFor } from '@ember/object/internals';
 import { later } from '@ember/runloop';
 import { allSettled } from 'rsvp';
-import extractCoordinates from '@fleetbase/ember-core/utils/extract-coordinates';
 import config from 'ember-get-config';
 
-const L = window.L;
 const DEFAULT_LATITUDE = 1.369;
 const DEFAULT_LONGITUDE = 103.8864;
 
@@ -131,7 +129,6 @@ export default class LiveMapComponent extends Component {
         }
 
         const { contextmenu } = map;
-        console.log('map.contextmenu', contextmenu);
         const contextMenuItems = this.buildContextMenuItems();
 
         contextMenuItems.forEach((options) => contextmenu.addItem(options));

package/addon/components/modals/contact-form.hbs

@@ -3,7 +3,7 @@
         <div class="flex">
             <div class="w-32 mb-6 mr-6">
                 <Image src={{@options.contact.photo_url}} @fallbackSrc={{config "defaultValues.contactImage"}} alt={{@options.contact.name}} height="128" width="128" class="h-32 w-32 rounded-md" />
-                <UploadButton @name="photos" @accept="image/*" @onFileAdded={{fn @options.uploadNewPhoto}} class="w-32" />
+                <UploadButton @name="photos" @accept="image/*" @onFileAdded={{@options.uploadNewPhoto}} class="w-32" />
             </div>
             <div class="flex-1">
                 <div class="grid grid-cols-2 gap-2 text-xs dark:text-gray-100">
@@ -11,28 +11,28 @@
                         <label>
                             Name
                         </label>
-                        <Input @value={{@options.contact.name}} type="text" class="w-full form-input" placeholder="Name" />
+                        <Input @value={{@options.contact.name}}  @type="text" class="w-full form-input" placeholder="Name" />
                     </div>
 
                     <div class="input-group">
                         <label>
                             Title
                         </label>
-                        <Input @value={{@options.contact.title}} type="text" class="w-full form-input" placeholder="Title" />
+                        <Input @value={{@options.contact.title}}  @type="text" class="w-full form-input" placeholder="Title" />
                     </div>
 
                     <div class="input-group">
                         <label>
                             Internal ID
                         </label>
-                        <Input @value={{@options.contact.internal_id}} type="text" class="w-full form-input" placeholder="Internal ID" />
+                        <Input @value={{@options.contact.internal_id}}  @type="text" class="w-full form-input" placeholder="Internal ID" />
                     </div>
 
                     <div class="input-group">
                         <label>
                             Email
                         </label>
-                        <Input @value={{@options.contact.email}} type="text" class="w-full form-input" placeholder="Email" />
+                        <Input @value={{@options.contact.email}}  @type="text" class="w-full form-input" placeholder="Email" />
                     </div>
 
                     <div class="input-group">

package/addon/components/modals/driver-form.hbs

@@ -3,7 +3,7 @@
         <div class="flex">
             <div class="w-32 mb-6 mr-6">
                 <Image src={{@options.driver.photo_url}} @fallbackSrc={{config "defaultValues.driverImage"}} alt={{@options.driver.name}} height="128" width="128" class="h-32 w-32 rounded-md" />
-                <UploadButton @name="photos" @accept="image/*" @onFileAdded={{fn @options.uploadNewPhoto}} class="w-32" />
+                <UploadButton @name="photos" @accept="image/*" @onFileAdded={{@options.uploadNewPhoto}} class="w-32" />
             </div>
             <div class="flex-1">
                 <div class="grid grid-cols-1 gap-2 text-xs dark:text-gray-100">
@@ -11,7 +11,7 @@
                         <label>
                             Name
                         </label>
-                        <Input @value={{@options.driver.name}} type="text" class="w-full form-input" placeholder="Name" />
+                        <Input @value={{@options.driver.name}}  @type="text" class="w-full form-input" placeholder="Name" />
                     </div>
                 </div>
 
@@ -20,21 +20,21 @@
                         <label>
                             Internal ID
                         </label>
-                        <Input @value={{@options.driver.internal_id}} type="text" class="w-full form-input" placeholder="Internal ID" />
+                        <Input @value={{@options.driver.internal_id}}  @type="text" class="w-full form-input" placeholder="Internal ID" />
                     </div>
 
                     <div class="input-group">
                         <label>
                             Drivers License
                         </label>
-                        <Input @value={{@options.driver.drivers_license_number}} type="text" class="w-full form-input" placeholder="Drivers License" />
+                        <Input @value={{@options.driver.drivers_license_number}}  @type="text" class="w-full form-input" placeholder="Drivers License" />
                     </div>
 
                     <div class="input-group">
                         <label>
                             Email
                         </label>
-                        <Input @value={{@options.driver.email}} type="text" class="w-full form-input" placeholder="Email" />
+                        <Input @value={{@options.driver.email}}  @type="text" class="w-full form-input" placeholder="Email" />
                     </div>
 
                     <div class="input-group">
@@ -66,7 +66,7 @@
                         <label>
                             City
                         </label>
-                        <Input @value={{@options.driver.city}} type="text" class="w-full form-input" placeholder="City" />
+                        <Input @value={{@options.driver.city}}  @type="text" class="w-full form-input" placeholder="City" />
                     </div>
 
                     <div class="input-group">

package/addon/components/modals/entity-form.hbs

@@ -3,7 +3,7 @@
         <div class="flex">
             <div class="w-32 mb-6 mr-6 flex flex-col items-center">
                 <Image src={{@options.entity.photo_url}} alt={{@options.entity.name}} height="128" width="128" class="h-32 w-32 rounded-md" />
-                <UploadButton @name="photos" @accept="image/*" @onFileAdded={{fn @options.uploadNewPhoto}} class="w-32" />
+                <UploadButton @name="photos" @accept="image/*" @onFileAdded={{@options.uploadNewPhoto}} class="w-32" />
             </div>
             <div class="flex-1 space-y-4">
                 <ContentPanel @title="Details" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">

package/addon/components/modals/group-form.hbs

@@ -5,7 +5,7 @@
                 <label>
                     Group Name
                 </label>
-                <Input @value={{@options.group.name}} type="text" class="w-full form-input" placeholder=" Group Name" />
+                <Input @value={{@options.group.name}}  @type="text" class="w-full form-input" placeholder=" Group Name" />
             </div>
 
             <div class="input-group">

package/addon/components/modals/order-form.hbs

@@ -9,7 +9,7 @@
             </div>
 
             <InputGroup @name="Customer" @helpText="Optionally assign the customer of this order. If it's a new customer, use the 'New Customer' button above.">
-                <ModelSelect @modelName="customer" @selectedModel={{@options.order.customer}} @placeholder="Select Customer" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @allowClear={{true}} @onChange={{fn @options.setOrderCustomer}} as |model|>
+                <ModelSelect @modelName="customer" @selectedModel={{@options.order.customer}} @placeholder="Select Customer" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @allowClear={{true}} @onChange={{@options.setOrderCustomer}} as |model|>
                     <div class="flex items-center">
                         <div class="w-7">
                             <FaIcon @icon={{if model.isVendor "warehouse" "user" }} />

package/addon/components/modals/order-import.hbs

@@ -30,7 +30,7 @@
                                 <p class="text-base font-semibold my-5">Drag and drop spreadsheet files onto this dropzone</p>
                             {{/if}}
 
-                            <UploadButton @buttonText="or select spreadsheets to upload" @type="magic" @name="spreadsheets" @for="spreadsheets" @accept={{join "," @options.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{fn @options.queueFile}} class="w-72" />
+                            <UploadButton @buttonText="or select spreadsheets to upload" @type="magic" @name="spreadsheets" @for="spreadsheets" @accept={{join "," @options.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{@options.queueFile}} class="w-72" />
                         </div>
                     {{/if}}
                 </FileDropzone>

package/addon/components/modals/policy-form.hbs

@@ -4,13 +4,13 @@
             <label>
                 Policy Name
             </label>
-            <Input @value={{@options.policy.name}} type="text" class="w-full form-input" placeholder="Enter a name for your policy" />
+            <Input @value={{@options.policy.name}}  @type="text" class="w-full form-input" placeholder="Enter a name for your policy" />
         </div>
         <div class="input-group">
             <label>
                 Policy Description
             </label>
-            <Input @value={{@options.policy.description}} type="text" class="w-full form-input" placeholder="Enter a description for your policy" />
+            <Input @value={{@options.policy.description}}  @type="text" class="w-full form-input" placeholder="Enter a description for your policy" />
         </div>
         <div class="input-group">
             <label>

package/addon/components/modals/role-form.hbs

@@ -4,7 +4,7 @@
             <label>
                 Role Name
             </label>
-            <Input @value={{@options.role.name}} type="text" class="w-full form-input" placeholder="Enter a name for this role" />
+            <Input @value={{@options.role.name}}  @type="text" class="w-full form-input" placeholder="Enter a name for this role" />
         </div>
         <div class="input-group">
             <label>

package/addon/components/modals/user-form.hbs

@@ -3,7 +3,7 @@
         <div class="flex">
             <div class="w-32 mb-6 mr-6">
                 <img src={{@options.user.avatar_url}} alt={{@options.user.name}} class="w-32 h-32 rounded-md" />
-                <FileUpload @name="photos" @accept="image/*" @onFileAdded={{fn @options.uploadNewPhoto}} as |queue|>
+                <FileUpload @name="photos" @accept="image/*" @onFileAdded={{@options.uploadNewPhoto}} as |queue|>
                     <a tabindex={{0}} class="flex items-center px-0 mt-2 text-xs no-underline truncate btn btn-sm btn-default">
                         {{#if queue.files.length}}
                             <Spinner class="mr-1" />
@@ -25,14 +25,14 @@
                         <label>
                             Name
                         </label>
-                        <Input @value={{@options.user.name}} type="text" class="w-full form-input" placeholder="Name" />
+                        <Input @value={{@options.user.name}}  @type="text" class="w-full form-input" placeholder="Name" />
                     </div>
 
                     <div class="input-group">
                         <label>
                             Email
                         </label>
-                        <Input @value={{@options.user.email}} type="text" class="w-full form-input" placeholder="Email" />
+                        <Input @value={{@options.user.email}}  @type="text" class="w-full form-input" placeholder="Email" />
                     </div>
 
                     <div class="input-group">