@fleetbase/fleetops-engine 0.3.5 → 0.3.6

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

@@ -36,24 +36,18 @@ export default class OperationsServiceRatesIndexEditController extends Operation
         this.isUpdatingServiceRate = true;
         this.loader.showLoader('.overlay-inner-content', { loadingMessage: 'Updating service rate...' });
 
-        try {
-            return serviceRate
-                .save()
-                .then((serviceRate) => {
-                    return this.transitionToRoute('operations.service-rates.index').then(() => {
-                        this.notifications.success(`Service rate '${serviceRate.service_name}' updated`);
-                        this.resetForm();
-                        this.hostRouter.refresh();
-                    });
-                })
-                .catch(this.notifications.serverError)
-                .finally(() => {
-                    this.isUpdatingServiceRate = false;
-                    this.loader.removeLoader();
+        return serviceRate
+            .save()
+            .then((serviceRate) => {
+                return this.transitionToRoute('operations.service-rates.index').then(() => {
+                    this.notifications.success(`Service rate '${serviceRate.service_name}' updated`);
+                    this.resetForm();
                 });
-        } catch (error) {
-            this.isUpdatingServiceRate = false;
-            this.loader.removeLoader();
-        }
+            })
+            .catch(this.notifications.serverError)
+            .finally(() => {
+                this.isUpdatingServiceRate = false;
+                this.loader.removeLoader();
+            });
     }
 }

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

@@ -1,10 +1,10 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action, computed } from '@ember/object';
 import { isBlank } from '@ember/utils';
 
