Merge remote-tracking branch 'upstream/main' into feature/oidc-auth

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Eliminated `uuid` in favor of using `randomUUID` from `node:crypto`
+- Upgraded `color` from version `5.0.0` to `5.0.3`
 
 ### Fixed
 

apps/api/src/app/endpoints/public/public.controller.ts

@@ -82,7 +82,6 @@ export class PublicController {
     ]);
 
     const { activities } = await this.orderService.getOrders({
-      includeDrafts: false,
       sortColumn: 'date',
       sortDirection: 'desc',
       take: 10,

apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html

@@ -10,6 +10,12 @@
       <div class="col-6 mb-3">
         <gf-value i18n size="medium" [value]="user?.id">User ID</gf-value>
       </div>
+      <div class="col-6 mb-3">
+        <gf-value i18n size="medium" [value]="user?.role">Role</gf-value>
+      </div>
+    </div>
+
+    <div class="mb-3 row">
       <div class="col-6 mb-3">
         <gf-value
           i18n
@@ -20,9 +26,6 @@
           >Registration Date</gf-value
         >
       </div>
-    </div>
-
-    <div class="mb-3 row">
       <div class="col-6 mb-3">
         <gf-value
           i18n
@@ -32,9 +35,6 @@
           >Authentication</gf-value
         >
       </div>
-      <div class="col-6 mb-3">
-        <gf-value i18n size="medium" [value]="user?.role">Role</gf-value>
-      </div>
     </div>
 
     @if (data.hasPermissionForSubscription) {

package-lock.json

@@ -55,7 +55,7 @@
         "cheerio": "1.0.0",
         "class-transformer": "0.5.1",
         "class-validator": "0.14.2",
-        "color": "5.0.0",
+        "color": "5.0.3",
         "countries-and-timezones": "3.8.0",
         "countries-list": "3.2.0",
         "countup.js": "2.9.0",
@@ -18044,13 +18044,13 @@
       "license": "MIT"
     },
     "node_modules/color": {
-      "version": "5.0.0",
+      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/color/-/color-5.0.3.tgz",
-      "integrity": "sha512-16BlyiuyLq3MLxpRWyOTiWsO3ii/eLQLJUQXBSNcxMBBSnyt1ee9YUdaozQp03ifwm5woztEZGDbk9RGVuCsdw==",
+      "integrity": "sha512-ezmVcLR3xAVp8kYOm4GS45ZLLgIE6SPAFoduLr6hTDajwb3KZ2F46gulK3XpcwRFb5KKGCSezCBAY4Dw4HsyXA==",
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^3.0.1",
+        "color-convert": "^3.1.3",
-        "color-string": "^2.0.0"
+        "color-string": "^2.1.3"
       },
       "engines": {
         "node": ">=18"
@@ -18075,9 +18075,9 @@
       "license": "MIT"
     },
     "node_modules/color-string": {
-      "version": "2.0.1",
+      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.4.tgz",
-      "integrity": "sha512-5z9FbYTZPAo8iKsNEqRNv+OlpBbDcoE+SY9GjLfDUHEfcNNV7tS9eSAlFHEaub/r5tBL9LtskAeq1l9SaoZ5tQ==",
+      "integrity": "sha512-Bb6Cq8oq0IjDOe8wJmi4JeNn763Xs9cfrBcaylK1tPypWzyoy2G3l90v9k64kjphl/ZJjPIShFztenRomi8WTg==",
       "license": "MIT",
       "dependencies": {
         "color-name": "^2.0.0"
@@ -18087,18 +18087,18 @@
       }
     },
     "node_modules/color-string/node_modules/color-name": {
-      "version": "2.0.0",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.1.0.tgz",
-      "integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==",
+      "integrity": "sha512-1bPaDNFm0axzE4MEAzKPuqKWeRaT43U/hyxKPBdqTfmPF+d6n7FSoTFxLVULUJOmiLp01KjhIPPH+HrXZJN4Rg==",
       "license": "MIT",
       "engines": {
         "node": ">=12.20"
       }
     },
     "node_modules/color/node_modules/color-convert": {
-      "version": "3.1.0",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.3.tgz",
-      "integrity": "sha512-TVoqAq8ZDIpK5lsQY874DDnu65CSsc9vzq0wLpNQ6UMBq81GSZocVazPiBbYGzngzBOIRahpkTzCLVe2at4MfA==",
+      "integrity": "sha512-fasDH2ont2GqF5HpyO4w0+BcewlhHEZOFn9c1ckZdHpJ56Qb7MHhH/IcJZbBGgvdtwdwNbLvxiBEdg336iA9Sg==",
       "license": "MIT",
       "dependencies": {
         "color-name": "^2.0.0"
@@ -18108,9 +18108,9 @@
       }
     },
     "node_modules/color/node_modules/color-name": {
-      "version": "2.0.0",
+      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.1.0.tgz",
-      "integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==",
+      "integrity": "sha512-1bPaDNFm0axzE4MEAzKPuqKWeRaT43U/hyxKPBdqTfmPF+d6n7FSoTFxLVULUJOmiLp01KjhIPPH+HrXZJN4Rg==",
       "license": "MIT",
       "engines": {
         "node": ">=12.20"

package.json

@@ -101,7 +101,7 @@
     "cheerio": "1.0.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.2",
-    "color": "5.0.0",
+    "color": "5.0.3",
     "countries-and-timezones": "3.8.0",
     "countries-list": "3.2.0",
     "countup.js": "2.9.0",