@fleetbase/fleetops-engine 0.3.3 → 0.3.5

package/addon/controllers/management/places/index.js

@@ -60,7 +60,7 @@ export default class ManagementPlacesIndexController extends Controller {
      *
      * @var {Array}
      */
-    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'internal_id', 'country', 'phone', 'email', 'created_at', 'updated_at'];
+    queryParams = ['name', 'page', 'limit', 'sort', 'query', 'public_id', 'country', 'phone', 'created_at', 'updated_at', 'city', 'neighborhood', 'state'];
 
     /**
      * The current page of data being viewed
@@ -91,11 +91,11 @@ export default class ManagementPlacesIndexController extends Controller {
     @tracked public_id;
 
     /**
-     * The filterable param `internal_id`
+     * The filterable param `public_id`
      *
      * @var {String}
      */
-    @tracked internal_id;
+    @tracked postal_code;
 
     /**
      * The filterable param `phone`
@@ -105,11 +105,18 @@ export default class ManagementPlacesIndexController extends Controller {
     @tracked phone;
 
     /**
-     * The filterable param `email`
+     * The filterable param `city`
+     *
+     * @var {String}
+     */
+    @tracked city;
+
+    /**
+     * The filterable param `name`
      *
      * @var {String}
      */
-    @tracked email;
+    @tracked name;
 
     /**
      * The filterable param `country`
@@ -118,6 +125,13 @@ export default class ManagementPlacesIndexController extends Controller {
      */
     @tracked country;
 
+    /**
+     * The filterable param `country`
+     *
+     * @var {String}
+     */
+    @tracked neighborhood;
+
     /**
      * All columns applicable for orders
      *
@@ -133,6 +147,7 @@ export default class ManagementPlacesIndexController extends Controller {
             resizable: true,
             sortable: true,
             filterable: true,
+            filterParam: 'name',
             filterComponent: 'filter/string',
         },
         {
@@ -148,34 +163,36 @@ export default class ManagementPlacesIndexController extends Controller {
             filterComponent: 'filter/string',
         },
         {
-            label: 'ID',
-            valuePath: 'public_id',
-            width: '120px',
-            cellComponent: 'click-to-copy',
+            label: 'State',
+            valuePath: 'state',
+            cellComponent: 'table/cell/anchor',
+            action: this.viewPlace,
+            width: '100px',
             resizable: true,
             sortable: true,
             filterable: true,
+            filterParam: 'state',
             filterComponent: 'filter/string',
         },
         {
-            label: 'Internal ID',
-            valuePath: 'internal_id',
-            cellComponent: 'click-to-copy',
-            width: '120px',
+            label: 'City',
+            valuePath: 'city',
+            cellComponent: 'table/cell/anchor',
+            action: this.viewPlace,
+            width: '100px',
             resizable: true,
             sortable: true,
             filterable: true,
-            hidden: true,
+            filterParam: 'city',
             filterComponent: 'filter/string',
         },
         {
-            label: 'Email',
-            valuePath: 'email',
-            cellComponent: 'table/cell/base',
+            label: 'ID',
+            valuePath: 'public_id',
             width: '120px',
+            cellComponent: 'click-to-copy',
             resizable: true,
             sortable: true,
-            hidden: true,
             filterable: true,
             filterComponent: 'filter/string',
         },
@@ -202,6 +219,29 @@ export default class ManagementPlacesIndexController extends Controller {
             filterComponent: 'filter/country',
             filterParam: 'country',
         },
+        {
+            label: 'Neighborhood',
+            valuePath: 'neighborhood',
+            cellComponent: 'table/cell/anchor',
+            action: this.viewPlace,
+            width: '100px',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterParam: 'neighborhood',
+            filterComponent: 'filter/string',
+        },
+        {
+            label: 'Postal Code',
+            valuePath: 'postal_code',
+            cellComponent: 'table/cell/anchor',
+            action: this.viewPlace,
+            width: '100px',
+            resizable: true,
+            sortable: true,
+            filterable: true,
+            filterComponent: 'filter/string',
+        },
         {
             label: 'Created At',
             valuePath: 'createdAt',
@@ -223,6 +263,7 @@ export default class ManagementPlacesIndexController extends Controller {
             filterable: true,
             filterComponent: 'filter/date',
         },
+
         {
             label: '',
             cellComponent: 'table/cell/dropdown',
@@ -308,6 +349,12 @@ export default class ManagementPlacesIndexController extends Controller {
         return this.transitionToRoute('management.places.index.details', place);
     }
 
+    /**
+     * Reload layout view.
+     */
+    @action reload() {
+        return this.hostRouter.refresh();
+    }
     /**
      * Create a new place
      *

package/addon/controllers/management/vehicles/index.js

@@ -69,7 +69,24 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      *
      * @var {Array}
      */
