@fleetbase/fleetops-engine 0.2.2 → 0.2.4

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

@@ -1,17 +1,10 @@
-import Controller, { inject as controller } from '@ember/controller';
+import Controller from '@ember/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 {
-    /**
-     * Inject the `operations.service-rates.index` controller
-     *
-     * @var {Controller}
-     */
-    @controller('operations.service-rates.index') index;
-
     /**
      * Inject the `currentUser` service
      *
@@ -33,12 +26,19 @@ export default class OperationsServiceRatesIndexNewController extends Controller
      */
     @service loader;
 
+    /**
+     * Inject the `hostRouter` service
+     *
+     * @var {Service}
+     */
+    @service hostRouter;
+
     /**
      * The service rate being created.
      *
      * @var {ServiceRateModel}
      */
-    @tracked serviceRate = this.store.createRecord('service-rate');
+    @tracked serviceRate = this.store.createRecord('service-rate', { per_meter_unit: 'm' });
 
     /**
      * Different service types available, based on order type.
@@ -300,11 +300,10 @@ export default class OperationsServiceRatesIndexNewController extends Controller
             return serviceRate
                 .save()
                 .then((serviceRate) => {
-                    this.index.table.addRow(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) => {

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

@@ -56,6 +56,13 @@ export default class OperationsServiceRatesIndexController extends Controller {
      */
     @service modalsManager;
 
