Merge pull request #492 from fleetbase/dev-v0.7.26

v0.7.26

.github/workflows/cd.yml

@@ -13,9 +13,24 @@ env:
   GITHUB_AUTH_KEY: ${{ secrets._GITHUB_AUTH_TOKEN }}
 
 jobs:
+  setup:
+    name: Setup Environment
+    runs-on: ubuntu-latest
+    outputs:
+      environment: ${{ steps.extract-env.outputs.environment }}
+    steps:
+      - name: Extract environment from branch name
+        id: extract-env
+        run: |
+          ENVIRONMENT=$(echo "${{ github.ref_name }}" | sed 's|deploy/||')
+          echo "environment=${ENVIRONMENT}" >> $GITHUB_OUTPUT
+          echo "Deploying to environment: ${ENVIRONMENT}"
+
   build_service:
     name: Build and Deploy the Service
+    needs: [setup]
     runs-on: ubuntu-latest
+    environment: ${{ needs.setup.outputs.environment }} 
     permissions:
       id-token: write # This is required for requesting the JWT
       contents: read # This is required for actions/checkout
@@ -120,8 +135,9 @@ jobs:
 
   build_frontend:
     name: Build and Deploy the Console
-    needs: [build_service]
+    needs: [setup, build_service]
     runs-on: ubuntu-latest
+    environment: ${{ needs.setup.outputs.environment }}
     permissions:
       id-token: write # This is required for requesting the JWT
       contents: read # This is required for actions/checkout
@@ -192,20 +208,17 @@ jobs:
           fi
         working-directory: ./console
 
-      - name: Set Env Variables for QA
-        if: startsWith(github.ref, 'refs/heads/deploy/qa')
+      - name: Set Env Variables
         run: |
-          echo "STRIPE_KEY=${{ secrets.STRIPE_TEST_KEY }}" >> ./environments/.env.production
+          echo "EXTENSIONS=${{ secrets.EXTENSIONS }}" >> ./environments/.env.production
           echo "LOGROCKET_APP_ID=${{ secrets.LOGROCKET_APP_ID }}" >> ./environments/.env.production
-          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine" >> ./environments/.env.production
-        working-directory: ./console
-
-      - name: Set Env Variables for Production
-        if: startsWith(github.ref, 'refs/heads/deploy/production')
-        run: |
           echo "STRIPE_KEY=${{ secrets.STRIPE_KEY }}" >> ./environments/.env.production
-          echo "LOGROCKET_APP_ID=${{ secrets.LOGROCKET_APP_ID }}" >> ./environments/.env.production
-          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine" >> ./environments/.env.production
+          echo "STRIPE_PRICE_LICENSE_ANNUAL_ID=${{ secrets.STRIPE_PRICE_LICENSE_ANNUAL_ID }}" >> ./environments/.env.production
+          echo "STRIPE_PRICE_LICENSE_MONTHLY_ID=${{ secrets.STRIPE_PRICE_LICENSE_MONTHLY_ID }}" >> ./environments/.env.production
+          echo "STRIPE_PRICE_LICENSE_MAJOR_ID=${{ secrets.STRIPE_PRICE_LICENSE_MAJOR_ID }}" >> ./environments/.env.production
+          echo "STRIPE_PRICE_LICENSE_MINOR_ID=${{ secrets.STRIPE_PRICE_LICENSE_MINOR_ID }}" >> ./environments/.env.production
+          echo "STRIPE_PRICE_INSTALLATION_FULL_ID=${{ secrets.STRIPE_PRICE_INSTALLATION_FULL_ID }}" >> ./environments/.env.production
+          echo "STRIPE_PRICE_INSTALLATION_ASSISTED_ID=${{ secrets.STRIPE_PRICE_INSTALLATION_ASSISTED_ID }}" >> ./environments/.env.production
         working-directory: ./console
 
       - name: Install dependencies

Caddyfile

@@ -8,6 +8,7 @@
 http://:8000 {
 	root * /fleetbase/api/public
 	encode zstd br gzip
+	
 	php_server {
 		resolve_root_symlink
 	}

RELEASE.md

@@ -1,14 +1,14 @@
-# 🚀 Fleetbase v0.7.22 — 2025-12-07
+# 🚀 Fleetbase v0.7.26 — 2025-01-16
 
-> "Organizations can now set their own alpha-numeric sender ID for SMS"
+> "Improved Driver Validation + API improvements"
 
 ---
 
 ## ✨ Highlights
-- **Custom Alphanumeric Sender ID for SMS:**  
-  Organizations can now configure their own **Alphanumeric Sender ID** used when sending verification codes and other SMS notifications.  
-  This feature improves brand recognition, enhances trust, and aligns outbound communication with each organization’s identity.  
-  Supported in regions/carriers where alphanumeric senders are allowed (e.g., Mongolia and others).
+- Improved driver creation validation for internal API
+- Vehicle and Driver API use explicit `::create` method now
+- Improved onboarding orchestrator framework and services for history and resume capability
+- Upgraded Stripe SDK to v17
 
 ---
 

api/app/Http/Kernel.php

@@ -40,7 +40,6 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];

api/composer.json

@@ -18,12 +18,12 @@
         }
     ],
     "require": {
-        "php": ">=8.0 <=8.2.28",
+        "php": ">=8.0 <=8.2.30",
         "appstract/laravel-opcache": "^4.0",
-        "fleetbase/core-api": "^1.6.28",
-        "fleetbase/fleetops-api": "^0.6.29",
-        "fleetbase/registry-bridge": "^0.1.2",
-        "fleetbase/storefront-api": "^0.4.9",
+        "fleetbase/core-api": "^1.6.34",
+        "fleetbase/fleetops-api": "^0.6.33",
+        "fleetbase/registry-bridge": "^0.1.3",
+        "fleetbase/storefront-api": "^0.4.12",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^10.0",
         "laravel/octane": "^2.3",
@@ -36,7 +36,7 @@
         "psr/http-factory-implementation": "*",
         "resend/resend-php": "^0.14.0",
         "s-ichikawa/laravel-sendgrid-driver": "^4.0",
-        "stripe/stripe-php": "13.13.0",
+        "stripe/stripe-php": "^17.0",
         "symfony/mailgun-mailer": "^7.1",
         "symfony/postmark-mailer": "^7.1"
     },

