From 35c3e1132e3ccf2dd26fc55e4c01bb6b160a04d2 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Tue, 12 Mar 2024 10:43:12 +0800 Subject: [PATCH 1/4] preparing next release; automatically adds storefront order config --- composer.json | 2 +- extension.json | 2 +- package.json | 2 +- server/src/Observers/CompanyObserver.php | 20 ++++++++++++++++++++ 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 server/src/Observers/CompanyObserver.php diff --git a/composer.json b/composer.json index 901bd8b..9fd71a5 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "fleetbase/storefront-api", - "version": "0.3.4", + "version": "0.3.5", "description": "Headless Commerce & Marketplace Extension for Fleetbase", "keywords": [ "fleetbase-extension", diff --git a/extension.json b/extension.json index 89f712b..34c93ad 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "Storefront", - "version": "0.3.4", + "version": "0.3.5", "description": "Headless Commerce & Marketplace Extension for Fleetbase", "repository": "https://github.com/fleetbase/storefront", "license": "MIT", diff --git a/package.json b/package.json index ac419da..b21cb88 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@fleetbase/storefront-engine", - "version": "0.3.4", + "version": "0.3.5", "description": "Headless Commerce & Marketplace Extension for Fleetbase", "fleetbase": { "route": "storefront", diff --git a/server/src/Observers/CompanyObserver.php b/server/src/Observers/CompanyObserver.php new file mode 100644 index 0000000..6984eb2 --- /dev/null +++ b/server/src/Observers/CompanyObserver.php @@ -0,0 +1,20 @@ + Date: Tue, 12 Mar 2024 15:11:46 +0800 Subject: [PATCH 2/4] patch seeder; patched creation of config; patched service rate fetch --- server/seeders/OrderConfigSeeder.php | 251 +----------------- .../Controllers/v1/ServiceQuoteController.php | 16 +- server/src/Observers/CompanyObserver.php | 6 +- .../Providers/StorefrontServiceProvider.php | 1 + server/src/Support/OrderConfig.php | 14 - server/src/Support/Storefront.php | 249 +++++++++++++++++ 6 files changed, 262 insertions(+), 275 deletions(-) delete mode 100644 server/src/Support/OrderConfig.php diff --git a/server/seeders/OrderConfigSeeder.php b/server/seeders/OrderConfigSeeder.php index 4ece7fb..22ee61c 100644 --- a/server/seeders/OrderConfigSeeder.php +++ b/server/seeders/OrderConfigSeeder.php @@ -2,10 +2,9 @@ namespace Fleetbase\Storefront\Seeders; -use Fleetbase\FleetOps\Models\OrderConfig; use Fleetbase\Models\Company; +use Fleetbase\Storefront\Support\Storefront; use Illuminate\Database\Seeder; -use Illuminate\Support\Str; class OrderConfigSeeder extends Seeder { @@ -18,253 +17,7 @@ public function run() { $companies = Company::all(); foreach ($companies as $company) { - static::createStorefrontConfig($company); + Storefront::createStorefrontConfig($company); } } - - /** - * Creates or retrieves an existing storefront configuration for a given company. - * - * This method checks if a storefront configuration (OrderConfig) already exists for the given company. - * If it exists, the method returns the existing configuration. Otherwise, it creates a new configuration with - * predefined settings for a storefront order process. The configuration includes various stages like 'created', - * 'started', 'canceled', 'completed', etc., each defined with specific attributes like key, code, color, logic, - * events, status, actions, details, and more. These stages help manage the order lifecycle in a storefront context. - * - * @param Company $company The company for which the storefront configuration is being created or retrieved. - * @return OrderConfig The storefront order configuration associated with the specified company. - */ - public static function createStorefrontConfig(Company $company): OrderConfig - { - return OrderConfig::firstOrCreate( - [ - 'company_uuid' => $company->uuid, - 'key' => 'storefront', - 'namespace' => 'system:order-config:storefront', - ], - [ - 'name' => 'Storefront', - 'key' => 'storefront', - 'namespace' => 'system:order-config:storefront', - 'description' => 'Storefront order configuration for hyperlocal delivery and pickup', - 'core_service' => 1, - 'status' => 'private', - 'version' => '0.0.1', - 'tags' => ['storefront', 'ecommerce', 'hyperlocal'], - 'entities' => [], - 'meta' => [], - 'flow' => [ - 'created' => [ - 'key' => 'created', - 'code' => 'created', - 'color' => '#1f2937', - 'logic' => [], - 'events' => [], - 'status' => 'Order Created', - 'actions' => [], - 'details' => 'New order was created.', - 'options' => [], - 'complete' => false, - 'entities' => [], - 'sequence' => 0, - 'activities' => ['dispatched'], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - 'started' => [ - 'key' => 'started', - 'code' => 'started', - 'color' => '#1f2937', - 'logic' => [], - 'events' => [], - 'status' => 'Order Started', - 'actions' => [], - 'details' => 'Order has been started', - 'options' => [], - 'complete' => false, - 'entities' => [], - 'sequence' => 0, - 'activities' => ['canceled', 'preparing'], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - 'canceled' => [ - 'key' => 'canceled', - 'code' => 'canceled', - 'color' => '#1f2937', - 'logic' => [], - 'events' => ['order.canceled'], - 'status' => 'Order canceled', - 'actions' => [], - 'details' => 'Order could not be accepted', - 'options' => [], - 'complete' => false, - 'entities' => [], - 'sequence' => 0, - 'activities' => [], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - 'completed' => [ - 'key' => 'completed', - 'code' => 'completed', - 'color' => '#1f2937', - 'logic' => [], - 'events' => [], - 'status' => 'Order completed', - 'actions' => [], - 'details' => 'Driver has completed the order', - 'options' => [], - 'complete' => true, - 'entities' => [], - 'sequence' => 0, - 'activities' => [], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - 'picked_up' => [ - 'key' => 'completed', - 'code' => 'picked_up', - 'color' => '#1f2937', - 'logic' => [], - 'events' => [], - 'status' => 'Order picked up', - 'actions' => [], - 'details' => 'Order has been picked up by customer', - 'options' => [], - 'complete' => true, - 'entities' => [], - 'sequence' => 0, - 'activities' => [], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - 'preparing' => [ - 'key' => 'preparing', - 'code' => 'preparing', - 'color' => '#1f2937', - 'logic' => [], - 'events' => [], - 'status' => 'Order is being prepared', - 'actions' => [], - 'details' => 'Order has been received by {storefront.name} and is being prepared', - 'options' => [], - 'complete' => false, - 'entities' => [], - 'sequence' => 0, - 'activities' => ['driver_enroute_to_store', 'pickup_ready'], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - 'dispatched' => [ - 'key' => 'dispatched', - 'code' => 'dispatched', - 'color' => '#1f2937', - 'logic' => [], - 'events' => [], - 'status' => 'Order Dispatched', - 'actions' => [], - 'details' => 'Order has been dispatched.', - 'options' => [], - 'complete' => false, - 'entities' => [], - 'sequence' => 0, - 'activities' => ['started'], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - 'pickup_ready' => [ - 'key' => 'ready', - 'code' => 'pickup_ready', - 'color' => '#1f2937', - 'logic' => [ - [ - 'type' => 'if', - 'conditions' => [ - [ - 'field' => 'meta.is_pickup', - 'value' => 'true', - 'operator' => 'equal', - ], - ], - ], - ], - 'events' => [], - 'status' => 'Order is ready for pickup', - 'actions' => [], - 'details' => 'Order is ready to be picked up by customer', - 'options' => [], - 'complete' => false, - 'entities' => [], - 'sequence' => 0, - 'activities' => ['picked_up'], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - 'driver_enroute' => [ - 'key' => 'driver_enroute', - 'code' => 'driver_enroute', - 'color' => '#1f2937', - 'logic' => [], - 'events' => [], - 'status' => 'Driver en-route', - 'actions' => [], - 'details' => 'Driver is on the way to the customer', - 'options' => [], - 'complete' => false, - 'entities' => [], - 'sequence' => 0, - 'activities' => ['completed'], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - 'driver_picked_up' => [ - 'key' => 'driver_picked_up', - 'code' => 'driver_picked_up', - 'color' => '#1f2937', - 'logic' => [], - 'events' => [], - 'status' => 'Driver picked up', - 'actions' => [], - 'details' => 'Driver has picked up order', - 'options' => [], - 'complete' => false, - 'entities' => [], - 'sequence' => 0, - 'activities' => ['driver_enroute'], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - 'driver_enroute_to_store' => [ - 'key' => 'driver_enroute', - 'code' => 'driver_enroute_to_store', - 'color' => '#1f2937', - 'logic' => [], - 'events' => [], - 'status' => 'Driver en-route', - 'actions' => [], - 'details' => 'Driver en-route to store', - 'options' => [], - 'complete' => false, - 'entities' => [], - 'sequence' => 0, - 'activities' => ['driver_picked_up'], - 'internalId' => Str::uuid(), - 'pod_method' => 'scan', - 'require_pod' => false, - ], - ], - ] - ); - } } diff --git a/server/src/Http/Controllers/v1/ServiceQuoteController.php b/server/src/Http/Controllers/v1/ServiceQuoteController.php index 6fe6549..08153ff 100644 --- a/server/src/Http/Controllers/v1/ServiceQuoteController.php +++ b/server/src/Http/Controllers/v1/ServiceQuoteController.php @@ -5,11 +5,11 @@ use Fleetbase\FleetOps\Http\Resources\v1\ServiceQuote as ServiceQuoteResource; use Fleetbase\FleetOps\Models\Entity; use Fleetbase\FleetOps\Models\IntegratedVendor; +use Fleetbase\FleetOps\Models\OrderConfig; use Fleetbase\FleetOps\Models\Place; use Fleetbase\FleetOps\Models\ServiceQuote; use Fleetbase\FleetOps\Models\ServiceQuoteItem; use Fleetbase\FleetOps\Models\ServiceRate; -use Fleetbase\FleetOps\Support\Flow; use Fleetbase\FleetOps\Support\Utils; use Fleetbase\Http\Controllers\Controller; use Fleetbase\Storefront\Http\Requests\GetServiceQuoteFromCart; @@ -100,12 +100,11 @@ public function fromCart(GetServiceQuoteFromCart $request) $serviceQuotes = collect(); // get order configurations for ecommerce / task - $orderConfigs = Flow::queryOrderConfigurations(function (&$query) use ($config) { - $query->where('key', $config); - }); + $orderConfig = OrderConfig::resolveFromIdentifier($config); + $orderConfigKey = data_get($orderConfig, 'key', 'storefront'); // get service rates for config type - $serviceRates = ServiceRate::whereIn('service_type', $orderConfigs->pluck('key'))->get(); + $serviceRates = ServiceRate::where('service_type', $orderConfigKey)->get(); // if no service rates send an empty quote if ($serviceRates->isEmpty()) { @@ -289,12 +288,11 @@ public function fromCartForNetwork(GetServiceQuoteFromCart $request) $serviceQuotes = collect(); // get order configurations for ecommerce / task - $orderConfigs = Flow::queryOrderConfigurations(function (&$query) use ($config) { - $query->where('key', $config); - }); + $orderConfig = OrderConfig::resolveFromIdentifier($config); + $orderConfigKey = data_get($orderConfig, 'key', 'storefront'); // get service rates for config type - $serviceRates = ServiceRate::whereIn('service_type', $orderConfigs->pluck('key'))->get(); + $serviceRates = ServiceRate::where('service_type', $orderConfigKey)->get(); // if no service rates send an empty quote if ($serviceRates->isEmpty()) { diff --git a/server/src/Observers/CompanyObserver.php b/server/src/Observers/CompanyObserver.php index 6984eb2..a832985 100644 --- a/server/src/Observers/CompanyObserver.php +++ b/server/src/Observers/CompanyObserver.php @@ -1,9 +1,9 @@ \Fleetbase\Storefront\Observers\ProductObserver::class, \Fleetbase\Storefront\Models\Network::class => \Fleetbase\Storefront\Observers\NetworkObserver::class, + \Fleetbase\Models\Company::class => \Fleetbase\Storefront\Observers\CompanyObserver::class, ]; /** diff --git a/server/src/Support/OrderConfig.php b/server/src/Support/OrderConfig.php deleted file mode 100644 index 0d84730..0000000 --- a/server/src/Support/OrderConfig.php +++ /dev/null @@ -1,14 +0,0 @@ - $company->uuid, + 'key' => 'storefront', + 'namespace' => 'system:order-config:storefront', + ], + [ + 'name' => 'Storefront', + 'key' => 'storefront', + 'namespace' => 'system:order-config:storefront', + 'description' => 'Storefront order configuration for hyperlocal delivery and pickup', + 'core_service' => 1, + 'status' => 'private', + 'version' => '0.0.1', + 'tags' => ['storefront', 'ecommerce', 'hyperlocal'], + 'entities' => [], + 'meta' => [], + 'flow' => [ + 'created' => [ + 'key' => 'created', + 'code' => 'created', + 'color' => '#1f2937', + 'logic' => [], + 'events' => [], + 'status' => 'Order Created', + 'actions' => [], + 'details' => 'New order was created.', + 'options' => [], + 'complete' => false, + 'entities' => [], + 'sequence' => 0, + 'activities' => ['dispatched'], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + 'started' => [ + 'key' => 'started', + 'code' => 'started', + 'color' => '#1f2937', + 'logic' => [], + 'events' => [], + 'status' => 'Order Started', + 'actions' => [], + 'details' => 'Order has been started', + 'options' => [], + 'complete' => false, + 'entities' => [], + 'sequence' => 0, + 'activities' => ['canceled', 'preparing'], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + 'canceled' => [ + 'key' => 'canceled', + 'code' => 'canceled', + 'color' => '#1f2937', + 'logic' => [], + 'events' => ['order.canceled'], + 'status' => 'Order canceled', + 'actions' => [], + 'details' => 'Order could not be accepted', + 'options' => [], + 'complete' => false, + 'entities' => [], + 'sequence' => 0, + 'activities' => [], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + 'completed' => [ + 'key' => 'completed', + 'code' => 'completed', + 'color' => '#1f2937', + 'logic' => [], + 'events' => [], + 'status' => 'Order completed', + 'actions' => [], + 'details' => 'Driver has completed the order', + 'options' => [], + 'complete' => true, + 'entities' => [], + 'sequence' => 0, + 'activities' => [], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + 'picked_up' => [ + 'key' => 'completed', + 'code' => 'picked_up', + 'color' => '#1f2937', + 'logic' => [], + 'events' => [], + 'status' => 'Order picked up', + 'actions' => [], + 'details' => 'Order has been picked up by customer', + 'options' => [], + 'complete' => true, + 'entities' => [], + 'sequence' => 0, + 'activities' => [], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + 'preparing' => [ + 'key' => 'preparing', + 'code' => 'preparing', + 'color' => '#1f2937', + 'logic' => [], + 'events' => [], + 'status' => 'Order is being prepared', + 'actions' => [], + 'details' => 'Order has been received by {storefront.name} and is being prepared', + 'options' => [], + 'complete' => false, + 'entities' => [], + 'sequence' => 0, + 'activities' => ['driver_enroute_to_store', 'pickup_ready'], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + 'dispatched' => [ + 'key' => 'dispatched', + 'code' => 'dispatched', + 'color' => '#1f2937', + 'logic' => [], + 'events' => [], + 'status' => 'Order Dispatched', + 'actions' => [], + 'details' => 'Order has been dispatched.', + 'options' => [], + 'complete' => false, + 'entities' => [], + 'sequence' => 0, + 'activities' => ['started'], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + 'pickup_ready' => [ + 'key' => 'ready', + 'code' => 'pickup_ready', + 'color' => '#1f2937', + 'logic' => [ + [ + 'type' => 'if', + 'conditions' => [ + [ + 'field' => 'meta.is_pickup', + 'value' => 'true', + 'operator' => 'equal', + ], + ], + ], + ], + 'events' => [], + 'status' => 'Order is ready for pickup', + 'actions' => [], + 'details' => 'Order is ready to be picked up by customer', + 'options' => [], + 'complete' => false, + 'entities' => [], + 'sequence' => 0, + 'activities' => ['picked_up'], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + 'driver_enroute' => [ + 'key' => 'driver_enroute', + 'code' => 'driver_enroute', + 'color' => '#1f2937', + 'logic' => [], + 'events' => [], + 'status' => 'Driver en-route', + 'actions' => [], + 'details' => 'Driver is on the way to the customer', + 'options' => [], + 'complete' => false, + 'entities' => [], + 'sequence' => 0, + 'activities' => ['completed'], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + 'driver_picked_up' => [ + 'key' => 'driver_picked_up', + 'code' => 'driver_picked_up', + 'color' => '#1f2937', + 'logic' => [], + 'events' => [], + 'status' => 'Driver picked up', + 'actions' => [], + 'details' => 'Driver has picked up order', + 'options' => [], + 'complete' => false, + 'entities' => [], + 'sequence' => 0, + 'activities' => ['driver_enroute'], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + 'driver_enroute_to_store' => [ + 'key' => 'driver_enroute', + 'code' => 'driver_enroute_to_store', + 'color' => '#1f2937', + 'logic' => [], + 'events' => [], + 'status' => 'Driver en-route', + 'actions' => [], + 'details' => 'Driver en-route to store', + 'options' => [], + 'complete' => false, + 'entities' => [], + 'sequence' => 0, + 'activities' => ['driver_picked_up'], + 'internalId' => Str::uuid(), + 'pod_method' => 'scan', + 'require_pod' => false, + ], + ], + ] + ); + } } From c090b86662d1517fbb4a750e59245a0417b42c0a Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Tue, 12 Mar 2024 16:11:50 +0800 Subject: [PATCH 3/4] fix autload path to seeders --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9fd71a5..ce884d7 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "autoload": { "psr-4": { "Fleetbase\\Storefront\\": "server/src/", - "Fleetbase\\Storefront\\Seeders\\": "seeders/" + "Fleetbase\\Storefront\\Seeders\\": "server/seeders/" } }, "autoload-dev": { From 25ed8c22fef936ff59d03c560aa59bf2e7da6fba Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Tue, 12 Mar 2024 17:59:29 +0800 Subject: [PATCH 4/4] bump dependency versions --- composer.json | 4 ++-- package.json | 4 ++-- pnpm-lock.yaml | 19 +++++++++---------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index ce884d7..7df429a 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,8 @@ ], "require": { "php": "^8.0", - "fleetbase/core-api": "^1.4.11", - "fleetbase/fleetops-api": "^0.4.17", + "fleetbase/core-api": "^1.4.12", + "fleetbase/fleetops-api": "^0.4.18", "geocoder-php/google-maps-places-provider": "^1.4", "laravel-notification-channels/apn": "^5.0", "laravel-notification-channels/fcm": "^4.1", diff --git a/package.json b/package.json index b21cb88..60e3c4d 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,9 @@ "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish" }, "dependencies": { - "@fleetbase/ember-core": "^0.2.5", + "@fleetbase/ember-core": "^0.2.6", "@fleetbase/ember-ui": "^0.2.11", - "@fleetbase/fleetops-data": "^0.1.12", + "@fleetbase/fleetops-data": "^0.1.13", "@babel/core": "^7.23.2", "@fortawesome/ember-fontawesome": "^0.4.1", "@fortawesome/fontawesome-svg-core": "^6.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3508e1d..ae36e4e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,14 +5,14 @@ dependencies: specifier: ^7.23.2 version: 7.23.2 '@fleetbase/ember-core': - specifier: ^0.2.5 - version: 0.2.5(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0) + specifier: ^0.2.6 + version: 0.2.6(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0) '@fleetbase/ember-ui': specifier: ^0.2.11 version: 0.2.11(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.35)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0) '@fleetbase/fleetops-data': - specifier: ^0.1.12 - version: 0.1.12 + specifier: ^0.1.13 + version: 0.1.13 '@fortawesome/ember-fontawesome': specifier: ^0.4.1 version: 0.4.1(rollup@4.12.0) @@ -1861,7 +1861,7 @@ packages: '@ember/edition-utils': 1.2.0 '@ember/string': 3.1.1 '@embroider/macros': 1.13.5 - ember-auto-import: 2.6.3(webpack@5.89.0) + ember-auto-import: 2.7.2(webpack@5.89.0) ember-cli-babel: 7.26.11 transitivePeerDependencies: - '@glint/template' @@ -2360,8 +2360,8 @@ packages: - supports-color dev: false - /@fleetbase/ember-core@0.2.5(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0): - resolution: {integrity: sha512-nLfNW5iiRdPcFzeLstKeEaPFkXuAPJbI04i19xz5a/D+zqstfD4bYQpv+vxbQpzRKwNFtFLYaJt+qg8xMWdB2A==} + /@fleetbase/ember-core@0.2.6(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0): + resolution: {integrity: sha512-EHO47NM6XH/1bC6TL7cEbJQ//RCrdFb1+TsCIHvhPtP7KSGyam2gexiiNlwTm4fgVizxyvDCbCpGDMEs8ltZnA==} engines: {node: '>= 18'} dependencies: '@babel/core': 7.23.2 @@ -2476,8 +2476,8 @@ packages: - webpack-command dev: false - /@fleetbase/fleetops-data@0.1.12: - resolution: {integrity: sha512-t3tuflZkZCeYPGuW81l9cYsI4ezg5JKBVplwaelhyIb5a9ZzIFwm0grRNN1jMJRbwCZkIVKyMMDnqIHw4mrWAg==} + /@fleetbase/fleetops-data@0.1.13: + resolution: {integrity: sha512-+JgP0p15TxMOxfJCSPJt/2nTA8ZugukGuaFYQTLzD0TFFKXjZE9bmYKPf+Z5w9L4oJ4b1oLsvRv6BL5dFt11lw==} engines: {node: '>= 18'} dependencies: '@babel/core': 7.23.2 @@ -6803,7 +6803,6 @@ packages: - '@glint/template' - supports-color - webpack - dev: false /ember-basic-dropdown@7.3.0(@babel/core@7.23.2)(@ember/string@3.1.1)(ember-source@5.4.0)(webpack@5.89.0): resolution: {integrity: sha512-XzLd1noCrHjG7O35HpZ+ljj7VwPPqon7svbvNJ2U7421e00eXBUVcCioGJFo1NnnPkjc14FTDc5UwktbGSbJdQ==}