Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha

.github/workflows/deploy.yml

@@ -13,7 +13,7 @@ permissions:
 jobs:
   detect-changes:
     name: Detect changed services
-    runs-on: self-hosted
+    runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', github.ref_name)) }}
     outputs:
       matrix: ${{ steps.filter.outputs.matrix }}
     steps:
@@ -52,7 +52,7 @@ jobs:
 
           NON_DEPLOYABLE_PATTERN="^docs/|^README[.]md$|^DEPLOYMENT[.]md$|^CLAUDE[.]md$|^checkpoint[.]md$|^orgstructure[.]md$|^ITMLS_DB_Design[.]md$|.*[.]md$|^[.]eslintrc|^[.]prettierrc|^[.]editorconfig|^[.]gitignore|^[.]gitattributes|^commitlint[.]config[.]js$"
 
-          GLOBAL_PATTERN="^[.]github/|^docker-compose[.]yaml$|^turbo[.]json$|^tsconfig[.]json$|^tsconfig[.]base[.]json$|^pnpm-workspace[.]yaml$|^pnpm-lock[.]yaml$|^package[.]json$|^[.]env([.][a-z]+)?$|^packages/|^infrastructure/|^scripts/deploy/|^wagon[.][^/]*[.]ts$|^cargo[.][^/]*[.]ts$|^container[.][^/]*[.]ts$|^use-[^/]*[.]ts$|^[^/]*[.]service[.]ts$|^[^/]*[.]entity[.]ts$|^[^/]*-types[.]ts$"
+          GLOBAL_PATTERN="^[.]github/|^docker-compose[.]yaml$|^turbo[.]json$|^tsconfig[.]json$|^tsconfig[.]base[.]json$|^pnpm-workspace[.]yaml$|^pnpm-lock[.]yaml$|^package[.]json$|^[.]env([.][a-z]+)?$|^packages/|^local-packages/|^infrastructure/|^scripts/deploy/|^wagon[.][^/]*[.]ts$|^cargo[.][^/]*[.]ts$|^container[.][^/]*[.]ts$|^use-[^/]*[.]ts$|^[^/]*[.]service[.]ts$|^[^/]*[.]entity[.]ts$|^[^/]*-types[.]ts$"
           
           DEPLOYABLE=$(echo "$CHANGED" | grep -vE "$NON_DEPLOYABLE_PATTERN" || true)
           if [ -z "$DEPLOYABLE" ]; then
@@ -91,7 +91,7 @@ jobs:
     name: Deploy ${{ matrix.service }}
     needs: detect-changes
     if: ${{ needs.detect-changes.outputs.matrix != '[]' }}
-    runs-on: self-hosted
+    runs-on: ${{ fromJson(format('["self-hosted", "{0}"]', github.ref_name)) }}
     strategy:
       fail-fast: false
       matrix:

apps/edr-freight-api/package.json

@@ -35,8 +35,8 @@
     "@nestjs/schedule": "^6.1.3",
     "@nestjs/swagger": "^11.4.2",
     "@nestjs/typeorm": "^11.0.1",
-    "@tria-plc/api-common": "^1.4.3",
-    "@tria-plc/iamapi-common": "^0.6.6",
+    "@tria-plc/api-common": "file:../../local-packages/tria-plc-api-common-1.4.3.tgz",
+    "@tria-plc/iamapi-common": "file:../../local-packages/tria-plc-iamapi-common-0.7.3.tgz",
     "amqp-connection-manager": "^5.0.0",
     "amqplib": "^2.0.1",
     "axios": "^1.16.1",
@@ -50,7 +50,6 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.30"
-
   },
   "devDependencies": {
     "@edr/api-common": "workspace:*",

apps/edr-freight-web/backoffice/package.json

@@ -22,7 +22,7 @@
     "@mantine/hooks": "^9.3.0",
     "@tabler/icons-react": "^3.44.0",
     "@tanstack/react-query": "^5.100.11",
-    "@tria-plc/iamui-common": "1.1.2",
+    "@tria-plc/iamui-common": "file:../../../local-packages/tria-plc-iamui-0.0.3.tgz",
     "axios": "^1.7.7",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",

apps/edr-freight-web/portal/package.json

@@ -18,7 +18,7 @@
     "@mantine/core": "^9.3.0",
     "@mantine/hooks": "^9.3.0",
     "@tanstack/react-query": "^5.59.0",
-    "@tria-plc/iamui-common": "1.1.2",
+    "@tria-plc/iamui-common": "file:../../../local-packages/tria-plc-iamui-0.0.3.tgz",
     "axios": "^1.7.7",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",

apps/edr-freight-web/portal/src/services/api.ts

@@ -2,11 +2,9 @@ import type { Freight, PaginatedResponse } from "@edr/types";
 import { endpoint } from "@/utils/endpoint";
 import type {
   CreateFileUploadFieldDto,
-  CreateFileUploadSettingDto,
   FileUploadField,
   FileUploadSetting,
   UpdateFileUploadFieldDto,
-  UpdateFileUploadSettingDto,
 } from "@/types/fileUploadSettings";
 import {
   bookingsService,
@@ -236,8 +234,11 @@ export const api = {
     getAvailableDays: endpoint<
       { originYardId?: string; destinationYardId?: string },
       string[]
-    >("train-scheduling", "availableDays", ({ originYardId, destinationYardId }) =>
-      bookingsService.getAvailableDays({ originYardId, destinationYardId }),
+    >(
+      "train-scheduling",
+      "availableDays",
+      ({ originYardId, destinationYardId }) =>
+        bookingsService.getAvailableDays({ originYardId, destinationYardId }),
     ),
   },