-export default class OperationsServiceRatesIndexNewController extends Controller {
+export default class OperationsServiceRatesIndexNewController extends BaseController {
     /**
      * Inject the `currentUser` service
      *
@@ -296,27 +296,21 @@ export default class OperationsServiceRatesIndexNewController extends Controller
         this.isCreatingServiceRate = true;
         this.loader.showLoader('.overlay-inner-content', { loadingMessage: 'Creating service rate...' });
 
-        try {
-            return serviceRate
-                .save()
-                .then((serviceRate) => {
-                    return this.transitionToRoute('operations.service-rates.index').then(() => {
-                        this.notifications.success(`New Service Rate ${serviceRate.service_name} Created`);
-                        this.resetForm();
-                        this.hostRouter.refresh();
-                    });
-                })
-                .catch((error) => {
-                    this.notifications.serverError(error);
-                })
-                .finally(() => {
-                    this.isCreatingServiceRate = false;
-                    this.loader.removeLoader();
+        return serviceRate
+            .save()
+            .then((serviceRate) => {
+                return this.transitionToRoute('operations.service-rates.index').then(() => {
+                    this.notifications.success(`New Service Rate ${serviceRate.service_name} Created`);
+                    this.resetForm();
                 });
-        } catch (error) {
-            this.isCreatingServiceRate = false;
-            this.loader.removeLoader();
-        }
+            })
+            .catch((error) => {
+                this.notifications.serverError(error);
+            })
+            .finally(() => {
+                this.isCreatingServiceRate = false;
+                this.loader.removeLoader();
+            });
     }
 
     /**

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

@@ -1,4 +1,4 @@
-import Controller from '@ember/controller';
+import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
@@ -6,7 +6,7 @@ import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
-export default class OperationsServiceRatesIndexController extends Controller {
+export default class OperationsServiceRatesIndexController extends BaseController {
     /**
      * Inject the `currentUser` service
      *

package/addon/engine.js

@@ -4,6 +4,7 @@ import Resolver from 'ember-resolver';
 import config from './config/environment';
 import services from '@fleetbase/ember-core/exports/services';
 import AdminVisibilityControlsComponent from './components/admin/visibility-controls';
+import NavigatorAppControlsComponent from './components/admin/navigator-app';
 
 const { modulePrefix } = config;
 const externalRoutes = ['console', 'extensions'];
@@ -28,6 +29,11 @@ export default class FleetOpsEngine extends Engine {
                     icon: 'eye',
                     component: AdminVisibilityControlsComponent,
                 },
+                {
+                    title: 'Navigator Apps',
+                    icon: 'key',
+                    component: NavigatorAppControlsComponent,
+                },
             ],
             {
                 slug: 'fleet-ops',

package/addon/helpers/waypoint-label.js

@@ -1 +1,6 @@
-export { default, waypointLabel } from '@fleetbase/console/helpers/waypoint-label';
+import { helper } from '@ember/component/helper';
+import waypointLabelUtil from '../utils/waypoint-label';
+
+export default helper(function waypointLabel([index]) {
+    return waypointLabelUtil(index);
+});

package/addon/routes/application.js

@@ -1,29 +1,18 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import getResourceNameFromTransition from '@fleetbase/ember-core/utils/get-resource-name-from-transition';
 
 export default class ApplicationRoute extends Route {
     @service loader;
     @service fetch;
 
-    loading(transition) {
-        const resourceName = this.getResouceName(transition);
+    @action loading(transition) {
+        const resourceName = getResourceNameFromTransition(transition);
         this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: resourceName ? `Loading ${resourceName}...` : `Loading...` });
     }
 
     model() {
         return this.fetch.get('fleet-ops/settings/visibility');
     }
-
-    getResouceName(transition) {
-        const { to } = transition;
-
-        if (typeof to.name === 'string') {
-            let routePathSegments = to.name.split('.');
-            let resourceName = routePathSegments[3];
-
-            return resourceName;
-        }
-
-        return null;
-    }
 }

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

@@ -1,14 +1,11 @@
 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';
 
 export default class ManagementContactsIndexRoute extends Route {
     @service store;
 
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -25,6 +22,13 @@ export default class ManagementContactsIndexRoute extends Route {
         updatedAt: { refreshModel: true },
     };
 
+    @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);
     }

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

@@ -1,9 +1,10 @@
 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';
 
 export default class ManagementDriversIndexRoute extends Route {
     @service store;
-    @service intl;
 
     queryParams = {
         page: { refreshModel: true },
@@ -28,8 +29,11 @@ export default class ManagementDriversIndexRoute extends Route {
         'within[where]': { refreshModel: true, replace: true },
     };
 
-    beforeModel() {
-        this.intl.setLocale(['en-us']);
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
     }
 
     model(params) {

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

@@ -1,14 +1,11 @@
 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';
 
 export default class ManagementFleetsIndexRoute extends Route {
     @service store;
 
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -28,6 +25,13 @@ export default class ManagementFleetsIndexRoute extends Route {
         updatedAt: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('fleet', { ...params, with: ['parent_fleet', 'service_area', 'zone'] });
     }

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

@@ -1,14 +1,11 @@
 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';
 
 export default class ManagementFuelReportsIndexRoute extends Route {
     @service store;
 
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -25,6 +22,13 @@ export default class ManagementFuelReportsIndexRoute extends Route {
         odometer: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('fuel-report', { ...params, with: ['driver', 'vehicle', 'reporter'] });
     }

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

@@ -1,14 +1,11 @@
 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';
 
 export default class ManagementIssuesIndexRoute extends Route {
     @service store;
 
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -26,6 +23,13 @@ export default class ManagementIssuesIndexRoute extends Route {
         createdAt: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('issue', { ...params, with: ['driver', 'vehicle', 'assignee', 'reporter'] });
     }

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

@@ -1,14 +1,11 @@
 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';
 
 export default class ManagementPlacesIndexRoute extends Route {
     @service store;
 
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -27,6 +24,13 @@ export default class ManagementPlacesIndexRoute extends Route {
         updatedAt: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('place', { ...params });
     }

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

@@ -8,8 +8,8 @@ export default class ManagementVehiclesIndexDetailsRoute extends Route {
         view: { refreshModel: false },
     };
 
-    model({ public_id }) {
-        return this.store.findRecord('vehicle', public_id);
+    model(params) {
+        return this.store.findRecord('vehicle', params.public_id);
     }
 
     afterModel(model) {

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

@@ -1,5 +1,7 @@
 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';
 
 export default class ManagementVehiclesIndexRoute extends Route {
     @service store;
@@ -29,6 +31,13 @@ export default class ManagementVehiclesIndexRoute extends Route {
         'within[where]': { refreshModel: true, replace: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('vehicle', { ...params });
     }

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

@@ -1,14 +1,11 @@
 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';
 
 export default class ManagementVendorsIndexRoute extends Route {
     @service store;
 
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -26,12 +23,18 @@ export default class ManagementVendorsIndexRoute extends Route {
         website_url: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('vendor', { ...params });
     }
 
     async setupController(controller, model) {
-        console.log('setupController action called');
         super.setupController(...arguments);
 
         // load integrated vendors

package/addon/routes/operations/orders/index/view.js

@@ -11,8 +11,12 @@ export default class OperationsOrdersIndexViewRoute extends Route {
     @action willTransition(transition) {
         const shouldReset = typeof transition.to.name === 'string' && !transition.to.name.includes('operations.orders');
 
-        if (this.controller && shouldReset) {
-            this.controller.resetView();
+        if (this.controller) {
+            this.controller.removeRoutingControlPreview();
+
+            if (shouldReset) {
+                this.controller.resetView();
+            }
         }
     }
 

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

@@ -1,7 +1,8 @@
 import Route from '@ember/routing/route';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class OperationsOrdersIndexRoute extends Route {
     @service store;
@@ -33,6 +34,11 @@ export default class OperationsOrdersIndexRoute extends Route {
         if (this.controller && shouldReset) {
             this.controller.resetView(transition);
         }
+
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
     }
 
     @action model(params) {

package/addon/routes/operations/orders.js

@@ -1,4 +1,3 @@
 import Route from '@ember/routing/route';
-// import '@fleetbase/leaflet-routing-machine';
 
 export default class OperationsOrdersRoute extends Route {}

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

@@ -1,36 +1,11 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
+import { action, set } from '@ember/object';
+import isNestedRouteTransition from '@fleetbase/ember-core/utils/is-nested-route-transition';
 
 export default class OperationsServiceRatesIndexRoute extends Route {
-    /**
-     * Inject the `store` service.
-     *
-     * @var {Store}
-     */
     @service store;
 
-    /**
-     * Inject the `loader` service.
-     *
-     * @var {Service}
-     */
-    @service loader;
-
-    /**
-     * Loading event handler for route.
-     *
-     * @param {Transition} transition
-     */
-    @action loading(transition) {
-        this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: 'Loading service rates...' });
-    }
-
-    /**
-     * Queryable parameters
-     *
-     * @var {Object}
-     */
     queryParams = {
         page: { refreshModel: true },
         limit: { refreshModel: true },
@@ -40,6 +15,13 @@ export default class OperationsServiceRatesIndexRoute extends Route {
         zone: { refreshModel: true },
     };
 
+    @action willTransition(transition) {
+        if (isNestedRouteTransition(transition)) {
+            set(this.queryParams, 'page.refreshModel', false);
+            set(this.queryParams, 'sort.refreshModel', false);
+        }
+    }
+
     model(params) {
         return this.store.query('service-rate', {
             ...params,

package/addon/routes/operations/service-rates.js

@@ -1,10 +1,3 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
 
-export default class OperationsServiceRatesRoute extends Route {
-    @service store;
-
-    model() {
-        return this.store.findAll('service-rate');
-    }
-}
+export default class OperationsServiceRatesRoute extends Route {}

package/addon/styles/fleetops-engine.css

@@ -1,18 +1,19 @@
 .scheduler-left-sidebar {
-    border-right: 1px rgba(229, 231, 235, 1) solid;
+    border-right: 1px rgb(229 231 235 / 100%) solid;
     height: 100vh;
     overflow-y: scroll;
 }
 
-body[data-theme="dark"] .scheduler-left-sidebar {
-    border-right: 1px rgba(55, 65, 81, 1) solid;
+body[data-theme='dark'] .scheduler-left-sidebar {
+    border-right: 1px rgb(55 65 81 / 100%) solid;
 }
 
-.scheduler-left-sidebar > .next-content-panel-wrapper  > .next-content-panel-container  > .next-content-panel > .next-content-panel-header.next-content-panel-is-closed {
+.scheduler-left-sidebar > .next-content-panel-wrapper > .next-content-panel-container > .next-content-panel > .next-content-panel-header.next-content-panel-is-closed {
     border-bottom-left-radius: 0;
     border-bottom-right-radius: 0;
 }
-.scheduler-left-sidebar > .next-content-panel-wrapper  > .next-content-panel-container  > .next-content-panel > .next-content-panel-header {
+
+.scheduler-left-sidebar > .next-content-panel-wrapper > .next-content-panel-container > .next-content-panel > .next-content-panel-header {
     border-top-left-radius: 0;
     border-top-right-radius: 0;
     border-top: 0;
@@ -20,9 +21,15 @@ body[data-theme="dark"] .scheduler-left-sidebar {
     border-right: 0;
 }
 
-.scheduler-left-sidebar > .next-content-panel-wrapper  > .next-content-panel-container  > .next-content-panel > .next-content-panel-body {
+.scheduler-left-sidebar > .next-content-panel-wrapper > .next-content-panel-container > .next-content-panel > .next-content-panel-body {
     border-left: 0;
     border-right: 0;
     border-bottom-left-radius: 0;
     border-bottom-right-radius: 0;
-}
+}
+
+.fleetbase-console.console-fleet-ops-operations-orders-index-new,
+.fleetbase-console.console-fleet-ops-operations-orders-index-view,
+.fleetbase-console .dragSortList {
+    overflow: visible !important;
+}

package/addon/templates/operations/orders/index/new.hbs

@@ -1,7 +1,7 @@
-<Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @isMaximizable={{true}} @isMinimizable={{true}} @width="700px" @fullHeight={{true}} @onLoad={{this.setupInterface}} as |overlay|>
+<Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @width="570px" @fullHeight={{true}} @onLoad={{this.setupInterface}} as |overlay|>
     <Overlay::Header @overlay={{overlay}} @title="New Order" @onPressCancel={{this.transitionBack}}>
         <DropdownButton @icon="ellipsis-h" @size="sm" @iconPrefix="fas" @triggerClass="mr-2 hidden md:flex" as |dd|>
-            <div class="next-dd-menu mt-1 mx-0" aria-orientation="vertical" aria-labelledby="user-menu">
+            <div class="next-dd-menu mt-1 mx-0" aria-labelledby="user-menu">
                 <div class="p-1">
                     <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.newCustomer)}}>
                         <div class="w-6">
@@ -15,7 +15,7 @@
                         </div>
                         <span>Create new facilitator</span>
                     </a>
-                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.newPlace)}}>
+                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.createPlace)}}>
                         <div class="w-6">
                             <FaIcon @icon="map-pin" />
                         </div>
