ENH: build fdo-manager-webui

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "fdo-aas-adapter/fdo-aas-adapter"]
 	path = fdo-aas-adapter/fdo-aas-adapter
 	url = git@gitlab.indiscale.com:fdo/fdo-aas-adapter/fdo-aas-adapter.git
+[submodule "fdo-manager/fdo-manager-webui"]
+	path = fdo-manager/fdo-manager-webui
+	url = git@gitlab.indiscale.com:fdo/fdo-manager-webui.git

Makefile

@@ -21,9 +21,13 @@ start: start_handle_system start_cordra start_linkahead start_fdo_manager start_
 start_mock_manager:
 	FDO_MANAGER_MOCK=true $(MAKE) -C fdo-manager start
 
-stop: stop_fdo_manager stop_cordra stop_linkahead stop_handle_system stop_aas_adapter
+stop: stop_aas_adapter stop_fdo_manager stop_cordra stop_linkahead stop_handle_system
 
-clean: clean_fdo_manager clean_cordra clean_linkahead clean_handle_system
+clean: clean_aas_adapter clean_fdo_manager clean_cordra clean_linkahead clean_handle_system
+
+.PHONY: clean_aas_adapter
+clean_aas_adapter:
+	$(MAKE) -C fdo-aas-adapter clean || true
 
 .PHONY: clean_handle_system
 clean_handle_system:

fdo-aas-adapter/.env

 AAS_HTTP_PORT=9080
+API_CLIENT_URL="https://gitlab.indiscale.com/fdo/fdo-manager-service/-/raw/f-data-url/api/src/main/resources/api.yaml"
+FDO_MANAGER_API_BASE_URL="http://172.27.0.1:8081/api/v1"
+AAS_SERVER_EXTERNAL_URL="http://172.27.0.1:${AAS_HTTP_PORT}"

fdo-aas-adapter/Dockerfile

@@ -11,8 +11,10 @@ ENV API_CLIENT_URL=${API_CLIENT_URL}
 
 ADD https://gitlab.indiscale.com/fdo/fdo-manager-e2e-tests/-/raw/main/install_python_client.sh?ref_type=heads&inline=false /opt/fdo-aas-adapter/install_python_client.sh
 RUN chmod +x ./install_python_client.sh
+RUN echo $API_CLIENT_URL
 RUN ./install_python_client.sh
 
+RUN pip install werkzeug
 RUN pip install .
 
-CMD ["python", "./example.py"]
+CMD ["python", "example.py"]

fdo-aas-adapter/Makefile

-
 start:
 	@echo "Start FDO AAS Adapter"
 	docker compose up --detach
-	#docker network connect _network local-fdo-testbed-linkahead-1
 
 stop:
 	@echo "Stop FDO AAS Adapter"
 	docker compose down
+
+clean: stop
+	@echo "Clean FDO AAS Adapter"
+	docker compose down -v --rmi local
+	docker compose rm -vsf

fdo-aas-adapter/docker-compose.yml

@@ -4,6 +4,8 @@ services:
   aas-adapter:
     build:
       context: .
+      args:
+        API_CLIENT_URL: "${API_CLIENT_URL}"
     env_file: .env
     ports:
-      - "${AAS_HTTP_PORT}:8080"
+      - "${AAS_HTTP_PORT}:8084"

fdo-aas-adapter @ 0da15b23

-Subproject commit 549f5dc7a893d81ce95f34d63332db904861e28a
+Subproject commit 0da15b23434e8ba686e6fdb67767e1e8da3df4e2

fdo-manager/docker-compose.yml

@@ -25,12 +25,13 @@ services:
         target: /root/.handle
   webui:
     #image: "gitlab.indiscale.com:5050/fdo/fdo-manager-webui/fdo-manager-webui:latest"
-    image: fdo-manager-webui:latest
+    build:
+      context: fdo-manager-webui
+      args:
+        - NEXT_PUBLIC_API_URL=http://localhost:${FDO_MANAGER_SERVICE_HTTP_PORT}/api/v1
+        - NEXT_PUBLIC_HANDLE_SYSTEM_BASE_URI=http://172.27.0.2:8000
     ports:
       - 3000:3000
-    environment:
-      - NEXT_PUBLIC_API_URL=http://localhost:${FDO_MANAGER_SERVICE_HTTP_PORT}/api/v1
-      - NEXT_PUBLIC_HDL_URL=http://172.27.0.2:${FDO_MANAGER_SERVICE_HTTP_PORT}
       #volumes:
       #- type: bind
       #source: "/data/fdomanager/webui/static"

fdo-manager-service @ a6140a05

-Subproject commit 2e922fb24424797bd97ca7fca0fb940773fcf9e4
+Subproject commit a6140a05b73559a7d7ecaa1ca935ba44a796b636

fdo-manager-webui @ 35954de5

+Subproject commit 35954de5033b8c1e62fcbf282deb73679f2e98bb

test-handle-system @ dc745405

-Subproject commit 3e6a5412765abfbc35fbaadd2b0670fb0cef9b9c
+Subproject commit dc74540573fee4ae5bdc99366cd71463d1ebccaa