Compare commits

..

6 Commits

Author SHA1 Message Date
Ron
dc00ac3892 Merge pull request #294 from fleetbase/dev-v0.5.7
upgrade core-api
2024-08-31 15:22:56 +07:00
Ronald A. Richardson
f18ec886a7 upgrade core-api 2024-08-31 16:21:45 +08:00
Ron
f039b61d79 Merge pull request #293 from fleetbase/dev-v0.5.7
hotfix for resource loading and relation loading for organizations
2024-08-31 15:01:36 +07:00
Ronald A. Richardson
248f70e31c hotfix for resource loading and relation loading for organizations 2024-08-31 15:51:30 +08:00
Ron
6bc76a1b33 Merge pull request #292 from fleetbase/dev-v0.5.6
v0.5.6 - hotfix only load organization with valid owners - no stale org
2024-08-30 17:18:07 +07:00
Ronald A. Richardson
30695b3ebe hotfix only load organization with valid owners - no stale org 2024-08-30 18:06:42 +08:00
11 changed files with 148 additions and 134 deletions

View File

@@ -9,8 +9,8 @@
"license": "AGPL-3.0-or-later",
"require": {
"php": "^8.0",
"fleetbase/core-api": "^1.5.3",
"fleetbase/fleetops-api": "^0.5.6",
"fleetbase/core-api": "^1.5.5",
"fleetbase/fleetops-api": "^0.5.7",
"fleetbase/registry-bridge": "^0.0.13",
"fleetbase/storefront-api": "^0.3.14",
"guzzlehttp/guzzle": "^7.0.1",

222
api/composer.lock generated
View File

@@ -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": "e36984e9016ec9c31454d6bc50a1632a",
"content-hash": "8cfd9f6c5100086b189153840795ddd2",
"packages": [
{
"name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.321.1",
"version": "3.321.2",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "f4ad64dffc2665dde6275e6dcc3f653f15c6e57f"
"reference": "c04f8f30891cee8480c132778cd4cc486467e77a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f4ad64dffc2665dde6275e6dcc3f653f15c6e57f",
"reference": "f4ad64dffc2665dde6275e6dcc3f653f15c6e57f",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c04f8f30891cee8480c132778cd4cc486467e77a",
"reference": "c04f8f30891cee8480c132778cd4cc486467e77a",
"shasum": ""
},
"require": {
@@ -154,9 +154,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.321.1"
"source": "https://github.com/aws/aws-sdk-php/tree/3.321.2"
},
"time": "2024-08-29T19:10:23+00:00"
"time": "2024-08-30T18:14:40+00:00"
},
{
"name": "aws/aws-sdk-php-laravel",
@@ -2295,16 +2295,16 @@
},
{
"name": "fleetbase/core-api",
"version": "1.5.3",
"version": "1.5.5",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/core-api.git",
"reference": "98bb2c16a3357a0b6f45bc8928a99dfdad6ccca1"
"reference": "af272fac24d5f8911b184ce383eb9d4e6f8320f1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/core-api/zipball/98bb2c16a3357a0b6f45bc8928a99dfdad6ccca1",
"reference": "98bb2c16a3357a0b6f45bc8928a99dfdad6ccca1",
"url": "https://api.github.com/repos/fleetbase/core-api/zipball/af272fac24d5f8911b184ce383eb9d4e6f8320f1",
"reference": "af272fac24d5f8911b184ce383eb9d4e6f8320f1",
"shasum": ""
},
"require": {
@@ -2387,29 +2387,29 @@
],
"support": {
"issues": "https://github.com/fleetbase/core-api/issues",
"source": "https://github.com/fleetbase/core-api/tree/v1.5.3"
"source": "https://github.com/fleetbase/core-api/tree/v1.5.5"
},
"time": "2024-08-30T05:57:37+00:00"
"time": "2024-08-31T07:20:50+00:00"
},
{
"name": "fleetbase/fleetops-api",
"version": "0.5.6",
"version": "0.5.7",
"source": {
"type": "git",
"url": "https://github.com/fleetbase/fleetops.git",
"reference": "e834be397af8f2a28fafccdd55d2e5128f6443c9"
"reference": "fac2832a54e1f146fb7b8faea9bfa9461d3abcf2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/e834be397af8f2a28fafccdd55d2e5128f6443c9",
"reference": "e834be397af8f2a28fafccdd55d2e5128f6443c9",
"url": "https://api.github.com/repos/fleetbase/fleetops/zipball/fac2832a54e1f146fb7b8faea9bfa9461d3abcf2",
"reference": "fac2832a54e1f146fb7b8faea9bfa9461d3abcf2",
"shasum": ""
},
"require": {
"barryvdh/laravel-dompdf": "^2.0",
"brick/geo": "0.7.2",
"cknow/laravel-money": "^7.1",
"fleetbase/core-api": "^1.5.3",
"fleetbase/core-api": "^1.5.5",
"geocoder-php/google-maps-places-provider": "^1.4",
"giggsey/libphonenumber-for-php": "^8.13",
"league/geotools": "^1.1.0",
@@ -2476,9 +2476,9 @@
],
"support": {
"issues": "https://github.com/fleetbase/fleetops/issues",
"source": "https://github.com/fleetbase/fleetops/tree/v0.5.6"
"source": "https://github.com/fleetbase/fleetops/tree/v0.5.7"
},
"time": "2024-08-30T06:08:16+00:00"
"time": "2024-08-31T07:40:32+00:00"
},
{
"name": "fleetbase/laravel-mysql-spatial",
@@ -10304,16 +10304,16 @@
},
{
"name": "rize/uri-template",
"version": "0.3.7",
"version": "0.3.8",
"source": {
"type": "git",
"url": "https://github.com/rize/UriTemplate.git",
"reference": "0c78eaa2e5241faf6c9f246beb53ef3fb31057fd"
"reference": "34a5b96d0b65a5dddb7d20f09b6527a43faede24"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rize/UriTemplate/zipball/0c78eaa2e5241faf6c9f246beb53ef3fb31057fd",
"reference": "0c78eaa2e5241faf6c9f246beb53ef3fb31057fd",
"url": "https://api.github.com/repos/rize/UriTemplate/zipball/34a5b96d0b65a5dddb7d20f09b6527a43faede24",
"reference": "34a5b96d0b65a5dddb7d20f09b6527a43faede24",
"shasum": ""
},
"require": {
@@ -10346,7 +10346,7 @@
],
"support": {
"issues": "https://github.com/rize/UriTemplate/issues",
"source": "https://github.com/rize/UriTemplate/tree/0.3.7"
"source": "https://github.com/rize/UriTemplate/tree/0.3.8"
},
"funding": [
{
@@ -10362,7 +10362,7 @@
"type": "open_collective"
}
],
"time": "2024-08-29T15:43:27+00:00"
"time": "2024-08-30T07:09:40+00:00"
},
{
"name": "s-ichikawa/laravel-sendgrid-driver",
@@ -11431,16 +11431,16 @@
},
{
"name": "symfony/cache",
"version": "v7.1.3",
"version": "v7.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
"reference": "8ac37acee794372f9732fe8a61a8221f6762148e"
"reference": "b61e464d7687bb7e8f677d5031c632bf3820df18"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/cache/zipball/8ac37acee794372f9732fe8a61a8221f6762148e",
"reference": "8ac37acee794372f9732fe8a61a8221f6762148e",
"url": "https://api.github.com/repos/symfony/cache/zipball/b61e464d7687bb7e8f677d5031c632bf3820df18",
"reference": "b61e464d7687bb7e8f677d5031c632bf3820df18",
"shasum": ""
},
"require": {
@@ -11508,7 +11508,7 @@
"psr6"
],
"support": {
"source": "https://github.com/symfony/cache/tree/v7.1.3"
"source": "https://github.com/symfony/cache/tree/v7.1.4"
},
"funding": [
{
@@ -11524,7 +11524,7 @@
"type": "tidelift"
}
],
"time": "2024-07-17T06:10:24+00:00"
"time": "2024-08-12T09:59:40+00:00"
},
{
"name": "symfony/cache-contracts",
@@ -11607,16 +11607,16 @@
},
{
"name": "symfony/console",
"version": "v6.4.10",
"version": "v6.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "504974cbe43d05f83b201d6498c206f16fc0cdbc"
"reference": "42686880adaacdad1835ee8fc2a9ec5b7bd63998"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/504974cbe43d05f83b201d6498c206f16fc0cdbc",
"reference": "504974cbe43d05f83b201d6498c206f16fc0cdbc",
"url": "https://api.github.com/repos/symfony/console/zipball/42686880adaacdad1835ee8fc2a9ec5b7bd63998",
"reference": "42686880adaacdad1835ee8fc2a9ec5b7bd63998",
"shasum": ""
},
"require": {
@@ -11681,7 +11681,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v6.4.10"
"source": "https://github.com/symfony/console/tree/v6.4.11"
},
"funding": [
{
@@ -11697,7 +11697,7 @@
"type": "tidelift"
}
],
"time": "2024-07-26T12:30:32+00:00"
"time": "2024-08-15T22:48:29+00:00"
},
{
"name": "symfony/css-selector",
@@ -12064,16 +12064,16 @@
},
{
"name": "symfony/finder",
"version": "v6.4.10",
"version": "v6.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "af29198d87112bebdd397bd7735fbd115997824c"
"reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/af29198d87112bebdd397bd7735fbd115997824c",
"reference": "af29198d87112bebdd397bd7735fbd115997824c",
"url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453",
"reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453",
"shasum": ""
},
"require": {
@@ -12108,7 +12108,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v6.4.10"
"source": "https://github.com/symfony/finder/tree/v6.4.11"
},
"funding": [
{
@@ -12124,20 +12124,20 @@
"type": "tidelift"
}
],
"time": "2024-07-24T07:06:38+00:00"
"time": "2024-08-13T14:27:37+00:00"
},
{
"name": "symfony/http-client",
"version": "v7.1.3",
"version": "v7.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
"reference": "b79858aa7a051ea791b0d50269a234a0b50cb231"
"reference": "a8f8d60b30b331cf4b743b3632e5acdba3f8285c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/b79858aa7a051ea791b0d50269a234a0b50cb231",
"reference": "b79858aa7a051ea791b0d50269a234a0b50cb231",
"url": "https://api.github.com/repos/symfony/http-client/zipball/a8f8d60b30b331cf4b743b3632e5acdba3f8285c",
"reference": "a8f8d60b30b331cf4b743b3632e5acdba3f8285c",
"shasum": ""
},
"require": {
@@ -12202,7 +12202,7 @@
"http"
],
"support": {
"source": "https://github.com/symfony/http-client/tree/v7.1.3"
"source": "https://github.com/symfony/http-client/tree/v7.1.4"
},
"funding": [
{
@@ -12218,7 +12218,7 @@
"type": "tidelift"
}
],
"time": "2024-07-17T06:10:24+00:00"
"time": "2024-08-26T06:32:37+00:00"
},
{
"name": "symfony/http-client-contracts",
@@ -12377,16 +12377,16 @@
},
{
"name": "symfony/http-kernel",
"version": "v6.4.10",
"version": "v6.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "147e0daf618d7575b5007055340d09aece5cf068"
"reference": "1ba6b89d781cb47448155cc70dd2e0f1b0584c79"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/147e0daf618d7575b5007055340d09aece5cf068",
"reference": "147e0daf618d7575b5007055340d09aece5cf068",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/1ba6b89d781cb47448155cc70dd2e0f1b0584c79",
"reference": "1ba6b89d781cb47448155cc70dd2e0f1b0584c79",
"shasum": ""
},
"require": {
@@ -12471,7 +12471,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v6.4.10"
"source": "https://github.com/symfony/http-kernel/tree/v6.4.11"
},
"funding": [
{
@@ -12487,7 +12487,7 @@
"type": "tidelift"
}
],
"time": "2024-07-26T14:52:04+00:00"
"time": "2024-08-30T16:57:20+00:00"
},
{
"name": "symfony/mailer",
@@ -12571,16 +12571,16 @@
},
{
"name": "symfony/mime",
"version": "v6.4.9",
"version": "v6.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "7d048964877324debdcb4e0549becfa064a20d43"
"reference": "dba5d5f6073baf7a3576b580cc4a208b4ca00553"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/7d048964877324debdcb4e0549becfa064a20d43",
"reference": "7d048964877324debdcb4e0549becfa064a20d43",
"url": "https://api.github.com/repos/symfony/mime/zipball/dba5d5f6073baf7a3576b580cc4a208b4ca00553",
"reference": "dba5d5f6073baf7a3576b580cc4a208b4ca00553",
"shasum": ""
},
"require": {
@@ -12636,7 +12636,7 @@
"mime-type"
],
"support": {
"source": "https://github.com/symfony/mime/tree/v6.4.9"
"source": "https://github.com/symfony/mime/tree/v6.4.11"
},
"funding": [
{
@@ -12652,7 +12652,7 @@
"type": "tidelift"
}
],
"time": "2024-06-28T09:49:33+00:00"
"time": "2024-08-13T12:15:02+00:00"
},
{
"name": "symfony/options-resolver",
@@ -13578,16 +13578,16 @@
},
{
"name": "symfony/property-access",
"version": "v7.1.1",
"version": "v7.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
"reference": "74e39e6a6276b8e384f34c6ddbc10a6c9a60193a"
"reference": "6c709f97103355016e5782d0622437ae381012ad"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/property-access/zipball/74e39e6a6276b8e384f34c6ddbc10a6c9a60193a",
"reference": "74e39e6a6276b8e384f34c6ddbc10a6c9a60193a",
"url": "https://api.github.com/repos/symfony/property-access/zipball/6c709f97103355016e5782d0622437ae381012ad",
"reference": "6c709f97103355016e5782d0622437ae381012ad",
"shasum": ""
},
"require": {
@@ -13634,7 +13634,7 @@
"reflection"
],
"support": {
"source": "https://github.com/symfony/property-access/tree/v7.1.1"
"source": "https://github.com/symfony/property-access/tree/v7.1.4"
},
"funding": [
{
@@ -13650,7 +13650,7 @@
"type": "tidelift"
}
],
"time": "2024-05-31T14:57:53+00:00"
"time": "2024-08-30T16:12:47+00:00"
},
{
"name": "symfony/property-info",
@@ -13738,16 +13738,16 @@
},
{
"name": "symfony/psr-http-message-bridge",
"version": "v7.1.3",
"version": "v7.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/psr-http-message-bridge.git",
"reference": "1365d10f5476f74a27cf9c2d1eee70c069019db0"
"reference": "405a7bcd872f1563966f64be19f1362d94ce71ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/1365d10f5476f74a27cf9c2d1eee70c069019db0",
"reference": "1365d10f5476f74a27cf9c2d1eee70c069019db0",
"url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/405a7bcd872f1563966f64be19f1362d94ce71ab",
"reference": "405a7bcd872f1563966f64be19f1362d94ce71ab",
"shasum": ""
},
"require": {
@@ -13801,7 +13801,7 @@
"psr-7"
],
"support": {
"source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.1.3"
"source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.1.4"
},
"funding": [
{
@@ -13817,20 +13817,20 @@
"type": "tidelift"
}
],
"time": "2024-07-17T06:10:24+00:00"
"time": "2024-08-15T22:48:53+00:00"
},
{
"name": "symfony/routing",
"version": "v6.4.10",
"version": "v6.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "aad19fe10753ba842f0d653a8db819c4b3affa87"
"reference": "8ee0c24c1bf61c263a26f1b9b6d19e83b1121f2a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/aad19fe10753ba842f0d653a8db819c4b3affa87",
"reference": "aad19fe10753ba842f0d653a8db819c4b3affa87",
"url": "https://api.github.com/repos/symfony/routing/zipball/8ee0c24c1bf61c263a26f1b9b6d19e83b1121f2a",
"reference": "8ee0c24c1bf61c263a26f1b9b6d19e83b1121f2a",
"shasum": ""
},
"require": {
@@ -13884,7 +13884,7 @@
"url"
],
"support": {
"source": "https://github.com/symfony/routing/tree/v6.4.10"
"source": "https://github.com/symfony/routing/tree/v6.4.11"
},
"funding": [
{
@@ -13900,20 +13900,20 @@
"type": "tidelift"
}
],
"time": "2024-07-15T09:26:24+00:00"
"time": "2024-08-29T08:15:38+00:00"
},
{
"name": "symfony/serializer",
"version": "v7.1.3",
"version": "v7.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
"reference": "0d5ddac365fbfffc30ca9bc944ad3eb9b3763c09"
"reference": "0158b0e91b7cf7e744a6fb9acaeb613d1ca40dbb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/serializer/zipball/0d5ddac365fbfffc30ca9bc944ad3eb9b3763c09",
"reference": "0d5ddac365fbfffc30ca9bc944ad3eb9b3763c09",
"url": "https://api.github.com/repos/symfony/serializer/zipball/0158b0e91b7cf7e744a6fb9acaeb613d1ca40dbb",
"reference": "0158b0e91b7cf7e744a6fb9acaeb613d1ca40dbb",
"shasum": ""
},
"require": {
@@ -13981,7 +13981,7 @@
"description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/serializer/tree/v7.1.3"
"source": "https://github.com/symfony/serializer/tree/v7.1.4"
},
"funding": [
{
@@ -13997,7 +13997,7 @@
"type": "tidelift"
}
],
"time": "2024-07-17T06:10:24+00:00"
"time": "2024-08-22T09:39:57+00:00"
},
{
"name": "symfony/service-contracts",
@@ -14084,16 +14084,16 @@
},
{
"name": "symfony/string",
"version": "v7.1.3",
"version": "v7.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "ea272a882be7f20cad58d5d78c215001617b7f07"
"reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/ea272a882be7f20cad58d5d78c215001617b7f07",
"reference": "ea272a882be7f20cad58d5d78c215001617b7f07",
"url": "https://api.github.com/repos/symfony/string/zipball/6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
"reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
"shasum": ""
},
"require": {
@@ -14151,7 +14151,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v7.1.3"
"source": "https://github.com/symfony/string/tree/v7.1.4"
},
"funding": [
{
@@ -14167,7 +14167,7 @@
"type": "tidelift"
}
],
"time": "2024-07-22T10:25:37+00:00"
"time": "2024-08-12T09:59:40+00:00"
},
{
"name": "symfony/translation",
@@ -14426,16 +14426,16 @@
},
{
"name": "symfony/uid",
"version": "v6.4.8",
"version": "v6.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/uid.git",
"reference": "35904eca37a84bb764c560cbfcac9f0ac2bcdbdf"
"reference": "6a0394ad707de386547223948fac1e0f2805bc0b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/uid/zipball/35904eca37a84bb764c560cbfcac9f0ac2bcdbdf",
"reference": "35904eca37a84bb764c560cbfcac9f0ac2bcdbdf",
"url": "https://api.github.com/repos/symfony/uid/zipball/6a0394ad707de386547223948fac1e0f2805bc0b",
"reference": "6a0394ad707de386547223948fac1e0f2805bc0b",
"shasum": ""
},
"require": {
@@ -14480,7 +14480,7 @@
"uuid"
],
"support": {
"source": "https://github.com/symfony/uid/tree/v6.4.8"
"source": "https://github.com/symfony/uid/tree/v6.4.11"
},
"funding": [
{
@@ -14496,20 +14496,20 @@
"type": "tidelift"
}
],
"time": "2024-05-31T14:49:08+00:00"
"time": "2024-08-12T09:55:28+00:00"
},
{
"name": "symfony/var-dumper",
"version": "v6.4.10",
"version": "v6.4.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "a71cc3374f5fb9759da1961d28c452373b343dd4"
"reference": "ee14c8254a480913268b1e3b1cba8045ed122694"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/a71cc3374f5fb9759da1961d28c452373b343dd4",
"reference": "a71cc3374f5fb9759da1961d28c452373b343dd4",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/ee14c8254a480913268b1e3b1cba8045ed122694",
"reference": "ee14c8254a480913268b1e3b1cba8045ed122694",
"shasum": ""
},
"require": {
@@ -14565,7 +14565,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v6.4.10"
"source": "https://github.com/symfony/var-dumper/tree/v6.4.11"
},
"funding": [
{
@@ -14581,7 +14581,7 @@
"type": "tidelift"
}
],
"time": "2024-07-26T12:30:32+00:00"
"time": "2024-08-30T16:03:21+00:00"
},
{
"name": "symfony/var-exporter",
@@ -17778,16 +17778,16 @@
},
{
"name": "symfony/yaml",
"version": "v7.1.1",
"version": "v7.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "fa34c77015aa6720469db7003567b9f772492bf2"
"reference": "92e080b851c1c655c786a2da77f188f2dccd0f4b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/fa34c77015aa6720469db7003567b9f772492bf2",
"reference": "fa34c77015aa6720469db7003567b9f772492bf2",
"url": "https://api.github.com/repos/symfony/yaml/zipball/92e080b851c1c655c786a2da77f188f2dccd0f4b",
"reference": "92e080b851c1c655c786a2da77f188f2dccd0f4b",
"shasum": ""
},
"require": {
@@ -17829,7 +17829,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/yaml/tree/v7.1.1"
"source": "https://github.com/symfony/yaml/tree/v7.1.4"
},
"funding": [
{
@@ -17845,7 +17845,7 @@
"type": "tidelift"
}
],
"time": "2024-05-31T14:57:53+00:00"
"time": "2024-08-12T09:59:40+00:00"
},
{
"name": "theseer/tokenizer",
@@ -17907,5 +17907,5 @@
"php": "^8.0"
},
"platform-dev": [],
"plugin-api-version": "2.2.0"
"plugin-api-version": "2.6.0"
}