-    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'status', 'created_at', 'updated_at', 'created_by', 'updated_by'];
+    queryParams = [
+        'page',
+        'limit',
+        'sort',
+        'query',
+        'public_id',
+        'status',
+        'created_at',
+        'updated_at',
+        'created_by',
+        'updated_by',
+        'name',
+        'plate_number',
+        'year',
+        'vehicle_make',
+        'vehicle_model',
+        'display_name',
+    ];
 
     /**
      * The search query.
@@ -176,6 +193,13 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      */
     @tracked driver;
 
+    /**
+     * The filterable param `display_name`.
+     *
+     * @var {String}
+     */
+    @tracked display_name;
+
     /**
      * TableComponent instance.
      *
@@ -214,7 +238,7 @@ export default class ManagementVehiclesIndexController extends ManagementControl
             sortable: true,
             filterable: true,
             filterComponent: 'filter/string',
-            filterParam: 'name',
+            filterParam: 'display_name',
             showOnlineIndicator: true,
         },
         {
@@ -264,7 +288,7 @@ export default class ManagementVehiclesIndexController extends ManagementControl
             sortable: true,
             hidden: true,
             filterable: true,
-            filterParam: 'vehicle_make',
+            filterParam: 'make',
             filterComponent: 'filter/string',
         },
         {
@@ -276,7 +300,7 @@ export default class ManagementVehiclesIndexController extends ManagementControl
             sortable: true,
             hidden: true,
             filterable: true,
-            filterParam: 'vehicle_model',
+            filterParam: 'model',
             filterComponent: 'filter/string',
         },
         {
@@ -382,6 +406,13 @@ export default class ManagementVehiclesIndexController extends ManagementControl
         },
     ];
 
+    /**
+     * Reload layout view.
+     */
+    @action reload() {
+        return this.hostRouter.refresh();
+    }
+
     /**
      * Bulk deletes selected `vehicle` via confirm prompt
      *
@@ -490,4 +521,25 @@ export default class ManagementVehiclesIndexController extends ManagementControl
      * @void
      */
     @action assignDriver() {}
+
+    /**
+     * View a place location on map
+     *
+     * @param {PlaceModel} place
+     * @param {Object} options
+     * @void
+     */
+    @action viewOnMap(place, options = {}) {
+        const { latitude, longitude } = place;
+
+        this.modalsManager.show('modals/point-map', {
+            title: `Location of ${place.name}`,
+            acceptButtonText: 'Done',
+            hideDeclineButton: true,
+            latitude,
+            longitude,
+            location: [latitude, longitude],
+            ...options,
+        });
+    }
 }

package/addon/controllers/management/vendors/index.js

@@ -5,7 +5,7 @@ import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
-
+import getVendorStatusOptions from '../../../utils/get-vendor-status-options';
 export default class ManagementVendorsIndexController extends Controller {
     /**
      * Inject the `management.places.index` controller
@@ -68,7 +68,7 @@ export default class ManagementVendorsIndexController extends Controller {
      *
      * @var {Array}
      */
-    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'internal_id', 'created_by', 'updated_by', 'status'];
+    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'internal_id', 'created_by', 'updated_by', 'status', 'name', 'email', 'phone', 'type', 'country', 'address', 'website_url'];
 
     /**
      * The current page of data being viewed
@@ -112,6 +112,48 @@ export default class ManagementVendorsIndexController extends Controller {
      */
     @tracked status;
 
