@fleetbase/fleetops-engine 0.4.1 → 0.4.3

package/addon/components/contact-form-panel.js

@@ -137,8 +137,8 @@ export default class ContactFormPanelComponent extends Component {
             {
                 path: `uploads/${this.currentUser.companyId}/drivers/${this.contact.id}`,
                 subject_uuid: this.contact.id,
-                subject_type: `contact`,
-                type: `contact_photo`,
+                subject_type: 'fleet-ops:contact',
+                type: 'contact_photo',
             },
             (uploadedFile) => {
                 this.contact.setProperties({
@@ -184,7 +184,7 @@ export default class ContactFormPanelComponent extends Component {
             {
                 path: `uploads/${this.contact.company_uuid}/contacts/${this.contact.slug}`,
                 subject_uuid: this.contact.id,
-                subject_type: 'contact',
+                subject_type: 'fleet-ops:contact',
                 type: 'contact_photo',
             },
             (uploadedFile) => {

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

@@ -131,7 +131,7 @@ export default class DriverFormPanelComponent extends Component {
             {
                 path: `uploads/${this.currentUser.companyId}/drivers/${this.driver.id}`,
                 subject_uuid: this.driver.id,
-                subject_type: 'driver',
+                subject_type: 'fleet-ops:driver',
                 type: 'driver_photo',
             },
             (uploadedFile) => {

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

@@ -131,7 +131,7 @@ export default class VehicleFormPanelComponent extends Component {
             {
                 path: `uploads/${this.currentUser.companyId}/vehicles/${this.vehicle.id}`,
                 subject_uuid: this.vehicle.id,
-                subject_type: 'vehicle',
+                subject_type: 'fleet-ops:vehicle',
                 type: 'vehicle_photo',
             },
             (uploadedFile) => {

package/addon/components/vendor-form-panel.js

@@ -147,7 +147,7 @@ export default class VendorFormPanelComponent extends Component {
             {
                 path: `uploads/${this.currentUser.companyId}/vendors/${this.vendor.id}`,
                 subject_uuid: this.vendor.id,
-                subject_type: 'vendor',
+                subject_type: 'fleet-ops:vendor',
                 type: 'vendor_logo',
             },
             (uploadedFile) => {

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

@@ -571,7 +571,6 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                 is_route_optimized,
             })
             .then((serviceQuotes) => {
-                console.log('[serviceQuotes]', serviceQuotes);
                 set(this, 'serviceQuotes', isArray(serviceQuotes) ? serviceQuotes : []);
 
                 if (this.serviceQuotes.length && this.isUsingIntegratedVendor) {
@@ -588,27 +587,21 @@ export default class OperationsOrdersIndexNewController extends BaseController {
 
     _getSerializedPayload(payload) {
         const serialized = {
-            pickup: payload.pickup,
-            dropoff: payload.dropoff,
+            pickup: this._seriailizeModel(payload.pickup),
+            dropoff: this._seriailizeModel(payload.dropoff),
+            entitities: this._serializeArray(payload.entities),
+            waypoints: this._serializeArray(payload.waypoint),
         };
 
-        if (isModel(payload.pickup)) {
-            serialized.pickup = payload.pickup.toJSON();
-        }
-
-        if (isModel(payload.dropoff)) {
-            serialized.dropoff = payload.dropoff.toJSON();
-        }
-
-        if (isArray(payload.entities)) {
-            serialized.entities = payload.entities.toArray();
-        }
+        return serialized;
+    }
 
-        if (isArray(payload.waypoints)) {
-            serialized.waypoints = payload.waypoints.toArray();
-        }
+    _seriailizeModel(model) {
+        return isModel(model) ? model.toJSON() : model;
+    }
 
-        return serialized;
+    _serializeArray(array) {
+        return isArray(array) ? array.map((item) => this._seriailizeModel(item)) : array;
     }
 
     @action scheduleOrder(dateInstance) {
@@ -1324,24 +1317,30 @@ export default class OperationsOrdersIndexNewController extends BaseController {
             acceptButtonText: 'Save Changes',
             entity,
             uploadNewPhoto: (file) => {
+                const fileUrl = URL.createObjectURL(file.file);
+
                 if (entity.get('isNew')) {
                     const { queue } = file;
-                    const fileUrl = URL.createObjectURL(file.blob);
 
                     this.modalsManager.setOption('pendingFileUpload', file);
                     entity.set('photo_url', fileUrl);
-                    // entity.set('photo_upload', fileUrl);
                     queue.remove(file);
                     return;
+                } else {
+                    entity.set('photo_url', fileUrl);
                 }
 
+                // Indicate loading
+                this.modalsManager.startLoading();
+
+                // Perform upload
                 return this.fetch.uploadFile.perform(
                     file,
                     {
                         path: `uploads/${this.currentUser.companyId}/entities/${entity.id}`,
                         subject_uuid: entity.id,
-                        subject_type: `entity`,
-                        type: `entity_photo`,
+                        subject_type: 'fleet-ops:entity',
+                        type: 'entity_photo',
                     },
                     (uploadedFile) => {
                         entity.setProperties({
@@ -1349,6 +1348,13 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                             photo_url: uploadedFile.url,
                             photo: uploadedFile,
                         });
+
+                        // Stop loading
+                        this.modalsManager.stopLoading();
+                    },
+                    () => {
+                        // Stop loading
+                        this.modalsManager.stopLoading();
                     }
                 );
             },
@@ -1356,7 +1362,6 @@ export default class OperationsOrdersIndexNewController extends BaseController {
                 modal.startLoading();
 
                 const pendingFileUpload = modal.getOption('pendingFileUpload');
-
                 return entity.save().then(() => {
                     if (pendingFileUpload) {
                         return modal.invoke('uploadNewPhoto', pendingFileUpload);

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

@@ -858,23 +858,30 @@ export default class OperationsOrdersIndexViewController extends BaseController
             acceptButtonText: 'Save Changes',
             entity,
             uploadNewPhoto: (file) => {
+                const fileUrl = URL.createObjectURL(file.blob);
+
                 if (entity.get('isNew')) {
                     const { queue } = file;
-                    const fileUrl = URL.createObjectURL(file.blob);
 
                     this.modalsManager.setOption('pendingFileUpload', file);
                     entity.set('photo_url', fileUrl);
                     queue.remove(file);
                     return;
+                } else {
+                    entity.set('photo_url', fileUrl);
                 }
 
+                // Indicate loading
+                this.modalsManager.startLoading();
+
+                // Perform upload
                 return this.fetch.uploadFile.perform(
                     file,
                     {
                         path: `uploads/${this.currentUser.companyId}/entities/${entity.id}`,
                         subject_uuid: entity.id,
-                        subject_type: `entity`,
-                        type: `entity_photo`,
+                        subject_type: 'fleet-ops:entity',
+                        type: 'entity_photo',
                     },
                     (uploadedFile) => {
                         entity.setProperties({
@@ -882,6 +889,13 @@ export default class OperationsOrdersIndexViewController extends BaseController
                             photo_url: uploadedFile.url,
                             photo: uploadedFile,
                         });
+
+                        // Stop loading
+                        this.modalsManager.stopLoading();
+                    },
+                    () => {
+                        // Stop loading
+                        this.modalsManager.stopLoading();
                     }
                 );
             },
@@ -889,7 +903,6 @@ export default class OperationsOrdersIndexViewController extends BaseController
                 modal.startLoading();
 
                 const pendingFileUpload = modal.getOption('pendingFileUpload');
-
                 return entity.save().then(() => {
                     if (pendingFileUpload) {
                         return modal.invoke('uploadNewPhoto', pendingFileUpload);

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

@@ -1,26 +1,7 @@
 import OperationsServiceRatesIndexNewController from './new';
-import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/object';
 
 export default class OperationsServiceRatesIndexEditController extends OperationsServiceRatesIndexNewController {
-    /**
-     * Inject the `intl` service
-     *
-     * @var {Service}
-     */
-    @service intl;
-
-    /**
-     * True if updating service rate.
-     *
-     * @var {Boolean}
-     */
-    @tracked isUpdatingServiceRate = false;
-
-    // @alias('@model.rate_fees') rateFees;
-    // @alias('@model.parcel_fees') parcelFees;
-
     /**
      * Updates the service rate to server
      *

package/addon/routes/application.js

@@ -6,10 +6,13 @@ import getResourceNameFromTransition from '@fleetbase/ember-core/utils/get-resou
 export default class ApplicationRoute extends Route {
     @service loader;
     @service fetch;
+    @service intl;
 
     @action loading(transition) {
-        const resourceName = getResourceNameFromTransition(transition);
-        this.loader.showOnInitialTransition(transition, 'section.next-view-section', { loadingMessage: resourceName ? `Loading ${resourceName}...` : `Loading...` });
+        const resourceName = getResourceNameFromTransition(transition, { humanize: true });
+        this.loader.showOnInitialTransition(transition, 'section.next-view-section', {
+            loadingMessage: resourceName ? this.intl.t('fleet-ops.common.loading-resource', { resourceName }) : this.intl.t('fleet-ops.common.loading'),
+        });
     }
 
     model() {

package/addon/styles/fleetops-engine.css

@@ -60,3 +60,9 @@ body[data-theme='dark'] .scheduler-left-sidebar {
 .next-sidebar .next-sidebar-panel-container.next-driver-listing > .next-sidebar-panel > .next-content-panel > .next-sidebar-panel-body .next-nav-item.driver-nav-item {
     padding-left: 3.5rem;
 }
+
+.multi-drop-select-container .fleetbase-model-select.fleetbase-power-select.ember-model-select > .ember-model-select__loading {
+    background: none;
+    border: none;
+    box-shadow: none;
+}

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

@@ -213,7 +213,7 @@
             </div>
 
             {{#if this.isMultipleDropoffOrder}}
-                <DragSortList class="overflow-visible" @items={{this.waypoints}} @dragEndAction={{this.sortWaypoints}} as |waypoint index|>
+                <DragSortList class="multi-drop-select-container overflow-visible" @items={{this.waypoints}} @dragEndAction={{this.sortWaypoints}} as |waypoint index|>
                     <div id={{concat "waypoint_" (add index 1)}} class="border rounded-md px-3 py-2 shadow-sm border-gray-300 dark:border-gray-900 mb-3">
                         <div class="flex items-center justify-between">
                             <div class="flex items-center justify-between cursor-move">

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops",
@@ -43,7 +43,7 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.2.0",
+        "@fleetbase/ember-core": "^0.2.1",
         "@fleetbase/ember-ui": "^0.2.9",
         "@fleetbase/fleetops-data": "^0.1.7",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",

package/server/src/Http/Controllers/Api/v1/DriverController.php

@@ -422,7 +422,10 @@ class DriverController extends Controller
                 return 'Your ' . data_get($company, 'name', config('app.name')) . ' verification code is ' . $verification->code;
             });
         } catch (\Throwable $e) {
-            return response()->apiError($e->getMessage());
+            if (app()->bound('sentry')) {
+                app('sentry')->captureException($e);
+            }
+            return response()->apiError('Unable to send SMS Verification code.');
         }
 
         return response()->json(['status' => 'OK']);

package/server/src/Models/Entity.php

@@ -247,7 +247,7 @@ class Entity extends Model
      */
     public function getPhotoUrlAttribute()
     {
-        return data_get($this, 'photo.s3url', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/parcels/medium.png');
+        return data_get($this, 'photo.url', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/parcels/medium.png');
     }
 
     /**

package/server/src/Models/Proof.php

@@ -81,7 +81,7 @@ class Proof extends Model
      */
     public function getFileUrlAttribute()
     {
-        return $this->fromCache('file.s3url', null);
+        return $this->fromCache('file.url', null);
     }
 
     /**

package/translations/en-us.yaml

@@ -38,6 +38,7 @@ fleet-ops:
     length: Length
     license: License
     loading: Loading...
+    loading-resource: Loading {resourceName}...
     make: Make
     manage-message: Manage your vendors
     manpower: Manpower
@@ -1300,7 +1301,8 @@ fleet-ops:
           example-second-message: Then the following formula will calculate a service fee of $2.50, which will be added to the base fee.
           algorithm-label: Algorithm
           algorithm-help-text: Define a formula to be evaluated for this service rate calculation.
-          algorithm-placeholder: (( {distance} / 50 ) * .05 ) + (( {time} / 60 ) * .01)
+          algorithm-placeholder: >-
+            (( '{distance}' / 50 ) * .05 ) + (( '{time}' / 60 ) * .01)
           percel-fee-title: Parcel Fee's
           length-label: Length
           length-placeholder: Length in {parcelFeeDimension}