diff --git a/README.md b/README.md index e14553b..5792dc6 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,12 @@ docker-compose down -v The option '-v' also removes the volumes created, so all data is lost with this option. +### Known issue with Docker Compose + +Using the current configuration with Keycloak and OpenResty (lua-resty-session) sometimes gives an error "**state from argument does not match state restored from session**". +This mostly happens after using logout or the session is expired. The login page is shown, but after login this error is shown. +Just open the url [http://localhost/](http://localhost/) again and OpenSCD is shown again also being logged in. + ## Keycloak Demo Configuration For demo purposes, a [demo Keycloak configuration](compas/keycloak/keycloak_compas_realm.json) is created which can be imported when running a Keycloak instance. diff --git a/compas/docker-compose.yml b/compas/docker-compose.yml index 497292e..874da15 100644 --- a/compas/docker-compose.yml +++ b/compas/docker-compose.yml @@ -39,7 +39,7 @@ services: scl-data-service: labels: compas: true - image: "lfenergy/compas-scl-data-service:0.8.2" + image: "lfenergy/compas-scl-data-service:0.8.3" environment: - BASEX_HOST=basex - BASEX_PORT=1984 @@ -63,7 +63,7 @@ services: cim-mapping: labels: compas: true - image: "lfenergy/compas-cim-mapping:0.7.4" + image: "lfenergy/compas-cim-mapping:0.7.6" environment: - JWT_VERIFY_KEY=http://keycloak:8080/auth/realms/compas/protocol/openid-connect/certs - JWT_VERIFY_ISSUER=http://${COMPAS_HOSTNAME}/auth/realms/compas @@ -81,7 +81,7 @@ services: open-scd: labels: compas: true - image: "lfenergy/compas-open-scd:v0.7.1-compas-1" + image: "lfenergy/compas-open-scd:v0.7.1-compas-3" healthcheck: test: ["CMD", "curl", "-f", "http://localhost/"] interval: 30s diff --git a/integration-testing/TestSuite002-versions-compas.robot b/integration-testing/TestSuite002-versions-compas.robot index 9a7e549..1a4f22a 100644 --- a/integration-testing/TestSuite002-versions-compas.robot +++ b/integration-testing/TestSuite002-versions-compas.robot @@ -159,8 +159,8 @@ TestCase002-30 # Next select the first version from the list and compare this to the current open edited version. Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox Click ${compas-versions-editor-selector} mwc-fab[label="Compare version (current)"] > button - Get Text ${dialog-selector} \#wizard-content > mwc-list > mwc-list-item:nth-child(5) >> text=Substation - Click ${dialog-selector} mwc-button[slot="primaryAction"] > button + Get Text ${dialog-selector} \#wizard-content > mwc-list > mwc-list-item:nth-child(3) >> text=Substation + Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button Wait for dialog is closed TestCase002-31 @@ -195,11 +195,10 @@ TestCase002-32 Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(2) mwc-checkbox Click ${compas-versions-editor-selector} mwc-fab[label="Compare versions"] > button - Get Text ${dialog-selector} \#wizard-content > mwc-list > mwc-list-item:nth-child(4) >> text=Substation - Click ${dialog-selector} mwc-button[slot="primaryAction"] > button + Get Text ${dialog-selector} \#wizard-content > mwc-list:nth-child(1) > mwc-list-item:nth-child(3) >> text=Substation + Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button Wait for dialog is closed - TestCase002-33 [Documentation] Compare versions from CoMPAS not selecting correct number of versions Initialize Versions True diff --git a/integration-testing/TestSuite003-cim-mapping.robot b/integration-testing/TestSuite003-cim-mapping.robot index c5ecf0b..e1b9fcb 100644 --- a/integration-testing/TestSuite003-cim-mapping.robot +++ b/integration-testing/TestSuite003-cim-mapping.robot @@ -14,7 +14,7 @@ Open Project from CIM [Arguments] ${name} ${scltype} ${promise}= Promise To Upload File ${CURDIR}/test-files/${name}.xml Open Menu Project from CIM - ${upload_result}= Wait For ${promise} + ${upload_result}= Wait For ${promise} Sleep 0.5s Wait until loading file starts. Check Title Filename ${name} ${scltype} Close Menu