+    /**
+     * The filterable param `type`
+     *
+     * @var {Array|String}
+     */
+    @tracked type;
+
+    /**
+     * The filterable param `name`
+     *
+     * @var {String}
+     */
+    @tracked name;
+
+    /**
+     * The filterable param `website_url`
+     *
+     * @var {String}
+     */
+    @tracked website_url;
+
+    /**
+     * The filterable param `phone`
+     *
+     * @var {String}
+     */
+    @tracked phone;
+
+    /**
+     * The filterable param `email`
+     *
+     * @var {String}
+     */
+    @tracked email;
+
+    /**
+     * The filterable param `country`
+     *
+     * @var {String}
+     */
+    @tracked country;
+
     /**
      * Rows for the table
      *
@@ -168,6 +210,17 @@ export default class ManagementVendorsIndexController extends Controller {
             filterable: true,
             filterComponent: 'filter/string',
         },
+        {
+            label: 'Website URL',
+            valuePath: 'website_url',
+            cellComponent: 'click-to-copy',
+            width: '80px',
+            resizable: true,
+            sortable: true,
+            hidden: true,
+            filterable: true,
+            filterComponent: 'filter/string',
+        },
         {
             label: 'Phone',
             valuePath: 'phone',
@@ -194,11 +247,13 @@ export default class ManagementVendorsIndexController extends Controller {
         {
             label: 'Type',
             valuePath: 'type',
-            cellComponent: 'table/cell/status',
-            width: '120px',
+            cellComponent: 'table/cell/anchor',
+            action: this.viewVendorPlace,
+            width: '150px',
             resizable: true,
             sortable: true,
             filterable: true,
+            filterParam: 'type',
             filterComponent: 'filter/string',
         },
         {
@@ -206,12 +261,12 @@ export default class ManagementVendorsIndexController extends Controller {
             valuePath: 'country',
             cellComponent: 'table/cell/base',
             cellClassNames: 'uppercase',
-            width: '130px',
+            width: '120px',
             resizable: true,
             sortable: true,
-            hidden: true,
             filterable: true,
-            filterComponent: 'filter/string',
+            filterComponent: 'filter/country',
+            filterParam: 'country',
         },
         {
             label: 'Created At',
@@ -243,7 +298,7 @@ export default class ManagementVendorsIndexController extends Controller {
             sortable: true,
             filterable: true,
             filterComponent: 'filter/multi-option',
-            filterOptions: this.statusOptions,
+            filterOptions: getVendorStatusOptions(),
         },
         {
             label: '',
@@ -322,6 +377,13 @@ export default class ManagementVendorsIndexController extends Controller {
         return this.transitionToRoute('management.vendors.index.details', vendor);
     }
 
+    /**
+     * Reload layout view.
+     */
+    @action reload() {
+        return this.hostRouter.refresh();
+    }
+
     /**
      * Create a new `vendor` in modal
      *

package/addon/controllers/operations/orders/index.js

@@ -96,6 +96,8 @@ export default class OperationsOrdersIndexController extends Controller {
         'status',
         'type',
         'layout',
+        'drawerOpen',
+        'drawerTab',
     ];
 
     /**
@@ -266,6 +268,20 @@ export default class OperationsOrdersIndexController extends Controller {
      */
     @tracked layout = 'map';
 
+    /**
+     * Decides if scope drawer is open.
+     *
+     * @type {Boolean}
+     */
+    @tracked drawerOpen = 0;
+
+    /**
+     * The drawer tab that is active.
+     *
+     * @type {Boolean}
+     */
+    @tracked drawerTab;
+
     /**
      * Flag to determine if the layout is 'map'
      *
@@ -732,10 +748,35 @@ export default class OperationsOrdersIndexController extends Controller {
      */
     @action onPressLiveMapDrawerToggle() {
         if (this.drawer) {
-            this.drawer.toggleMinimize();
+            this.drawer.toggleMinimize({
+                onToggle: (drawerApi) => {
+                    this.drawerOpen = drawerApi.isMinimized ? 0 : 1;
+                },
+            });
         }
     }
 