View File

@@ -18,10 +18,6 @@ php artisan fleetbase:seed
# Create permissions, policies, and roles
php artisan fleetbase:create-permissions
# Assign admin and driver roles
php artisan fleetbase:assign-admin-roles
php artisan fleetops:assign-driver-roles
# Restart queue
php artisan queue:restart

View File

@@ -7,8 +7,7 @@ export default class ConsoleAdminRoute extends Route {
@service router;
beforeModel() {
// USER MUST BE ADMIN
if (!this.currentUser.user.is_admin) {
if (!this.currentUser.isAdmin) {
return this.router.transitionTo('console').then(() => {
this.notifications.error('You do not have authorization to access admin!');
});

View File

@@ -35,4 +35,6 @@
</Layout::Sidebar::Panel>
</EmberWormhole>
{{outlet}}
<Layout::Section::Container>
{{outlet}}
</Layout::Section::Container>

View File

@@ -15,9 +15,8 @@
@paginationMeta={{@model.meta}}
@page={{this.page}}
@onPageChange={{fn (mut this.page)}}
@tfootVerticalOffset="53"
@tfootVerticalOffsetElements=".next-view-section-subheader"
@onRowClick={{this.goToCompany}}
/>
</Layout::Section::Body>
{{outlet}}

View File

@@ -1,5 +1,15 @@
{{page-title (t "common.users")}}
<Overlay @isOpen={{@isOpen}} @onLoad={{this.setOverlayContext}} @position="right" @noBackdrop={{true}} @fullHeight={{true}} @width="600px" @isResizable={{true}}>
<Overlay
@onLoad={{this.setOverlayContext}}
@onOpen={{this.onOpen}}
@onClose={{this.onClose}}
@onToggle={{this.onToggle}}
@position="right"
@noBackdrop={{true}}
@fullHeight={{true}}
@isResizeble={{true}}
@width="800px"
>
<Overlay::Header @title={{concat this.company.name " - " (t "common.users")}} @hideStatusDot={{true}} @titleWrapperClass="leading-5">
<div class="flex flex-1 justify-end">
<Button @type="default" @icon="times" @helpText={{t "common.close-and-save"}} @onClick={{this.onPressClose}} />
@@ -7,9 +17,17 @@
</Overlay::Header>
<Overlay::Body class="without-padding">
{{!-- template-lint-disable no-unbound --}}
{{! template-lint-disable no-unbound }}
<Layout::Section::Header @title={{t "console.admin.organizations.users.title"}} @searchQuery={{unbound this.nestedQuery}} @onSearch={{this.search}}>
<Pagination @meta={{@model.meta}} @page={{this.nestedPage}} @onPageChange={{fn (mut this.nestedPage)}} @metaInfoClass="hidden" @metaInfoWrapperClass="within-layout-section-header" />
{{#if (gt @model.meta.total this.nestedLimit)}}
<Pagination
@meta={{@model.meta}}
@page={{this.nestedPage}}
@onPageChange={{fn (mut this.nestedPage)}}
@metaInfoClass="hidden"
@metaInfoWrapperClass="within-layout-section-header"
/>
{{/if}}
</Layout::Section::Header>
<Layout::Section::Body>

View File

@@ -1,6 +1,6 @@
{
"name": "@fleetbase/console",
"version": "0.5.4",
"version": "0.5.7",
"private": true,
"description": "Modular logistics and supply chain operating system (LSOS)",
"repository": "https://github.com/fleetbase/fleetbase",
@@ -31,7 +31,7 @@
"dependencies": {
"@fleetbase/ember-core": "^0.2.17",
"@fleetbase/ember-ui": "^0.2.24",
"@fleetbase/fleetops-engine": "^0.5.6",
"@fleetbase/fleetops-engine": "^0.5.7",
"@fleetbase/storefront-engine": "^0.3.14",
"@fleetbase/dev-engine": "^0.2.6",
"@fleetbase/iam-engine": "^0.1.0",

10
console/pnpm-lock.yaml generated
View File

@@ -29,8 +29,8 @@ importers:
specifier: ^0.1.17
version: 0.1.17(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0)
'@fleetbase/fleetops-engine':
specifier: ^0.5.6
version: 0.5.6(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-engines@0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.3.0)(webpack@5.94.0)
specifier: ^0.5.7
version: 0.5.7(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-engines@0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.3.0)(webpack@5.94.0)
'@fleetbase/iam-engine':
specifier: ^0.1.0
version: 0.1.0(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-engines@0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.3.0)(webpack@5.94.0)
@@ -1576,8 +1576,8 @@ packages:
resolution: {integrity: sha512-cT3MgW0klMByRtUZMJO5d5CfaWCg4Ss9vVr/YA1iUL5DtHP5RgpCmndFLqa0nyYpncIwhkCykfWAUts4PUl+sg==}
engines: {node: '>= 18'}
'@fleetbase/fleetops-engine@0.5.6':
resolution: {integrity: sha512-N926LLhCsw5kKZVxTe+5UP10JxWmCj2FRpKvHtPnA57AhBUvfYrA2GrlbYC4rfjDqe951LtHCSAZ81VHZjEXVg==}
'@fleetbase/fleetops-engine@0.5.7':
resolution: {integrity: sha512-zFZWb/4iba79ED4oDL5f85tmudAIhqCkidxm9tWwyzUXecoXeH4rNXWRLijK8H/SKjWL0t3Oos/UueD8BqjkMg==}
engines: {node: '>= 18'}
peerDependencies:
ember-engines: ^0.9.0
@@ -10638,7 +10638,7 @@ snapshots:
- utf-8-validate
- webpack
'@fleetbase/fleetops-engine@0.5.6(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-engines@0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.3.0)(webpack@5.94.0)':
'@fleetbase/fleetops-engine@0.5.7(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(@glimmer/component@1.1.2(@babel/core@7.25.2))(@glimmer/tracking@1.1.2)(ember-engines@0.9.0(@ember/legacy-built-in-components@0.4.2(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(postcss@8.4.41)(rollup@2.79.1)(tracked-built-ins@3.3.0)(webpack@5.94.0)':
dependencies:
'@babel/core': 7.25.2
'@fleetbase/ember-core': 0.2.17(@ember/string@3.1.1)(@ember/test-helpers@3.3.1(@babel/core@7.25.2)(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0))(ember-resolver@11.0.1(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0)))(ember-source@5.4.1(@babel/core@7.25.2)(@glimmer/component@1.1.2(@babel/core@7.25.2))(rsvp@4.8.5)(webpack@5.94.0))(webpack@5.94.0)