@fleetbase/fleetops-engine 0.6.18 → 0.6.20

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

@@ -1,242 +1,146 @@
-import BaseController from '@fleetbase/fleetops-engine/controllers/base-controller';
+import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { isBlank } from '@ember/utils';
-import { timeout, task } from 'ember-concurrency';
 
-export default class OperationsServiceRatesIndexController extends BaseController {
-    @service store;
-    @service currentUser;
+export default class OperationsServiceRatesIndexController extends Controller {
+    @service serviceRateActions;
     @service intl;
-    @service fetch;
-    @service filters;
-    @service crud;
-    @service notifications;
-    @service modalsManager;
-    @service hostRouter;
-    @service loader;
 
-    /**
-     * The current page of data being viewed
-     *
-     * @var {Integer}
-     */
+    /** query params */
+    @tracked queryParams = ['page', 'query', 'limit', 'sort', 'zone', 'service_area'];
     @tracked page = 1;
-
-    /**
-     * The maximum number of items to show per page
-     *
-     * @var {Integer}
-     */
     @tracked limit;
-
-    /**
-     * The search query
-     *
-     * @var {String}
-     */
     @tracked query;
-
-    /**
-     * The param to sort the data on, the param with prepended `-` is descending
-     *
-     * @var {String}
-     */
     @tracked sort = '-created_at';
 
-    /**
-     * Queryable parameters for this controller's model
-     *
-     * @var {Array}
-     */
-    queryParams = ['page', 'query', 'limit', 'sort', 'zone', 'service_area'];
-
-    /**
-     * All columns applicable for orders
-     *
-     * @var {Array}
-     */
-    @tracked columns = [
-        {
-            label: this.intl.t('fleet-ops.common.id'),
-            valuePath: 'public_id',
-            width: '150px',
-            cellComponent: 'table/cell/anchor',
-            permission: 'fleet-ops view service-rate',
-            onClick: this.editServiceRate,
-            resizable: true,
-            sortable: true,
-            filterable: true,
-            filterComponent: 'filter/string',
-        },
-        {
-            label: this.intl.t('fleet-ops.common.service'),
-            valuePath: 'service_name',
-            cellComponent: 'table/cell/base',
-            width: '125px',
-            resizable: true,
-            sortable: true,
-            filterable: false,
-        },
+    /** action buttons */
+    @tracked actionButtons = [
         {
-            label: this.intl.t('fleet-ops.common.service-area'),
-            valuePath: 'service_area.name',
-            cellComponent: 'table/cell/base',
-            width: '125px',
-            resizable: true,
-            sortable: true,
-            filterable: true,
-            filterComponent: 'filter/model',
-            filterComponentPlaceholder: 'Select service area',
-            filterParam: 'service_area',
-            model: 'service-area',
+            icon: 'refresh',
+            onClick: this.serviceRateActions.refresh,
+            helpText: this.intl.t('common.refresh'),
         },
         {
-            label: this.intl.t('fleet-ops.common.zone'),
-            valuePath: 'zone.name',
-            cellComponent: 'table/cell/base',
-            width: '125px',
-            resizable: true,
-            sortable: true,
-            filterable: true,
-            filterComponent: 'filter/model',
-            filterComponentPlaceholder: 'Select zone',
-            filterParam: 'zone',
-            model: 'zone',
+            text: this.intl.t('common.new'),
+            type: 'primary',
+            icon: 'plus',
+            onClick: this.serviceRateActions.transition.create,
         },
         {
-            label: this.intl.t('fleet-ops.common.created-at'),
-            valuePath: 'createdAt',
-            sortParam: 'created_at',
-            width: '125px',
-            resizable: true,
-            sortable: true,
-            filterable: true,
-            filterComponent: 'filter/date',
-        },
-        {
-            label: this.intl.t('fleet-ops.common.updated-at'),
-            valuePath: 'updatedAt',
-            sortParam: 'updated_at',
-            width: '125px',
-            resizable: true,
-            sortable: true,
-            hidden: true,
-            filterable: true,
-            filterComponent: 'filter/date',
+            text: this.intl.t('common.export'),
+            icon: 'long-arrow-up',
+            iconClass: 'rotate-icon-45',
+            wrapperClass: 'hidden md:flex',
+            onClick: this.serviceRateActions.export,
         },
+    ];
+
+    /** bulk action buttons */
+    @tracked bulkActions = [
         {
-            label: '',
-            cellComponent: 'table/cell/dropdown',
-            ddButtonText: false,
-            ddButtonIcon: 'ellipsis-h',
-            ddButtonIconPrefix: 'fas',
-            cellClassNames: 'overflow-visible',
-            wrapperClass: 'flex items-center justify-end mx-2',
-            width: '10%',
-            actions: [
-                {
-                    label: this.intl.t('fleet-ops.operations.service-rates.index.edit-service'),
-                    fn: this.editServiceRate,
-                    permission: 'fleet-ops view service-rate',
-                },
-                {
-                    label: this.intl.t('fleet-ops.operations.service-rates.index.delete-service'),
-                    fn: this.deleteServiceRate,
-                    permission: 'fleet-ops delete service-rate',
-                },
-            ],
-            sortable: false,
-            filterable: false,
-            resizable: false,
-            searchable: false,
+            label: 'Delete selected...',
+            class: 'text-red-500',
+            fn: this.serviceRateActions.bulkDelete,
         },
     ];
 
-    /**
-     * The search task.
-     *
-     * @void
-     */
-    @task({ restartable: true }) *search({ target: { value } }) {
-        // if no query don't search
-        if (isBlank(value)) {
-            this.query = null;
-            return;
-        }
-
-        // timeout for typing
-        yield timeout(250);
-
-        // reset page for results
-        if (this.page > 1) {
-            this.page = 1;
-        }
-
-        // update the query param
-        this.query = value;
-    }
-
-    /**
-     * Reload layout view.
-     */
-    @action reload() {
-        return this.hostRouter.refresh();
-    }
-
-    /**
-     * Toggles dialog to export `service-rate`
-     *
-     * @memberof OperationsServiceRatesIndexController
-     * @void
-     */
-    @action exportServiceRates() {
-        const selections = this.table.selectedRows.map((_) => _.id);
-        this.crud.export('service-rate', { params: { selections } });
-    }
-
-    /**
-     * Transition to service rate edit route.
-     *
-     * @param {ServiceRateModel} serviceRate
-     * @memberof OperationsServiceRatesIndexController
-     */
-    @action editServiceRate(serviceRate) {
-        this.transitionToRoute('operations.service-rates.index.edit', serviceRate);
-    }
-
-    /**
-     * Delete a `service-rate` via confirm prompt
-     *
-     * @param {ServiceRateModel} serviceRate
-     * @param {Object} options
-     * @void
-     */
-    @action deleteServiceRate(serviceRate, options = {}) {
-        this.crud.delete(serviceRate, {
-            onSuccess: () => {
-                return this.hostRouter.refresh();
+    /** columns **/
+    get columns() {
+        return [
+            {
+                label: this.intl.t('column.id'),
+                valuePath: 'public_id',
+                width: '150px',
+                cellComponent: 'table/cell/anchor',
+                permission: 'fleet-ops view service-rate',
+                onClick: this.serviceRateActions.transition.view,
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterComponent: 'filter/string',
             },
-            ...options,
-        });
-    }
-
-    /**
-     * Bulk deletes selected `service rates` via confirm prompt
-     *
-     * @void
-     */
-    @action bulkDeleteServiceRates() {
-        const selected = this.table.selectedRows;
-
-        this.crud.bulkDelete(selected, {
-            modelNamePath: `public_id`,
-            acceptButtonText: this.intl.t('fleet-ops.operations.service-rates.index.accept-button'),
-            onSuccess: async () => {
-                await this.hostRouter.refresh();
-                this.table.untoggleSelectAll();
+            {
+                label: this.intl.t('column.service'),
+                valuePath: 'service_name',
+                cellComponent: 'table/cell/base',
+                width: '125px',
+                resizable: true,
+                sortable: true,
+                filterable: false,
+            },
+            {
+                label: this.intl.t('column.service-area'),
+                valuePath: 'service_area.name',
+                cellComponent: 'table/cell/base',
+                width: '125px',
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterComponent: 'filter/model',
+                filterComponentPlaceholder: 'Select service area',
+                filterParam: 'service_area',
+                model: 'service-area',
+            },
+            {
+                label: this.intl.t('column.zone'),
+                valuePath: 'zone.name',
+                cellComponent: 'table/cell/base',
+                width: '125px',
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterComponent: 'filter/model',
+                filterComponentPlaceholder: 'Select zone',
+                filterParam: 'zone',
+                model: 'zone',
+            },
+            {
+                label: this.intl.t('column.created-at'),
+                valuePath: 'createdAt',
+                sortParam: 'created_at',
+                width: '125px',
+                resizable: true,
+                sortable: true,
+                filterable: true,
+                filterComponent: 'filter/date',
+            },
+            {
+                label: this.intl.t('column.updated-at'),
+                valuePath: 'updatedAt',
+                sortParam: 'updated_at',
+                width: '125px',
+                resizable: true,
+                sortable: true,
+                hidden: true,
+                filterable: true,
+                filterComponent: 'filter/date',
+            },
+            {
+                label: '',
+                cellComponent: 'table/cell/dropdown',
+                ddButtonText: false,
+                ddButtonIcon: 'ellipsis-h',
+                ddButtonIconPrefix: 'fas',
+                cellClassNames: 'overflow-visible',
+                wrapperClass: 'flex items-center justify-end mx-2',
+                width: '10%',
+                actions: [
+                    {
+                        label: this.intl.t('column.edit-service'),
+                        fn: this.serviceRateActions.transition.edit,
+                        permission: 'fleet-ops view service-rate',
+                    },
+                    {
+                        label: this.intl.t('column.delete-service'),
+                        fn: this.serviceRateActions.delete,
+                        permission: 'fleet-ops delete service-rate',
+                    },
+                ],
+                sortable: false,
+                filterable: false,
+                resizable: false,
+                searchable: false,
             },
-        });
+        ];
     }
 }

package/addon/controllers/settings/custom-fields.js

@@ -0,0 +1,56 @@
+import Controller from '@ember/controller';
+
+export default class SettingsCustomFieldsController extends Controller {
+    get subjects() {
+        return [
+            {
+                model: 'driver',
+                type: 'fleet-ops:driver',
+                label: 'Driver',
+                groups: [],
+            },
+            {
+                model: 'vehicle',
+                type: 'fleet-ops:vehicle',
+                label: 'Vehicle',
+                groups: [],
+            },
+            {
+                model: 'contact',
+                type: 'fleet-ops:contact',
+                label: 'Contact',
+                groups: [],
+            },
+            {
+                model: 'vendor',
+                type: 'fleet-ops:vendor',
+                label: 'Vendor',
+                groups: [],
+            },
+            {
+                model: 'place',
+                type: 'fleet-ops:place',
+                label: 'Place',
+                groups: [],
+            },
+            {
+                model: 'fleet',
+                type: 'fleet-ops:fleet',
+                label: 'Fleet',
+                groups: [],
+            },
+            {
+                model: 'issue',
+                type: 'fleet-ops:issue',
+                label: 'Issue',
+                groups: [],
+            },
+            {
+                model: 'fuel-report',
+                type: 'fleet-ops:fuel-report',
+                label: 'Fuel Report',
+                groups: [],
+            },
+        ];
+    }
+}

package/addon/controllers/settings/routing.js

@@ -28,7 +28,7 @@ export default class SettingsRoutingController extends Controller {
      */
     @task *saveSettings() {
         try {
-            yield this.fetch.post('fleet-ops/settings/routing-settings', { router: this.routerService });
+            yield this.fetch.post('fleet-ops/settings/routing-settings', { router: this.routerService, unit: this.routingUnit });
             yield this.performAdditionalSaveTasks();
             // Save in local memory too
             this.currentUser.setOption('routing', { router: this.routerService, unit: this.routingUnit });

package/addon/engine.js

@@ -6,12 +6,11 @@ import services from '@fleetbase/ember-core/exports/services';
 import NavigatorAppConfigComponent from './components/admin/navigator-app';
 import WidgetFleetOpsKeyMetricsComponent from './components/widget/fleet-ops-key-metrics';
 import AdminAvatarManagementComponent from './components/admin/avatar-management';
-import CustomerOrdersComponent from './components/customer/orders';
-import CustomerAdminSettingsComponent from './components/customer/admin-settings';
 import OrderTrackingLookupComponent from './components/order-tracking-lookup';
 import { RoutingControl } from './services/leaflet-routing-control';
 import { OSRMv1 } from '@fleetbase/leaflet-routing-machine';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
+import setupCustomerPortal from './utils/setup-customer-portal';
 
 const { modulePrefix } = config;
 const externalRoutes = ['console', 'extensions'];
@@ -104,31 +103,33 @@ export default class FleetOpsEngine extends Engine {
         universe.createRegistries([
             'engine:fleet-ops',
             'fleet-ops:component:live-map-drawer',
-            'fleet-ops:component:vehicle-panel',
-            'fleet-ops:component:driver-panel',
+            'fleet-ops:component:vehicle:details',
+            'fleet-ops:component:driver:details',
             'fleet-ops:component:order-config-manager',
-            'fleet-ops:component:contact-form-panel',
-            'fleet-ops:component:contact-form-panel:details',
-            'fleet-ops:component:customer-form-panel',
-            'fleet-ops:component:customer-form-panel:details',
-            'fleet-ops:component:driver-form-panel',
-            'fleet-ops:component:driver-form-panel:details',
-            'fleet-ops:component:fleet-form-panel',
-            'fleet-ops:component:fleet-form-panel:details',
-            'fleet-ops:component:place-form-panel',
-            'fleet-ops:component:place-form-panel:details',
-            'fleet-ops:component:vehicle-form-panel',
-            'fleet-ops:component:vehicle-form-panel:details',
-            'fleet-ops:component:vendor-form-panel:edit',
-            'fleet-ops:component:vendor-form-panel:edit:details',
-            'fleet-ops:component:vendor-form-panel:create',
-            'fleet-ops:component:vendor-form-panel:create:details',
-            'fleet-ops:component:issue-form-panel',
-            'fleet-ops:component:issue-form-panel:details',
-            'fleet-ops:component:fuel-report-form-panel',
-            'fleet-ops:component:fuel-report-form-panel:details',
+            'fleet-ops:component:contact:form',
+            'fleet-ops:component:contact:form:details',
+            'fleet-ops:component:customer:form',
+            'fleet-ops:component:customer:form:details',
+            'fleet-ops:component:driver:form',
+            'fleet-ops:component:driver:form:details',
+            'fleet-ops:component:fleet:form',
+            'fleet-ops:component:fleet:form:details',
+            'fleet-ops:component:place:form',
+            'fleet-ops:component:place:form:details',
+            'fleet-ops:component:vehicle:form',
+            'fleet-ops:component:vehicle:form:details',
+            'fleet-ops:component:vendor:form:edit',
+            'fleet-ops:component:vendor:form:edit:details',
+            'fleet-ops:component:vendor:form:create',
+            'fleet-ops:component:vendor:form:create:details',
+            'fleet-ops:component:issue:form',
+            'fleet-ops:component:issue:form:details',
+            'fleet-ops:component:fuel-report:form',
+            'fleet-ops:component:fuel-report:form:details',
             'fleet-ops:contextmenu:vehicle',
             'fleet-ops:contextmenu:driver',
+            'fleet-ops:component:order:details',
+            'fleet-ops:component:order:form',
             'fleet-ops:template:operations:orders:view',
             'fleet-ops:template:operations:orders:new',
             'fleet-ops:template:operations:orders:new:entities-input',
@@ -136,12 +137,7 @@ export default class FleetOpsEngine extends Engine {
             'fleet-ops:template:settings:routing',
         ]);
 
-        universe.afterBoot(function (universe) {
-            universe.registerMenuItems('customer-portal:sidebar', [
-                universe._createMenuItem('Orders', 'customer-portal.portal.virtual', { icon: 'boxes-packing', component: CustomerOrdersComponent }),
-            ]);
-            universe.registerRenderableComponent('@fleetbase/customer-portal-engine', 'customer-portal:admin-settings', CustomerAdminSettingsComponent);
-        });
+        setupCustomerPortal(app, engine, universe);
     };
 }
 

package/addon/helpers/get-fleet-ops-options.js

@@ -0,0 +1,6 @@
+import { helper } from '@ember/component/helper';
+import fleetOpsOptions from '../utils/fleet-ops-options';
+
+export default helper(function getFleetOpsOptions([key]) {
+    return fleetOpsOptions(key);
+});

package/addon/helpers/is-model-leaflet-layer-hidden.js

@@ -0,0 +1,10 @@
+import Helper from '@ember/component/helper';
+import { inject as service } from '@ember/service';
+
+export default class IsModelLeafletLayerHidden extends Helper {
+    @service leafletLayerVisibilityManager;
+
+    compute([model]) {
+        return this.leafletLayerVisibilityManager.isModelLayerHidden(model);
+    }
+}

package/addon/helpers/point-coordinates.js

@@ -1,5 +1,5 @@
 import { helper } from '@ember/component/helper';
-import Point from '../utils/geojson/point';
+import Point from '@fleetbase/fleetops-data/utils/geojson/point';
 
 export default helper(function pointCoordinates([point]) {
     if (point instanceof Point) {

package/addon/initializers/leaflet-intersects-polyfill.js

@@ -0,0 +1,23 @@
+export function initialize() {
+    let waitForLeaflet = setInterval(() => {
+        let leafletLoaded = window.L !== undefined;
+        if (leafletLoaded) {
+            clearInterval(waitForLeaflet);
+
+            window.L.Bounds.prototype.intersects = function (bounds) {
+                var min = this.min,
+                    max = this.max,
+                    min2 = bounds.min,
+                    max2 = bounds.max,
+                    xIntersects = max2.x >= min.x && min2.x <= max.x,
+                    yIntersects = max2.y >= min.y && min2.y <= max.y;
+
+                return xIntersects && yIntersects;
+            };
+        }
+    }, 100);
+}
+
+export default {
+    initialize,
+};

package/addon/routes/analytics/reports/index/details/index.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class AnalyticsReportsIndexDetailsIndexRoute extends Route {}

package/addon/routes/analytics/reports/index/details/result.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class AnalyticsReportsIndexDetailsResultRoute extends Route {}

package/addon/routes/analytics/reports/index/details.js

@@ -0,0 +1,33 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class AnalyticsReportsIndexDetailsRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('console.fleet-ops.analytics.reports.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops view report')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.analytics.reports.index');
+        }
+    }
+
+    queryParams = {
+        view: { refreshModel: false },
+    };
+
+    model({ public_id }) {
+        return this.store.queryRecord('report', { public_id, single: true });
+    }
+}

package/addon/routes/analytics/reports/index/edit.js

@@ -0,0 +1,29 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+
+export default class AnalyticsReportsIndexEditRoute extends Route {
+    @service store;
+    @service notifications;
+    @service hostRouter;
+    @service abilities;
+    @service intl;
+
+    @action error(error) {
+        this.notifications.serverError(error);
+        if (typeof error.message === 'string' && error.message.endsWith('not found')) {
+            return this.hostRouter.transitionTo('console.fleet-ops.analytics.reports.index');
+        }
+    }
+
+    beforeModel() {
+        if (this.abilities.cannot('fleet-ops update report')) {
+            this.notifications.warning(this.intl.t('common.unauthorized-access'));
+            return this.hostRouter.transitionTo('console.fleet-ops.analytics.reports.index');
+        }
+    }
+
+    model({ public_id }) {
+        return this.store.queryRecord('report', { public_id, single: true });
+    }
+}

package/addon/routes/analytics/reports/index/new.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class AnalyticsReportsIndexNewRoute extends Route {}

package/addon/routes/analytics/reports/index.js

@@ -0,0 +1,21 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class AnalyticsReportsIndexRoute extends Route {
+    @service store;
+
+    queryParams = {
+        page: { refreshModel: true },
+        limit: { refreshModel: true },
+        sort: { refreshModel: true },
+        query: { refreshModel: true },
+        name: { refreshModel: true },
+        public_id: { refreshModel: true },
+        created_at: { refreshModel: true },
+        updated_at: { refreshModel: true },
+    };
+
+    model(params) {
+        return this.store.query('report', { type: 'fleet-ops', ...params });
+    }
+}