+    /**
+     * Handles the resize end event for the `<LiveMapDrawer />` component.
+     *
+     * @params {Object} event
+     * @params {Object.drawerPanelNode|HTMLElement}
+     * @memberof OperationsOrdersIndexController
+     */
+    @action onDrawerResizeEnd({ drawerPanelNode }) {
+        const rect = drawerPanelNode.getBoundingClientRect();
+
+        if (rect.height === 0) {
+            this.drawerOpen = 0;
+        } else if (rect.height > 1) {
+            this.drawerOpen = 1;
+        }
+    }
+
+    @action onDrawerTabChanged(tabName) {
+        this.drawerTab = tabName;
+    }
+
     /**
      * Exports all orders.
      * @action

package/addon/controllers/operations/service-rates/index.js

@@ -228,6 +228,13 @@ export default class OperationsServiceRatesIndexController extends Controller {
         this.query = value;
     }
 
+    /**
+     * Reload layout view.
+     */
+    @action reload() {
+        return this.hostRouter.refresh();
+    }
+
     /**
      * Toggles dialog to export `service-rate`
      *

package/addon/routes/management/contacts/index.js

@@ -15,6 +15,14 @@ export default class ManagementContactsIndexRoute extends Route {
         sort: { refreshModel: true },
         query: { refreshModel: true },
         status: { refreshModel: true },
+        name: { refreshModel: true },
+        title: { refreshModel: true },
+        phone: { refreshModel: true },
+        email: { refreshModel: true },
+        type: { refreshModel: true },
+        internal_id: { refreshModel: true },
+        createdAt: { refreshModel: true },
+        updatedAt: { refreshModel: true },
     };
 
     model(params) {

package/addon/routes/management/fleets/index.js

@@ -15,11 +15,17 @@ export default class ManagementFleetsIndexRoute extends Route {
         sort: { refreshModel: true },
         query: { refreshModel: true },
         status: { refreshModel: true },
-        internal_id: { refreshModel: true },
+        public_id: { refreshModel: true },
         zone: { refreshModel: true },
         service_area: { refreshModel: true },
-        parent_fleet: { refreshModel: true },
+        parent_fleet_uuid: { refreshModel: true },
         task: { refreshModel: true },
+        name: { refreshModel: true },
+        vendor: { refreshModel: true },
+        drivers_count: { refreshModel: true },
+        drivers_online_count: { refreshModel: true },
+        createdAt: { refreshModel: true },
+        updatedAt: { refreshModel: true },
     };
 
     model(params) {

package/addon/routes/management/fuel-reports/index.js

@@ -15,8 +15,14 @@ export default class ManagementFuelReportsIndexRoute extends Route {
         sort: { refreshModel: true },
         query: { refreshModel: true },
         vehicle: { refreshModel: true },
+        reporter: { refreshModel: true },
         driver: { refreshModel: true },
         status: { refreshModel: true },
+        createdAt: { refreshModel: true },
+        updatedAt: { refreshModel: true },
+        public_id: { refreshModel: true },
+        volume: { refreshModel: true },
+        odometer: { refreshModel: true },
     };
 
     model(params) {

package/addon/routes/management/issues/index.js

@@ -14,8 +14,16 @@ export default class ManagementIssuesIndexRoute extends Route {
         limit: { refreshModel: true },
         sort: { refreshModel: true },
         query: { refreshModel: true },
-        country: { refreshModel: true },
+        priority: { refreshModel: true },
         status: { refreshModel: true },
+        vehicle: { refreshModel: true },
+        driver: { refreshModel: true },
+        assignee: { refreshModel: true },
+        reporter: { refreshModel: true },
+        type: { refreshModel: true },
+        category: { refreshModel: true },
+        updatedAt: { refreshModel: true },
+        createdAt: { refreshModel: true },
     };
 
     model(params) {

package/addon/routes/management/places/index.js

@@ -15,9 +15,19 @@ export default class ManagementPlacesIndexRoute extends Route {
         sort: { refreshModel: true },
         query: { refreshModel: true },
         country: { refreshModel: true },
+        name: { refreshModel: true },
+        address: { refreshModel: true },
+        public_id: { refreshModel: true },
+        city: { refreshModel: true },
+        phone: { refreshModel: true },
+        neighborhood: { refreshModel: true },
+        postal_code: { refreshModel: true },
+        state: { refreshModel: true },
+        createdAt: { refreshModel: true },
+        updatedAt: { refreshModel: true },
     };
 
     model(params) {
-        return this.store.query('place', { params });
+        return this.store.query('place', { ...params });
     }
 }

package/addon/routes/management/vehicles/index.js

@@ -10,7 +10,7 @@ export default class ManagementVehiclesIndexRoute extends Route {
         sort: { refreshModel: true },
         query: { refreshModel: true },
         status: { refreshModel: true },
-        name: { refreshModel: true },
+        display_name: { refreshModel: true },
         public_id: { refreshModel: true },
         vin: { refreshModel: true },
         plate_number: { refreshModel: true },

package/addon/routes/management/vendors/index.js

@@ -16,6 +16,14 @@ export default class ManagementVendorsIndexRoute extends Route {
         query: { refreshModel: true },
         country: { refreshModel: true },
         status: { refreshModel: true },
+        name: { refreshModel: true },
+        email: { refreshModel: true },
+        address: { refreshModel: true },
+        phone: { refreshModel: true },
+        type: { refreshModel: true },
+        createdAt: { refreshModel: true },
+        updatedAt: { refreshModel: true },
+        website_url: { refreshModel: true },
     };
 
     model(params) {

package/addon/routes/operations/scheduler/index.js

@@ -16,7 +16,7 @@ export default class OperationsSchedulerIndexRoute extends Route {
     @service store;
 
     model() {
-        return this.store.query('order', { status: 'created', with: ['payload'] });
+        return this.store.query('order', { status: 'created', with: ['payload', 'driverAssigned.vehicle'] });
     }
 
     setupController(controller, model) {

package/addon/templates/management/contacts/index.hbs

@@ -1,4 +1,5 @@
 <Layout::Section::Header @title="Contacts" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+    <Button @icon="refresh" @onClick={{this.reload}} @helpText="Reload data" class="mr-2" />
     <FiltersPicker
         @columns={{this.columns}}
         @onApply={{fn this.filters.apply this}}

package/addon/templates/management/drivers/index.hbs

@@ -4,7 +4,8 @@
     @searchQuery={{this.query}}
     @onSearch={{perform this.search}}
 >
-    <Button @icon="grip-horizontal" @prefix="fas" @onClick={{fn this.changeLayout "grid"}} @disabled={{this.isGridLayout}} class="mr-2" />
+    <Button @icon="refresh" @onClick={{this.reload}} @helpText="Reload data" class="mr-2" />
+    <Button @icon="grip-horizontal" @prefix="fas" @onClick={{this.reload}} @disabled={{this.isGridLayout}} class="mr-2" />
     <Button @icon="table" @prefix="fas" @onClick={{fn this.changeLayout "table"}} @disabled={{this.isTableLayout}} class="mr-2" />
     <FiltersPicker
         @columns={{this.columns}}

package/addon/templates/management/fleets/index.hbs

@@ -1,7 +1,15 @@
 <Layout::Section::Header @title="Fleets" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-    <FiltersPicker @columns={{this.columns}} @onApply={{fn this.filters.apply this}} @onClear={{fn this.filters.reset this}} @onFilterClear={{this.filters.clear}} @onChange={{this.filters.set}} @buttonWrapperClass="mr-2" />
+    <Button @icon="refresh" @onClick={{this.reload}} @helpText="Reload data" class="mr-2" />
+    <FiltersPicker
+        @columns={{this.columns}}
+        @onApply={{fn this.filters.apply this}}
+        @onClear={{fn this.filters.reset this}}
+        @onFilterClear={{this.filters.clear}}
+        @onChange={{this.filters.set}}
+        @buttonWrapperClass="mr-2"
+    />
     <VisibleColumnPicker @columns={{this.columns}} @onChange={{fn (mut this.columns)}} class="mr-2" />
-   {{#if (safe-has this.table "selectedRows")}}
+    {{#if (safe-has this.table "selectedRows")}}
         <DropdownButton @icon="layer-group" @text="Bulk Action" @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
@@ -17,6 +25,18 @@
 </Layout::Section::Header>
 
 <Layout::Section::Body>
-    <Table @rows={{@model}} @columns={{this.columns}} @selectable={{true}} @canSelectAll={{true}} @onSetup={{fn (mut this.table)}} @pagination={{true}} @paginationMeta={{@model.meta}} @page={{this.page}} @onPageChange={{fn (mut this.page)}} @tfootVerticalOffset="53" @tfootVerticalOffsetElements=".next-view-section-subheader" />
+    <Table
+        @rows={{@model}}
+        @columns={{this.columns}}
+        @selectable={{true}}
+        @canSelectAll={{true}}
+        @onSetup={{fn (mut this.table)}}
+        @pagination={{true}}
+        @paginationMeta={{@model.meta}}
+        @page={{this.page}}
+        @onPageChange={{fn (mut this.page)}}
+        @tfootVerticalOffset="53"
+        @tfootVerticalOffsetElements=".next-view-section-subheader"
+    />
 </Layout::Section::Body>
 {{outlet}}

package/addon/templates/management/fuel-reports/index.hbs

@@ -1,4 +1,5 @@
 <Layout::Section::Header @title="Fuel Reports" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+    <Button @icon="refresh" @onClick={{this.reload}} @helpText="Reload data" class="mr-2" />
     <FiltersPicker
         @columns={{this.columns}}
         @onApply={{fn this.filters.apply this}}