@fleetbase/fleetops-engine 0.6.17 → 0.6.19

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

@@ -0,0 +1,280 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { isArray } from '@ember/array';
+import { isNone } from '@ember/utils';
+import getWithDefault from '@fleetbase/ember-core/utils/get-with-default';
+
+export default class ActivityLogicBuilderComponent extends Component {
+    @service intl;
+    @tracked logic = [];
+
+    /**
+     * Returns available logic types used by the logic builder.
+     *
+     * @readonly
+     * @memberof LogicBuilderService
+     * @returns {Array<{type: string, description: string}>}
+     */
+    get types() {
+        return [
+            {
+                type: 'and',
+                description: this.intl?.t?.('activity.form.logic-builder.types.and') ?? 'Logical AND: True if all conditions are true',
+            },
+            {
+                type: 'or',
+                description: this.intl?.t?.('activity.form.logic-builder.types.or') ?? 'Logical OR: True if at least one condition is true',
+            },
+            {
+                type: 'not',
+                description: this.intl?.t?.('activity.form.logic-builder.types.not') ?? 'Logical NOT: Inverts the truth value of the condition',
+            },
+            {
+                type: 'if',
+                description: this.intl?.t?.('activity.form.logic-builder.types.if') ?? 'Conditional logic: Executes the following action if the condition is true',
+            },
+        ];
+    }
+
+    /**
+     * Returns available comparison and logical operators used in the logic builder.
+     *
+     * @readonly
+     * @memberof LogicBuilderService
+     * @returns {Object}
+     */
+    get operators() {
+        return {
+            equal: {
+                symbol: '==',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.equal') ?? 'Checks if two values are equal',
+                operandType: 'any',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            notEqual: {
+                symbol: '!=',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.not-equal') ?? 'Checks if two values are not equal',
+                operandType: 'any',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            greaterThan: {
+                symbol: '>',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.greater-than') ?? 'Checks if a value is greater than another',
+                operandType: 'number',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            lessThan: {
+                symbol: '<',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.less-than') ?? 'Checks if a value is less than another',
+                operandType: 'number',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            greaterThanOrEqual: {
+                symbol: '>=',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.greater-than-or-equal') ?? 'Checks if a value is greater than or equal to another',
+                operandType: 'number',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            lessThanOrEqual: {
+                symbol: '<=',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.less-than-or-equal') ?? 'Checks if a value is less than or equal to another',
+                operandType: 'number',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            exists: {
+                symbol: 'exists',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.exists') ?? 'Checks if a field or value exists',
+                operandType: 'any',
+                inputCount: 1,
+                leftOperand: false,
+                rightOperand: true,
+            },
+            has: {
+                symbol: 'has',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.has') ?? 'Checks if an object has a specific property or if a collection contains a specific element',
+                operandType: 'object/array',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            contains: {
+                symbol: 'contains',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.contains') ?? 'Checks if a string contains another string, or if an array includes a specific element',
+                operandType: 'string/array',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            beginsWith: {
+                symbol: 'begins with',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.begins-with') ?? 'Checks if a string begins with a specified substring',
+                operandType: 'string',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            endsWith: {
+                symbol: 'ends with',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.ends-with') ?? 'Checks if a string ends with a specified substring',
+                operandType: 'string',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            in: {
+                symbol: 'in',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.in') ?? 'Checks if a value is within a given set or range',
+                operandType: 'any',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            notIn: {
+                symbol: 'not in',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.not-in') ?? 'Checks if a value is not within a given set or range',
+                operandType: 'any',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            and: {
+                symbol: '&&',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.and') ?? 'Logical AND, true if both operands are true',
+                operandType: 'boolean',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            or: {
+                symbol: '||',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.or') ?? 'Logical OR, true if at least one operand is true',
+                operandType: 'boolean',
+                inputCount: 2,
+                leftOperand: true,
+                rightOperand: true,
+            },
+            not: {
+                symbol: '!',
+                description: this.intl?.t?.('activity.form.logic-builder.operators.not') ?? 'Logical NOT, inverts the truth value',
+                operandType: 'boolean',
+                inputCount: 1,
+                leftOperand: false,
+                rightOperand: true,
+            },
+        };
+    }
+
+    constructor(owner, { activity }) {
+        super(...arguments);
+        this.logic = getWithDefault(activity, 'logic', []);
+    }
+
+    @action addLogic() {
+        this.logic = [{ type: 'if', conditions: [this.createCondition()] }, ...this.logic];
+    }
+
+    @action selectLogicType({ type }, index) {
+        this.updateLogic((item, idx) => {
+            if (idx === index) {
+                let updatedItem = { ...item, type: type };
+                updatedItem.conditions = isArray(updatedItem.conditions) ? updatedItem.conditions : [this.createCondition()];
+                return updatedItem;
+            }
+            return item;
+        });
+    }
+
+    @action removeLogic(index) {
+        this.logic = this.logic.filter((_, i) => i !== index);
+        this.updateLogic();
+    }
+
+    @action addCondition(index) {
+        this.updateLogic((item, idx) => {
+            if (idx === index) {
+                let updatedItem = { ...item };
+                if (isArray(updatedItem.conditions)) {
+                    updatedItem.conditions = [this.createCondition(), ...updatedItem.conditions];
+                } else {
+                    updatedItem.conditions = [this.createCondition()];
+                }
+                return updatedItem;
+            }
+            return item;
+        });
+    }
+
+    @action removeCondition(index, conditionIndex) {
+        this.updateLogic((item, idx) => {
+            if (idx === index) {
+                const { conditions, ...rest } = item;
+                const updatedConditions = conditions.filter((_, cIdx) => cIdx !== conditionIndex);
+
+                return { ...rest, conditions: updatedConditions };
+            }
+
+            return item;
+        });
+
+        // If logic has no conditions remove the logic
+        const logic = this.logic[index];
+        if (logic && logic.conditions?.length === 0) {
+            this.removeLogic(index);
+        }
+    }
+
+    @action selectConditionOperator(index, conditionIndex, key) {
+        this.updateLogic((item, idx) => {
+            if (idx === index) {
+                const updatedConditions = item.conditions.map((condition, cIdx) => {
+                    if (cIdx === conditionIndex) {
+                        return { ...condition, operator: key };
+                    }
+                    return condition;
+                });
+
+                return { ...item, conditions: updatedConditions };
+            }
+
+            return item;
+        });
+    }
+
+    @action trackConditionInputChanges() {
+        this.updateLogic(this.logic);
+    }
+
+    @action updateLogic(logic) {
+        if (typeof logic === 'function') {
+            this.logic = this.logic.map(logic);
+        } else if (!isNone(logic)) {
+            this.logic = logic;
+        }
+
+        if (typeof this.args.onChange === 'function') {
+            this.args.onChange(this.logic);
+        }
+    }
+
+    createCondition() {
+        return {
+            field: '',
+            operator: 'equal',
+            value: '',
+        };
+    }
+}

package/addon/components/admin/avatar-management.hbs

@@ -23,7 +23,7 @@
                         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"}} />
+                            <Spinner class="text-sm dar:text-gray-100" @loadingMessage={{concat (t "common.uploading") "..."}} />
                         </div>
                     </div>
                 {{else}}
@@ -31,27 +31,27 @@
                         <FileDropzone @queue={{queue}} class="dropzone file-dropzone" as |dropzone|>
                             {{#if dropzone.active}}
                                 {{#if dropzone.valid}}
-                                    {{t "component.dropzone.drop-to-upload"}}
+                                    {{t "dropzone.drop-to-upload"}}
                                 {{else}}
-                                    {{t "component.dropzone.invalid"}}
+                                    {{t "dropzone.invalid"}}
                                 {{/if}}
                             {{else if queue.files.length}}
                                 <div class="my-2">
                                     <FaIcon @icon="folder-open" class="text-indigo-500 mr-2" />
-                                    {{t "component.dropzone.files-ready-for-upload" numOfFiles=(pluralize queue.files.length (t "component.dropzone.file"))}}
+                                    {{t "dropzone.files-ready-for-upload" numOfFiles=(pluralize queue.files.length (t "dropzone.file"))}}
                                 </div>
                                 <div class="my-2">({{queue.progress}}%)</div>
                             {{else}}
                                 <h4 class="font-semibold">
                                     <FaIcon @icon="folder-open" @size="lg" class="text-indigo-500 mr-2" />
-                                    {{t "component.dropzone.upload-avatar-files"}}
+                                    {{t "dropzone.upload-avatar-files"}}
                                 </h4>
                                 <div>
                                     {{#if dropzone.supported}}
-                                        <p class="text-sm my-5">{{t "component.dropzone.dropzone-supported-avatars"}}</p>
+                                        <p class="text-sm my-5">{{t "dropzone.dropzone-supported-avatars"}}</p>
                                     {{/if}}
                                     <FileUpload @name="files" @for="files" @accept={{join "," this.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{this.queueFile}}>
-                                        <a tabindex={{0}} class="btn btn-magic cursor-pointer ml-1">{{t "component.dropzone.or-select-button-text"}}</a>
+                                        <a tabindex={{0}} class="btn btn-magic cursor-pointer ml-1">{{t "dropzone.or-select-button-text"}}</a>
                                     </FileUpload>
                                 </div>
                             {{/if}}

package/addon/components/admin/avatar-management.js

@@ -7,40 +7,12 @@ import { task } from 'ember-concurrency';
 import { pluralize } from 'ember-inflector';
 
 export default class AdminAvatarManagementComponent extends Component {
-    /**
-     * Inject the `fileQueue` service
-     *
-     * @var {Service}
-     */
     @service fileQueue;
-
-    /**
-     * Injexts the `store` service
-     *
-     * @memberof AdminAvatarManagementComponent
-     */
     @service store;
-
-    /**
-     * Injexts the `fetch` service
-     *
-     * @memberof AdminAvatarManagementComponent
-     */
     @service fetch;
-
-    /**
-     * Inject the `notifications` service for handling notifications.
-     *
-     * @var {Service}
-     */
     @service notifications;
-
-    /**
-     * Inject the `currentUser` service.
-     *
-     * @var {Service}
-     */
     @service currentUser;
+    @service intl;
 
     /**
      * Tracks the files in the upload queue.
@@ -50,51 +22,55 @@ export default class AdminAvatarManagementComponent extends Component {
     @tracked uploadQueue = [];
 
     /**
-     * The only acceptable file types for avatars, png or svg.
+     * The current loaded avatars.
      *
-     * @memberof AdminAvatarManagementComponent
+     * @var {Array}
      */
-    acceptedFileTypes = ['image/svg+xml', 'image/png'];
+    @tracked avatars = [];
 
     /**
-     * The current loaded avatars.
+     * Tracks the selected category for avatar management.
      *
-     * @var {Array}
+     * @var {string|null}
      */
-    @tracked avatars = [];
+    @tracked currentCategory;
 
     /**
-     * Selectable categories for avatar management.
+     * The only acceptable file types for avatars, png or svg.
      *
      * @memberof AdminAvatarManagementComponent
      */
-    @tracked categories = [
-        {
-            name: 'Vehicles',
-            icon: 'car',
-            type: 'vehicle',
-            avatars: [],
-        },
-        {
-            name: 'Places',
-            icon: 'building',
-            type: 'place',
-            avatars: [],
-        },
-        {
-            name: 'Drivers',
-            icon: 'id-card',
-            type: 'driver',
-            avatars: [],
-        },
-    ];
+    get acceptedFileTypes() {
+        return ['image/svg+xml', 'image/png'];
+    }
 
     /**
-     * Tracks the selected category for avatar management.
+     * Selectable categories for avatar management.
      *
-     * @var {string|null}
+     * @memberof AdminAvatarManagementComponent
      */
-    @tracked currentCategory;
+    get categories() {
+        return [
+            {
+                name: this.intl.t('resource.vehicles'),
+                icon: 'car',
+                type: 'vehicle',
+                avatars: [],
+            },
+            {
+                name: this.intl.t('resource.places'),
+                icon: 'building',
+                type: 'place',
+                avatars: [],
+            },
+            {
+                name: this.intl.t('resource.drivers'),
+                icon: 'id-card',
+                type: 'driver',
+                avatars: [],
+            },
+        ];
+    }
 
     /**
      * Creates an instance of AdminAvatarManagementComponent.

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

@@ -1,8 +1,8 @@
-<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"}}>
+<ContentPanel @title={{t "admin.navigator-app.title"}} @open={{true}} @panelBodyClass="bg-white dark:bg-gray-800 mb-4">
+    <InputGroup @name={{t "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>
+            <InputInfo>{{t "admin.navigator-app.message" htmlSafe=true companyName=@app.name}}</InputInfo>
         </Attach::Tooltip>
     </InputGroup>
 </ContentPanel>

package/addon/components/asset/form.js

@@ -0,0 +1,3 @@
+import Component from '@glimmer/component';
+
+export default class AssetFormComponent extends Component {}

package/addon/components/avatar-picker.hbs

@@ -1,23 +1,45 @@
-<div class="grid grid-cols-1 gap-4 lg:grid-cols-2 lg:gap-2">
-    <div class="input-group mb-2">
-        <InputLabel @labelText={{t "fleet-ops.component.avatar-picker.select-map-avatar"}} @helpText={{t "fleet-ops.component.avatar-picker.select-avatar-rendering"}} />
+<div class="flex flex-row items-start space-x-2">
+    <div class="flex flex-row justify-end">
+        <div class="border border-dashed border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-600 rounded-lg flex items-center justify-center">
+            <div class="flex items-center justify-center h-20 w-24">
+                <Image alt={{this.model.displayName}} src={{or this.model.avatar_custom_url this.model.avatar_url}} @fallbackSrc={{@defaultAvatar}} class="w-12 h-12" />
+            </div>
+        </div>
+    </div>
+    <div class="input-group">
+        <InputLabel @labelText={{t "avatar-picker.select-map-avatar"}} @helpText={{t "avatar-picker.select-avatar-rendering"}} />
         <FetchSelect
             @wrapperClass="w-60"
-            @placeholder={{t "fleet-ops.component.avatar-picker.select-avatar"}}
+            @placeholder={{t "avatar-picker.select-avatar"}}
             @endpoint={{this.endpoint}}
             @selected={{this.model.avatar_value}}
             @optionValue="value"
             @onChange={{this.selectAvatar}}
             as |option|
         >
-            {{titleize (humanize option.key)}}
+            <div class="flex flex-row space-x-2">
+                <div class="border border-dashed border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-600 rounded-lg flex items-center justify-center">
+                    <div class="flex items-center justify-center h-10 w-10">
+                        {{#if (is-uuid option.value)}}
+                            <WithRecord @id={{option.value}} @type="file" as |file isLoading|>
+                                {{#if file}}
+                                    <Image alt={{titleize (humanize option.key)}} src={{file.url}} class="w-8 h-8" />
+                                {{else if isLoading}}
+                                    <Spinner />
+                                {{else}}
+                                    <div class="flex items-center justify-center text-center">
+                                        <FaIcon @icon="image" />
+                                        <span class="text-xs text-gray-400 dark:text-gray-600">{{t "avatar-picker.select-for-preview"}}</span>
+                                    </div>
+                                {{/if}}
+                            </WithRecord>
+                        {{else}}
+                            <Image alt={{titleize (humanize option.key)}} src={{option.value}} class="w-8 h-8" />
+                        {{/if}}
+                    </div>
+                </div>
+                <div>{{titleize (humanize option.key)}}</div>
+            </div>
         </FetchSelect>
     </div>
-    <div class="flex flex-row justify-end">
-        {{#if this.model.avatar_custom_url}}
-            <Image alt={{this.model.displayName}} src={{this.model.avatar_custom_url}} @fallbackSrc={{@defaultAvatar}} class="w-24 h-24" />
-        {{else}}
-            <Image alt={{this.model.displayName}} src={{this.model.avatar_url}} @fallbackSrc={{@defaultAvatar}} class="w-24 h-24" />
-        {{/if}}
-    </div>
 </div>

package/addon/components/avatar-picker.js

@@ -4,15 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { pluralize } from 'ember-inflector';
 import getModelName from '@fleetbase/ember-core/utils/get-model-name';
-
-function isUuid(str) {
-    if (typeof str !== 'string') {
-        return false;
-    }
-
-    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-    return uuidRegex.test(str);
-}
+import isUuid from '@fleetbase/ember-core/utils/is-uuid';
 
 export default class AvatarPickerComponent extends Component {
     @service store;
@@ -31,27 +23,65 @@ export default class AvatarPickerComponent extends Component {
     /**
      * Set the selected avatar
      *
-     * @param {String} url
+     * @param {String} input
      */
-    @action selectAvatar(url) {
-        // custom avatar file selected
-        if (isUuid(url)) {
-            return this.store.findRecord('file', url).then((file) => {
-                this.model.set('avatar_custom_url', file.url);
-                this.model.set('avatar_url', file.id);
-
-                if (typeof this.args.onSelect === 'function') {
-                    this.args.onSelect(this.model, file.url);
-                }
+    @action async selectAvatar(input) {
+        // Normalize: empty -> clear to default
+        if (!input) {
+            const changed = this.model.avatar_url !== null || this.model.avatar_custom_url !== null;
+
+            this.model.setProperties({
+                avatar_url: null,
+                avatar_custom_url: null,
             });
+
+            if (changed) this.args.onSelect?.(this.model, null);
+            return;
         }
 
-        // default url
-        this.model.set('avatar_url', url);
-        this.model.set('avatar_custom_url', null);
+        // UUID path: fetch File and use its URL
+        if (isUuid(input)) {
+            const id = input;
+
+            // Correct Ember Data usage
+            let file = this.store.peekRecord('file', id);
+            if (!file) {
+                try {
+                    file = await this.store.findRecord('file', id);
+                } catch (e) {
+                    // Optional: surface a toast here if you want
+                    return;
+                }
+            }
+            if (!file) return;
+
+            // No-op fast path
+            if (this.model.avatar_url === file.id && this.model.avatar_custom_url === file.url) {
+                this.args.onSelect?.(this.model, file.url);
+                return;
+            }
+
+            this.model.setProperties({
+                avatar_url: file.id,
+                avatar_custom_url: file.url,
+            });
 
-        if (typeof this.args.onSelect === 'function') {
-            this.args.onSelect(this.model, url);
+            this.args.onSelect?.(this.model, file.url);
+            return;
         }
+
+        // URL path (treat any non-UUID string as a URL)
+        const url = String(input);
+        if (this.model.avatar_url === url && this.model.avatar_custom_url === null) {
+            this.args.onSelect?.(this.model, url);
+            return;
+        }
+
+        this.model.setProperties({
+            avatar_url: url,
+            avatar_custom_url: null,
+        });
+
+        this.args.onSelect?.(this.model, url);
     }
 }

package/addon/components/cell/driver-name.hbs

@@ -20,7 +20,7 @@
         </div>
     {{else}}
         <div class="flex items-center">
-            <span>{{t "fleet-ops.component.cell.driver-name.not-assigned"}}</span>
+            <span>{{t "common.no-driver-assigned"}}</span>
         </div>
     {{/if}}
 {{/let}}