@fleetbase/fleetops-engine 0.4.19 → 0.4.20

package/addon/components/activity-event-selector.js

@@ -1,7 +1,7 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import contextComponentCallback from '../utils/context-component-callback';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 
 /**

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

@@ -2,8 +2,8 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { underscore, capitalize, w } from '@ember/string';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 /**
  * Component class for managing activity forms.

package/addon/components/activity-logic-builder.js

@@ -3,7 +3,7 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import { isNone } from '@ember/utils';
-import contextComponentCallback from '../utils/context-component-callback';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 
 export default class ActivityLogicBuilderComponent extends Component {

package/addon/components/admin/navigator-app.hbs

@@ -1,8 +1,84 @@
-<ContentPanel @title={{t "fleet-ops.component.admin.navigator-app.title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+<ContentPanel @title={{t "fleet-ops.component.admin.navigator-app.title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800 mb-4">
     <InputGroup @name={{t "fleet-ops.component.admin.navigator-app.name"}}>
         <ClickToCopy class="px-4 py-2 border rounded-md bg-gray-100 shadow-sm dark:bg-gray-700 border-gray-200 dark:border-gray-800" @value={{this.url}}>{{this.url}}</ClickToCopy>
         <Attach::Tooltip @class="clean" @animation="scale" @placement="top">
             <InputInfo>{{t "fleet-ops.component.admin.navigator-app.message" htmlSafe=true companyName=@app.name}}</InputInfo>
         </Attach::Tooltip>
     </InputGroup>
+</ContentPanel>
+
+<ContentPanel @title={{t "fleet-ops.component.admin.navigator-app.settings"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+    <InputGroup>
+        <div class="flex items-center">
+            <Toggle @isToggled={{this.isEntityFieldsEditable}} @onToggle={{this.enableEditableEntityFields}} />
+            <div class="ml-2">{{t "fleet-ops.component.admin.navigator-app.select-input"}}</div>
+        </div>
+    </InputGroup>
+    {{#if this.isEntityFieldsEditable}}
+        <OrderConfigManager @onConfigChanged={{this.onConfigChanged}} as |Action Context|>
+            <div class="mt-2">
+                <InputGroup @name="Select order config" @helpText="Apply entity editing settings for an order config.">
+                    <DropdownButton
+                        class="order-config-select-button mr-2"
+                        @disabled={{not Context.configs}}
+                        @text={{if Context.currentConfig.name Context.currentConfig.name (t "fleet-ops.component.order-config-manager.select-order-config")}}
+                        @textClass="text-sm mr-2"
+                        @buttonClass="flex-row-reverse w-44 justify-between"
+                        @icon="caret-down"
+                        @iconClass="mr-0i"
+                        @size="sm"
+                        @iconPrefix="fas"
+                        @triggerClass="hidden md:flex"
+                        as |dd|
+                    >
+                        <div class="next-dd-menu mt-1 mx-0" aria-labelledby="user-menu">
+                            <div class="p-1">
+                                {{#each Context.configs as |orderConfig|}}
+                                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd Context.selectConfig orderConfig)}}>
+                                        <div class="flex-1 flex flex-row items-center">
+                                            <div class="w-6">
+                                                <FaIcon @icon="cogs" />
+                                            </div>
+                                            <span>{{orderConfig.name}}</span>
+                                        </div>
+                                        <div>
+                                            {{#if (eq Context.currentConfig.id orderConfig.id)}}
+                                                <FaIcon @icon="check" class="text-green-500" />
+                                            {{/if}}
+                                        </div>
+                                    </a>
+                                {{/each}}
+                            </div>
+                        </div>
+                    </DropdownButton>
+                </InputGroup>
+            </div>
+        </OrderConfigManager>
+        {{#if this.selectedOrderConfig}}
+            <div class="bg-gray-400 border-gray-600 rounded-lg px-4 py-2 dark:bg-gray-700 dark:border-gray-800">
+                {{#let (get (get this.entityEditingSettings this.selectedOrderConfig.id) "editable_entity_fields") as |editableEntityFields|}}
+                    {{#each this.entityFields as |entityField|}}
+                        <div class="mt-1">
+                            <Checkbox
+                                @value={{includes entityField editableEntityFields}}
+                                @label={{smart-humanize entityField}}
+                                @onToggle={{fn this.toggleFieldEditable entityField}}
+                                @helpText={{t "fleet-ops.component.admin.visibility-controls.checkbox-text"}}
+                            />
+                        </div>
+                    {{/each}}
+                {{/let}}
+            </div>
+            <div class="mt-3 flex items-center">
+                <Button
+                    @type="primary"
+                    @size="lg"
+                    @icon="save"
+                    @text={{t "fleet-ops.common.save-changes"}}
+                    @onClick={{perform this.saveEntityEditingSettings}}
+                    @isLoading={{not this.saveEntityEditingSettings.isIdle}}
+                />
+            </div>
+        {{/if}}
+    {{/if}}
 </ContentPanel>

package/addon/components/admin/navigator-app.js

@@ -1,27 +1,80 @@
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { isArray } from '@ember/array';
+import { task } from 'ember-concurrency-decorators';
 
 export default class NavigatorAppControlsComponent extends Component {
     @service fetch;
     @tracked isLoading = false;
     @tracked url;
+    @tracked selectedOrderConfig;
+    @tracked entityFields = ['name', 'description', 'sku', 'height', 'width', 'length', 'weight', 'declared_value', 'sale_price'];
+    @tracked entityEditingSettings = {};
+    @tracked isEntityFieldsEditable = false;
 
     constructor() {
         super(...arguments);
-        this.getAppLinkUrl();
+        this.getAppLinkUrl.perform();
+        this.getEntityEditableSettings.perform();
+    }
+
+    @action enableEditableEntityFields(isEntityFieldsEditable) {
+        this.isEntityFieldsEditable = isEntityFieldsEditable;
+    }
+
+    @action onConfigChanged(orderConfig) {
+        this.selectedOrderConfig = orderConfig;
+    }
+
+    @action toggleFieldEditable(fieldName, isEditable) {
+        const editableFields = this.entityEditingSettings[this.selectedOrderConfig.id]?.editable_entity_fields;
+        if (isArray(editableFields)) {
+            if (isEditable) {
+                editableFields.pushObject(fieldName);
+            } else {
+                editableFields.removeObject(fieldName);
+            }
+        } else {
+            this.entityEditingSettings = {
+                ...this.entityEditingSettings,
+                [this.selectedOrderConfig.id]: {
+                    editable_entity_fields: [],
+                },
+            };
+            return this.toggleFieldEditable(...arguments);
+        }
+
+        this.updateEditableEntityFieldsForOrderConfig(editableFields);
+    }
+
+    updateEditableEntityFieldsForOrderConfig(editableFields = [], orderConfig = null) {
+        orderConfig = orderConfig === null ? this.selectedOrderConfig : orderConfig;
+        this.entityEditingSettings = {
+            ...this.entityEditingSettings,
+            [orderConfig.id]: {
+                editable_entity_fields: editableFields,
+            },
+        };
     }
 
-    getAppLinkUrl() {
-        this.isLoading = true;
+    @task *getAppLinkUrl() {
+        const response = yield this.fetch.get('fleet-ops/navigator/get-link-app');
+        const { linkUrl } = response;
+        if (linkUrl) {
+            this.url = linkUrl;
+        }
+    }
+
+    @task *getEntityEditableSettings() {
+        const { entityEditingSettings, isEntityFieldsEditable } = yield this.fetch.get('fleet-ops/settings/entity-editing-settings');
+        this.entityEditingSettings = entityEditingSettings;
+        this.isEntityFieldsEditable = isEntityFieldsEditable;
+    }
 
-        return this.fetch
-            .get('fleet-ops/navigator/get-link-app')
-            .then(({ linkUrl }) => {
-                this.url = linkUrl;
-            })
-            .finally(() => {
-                this.isLoading = false;
-            });
+    @task *saveEntityEditingSettings() {
+        const { entityEditingSettings, isEntityFieldsEditable } = this;
+        yield this.fetch.post('fleet-ops/settings/entity-editing-settings', { entityEditingSettings, isEntityFieldsEditable });
     }
 }

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

@@ -2,8 +2,8 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class ContactFormPanelComponent extends Component {
     /**

package/addon/components/contact-panel.js

@@ -4,8 +4,8 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 import ContactPanelDetailComponent from './contact-panel/details';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class ContactPanelComponent extends Component {
     /**

package/addon/components/custom-field-form-panel.js

@@ -5,8 +5,8 @@ import { action } from '@ember/object';
 import { dasherize, camelize } from '@ember/string';
 import { task } from 'ember-concurrency-decorators';
 import isObject from '@fleetbase/ember-core/utils/is-object';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 import getCustomFieldTypeMap from '../utils/get-custom-field-type-map';
 
 /**

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

@@ -3,8 +3,8 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import Point from '@fleetbase/fleetops-data/utils/geojson/point';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class DriverFormPanelComponent extends Component {
     /**

package/addon/components/driver-panel.js

@@ -4,8 +4,8 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 import DriverPanelDetailComponent from './driver-panel/details';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class DriverPanelComponent extends Component {
     /**

package/addon/components/edit-order-route-panel.js

@@ -4,8 +4,8 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 import { task } from 'ember-concurrency-decorators';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 import getRoutingHost from '@fleetbase/ember-core/utils/get-routing-host';
 import Point from '@fleetbase/fleetops-data/utils/geojson/point';
 import findClosestWaypoint from '@fleetbase/ember-core/utils/find-closest-waypoint';

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

@@ -3,8 +3,8 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { underscore } from '@ember/string';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class FleetFormPanelComponent extends Component {
     /**

package/addon/components/fleet-panel/driver-listing.js

@@ -5,7 +5,7 @@ import { isBlank } from '@ember/utils';
 import { action, set } from '@ember/object';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
-import contextComponentCallback from '../../utils/context-component-callback';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 
 export default class FleetPanelDriverListingComponent extends Component {
     /**

package/addon/components/fleet-panel/vehicle-listing.js

@@ -5,7 +5,7 @@ import { isBlank } from '@ember/utils';
 import { action, set } from '@ember/object';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
-import contextComponentCallback from '../../utils/context-component-callback';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 
 export default class FleetPanelVehicleListingComponent extends Component {
     /**

package/addon/components/fleet-panel.js

@@ -6,8 +6,8 @@ import { isArray } from '@ember/array';
 import FleetPanelDetailComponent from './fleet-panel/details';
 import FleetPanelDriverListingComponent from './fleet-panel/driver-listing';
 import FleetPanelVehicleListingComponent from './fleet-panel/vehicle-listing';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class FleetPanelComponent extends Component {
     /**

package/addon/components/fuel-report-form-panel.js

@@ -2,8 +2,8 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class FuelReportFormPanelComponent extends Component {
     /**

package/addon/components/fuel-report-panel.js

@@ -4,8 +4,8 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import FuelReportPanelDetailsComponent from './fuel-report-panel/details';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class FuelReportPanelComponent extends Component {
     /**

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

@@ -4,8 +4,8 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 import getIssueTypes from '../utils/get-issue-types';
 import getIssueCategories from '../utils/get-issue-categories';
 

package/addon/components/issue-panel.js

@@ -4,8 +4,8 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 import IssuePanelDetailComponent from './issue-panel/details';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 export default class IssuePanelComponent extends Component {
     /**
      * Service for fetching data.

package/addon/components/live-map-drawer.js

@@ -3,8 +3,8 @@ import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 import LiveMapDrawerVehicleListingComponent from './live-map-drawer/vehicle-listing';
 import LiveMapDrawerDriverListingComponent from './live-map-drawer/driver-listing';
 import LiveMapDrawerPlaceListingComponent from './live-map-drawer/place-listing';

package/addon/components/order-config-manager/activity-flow.js

@@ -9,7 +9,7 @@ import { later } from '@ember/runloop';
 import { task } from 'ember-concurrency-decorators';
 import generateUUID from '@fleetbase/ember-core/utils/generate-uuid';
 import createFlowActivity from '../../utils/create-flow-activity';
-import contextComponentCallback from '../../utils/context-component-callback';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 
 /**
  * Manages the activity flow for order configuration, allowing users to create, edit, and view a sequence of activities.

package/addon/components/order-config-manager/custom-fields.js

@@ -6,7 +6,7 @@ import { isArray } from '@ember/array';
 import { later } from '@ember/runloop';
 import { task } from 'ember-concurrency-decorators';
 import isObject from '@fleetbase/ember-core/utils/is-object';
-import contextComponentCallback from '../../utils/context-component-callback';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 
 /**
  * Component class for managing custom fields within an order configuration.

package/addon/components/order-config-manager/entities.js

@@ -8,7 +8,7 @@ import { task } from 'ember-concurrency-decorators';
 import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
 import ObjectProxy from '@ember/object/proxy';
 import createCustomEntity from '../../utils/create-custom-entity';
-import contextComponentCallback from '../../utils/context-component-callback';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 
 /**
  * Component class for managing order configuration entities.

package/addon/components/order-config-manager-overlay.js

@@ -1,6 +1,6 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
-import contextComponentCallback from '../utils/context-component-callback';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 
 export default class OrderConfigManagerOverlayComponent extends Component {
     /**

package/addon/components/order-config-manager.js

@@ -9,8 +9,8 @@ import { dasherize } from '@ember/string';
 import { task } from 'ember-concurrency-decorators';
 import isModel from '@fleetbase/ember-core/utils/is-model';
 import getModelName from '@fleetbase/ember-core/utils/get-model-name';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 import OrderConfigManagerDetailsComponent from './order-config-manager/details';
 import OrderConfigManagerCustomFieldsComponent from './order-config-manager/custom-fields';
 import OrderConfigManagerActivityFlowComponent from './order-config-manager/activity-flow';

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

@@ -4,8 +4,8 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import Point from '@fleetbase/fleetops-data/utils/geojson/point';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class PlaceFormPanelComponent extends Component {
     /**

package/addon/components/place-panel.js

@@ -4,8 +4,8 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 import PlacePanelDetailComponent from './place-panel/details';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class PlacePanelComponent extends Component {
     /**

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

@@ -2,8 +2,8 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 import Point from '@fleetbase/fleetops-data/utils/geojson/point';
 
 export default class VehicleFormPanelComponent extends Component {

package/addon/components/vehicle-panel.js

@@ -4,8 +4,8 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 import VehiclePanelDetailComponent from './vehicle-panel/details';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 /**
  * Represents the vehicle panel component, handling vehicle information display and editing.

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

@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { isArray } from '@ember/array';
 import apiUrl from '@fleetbase/ember-core/utils/api-url';
-import contextComponentCallback from '../../utils/context-component-callback';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
 
 export default class VendorFormPanelCreateFormComponent extends Component {
     /**

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

@@ -2,8 +2,8 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 import getVendorTypeOptions from '../utils/get-vendor-type-options';
 import getVendorStatusOptions from '../utils/get-vendor-status-options';
 

package/addon/components/vendor-panel.js

@@ -4,8 +4,8 @@ import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isArray } from '@ember/array';
 import VendorPanelDetailComponent from './vendor-panel/details';
-import contextComponentCallback from '../utils/context-component-callback';
-import applyContextComponentArguments from '../utils/apply-context-component-arguments';
+import contextComponentCallback from '@fleetbase/ember-core/utils/context-component-callback';
+import applyContextComponentArguments from '@fleetbase/ember-core/utils/apply-context-component-arguments';
 
 export default class VendorPanelComponent extends Component {
     /**

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.19",
+    "version": "0.4.20",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.12",
+        "fleetbase/core-api": "^1.4.14",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.4.19",
+    "version": "0.4.20",
     "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.19",
+    "version": "0.4.20",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,7 +42,7 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.2.6",
+        "@fleetbase/ember-core": "^0.2.8",
         "@fleetbase/ember-ui": "^0.2.11",
         "@fleetbase/fleetops-data": "^0.1.14",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",

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

@@ -11,7 +11,6 @@ use Fleetbase\FleetOps\Http\Resources\v1\Driver as DriverResource;
 use Fleetbase\FleetOps\Jobs\SimulateDrivingRoute;
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\FleetOps\Support\Flow;
 use Fleetbase\FleetOps\Support\OSRM;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;

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

@@ -25,6 +25,7 @@ use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Models\Company;
 use Fleetbase\Models\File;
+use Fleetbase\Models\Setting;
 use Fleetbase\Support\Auth;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
@@ -433,8 +434,6 @@ class OrderController extends Controller
     public function query(Request $request)
     {
         $results = Order::queryWithRequest($request, function (&$query, $request) {
-            $query->where('company_uuid', session('company'));
-
             if ($request->has('payload')) {
                 $query->whereHas('payload', function ($q) use ($request) {
                     $q->where('public_id', $request->input('payload'));
@@ -1364,4 +1363,52 @@ class OrderController extends Controller
 
         return new ProofResource($proof);
     }
+
+    /**
+     * Retrieves editable fields for a specific order entity based on its configuration.
+     *
+     * This function looks up an order by its ID and retrieves configurable editable fields
+     * associated with it, as defined in the settings. If the order is not found, it returns
+     * a 404 response with an error message. Otherwise, it returns the editable fields for
+     * the order entity.
+     *
+     * @param string  $id      the unique identifier of the order
+     * @param Request $request the incoming request instance
+     *
+     * @return \Illuminate\Http\JsonResponse returns a JSON response containing either an error message
+     *                                       or the editable fields for the order entity
+     *
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException thrown if the order with the given ID cannot be found
+     */
+    public function getEditableEntityFields(string $id, Request $request)
+    {
+        try {
+            $order = Order::findRecordOrFail($id);
+        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $exception) {
+            return response()->json(
+                [
+                    'error' => 'Order resource not found.',
+                ],
+                404
+            );
+        }
+
+        // Define settings as array
+        $entityEditingSettings = [];
+
+        // get the order config id
+        $orderConfigId = data_get($order, 'order_config_uuid');
+
+        // Get entity editing settings
+        $savedEntityEditingSettings = Setting::where('key', 'fleet-ops.entity-editing-settings')->value('value');
+
+        if ($orderConfigId && $savedEntityEditingSettings) {
+            $resolvedEntityEditingSettings = data_get($savedEntityEditingSettings, $orderConfigId, []);
+            if ($resolvedEntityEditingSettings) {
+                $entityEditingSettings = data_get($resolvedEntityEditingSettings, 'editable_entity_fields', []);
+            }
+        }
+
+        return response()->json($entityEditingSettings);
+    }
 }