@@ -162,7 +162,7 @@
                         {{#each group.items as |metaField|}}
                             <div class="input-group {{if (eq metaField.type "boolean") "col-span-2 items-center" ""}}">
                                 <div class="flex items-center justify-between">
-                                    {{#if (not (eq metaField.type "boolean"))}}
+                                    {{#if (not-eq metaField.type "boolean")}}
                                         <InputLabel @labelText={{metaField.label}} @required={{metaField.required}} />
                                     {{/if}}
 
@@ -223,8 +223,8 @@
                                 </label>
                             </div>
 
-                            <div class="flex-1 px-4">
-                                <ModelSelect @modelName="place" @selectedModel={{waypoint.place}} @placeholder={{concat "Select Waypoint " (add index 1)}} @triggerClass="form-select form-input truncate" @wrapperClass="w-96" @infiniteScroll={{false}} @customSearchEndpoint="places/search" @query={{hash geo=true latitude=this.userLatitude longitude=this.userLongitude}} @renderInPlace={{true}} @onChange={{fn this.setWaypointPlace index}} as |model|>
+                            <div class="flex-1 px-3">
+                                <ModelSelect @modelName="place" @selectedModel={{waypoint.place}} @placeholder={{concat "Select Waypoint " (add index 1)}} @triggerClass="form-select form-input truncate max-w-300px" @infiniteScroll={{false}} @customSearchEndpoint="places/search" @query={{hash geo=true latitude=this.userLatitude longitude=this.userLongitude}} @renderInPlace={{true}} @onChange={{fn this.setWaypointPlace index}} as |model|>
                                     {{model.address}}
                                 </ModelSelect>
 
@@ -241,7 +241,7 @@
 
                             <div class="flex items-center">
                                 {{#if waypoint.place}}
-                                    <Button class="mr-2" @icon="edit" @size="sm" @onClick={{fn this.placesController.editPlace waypoint.place}} />
+                                    <Button class="mr-2" @icon="edit" @size="sm" @onClick={{fn this.editPlace waypoint.place}} />
                                 {{/if}}
                                 <Button @type="danger" @icon="trash" @size="sm" @onClick={{fn this.removeWaypoint waypoint}} />
                             </div>