replace uuid in the ui section as well (#1912)

replace uuid in the ui section as well

Author: sanderegg

.github/workflows/ci-testing-deploy.yml

@@ -238,7 +238,7 @@ jobs:
           sudo ./ci/github/helpers/setup_docker_compose.bash
           ./ci/github/helpers/setup_docker_experimental.bash
           ./ci/github/helpers/setup_docker_buildx.bash
-          echo ::set-env name=DOCKER_BUILDX::1
+          echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
       - name: setup python environment
         uses: actions/[email protected]
         with:

ci/github/integration-testing/sidecar.bash

@@ -8,27 +8,28 @@ DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash)
 export DOCKER_IMAGE_TAG
 
 install() {
-    bash ci/helpers/ensure_python_pip.bash
-    pushd services/sidecar; pip3 install -r requirements/ci.txt; popd;
-    pip list -v
-    make pull-version || ( (make pull-cache || true) && make build-x tag-version)
-    make info-images
+  bash ci/helpers/ensure_python_pip.bash
+  pushd services/sidecar
+  pip3 install -r requirements/ci.txt
+  popd
+  pip list -v
+  make pull-version || ( (make pull-cache || true) && make build-x tag-version)
+  make info-images
 }
 
 test() {
-    pytest --cov=simcore_service_sidecar --durations=10 --cov-append \
-        --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \
-        -v -m "not travis" services/sidecar/tests/integration
+  pytest --cov=simcore_service_sidecar --durations=10 --cov-append \
+    --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \
+    -v -m "not travis" services/sidecar/tests/integration --log-level=DEBUG
 }
 
 clean_up() {
-    docker images
-    make down
+  docker images
+  make down
 }
 
 # Check if the function exists (bash specific)
-if declare -f "$1" > /dev/null
-then
+if declare -f "$1" >/dev/null; then
   # call arguments verbatim
   "$@"
 else

ci/github/integration-testing/simcore-sdk.bash

@@ -7,29 +7,30 @@ DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash)
 export DOCKER_IMAGE_TAG
 
 install() {
-    bash ci/helpers/ensure_python_pip.bash
-    pushd packages/simcore-sdk; pip3 install -r requirements/ci.txt; popd;
-    pip list -v
-    # pull the test images if registry is set up, else build the images
-    make pull-version || ( (make pull-cache || true) && make build-x tag-version)
-    make info-images
-    # pip3 install services/storage/client-sdk/python
+  bash ci/helpers/ensure_python_pip.bash
+  pushd packages/simcore-sdk
+  pip3 install -r requirements/ci.txt
+  popd
+  pip list -v
+  # pull the test images if registry is set up, else build the images
+  make pull-version || ( (make pull-cache || true) && make build-x tag-version)
+  make info-images
+  # pip3 install services/storage/client-sdk/python
 }
 
 test() {
-    pytest --cov=simcore_sdk --durations=10 --cov-append \
-      --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \
-      -v -m "not travis" packages/simcore-sdk/tests/integration
+  pytest --cov=simcore_sdk --durations=10 --cov-append \
+    --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \
+    -v -m "not travis" packages/simcore-sdk/tests/integration --log-level=DEBUG
 }
 
 clean_up() {
-    docker images
-    make down
+  docker images
+  make down
 }
 
 # Check if the function exists (bash specific)
-if declare -f "$1" > /dev/null
-then
+if declare -f "$1" >/dev/null; then
   # call arguments verbatim
   "$@"
 else

ci/github/system-testing/environment-setup.bash

@@ -6,22 +6,23 @@ set -euo pipefail
 IFS=$'\n\t'
 
 install() {
-    bash ci/helpers/ensure_python_pip.bash
-    pushd tests/environment-setup; pip3 install -r requirements/ci.txt; popd
-    make .env
+  bash ci/helpers/ensure_python_pip.bash
+  pushd tests/environment-setup
+  pip3 install -r requirements/ci.txt
+  popd
+  make .env
 }
 
 test() {
-    pytest --color=yes -v tests/environment-setup
+  pytest --color=yes -v tests/environment-setup --log-level=DEBUG
 }
 
 clean_up() {
-    ls -la tests/environment-setup
+  ls -la tests/environment-setup
 }
 
 # Check if the function exists (bash specific)
-if declare -f "$1" > /dev/null
-then
+if declare -f "$1" >/dev/null; then
   # call arguments verbatim
   "$@"
 else

ci/github/system-testing/swarm-deploy.bash

@@ -14,27 +14,28 @@ DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash)
 export DOCKER_IMAGE_TAG
 
 install() {
-    bash ci/helpers/ensure_python_pip.bash
-    pushd tests/swarm-deploy; pip3 install -r requirements/ci.txt; popd
-    make pull-version || ( (make pull-cache || true) && make build-x tag-version)
-    make .env
-    pip list -v
-    make info-images
+  bash ci/helpers/ensure_python_pip.bash
+  pushd tests/swarm-deploy
+  pip3 install -r requirements/ci.txt
+  popd
+  make pull-version || ( (make pull-cache || true) && make build-x tag-version)
+  make .env
+  pip list -v
+  make info-images
 }
 
 test() {
-    pytest  --color=yes --cov-report=term-missing -v tests/swarm-deploy
+  pytest --color=yes --cov-report=term-missing -v tests/swarm-deploy --log-level=DEBUG
 }
 
 clean_up() {
-    docker images
-    make down
-    make leave
+  docker images
+  make down
+  make leave
 }
 
 # Check if the function exists (bash specific)
-if declare -f "$1" > /dev/null
-then
+if declare -f "$1" >/dev/null; then
   # call arguments verbatim
   "$@"
 else

services/web/server/src/simcore_service_webserver/projects/projects_utils.py

@@ -56,6 +56,10 @@ def _replace_uuids(node):
         return node
 
     project_copy["workbench"] = _replace_uuids(project_copy.get("workbench", {}))
+    if "ui" in project_copy:
+        project_copy["ui"]["workbench"] = _replace_uuids(
+            project_copy["ui"].get("workbench", {})
+        )
     return project_copy, nodes_map
 
 

services/web/server/tests/unit/with_dbs/fast/test_access_to_studies.py

@@ -190,6 +190,7 @@ def _assert_same_projects(got: Dict, expected: Dict):
             "uuid",
             "workbench",
             "accessRights",
+            "ui",
         ]
     )
     for key in expected.keys():

services/web/server/tests/unit/with_dbs/slow/test_projects.py

@@ -437,6 +437,7 @@ async def _new_project(
             "lastChangeDate",
             "accessRights",
             "workbench" if from_template else None,
+            "ui" if from_template else None,
         ]
 
         for key in new_project.keys():