From b2776ba4590dfd659aac62af373ad8d8054636e4 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Fri, 19 Dec 2025 23:06:31 +0800
Subject: [PATCH 1/2] v0.6.31 ~ Hotfix: load iam engine for user-form modal
 when creating driver

---
 addon/components/driver/form.js | 6 +++++-
 composer.json                   | 2 +-
 extension.json                  | 2 +-
 package.json                    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addon/components/driver/form.js b/addon/components/driver/form.js
index e3d01d87..72c621ac 100644
--- a/addon/components/driver/form.js
+++ b/addon/components/driver/form.js
@@ -8,6 +8,7 @@ export default class DriverFormComponent extends Component {
     @service currentUser;
     @service notifications;
     @service modalsManager;
+    @service extensionManager;
 
     get userAccountActionButtons() {
         return [
@@ -15,7 +16,10 @@ export default class DriverFormComponent extends Component {
                 icon: 'user-plus',
                 size: 'xs',
                 permission: 'iam create user',
-                onClick: () => {
+                onClick: async () => {
+                    // Load IAM engine for user-form modal component
+                    await this.extensionManager.ensureEngineLoaded('@fleetbase/iam-engine');
+
                     const user = this.store.createRecord('user', {
                         status: 'pending',
                         type: 'user',
diff --git a/composer.json b/composer.json
index b7f7a029..b380dc7c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.6.30",
+    "version": "0.6.31",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
diff --git a/extension.json b/extension.json
index fc967d87..2d1bda52 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.6.30",
+    "version": "0.6.31",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "AGPL-3.0-or-later",
diff --git a/package.json b/package.json
index 80a432f5..b349d690 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.6.30",
+    "version": "0.6.31",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops"

From 8bb7df60ddc5cac01c98eb7f503e35329c7ce830 Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Fri, 19 Dec 2025 23:09:08 +0800
Subject: [PATCH 2/2] Use correct service path for extensionManager injection

---
 addon/components/driver/form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/components/driver/form.js b/addon/components/driver/form.js
index 72c621ac..1bc13c38 100644
--- a/addon/components/driver/form.js
+++ b/addon/components/driver/form.js
@@ -8,7 +8,7 @@ export default class DriverFormComponent extends Component {
     @service currentUser;
     @service notifications;
     @service modalsManager;
-    @service extensionManager;
+    @service('universe/extension-manager') extensionManager;
 
     get userAccountActionButtons() {
         return [