package/server/src/Http/Controllers/Internal/v1/SettingController.php

@@ -47,4 +47,24 @@ class SettingController extends Controller
 
         return response()->json(['visibilitySettings' => $visibilitySettings]);
     }
+
+    public function saveEntityEditingSettings(Request $request)
+    {
+        $entityEditingSettings  = $request->input('entityEditingSettings', []);
+        $isEntityFieldsEditable = $request->boolean('isEntityFieldsEditable');
+
+        // Save entity editing settings
+        Setting::configure('fleet-ops.entity-editing-settings', $entityEditingSettings);
+        Setting::configure('fleet-ops.entity-fields-editable', $isEntityFieldsEditable);
+
+        return response()->json(['entityEditingSettings' => $entityEditingSettings, 'isEntityFieldsEditable' => $isEntityFieldsEditable]);
+    }
+
+    public function getEntityEditingSettings()
+    {
+        $entityEditingSettings  = Setting::where('key', 'fleet-ops.entity-editing-settings')->value('value');
+        $isEntityFieldsEditable = Setting::where('key', 'fleet-ops.entity-fields-editable')->value('value');
+
+        return response()->json(['entityEditingSettings' => $entityEditingSettings, 'isEntityFieldsEditable' => $isEntityFieldsEditable]);
+    }
 }

