Merge pull request #374 from fleetbase/dev-v0.6.8

v0.6.8 ~ View Proof of Delivery in FleetOps + API to get POD
2026-01-05 22:05:50 +00:00 · 2025-04-14 16:10:34 +08:00 · 2025-04-14 16:05:10 +08:00 · 2025-04-11 12:51:25 +08:00 · 2025-04-11 12:43:09 +08:00 · 2025-04-11 10:09:40 +08:00
26 changed files with 4855 additions and 4258 deletions
--- a/api/composer.json
+++ b/api/composer.json
@@ -9,10 +9,11 @@
    "license": "AGPL-3.0-or-later",
    "require": {
        "php": "^8.0",
-        "fleetbase/core-api": "^1.5.21",
-        "fleetbase/fleetops-api": "^0.5.15",
+        "appstract/laravel-opcache": "^4.0",
+        "fleetbase/core-api": "^1.6.2",
+        "fleetbase/fleetops-api": "^0.6.5",
        "fleetbase/registry-bridge": "^0.0.18",
-        "fleetbase/storefront-api": "^0.3.18",
+        "fleetbase/storefront-api": "^0.3.30",
        "guzzlehttp/guzzle": "^7.0.1",
        "laravel/framework": "^10.0",
        "laravel/octane": "^2.3",
--- a/api/composer.lock
+++ b/api/composer.lock
--- a/api/config/opcache.php
+++ b/api/config/opcache.php
@@ -0,0 +1,30 @@
+<?php
+
+return [
+    'url' => env('OPCACHE_URL', config('app.url')),
+    'prefix' => 'opcache-api',
+    'verify' => true,
+    'headers' => [],
+    'directories' => [
+        base_path('app'),
+        base_path('bootstrap'),
+        base_path('public'),
+        base_path('resources'),
+        base_path('routes'),
+        base_path('storage'),
+        base_path('vendor'),
+    ],
+    'exclude' => [
+        'test',
+        'Test',
+        'tests',
+        'Tests',
+        'stub',
+        'Stub',
+        'stubs',
+        'Stubs',
+        'dumper',
+        'Dumper',
+        'Autoload',
+    ],
+];
--- a/api/deploy.sh
+++ b/api/deploy.sh
@@ -26,10 +26,14 @@ php artisan schedule-monitor:sync

 # Clear cache
 php artisan cache:clear
+php artisan route:clear

 # Optimize
-# php artisan config:cache
-# php artisan route:cache
+php artisan config:cache
+php artisan route:cache

 # Initialize registry
 php artisan registry:init
+
+# Restart octane
+# php artisan octane:reload
--- a/console/app/components/configure/notification-channels.hbs
+++ b/console/app/components/configure/notification-channels.hbs
@@ -16,7 +16,7 @@
        {{/if}}
    </InputGroup>
    <InputGroup @wrapperClass="mb-0i">
-        <Checkbox @label="APN Production" @value={{this.apn.production}} @onToggle={{fn (mut this.apn.production)}} @disabled={{this.isLoading}} />
+        <Checkbox @label="APN Production" @value={{this.apn.production}} @onToggle={{this.toggleApnProduction}} />
    </InputGroup>
 </ContentPanel>

--- a/console/app/components/configure/notification-channels.js
+++ b/console/app/components/configure/notification-channels.js
@@ -32,6 +32,13 @@ export default class ConfigureNotificationChannelsComponent extends Component {
        this.loadConfigValues();
    }

+    @action toggleApnProduction(checked) {
+        this.apn = {
+            ...this.apn,
+            production: checked,
+        };
+    }
+
    @action removeApnFile() {
        const apnConfig = this.apn;
        apnConfig.private_key_file = null;
--- a/console/app/controllers/console.js
+++ b/console/app/controllers/console.js
@@ -50,7 +50,7 @@ export default class ConsoleController extends Controller {
     *
     * @var {Array}
     */
-    @tracked hiddenSidebarRoutes = ['console.home', 'console.notifications'];
+    @tracked hiddenSidebarRoutes = ['console.home', 'console.notifications', 'console.virtual'];

    /**
     * Menu items to be added to the main header navigation bar.
--- a/console/app/index.html
+++ b/console/app/index.html
@@ -22,7 +22,12 @@
  </head>
  <body>
    {{content-for "body"}}
-
+    <div id="boot-loader" class="overloader">
+      <div class="loader-container">
+        <span class="fleetbase-loader" width="16" height="16"></span>
+        <div class="loading-message">Starting up...</div>
+      </div>
+    </div>
    <script src="{{rootURL}}assets/vendor.js"></script>
    <script src="{{rootURL}}assets/@fleetbase/console.js"></script>

--- a/console/app/models/user.js
+++ b/console/app/models/user.js
@@ -31,7 +31,10 @@ export default class UserModel extends Model {
    @attr('string') locale;
    @attr('boolean') is_online;
    @attr('boolean') is_admin;
+    @attr('boolean') is_subscribed;
+    @attr('boolean') is_trialing;
    @attr('raw') meta;
+    @attr('raw') subscription;

    /** @relationships */
    @belongsTo('role') role;
@@ -42,6 +45,7 @@ export default class UserModel extends Model {
    @attr('date') last_seen_at;
    @attr('date') phone_verified_at;
    @attr('date') email_verified_at;
+    @attr('date') trial_ends_at;
    @attr('date') last_login;
    @attr('date') deleted_at;
    @attr('date') created_at;
--- a/console/app/routes/application.js
+++ b/console/app/routes/application.js
@@ -4,6 +4,7 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import isElectron from '@fleetbase/ember-core/utils/is-electron';
 import pathToRoute from '@fleetbase/ember-core/utils/path-to-route';
+import removeBootLoader from '../utils/remove-boot-loader';

 export default class ApplicationRoute extends Route {
    @service session;
@@ -88,6 +89,17 @@ export default class ApplicationRoute extends Route {
        }
    }

+    /**
+     * Remove boot loader if not authenticated.
+     *
+     * @memberof ApplicationRoute
+     */
+    afterModel() {
+        if (!this.session.isAuthenticated) {
+            removeBootLoader();
+        }
+    }
+
    /**
     * Initializes the application's theme settings, applying necessary class names and default theme configurations.
     *
--- a/console/app/routes/console.js
+++ b/console/app/routes/console.js
@@ -1,6 +1,7 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import removeBootLoader from '../utils/remove-boot-loader';
 import '@fleetbase/leaflet-routing-machine';

 export default class ConsoleRoute extends Route {
@@ -37,6 +38,7 @@ export default class ConsoleRoute extends Route {
     */
    async afterModel(model, transition) {
        this.universe.callHooks('console:after-model', this.session, this.router, model, transition);
+        removeBootLoader();
    }

    /**
--- a/console/app/styles/console.css
+++ b/console/app/styles/console.css
@@ -38,3 +38,32 @@ body[data-theme='dark'] .two-fa-enforcement-alert button#two-fa-setup-button.btn
 body.console-admin-organizations-index-index .next-table-wrapper > table {
    table-layout: auto;
 }
+
+#boot-loader {
+    position: absolute;
+    z-index: 9999999999;
+    inset: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+}
+
+#boot-loader > .loader-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+}
+
+#boot-loader > .loader-container > .loading-message {
+    margin-left: 0.5rem;
+    font-weight: 600;
+    font-size: 0.875rem;
+}
+
+body[data-theme='dark'] #boot-loader > .loader-container > .loading-message {
+    color: #fff;
+}
--- a/console/app/templates/console/virtual.hbs
+++ b/console/app/templates/console/virtual.hbs
@@ -1,11 +1,6 @@
 {{page-title @model.title}}
-<Layout::Section::Header @title={{@model.title}} />

 <Layout::Section::Body class="overflow-y-scroll h-full">
-    <div class="container mx-auto h-screen">
-        <div class="max-w-3xl my-10 mx-auto space-y-">
-            {{component @model.component params=@model.componentParams}}
-        </div>
-    </div>
+    {{component @model.component params=@model.componentParams}}
    <Spacer @height="300px" />
 </Layout::Section::Body>
--- a/console/app/utils/remove-boot-loader.js
+++ b/console/app/utils/remove-boot-loader.js
@@ -0,0 +1,6 @@
+export default function removeBootLoader() {
+    const bootLoaderElement = document.getElementById('boot-loader');
+    if (bootLoaderElement && typeof bootLoaderElement.remove === 'function') {
+        bootLoaderElement.remove();
+    }
+}
--- a/console/package.json
+++ b/console/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@fleetbase/console",
-    "version": "0.5.19",
+    "version": "0.6.8",
    "private": true,
    "description": "Modular logistics and supply chain operating system (LSOS)",
    "repository": "https://github.com/fleetbase/fleetbase",
@@ -29,18 +29,18 @@
    },
    "dependencies": {
        "@ember/legacy-built-in-components": "^0.4.2",
+        "@fleetbase/dev-engine": "^0.2.9",
        "@fleetbase/ember-core": "latest",
        "@fleetbase/ember-ui": "latest",
        "@fleetbase/fleetops-data": "latest",
-        "@fleetbase/fleetops-engine": "^0.5.14",
+        "@fleetbase/fleetops-engine": "^0.6.5",
        "@fleetbase/iam-engine": "^0.1.3",
-        "@fleetbase/dev-engine": "^0.2.9",
        "@fleetbase/leaflet-routing-machine": "^3.2.16",
        "@fleetbase/registry-bridge-engine": "^0.0.18",
-        "@fleetbase/storefront-engine": "^0.3.18",
+        "@fleetbase/storefront-engine": "^0.3.30",
        "@fortawesome/ember-fontawesome": "^2.0.0",
-        "ember-changeset": "^4.1.2",
-        "ember-changeset-validations": "^4.1.1",
+        "ember-changeset": "4.1.2",
+        "ember-changeset-validations": "4.1.2",
        "ember-composable-helpers": "^5.0.0",
        "ember-concurrency": "^3.1.1",
        "ember-concurrency-decorators": "^2.0.3",
@@ -56,6 +56,7 @@
        "postcss-nth-list": "^1.0.2"
    },
    "devDependencies": {
+        "@embroider/macros": "1.16.12",
        "@babel/core": "^7.25.2",
        "@babel/eslint-parser": "^7.25.1",
        "@babel/plugin-proposal-decorators": "^7.24.7",
@@ -127,7 +128,7 @@
        "stylelint-prettier": "^4.1.0",
        "tailwindcss": "^3.4.10",
        "tracked-built-ins": "^3.3.0",
-        "webpack": "^5.94.0"
+        "webpack": "^5.98.0"
    },
    "engines": {
        "node": ">= 18"
--- a/console/pnpm-lock.yaml
+++ b/console/pnpm-lock.yaml
--- a/console/tests/unit/utils/remove-boot-loader-test.js
+++ b/console/tests/unit/utils/remove-boot-loader-test.js
@@ -0,0 +1,10 @@
+import removeBootLoader from '@fleetbase/console/utils/remove-boot-loader';
+import { module, test } from 'qunit';
+
+module('Unit | Utility | remove-boot-loader', function () {
+    // TODO: Replace this with your real tests.
+    test('it works', function (assert) {
+        let result = removeBootLoader();
+        assert.ok(result);
+    });
+});
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,11 @@
 services:
  cache:
    image: redis:4-alpine
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5

  database:
    image: mysql:8.0-oracle
@@ -12,6 +17,11 @@ services:
    environment:
      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
      MYSQL_DATABASE: "fleetbase"
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      interval: 10s
+      timeout: 5s
+      retries: 5

  socket:
    image: socketcluster/socketcluster:v17.4.0
@@ -28,6 +38,11 @@ services:
      target: events-dev
      args:
        ENVIRONMENT: development
+    healthcheck:
+      test: ["CMD", "php", "artisan", "queue:status"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
    environment:
      DATABASE_URL: "mysql://root@database/fleetbase"
      QUEUE_CONNECTION: redis
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2
 # Base stage
-FROM dunglas/frankenphp:1.2.3-php8.2-bookworm as base
+FROM dunglas/frankenphp:1.5.0-php8.2-bookworm as base

 # Install packages
 RUN apt-get update && apt-get install -y git bind9-utils mycli nodejs npm nano \
@@ -20,11 +20,35 @@ RUN install-php-extensions \
  opcache \
  memcached \
  imagick \
-  geos \
+  # geos \
  sockets \
  pcntl \
  @composer

+# Install build dependencies for GEOS
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       pkg-config \
+       libgeos-dev \
+       libgeos++-dev \
+       autoconf \
+       build-essential \
+       unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+# Download, extract, compile, and enable the php-geos extension
+RUN curl -fsSL -o php-geos.zip \
+      https://github.com/libgeos/php-geos/archive/dfe1ab17b0f155cc315bc13c75689371676e02e1.zip \
+    && unzip php-geos.zip \
+    && rm php-geos.zip \
+    && cd php-geos-* \
+    && ./autogen.sh \
+    && ./configure \
+    && make -j"$(nproc)" install \
+    && docker-php-ext-enable geos \
+    && cd .. \
+    && rm -rf php-geos-*
+
 # Update PHP configurations
 RUN sed -e 's/^expose_php.*/expose_php = Off/' "$PHP_INI_DIR/php.ini-production" > "$PHP_INI_DIR/php.ini" \
  && sed -i -e 's/^upload_max_filesize.*/upload_max_filesize = 600M/' -e 's/^post_max_size.*/post_max_size = 0/' \
@@ -129,10 +153,9 @@ CMD ["php", "artisan", "queue:work"]
 # Application dev stage
 FROM base as app-dev
 ENTRYPOINT ["docker-php-entrypoint"]
-# Add --watch flag later
-CMD ["sh", "-c", "php artisan octane:frankenphp --workers=6 --max-requests=250 --port=8000 --host=0.0.0.0 --caddyfile $CADDYFILE_PATH"] 
+CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=250 --port=8000 --host=0.0.0.0 --watch"] 

 # Application stage
 FROM base as app
 ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"]
-CMD ["sh", "-c", "php artisan octane:frankenphp --workers=6 --max-requests=250 --port=8000 --host=0.0.0.0 --https --http-redirect --caddyfile $CADDYFILE_PATH"]
+CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=250 --port=8000 --host=0.0.0.0"]
--- a/packages/core-api
+++ b/packages/core-api
--- a/packages/ember-core
+++ b/packages/ember-core
--- a/packages/ember-ui
+++ b/packages/ember-ui
--- a/packages/fleetops
+++ b/packages/fleetops
--- a/packages/fleetops-data
+++ b/packages/fleetops-data
--- a/packages/pallet
+++ b/packages/pallet
--- a/packages/storefront
+++ b/packages/storefront
Author	SHA1	Message	Date
Ron	313b5ea3ba	Merge pull request #374 from fleetbase/dev-v0.6.8 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details v0.6.8 ~ View Proof of Delivery in FleetOps + API to get POD	2025-04-14 16:10:34 +08:00
Ronald A. Richardson	698f5979b1	v0.6.8 ~ View Proof of Delivery in FleetOps + API to get POD	2025-04-14 16:05:10 +08:00
Ron	f6f6899650	Merge pull request #373 from fleetbase/dev-v0.6.7 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details Fix iOS Push Notifications for Production Environments	2025-04-11 12:51:25 +08:00
Ronald A. Richardson	83a7ab7338	Fix iOS Push Notifications for Production Environments	2025-04-11 12:43:09 +08:00
Ron	acf7b209af	Merge pull request #372 from fleetbase/dev-v0.6.6 Patched Join Organization + Chat Push Notifications Added	2025-04-11 10:09:40 +08:00
Ronald A. Richardson	5c048a8238	Patched Join Organization + Chat Push Notifications Added	2025-04-11 10:02:33 +08:00
Ron	de00ad31db	Merge pull request #371 from fleetbase/dev-v0.6.5 Some checks are pending Fleetbase CI / Build and Start Docker Services (push) Waiting to run Details 🤖 Patched Navigator App Instance Linking for Android	2025-04-10 13:44:34 +08:00
Ronald A. Richardson	8fe52c6157	🤖 Patched Navigator App Instance Linking for Android + Navigator App Identifier Configurable	2025-04-10 13:34:42 +08:00
Ron	a371e055ca	Merge pull request #370 from fleetbase/dev-v0.6.4 Some checks are pending Fleetbase CI / Build and Start Docker Services (push) Waiting to run Details Upgraded FleetOps to v0.6.3	2025-04-09 19:34:52 +08:00
Ronald A. Richardson	bbec73fcef	Upgraded FleetOps to v0.6.3	2025-04-09 19:03:42 +08:00
Ron	838a829a11	Merge pull request #367 from fleetbase/dev-v0.6.3 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details Patched AdHoc Pinging & Push Notifications	2025-04-01 21:17:49 +08:00
Ronald A. Richardson	dbb7bc793a	removed console logs	2025-04-01 21:06:16 +08:00
Ronald A. Richardson	f0fa867ef9	Patched AdHoc Pinging & Push Notifications	2025-04-01 21:02:51 +08:00
Ron	3cc64913ca	Merge pull request #366 from fleetbase/hotfix/php-geos-404 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details hotfix php-geos install replace broken url with github mirror	2025-03-31 11:13:35 +08:00
Ronald A. Richardson	d034c4ad03	hotfix php-geos install replace broken url with github mirror	2025-03-31 11:05:47 +08:00
Ron	b740cf035e	Merge pull request #365 from fleetbase/dev-v0.6.1 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details v0.6.1 ~ new driver online/offline toggle endpoint, improvements to tracker data api	2025-03-27 21:27:50 +08:00
Ronald A. Richardson	cc42779efc	new driver online/offline toggle endpoint, improvements to tracker data api	2025-03-27 21:25:50 +08:00
Ron	4a5422e357	Merge pull request #364 from fleetbase/dev-v0.6.0 Some checks are pending Fleetbase CI / Build and Start Docker Services (push) Waiting to run Details v0.6.0 - Navigator App Refactor Support Release & Patches + Improvements	2025-03-26 22:14:02 +08:00
Ronald A. Richardson	21a0808b99	v0.6.0 - Navigator App Refactor Support Release & Patches + Improvements	2025-03-26 21:54:48 +08:00
Ron	f6cb850219	Merge pull request #358 from fleetbase/dev-v0.5.30 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details 🏁 Consumable API Patches, Perf Improvements	2025-02-26 20:22:51 +08:00
Ronald A. Richardson	80707774ac	🏁 Consumable API Patches, Perf Improvements	2025-02-26 20:03:09 +08:00
Ron	96318bb909	Merge pull request #356 from fleetbase/dev-v0.5.29 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details v0.5.29 ~ ⚡️ Performance Upgrades 10x Faster, Critical Patches	2025-02-25 20:27:01 +08:00
Ronald A. Richardson	2c10f3551e	dont run octane reload on deploy	2025-02-25 20:06:51 +08:00
Ronald A. Richardson	41a469c983	fix static issues with octane	2025-02-25 20:05:21 +08:00
Ronald A. Richardson	edf7efe167	v0.5.29 ~ ⚡️ Performance Upgrades 10x Faster, Critical Patches	2025-02-25 16:44:14 +08:00
Ron	d7a2dd474a	Merge pull request #355 from fleetbase/dev-v0.5.28 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details v0.5.28 ~ patches for creating contact, and driver api hotfix	2025-02-21 16:29:47 +08:00
Ronald A. Richardson	2b0c6f793d	patches for creating contact, and driver api hotfix	2025-02-21 16:24:23 +08:00
Ron	3e60479130	Merge pull request #352 from fleetbase/dev-v0.5.27 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details v0.5.27 ~ Update for improved storefront callbacks and patches	2025-02-14 19:15:52 +08:00
Ronald A. Richardson	215d5dc42e	v0.5.27 ~ Update for improved storefront callbacks and patches	2025-02-14 19:10:35 +08:00
Ron	a57467539b	Merge pull request #351 from fleetbase/dev-v0.5.26 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details v0.5.26 ~ Hotfix dark tile source	2025-02-13 14:48:35 +08:00
Ronald A. Richardson	c612c97e43	v0.5.26 ~ Hotfix dark tile source	2025-02-13 14:47:22 +08:00
Ron	683e93abe0	Merge pull request #350 from fleetbase/dev-v0.5.25 Some checks are pending Fleetbase CI / Build and Start Docker Services (push) Waiting to run Details v0.5.25 ~ Improved API, Performance and Design	2025-02-12 23:34:54 +08:00
Ronald A. Richardson	ba63441e7c	v0.5.25 ~ Improved API, Performance and Design	2025-02-12 23:29:43 +08:00
Ron	879409d530	Merge pull request #348 from fleetbase/dev-v0.5.24 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details 📖 Catalogs & 🚚 Food Trucks for Storefront + Patches	2025-02-04 23:44:40 +08:00
Ronald A. Richardson	6105b575c6	📖 Catalogs & 🚚 Food Trucks for Storefront + Patches	2025-02-04 23:34:44 +08:00
Ron	57c22eccb7	Merge pull request #344 from fleetbase/dev-v0.5.23 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details v0.5.23 ~ More Features, More Patches	2025-01-30 01:21:02 +09:00
Ronald A. Richardson	989ca4d35e	More Features, More Patches	2025-01-30 00:03:04 +08:00
Ron	afb1c1dbdc	Merge pull request #341 from fleetbase/dev-v0.5.22 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details v0.5.22 ~ Implemented Social OAuth, Critical Patches	2025-01-27 15:37:48 +09:00
Ronald A. Richardson	0ac52bc772	v0.5.22 ~ Implemented Social OAuth, Critical Patches	2025-01-27 14:32:03 +08:00
Ron	50d8ffee33	Merge pull request #337 from fleetbase/dev-v0.5.21 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details v0.5.21 - maintenance release	2025-01-13 12:11:48 +09:00
Ronald A. Richardson	015b87ba82	v0.5.21 - maintenance release	2025-01-13 11:04:55 +08:00
Ron	983d4e5bae	Merge pull request #335 from fleetbase/dev-v0.5.20 Some checks failed Fleetbase CI / Build and Start Docker Services (push) Has been cancelled Details v0.5.20	2025-01-11 18:31:43 +09:00
Ronald A. Richardson	9bc78c0bcc	Several major patches and refactors for storefront and new data management capabilities	2025-01-11 17:26:27 +08:00