api/config/cors.php

@@ -27,7 +27,7 @@ return [
 
     'allowed_headers' => ['*'],
 
-    'exposed_headers' => ['x-compressed-json', 'access-console-sandbox', 'access-console-sandbox-key'],
+    'exposed_headers' => ['x-compressed-json', 'access-console-sandbox', 'access-console-sandbox-key', 'content-disposition'],
 
     'max_age' => 0,
 

api/config/logging.php

@@ -51,7 +51,7 @@ return [
     'channels' => [
         'stack' => [
             'driver' => 'stack',
-            'channels' => ['single'],
+            'channels' => ['single', 'stdout'],
             'ignore_exceptions' => false,
         ],
 

api/config/octane.php

@@ -105,8 +105,8 @@ return [
         OperationTerminated::class => [
             FlushOnce::class,
             FlushTemporaryContainerInstances::class,
-            // DisconnectFromDatabases::class,
-            // CollectGarbage::class,
+            DisconnectFromDatabases::class,
+            CollectGarbage::class,    
         ],
 
         WorkerErrorOccurred::class => [

api/config/services.php

@@ -43,4 +43,10 @@ return [
         'secret' => env('STRIPE_SECRET', env('STRIPE_API_SECRET')),
         'webhook_secret' => env('STRIPE_WEBHOOK_SECRET'),
     ],
+
+    'callpromn' => [
+        'api_key' => env('CALLPROMN_API_KEY', ''),
+        'from' => env('CALLPROMN_FROM', ''),
+        'base_url' => env('CALLPROMN_BASE_URL', 'https://api.messagepro.mn' ),
+    ],
 ];

console/app/app.js

@@ -2,6 +2,7 @@ import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from '@fleetbase/console/config/environment';
+import './deprecation-workflow';
 
 export default class App extends Application {
     modulePrefix = config.modulePrefix;

console/app/components/onboarding/form.hbs

@@ -1,42 +1,61 @@
-<div class="bg-white dark:bg-gray-800 py-5 px-4 shadow rounded-lg w-full">
-    <div class="mb-4">
-        <Image src={{@brand.logo_url}} @fallbackSrc="/images/fleetbase-logo-svg.svg" alt={{t "app.name"}} height="56" class="h-10 object-contain mx-auto" />
-        <div class="mt-2">
-            <h2 class="text-center text-lg font-extrabold text-gray-900 dark:text-white truncate">
-                {{t "onboard.index.title"}}
-            </h2>
+<div class="flex items-center justify-center h-screen min-h-screen px-4 py-12 bg-gray-50 dark:bg-gray-900 sm:px-6 lg:px-8 overflow-y-scroll">
+    <div class="w-full max-w-md h-screen flex items-center justify-center py-4">
+        <div class="bg-white dark:bg-gray-800 py-5 px-4 shadow rounded-lg w-full">
+            <div class="mb-4">
+                <Image src={{@brand.logo_url}} @fallbackSrc="/images/fleetbase-logo-svg.svg" alt={{t "app.name"}} height="56" class="h-10 object-contain mx-auto" />
+                <div class="mt-2">
+                    <h2 class="text-center text-lg font-extrabold text-gray-900 dark:text-white truncate">
+                        {{t "onboard.index.title"}}
+                    </h2>
+                </div>
+            </div>
+
+            <div class="flex px-3 py-2 mb-4 rounded-md shadow-sm bg-blue-200">
+                <div>
+                    <FaIcon @icon="hand-spock" @size="lg" class="text-blue-900 mr-4" />
+                </div>
+                <p class="flex-1 text-sm text-blue-900 dark:text-blue-900">
+                    {{t "onboard.index.welcome-title" htmlSafe=true companyName=(t "app.name")}}
+                    {{t "onboard.index.welcome-text"}}
+                </p>
+            </div>
+
+            <form {{on "submit" (perform this.onboard)}}>
+                {{#if this.error}}
+                    <InfoBlock @icon="exclamation-triangle" @text={{this.error}} class="mb-6 px-3 py-2 bg-red-300 text-red-900" @textClass="text-red-900" />
+                {{/if}}
+                <InputGroup @name={{t "onboard.index.full-name"}} @value={{this.name}} @helpText={{t "onboard.index.full-name-help-text"}} @inputClass="input-lg" />
+                <InputGroup @name={{t "onboard.index.your-email"}} @type="email" @value={{this.email}} @helpText={{t "onboard.index.your-email-help-text"}} @inputClass="input-lg" />
+                <InputGroup @name={{t "onboard.index.phone"}} @helpText={{t "onboard.index.phone-help-text"}}>
+                    <PhoneInput @onInput={{fn (mut this.phone)}} class="form-input input-lg w-full" />
+                </InputGroup>
+                <InputGroup @name={{t "onboard.index.organization-name"}} @value={{this.organization_name}} @helpText={{t "onboard.index.organization-help-text"}} @inputClass="input-lg" />
+                <InputGroup @name={{t "onboard.index.password"}} @value={{this.password}} @type="password" @helpText={{t "onboard.index.password-help-text"}} @inputClass="input-lg" />
+                <InputGroup
+                    @name={{t "onboard.index.confirm-password"}}
+                    @value={{this.password_confirmation}}
+                    @type="password"
+                    @helpText={{t "onboard.index.confirm-password-help-text"}}
+                    @inputClass="input-lg"
+                />
+
+                <div class="flex items-center justify-end mt-5">
+                    <Button
+                        @buttonType="submit"
+                        @icon="check"
+                        @iconPrefix="fas"
+                        @type="primary"
+                        @size="lg"
+                        @text={{t "onboard.index.continue-button-text"}}
+                        @isLoading={{this.onboard.isRunning}}
+                        @disabled={{not this.filled}}
+                    />
+                </div>
+            </form>
+
+            <RegistryYield @registry="onboard" as |YieldedComponent ctx|>
+                <YieldedComponent @context={{ctx}} />
+            </RegistryYield>
         </div>
     </div>
-
-    <div class="flex px-3 py-2 mb-4 rounded-md shadow-sm bg-blue-200">
-        <div>
-            <FaIcon @icon="hand-spock" @size="lg" class="text-blue-900 mr-4" />
-        </div>
-        <p class="flex-1 text-sm text-blue-900 dark:text-blue-900">
-            {{t "onboard.index.welcome-title" htmlSafe=true companyName=(t "app.name")}}
-            {{t "onboard.index.welcome-text"}}
-        </p>
-    </div>
-
-    <form {{on "submit" (perform this.onboard)}}>
-        {{#if this.error}}
-            <InfoBlock @icon="exclamation-triangle" @text={{this.error}} class="mb-6 px-3 py-2 bg-red-300 text-red-900" @textClass="text-red-900" />
-        {{/if}}
-        <InputGroup @name={{t "onboard.index.full-name"}} @value={{this.name}} @helpText={{t "onboard.index.full-name-help-text"}} @inputClass="input-lg" />
-        <InputGroup @name={{t "onboard.index.your-email"}} @type="email" @value={{this.email}} @helpText={{t "onboard.index.your-email-help-text"}} @inputClass="input-lg" />
-        <InputGroup @name={{t "onboard.index.phone"}} @helpText={{t "onboard.index.phone-help-text"}}>
-            <PhoneInput @onInput={{fn (mut this.phone)}} class="form-input input-lg w-full" />
-        </InputGroup>
-        <InputGroup @name={{t "onboard.index.organization-name"}} @value={{this.organization_name}} @helpText={{t "onboard.index.organization-help-text"}} @inputClass="input-lg" />
-        <InputGroup @name={{t "onboard.index.password"}} @value={{this.password}} @type="password" @helpText={{t "onboard.index.password-help-text"}} @inputClass="input-lg" />
-        <InputGroup @name={{t "onboard.index.confirm-password"}} @value={{this.password_confirmation}} @type="password" @helpText={{t "onboard.index.confirm-password-help-text"}} @inputClass="input-lg" />
-
-        <div class="flex items-center justify-end mt-5">
-            <Button @buttonType="submit" @icon="check" @iconPrefix="fas" @type="primary" @size="lg" @text={{t "onboard.index.continue-button-text"}} @isLoading={{this.onboard.isRunning}} @disabled={{not this.filled}} />
-        </div>
-    </form>
-
-    <RegistryYield @registry="onboard" as |YieldedComponent ctx|>
-        <YieldedComponent @context={{ctx}} />
-    </RegistryYield>
 </div>

console/app/components/onboarding/verify-email.hbs

@@ -1,78 +1,82 @@
 {{page-title (t "onboard.verify-email.header-title")}}
 
-{{#if this.initialized}}
-    <div class="bg-white dark:bg-gray-800 py-8 px-4 shadow rounded-lg w-full">
-        <div class="mb-6">
-            <LinkTo @route="console" class="flex items-center justify-center">
-                <LogoIcon @size="12" class="rounded-md" />
-            </LinkTo>
-            <h2 class="mt-6 text-center text-lg font-extrabold text-gray-900 dark:text-white truncate">
-                {{t "onboard.verify-email.title"}}
-            </h2>
-        </div>
+<div class="flex items-center justify-center h-screen min-h-screen px-4 py-12 bg-gray-50 dark:bg-gray-900 sm:px-6 lg:px-8 overflow-y-scroll">
+    <div class="w-full max-w-md h-screen flex items-center justify-center py-4">
+        {{#if this.initialized}}
+            <div class="bg-white dark:bg-gray-800 py-8 px-4 shadow rounded-lg w-full">
+                <div class="mb-6">
+                    <LinkTo @route="console" class="flex items-center justify-center">
+                        <LogoIcon @size="12" class="rounded-md" />
+                    </LinkTo>
+                    <h2 class="mt-6 text-center text-lg font-extrabold text-gray-900 dark:text-white truncate">
+                        {{t "onboard.verify-email.title"}}
+                    </h2>
+                </div>
 
-        <InfoBlock @type="info" @icon="shield-halved" @iconSize="lg">
-            {{t "onboard.verify-email.message-text" htmlSafe=true}}
-        </InfoBlock>
+                <InfoBlock @type="info" @icon="shield-halved" @iconSize="lg">
+                    {{t "onboard.verify-email.message-text" htmlSafe=true}}
+                </InfoBlock>
 
-        <form class="mt-8 space-y-6" {{on "submit" (perform this.verify)}}>
-            <InputGroup
-                @type="tel"
-                @name={{t "onboard.verify-email.verification-input-label"}}
-                @value={{this.code}}
-                @helpText={{t "onboard.verify-email.verification-code-text"}}
-                @inputClass="input-lg"
-                {{on "input" this.verification.validateInput}}
-                {{did-insert this.verification.validateInput}}
-            />
+                <form class="mt-8 space-y-6" {{on "submit" (perform this.verify)}}>
+                    <InputGroup
+                        @type="tel"
+                        @name={{t "onboard.verify-email.verification-input-label"}}
+                        @value={{this.code}}
+                        @helpText={{t "onboard.verify-email.verification-code-text"}}
+                        @inputClass="input-lg"
+                        {{on "input" this.verification.validateInput}}
+                        {{did-insert this.verification.validateInput}}
+                    />
 
-            <div class="flex flex-row items-center space-x-4">
-                <Button
-                    @icon="check"
-                    @iconPrefix="fas"
-                    @buttonType="submit"
-                    @type="primary"
-                    @size="lg"
-                    @text="Verify & Continue"
-                    @isLoading={{this.verify.isRunning}}
-                    @disabled={{not this.verification.ready}}
-                />
-                <a href="#" {{on "click" this.verification.didntReceiveCode}} class="text-sm text-blue-400 hover:text-blue-300">{{t "onboard.verify-email.didnt-receive-a-code"}}</a>
-            </div>
+                    <div class="flex flex-row items-center space-x-4">
+                        <Button
+                            @icon="check"
+                            @iconPrefix="fas"
+                            @buttonType="submit"
+                            @type="primary"
+                            @size="lg"
+                            @text="Verify & Continue"
+                            @isLoading={{this.verify.isRunning}}
+                            @disabled={{not this.verification.ready}}
+                        />
+                        <a href="#" {{on "click" this.verification.didntReceiveCode}} class="text-sm text-blue-400 hover:text-blue-300">{{t "onboard.verify-email.didnt-receive-a-code"}}</a>
+                    </div>
 
-            {{#if this.verification.waiting}}
-                <div class="flex flex-col flex-grow-0 flex-shrink-0 text-sm bg-yellow-800 border border-yellow-600 px-2 py-2 rounded-md text-yellow-100 my-4 transition-all">
-                    <div class="flex flex-row items-start mb-2">
-                        <div class="w-8 flex-grow-0 flex-shrink-0">
-                            <FaIcon @icon="triangle-exclamation" @size="xl" class="pt-1" />
-                        </div>
-                        <div class="flex-1">
-                            <div class="flex-1 text-sm text-yellow-100">
-                                <div>{{t "auth.verification.didnt-receive-a-code" htmlSafe=true}}</div>
-                                <div>{{t "auth.verification.not-sent.alternative-choice" htmlSafe=true}}</div>
+                    {{#if this.verification.waiting}}
+                        <div class="flex flex-col flex-grow-0 flex-shrink-0 text-sm bg-yellow-800 border border-yellow-600 px-2 py-2 rounded-md text-yellow-100 my-4 transition-all">
+                            <div class="flex flex-row items-start mb-2">
+                                <div class="w-8 flex-grow-0 flex-shrink-0">
+                                    <FaIcon @icon="triangle-exclamation" @size="xl" class="pt-1" />
+                                </div>
+                                <div class="flex-1">
+                                    <div class="flex-1 text-sm text-yellow-100">
+                                        <div>{{t "auth.verification.didnt-receive-a-code" htmlSafe=true}}</div>
+                                        <div>{{t "auth.verification.not-sent.alternative-choice" htmlSafe=true}}</div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="flex items-center space-x-2">
+                                <Button
+                                    @text={{t "auth.verification.not-sent.resend-email"}}
+                                    @buttonType="button"
+                                    @type="link"
+                                    class="text-yellow-100"
+                                    @wrapperClass="px-4 py-2 bg-gray-900 bg-opacity-25 hover:opacity-50"
+                                    @onClick={{this.verification.resendEmail}}
+                                />
+                                <Button
+                                    @text={{t "auth.verification.not-sent.send-by-sms"}}
+                                    @buttonType="button"
+                                    @type="link"
+                                    class="text-yellow-100"
+                                    @wrapperClass="px-4 py-2 bg-gray-900 bg-opacity-25 hover:opacity-50"
+                                    @onClick={{this.verification.resendBySms}}
+                                />
                             </div>
                         </div>
-                    </div>
-                    <div class="flex items-center space-x-2">
-                        <Button
-                            @text={{t "auth.verification.not-sent.resend-email"}}
-                            @buttonType="button"
-                            @type="link"
-                            class="text-yellow-100"
-                            @wrapperClass="px-4 py-2 bg-gray-900 bg-opacity-25 hover:opacity-50"
-                            @onClick={{this.verification.resendEmail}}
-                        />
-                        <Button
-                            @text={{t "auth.verification.not-sent.send-by-sms"}}
-                            @buttonType="button"
-                            @type="link"
-                            class="text-yellow-100"
-                            @wrapperClass="px-4 py-2 bg-gray-900 bg-opacity-25 hover:opacity-50"
-                            @onClick={{this.verification.resendBySms}}
-                        />
-                    </div>
-                </div>
-            {{/if}}
-        </form>
+                    {{/if}}
+                </form>
+            </div>
+        {{/if}}
     </div>
-{{/if}}
+</div>

console/app/components/onboarding/yield.hbs

@@ -1,7 +1,9 @@
 <section class="onboarding step-host">
     {{#if this.initialized}}
-        {{#if this.currentComponent}}
-            {{component this.currentComponent context=this.context orchestrator=this.orchestrator brand=@brand}}
+        {{#if this.orchestrator.wrapper}}
+            {{component (lazy-engine-component this.orchestrator.wrapper) currentStepComponent=this.currentComponent context=this.context orchestrator=this.orchestrator brand=@brand}}
+        {{else if this.currentComponent}}
+            {{component (lazy-engine-component this.currentComponent) context=this.context orchestrator=this.orchestrator brand=@brand}}
         {{/if}}
     {{else}}
         <div class="flex items-center justify-center min-h-24">

console/app/controllers/console/account/index.js

@@ -68,6 +68,7 @@ export default class ConsoleAccountIndexController extends Controller {
                 subject_uuid: this.user.id,
                 subject_type: 'user',
                 type: 'user_avatar',
+                resize: 'md'
             },
             (uploadedFile) => {
                 this.user.setProperties({

console/app/controllers/console/admin/organizations/index/users.js

@@ -77,7 +77,7 @@ export default class ConsoleAdminOrganizationsIndexUsersController extends Contr
             valuePath: 'roleName',
         },
         {
-            label: this.intl.t('common.phone-number'),
+            label: this.intl.t('common.phone'),
             valuePath: 'phone',
         },
         {

console/app/controllers/console/admin/virtual.js

@@ -2,6 +2,9 @@ import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 
 export default class ConsoleAdminVirtualController extends Controller {
+    @tracked bodyClass = 'overflow-y-scroll h-full';
+    @tracked containerClass = 'container mx-auto h-screen';
+    @tracked wrapperClass = 'max-w-3xl my-10 mx-auto';
     @tracked view;
     queryParams = ['view'];
 }

console/app/deprecation-workflow.js

@@ -0,0 +1,9 @@
+import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';
+
+setupDeprecationWorkflow({
+    workflow: [
+        { handler: 'silence', matchId: 'ember-concurrency.deprecate-decorator-task' },
+        { handler: 'silence', matchId: 'new-helper-names' },
+        { handler: 'silence', matchId: 'ember-data:deprecate-non-strict-relationships' },
+    ],
+});

console/app/instance-initializers/set-application-instance.js

@@ -1,10 +1,4 @@
 export function initialize(appInstance) {
-    // Set window.Fleetbase to the application instance for global access
-    // This is used by services and engines to access the root application instance
-    if (typeof window !== 'undefined') {
-        window.Fleetbase = appInstance;
-    }
-
     // Look up UniverseService and set the application instance
     const universeService = appInstance.lookup('service:universe');
     if (universeService) {

console/app/models/company.js

@@ -33,6 +33,7 @@ export default class Company extends Model {
     @attr('string') phone;
     @attr('string') status;
     @attr('string') slug;
+    @attr('boolean', { defaultValue: false }) onboarding_completed;
 
     /** @dates */
     @attr('date') joined_at;

console/app/models/user.js

@@ -34,6 +34,7 @@ export default class UserModel extends Model {
     @attr('boolean') is_admin;
     @attr('boolean') is_subscribed;
     @attr('boolean') is_trialing;
+    @attr('boolean') company_onboarding_completed;
     @attr('raw') meta;
     @attr('raw') subscription;
 

console/app/routes/onboard/index.js

@@ -12,7 +12,8 @@ export default class OnboardIndexRoute extends Route {
     };
 
     beforeModel() {
-        this.orchestrator.start();
+        // Resume from previous session if data exists in localStorage
+        this.orchestrator.start(null, { resume: true });
     }
 
     model() {

console/app/serializers/user.js

@@ -4,8 +4,6 @@ import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 export default class UserSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
     /**
      * Embedded relationship attributes
-     *
-     * @var {Object}
      */
     get attrs() {
         return {
@@ -16,22 +14,45 @@ export default class UserSerializer extends ApplicationSerializer.extend(Embedde
     }
 
     /**
-     * Customize serializer so that the password is never sent to the server via Ember Data
+     * Prevent partial payloads from overwriting fully-loaded
+     * user records in the store.
      *
-     * @param {Snapshot} snapshot
-     * @param {Object} options
-     * @return {Object} json
+     * This runs ONLY on incoming data.
+     */
+    normalize(modelClass, resourceHash, prop) {
+        let normalized = super.normalize(modelClass, resourceHash, prop);
+
+        // Existing user already loaded in the store?
+        let existing = this.store.peekRecord(normalized.data.type, normalized.data.id);
+
+        if (existing) {
+            let attrs = normalized.data.attributes || {};
+
+            for (let key in attrs) {
+                if (attrs[key] === null || attrs[key] === undefined || key === 'avatar_url') {
+                    delete attrs[key];
+                }
+            }
+        }
+
+        return normalized;
+    }
+
+    /**
+     * Customize serializer so that sensitive or server-managed
+     * fields are never sent to the backend.
      */
     serialize() {
         const json = super.serialize(...arguments);
 
-        // delete the password always
+        // Never send password
         delete json.password;
-        // delete verification attributes
+
+        // Verification flags
         delete json.email_verified_at;
         delete json.phone_verified_at;
 
-        // delete server managed dates
+        // Server-managed timestamps
         delete json.deleted_at;
         delete json.created_at;
         delete json.updated_at;

console/app/services/onboarding-context.js

@@ -1,39 +1,133 @@
 import Service, { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
+const CONTEXT_PREFIX = 'onboarding:context:';
+const KEYS_INDEX = `${CONTEXT_PREFIX}__keys__`;
+
 export default class OnboardingContextService extends Service {
     @service appCache;
     @tracked data = {};
 
+    /**
+     * Get a value from in-memory state first, then fallback to cache
+     */
     get(key) {
-        return this.data[key] ?? this.appCache.get(`onboarding:context:${key}`);
+        return this.data[key] ?? this.appCache.get(`${CONTEXT_PREFIX}${key}`);
     }
 
+    /**
+     * Get a value directly from cache
+     */
     getFromCache(key) {
-        return this.appCache.get(`onboarding:context:${key}`);
+        return this.appCache.get(`${CONTEXT_PREFIX}${key}`);
     }
 
-    set(key, value, options = {}) {
-        this.data = { ...this.data, [key]: value };
-        if (options?.persist === true) {
-            this.appCache.set(`onboarding:context:${key}`, value);
+    /**
+     * Restore all persisted onboarding context values from cache
+     *
+     * @returns {Object}
+     */
+    restore() {
+        const keys = this.appCache.get(KEYS_INDEX) ?? [];
+        const persisted = {};
+
+        for (const key of keys) {
+            const value = this.appCache.get(`${CONTEXT_PREFIX}${key}`);
+            if (value !== undefined) {
+                persisted[key] = value;
+            }
+        }
+
+        return persisted;
+    }
+
+    /**
+     * Merge data into the context
+     * Optionally persist all merged values
+     */
+    merge(data = {}, options = {}) {
+        if (!data || typeof data !== 'object') {
+            return;
+        }
+
+        // Filter out sensitive fields
+        const sensitiveFields = ['password', 'password_confirmation'];
+        const filteredData = {};
+        
+        for (const [key, value] of Object.entries(data)) {
+            if (!sensitiveFields.includes(key)) {
+                filteredData[key] = value;
+            }
+        }
+
+        this.data = { ...this.data, ...filteredData };
+
+        if (options.persist === true) {
+            const keys = new Set(this.appCache.get(KEYS_INDEX) ?? []);
+
+            for (const key of Object.keys(filteredData)) {
+                keys.add(key);
+                this.appCache.set(`${CONTEXT_PREFIX}${key}`, this.data[key]);
+            }
+
+            this.appCache.set(KEYS_INDEX, [...keys]);
         }
     }
 
+    /**
+     * Set a single value
+     * Optionally persist it
+     */
+    set(key, value, options = {}) {
+        // Don't store sensitive fields
+        const sensitiveFields = ['password', 'password_confirmation'];
+        if (sensitiveFields.includes(key)) {
+            return;
+        }
+
+        this.data = { ...this.data, [key]: value };
+
+        if (options.persist === true) {
+            const keys = new Set(this.appCache.get(KEYS_INDEX) ?? []);
+            keys.add(key);
+
+            this.appCache.set(`${CONTEXT_PREFIX}${key}`, value);
+            this.appCache.set(KEYS_INDEX, [...keys]);
+        }
+    }
+
+    /**
+     * Convenience alias for persisted set
+     */
     persist(key, value) {
         this.set(key, value, { persist: true });
     }
 
+    /**
+     * Delete a key from memory and cache
+     */
     del(key) {
-        const { [key]: _drop, ...rest } = this.data; // eslint-disable-line no-unused-vars
+        const { [key]: _removed, ...rest } = this.data; // eslint-disable-line no-unused-vars
         this.data = rest;
-        this.appCache.set(`onboarding:context:${key}`, undefined);
+
+        const keys = new Set(this.appCache.get(KEYS_INDEX) ?? []);
+        keys.delete(key);
+
+        this.appCache.set(`${CONTEXT_PREFIX}${key}`, undefined);
+        this.appCache.set(KEYS_INDEX, [...keys]);
     }
 
+    /**
+     * Fully reset onboarding context (memory + persistence)
+     */
     reset() {
-        for (let key in this.data) {
-            this.appCache.set(`onboarding:context:${key}`, undefined);
+        const keys = this.appCache.get(KEYS_INDEX) ?? [];
+
+        for (const key of keys) {
+            this.appCache.set(`${CONTEXT_PREFIX}${key}`, undefined);
         }
+
+        this.appCache.set(KEYS_INDEX, []);
         this.data = {};
     }
-}
+}

console/app/services/onboarding-orchestrator.js

@@ -7,17 +7,43 @@ export default class OnboardingOrchestratorService extends Service {
     @service onboardingContext;
 
     @tracked flow = null;
+    @tracked wrapper = null;
     @tracked current = null;
     @tracked history = [];
     @tracked sessionId = null;
 
-    start(flowId = null, opts = {}) {
+    /**
+     * localStorage key for persisting navigation history
+     */
+    get historyStorageKey() {
+        return `onboarding:history:${this.flow?.id || 'default'}`;
+    }
+
+    async start(flowId = null, opts = {}) {
         const flow = this.onboardingRegistry.getFlow(flowId ?? this.onboardingRegistry.defaultFlow);
         if (!flow) throw new Error(`Onboarding flow '${flowId}' not found`);
+        
         this.flow = flow;
+        this.wrapper = flow.wrapper || null;
         this.sessionId = opts.sessionId || null;
         this.history = [];
-        this.goto(flow.entry);
+
+        // Restore history if resuming from a previous session
+        if (opts.resume) {
+            this._restoreHistory();
+        }
+
+        // Execute onFlowWillStart hook if defined
+        if (typeof this.flow.onFlowWillStart === 'function') {
+            await this.flow.onFlowWillStart(this.flow, this);
+        }
+
+        await this.goto(flow.entry);
+
+        // Execute onFlowDidStart hook if defined
+        if (typeof this.flow.onFlowDidStart === 'function') {
+            await this.flow.onFlowDidStart(this.flow, this);
+        }
     }
 
     async goto(stepId) {
@@ -25,27 +51,46 @@ export default class OnboardingOrchestratorService extends Service {
         const step = this.flow.steps.find((s) => s.id === stepId);
         if (!step) throw new Error(`Step '${stepId}' not found`);
 
+        // Execute onStepWillChange hook if defined
+        const previousStep = this.current;
+        if (typeof this.flow.onStepWillChange === 'function') {
+            await this.flow.onStepWillChange(step, previousStep, this);
+        }
+
+        // Guard function - skip step if guard returns false
         if (typeof step.guard === 'function' && !step.guard(this.onboardingContext)) {
             return this.next();
         }
 
+        // beforeEnter lifecycle hook
         if (typeof step.beforeEnter === 'function') {
             await step.beforeEnter(this.onboardingContext);
         }
 
         this.current = step;
+
+        // Execute onStepDidChange hook if defined
+        if (typeof this.flow.onStepDidChange === 'function') {
+            await this.flow.onStepDidChange(this.current, previousStep, this);
+        }
     }
 
     async next() {
         if (!this.flow || !this.current) return;
 
         const leaving = this.current;
+        
+        // afterLeave lifecycle hook
         if (typeof leaving.afterLeave === 'function') {
             await leaving.afterLeave(this.onboardingContext);
         }
 
-        if (!this.history.includes(leaving)) this.history.push(leaving);
+        if (!this.history.includes(leaving)) {
+            this.history.push(leaving);
+            this._persistHistory();
+        }
 
+        // Support both string and function for next property
         let nextId;
         if (typeof leaving.next === 'function') {
             nextId = leaving.next(this.onboardingContext);
@@ -53,8 +98,23 @@ export default class OnboardingOrchestratorService extends Service {
             nextId = leaving.next;
         }
 
+        // If no next step, flow is complete
         if (!nextId) {
+            // Execute onFlowWillEnd hook if defined
+            if (typeof this.flow.onFlowWillEnd === 'function') {
+                await this.flow.onFlowWillEnd(leaving, this);
+            }
+
             this.current = null; // finished
+
+            // Execute onFlowDidEnd hook if defined
+            if (typeof this.flow.onFlowDidEnd === 'function') {
+                await this.flow.onFlowDidEnd(leaving, this);
+            }
+
+            // Clear history from localStorage when flow completes
+            this._clearHistory();
+
             return;
         }
 
@@ -66,6 +126,89 @@ export default class OnboardingOrchestratorService extends Service {
         const prev = this.history[this.history.length - 1];
         if (prev && prev.allowBack === false) return;
         this.history = this.history.slice(0, -1);
+        this._persistHistory();
         await this.goto(prev.id);
     }
+
+    /**
+     * Get the current path (for flows with multiple paths)
+     * This is a helper method that can be used by flows to determine the current path
+     */
+    getCurrentPath() {
+        if (!this.flow || !this.flow.paths) return null;
+        
+        // Determine path based on context or current step
+        for (const [pathId, pathDef] of Object.entries(this.flow.paths)) {
+            if (pathDef.steps && pathDef.steps.some(s => s.id === this.current?.id)) {
+                return pathDef;
+            }
+        }
+        
+        return null;
+    }
+
+    /**
+     * Check if a step is in the current path
+     */
+    isStepInPath(stepId) {
+        const currentPath = this.getCurrentPath();
+        if (!currentPath) return true; // If no paths defined, all steps are valid
+        
+        return currentPath.steps?.some(s => s.id === stepId) ?? false;
+    }
+
+    /**
+     * Persist navigation history to localStorage
+     * Stores only step IDs to keep storage lightweight
+     * @private
+     */
+    _persistHistory() {
+        if (!this.flow) return;
+        
+        try {
+            const historyIds = this.history.map(step => step.id);
+            localStorage.setItem(this.historyStorageKey, JSON.stringify(historyIds));
+        } catch (error) {
+            console.warn('[OnboardingOrchestrator] Failed to persist history:', error);
+        }
+    }
+
+    /**
+     * Restore navigation history from localStorage
+     * Reconstructs step objects from stored IDs
+     * @private
+     */
+    _restoreHistory() {
+        if (!this.flow) return;
+        
+        try {
+            const stored = localStorage.getItem(this.historyStorageKey);
+            if (!stored) return;
+            
+            const historyIds = JSON.parse(stored);
+            this.history = historyIds
+                .map(id => this.flow.steps.find(s => s.id === id))
+                .filter(Boolean); // Remove any invalid steps
+            
+            console.log('[OnboardingOrchestrator] Restored history:', this.history.map(s => s.id));
+        } catch (error) {
+            console.warn('[OnboardingOrchestrator] Failed to restore history:', error);
+            this.history = [];
+        }
+    }
+
+    /**
+     * Clear navigation history from localStorage
+     * Called when flow completes or is reset
+     * @private
+     */
+    _clearHistory() {
+        if (!this.flow) return;
+        
+        try {
+            localStorage.removeItem(this.historyStorageKey);
+        } catch (error) {
+            console.warn('[OnboardingOrchestrator] Failed to clear history:', error);
+        }
+    }
 }

console/app/services/onboarding-registry.js

@@ -9,7 +9,7 @@ export default class OnboardingRegistryService extends Service {
         this.defaultFlow = flowId;
     }
 
-    registerFlow(flow) {
+    registerFlow(flow, options = {}) {
         if (!flow || !flow.id || !flow.entry || !Array.isArray(flow.steps)) {
             throw new Error('Invalid FlowDef: id, entry, steps are required');
         }
@@ -23,6 +23,11 @@ export default class OnboardingRegistryService extends Service {
             }
         }
         this.flows.set(flow.id, flow);
+
+        // If specified, set as default flow
+        if (options.default) {
+            this.defaultFlow = flow.id;
+        }
     }
 
     getFlow(id) {

console/app/templates/console/account/index.hbs

@@ -4,21 +4,27 @@
     <div class="container mx-auto h-screen">
         <div class="max-w-3xl my-10 mx-auto">
             <ContentPanel @title={{t "common.your-profile"}} @open={{true}} @wrapperClass="bordered-classic">
-                <form class="flex flex-col md:flex-row" {{on "submit" (perform this.saveProfile)}}>
+                <form class="flex flex-col items-start md:flex-row" {{on "submit" (perform this.saveProfile)}}>
                     <div class="w-32 flex flex-col justify-center mb-6 mr-6">
-                        <Image src={{this.user.avatar_url}} @fallbackSrc={{config "defaultValues.userImage"}} alt={{this.user.name}} class="w-32 h-32 rounded-md" />
-                        <FileUpload @name={{t "console.account.index.photos"}} @accept="image/*" @onFileAdded={{this.uploadNewPhoto}} @labelClass="flex flex-row items-center justify-center" as |queue|>
+                        <Image src={{this.user.avatar_url}} @fallbackSrc={{config "defaultValues.userImage"}} alt={{this.user.name}} class="w-32 h-32 rounded-md mt-1" />
+                        <FileUpload
+                            @name={{t "console.account.index.photos"}}
+                            @accept="image/*"
+                            @onFileAdded={{this.uploadNewPhoto}}
+                            @labelClass="flex flex-row items-center justify-center"
+                            as |queue|
+                        >
                             <a tabindex={{0}} class="flex items-center px-0 mt-2 text-xs no-underline truncate btn btn-sm btn-default" disabled={{queue.files.length}}>
                                 {{#if queue.files.length}}
                                     <div class="mr-1.5">
                                         <Spinner />
                                     </div>
                                     <span>
-                                        {{t "common.uploading"}}                       
+                                        {{t "common.uploading"}}
                                     </span>
                                 {{else}}
                                     <FaIcon @icon="image" class="mr-1.5" />
-                                    <span>                                        
+                                    <span>
                                         {{t "console.account.index.upload-new"}}
                                     </span>
                                 {{/if}}
@@ -34,11 +40,31 @@
                             </InputGroup>
                             <InputGroup @name={{t "common.date-of-birth"}} @type="date" @value={{this.user.date_of_birth}} />
                             <InputGroup @name={{t "common.timezone"}} @helpText={{t "console.account.index.timezone"}}>
-                                <Select @value={{this.user.timezone}} @options={{this.timezones}} @onSelect={{fn (mut this.user.timezone)}} @placeholder={{t "console.account.index.timezone"}} />
+                                <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
+                                    <PowerSelect
+                                        @options={{this.timezones}}
+                                        @selected={{this.user.timezone}}
+                                        @onChange={{fn (mut this.user.timezone)}}
+                                        @placeholder={{t "console.account.index.timezone"}}
+                                        @triggerClass="form-select form-input"
+                                        @searchEnabled={{true}}
+                                        as |option|
+                                    >
+                                        <div>{{option}}</div>
+                                    </PowerSelect>
+                                </div>
                             </InputGroup>
                         </div>
                         <div class="mt-3 flex items-center justify-end">
-                            <Button @buttonType="submit" @type="primary" @size="lg" @icon="save" @text={{t "common.save-changes"}} @onClick={{perform this.saveProfile}} @isLoading={{not this.saveProfile.isIdle}} />
+                            <Button
+                                @buttonType="submit"
+                                @type="primary"
+                                @size="lg"
+                                @icon="save"
+                                @text={{t "common.save-changes"}}
+                                @onClick={{perform this.saveProfile}}
+                                @isLoading={{not this.saveProfile.isIdle}}
+                            />
                         </div>
                     </div>
                 </form>

console/app/templates/console/admin/virtual.hbs

@@ -1,10 +1,10 @@
 {{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-">
-            <LazyEngineComponent @component={{@model.component}} @params={{@model.componentParams}} />
+<Layout::Section::Body class={{this.bodyClass}}>
+    <div class={{this.containerClass}}>
+        <div class={{this.wrapperClass}}>
+            {{component (lazy-engine-component @model.component) params=@model.componentParams controller=this}}
         </div>
     </div>
     <Spacer @height="300px" />

console/app/templates/onboard.hbs

@@ -1,6 +1,3 @@
-<div class="flex items-center justify-center h-screen min-h-screen px-4 py-12 bg-gray-50 dark:bg-gray-900 sm:px-6 lg:px-8 overflow-y-scroll">
-    <div class="w-full max-w-md h-screen flex items-center justify-center py-4">
-        {{outlet}}
-    </div>
-    <Spacer @height="300px" />
+<div class="onboard-route-wrapper">
+    {{outlet}}
 </div>

console/config/environment.js

@@ -23,7 +23,7 @@ module.exports = function (environment) {
         APP: {
             autoboot: true,
             extensions: asArray(getenv('EXTENSIONS')),
-            disableRuntimeConfig: toBoolean(getenv('DISABLE_RUNTIME_CONFIG')),
+            disableRuntimeConfig: toBoolean(getenv('DISABLE_RUNTIME_CONFIG', environment === 'production')),
         },
 
         API: {

console/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/console",
-    "version": "0.7.22",
+    "version": "0.7.26",
     "private": true,
     "description": "Modular logistics and supply chain operating system (LSOS)",
     "repository": "https://github.com/fleetbase/fleetbase",
@@ -34,14 +34,14 @@
     "dependencies": {
         "@ember/legacy-built-in-components": "^0.4.2",
         "@fleetbase/dev-engine": "^0.2.12",
-        "@fleetbase/ember-core": "^0.3.8",
-        "@fleetbase/ember-ui": "^0.3.14",
-        "@fleetbase/fleetops-data": "^0.1.23",
-        "@fleetbase/fleetops-engine": "^0.6.29",
+        "@fleetbase/ember-core": "^0.3.10",
+        "@fleetbase/ember-ui": "^0.3.18",
+        "@fleetbase/fleetops-data": "^0.1.25",
+        "@fleetbase/fleetops-engine": "^0.6.33",
         "@fleetbase/iam-engine": "^0.1.6",
         "@fleetbase/leaflet-routing-machine": "^3.2.17",
-        "@fleetbase/registry-bridge-engine": "^0.1.2",
-        "@fleetbase/storefront-engine": "^0.4.9",
+        "@fleetbase/registry-bridge-engine": "^0.1.3",
+        "@fleetbase/storefront-engine": "^0.4.12",
         "@formatjs/intl-datetimeformat": "^6.18.2",
         "@formatjs/intl-numberformat": "^8.15.6",
         "@formatjs/intl-pluralrules": "^5.4.6",
@@ -93,6 +93,7 @@
         "ember-cli-babel": "^8.2.0",
         "ember-cli-clean-css": "^3.0.0",
         "ember-cli-dependency-checker": "^3.3.2",
+        "ember-cli-deprecation-workflow": "^4.0.0",
         "ember-cli-dotenv": "^3.1.0",
         "ember-cli-htmlbars": "^6.3.0",
         "ember-cli-inject-live-reload": "^2.1.0",
@@ -149,9 +150,9 @@
     },
     "pnpm": {
         "overrides": {
-            "@fleetbase/ember-core": "latest",
-            "@fleetbase/ember-ui": "latest",
-            "@fleetbase/fleetops-data": "latest"
+            "@fleetbase/ember-core": "^0.3.10",
+            "@fleetbase/ember-ui": "^0.3.18",
+            "@fleetbase/fleetops-data": "^0.1.24"
         }
     },
     "prettier": {

console/translations/en-us.yaml

@@ -346,6 +346,7 @@ common:
     {resource} ({resourceName}) deleted.
   continue-without-saving: Continue Without Saving?
   continue-without-saving-prompt: You have unsaved changes to this {resource}. Continuing will discard them. Click Continue to proceed.
+  changelog: Changelog
 
 resource:
   alert: Alert

docker/Dockerfile

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2
 # Base stage
-FROM dunglas/frankenphp:1.5.0-php8.2-bookworm AS base
+FROM dunglas/frankenphp:1.11-php8.2-bookworm AS base
 
 # Install packages
 RUN apt-get update && apt-get install -y git bind9-utils mycli nodejs npm nano uuid-runtime \
@@ -75,7 +75,7 @@ ENV QUEUE_CONNECTION=redis
 ENV CADDYFILE_PATH=/fleetbase/Caddyfile
 ENV CONSOLE_PATH=/fleetbase/console
 ENV OCTANE_SERVER=frankenphp
-ENV FLEETBASE_VERSION=0.7.22
+ENV FLEETBASE_VERSION=0.7.26
 
 # Set environment
 ARG ENVIRONMENT=production
@@ -158,14 +158,14 @@ CMD ["php", "artisan", "queue:work"]
 # Application dev stage
 FROM base AS app-dev
 ENTRYPOINT ["docker-php-entrypoint"]
-CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=250 --port=8000 --host=0.0.0.0 --watch"]
+CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=1000 --port=8000 --host=0.0.0.0 --watch"]
 
 # Application release stage
 FROM base AS app-release
 ENTRYPOINT ["docker-php-entrypoint"]
-CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=250 --port=8000 --host=0.0.0.0"] 
+CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=1000 --port=8000 --host=0.0.0.0"] 
 
 # 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 --max-requests=250 --port=8000 --host=0.0.0.0"]
+CMD ["sh", "-c", "php artisan octane:frankenphp --max-requests=1000 --port=8000 --host=0.0.0.0"]