package/server/src/Http/Filter/ContactFilter.php

@@ -22,6 +22,11 @@ class ContactFilter extends Filter
         );
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);

package/server/src/Http/Filter/DriverFilter.php

@@ -23,6 +23,11 @@ class DriverFilter extends Filter
         );
     }
 
+    public function queryForPublic()
+    {
+        $this->queryForInternal();
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->where(function ($query) use ($searchQuery) {

package/server/src/Http/Filter/EntityFilter.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class EntityFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+}

package/server/src/Http/Filter/FleetFilter.php

@@ -12,6 +12,11 @@ class FleetFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'))->with(['serviceArea', 'zone']);
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->where(function ($query) use ($searchQuery) {

package/server/src/Http/Filter/FuelReportFilter.php

@@ -13,6 +13,11 @@ class FuelReportFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);

package/server/src/Http/Filter/IssueFilter.php

@@ -13,6 +13,11 @@ class IssueFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);

package/server/src/Http/Filter/OrderConfigFilter.php

@@ -10,4 +10,9 @@ class OrderConfigFilter extends Filter
     {
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
 }

package/server/src/Http/Filter/OrderFilter.php

@@ -36,6 +36,11 @@ class OrderFilter extends Filter
             );
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'))->whereHas('trackingNumber')->whereHas('payload');
+    }
+
     public function unassigned(bool $unassigned)
     {
         if ($unassigned) {

package/server/src/Http/Filter/PayloadFilter.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class PayloadFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+}

package/server/src/Http/Filter/PlaceFilter.php

@@ -15,6 +15,11 @@ class PlaceFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);

