Merge branch 'main' into feat/waypoint-pod-notes-columns

roncodes · web-flow · commit eb2aed55cb8b · 2026-04-14T10:55:04.000+08:00
diff --git a/addon/serializers/maintenance-schedule.js b/addon/serializers/maintenance-schedule.js
@@ -57,7 +57,10 @@ export default class MaintenanceScheduleSerializer extends ApplicationSerializer
                 // Strip abstract subtype prefixes so the server receives the bare model type
                 // e.g. 'facilitator-vendor' -> 'vendor', 'maintenance-subject-vehicle' -> 'vehicle'
                 if (typeof type === 'string') {
-                    type = type.replace(/^facilitator-/, '').replace(/^maintenance-subject-/, '').replace(/^customer-/, '');
+                    type = type
+                        .replace(/^facilitator-/, '')
+                        .replace(/^maintenance-subject-/, '')
+                        .replace(/^customer-/, '');
                 }
                 json[key + '_type'] = `fleet-ops:${type}`;
             }
diff --git a/addon/serializers/maintenance.js b/addon/serializers/maintenance.js
@@ -59,7 +59,10 @@ export default class MaintenanceSerializer extends ApplicationSerializer.extend(
                 // Strip abstract subtype prefixes so the server receives the bare model type
                 // e.g. 'facilitator-vendor' -> 'vendor', 'maintenance-subject-vehicle' -> 'vehicle'
                 if (typeof type === 'string') {
-                    type = type.replace(/^facilitator-/, '').replace(/^maintenance-subject-/, '').replace(/^customer-/, '');
+                    type = type
+                        .replace(/^facilitator-/, '')
+                        .replace(/^maintenance-subject-/, '')
+                        .replace(/^customer-/, '');
                 }
                 json[key + '_type'] = `fleet-ops:${type}`;
             }
diff --git a/addon/serializers/order.js b/addon/serializers/order.js
@@ -91,7 +91,10 @@ export default class OrderSerializer extends ApplicationSerializer.extend(Embedd
                 // Strip abstract subtype prefixes so the server receives the bare model type
                 // e.g. 'facilitator-vendor' -> 'vendor', 'customer-contact' -> 'contact'
                 if (typeof type === 'string') {
-                    type = type.replace(/^facilitator-/, '').replace(/^customer-/, '').replace(/^maintenance-subject-/, '');
+                    type = type
+                        .replace(/^facilitator-/, '')
+                        .replace(/^customer-/, '')
+                        .replace(/^maintenance-subject-/, '');
                 }
                 json[key + '_type'] = `fleet-ops:${type}`;
             }
diff --git a/addon/serializers/work-order.js b/addon/serializers/work-order.js
@@ -58,7 +58,10 @@ export default class WorkOrderSerializer extends ApplicationSerializer.extend(Em
                 // Strip abstract subtype prefixes so the server receives the bare model type
                 // e.g. 'facilitator-vendor' -> 'vendor', 'maintenance-subject-vehicle' -> 'vehicle'
                 if (typeof type === 'string') {
-                    type = type.replace(/^facilitator-/, '').replace(/^maintenance-subject-/, '').replace(/^customer-/, '');
+                    type = type
+                        .replace(/^facilitator-/, '')
+                        .replace(/^maintenance-subject-/, '')
+                        .replace(/^customer-/, '');
                 }
                 json[key + '_type'] = `fleet-ops:${type}`;
             }
diff --git a/package.json b/package.json
@@ -36,8 +36,8 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.3.9",
         "@babel/core": "^7.23.2",
+        "@fleetbase/ember-core": "^0.3.18",
         "date-fns": "^2.29.3",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,10 @@ export default class MaintenanceScheduleSerializer extends ApplicationSerializer`
`57`	`57`	`// Strip abstract subtype prefixes so the server receives the bare model type`
`58`	`58`	`// e.g. 'facilitator-vendor' -> 'vendor', 'maintenance-subject-vehicle' -> 'vehicle'`
`59`	`59`	`if (typeof type === 'string') {`
`60`		`- type = type.replace(/^facilitator-/, '').replace(/^maintenance-subject-/, '').replace(/^customer-/, '');`
	`60`	`+ type = type`
	`61`	`+ .replace(/^facilitator-/, '')`
	`62`	`+ .replace(/^maintenance-subject-/, '')`
	`63`	`+ .replace(/^customer-/, '');`
`61`	`64`	`}`
`62`	`65`	json[key + '_type'] = `fleet-ops:${type}`;
`63`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,10 @@ export default class MaintenanceSerializer extends ApplicationSerializer.extend(`
`59`	`59`	`// Strip abstract subtype prefixes so the server receives the bare model type`
`60`	`60`	`// e.g. 'facilitator-vendor' -> 'vendor', 'maintenance-subject-vehicle' -> 'vehicle'`
`61`	`61`	`if (typeof type === 'string') {`
`62`		`- type = type.replace(/^facilitator-/, '').replace(/^maintenance-subject-/, '').replace(/^customer-/, '');`
	`62`	`+ type = type`
	`63`	`+ .replace(/^facilitator-/, '')`
	`64`	`+ .replace(/^maintenance-subject-/, '')`
	`65`	`+ .replace(/^customer-/, '');`
`63`	`66`	`}`
`64`	`67`	json[key + '_type'] = `fleet-ops:${type}`;
`65`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,10 @@ export default class OrderSerializer extends ApplicationSerializer.extend(Embedd`
`91`	`91`	`// Strip abstract subtype prefixes so the server receives the bare model type`
`92`	`92`	`// e.g. 'facilitator-vendor' -> 'vendor', 'customer-contact' -> 'contact'`
`93`	`93`	`if (typeof type === 'string') {`
`94`		`- type = type.replace(/^facilitator-/, '').replace(/^customer-/, '').replace(/^maintenance-subject-/, '');`
	`94`	`+ type = type`
	`95`	`+ .replace(/^facilitator-/, '')`
	`96`	`+ .replace(/^customer-/, '')`
	`97`	`+ .replace(/^maintenance-subject-/, '');`
`95`	`98`	`}`
`96`	`99`	json[key + '_type'] = `fleet-ops:${type}`;
`97`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,10 @@ export default class WorkOrderSerializer extends ApplicationSerializer.extend(Em`
`58`	`58`	`// Strip abstract subtype prefixes so the server receives the bare model type`
`59`	`59`	`// e.g. 'facilitator-vendor' -> 'vendor', 'maintenance-subject-vehicle' -> 'vehicle'`
`60`	`60`	`if (typeof type === 'string') {`
`61`		`- type = type.replace(/^facilitator-/, '').replace(/^maintenance-subject-/, '').replace(/^customer-/, '');`
	`61`	`+ type = type`
	`62`	`+ .replace(/^facilitator-/, '')`
	`63`	`+ .replace(/^maintenance-subject-/, '')`
	`64`	`+ .replace(/^customer-/, '');`
`62`	`65`	`}`
`63`	`66`	json[key + '_type'] = `fleet-ops:${type}`;
`64`	`67`	`}`