diff --git a/api/composer.json b/api/composer.json index 3ce3d378..cdfd5f76 100644 --- a/api/composer.json +++ b/api/composer.json @@ -9,9 +9,9 @@ "license": "MIT", "require": { "php": "^8.0", - "fleetbase/core-api": "^1.4.8", - "fleetbase/fleetops-api": "^0.4.14", - "fleetbase/storefront-api": "^0.3.1", + "fleetbase/core-api": "^1.4.9", + "fleetbase/fleetops-api": "^0.4.15", + "fleetbase/storefront-api": "^0.3.2", "guzzlehttp/guzzle": "^7.0.1", "laravel/framework": "^10.0", "laravel/octane": "^2.3", diff --git a/api/composer.lock b/api/composer.lock index 39c69275..a68ac3a9 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "42661df70e48d19fefaf3d3f9ad2c8c3", + "content-hash": "a7a204f57912139166ed9236ef154dd0", "packages": [ { "name": "aloha/twilio", @@ -136,16 +136,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.300.2", + "version": "3.300.3", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "61d3d0179eff76793e338349c40c73271854fd1c" + "reference": "a1202d1a82593fc2cdad54d627e54c518a984738" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/61d3d0179eff76793e338349c40c73271854fd1c", - "reference": "61d3d0179eff76793e338349c40c73271854fd1c", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/a1202d1a82593fc2cdad54d627e54c518a984738", + "reference": "a1202d1a82593fc2cdad54d627e54c518a984738", "shasum": "" }, "require": { @@ -225,9 +225,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.300.2" + "source": "https://github.com/aws/aws-sdk-php/tree/3.300.3" }, - "time": "2024-02-21T19:07:54+00:00" + "time": "2024-02-22T19:20:21+00:00" }, { "name": "aws/aws-sdk-php-laravel", @@ -2287,16 +2287,16 @@ }, { "name": "fleetbase/core-api", - "version": "1.4.8", + "version": "1.4.9", "source": { "type": "git", "url": "https://github.com/fleetbase/core-api.git", - "reference": "d5cf8b714f26ecd44876906dabe8f484cba91899" + "reference": "734e0cb2475aa0f53014afe033c14e67afe2e884" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fleetbase/core-api/zipball/d5cf8b714f26ecd44876906dabe8f484cba91899", - "reference": "d5cf8b714f26ecd44876906dabe8f484cba91899", + "url": "https://api.github.com/repos/fleetbase/core-api/zipball/734e0cb2475aa0f53014afe033c14e67afe2e884", + "reference": "734e0cb2475aa0f53014afe033c14e67afe2e884", "shasum": "" }, "require": { @@ -2375,29 +2375,29 @@ ], "support": { "issues": "https://github.com/fleetbase/core-api/issues", - "source": "https://github.com/fleetbase/core-api/tree/v1.4.8" + "source": "https://github.com/fleetbase/core-api/tree/v1.4.9" }, - "time": "2024-02-22T09:44:51+00:00" + "time": "2024-02-23T05:31:33+00:00" }, { "name": "fleetbase/fleetops-api", - "version": "0.4.14", + "version": "0.4.15", "source": { "type": "git", "url": "https://github.com/fleetbase/fleetops.git", - "reference": "a609f0d29ab8691640579c37b6592828ff61c989" + "reference": "09d60f92e365e89fef37be394a0e2132a9f2199d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fleetbase/fleetops/zipball/a609f0d29ab8691640579c37b6592828ff61c989", - "reference": "a609f0d29ab8691640579c37b6592828ff61c989", + "url": "https://api.github.com/repos/fleetbase/fleetops/zipball/09d60f92e365e89fef37be394a0e2132a9f2199d", + "reference": "09d60f92e365e89fef37be394a0e2132a9f2199d", "shasum": "" }, "require": { "barryvdh/laravel-dompdf": "^2.0", "brick/geo": "0.7.2", "cknow/laravel-money": "^7.1", - "fleetbase/core-api": "^1.4.7", + "fleetbase/core-api": "^1.4.9", "geocoder-php/google-maps-places-provider": "^1.4", "giggsey/libphonenumber-for-php": "^8.13", "league/geotools": "^1.1.0", @@ -2463,9 +2463,9 @@ ], "support": { "issues": "https://github.com/fleetbase/fleetops/issues", - "source": "https://github.com/fleetbase/fleetops/tree/v0.4.14" + "source": "https://github.com/fleetbase/fleetops/tree/v0.4.15" }, - "time": "2024-02-22T04:31:52+00:00" + "time": "2024-02-23T05:36:54+00:00" }, { "name": "fleetbase/laravel-mysql-spatial", @@ -2535,21 +2535,21 @@ }, { "name": "fleetbase/storefront-api", - "version": "0.3.1", + "version": "0.3.2", "source": { "type": "git", "url": "https://github.com/fleetbase/storefront.git", - "reference": "c356f467c0753fcb26b69e29603a461ed7a0c6a9" + "reference": "0de015786a55c802b5f478e3154362d7e9a2d87a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fleetbase/storefront/zipball/c356f467c0753fcb26b69e29603a461ed7a0c6a9", - "reference": "c356f467c0753fcb26b69e29603a461ed7a0c6a9", + "url": "https://api.github.com/repos/fleetbase/storefront/zipball/0de015786a55c802b5f478e3154362d7e9a2d87a", + "reference": "0de015786a55c802b5f478e3154362d7e9a2d87a", "shasum": "" }, "require": { - "fleetbase/core-api": "^1.4.7", - "fleetbase/fleetops-api": "^0.4.13", + "fleetbase/core-api": "^1.4.9", + "fleetbase/fleetops-api": "^0.4.15", "geocoder-php/google-maps-places-provider": "^1.4", "laravel-notification-channels/apn": "^5.0", "laravel-notification-channels/fcm": "^4.1", @@ -2610,9 +2610,9 @@ ], "support": { "issues": "https://github.com/fleetbase/storefront/issues", - "source": "https://github.com/fleetbase/storefront/tree/v0.3.1" + "source": "https://github.com/fleetbase/storefront/tree/v0.3.2" }, - "time": "2024-02-21T10:32:09+00:00" + "time": "2024-02-23T05:40:38+00:00" }, { "name": "fruitcake/php-cors", @@ -14273,6 +14273,7 @@ "type": "patreon" } ], + "abandoned": "web-token/jwt-library", "time": "2024-02-22T07:19:34+00:00" }, { @@ -14435,6 +14436,7 @@ "type": "patreon" } ], + "abandoned": "web-token/jwt-library", "time": "2024-02-22T07:19:34+00:00" }, { @@ -17157,5 +17159,5 @@ "php": "^8.0" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.6.0" } diff --git a/console/app/components/configure/notification-channels.js b/console/app/components/configure/notification-channels.js index 0a984859..b520273f 100644 --- a/console/app/components/configure/notification-channels.js +++ b/console/app/components/configure/notification-channels.js @@ -56,7 +56,6 @@ export default class ConfigureNotificationChannelsComponent extends Component { this.fetch.uploadFile.perform( file, { - disk: 'local', path: 'apn', subject_uuid: this.currentUser.companyId, subject_type: 'company', @@ -82,7 +81,6 @@ export default class ConfigureNotificationChannelsComponent extends Component { this.fetch.uploadFile.perform( file, { - disk: 'local', path: 'firebase', subject_uuid: this.currentUser.companyId, subject_type: 'company', diff --git a/console/package.json b/console/package.json index 89f5884b..d5a051a5 100644 --- a/console/package.json +++ b/console/package.json @@ -1,6 +1,6 @@ { "name": "@fleetbase/console", - "version": "0.4.7", + "version": "0.4.8", "private": true, "description": "Fleetbase Console", "repository": "https://github.com/fleetbase/fleetbase", @@ -31,9 +31,9 @@ "dependencies": { "@fleetbase/ember-core": "^0.2.4", "@fleetbase/ember-ui": "^0.2.11", - "@fleetbase/fleetops-engine": "^0.4.14", + "@fleetbase/fleetops-engine": "^0.4.15", "@fleetbase/fleetops-data": "^0.1.9", - "@fleetbase/storefront-engine": "^0.3.1", + "@fleetbase/storefront-engine": "^0.3.2", "@fleetbase/dev-engine": "^0.2.1", "@fleetbase/iam-engine": "^0.0.9", "@fleetbase/leaflet-routing-machine": "^3.2.16", diff --git a/console/pnpm-lock.yaml b/console/pnpm-lock.yaml index c2623368..f2e2c602 100644 --- a/console/pnpm-lock.yaml +++ b/console/pnpm-lock.yaml @@ -22,8 +22,8 @@ dependencies: specifier: ^0.1.9 version: 0.1.9 '@fleetbase/fleetops-engine': - specifier: ^0.4.14 - version: 0.4.14(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0) + specifier: ^0.4.15 + version: 0.4.15(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0) '@fleetbase/iam-engine': specifier: ^0.0.9 version: 0.0.9(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0) @@ -31,8 +31,8 @@ dependencies: specifier: ^3.2.16 version: 3.2.16 '@fleetbase/storefront-engine': - specifier: ^0.3.1 - version: 0.3.1(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0) + specifier: ^0.3.2 + version: 0.3.2(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0) '@fortawesome/ember-fontawesome': specifier: ^0.4.1 version: 0.4.1(rollup@4.12.0) @@ -2817,8 +2817,8 @@ packages: - supports-color dev: false - /@fleetbase/fleetops-engine@0.4.14(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0): - resolution: {integrity: sha512-0YdFYlVZOdkZP+gTn1bd6aDJpu7uYnDtC4pASUjdxlW1j/Z7Auad9naM1Yt3NgegVA1jya7bGPJgddfTCuImnw==} + /@fleetbase/fleetops-engine@0.4.15(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0): + resolution: {integrity: sha512-zqTzzLoKW5moP564Jc371QYr4XkU1CwWLzU/SzBnSBAqYoOt6yRY3TRDDWkKNOdHEpNbbsAVZ8vOYAGayI1Jlw==} engines: {node: '>= 18'} peerDependencies: ember-engines: ^0.9.0 @@ -2933,8 +2933,8 @@ packages: osrm-text-instructions: 0.13.4 dev: false - /@fleetbase/storefront-engine@0.3.1(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0): - resolution: {integrity: sha512-CQiksbscByA2AJr77oL7Kc2Cw3NwqUROSkppoLSAmzIU7tmP4A9aOETHaCO5c1eNmdhz0mtmP6yeCxj6awGtvw==} + /@fleetbase/storefront-engine@0.3.2(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-engines@0.8.23)(ember-source@5.4.0)(postcss@8.4.21)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0): + resolution: {integrity: sha512-eAc/4M/lXW76/Mz5EAnb22LkUx7HT2W1Xs0uYlKWWcq1sUUYO6+dh13/bHlceEH8YMRVKti5Xqe+7cm1OlfQPg==} engines: {node: '>= 18'} peerDependencies: ember-engines: ^0.9.0 diff --git a/packages/core-api b/packages/core-api index d5cf8b71..734e0cb2 160000 --- a/packages/core-api +++ b/packages/core-api @@ -1 +1 @@ -Subproject commit d5cf8b714f26ecd44876906dabe8f484cba91899 +Subproject commit 734e0cb2475aa0f53014afe033c14e67afe2e884 diff --git a/packages/fleetops b/packages/fleetops index a609f0d2..09d60f92 160000 --- a/packages/fleetops +++ b/packages/fleetops @@ -1 +1 @@ -Subproject commit a609f0d29ab8691640579c37b6592828ff61c989 +Subproject commit 09d60f92e365e89fef37be394a0e2132a9f2199d diff --git a/packages/storefront b/packages/storefront index c356f467..0de01578 160000 --- a/packages/storefront +++ b/packages/storefront @@ -1 +1 @@ -Subproject commit c356f467c0753fcb26b69e29603a461ed7a0c6a9 +Subproject commit 0de015786a55c802b5f478e3154362d7e9a2d87a