Merge remote-tracking branch 'origin'

Author: aaronzi

.github/workflows/docker-prerelease-ui.yml

@@ -38,15 +38,15 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
         with:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
@@ -55,7 +55,7 @@ jobs:
         run: echo "SHORT_SHA=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
 
       - name: Build and Push Docker Image (Pre-release)
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: ./aas-web-ui
           file: ./aas-web-ui/Dockerfile
@@ -78,7 +78,7 @@ jobs:
           syft ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} -o json > ${{ env.SBOM_FILE }}
 
       - name: Upload SBOM
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: sbom
           path: ${{ env.SBOM_FILE }}

.github/workflows/docker-release-ui.yml

@@ -36,16 +36,16 @@ jobs:
 
       # Step 2: Set up Docker Buildx
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
         with:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       # Step 3: Log in to Docker Hub
       - name: Log in to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
@@ -60,7 +60,7 @@ jobs:
 
       # Step 5: Build and Push Docker Images
       - name: Build and Push Docker Images
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: ./aas-web-ui
           file: ./aas-web-ui/Dockerfile
@@ -85,7 +85,7 @@ jobs:
 
       # Step 10: Upload SBOM as an Artifact
       - name: Upload SBOM
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: sbom
           path: ${{ env.SBOM_FILE }}

README.md

@@ -70,6 +70,7 @@ The [`examples/`](./examples/) directory contains ready-to-use configurations:
 - **[MultiInfrastructure](./examples/MultiInfrastructure/)** - Connect to multiple BaSyx environments with different authentication methods
 - **[TimeSeriesData](./examples/TimeSeriesData/)** - Real-time time-series data visualization with InfluxDB
 - **[PcfCalculation](./examples/PcfCalculation/)** - Product Carbon Footprint calculation example
+- **[CombinedExample](./examples/CombinedExample/)** - Combined example showcasing multiple features in one setup
 
 ## 🤝 Contributing
 

aas-web-ui/package.json

@@ -18,17 +18,20 @@
     "postinstall": "node ./scripts/postinstall.mjs"
   },
   "dependencies": {
+    "@aas-core-works/aas-core3.1-typescript": "^1.0.0",
     "@mdi/font": "^7.4.47",
     "@thatopen/components": "^3.3.2",
-    "@thatopen/components-front": "^3.3.1",
-    "@thatopen/fragments": "^3.3.4",
+    "@thatopen/components-front": "^3.3.3",
+    "@thatopen/fragments": "^3.3.6",
     "@thatopen/ui": "^3.3.3",
     "@thatopen/ui-obc": "^3.3.3",
     "@vue-flow/background": "^1.3.2",
     "@vue-flow/controls": "^1.1.3",
     "@vue-flow/core": "^1.48.2",
     "@vue-leaflet/vue-leaflet": "^0.10.1",
-    "apexcharts": "^5.6.0",
+    "aasx-package-ts": "^0.1.4",
+    "apexcharts": "^5.10.1",
+    "basyx-typescript-sdk": "^2.1.2",
     "i18n-iso-countries": "^7.14.0",
     "iso-639-1": "^3.1.5",
     "js-yaml": "^4.1.1",
@@ -38,26 +41,25 @@
     "pinia": "^3.0.4",
     "prismjs": "^1.30.0",
     "qrcode": "^1.5.4",
-    "three": "^0.182.0",
+    "three": "^0.183.2",
     "uuid": "^13.0.0",
-    "vue": "^3.5.28",
-    "vue-router": "^5.0.2",
-    "vue3-apexcharts": "^1.10.0",
-    "vuetify": "^3.11.8",
-    "web-ifc": "^0.0.75",
+    "vue": "^3.5.30",
+    "vue-router": "^5.0.3",
+    "vue3-apexcharts": "^1.11.1",
+    "vuetify": "^3.12.0",
+    "web-ifc": "^0.0.77",
     "webfontloader": "^1.0.0"
   },
   "devDependencies": {
-    "@aas-core-works/aas-core3.0-typescript": "^1.0.5",
     "@eslint/js": "^10.0.1",
     "@testing-library/vue": "^8.1.0",
     "@types/js-yaml": "^4.0.9",
     "@types/leaflet": "^1.9.21",
     "@types/md5": "^2.3.6",
-    "@types/node": "^25.2.3",
+    "@types/node": "^25.4.0",
     "@types/prismjs": "^1.26.6",
     "@types/qrcode": "^1.5.6",
-    "@types/three": "^0.182.0",
+    "@types/three": "^0.183.1",
     "@types/uuid": "^11.0.0",
     "@types/webfontloader": "^1.6.38",
     "@vitejs/plugin-vue": "^6.0.4",
@@ -73,15 +75,15 @@
     "eslint-plugin-vue": "^10.8.0",
     "jsdom": "^28.1.0",
     "prettier": "^3.8.1",
-    "sass": "^1.97.3",
+    "sass": "^1.98.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.56.0",
+    "typescript-eslint": "^8.57.0",
     "unplugin-auto-import": "^21.0.0",
     "unplugin-vue-components": "^31.0.0",
     "vite": "^7.3.1",
     "vite-plugin-vuetify": "^2.1.3",
     "vitest": "^4.0.18",
     "vue-eslint-parser": "^10.4.0",
-    "vue-tsc": "^3.2.4"
+    "vue-tsc": "^3.2.5"
   }
 }

