Merge remote-tracking branch 'upstream/main' into feat/aas-reg-auth

basyx.aasenvironment/Readme.md

@@ -47,5 +47,11 @@ AAS environments (e.g. XML, JSON, AASX) can be uploaded by a multipart/form-data
 
 The upload follows the same rules as the preconfiguration in terms of handling existing AAS, submodels and concept descriptions. In order for the file to be recognized correctly, please make sure that its MIME type is properly configured.
 
+**Note** 
+If the AAS Environment file (XML, JSON, or AASX) size exceeds the below mentioned default limit, it is important to set the below two properties in the application.properties based on the size of the file to be uploaded:
+
+	spring.servlet.multipart.max-file-size (default 1 MB)
+	spring.servlet.multipart.max-request-size (default 10 MB)
+
 ## AAS Environment Features
 * [AAS Environment Authorization](basyx.aasenvironment-feature-authorization)

basyx.aasenvironment/basyx.aasenvironment.component/src/main/resources/application.properties

@@ -44,4 +44,18 @@ basyx.backend = InMemory
 ####################################################################################
 # This feature is enabled by default
 
-#basyx.submodelrepository.feature.operation.delegation.enabled = false
+#basyx.submodelrepository.feature.operation.delegation.enabled = false
+
+####################################################################################
+# Max File Size
+####################################################################################
+# To define the maximum size of file to be uploaded in a request (default 1 MB)
+
+# spring.servlet.multipart.max-file-size=128KB
+
+####################################################################################
+# Max Request Size
+####################################################################################
+# To define the total request size for a multipart/form-data (default 10 MB)
+
+# spring.servlet.multipart.max-request-size=128KB

examples/docker-compose.yml

@@ -80,17 +80,17 @@ services:
         condition: service_healthy
 
   aas-web-ui_v2:
-    image: eclipsebasyx/aas-gui:v2-240227
+    image: eclipsebasyx/aas-gui:v2-240327
     container_name: aas-web-ui_v2
     ports:
       - "3000:3000"
     environment:
-      VITE_AAS_REGISTRY_PATH: "http://localhost:8082"
-      VITE_SUBMODEL_REGISTRY_PATH: "http://localhost:8083"
-      VITE_AAS_DISCOVERY_PATH: "http://localhost:8084"
-      VITE_AAS_REPO_PATH: "http://localhost:8081/shells"
-      VITE_SUBMODEL_REPO_PATH: "http://localhost:8081/submodels"
-      VITE_CD_REPO_PATH: "http://localhost:8081/concept-descriptions"
+      AAS_REGISTRY_PATH: "http://localhost:8082"
+      SUBMODEL_REGISTRY_PATH: "http://localhost:8083"
+      AAS_DISCOVERY_PATH: "http://localhost:8084"
+      AAS_REPO_PATH: "http://localhost:8081/shells"
+      SUBMODEL_REPO_PATH: "http://localhost:8081/submodels"
+      CD_REPO_PATH: "http://localhost:8081/concept-descriptions"
     restart: always
     depends_on:
       aas-env: