@fleetbase/fleetops-engine 0.4.16 → 0.4.18

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

@@ -202,6 +202,25 @@
             </div>
         </ContentPanel>
 
+        {{#if @model.order_config}}
+            {{#each this.customFieldGroups as |group|}}
+                <ContentPanel @title={{group.name}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+                    <div class="grid grid-cols-{{or group.meta.grid_size 1}} gap-2">
+                        {{#each group.customFields as |customField|}}
+                            <div class="field-info-container space-y-2">
+                                <div class="field-name">{{customField.label}}</div>
+                                {{#if (and (eq customField.type "file-upload") customField.value.asFile)}}
+                                    <File @file={{customField.value.asFile}} @onDelete={{fn this.removeCustomFieldFile customField.value}} class="custom-field-file" />
+                                {{else}}
+                                    <div class="field-value">{{n-a customField.value.value}}</div>
+                                {{/if}}
+                            </div>
+                        {{/each}}
+                    </div>
+                </ContentPanel>
+            {{/each}}
+        {{/if}}
+
         {{#if @model.purchase_rate}}
             <ContentPanel @title={{t "fleet-ops.operations.orders.index.view.purchase-rate-panel-title"}} @open={{true}} @pad={{false}} @panelBodyClass="bg-white dark:bg-gray-800">
                 <div class="order-view-purchase-rate-table-wrapper next-table-wrapper h-auto table-fluid rounded-b-md">
@@ -239,33 +258,24 @@
             </ContentPanel>
         {{/if}}
 
-        <ContentPanel @title={{t "fleet-ops.operations.orders.index.view.notes-title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
-            <p class="text-gray-700 dark:text-gray-300 leading-5 text-sm">{{n-a @model.notes}}</p>
+        <ContentPanel @title={{t "fleet-ops.operations.orders.index.view.notes-title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800" @actionButtons={{this.notesPanelButtons}}>
+            {{#if this.isEditingOrderNotes}}
+                <Textarea @value={{@model.notes}} class="form-input w-full" placeholder={{t "fleet-ops.operations.orders.index.view.notes-placeholder"}} rows={{4}} />
+                <div class="flex items-center space-x-2">
+                    <Button @type="primary" @icon="save" @text={{t "fleet-ops.operations.orders.index.view.save-order-note"}} @onClick={{perform this.saveOrderNotes}} @isLoading={{not this.saveOrderNotes.isIdle}} />
+                    <Button @type="default" @icon="times" @text={{t "fleet-ops.common.cancel"}} @onClick={{this.saveOrderNotes}} />
+                </div>
+            {{else}}
+                <p class="text-gray-700 dark:text-gray-300 leading-5 text-sm">{{n-a @model.notes}}</p>
+            {{/if}}
         </ContentPanel>
-        
+
         {{#if @model.isIntegratedVendorOrder}}
             <ContentPanel @title={{concat @model.facilitator.name (t "fleet-ops.operations.orders.index.view.order-details-title")}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
                 <IntegratedOrderDetails @integratedVendor={{@model.facilitator}} @details={{@model.meta.integrated_vendor_order}} />
             </ContentPanel>
         {{/if}}
 
-        {{#if @model.order_config}}
-            {{#each @model.groupedMetaFields as |group|}}
-                <ContentPanel @title={{if group.value (humanize group.value) (t "fleet-ops.operations.orders.index.view.additional-details-title")}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
-                    <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-2">
-                        {{#each group.items as |metaField|}}
-                            <div class="field-info-container space-y-2">
-                                <div class="field-name">{{metaField.label}}</div>
-                                <div class="field-value">
-                                    <CustomFieldValue @metaField={{metaField}} @value={{get @model.meta metaField.key}} />
-                                </div>
-                            </div>
-                        {{/each}}
-                    </div>
-                </ContentPanel>
-            {{/each}}
-        {{/if}}
-
         {{#if @model.tracking_number}}
             <ContentPanel @title={{t "fleet-ops.operations.orders.index.view.tracking"}} @prefixTitleRight={{@model.tracking}} @isLoading={{not this.loadOrderRelations.isIdle}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
                 <div class="mb-4 flex justify-end">
@@ -305,78 +315,10 @@
             {{/if}}
         </ContentPanel>
 
-        {{#if @model.isStorefrontOrder}}
-            <ContentPanel @title={{t "fleet-ops.operations.orders.index.view.order-summary"}} @prefixTitleRight={{if @model.payload.cod_amount "Cash" ""}} @prefixTitleRightClass="text-green-400" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
-                <div class="flex flex-col space-y-4 p-2 overflow-hidden">
-                    {{#each @model.payload.entities as |entity|}}
-                        <div class="flex flex-1">
-                            <div class="mr-2">
-                                <div class="flex items-center justify-center w-6 h-5 border border-gray-200 dark:border-blue-400 rounded-md">
-                                    <span class="text-blue-400 text-xs">{{entity.meta.quantity}}x</span>
-                                </div>
-                            </div>
-                            <div class="flex-1 flex">
-                                <div class="mr-4">
-                                    <img src={{entity.photo_url}} class="w-12 h-12 rounded-md shadow-sm" alt={{entity.name}} />
-                                </div>
-                                <div>
-                                    <h4 class="font-semibold dark:text-gray-100 mb-1 text-sm">{{entity.name}}</h4>
-                                    <div class="flex flex-wrap truncate w-44">
-                                        <p class="dark:text-gray-50 text-xs truncate">{{entity.description}}</p>
-                                    </div>
-                                    <div>
-                                        {{#each entity.meta.variants as |variant|}}
-                                            <div>
-                                                <span class="text-xs dark:text-gray-50">{{variant.name}}</span>
-                                            </div>
-                                        {{/each}}
-                                    </div>
-                                    <div>
-                                        {{#each entity.meta.addons as |addon|}}
-                                            <div>
-                                                <span class="text-xs dark:text-gray-50">+ {{addon.name}}</span>
-                                            </div>
-                                        {{/each}}
-                                    </div>
-                                </div>
-                            </div>
-                            <div>
-                                <span class="dark:text-gray-50 text-sm">{{format-currency entity.meta.subtotal entity.currency}}</span>
-                            </div>
-                        </div>
-                    {{/each}}
-                </div>
-                <div class="p-2 space-y-2 border-t border-b dark:border-gray-800">
-                    <div class="flex items-center justify-between">
-                        <span class="dark:text-gray-50 text-sm">{{t "fleet-ops.operations.orders.index.view.subtotal"}}</span>
-                        <span class="dark:text-gray-50 text-sm">{{format-currency @model.meta.subtotal @model.meta.currency}}</span>
-                    </div>
-                    {{#unless @model.meta.is_pickup}}
-                        <div class="flex items-center justify-between">
-                            <span class="dark:text-gray-50 text-sm">{{t "fleet-ops.operations.orders.index.view.delivery-fee"}}</span>
-                            <span class="dark:text-gray-50 text-sm">{{format-currency @model.meta.delivery_fee @model.meta.currency}}</span>
-                        </div>
-                    {{/unless}}
-                    {{#if @model.meta.tip}}
-                        <div class="flex items-center justify-between">
-                            <span class="dark:text-gray-50 text-sm">{{t "fleet-ops.operations.orders.index.view.tip"}}</span>
-                            <span class="dark:text-gray-50 text-sm">{{get-tip-amount @model.meta.tip @model.meta.subtotal @model.meta.currency}}</span>
-                        </div>
-                    {{/if}}
-                    {{#if @model.meta.delivery_tip}}
-                        <div class="flex items-center justify-between">
-                            <span class="dark:text-gray-50 text-sm">{{t "fleet-ops.operations.orders.index.view.delivery-tip"}}</span>
-                            <span class="dark:text-gray-50 text-sm">{{get-tip-amount @model.meta.delivery_tip @model.meta.subtotal @model.meta.currency}}</span>
-                        </div>
-                    {{/if}}
-                </div>
-                <div class="p-2">
-                    <div class="flex items-center justify-between">
-                        <span class="dark:text-gray-50 font-bold text-sm">{{t "fleet-ops.operations.orders.index.view.total"}}</span>
-                        <span class="dark:text-gray-50 font-bold text-sm">{{format-currency @model.meta.total @model.meta.currency}}</span>
-                    </div>
-                </div>
-            </ContentPanel>
+        {{#if this.renderableComponents}}
+            {{#each this.renderableComponents as |renderableComponent|}}
+                {{component renderableComponent order=this.order}}
+            {{/each}}
         {{/if}}
 
         <ContentPanel @title={{t "fleet-ops.operations.orders.index.view.payload"}} @open={{gt @model.payload.entities.length 0}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
@@ -473,13 +415,11 @@
                 </div>
             {{/if}}
         </ContentPanel>
-        
+
         <ContentPanel @title={{t "fleet-ops.operations.orders.index.view.documents-panel-title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
             <div class="space-y-4">
                 {{#if this.isUploading}}
-                    <div
-                        class="dropzone w-full rounded-lg px-4 py-8 bg-gray-50 dark:bg-gray-900 bg-opacity-25 text-gray-900 dark:text-white text-center flex flex-col items-center justify-center border-2 border-dashed border-gray-200 dark:border-indigo-500"
-                    >
+                    <div class="dropzone w-full rounded-lg px-4 py-8 bg-gray-50 dark:bg-gray-900 bg-opacity-25 text-gray-900 dark:text-white text-center flex flex-col items-center justify-center border-2 border-dashed border-gray-200 dark:border-indigo-500">
                         <div class="flex items-center justify-center py-5">
                             <Spinner class="text-sm dar:text-gray-100" @loadingMessage={{t "fleet-ops.common.uploading"}} />
                         </div>

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

@@ -21,7 +21,6 @@
 
 {{#if this.isTableLayout}}
     <Layout::Section::Header @title={{t "fleet-ops.common.orders"}} @onSearch={{perform this.search}}>
-        <Button @icon="cogs" @text={{t "fleet-ops.common.config"}} class="mr-2" @onClick={{fn (transition-to "operations.orders.index.config")}} />
         <FiltersPicker @columns={{this.columns}} @onApply={{fn this.filters.apply this}} @onClear={{fn this.filters.reset this}} @onFilterClear={{this.filters.clear}} @onChange={{this.filters.set}} @buttonWrapperClass="mr-2" />
         <VisibleColumnPicker @columns={{this.columns}} @onChange={{fn (mut this.columns)}} class="mr-2" />
         {{#if (safe-has this.table "selectedRows")}}

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

@@ -1,4 +1,6 @@
 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.
@@ -9,8 +11,8 @@ export default function applyContextComponentArguments(component) {
     const { context, dynamicArgs = {} } = component.args;
 
     // Apply context model if available
-    if (context) {
-        const contextModelName = getModelName(context);
+    if (context && isModel(context)) {
+        const contextModelName = camelize(getModelName(context));
         if (contextModelName) {
             component[contextModelName] = context;
         }

package/addon/utils/create-custom-entity.js

@@ -0,0 +1,22 @@
+import ObjectProxy from '@ember/object/proxy';
+import config from '../config/environment';
+import generateUUID from '@fleetbase/ember-core/utils/generate-uuid';
+import { get } from '@ember/object';
+
+export default function createCustomEntity(name = '', type = '', description = '', props = {}) {
+    return ObjectProxy.create({
+        content: {
+            id: generateUUID(),
+            name,
+            description,
+            type,
+            dimensions_unit: 'cm',
+            weight_unit: 'kg',
+            photo_url: typeof props.photo_url === 'string' ? props.photo_url : get(config, 'defaultValues.entityImage'),
+            ...props,
+            _internalModel: {
+                modelName: 'custom-entity',
+            },
+        },
+    });
+}

package/addon/utils/create-flow-activity.js

@@ -0,0 +1,31 @@
+import ObjectProxy from '@ember/object/proxy';
+import generateUUID from '@fleetbase/ember-core/utils/generate-uuid';
+import { underscore } from '@ember/string';
+
+export default function createFlowActivity(name = '', status = '', details = '', sequence = 0, color = '#1f2937', props = {}) {
+    return ObjectProxy.create({
+        content: {
+            code: underscore(name),
+            key: underscore(name),
+            status,
+            details,
+            sequence,
+            color,
+            activities: [],
+            events: [],
+            logic: [],
+            actions: [],
+            entities: [],
+            complete: false,
+            require_pod: false,
+            pod_method: 'scan',
+            options: {},
+            node: null,
+            internalId: generateUUID(),
+            _internalModel: {
+                modelName: 'activity',
+            },
+            ...props,
+        },
+    });
+}

package/addon/utils/get-custom-field-type-map.js

@@ -0,0 +1,34 @@
+export default function getCustomFieldTypeMap() {
+    return {
+        input: {
+            component: 'input',
+        },
+        phoneInput: {
+            component: 'phone-input',
+        },
+        moneyInput: {
+            component: 'money-input',
+        },
+        dateTimeInput: {
+            component: 'date-time-input',
+        },
+        radioButton: {
+            component: 'radio-button-select',
+            hasOptions: true,
+        },
+        select: {
+            component: 'select',
+            hasOptions: true,
+        },
+        // modelSelect: {
+        //     allowedModels: ['driver', 'contact', 'vendor', 'place', 'issue', 'fuel-report'],
+        //     component: 'model-select',
+        // },
+        fileUpload: {
+            component: 'file-upload',
+        },
+        // dropzone: {
+        //     component: 'file-dropzone',
+        // },
+    };
+}

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

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/activity-event-selector';

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

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

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

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/activity-logic-builder';

package/app/components/custom-entity-form-panel.js

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

package/app/components/custom-field-form-panel/options-input.js

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

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

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

package/app/components/joint-graph.js

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

package/app/components/modals/new-custom-field-group.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/modals/new-custom-field-group';

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

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/order-config-manager/activity-flow';

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

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/order-config-manager/custom-fields';

package/app/components/order-config-manager/details.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/order-config-manager/details';

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

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/order-config-manager/entities';

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

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/order-config-manager-overlay';

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

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/components/order-config-manager';

package/app/components/order-flow.js

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

package/app/controllers/operations/order-config.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/controllers/operations/order-config';

package/app/routes/operations/order-config.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/routes/operations/order-config';

package/app/templates/operations/order-config.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/templates/operations/order-config';

package/app/utils/create-custom-entity.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/utils/create-custom-entity';

package/app/utils/create-flow-activity.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/utils/create-flow-activity';

package/app/utils/get-custom-field-type-map.js

@@ -0,0 +1 @@
+export { default } from '@fleetbase/fleetops-engine/utils/get-custom-field-type-map';

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.16",
+    "version": "0.4.18",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.10",
+        "fleetbase/core-api": "^1.4.12",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",
@@ -44,7 +44,8 @@
     },
     "autoload": {
         "psr-4": {
-            "Fleetbase\\FleetOps\\": "server/src/"
+            "Fleetbase\\FleetOps\\": "server/src/",
+            "Fleetbase\\FleetOps\\Seeders\\": "server/seeders/"
         }
     },
     "autoload-dev": {

package/config/environment.js

@@ -14,6 +14,7 @@ module.exports = function (environment) {
             contactImage: getenv('DEFAULT_CONTACT_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
             vendorImage: getenv('DEFAULT_VENDOR_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/no-avatar.png'),
             vehicleImage: getenv('DEFAULT_VEHICLE_IMAGE', 'https://s3.ap-southeast-1.amazonaws.com/flb-assets/static/vehicle-placeholder.png'),
+            entityImage: getenv('DEFAULT_ENTITY_IMAGE', 'https://flb-assets.s3-ap-southeast-1.amazonaws.com/static/parcels/medium.png'),
             vehicleAvatar: getenv('DEFAUL_VEHICLE_AVATAR', 'https://flb-assets.s3-ap-southeast-1.amazonaws.com/static/vehicle-icons/mini_bus.svg'),
             driverAvatar: getenv('DEFAUL_DRIVER_AVATAR', 'https://flb-assets.s3-ap-southeast-1.amazonaws.com/static/driver-icons/moto-driver.png'),
             placeAvatar: getenv('DEFAUL_PLACE_AVATAR', 'https://flb-assets.s3-ap-southeast-1.amazonaws.com/static/place-icons/basic-building.png'),

package/extension.json

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

package/index.js

@@ -65,6 +65,26 @@ module.exports = buildEngine({
             );
         }
 
+        // jointjs
+        const jointJsPath = path.join(this.pathBase('@joint/core'), 'dist');
+        trees.push(
+            new Funnel(jointJsPath, {
+                destDir: '/',
+                include: ['joint.min.js'],
+                exclude: [],
+            })
+        );
+
+        // jointjs directed graph
+        const jointJsDirectedGraphPath = path.join(this.pathBase('@joint/layout-directed-graph'), 'dist');
+        trees.push(
+            new Funnel(jointJsDirectedGraphPath, {
+                destDir: '/',
+                include: ['DirectedGraph.min.js'],
+                exclude: [],
+            })
+        );
+
         trees.push(
             new Funnel(leafletImagesPath, {
                 srcDir: '/',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.4.16",
+    "version": "0.4.18",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"
@@ -42,25 +42,27 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "^0.2.4",
+        "@fleetbase/ember-core": "^0.2.6",
         "@fleetbase/ember-ui": "^0.2.11",
-        "@fleetbase/fleetops-data": "^0.1.9",
+        "@fleetbase/fleetops-data": "^0.1.13",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@fortawesome/ember-fontawesome": "^0.4.1",
         "@fortawesome/fontawesome-svg-core": "^6.4.0",
         "@fortawesome/free-solid-svg-icons": "^6.4.0",
+        "@joint/core": "^4.0.1",
+        "@joint/layout-directed-graph": "^4.0.1",
         "@terraformer/spatial": "^2.1.2",
         "@zestia/ember-dragula": "^12.0.0",
         "broccoli-funnel": "^3.0.8",
         "broccoli-merge-trees": "^4.2.0",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0",
+        "ember-drag-sort": "^3.0.1",
         "ember-intl": "6.3.2",
         "ember-leaflet": "^5.1.1",
         "ember-radio-button": "^3.0.0-beta.1",
         "ember-tag-input": "^3.1.0",
         "ember-wormhole": "^0.6.0",
-        "ember-drag-sort": "^3.0.1",
         "leaflet": "^1.9.4",
         "leaflet-contextmenu": "^1.4.0",
         "leaflet-draw": "^1.0.4",
@@ -68,12 +70,12 @@
         "leaflet-rotatedmarker": "^0.2.0"
     },
     "devDependencies": {
-        "@fleetbase/intl-lint": "^0.0.1",
         "@babel/eslint-parser": "^7.22.15",
         "@babel/plugin-proposal-decorators": "^7.23.2",
         "@ember/optional-features": "^2.0.0",
         "@ember/test-helpers": "^3.2.0",
         "@embroider/test-setup": "^3.0.2",
+        "@fleetbase/intl-lint": "^0.0.1",
         "@glimmer/component": "^1.1.2",
         "@glimmer/tracking": "^1.1.2",
         "broccoli-asset-rev": "^3.0.0",