+    /**
+     * Inject the `hostRouter` service
+     *
+     * @var {Service}
+     */
+    @service hostRouter;
+
     /**
      * Inject the `loader` service
      *

package/addon/engine.js

@@ -17,6 +17,12 @@ export default class FleetOpsEngine extends Engine {
     setupExtension = function (app, engine, universe) {
         // register menu item in header
         universe.registerHeaderMenuItem('Fleet-Ops', 'console.fleet-ops', { icon: 'route', priority: 0 });
+
+        // register the vehicle panel
+        universe.createRegistry('component:vehicle-panel');
+
+        // register the driver panel
+        universe.createRegistry('component:driver-panel');
     };
 }
 

package/addon/initializers/load-leaflet-assets.js

@@ -1,8 +1,13 @@
 export function initialize() {
     const path = '/engines-dist/leaflet/';
-    const scripts = ['leaflet.contextmenu.js', 'leaflet.draw-src.js', 'leaflet.rotatedMarker.js'];
+    const scripts = ['leaflet.contextmenu.js', 'leaflet.draw-src.js', 'leaflet.rotatedMarker.js', 'leaflet-drift-marker.js'];
     const stylesheets = ['leaflet.contextmenu.css', 'leaflet.draw.css'];
 
+    // Define exports on window
+    const exportsScript = document.createElement('script');
+    exportsScript.innerHTML = 'window.exports = window.exports || {};';
+    document.body.appendChild(exportsScript);
+
     for (let i = 0; i < scripts.length; i++) {
         const script = document.createElement('script');
         script.src = path + scripts[i];

package/addon/instance-initializers/register-leaflet-drift-marker.js

@@ -0,0 +1,17 @@
+import LeafletDriftMarkerComponent from '../components/leaflet-drift-marker';
+
+export function initialize(owner) {
+    let emberLeafletService = owner.lookup('service:ember-leaflet');
+
+    if (emberLeafletService) {
+        // we then invoke the `registerComponent` method
+        emberLeafletService.registerComponent('leaflet-drift-marker', {
+            as: 'drift-marker',
+            component: LeafletDriftMarkerComponent,
+        });
+    }
+}
+
+export default {
+    initialize,
+};

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

@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+export default class ManagementDriversIndexDetailsRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.findRecord('driver', public_id);
+    }
+}

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

@@ -0,0 +1,13 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+export default class ManagementDriversIndexEditRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.findRecord('driver', public_id);
+    }
+
+    async setupController(controller, model) {
+        controller.driver = model;
+    }
+}

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

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

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

@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+export default class ManagementFleetsIndexDetailsRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.findRecord('fleet', public_id);
+    }
+}

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

@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+export default class ManagementFleetsIndexEditRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.findRecord('fleet', public_id);
+    }
+}

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

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

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

@@ -18,6 +18,7 @@ export default class ManagementFleetsIndexRoute extends Route {
         internal_id: { refreshModel: true },
         zone: { refreshModel: true },
         service_area: { refreshModel: true },
+        parent_fleet: { refreshModel: true },
         task: { refreshModel: true },
     };
 

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

@@ -0,0 +1,18 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class ManagementVehiclesIndexDetailsRoute extends Route {
+    @service store;
+
+    queryParams = {
+        view: { refreshModel: false },
+    };
+
+    model({ public_id }) {
+        return this.store.findRecord('vehicle', public_id);
+    }
+
+    afterModel(model) {
+        model.loadDriver();
+    }
+}

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

@@ -0,0 +1,14 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+
+export default class ManagementVehiclesIndexEditRoute extends Route {
+    @service store;
+
+    model({ public_id }) {
+        return this.store.findRecord('vehicle', public_id);
+    }
+
+    afterModel(model) {
+        model.loadDriver();
+    }
+}

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

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

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

@@ -7,7 +7,9 @@ export default class OperationsOrdersIndexNewRoute extends Route {
     @service loader;
 
     @action willTransition() {
-        this.controller?.resetForm();
+        if (this.controller) {
+            this.controller.resetForm();
+        }
     }
 
     async setupController(controller) {

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

@@ -4,7 +4,9 @@ import { action } from '@ember/object';
 
 export default class OperationsOrdersIndexViewRoute extends Route {
     @service currentUser;
+    @service notifications;
     @service store;
+    @service socket;
 
     @action willTransition() {
         if (this.controller) {
@@ -12,6 +14,11 @@ export default class OperationsOrdersIndexViewRoute extends Route {
         }
     }
 
+    @action error(error) {
+        this.notifications.serverError(error);
+        return this.transitionTo('operations.orders.index');
+    }
+
     model(order) {
         const { public_id } = order;
 
@@ -22,6 +29,49 @@ export default class OperationsOrdersIndexViewRoute extends Route {
         });
     }
 
+    /**
+     * Handle resolved model
+     *
+     * @param {OrderModel} model
+     * @memberof OperationsOrdersIndexViewRoute
+     */
+    afterModel(model) {
+        this.listenForOrderEvents(model);
+    }
+
+    /**
+     * Listen to order channel for update events to refresh data
+     *
+     * @param {OrderModel} model
+     * @memberof OperationsOrdersIndexViewRoute
+     */
+    async listenForOrderEvents(model) {
+        // Get socket instance
+        const socket = this.socket.instance();
+
+        // The channel ID to listen on
+        const channelId = `order.${model.public_id}`;
+
+        // Listed on company channel
+        const channel = socket.subscribe(channelId);
+
+        // Listen for channel subscription
+        (async () => {
+            for await (let output of channel) {
+                this.refresh();
+
+                if (typeof this.onOrderEvent === 'function') {
+                    this.onOrderEvent(output);
+                }
+            }
+        })();
+
+        // disconnect when transitioning
+        this.on('willTransition', () => {
+            channel.close();
+        });
+    }
+
     async setupController(controller, model) {
         super.setupController(controller, model);
 

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

@@ -1,12 +1,19 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 
 export default class OperationsServiceRatesIndexEditRoute extends Route {
     @service store;
     @service currentUser;
+    @service notifications;
 
     templateName = 'operations.service-rates.index.new';
 
+    @action error(error) {
+        this.notifications.serverError(error);
+        return this.transitionTo('operations.service-rates.index');
+    }
+
     model({ public_id }) {
         return this.store.queryRecord('service-rate', {
             public_id,

package/addon/routes.js

@@ -23,16 +23,28 @@ export default buildRoutes(function () {
     });
     this.route('management', { path: '/manage' }, function () {
         this.route('fleets', function () {
-            this.route('index', { path: '/' });
+            this.route('index', { path: '/' }, function () {
+                this.route('new');
+                this.route('details', { path: '/:public_id' });
+                this.route('edit', { path: '/edit/:public_id' });
+            });
         });
         this.route('vendors', function () {
             this.route('index', { path: '/' });
         });
         this.route('drivers', function () {
-            this.route('index', { path: '/' });
+            this.route('index', { path: '/' }, function () {
+                this.route('new');
+                this.route('details', { path: '/:public_id' });
+                this.route('edit', { path: '/edit/:public_id' });
+            });
         });
         this.route('vehicles', function () {
-            this.route('index', { path: '/' });
+            this.route('index', { path: '/' }, function () {
+                this.route('new');
+                this.route('details', { path: '/:public_id' });
+                this.route('edit', { path: '/edit/:public_id' });
+            });
         });
         this.route('places', function () {
             this.route('index', { path: '/' });

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

@@ -0,0 +1 @@
+<DriverPanel @driver={{@model}} @tab={{this.view}} @onPressCancel={{this.transitionBack}} />

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

@@ -0,0 +1 @@
+<DriverFormPanel @driver={{@model}} @onUpdateDriver={{this.updateDriver}} @onPressCancel={{this.transitionBack}}/>

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

@@ -0,0 +1 @@
+<DriverFormPanel @driver={{this.driver}} @onCreateDriver={{this.createDriver}} @onPressCancel={{this.transitionBack}}/>

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

@@ -32,4 +32,6 @@
             {{/each}}
         </div>
     </div>
-{{/if}}
+{{/if}}
+
+{{outlet}}

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

@@ -0,0 +1 @@
+<FleetPanel @fleet={{@model}} @tab={{this.view}} @onPressCancel={{this.transitionBack}} />

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

@@ -0,0 +1 @@
+<FleetFormPanel @fleet={{@model}} @onUpdateFleet={{this.updateFleet}} @onPressCancel={{this.transitionBack}}/>

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

@@ -0,0 +1 @@
+<FleetFormPanel @fleet={{this.fleet}} @onCreateFleet={{this.createFleet}} @onPressCancel={{this.transitionBack}}/>

package/addon/templates/management/vehicles/index/details.hbs

@@ -0,0 +1 @@
+<VehiclePanel @vehicle={{@model}} @tab={{this.view}} @onTabChanged={{mut this.view}} @onPressCancel={{this.transitionBack}} />

package/addon/templates/management/vehicles/index/edit.hbs

@@ -0,0 +1 @@
+<VehicleFormPanel @vehicle={{@model}} @onPressCancel={{this.transitionBack}}/>

package/addon/templates/management/vehicles/index/new.hbs

@@ -0,0 +1 @@
+<VehicleFormPanel @vehicle={{this.vehicle}} @onPressCancel={{this.transitionBack}} />

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

@@ -43,7 +43,7 @@
             </div>
         </DropdownButton>
         <Button @icon="upload" @type="magic" @text={{if (media 'isMobile') "" "Import"}} @onClick={{this.importOrder}} @disabled={{this.isCreatingOrder}} class="mr-2" />
-        <Button @icon="check" @type="primary" @text={{if (media 'isMobile') "" "Submit"}} @onClick={{this.createOrder}} @isLoading={{this.isCreatingOrder}} @isSubscriptionRequired={{true}} @disabled={{not this.isValid}} />
+        <Button @icon="check" @type="primary" @text={{if (media 'isMobile') "" "Submit"}} @onClick={{this.createOrder}} @isLoading={{this.isCreatingOrder}} @disabled={{not this.isValid}} />
     </Overlay::Header>
 
     <Overlay::Body @wrapperClass="new-order-overlay-body" @increaseInnerBodyHeightBy={{1000}}>

package/addon/templates/operations/service-rates/index/new.hbs

@@ -1,9 +1,9 @@
-<Overlay @position="right" @noBackdrop={{true}} @fullHeight={{true}} @width="700">
+<Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @fullHeight={{true}} @width="800px">
     <Overlay::Header @title={{if this.serviceRate.id this.serviceRate.service_name "New service rate"}} @status={{this.serviceRate.public_id}} @hideStatusDot={{true}} @createdAt={{this.serviceRate.createdAt}} @onPressCancel={{this.transitionBack}}>
         {{#if this.serviceRate.id}}
-            <Button @icon="save" @type="primary" @text="Save Service Rate" @onClick={{this.updateServiceRate}} @isLoading={{this.isUpdatingServiceRate}} @isSubscriptionRequired={{true}} />
+            <Button @icon="save" @type="primary" @text="Save Service Rate" @onClick={{this.updateServiceRate}} @isLoading={{this.isUpdatingServiceRate}} />
         {{else}}
-            <Button @icon="check" @type="primary" @text="Create Service Rate" @onClick={{this.createServiceRate}} @isLoading={{this.isCreatingServiceRate}} @isSubscriptionRequired={{true}} />
+            <Button @icon="check" @type="primary" @text="Create Service Rate" @onClick={{this.createServiceRate}} @isLoading={{this.isCreatingServiceRate}} />
         {{/if}}
     </Overlay::Header>
 
@@ -179,7 +179,7 @@
                         <div class="dark:text-gray-100">
                             <div class="grid grid-cols-7">
                                 <div class="flex flex-col items-start justify-start pt-3">
-                                    <img src="/images/boxes/{{parcelFee.size}}.png" alt="parcel size {{parcelFee.size}}" width="44" class="w-11">
+                                    <img src="/engines-dist/images/boxes/{{parcelFee.size}}.png" alt="parcel size {{parcelFee.size}}" width="44" class="w-11">
                                     <label class="mt-2">{{humanize parcelFee.size}}</label>
                                 </div>
                                 <div class="col-span-6 dimensions-box">

package/app/components/driver-form-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/driver-form-panel';

package/app/components/driver-panel/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/driver-panel/details';

package/app/components/driver-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/driver-panel';

package/app/components/fleet-form-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/fleet-form-panel';

package/app/components/fleet-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/fleet-panel';

package/app/components/fleet-vehicle-listing.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/fleet-vehicle-listing';

package/app/components/leaflet-drift-marker.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/leaflet-drift-marker';

package/app/components/vehicle-form-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vehicle-form-panel';

package/app/components/vehicle-panel/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vehicle-panel/details';

package/app/components/vehicle-panel/tracking.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vehicle-panel/tracking';

package/app/components/vehicle-panel.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/vehicle-panel';

package/app/controllers/management/drivers/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/drivers/index/new';

package/app/controllers/management/vehicles/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/vehicles/index/details';

package/app/controllers/management/vehicles/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/management/vehicles/index/new';

package/app/routes/management/drivers/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/drivers/index/details';

package/app/routes/management/drivers/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/drivers/index/edit';

package/app/routes/management/drivers/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/drivers/index/new';

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

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/vehicles/index/details';

package/app/routes/management/vehicles/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/vehicles/index/edit';

package/app/routes/management/vehicles/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/management/vehicles/index/new';

package/app/templates/management/drivers/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/drivers/index/details';

package/app/templates/management/drivers/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/drivers/index/edit';

package/app/templates/management/drivers/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/drivers/index/new';

package/app/templates/management/vehicles/index/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/vehicles/index/details';

package/app/templates/management/vehicles/index/edit.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/vehicles/index/edit';

package/app/templates/management/vehicles/index/new.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/management/vehicles/index/new';

package/index.js

@@ -33,6 +33,21 @@ module.exports = buildEngine({
             { package: 'leaflet-contextmenu', include: undefined, exclude: [...alwaysExclude], path: ['dist'] },
             { package: 'leaflet-draw', include: undefined, exclude: [...alwaysExclude], path: ['dist'] },
             { package: 'leaflet-rotatedmarker', include: undefined, exclude: [...alwaysExclude], path: [] },
+            {
+                package: 'leaflet-drift-marker',
+                include: ['index.js', 'index.js.map'],
+                exclude: [...alwaysExclude],
+                path: ['lib'],
+                getDestinationPath: (relativePath) => {
+                    if (relativePath === 'index.js') {
+                        return 'leaflet-drift-marker.js';
+                    }
+                    if (relativePath === 'index.js.map') {
+                        return 'leaflet-drift-marker.js.map';
+                    }
+                    return relativePath;
+                },
+            },
         ];
         const trees = [];
 
@@ -45,6 +60,7 @@ module.exports = buildEngine({
                     destDir: 'leaflet',
                     include: leafletAdddon.include,
                     exclude: leafletAdddon.exclude,
+                    getDestinationPath: leafletAdddon.getDestinationPath,
                 })
             );
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.2.2",
+    "version": "0.2.4",
     "description": "Fleetbase Fleet-Ops extension provides a fleet management and last mile delivery operations system module.",
     "fleetbase": {
         "route": "fleet-ops",
@@ -39,9 +39,9 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.1.2",
-        "@fleetbase/ember-ui": "^0.1.8",
-        "@fleetbase/fleetops-data": "^0.0.6",
+        "@fleetbase/ember-core": "^0.1.3",
+        "@fleetbase/ember-ui": "^0.1.9",
+        "@fleetbase/fleetops-data": "^0.1.0",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",
@@ -50,16 +50,17 @@
         "@zestia/ember-dragula": "^12.0.0",
         "broccoli-funnel": "^3.0.8",
         "broccoli-merge-trees": "^4.2.0",
-        "ember-intl": "^6.0.0-beta.6",
         "ember-cli-babel": "^7.26.11",
         "ember-cli-es6-transform": "^1.0.0",
         "ember-cli-htmlbars": "^6.1.0",
+        "ember-intl": "^6.0.0-beta.6",
         "ember-leaflet": "^5.1.1",
         "ember-radio-button": "^3.0.0-beta.1",
         "ember-wormhole": "^0.6.0",
         "leaflet": "^1.9.4",
         "leaflet-contextmenu": "^1.4.0",
         "leaflet-draw": "^1.0.4",
+        "leaflet-drift-marker": "^2.0.0",
         "leaflet-rotatedmarker": "^0.2.0"
     },
     "devDependencies": {