aas-web-ui/public/wasm/web-ifc-mt.wasm

@@ -17,6 +17,7 @@ declare module 'vue' {
     AASToInstance: typeof import('./components/AppNavigation/AASToInstance.vue')['default']
     AdministrativeInformationElement: typeof import('./components/UIComponents/AdministrativeInformationElement.vue')['default']
     AnnotatedRelationshipElement: typeof import('./components/SubmodelElements/AnnotatedRelationshipElement.vue')['default']
+    AnnotatedRelationshipElementForm: typeof import('./components/EditorComponents/SubmodelElements/AnnotatedRelationshipElementForm.vue')['default']
     AppNavigation: typeof import('./components/AppNavigation/AppNavigation.vue')['default']
     AreaChart: typeof import('./components/Widgets/AreaChart.vue')['default']
     AssetIdInput: typeof import('./components/EditorComponents/InputTypes/AssetIdInput.vue')['default']
@@ -48,6 +49,7 @@ declare module 'vue' {
     DisplayNameElement: typeof import('./components/UIComponents/DisplayNameElement.vue')['default']
     DocumentIdsTable: typeof import('./components/Plugins/Submodels/HandoverDocumentation_v2_0/components/DocumentIdsTable.vue')['default']
     DownloadAAS: typeof import('./components/AppNavigation/DownloadAAS.vue')['default']
+    EmbeddedDataSpecificationInput: typeof import('./components/EditorComponents/InputTypes/EmbeddedDataSpecificationInput.vue')['default']
     Entity: typeof import('./components/SubmodelElements/Entity.vue')['default']
     EntityForm: typeof import('./components/EditorComponents/SubmodelElements/EntityForm.vue')['default']
     File: typeof import('./components/SubmodelElements/File.vue')['default']
@@ -101,6 +103,7 @@ declare module 'vue' {
     Property: typeof import('./components/SubmodelElements/Property.vue')['default']
     PropertyForm: typeof import('./components/EditorComponents/SubmodelElements/PropertyForm.vue')['default']
     QualifierElement: typeof import('./components/UIComponents/QualifierElement.vue')['default']
+    QualifierInput: typeof import('./components/EditorComponents/InputTypes/QualifierInput.vue')['default']
     Range: typeof import('./components/SubmodelElements/Range.vue')['default']
     RangeForm: typeof import('./components/EditorComponents/SubmodelElements/RangeForm.vue')['default']
     RangeInput: typeof import('./components/EditorComponents/InputTypes/RangeInput.vue')['default']

aas-web-ui/public/wasm/web-ifc-node.wasm

@@ -33,8 +33,8 @@
 </template>
 
 <script lang="ts" setup>
-    import { jsonization } from '@aas-core-works/aas-core3.0-typescript';
-    import { types as aasTypes } from '@aas-core-works/aas-core3.0-typescript';
+    import { jsonization } from '@aas-core-works/aas-core3.1-typescript';
+    import { types as aasTypes } from '@aas-core-works/aas-core3.1-typescript';
     import { onMounted, ref, watch } from 'vue';
     import { useAASHandling } from '@/composables/AAS/AASHandling';
     import { useSMHandling } from '@/composables/AAS/SMHandling';