package/server/src/Http/Filter/PurchaseRateFilter.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class PurchaseRateFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+}

package/server/src/Http/Filter/ServiceAreaFilter.php

@@ -10,4 +10,9 @@ class ServiceAreaFilter extends Filter
     {
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
 }

package/server/src/Http/Filter/ServiceQuoteFilter.php

@@ -10,4 +10,9 @@ class ServiceQuoteFilter extends Filter
     {
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
 }

package/server/src/Http/Filter/ServiceRateFilter.php

@@ -11,6 +11,11 @@ class ServiceRateFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function serviceArea(?string $serviceArea)
     {
         $this->builder->whereHas(

package/server/src/Http/Filter/TrackingNumberFilter.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Fleetbase\FleetOps\Http\Filter;
+
+use Fleetbase\Http\Filter\Filter;
+
+class TrackingNumberFilter extends Filter
+{
+    public function queryForInternal()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+}

package/server/src/Http/Filter/TrackingStatusFilter.php

@@ -11,6 +11,11 @@ class TrackingStatusFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function trackingNumber(string $trackingNumber)
     {
         $this->builder->whereHas('trackingNumber', function ($query) use ($trackingNumber) {

package/server/src/Http/Filter/VehicleFilter.php

@@ -12,6 +12,11 @@ class VehicleFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $query)
     {
         $this->builder->search($query);

package/server/src/Http/Filter/VendorFilter.php

@@ -12,6 +12,11 @@ class VendorFilter extends Filter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
+
     public function query(?string $searchQuery)
     {
         $this->builder->search($searchQuery);

package/server/src/Http/Filter/ZoneFilter.php

@@ -10,4 +10,9 @@ class ZoneFilter extends Filter
     {
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
+
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+    }
 }

package/server/src/Http/Resources/v1/Order.php

@@ -39,6 +39,7 @@ class Order extends FleetbaseResource
             'service_quote_uuid'   => $this->when(Http::isInternalRequest(), $this->service_quote_uuid),
             'has_driver_assigned'  => $this->when(Http::isInternalRequest(), $this->has_driver_assigned),
             'is_scheduled'         => $this->when(Http::isInternalRequest(), $this->is_scheduled),
+            'order_config_id'      => $this->when(Http::isInternalRequest(), $this->order_config_id),
             'order_config'         => $this->when(Http::isInternalRequest(), $this->whenLoaded('orderConfig', $this->orderConfig), data_get($this->orderConfig, 'public_id')),
             'custom_field_values'  => $this->when(Http::isInternalRequest(), $this->customFieldValues),
             'customer'             => $this->setCustomerType(Resolve::resourceForMorph($this->customer_type, $this->customer_uuid)),

package/server/src/Models/Driver.php

@@ -157,7 +157,7 @@ class Driver extends Model
      *
      * @var array
      */
-    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid'];
+    protected $filterParams = ['vendor', 'facilitator', 'customer', 'fleet', 'photo_uuid', 'avatar_uuid', 'avatar_value'];
 
     /**
      * Get the activity log options for the model.

package/server/src/Providers/FleetOpsServiceProvider.php

@@ -80,9 +80,9 @@ class FleetOpsServiceProvider extends CoreServiceProvider
         $this->registerObservers();
         $this->registerCommands();
         $this->scheduleCommands(function ($schedule) {
-            $schedule->command('fleetops:dispatch-orders')->everyMinute();
-            $schedule->command('fleetops:dispatch-adhoc')->everyMinute();
-            $schedule->command('fleetops:update-estimations')->everyFifteenMinutes();
+            $schedule->command('fleetops:dispatch-orders')->everyMinute()->withoutOverlapping()->storeOutputInDb();
+            $schedule->command('fleetops:dispatch-adhoc')->everyMinute()->withoutOverlapping()->storeOutputInDb();
+            $schedule->command('fleetops:update-estimations')->everyFiveMinutes()->withoutOverlapping();
         });
         $this->registerNotifications();
         $this->registerExpansionsFrom(__DIR__ . '/../Expansions');

package/server/src/Support/Utils.php

@@ -633,13 +633,26 @@ class Utils extends FleetbaseUtils
                 ]
             );
         } else {
-            $point  = static::getPointFromMixed($origin);
-            $origin = static::createObject(
-                [
-                    'latitude'  => $point->getLat(),
-                    'longitude' => $point->getLng(),
-                ]
-            );
+            try {
+                $point  = static::getPointFromMixed($origin);
+                $origin = static::createObject(
+                    [
+                        'latitude'  => $point->getLat(),
+                        'longitude' => $point->getLng(),
+                    ]
+                );
+            } catch (\Throwable $e) {
+                if (app()->bound('sentry')) {
+                    app('sentry')->captureException($e);
+                }
+                // create dummy $origin
+                $origin = static::createObject(
+                    [
+                        'latitude'  => 0,
+                        'longitude' => 0,
+                    ]
+                );
+            }
         }
 
         if ($destination instanceof \Fleetbase\FleetOps\Models\Place) {
@@ -650,13 +663,26 @@ class Utils extends FleetbaseUtils
                 ]
             );
         } else {
-            $point       = static::getPointFromMixed($destination);
-            $destination = static::createObject(
-                [
-                    'latitude'  => $point->getLat(),
-                    'longitude' => $point->getLng(),
-                ]
-            );
+            try {
+                $point       = static::getPointFromMixed($destination);
+                $destination = static::createObject(
+                    [
+                        'latitude'  => $point->getLat(),
+                        'longitude' => $point->getLng(),
+                    ]
+                );
+            } catch (\Throwable $e) {
+                if (app()->bound('sentry')) {
+                    app('sentry')->captureException($e);
+                }
+                // create dummy $destination
+                $destination = static::createObject(
+                    [
+                        'latitude'  => 0,
+                        'longitude' => 0,
+                    ]
+                );
+            }
         }
 
         $cacheKey = $origin->latitude . ':' . $origin->longitude . ':' . $destination->latitude . ':' . $destination->longitude;

package/server/src/routes.php

@@ -84,6 +84,7 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                     $router->post('{id}/capture-photo/{subjectId?}', 'OrderController@capturePhoto');
                     $router->put('{id}', 'OrderController@update');
                     $router->delete('{id}', 'OrderController@delete');
+                    $router->get('{id}/editable-entity-fields', 'OrderController@getEditableEntityFields');
                 });
                 // entities routes
                 $router->group(['prefix' => 'entities'], function () use ($router) {
@@ -435,6 +436,8 @@ Route::prefix(config('fleetops.api.routing.prefix', null))->namespace('Fleetbase
                                     function ($router) {
                                         $router->get('visibility', 'SettingController@getVisibilitySettings');
                                         $router->post('visibility', 'SettingController@saveVisibilitySettings');
+                                        $router->get('entity-editing-settings', 'SettingController@getEntityEditingSettings');
+                                        $router->post('entity-editing-settings', 'SettingController@saveEntityEditingSettings');
                                     }
                                 );
                                 $router->group(

package/translations/en-us.yaml

@@ -236,6 +236,9 @@ fleet-ops:
         title: Navigator App
         name: Instance Linking URL
         message: Use this URL to link the official Navigator app to this {companyName} instance. Opening this URL on a mobile device will open the Navigator app and update it's configuration and branding.
+        settings: Entity Settings
+        select-input: Allow driver to update entity details 
+
       visibility-controls:
         title: Visibility Controls
         message: Visibility controls allow you to disable sections of Fleet-Ops. Toggle the checkbox to enable or disable sections to hide in Fleet-ops.

package/addon/utils/apply-context-component-arguments.js

@@ -1,33 +0,0 @@
-import getModelName from '@fleetbase/ember-core/utils/get-model-name';
-import isModel from '@fleetbase/ember-core/utils/is-model';
-import { camelize } from '@ember/string';
-
-/**
- * Applies context and dynamic arguments to a given component.
- *
- * @param {Component} component - The component to which context and arguments will be applied.
- */
-export default function applyContextComponentArguments(component) {
-    const { context, dynamicArgs = {} } = component.args;
-
-    // Apply context model if available
-    if (context && isModel(context)) {
-        const contextModelName = camelize(getModelName(context));
-        if (contextModelName) {
-            component[contextModelName] = context;
-        }
-    }
-
-    // Execute any apply callback present in dynamic arguments
-    const { applyCallback } = dynamicArgs;
-    if (typeof applyCallback === 'function') {
-        applyCallback(component);
-    }
-
-    // Apply other dynamic arguments to the component
-    for (const [key, value] of Object.entries(dynamicArgs)) {
-        if (key !== 'applyCallback') {
-            component[key] = value;
-        }
-    }
-}

package/addon/utils/context-component-callback.js

@@ -1,16 +0,0 @@
-export default function contextComponentCallback(component, name, ...params) {
-    let callbackInvoked = false;
-
-    if (typeof component.args[name] === 'function') {
-        component.args[name](...params);
-        callbackInvoked = true;
-    }
-
-    // now do for context options
-    if (typeof component.args.options === 'object' && typeof component.args.options[name] === 'function') {
-        component.args.options[name](...params);
-        callbackInvoked = true;
-    }
-
-    return callbackInvoked;
-}

package/app/utils/apply-context-component-arguments.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/utils/apply-context-component-arguments';

package/app/utils/context-component-callback.js

@@ -1 +0,0 @@
-export { default } from '@fleetbase/fleetops-engine/utils/context-component-callback';