Merge branch 'add-ids' into update-docker-image-20sept

Author: Dennis Labordus

integration-testing/include/general-compas.robot

@@ -20,19 +20,19 @@ Open from CoMPAS
 Add to CoMPAS
     [Arguments]                 ${initialValue}   ${name}   ${type}   ${expectedVersion}
     # Make sure the initial value is entered. so we can continue.
-    Get Text                    ${dialog-selector} compas-save mwc-textfield#name input   ==   ${initialValue}
-    Fill Text                   ${dialog-selector} compas-save mwc-textfield#name input   ${name}-${current-date}
-    Click                       ${dialog-selector} compas-save compas-scltype-radiogroup mwc-list > mwc-radio-list-item[value="${type.upper()}"]
-    Click                       ${dialog-selector} mwc-button[slot="primaryAction"] > button
+    Get Text                    mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input   ==   ${initialValue}
+    Fill Text                   mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input   ${name}-${current-date}
+    Click                       mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select > mwc-list-item[value="${type.upper()}"]
+    Click                       mwc-dialog#compas-save-dlg mwc-button[slot="primaryAction"] > button
     Wait for dialog is closed
     Close Menu
     # check if the title (filename) changed to the new expected one.
     Check Title Filename        ${name}-${current-date}-${expectedVersion}    ${type}
 
 Update in CoMPAS
     [Arguments]                 ${changeType}   ${name}   ${type}   ${expectedVersion}
-    Click                       ${dialog-selector} compas-save compas-changeset-radiogroup mwc-list > mwc-radio-list-item[value="${changeType.upper()}"]
-    Click                       ${dialog-selector} mwc-button[slot="primaryAction"] > button
+    Click                       mwc-dialog#compas-save-dlg > compas-save compas-changeset-radiogroup mwc-list > mwc-radio-list-item[value="${changeType.upper()}"]
+    Click                       mwc-dialog#compas-save-dlg mwc-button[slot="primaryAction"] > button
     Wait for dialog is closed
     Close Menu
     # check if the title (filename) changed to the new expected one.

integration-testing/include/general-openscd.robot

@@ -84,7 +84,7 @@ Open local file
 Save to local file
     [Arguments]         ${name}     ${type}
     ${dl_promise}=      Promise To Wait For Download    ${OUTPUT DIR}/saved-files/${name}-${current-date}.${type.lower()}
-    Click               ${dialog-selector} compas-save mwc-button[label="Save to file..."] button
+    Click               mwc-dialog compas-save mwc-button[label="Save to file..."] button
     ${file_obj}=        Wait For  ${dl_promise}
     File Should Exist   ${file_obj}[saveAs]
     Wait for dialog is closed