From b77d247d0df5466fb6563c514959fda7047e81a1 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 10 Mar 2022 11:41:25 -0700
Subject: [PATCH 01/81] SHIBUI-2262

Unofficial SQLServer build for Citrus


Former-commit-id: 0b6243a2d7c3a51466588049c5d63c8d001b5f3c
---
 testbed/sqlServer/shibui-1.11.0-sqlserver.war.REMOVED.git-id | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 testbed/sqlServer/shibui-1.11.0-sqlserver.war.REMOVED.git-id

diff --git a/testbed/sqlServer/shibui-1.11.0-sqlserver.war.REMOVED.git-id b/testbed/sqlServer/shibui-1.11.0-sqlserver.war.REMOVED.git-id
new file mode 100644
index 000000000..ca6c5f636
--- /dev/null
+++ b/testbed/sqlServer/shibui-1.11.0-sqlserver.war.REMOVED.git-id
@@ -0,0 +1 @@
+0f086a9d7e6e173ebdd799f033855d57f44d469b
\ No newline at end of file

From 2b4c55f7f0790bbec860533c574162ce51387f9e Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 9 Jun 2022 13:46:08 -0700
Subject: [PATCH 02/81] SHIBUI-2262 Merge develop to branch with test fix

Former-commit-id: 74d0562dd6569cfbe1f740933f85e05be0498d52
---
 .../envers/MetadataResolverEnversVersioningTests.groovy   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy
index 85e854d3d..6d976a033 100644
--- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy
+++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataResolverEnversVersioningTests.groovy
@@ -268,7 +268,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
         when:
         ResourceBackedMetadataResolver resolver = new ResourceBackedMetadataResolver(name: 'rbmr').with {
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes(taskTimerRef: 'taskTimerRef')
-            it.classpathMetadataResource = new ClasspathMetadataResource(setFileResource: 'metadata.xml')
+            it.classpathMetadataResource = new ClasspathMetadataResource(fileResource: 'metadata.xml')
             it
         }
 
@@ -282,7 +282,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
         resolverHistory.size() == 1
         getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'rbmr'
         getTargetEntityForRevisionIndex(resolverHistory, 0).reloadableMetadataResolverAttributes.taskTimerRef == 'taskTimerRef'
-        getTargetEntityForRevisionIndex(resolverHistory, 0).classpathMetadataResource.file == 'metadata.xml'
+        getTargetEntityForRevisionIndex(resolverHistory, 0).classpathMetadataResource.fileResource == 'metadata.xml'
         getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser'
         getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L
         getModifiedEntityNames(resolverHistory, 0).sort() == expectedModifiedPersistentEntities.sort()
@@ -302,7 +302,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
         resolverHistory.size() == 2
         getTargetEntityForRevisionIndex(resolverHistory, 1).name == 'rbmrUPDATED'
         getTargetEntityForRevisionIndex(resolverHistory, 1).reloadableMetadataResolverAttributes.taskTimerRef == 'taskTimerRefUPDATED'
-        getTargetEntityForRevisionIndex(resolverHistory, 1).classpathMetadataResource.file == 'metadataUPDATED.xml'
+        getTargetEntityForRevisionIndex(resolverHistory, 1).classpathMetadataResource.fileResource == 'metadataUPDATED.xml'
         getRevisionEntityForRevisionIndex(resolverHistory, 1).principalUserName == 'anonymousUser'
         getRevisionEntityForRevisionIndex(resolverHistory, 1).timestamp > 0L
         getModifiedEntityNames(resolverHistory, 1).sort() == expectedModifiedPersistentEntities.sort()
@@ -310,7 +310,7 @@ class MetadataResolverEnversVersioningTests extends Specification {
         //Check the original revision is intact
         getTargetEntityForRevisionIndex(resolverHistory, 0).name == 'rbmr'
         getTargetEntityForRevisionIndex(resolverHistory, 0).reloadableMetadataResolverAttributes.taskTimerRef == 'taskTimerRef'
-        getTargetEntityForRevisionIndex(resolverHistory, 0).classpathMetadataResource.file == 'metadata.xml'
+        getTargetEntityForRevisionIndex(resolverHistory, 0).classpathMetadataResource.fileResource == 'metadata.xml'
         getRevisionEntityForRevisionIndex(resolverHistory, 0).principalUserName == 'anonymousUser'
         getRevisionEntityForRevisionIndex(resolverHistory, 0).timestamp > 0L
     }

From 6f1a77e40b3e71132a2efd8c1a7eccdabaf4a42e Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 14 Jun 2022 10:16:02 -0700
Subject: [PATCH 03/81] SHIBUI-2273 merging shibui-2262

Former-commit-id: 3e5b37e9f6e31f4106d48faaf2f321052b5949c3
---
 backend/build.gradle | 8 ++++----
 gradle.properties    | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/backend/build.gradle b/backend/build.gradle
index 90cc83503..e2c4936e0 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -171,10 +171,10 @@ dependencies {
     runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:2.3.0'
 
     compile "com.h2database:h2"
-    runtimeOnly 'org.postgresql:postgresql:42.3.4'
-    runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.0.4'
-    runtimeOnly 'mysql:mysql-connector-java:8.0.29'
-    runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc:9.4.1.jre11'
+    runtimeOnly "org.postgresql:postgresql:${project.'postgresVersion'}"
+    runtimeOnly "org.mariadb.jdbc:mariadb-java-client:${project.'mariadbVersion'}"
+    runtimeOnly "mysql:mysql-connector-java:${project.'mysqlVersion'}"
+    runtimeOnly "com.microsoft.sqlserver:mssql-jdbc:${project.'sqlserverVersion'}"
 
     //Swagger
     compile 'io.springfox:springfox-swagger2:2.9.2'
diff --git a/gradle.properties b/gradle.properties
index f645de2d4..9fb07eccf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,12 @@ springbootVersion=2.5.12
 springSecurityVersion=5.6.3
 # springSecurityVersion=5.7.1
 
+### DB Driver Versions ###
+mariadbVersion=3.0.4
+mysqlVersion=8.0.29
+postgresVersion=42.3.4
+sqlserverVersion=9.4.1.jre11
+
 org.gradle.jvmargs=-Xmx1g -XX:-UseGCOverheadLimit
 
 # set token in personal global

From 249b85241075503ee16e266820466ef3475fb1d0 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 14 Jun 2022 15:41:48 -0700
Subject: [PATCH 04/81] SHIBUI-2273

Setup liquidbase to run for SQL SERVER


Former-commit-id: 52869ccf24f8d6966b1772c11660707d7d3b0b66
---
 .../CustomEntityAttributeDefinition.java      |  4 +--
 .../admin/ui/domain/LocalizedName.java        |  4 ++-
 .../admin/ui/domain/OrganizationURL.java      |  2 +-
 .../src/main/resources/application.properties |  3 +-
 .../main/resources/db/changelog/changelog.sql | 29 +++++++++++++++++++
 5 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 backend/src/main/resources/db/changelog/changelog.sql

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
index f1d14911a..6e7ced3e2 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
@@ -35,7 +35,7 @@ public class CustomEntityAttributeDefinition implements IRelyingPartyOverridePro
     @ElementCollection
     @CollectionTable(name = "custom_entity_attr_list_items", joinColumns = @JoinColumn(name = "name"))
     @Fetch(FetchMode.JOIN)
-    @Column(name = "value", nullable = false)
+    @Column(name = "item_value", nullable = false)
     Set<String> customAttrListDefinitions = new HashSet<>();
 
     @Column(name = "default_value", nullable = true)
@@ -114,4 +114,4 @@ public void setName(String name) {
     public void updateExamplesList() {
         examples = customAttrListDefinitions;
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java
index e0a54d494..3f7dcb48e 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/LocalizedName.java
@@ -3,6 +3,7 @@
 import org.hibernate.envers.Audited;
 
 import javax.annotation.Nullable;
+import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 
 @MappedSuperclass
@@ -11,6 +12,7 @@ public class LocalizedName extends AbstractXMLObject implements org.opensaml.sam
 
     private String xMLLang;
 
+    @Column(name = "name_value")
     private String value;
 
     @Nullable
@@ -34,4 +36,4 @@ public String getValue() {
     public void setValue(@Nullable String value) {
         this.value = value;
     }
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java
index c8e556695..625e96379 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OrganizationURL.java
@@ -14,7 +14,7 @@ public class OrganizationURL extends AbstractXMLObject implements org.opensaml.s
 
     private String xMLLang;
 
-    @Column(name="value")
+    @Column(name="uri_value")
     private String uri;
 
     @Nullable
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 0556e5b45..a0d50725f 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -37,7 +37,8 @@ spring.jackson.mapper.accept-case-insensitive-enums=true
 #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect
 
 # Liquibase properties
-spring.liquibase.enabled=false
+spring.liquibase.enabled=true
+spring.liquibase.change-log=db/changelog/changelog.sql
 
 # Hibernate properties
 # for production never ever use create, create-drop. It's BEST to use validate
diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql
new file mode 100644
index 000000000..cfdf5bc02
--- /dev/null
+++ b/backend/src/main/resources/db/changelog/changelog.sql
@@ -0,0 +1,29 @@
+-- liquibase formatted sql
+
+-- changeset liquibase:1.11.0 dbms:mariadb,mysql,postgresql
+-- preconditions onFail:MARK_RAN
+-- precondition-sql-check expectedResult:1 SELECT 1 FROM users
+-- comment: /* we don't need to run this if the system is new */
+ALTER TABLE resource_backed_metadata_resolver
+    RENAME file TO file_resource;
+GO
+ALTER TABLE organizationurl
+    RENAME 'value' TO 'uri_value';
+GO
+
+-- changeset liquibase:1.11.0 dbms:mssql
+-- preconditions onFail:MARK_RAN
+-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
+-- comment: /* we don't need to run this if the system is new */
+EXEC sp_rename 'organizationurl.value', uri_value, 'COLUMN'
+GO
+EXEC sp_rename 'custom_entity_attr_list_items.value', item_value, 'COLUMN'
+GO
+EXEC sp_rename 'organization_name.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'organization_display_name.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'service_description.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'service_name.value', name_value, 'COLUMN'
+GO
\ No newline at end of file

From ef94ba5531d30acf9343e8abcaa63b77a1960149 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 14 Jun 2022 16:45:04 -0700
Subject: [PATCH 05/81] SHIBUI-2273

Setup liquidbase to run for POSTGRES


Former-commit-id: eab4b8b4f2991b8b3d2f6f32253189894be8b6ba
---
 .../main/resources/db/changelog/changelog.sql  | 18 +++++++++++++++---
 testbed/postgres/docker-compose.yml            |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql
index cfdf5bc02..3b3c84fb3 100644
--- a/backend/src/main/resources/db/changelog/changelog.sql
+++ b/backend/src/main/resources/db/changelog/changelog.sql
@@ -2,13 +2,25 @@
 
 -- changeset liquibase:1.11.0 dbms:mariadb,mysql,postgresql
 -- preconditions onFail:MARK_RAN
--- precondition-sql-check expectedResult:1 SELECT 1 FROM users
+-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
 -- comment: /* we don't need to run this if the system is new */
 ALTER TABLE resource_backed_metadata_resolver
-    RENAME file TO file_resource;
+    RENAME "file" TO "file_resource";
 GO
 ALTER TABLE organizationurl
-    RENAME 'value' TO 'uri_value';
+    RENAME "value" TO "uri_value";
+GO
+ALTER TABLE organization_name
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE organization_display_name
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE service_description
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE service_name
+    RENAME "value" TO "name_value";
 GO
 
 -- changeset liquibase:1.11.0 dbms:mssql
diff --git a/testbed/postgres/docker-compose.yml b/testbed/postgres/docker-compose.yml
index 593ceb1fc..c66b591a8 100644
--- a/testbed/postgres/docker-compose.yml
+++ b/testbed/postgres/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     networks:
       - front
     ports:
-      - 3306:3306
+      - 5432:5432
   shibui:
     image: unicon/shibui
     ports:

From 3c2fa87bdad8d262f2639612a59a88cc37903e31 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 14 Jun 2022 17:11:32 -0700
Subject: [PATCH 06/81] SHIBUI-2273

Readme for liquibase


Former-commit-id: 9114bd601f17fe3b2131da25c9b1190a1e34e95b
---
 .../src/main/resources/db/changelog/README.txt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 backend/src/main/resources/db/changelog/README.txt

diff --git a/backend/src/main/resources/db/changelog/README.txt b/backend/src/main/resources/db/changelog/README.txt
new file mode 100644
index 000000000..2ebb5d59f
--- /dev/null
+++ b/backend/src/main/resources/db/changelog/README.txt
@@ -0,0 +1,18 @@
+Understanding the liquidbase changelog.sql file
+
+" -- liquibase formatted sql" - this is required at the top of this file "
+
+" -- changeset liquibase:1.11.0 dbms:mariadb,mysql,postgresql "
+This indicates a change set and the version - please use the release version that the change matches so that looking at the DB should
+give a good indication of what has been run.
+
+The dbms section indicates which DBs the changeset that follows is valid to be run on. If this is not present, Liquidbase will try
+to run the changeset always.
+
+" -- preconditions onFail:MARK_RAN "
+" -- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users' "
+
+@see - https://docs.liquibase.com/concepts/changelogs/preconditions.html
+The check here is looking to see if the schema has been built out yet. If it has not, then the db is new and will be created
+correctly without needing to be updated, so MARK_RAN ensures that the given changeset will not be run, but will be added to the
+liquibase changesetlog table indicating that it was checked.
\ No newline at end of file

From 310f35995c7e0fe81080de15b18289e7eee46a5f Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 14 Jun 2022 17:20:41 -0700
Subject: [PATCH 07/81] SHIBUI-2273

Removing the war file from the codebase - the war was originally given to Citrus College and added to the project as a matter of record, but we don't want it in the main branch of code


Former-commit-id: 606fc59eeba7a5a552ab724b2d9ca0243f9aaf31
---
 testbed/sqlServer/shibui-1.11.0-sqlserver.war.REMOVED.git-id | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 testbed/sqlServer/shibui-1.11.0-sqlserver.war.REMOVED.git-id

diff --git a/testbed/sqlServer/shibui-1.11.0-sqlserver.war.REMOVED.git-id b/testbed/sqlServer/shibui-1.11.0-sqlserver.war.REMOVED.git-id
deleted file mode 100644
index ca6c5f636..000000000
--- a/testbed/sqlServer/shibui-1.11.0-sqlserver.war.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-0f086a9d7e6e173ebdd799f033855d57f44d469b
\ No newline at end of file

From 9fbf07aeb96f8937a69887aee52af0e090f0364c Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 15 Jun 2022 10:05:10 -0700
Subject: [PATCH 08/81] SHIBUI-2273

Updates: added missing tables and aud tables to the sql updates, updated the springboot and hibernate versions to newer versions, updated the settings to work with the newer version of springboot which uses a different library for path pattern matching.

Former-commit-id: 9bc6b2aaff967963d3e0b566329c4b949abdf7b0
---
 .../filters/EntityAttributesFilterTarget.java |  2 +-
 .../filters/NameIdFormatFilterTarget.java     |  2 +
 .../src/main/resources/application.properties |  4 ++
 .../main/resources/db/changelog/changelog.sql | 67 +++++++++++++++++--
 gradle.properties                             |  8 +--
 5 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java
index a7959dbbf..e2ed028a0 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java
@@ -26,7 +26,7 @@ public class EntityAttributesFilterTarget extends AbstractAuditable implements I
 
     @ElementCollection (fetch = FetchType.EAGER)
     @OrderColumn
-    @Column(length = 760)
+    @Column(length = 760, name="target_value")
     private List<String> value;
 
     public EntityAttributesFilterTargetType getEntityAttributesFilterTargetType() {
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java
index 90445ff75..3a5bfe9da 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/NameIdFormatFilterTarget.java
@@ -8,6 +8,7 @@
 import org.hibernate.envers.AuditOverride;
 import org.hibernate.envers.Audited;
 
+import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.OrderColumn;
@@ -27,6 +28,7 @@ public class NameIdFormatFilterTarget extends AbstractAuditable implements IFilt
 
     @ElementCollection
     @OrderColumn
+    @Column(name="target_value")
     private List<String> value;
 
     public NameIdFormatFilterTargetType getNameIdFormatFilterTargetType() {
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index b126439d5..dd02864b0 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -9,6 +9,9 @@ logging.level.org.springframework=INFO
 logging.level.edu.internet2.tier.shibboleth.admin.ui=INFO
 
 spring.main.allow-bean-definition-overriding=true
+# "In Spring MVC, the path was previously analyzed by AntPathMatcher, but it was changed to use PathPatternParser introduced in WebFlux from Spring 5.3.0."
+# we still have the option to use ant path matcher thus keeping existing configuration from having to change
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
 
 # Database Credentials
 spring.datasource.username=shibui
@@ -109,6 +112,7 @@ shibui.roles.authenticated=ADMIN,ENABLE,USER
 #docker container
 shibui.beacon-enabled=true
 
+### Swagger/Springdoc patterns
 springdoc.use-management-port=true
 springdoc.swagger-ui.tagsSorter: alpha
 springdoc.writer-with-order-by-keys: true
diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql
index 3b3c84fb3..911f36cb9 100644
--- a/backend/src/main/resources/db/changelog/changelog.sql
+++ b/backend/src/main/resources/db/changelog/changelog.sql
@@ -4,38 +4,95 @@
 -- preconditions onFail:MARK_RAN
 -- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
 -- comment: /* we don't need to run this if the system is new */
-ALTER TABLE resource_backed_metadata_resolver
-    RENAME "file" TO "file_resource";
+ALTER TABLE custom_entity_attr_list_items
+    RENAME "value" TO "item_value";
+GO
+ALTER TABLE custom_entity_attr_list_items_aud
+    RENAME "value" TO "item_value";
+GO
+ALTER TABLE entity_attributes_filter_target_value
+    RENAME "value" TO "target_value";
+GO
+ALTER TABLE entity_attributes_filter_target_value_aud
+    RENAME "value" TO "target_value";
+GO
+ALTER TABLE name_id_format_filter_target_value
+    RENAME "value" TO "target_value";
+GO
+ALTER TABLE name_id_format_filter_target_value_aud
+    RENAME "value" TO "target_value";
 GO
 ALTER TABLE organizationurl
     RENAME "value" TO "uri_value";
 GO
+ALTER TABLE organizationurl_aud
+    RENAME "value" TO "uri_value";
+GO
+ALTER TABLE organization_display_name
+    RENAME "value" TO "name_value";
+GO
+ALTER TABLE organization_display_name_aud
+    RENAME "value" TO "name_value";
+GO
 ALTER TABLE organization_name
     RENAME "value" TO "name_value";
 GO
-ALTER TABLE organization_display_name
+ALTER TABLE organization_name_aud
     RENAME "value" TO "name_value";
 GO
+ALTER TABLE resource_backed_metadata_resolver
+    RENAME "file" TO "file_resource";
+GO
+ALTER TABLE resource_backed_metadata_resolver_aud
+    RENAME "file" TO "file_resource";
+GO
 ALTER TABLE service_description
     RENAME "value" TO "name_value";
 GO
+ALTER TABLE service_description_aud
+    RENAME "value" TO "name_value";
+GO
 ALTER TABLE service_name
     RENAME "value" TO "name_value";
 GO
+ALTER TABLE service_name_aud
+    RENAME "value" TO "name_value";
+GO
+
 
 -- changeset liquibase:1.11.0 dbms:mssql
 -- preconditions onFail:MARK_RAN
 -- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
 -- comment: /* we don't need to run this if the system is new */
+EXEC sp_rename 'custom_entity_attr_list_items.value', item_value, 'COLUMN'
+GO
+EXEC sp_rename 'custom_entity_attr_list_items_aud.value', item_value, 'COLUMN'
+GO
+EXEC sp_rename 'entity_attributes_filter_target_value.value', target_value, 'COLUMN'
+GO
+EXEC sp_rename 'entity_attributes_filter_target_value_aud.value', target_value, 'COLUMN'
+GO
+EXEC sp_rename 'name_id_format_filter_target_value', target_value, 'COLUMN'
+GO
+EXEC sp_rename 'name_id_format_filter_target_value_aud', target_value, 'COLUMN'
+GO
 EXEC sp_rename 'organizationurl.value', uri_value, 'COLUMN'
 GO
-EXEC sp_rename 'custom_entity_attr_list_items.value', item_value, 'COLUMN'
+EXEC sp_rename 'organizationurl_aud.value', uri_value, 'COLUMN'
+GO
+EXEC sp_rename 'organization_display_name.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'organization_display_name_aud.value', name_value, 'COLUMN'
 GO
 EXEC sp_rename 'organization_name.value', name_value, 'COLUMN'
 GO
-EXEC sp_rename 'organization_display_name.value', name_value, 'COLUMN'
+EXEC sp_rename 'organization_name_aud.value', name_value, 'COLUMN'
 GO
 EXEC sp_rename 'service_description.value', name_value, 'COLUMN'
 GO
+EXEC sp_rename 'service_description_aud.value', name_value, 'COLUMN'
+GO
 EXEC sp_rename 'service_name.value', name_value, 'COLUMN'
+GO
+EXEC sp_rename 'service_name_aud.value', name_value, 'COLUMN'
 GO
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 9fb07eccf..fdbf3f56a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,8 +5,8 @@ version=1.11.0-SNAPSHOT
 ### library versions ###
 commonsCollections4Version=4.4
 cryptacularVersion=1.2.4
-hibernateVersion=5.5.0.Final
-#hibernateVersion=5.6.9.Final
+#hibernateVersion=5.5.0.Final
+hibernateVersion=5.6.9.Final
 luceneVersion=8.1.1
 log4JVersion=2.17.2
 lombokVersion=5.3.3.3
@@ -14,8 +14,8 @@ opensamlVersion=4.2.0
 pac4JVersion=5.4.3
 pac4jSpringSecurityVersion=7.0.3
 shibbolethVersion=4.2.1
-springbootVersion=2.5.12
-#springbootVersion=2.7.0
+#springbootVersion=2.5.12
+springbootVersion=2.7.0
 springSecurityVersion=5.6.3
 # springSecurityVersion=5.7.1
 

From a366ba246d2999808a71d68d0c3ad6687814ddbb Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 15 Jun 2022 10:55:04 -0700
Subject: [PATCH 09/81] SHIBUI-2273

update version of spring security
properties file cleanup


Former-commit-id: 3e9284d7ed705d58ac0100e0713522254a10fd57
---
 backend/src/main/resources/application.properties |  2 +-
 gradle.properties                                 | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index dd02864b0..ba1b8f20f 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -19,7 +19,7 @@ spring.datasource.password=shibui
 
 # Database Configuration H2
 spring.datasource.url=jdbc:h2:mem:shibui;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-spring.datasource.platform=h2
+spring.sql.init.platform=h2
 spring.datasource.driverClassName=org.h2.Driver
 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
 spring.h2.console.enabled=true
diff --git a/gradle.properties b/gradle.properties
index fdbf3f56a..f891afd02 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,6 @@ version=1.11.0-SNAPSHOT
 ### library versions ###
 commonsCollections4Version=4.4
 cryptacularVersion=1.2.4
-#hibernateVersion=5.5.0.Final
 hibernateVersion=5.6.9.Final
 luceneVersion=8.1.1
 log4JVersion=2.17.2
@@ -14,10 +13,8 @@ opensamlVersion=4.2.0
 pac4JVersion=5.4.3
 pac4jSpringSecurityVersion=7.0.3
 shibbolethVersion=4.2.1
-#springbootVersion=2.5.12
 springbootVersion=2.7.0
-springSecurityVersion=5.6.3
-# springSecurityVersion=5.7.1
+springSecurityVersion=5.7.1
 
 ### DB Driver Versions ###
 mariadbVersion=3.0.4
@@ -35,10 +32,4 @@ i2.github.apiEndpoint=https://github.internet2.edu/api/v3
 
 ## NOTES
 # pac4j spring security 7.0.3 here uses the pac4j 5.4.3 core, thus differences in versions (they used use the same versions, now
-# keeping them in sync takes paying attention
-#
-# Springboot 2.7.0 and Hibernate 5.6.9 are current, but don't like all the columns named "value" in the db (along with H2), so don't
-# update to these versions until ready to migrate the database columns. (the tests fail under these versions because the test database
-# doesn't work).
-#
-# Additionally, springbootsecurity for tests doesn't like 5.7.1
\ No newline at end of file
+# keeping them in sync takes paying attention
\ No newline at end of file

From b22e3505ada39eb6e3b63f554a2732fc25f70443 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 23 Jun 2022 09:22:57 -0700
Subject: [PATCH 10/81] SHIBUI-2273

Corrections for MySQL


Former-commit-id: cf07f85398c7d9e2fd842c730db8d80ea83d7525
---
 .../main/resources/db/changelog/changelog.sql | 62 ++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql
index 911f36cb9..561280f58 100644
--- a/backend/src/main/resources/db/changelog/changelog.sql
+++ b/backend/src/main/resources/db/changelog/changelog.sql
@@ -1,6 +1,66 @@
 -- liquibase formatted sql
 
--- changeset liquibase:1.11.0 dbms:mariadb,mysql,postgresql
+-- changeset liquibase:1.11.0 dbms:mysql
+-- preconditions onFail:MARK_RAN
+-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
+-- comment: /* we don't need to run this if the system is new */
+ALTER TABLE custom_entity_attr_list_items
+    CHANGE value item_value varchar(255);
+GO
+ALTER TABLE custom_entity_attr_list_items_aud
+    CHANGE value item_value varchar(255);
+GO
+ALTER TABLE entity_attributes_filter_target_value
+    CHANGE value target_value varchar(255);
+GO
+ALTER TABLE entity_attributes_filter_target_value_aud
+    CHANGE value target_value varchar(255);
+GO
+ALTER TABLE name_id_format_filter_target_value
+    CHANGE value target_value varchar(255);
+GO
+ALTER TABLE name_id_format_filter_target_value_aud
+    CHANGE value target_value varchar(255);
+GO
+ALTER TABLE organizationurl
+    CHANGE value uri_value varchar(255);
+GO
+ALTER TABLE organizationurl_aud
+    CHANGE value uri_value varchar(255);
+GO
+ALTER TABLE organization_display_name
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE organization_display_name_aud
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE organization_name
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE organization_name_aud
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE resource_backed_metadata_resolver
+    CHANGE file file_resource varchar(255);
+GO
+ALTER TABLE resource_backed_metadata_resolver_aud
+    CHANGE file file_resource varchar(255);
+GO
+ALTER TABLE service_description
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE service_description_aud
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE service_name
+    CHANGE value name_value varchar(255);
+GO
+ALTER TABLE service_name_aud
+    CHANGE value name_value varchar(255);
+GO
+
+
+-- changeset liquibase:1.11.0 dbms:mariadb,postgresql
 -- preconditions onFail:MARK_RAN
 -- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
 -- comment: /* we don't need to run this if the system is new */

From 49f951aab64c535cf80d38b355e188f3126db516 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 23 Jun 2022 09:57:02 -0700
Subject: [PATCH 11/81] Updated min/max refresh for providers

Former-commit-id: 50aa590d8106c1ca93946a204170ece00215a16d
---
 .../file-system-metadata-provider.schema.json | 16 +++++++--------
 .../main/resources/i18n/messages.properties   |  2 +-
 .../resources/i18n/messages_en.properties     |  2 +-
 .../schema/provider/file-system.schema.json   | 20 +++++++++----------
 .../provider/filebacked-http.schema.json      | 10 ++++++++--
 ui/src/app/metadata/domain/data.js            | 14 +++++++++++++
 ...ileBackedHttpMetadataProviderDefinition.js |  6 +++---
 .../FileSystemMetadataProviderDefinition.js   |  6 +++---
 .../metadata/wizard/MetadataProviderWizard.js |  2 +-
 9 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/backend/src/main/resources/file-system-metadata-provider.schema.json b/backend/src/main/resources/file-system-metadata-provider.schema.json
index 7969495f2..a4db5a52d 100644
--- a/backend/src/main/resources/file-system-metadata-provider.schema.json
+++ b/backend/src/main/resources/file-system-metadata-provider.schema.json
@@ -1,11 +1,6 @@
 {
     "type": "object",
-    "required": [
-        "name",
-        "@type",
-        "xmlId",
-        "metadataFile"
-    ],
+    "required": ["name", "@type", "xmlId", "metadataFile"],
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-dashboard-display-only",
@@ -47,18 +42,21 @@
         },
         "reloadableMetadataResolverAttributes": {
             "type": "object",
+            "required": ["minRefreshDelay", "maxRefreshDelay"],
             "properties": {
                 "minRefreshDelay": {
                     "title": "label.min-refresh-delay",
                     "description": "tooltip.min-refresh-delay",
                     "type": "string",
-                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT5M"
                 },
                 "maxRefreshDelay": {
                     "title": "label.max-refresh-delay",
                     "description": "tooltip.max-refresh-delay",
                     "type": "string",
-                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT4H"
                 },
                 "refreshDelayFactor": {
                     "title": "label.refresh-delay-factor",
@@ -71,4 +69,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 0a7880b36..2513a7c87 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -684,7 +684,7 @@ tooltip.retained-roles=Note that property replacement cannot be used on this ele
 tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntityDescriptor> element must include at least one role descriptor.
 tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntitiesDescriptor> element must include at least one child element, either an <md:EntityDescriptor> element or an <md:EntitiesDescriptor> element.
 
-tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
+tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration. Setting this to 0 will result in the default value being used.
 tooltip.max-refresh-delay=Upper bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
 tooltip.refresh-delay-factor=A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata\u0027s expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.
 tooltip.resolve-via-predicates-only=Flag indicating whether resolution may be performed solely by applying predicates to the entire metadata collection, when an entityID input criterion is not supplied.
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index f9f64d4d2..40d17ae7e 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -531,7 +531,7 @@ tooltip.retained-roles=Note that property replacement cannot be used on this ele
 tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntityDescriptor> element must include at least one role descriptor.
 tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntitiesDescriptor> element must include at least one child element, either an <md:EntityDescriptor> element or an <md:EntitiesDescriptor> element.
 
-tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
+tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration. Setting this to 0 will result in the default value being used.
 tooltip.max-refresh-delay=Upper bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
 tooltip.refresh-delay-factor=A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata\u0027s expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.
 tooltip.resolve-via-predicates-only=Flag indicating whether resolution may be performed solely by applying predicates to the entire metadata collection, when an entityID input criterion is not supplied.
diff --git a/ui/public/assets/schema/provider/file-system.schema.json b/ui/public/assets/schema/provider/file-system.schema.json
index 38d0d90e3..a4db5a52d 100644
--- a/ui/public/assets/schema/provider/file-system.schema.json
+++ b/ui/public/assets/schema/provider/file-system.schema.json
@@ -1,15 +1,10 @@
 {
     "type": "object",
-    "required": [
-        "name",
-        "@type",
-        "xmlId",
-        "metadataFile"
-    ],
+    "required": ["name", "@type", "xmlId", "metadataFile"],
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-dashboard-display-only",
-            "description": "tooltip.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name",
             "type": "string",
             "widget": {
                 "id": "string",
@@ -20,7 +15,7 @@
             "title": "label.metadata-provider-type",
             "description": "tooltip.metadata-provider-type",
             "type": "string",
-            "const": "FilesystemMetadataResolver"
+            "default": "FilesystemMetadataResolver"
         },
         "xmlId": {
             "title": "label.xml-id",
@@ -47,18 +42,21 @@
         },
         "reloadableMetadataResolverAttributes": {
             "type": "object",
+            "required": ["minRefreshDelay", "maxRefreshDelay"],
             "properties": {
                 "minRefreshDelay": {
                     "title": "label.min-refresh-delay",
                     "description": "tooltip.min-refresh-delay",
                     "type": "string",
-                    "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT5M"
                 },
                 "maxRefreshDelay": {
                     "title": "label.max-refresh-delay",
                     "description": "tooltip.max-refresh-delay",
                     "type": "string",
-                    "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT4H"
                 },
                 "refreshDelayFactor": {
                     "title": "label.refresh-delay-factor",
@@ -71,4 +69,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ui/public/assets/schema/provider/filebacked-http.schema.json b/ui/public/assets/schema/provider/filebacked-http.schema.json
index 860733486..77f415b43 100644
--- a/ui/public/assets/schema/provider/filebacked-http.schema.json
+++ b/ui/public/assets/schema/provider/filebacked-http.schema.json
@@ -252,18 +252,24 @@
         "reloadableMetadataResolverAttributes": {
             "$id": "reloadableMetadataResolverAttributes",
             "type": "object",
+            "required": [
+                "minRefreshDelay",
+                "maxRefreshDelay"
+            ],
             "properties": {
                 "minRefreshDelay": {
                     "title": "label.min-refresh-delay",
                     "description": "tooltip.min-refresh-delay",
                     "type": "string",
-                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT5M"
                 },
                 "maxRefreshDelay": {
                     "title": "label.max-refresh-delay",
                     "description": "tooltip.max-refresh-delay",
                     "type": "string",
-                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                    "pattern": "^$|^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$",
+                    "default": "PT4H"
                 },
                 "refreshDelayFactor": {
                     "title": "label.refresh-delay-factor",
diff --git a/ui/src/app/metadata/domain/data.js b/ui/src/app/metadata/domain/data.js
index 45412d300..b97afbddb 100644
--- a/ui/src/app/metadata/domain/data.js
+++ b/ui/src/app/metadata/domain/data.js
@@ -9,4 +9,18 @@ export const DurationOptions = [
     "PT8H",
     "PT12H",
     "PT24H"
+];
+
+export const RefreshOptions = [
+    "PT1S",
+    "PT30S",
+    "PT1M",
+    "PT5M",
+    "PT10M",
+    "PT30M",
+    "PT1H",
+    "PT4H",
+    "PT8H",
+    "PT12H",
+    "PT24H",
 ];
\ No newline at end of file
diff --git a/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js
index 106edfa55..e4e4be5b6 100644
--- a/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js
+++ b/ui/src/app/metadata/domain/provider/definition/FileBackedHttpMetadataProviderDefinition.js
@@ -1,7 +1,7 @@
 import defaultsDeep from 'lodash/defaultsDeep';
 import { BaseProviderDefinition, HttpMetadataResolverAttributesSchema, MetadataFilterPluginsSchema } from './BaseProviderDefinition';
 
-import { DurationOptions } from '../../data';
+import { DurationOptions, RefreshOptions } from '../../data';
 import { BASE_PATH } from '../../../../App.constant';
 
 export const FileBackedHttpMetadataProviderWizard = {
@@ -155,12 +155,12 @@ export const FileBackedHttpMetadataProviderWizard = {
         reloadableMetadataResolverAttributes: {
             minRefreshDelay: {
                 'ui:widget': 'OptionWidget',
-                options: DurationOptions,
+                options: RefreshOptions,
                 'ui:placeholder': 'label.duration'
             },
             maxRefreshDelay: {
                 'ui:widget': 'OptionWidget',
-                options: DurationOptions,
+                options: RefreshOptions,
                 'ui:placeholder': 'label.duration'
             },
             refreshDelayFactor: {
diff --git a/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js b/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js
index d97b8e041..5e9d617fe 100644
--- a/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js
+++ b/ui/src/app/metadata/domain/provider/definition/FileSystemMetadataProviderDefinition.js
@@ -1,7 +1,7 @@
 import defaultsDeep from 'lodash/defaultsDeep';
 import API_BASE_PATH from "../../../../App.constant";
 import { BaseProviderDefinition } from "./BaseProviderDefinition";
-import { DurationOptions } from '../../data';
+import { RefreshOptions } from '../../data';
 
 export const FileSystemMetadataProviderWizard = {
     ...BaseProviderDefinition,
@@ -74,12 +74,12 @@ export const FileSystemMetadataProviderWizard = {
         reloadableMetadataResolverAttributes: {
             minRefreshDelay: {
                 'ui:widget': 'OptionWidget',
-                options: DurationOptions,
+                options: RefreshOptions,
                 'ui:placeholder': 'label.duration'
             },
             maxRefreshDelay: {
                 'ui:widget': 'OptionWidget',
-                options: DurationOptions,
+                options: RefreshOptions,
                 'ui:placeholder': 'label.duration'
             },
             refreshDelayFactor: {
diff --git a/ui/src/app/metadata/wizard/MetadataProviderWizard.js b/ui/src/app/metadata/wizard/MetadataProviderWizard.js
index d2cbc0864..8dcbf73cd 100644
--- a/ui/src/app/metadata/wizard/MetadataProviderWizard.js
+++ b/ui/src/app/metadata/wizard/MetadataProviderWizard.js
@@ -49,7 +49,6 @@ export function MetadataProviderWizard({onSave, loading, block}) {
 
     return (
         <>
-
             <div className="row mb-4">
                 <div className="col-12">
                     <WizardNav onSave={save}
@@ -78,6 +77,7 @@ export function MetadataProviderWizard({onSave, loading, block}) {
                     </div>
                 </div>
             }
+            <pre>{JSON.stringify(errors, null, 4)}</pre>
         </>
     );
 }

From c58b911ba905270f2fd00b90f909d051978740c6 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 23 Jun 2022 12:07:34 -0700
Subject: [PATCH 12/81] SHIBUI-2273

"Resetting" the min and max refresh values to match the open saml code


Former-commit-id: ce8a5b5c8511ac9f4a14953180a046c2e05913ff
---
 .../main/resources/db/changelog/changelog.sql | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql
index 561280f58..2653cdd64 100644
--- a/backend/src/main/resources/db/changelog/changelog.sql
+++ b/backend/src/main/resources/db/changelog/changelog.sql
@@ -1,6 +1,6 @@
 -- liquibase formatted sql
 
--- changeset liquibase:1.11.0 dbms:mysql
+-- changeset liquibase:1.11.0.1 dbms:mysql
 -- preconditions onFail:MARK_RAN
 -- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
 -- comment: /* we don't need to run this if the system is new */
@@ -60,7 +60,7 @@ ALTER TABLE service_name_aud
 GO
 
 
--- changeset liquibase:1.11.0 dbms:mariadb,postgresql
+-- changeset liquibase:1.11.0.1 dbms:mariadb,postgresql
 -- preconditions onFail:MARK_RAN
 -- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
 -- comment: /* we don't need to run this if the system is new */
@@ -120,7 +120,7 @@ ALTER TABLE service_name_aud
 GO
 
 
--- changeset liquibase:1.11.0 dbms:mssql
+-- changeset liquibase:1.11.0.1 dbms:mssql
 -- preconditions onFail:MARK_RAN
 -- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
 -- comment: /* we don't need to run this if the system is new */
@@ -155,4 +155,24 @@ GO
 EXEC sp_rename 'service_name.value', name_value, 'COLUMN'
 GO
 EXEC sp_rename 'service_name_aud.value', name_value, 'COLUMN'
-GO
\ No newline at end of file
+GO
+
+-- changeset liquibase:1.11.0.2 dbms:mariadb,postgresql,mssql,mysql
+-- preconditions onFail:MARK_RAN
+-- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
+-- comment: /* we don't need to run this if the system is new */
+
+update filesystem_metadata_resolver set min_refresh_delay ='PT5M';
+update filesystem_metadata_resolver_aud set min_refresh_delay ='PT5M';
+update filesystem_metadata_resolver set max_refresh_delay ='PT4H';
+update filesystem_metadata_resolver_aud set max_refresh_delay ='PT4H';
+
+update file_backed_http_metadata_resolver set min_refresh_delay ='PT5M';
+update file_backed_http_metadata_resolver_aud set min_refresh_delay ='PT5M';
+update file_backed_http_metadata_resolver set max_refresh_delay ='PT4H';
+update file_backed_http_metadata_resolver_aud set max_refresh_delay ='PT4H';
+
+update resource_backed_metadata_resolver set min_refresh_delay ='PT5M';
+update resource_backed_metadata_resolver_aud set min_refresh_delay ='PT5M';
+update resource_backed_metadata_resolver set max_refresh_delay ='PT4H';
+update resource_backed_metadata_resolver_aud set max_refresh_delay ='PT4H';
\ No newline at end of file

From 92d8fdd17e11ab67f91e493c379ee3a46da94cd0 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 23 Jun 2022 15:23:31 -0700
Subject: [PATCH 13/81] SHIBUI-2273

Overriding calls that were getting made that break things. Those methods don't need to be used by the shibui functionality


Former-commit-id: 8e09709025e2a2ae5edc1933dcd3b72e89bc090a
---
 .../OpenSamlFileBackedHTTPMetadataResolver.java     | 13 +++++++++++++
 .../OpenSamlFilesystemMetadataResolver.java         | 12 ++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
index c5d64dc5b..4b642e52a 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFileBackedHTTPMetadataResolver.java
@@ -15,6 +15,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.io.File;
 import java.time.Duration;
 import java.time.Instant;
 
@@ -135,4 +136,16 @@ public synchronized void refresh() throws ResolverException {
             }
         }
     }
+
+    @Override
+    public void validateBackupFile(final File backupFile) throws ResolverException {
+        // NOPE, not going to validate this because the file reference is likely not to exist on the shibui server nor even be a
+        // valid path on the running server. The file is needed for the XML, but we shouldn't be validating it.
+    }
+
+    @Override
+    protected byte[] fetchMetadata() throws ResolverException {
+        // NOPE, we don't need to try and fetch the metadata from either the URI nor the file
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java
index c247e7b53..f8b9a856f 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFilesystemMetadataResolver.java
@@ -88,4 +88,16 @@ public void refilter() {
             logger.error("An error occurred while attempting to filter metadata!", e);
         }
     }
+
+    @Override
+    public void validateMetadataFile(@Nonnull final File file) throws ResolverException {
+        // NOPE, not going to validate this because the file reference is likely not to exist on the shibui server nor even be a
+        // valid path on the running server. The file is needed for the XML, but we shouldn't be validating it.
+    }
+
+    @Override
+    protected byte[] fetchMetadata() throws ResolverException {
+        // NOPE, we don't need to try and fetch the metadata
+        return null;
+    }
 }
\ No newline at end of file

From 08bcf6662dc4b9725ce9d560450dc7c3348245da Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 29 Jun 2022 14:24:04 -0700
Subject: [PATCH 14/81] SHIBUI-2273

slight change for mariadb


Former-commit-id: e483b0a62197b57427381f4481da8b0f8452f3f4
---
 backend/src/main/resources/db/changelog/changelog.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql
index 2653cdd64..5bece9633 100644
--- a/backend/src/main/resources/db/changelog/changelog.sql
+++ b/backend/src/main/resources/db/changelog/changelog.sql
@@ -1,6 +1,6 @@
 -- liquibase formatted sql
 
--- changeset liquibase:1.11.0.1 dbms:mysql
+-- changeset liquibase:1.11.0.1 dbms:mysql,mariadb
 -- preconditions onFail:MARK_RAN
 -- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
 -- comment: /* we don't need to run this if the system is new */
@@ -60,7 +60,7 @@ ALTER TABLE service_name_aud
 GO
 
 
--- changeset liquibase:1.11.0.1 dbms:mariadb,postgresql
+-- changeset liquibase:1.11.0.1 dbms:postgresql
 -- preconditions onFail:MARK_RAN
 -- precondition-sql-check expectedResult:1 SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = N'users'
 -- comment: /* we don't need to run this if the system is new */

From fe2be95c7b980433dcba896629197eb3f192983a Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 1 Jul 2022 10:50:47 -0700
Subject: [PATCH 15/81] NOJIRA

Fixing the footer version information


Former-commit-id: 98976bf3626b7e73be4709f288f988616e810ac8
---
 backend/src/main/resources/application.properties |  8 +++++---
 ui/src/app/App.constant.js                        | 10 ++++++++++
 ui/src/app/core/components/VersionInfo.js         | 14 +++++++++-----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index ba1b8f20f..f6af0610e 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -48,7 +48,7 @@ spring.liquibase.change-log=db/changelog/changelog.sql
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
 spring.jpa.show-sql=false
-spring.jpa.properties.hibernate.format_sql=false
+spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.properties.hibernate.check_nullability=true
 spring.jpa.hibernate.use-new-id-generator-mappings=true
 
@@ -118,5 +118,7 @@ springdoc.swagger-ui.tagsSorter: alpha
 springdoc.writer-with-order-by-keys: true
 springdoc.pathsToMatch=/entities, /api/**
 # This property enables the openapi and swagger-ui endpoints to be exposed beneath the actuator base path.
-management.endpoints.web.exposure.include=openapi, swagger-ui
-management.server.port=9090
\ No newline at end of file
+management.endpoints.web.exposure.include=openapi, swagger-ui, info
+management.server.port=9090
+management.endpoints.web.cors.allowed-origins=*
+management.endpoints.web.cors.allowed-headers=*
\ No newline at end of file
diff --git a/ui/src/app/App.constant.js b/ui/src/app/App.constant.js
index 3b6af7f89..afa7a688c 100644
--- a/ui/src/app/App.constant.js
+++ b/ui/src/app/App.constant.js
@@ -5,8 +5,18 @@ export const getBasePath = () => {
     //replace(/^\/|\/$/g, '')
 };
 
+export const getActuatorPath = () => {
+    const url = new URL(document.getElementsByTagName('base')[0].href);
+
+    var foo = document.createElement("a");
+    foo.href = url.pathname?.replace(/^\/+/g, '');
+    foo.port = "9090"
+    return foo.href;
+}
+
 export const BASE_PATH = getBasePath();
 export const API_BASE_PATH = `${BASE_PATH}api`;
+export const ACTUATOR_PATH = getActuatorPath();
 
 export const FILTER_PLUGIN_TYPES = ['RequiredValidUntil', 'SignatureValidation', 'EntityRoleWhiteList'];
 
diff --git a/ui/src/app/core/components/VersionInfo.js b/ui/src/app/core/components/VersionInfo.js
index 1c6badfc1..1c88ad271 100644
--- a/ui/src/app/core/components/VersionInfo.js
+++ b/ui/src/app/core/components/VersionInfo.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import useFetch from 'use-http';
-import { BASE_PATH } from '../../App.constant';
+import { ACTUATOR_PATH } from '../../App.constant';
 
 import Translate from '../../i18n/components/translate';
 
@@ -11,11 +11,15 @@ const year = new Date().getFullYear();
 const params = { year };
 
 export function VersionInfo () {
-
-    const { data = {} } = useFetch(`${BASE_PATH}actuator/info`, {}, []);
+    var opts = {
+        headers: {
+            'mode':'no-cors'
+        }
+    }
+    const { data = {} } = useFetch(`${ACTUATOR_PATH}actuator/info`, opts, []);
 
     const [ versionData, setVersionData ] = React.useState('');
-    
+
     React.useEffect(() => {
         setVersionData(formatter(data));
     }, [data]);
@@ -29,4 +33,4 @@ export function VersionInfo () {
     );
 }
 
-export default VersionInfo;
\ No newline at end of file
+export default VersionInfo;

From c5b3961206a2366c153b0be49150831052fa6d8f Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 5 Jul 2022 15:05:36 -0700
Subject: [PATCH 16/81] NOJIRA

Former-commit-id: f6686e8abed037b3929045d01f7cb5f54f8bc649
---
 testbed/postgres/conf/application.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/testbed/postgres/conf/application.yml b/testbed/postgres/conf/application.yml
index 2173107e1..56fd5e709 100644
--- a/testbed/postgres/conf/application.yml
+++ b/testbed/postgres/conf/application.yml
@@ -8,9 +8,11 @@ spring:
     username: shibui
     password: shibui
   jpa:
+    show-sql: false
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
+        dialect: org.hibernate.dialect.PostgreSQL95Dialect
+        format_sql: true
 server:
   port: 8443
   ssl:
@@ -135,4 +137,4 @@ custom:
 logging:
   level:
     org.pac4j: "TRACE"
-    org.opensaml: "INFO"
+    org.opensaml: "INFO"
\ No newline at end of file

From 4cc06673aa815b577b385172f72ee3fd2c71dcfd Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 5 Jul 2022 16:45:21 -0700
Subject: [PATCH 17/81] SHIBUI-2273

Updating dialects


Former-commit-id: f2f1813dc1ad7a754464eadb01c0dd821461db81
---
 backend/src/main/resources/application.yml | 9 +++++++++
 testbed/mariadb/conf/application.yml       | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 671000aa6..ffeab970c 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -1,3 +1,12 @@
+#spring:
+#  jpa:
+#    show-sql: false
+#    properties:
+#      hibernate:
+#        format_sql: true
+#        dialect: org.hibernate.dialect.PostgreSQL95Dialect
+# OR SEE: https://access.redhat.com/webassets/avalon/d/red-hat-jboss-enterprise-application-platform/7.2/javadocs/org/hibernate/dialect/package-summary.html
+
 #shibui:
 ## Default password must be set for the default user to be configured and setup
 #  default-rootuser:root
diff --git a/testbed/mariadb/conf/application.yml b/testbed/mariadb/conf/application.yml
index 68018a4b9..82fe6fec7 100644
--- a/testbed/mariadb/conf/application.yml
+++ b/testbed/mariadb/conf/application.yml
@@ -10,7 +10,7 @@ spring:
   jpa:
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.MariaDBDialect
+        dialect: org.hibernate.dialect.MariaDB103Dialect
 server:
   port: 8443
   ssl:
@@ -135,4 +135,4 @@ custom:
 logging:
   level:
     org.pac4j: "TRACE"
-    org.opensaml: "INFO"
+    org.opensaml: "INFO"
\ No newline at end of file

From c61ffae5de6c84535945054218060c5f4fa1b75b Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 7 Jul 2022 12:40:23 -0700
Subject: [PATCH 18/81] SHIBUI-2273

Fixing postgres lob issue


Former-commit-id: b0fce3ff433895e3baa1229c69a55e1196693577
---
 .../tier/shibboleth/admin/ui/domain/X509Certificate.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java
index b1db21b72..cff1a3c9d 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Certificate.java
@@ -1,6 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.Type;
 import org.hibernate.envers.Audited;
 
 import javax.annotation.Nullable;
@@ -14,6 +15,7 @@
 public class X509Certificate extends AbstractXMLObject implements org.opensaml.xmlsec.signature.X509Certificate {
     @Column(name = "x509CertificateValue")
     @Lob
+    @Type(type = "org.hibernate.type.TextType")
     private String value;
 
     @Nullable
@@ -26,4 +28,4 @@ public String getValue() {
     public void setValue(@Nullable String value) {
         this.value = value;
     }
-}
+}
\ No newline at end of file

From ad9904067dc3d0948becc719319c1da008c36389 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 12 Jul 2022 11:28:05 -0700
Subject: [PATCH 19/81] SHIBUI-2273

fixes for sqlserver docker


Former-commit-id: 230f1084919925e001b3ca8b741cf4b90a8605e8
---
 testbed/sqlServer/conf/application.yml | 16 ++++++++--------
 testbed/sqlServer/docker-compose.yml   |  9 ++++++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/testbed/sqlServer/conf/application.yml b/testbed/sqlServer/conf/application.yml
index 1e48abf4d..f69ccb318 100644
--- a/testbed/sqlServer/conf/application.yml
+++ b/testbed/sqlServer/conf/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    include:
+    include: dev
   datasource:
     platform: sqlserver
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -11,13 +11,13 @@ spring:
     properties:
       hibernate:
         dialect: org.hibernate.dialect.SQLServerDialect
-#server:
-#  port: 8443
-#  ssl:
-#    key-store: "/conf/keystore.p12"
-#    key-store-password: "changeit"
-#    keyStoreType: "PKCS12"
-#    keyAlias: "tomcat"
+server:
+  port: 8443
+  ssl:
+    key-store: "/conf/keystore.p12"
+    key-store-password: "changeit"
+    keyStoreType: "PKCS12"
+    keyAlias: "tomcat"
 shibui:
   user-bootstrap-resource: file:/conf/users.csv
   roles: ROLE_ADMIN,ROLE_NONE,ROLE_USER,ROLE_PONY
diff --git a/testbed/sqlServer/docker-compose.yml b/testbed/sqlServer/docker-compose.yml
index a7509fe37..68276f256 100644
--- a/testbed/sqlServer/docker-compose.yml
+++ b/testbed/sqlServer/docker-compose.yml
@@ -23,7 +23,14 @@ services:
       - db
     networks:
       - front
-
+  mailhog:
+    image: mailhog/mailhog:latest
+    ports:
+      - 1025:1025
+      - 8025:8025
+    container_name: mailhog
+    networks:
+      - front
 networks:
   front:
     driver: bridge
\ No newline at end of file

From af779ec3b26a1d02525167c5862d08c9968220bc Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Fri, 15 Jul 2022 13:11:18 -0400
Subject: [PATCH 20/81] SHIBUI-2316 fixed sqlserver upgrade migration

Former-commit-id: bf414ee0118c5697ffe8fe057bba4af9e5edd40d
---
 backend/src/main/resources/db/changelog/changelog.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/db/changelog/changelog.sql b/backend/src/main/resources/db/changelog/changelog.sql
index 5bece9633..0a63846a3 100644
--- a/backend/src/main/resources/db/changelog/changelog.sql
+++ b/backend/src/main/resources/db/changelog/changelog.sql
@@ -132,9 +132,9 @@ EXEC sp_rename 'entity_attributes_filter_target_value.value', target_value, 'COL
 GO
 EXEC sp_rename 'entity_attributes_filter_target_value_aud.value', target_value, 'COLUMN'
 GO
-EXEC sp_rename 'name_id_format_filter_target_value', target_value, 'COLUMN'
+EXEC sp_rename 'name_id_format_filter_target_value.value', target_value, 'COLUMN'
 GO
-EXEC sp_rename 'name_id_format_filter_target_value_aud', target_value, 'COLUMN'
+EXEC sp_rename 'name_id_format_filter_target_value_aud.value', target_value, 'COLUMN'
 GO
 EXEC sp_rename 'organizationurl.value', uri_value, 'COLUMN'
 GO

From 6527e520f1a08c8495b80caa8d556e59c465237b Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 20 Jul 2022 08:10:36 -0700
Subject: [PATCH 21/81] Added filter scroll link to comparison view

Former-commit-id: 78c4e6f748dd1e6a7b26e21e94b7794a8e77ea37
---
 .../app/metadata/view/MetadataComparison.js   | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/metadata/view/MetadataComparison.js b/ui/src/app/metadata/view/MetadataComparison.js
index de0022ce0..2e9307acf 100644
--- a/ui/src/app/metadata/view/MetadataComparison.js
+++ b/ui/src/app/metadata/view/MetadataComparison.js
@@ -4,13 +4,14 @@ import {
     ArrayParam,
     withDefault
 } from 'use-query-params';
+import { scroller } from 'react-scroll';
 import { MetadataDefinitionContext, MetadataSchemaContext } from '../hoc/MetadataSchema';
 import { MetadataVersionsLoader } from '../hoc/MetadataVersionsLoader';
 import { Configuration } from '../hoc/Configuration';
 import { MetadataConfiguration } from '../component/MetadataConfiguration';
 import { Link, useParams } from 'react-router-dom';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faHistory } from '@fortawesome/free-solid-svg-icons';
+import { faArrowDown, faHistory } from '@fortawesome/free-solid-svg-icons';
 import Translate from '../../i18n/components/translate';
 import Form from 'react-bootstrap/Form';
 import { useTranslation } from '../../i18n/hooks';
@@ -18,6 +19,14 @@ import { MetadataFilterVersionList } from '../domain/filter/component/MetadataFi
 import { MetadataFilterVersionContext } from '../domain/filter/component/MetadataFilterVersionContext';
 import { useMetadataSchema } from '../hooks/schema';
 import { FilterableProviders } from '../domain/provider';
+import Button from 'react-bootstrap/Button';
+const onScrollTo = (element, offset = 0) => {
+        scroller.scrollTo(element, {
+            duration: 500,
+            smooth: true,
+            offset
+        });
+    };
 
 export function MetadataComparison () {
 
@@ -54,6 +63,12 @@ export function MetadataComparison () {
                                             <FontAwesomeIcon icon={faHistory} />&nbsp;
                                             <Translate value="action.version-history">Version History</Translate>
                                         </Link>
+                                        {type === 'provider' && canFilter &&
+                                            <Button variant="link" onClick={() => onScrollTo('filters')}>
+                                                <FontAwesomeIcon icon={faArrowDown} />&nbsp;
+                                                <Translate value="label.filters">Filters</Translate>
+                                            </Button>
+                                        }
                                     </div>
                                     <Form.Check type="switch"
                                         id="toggleLimited"
@@ -65,7 +80,7 @@ export function MetadataComparison () {
                                 <MetadataConfiguration configuration={config} />
 
                                 {type === 'provider' && canFilter && v &&
-                                <React.Fragment>
+                                <div id="filters">
                                     <div className="numbered-header d-flex justify-content-start bg-light align-items-center py-1">
                                         <h2 className="title h4 m-0 flex-grow-1">
                                             <span className="text ms-2"><Translate value="label.metadata-filter">Metadata Filter</Translate></span>
@@ -74,7 +89,7 @@ export function MetadataComparison () {
                                     <MetadataFilterVersionContext models={v} dates={config.dates}>
                                         {(c) => <MetadataFilterVersionList configuration={c} columns={ c.dates.length } limited={limited}/>}
                                     </MetadataFilterVersionContext>
-                                </React.Fragment>
+                                </div>
                                 }
                             </div>
                         }

From a005fd96dde6fcc7f4c798ba40935d62d0d0550e Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Fri, 22 Jul 2022 10:04:40 -0400
Subject: [PATCH 22/81] SHIBUI-2269

Added automated test that checks XML endpoint for filters.


Former-commit-id: 993f3d13ed2b2ce4717e5d086b7cceb57010c43b
---
 .../admin/ui/SeleniumSIDETest.groovy          |   2 +-
 .../integration/resources/SHIBUI-2269.side    | 545 ++++++++++++++++++
 2 files changed, 546 insertions(+), 1 deletion(-)
 create mode 100644 backend/src/integration/resources/SHIBUI-2269.side

diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
index 3c73bfbbf..14a65b52b 100644
--- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
+++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -153,6 +153,6 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1744: Verify attribute bundles in entity attribute filters' | '/SHIBUI-1744-3.side'
         'SHIBUI-2052: Logged in user & role appear on dashboard'            | '/SHIBUI-2052.side'
         'SHIBUI-2116: Verify entity attribute bundle highlights'            | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script).
-
+        'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
     }
 }
diff --git a/backend/src/integration/resources/SHIBUI-2269.side b/backend/src/integration/resources/SHIBUI-2269.side
new file mode 100644
index 000000000..f2848dddb
--- /dev/null
+++ b/backend/src/integration/resources/SHIBUI-2269.side
@@ -0,0 +1,545 @@
+{
+  "id": "1b31a551-eb09-4bd4-8db9-694bf1539a46",
+  "version": "2.0",
+  "name": "SHIBUI-2269",
+  "url": "http://localhost:10101",
+  "tests": [{
+    "id": "841ade0e-83bd-4a4b-94f2-de6bd5c536b2",
+    "name": "SHIBUI-2269",
+    "commands": [{
+      "id": "d6b23986-6d14-4b10-be7b-a7e6f576e3b2",
+      "comment": "",
+      "command": "open",
+      "target": "/login",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "f77ecd77-01c2-4463-944e-1a69600f5297",
+      "comment": "",
+      "command": "type",
+      "target": "name=username",
+      "targets": [
+        ["name=username", "name"],
+        ["css=tr:nth-child(1) input", "css:finder"],
+        ["xpath=//input[@name='username']", "xpath:attributes"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "admin"
+    }, {
+      "id": "c9bf0a22-faa9-494c-b2ed-6c9653248551",
+      "comment": "",
+      "command": "type",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "adminpass"
+    }, {
+      "id": "7ab1d854-3582-4101-bd19-f94b8f438090",
+      "comment": "",
+      "command": "sendKeys",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "${KEY_ENTER}"
+    }, {
+      "id": "4059cae7-b9f9-49d0-a213-343bcaba66d1",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "f03af8d5-5875-4a2c-b93a-c3ddcbd4b16a",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "081f495b-4d84-4758-824c-1e85b6311e7f",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }, {
+      "id": "9e912dd5-6ace-45be-bafd-2d1655906575",
+      "comment": "",
+      "command": "open",
+      "target": "/",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "3bb52950-667c-4852-a98f-6a6fb5632ba5",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "6af18279-b5ed-47d0-932b-cba97881b9bb",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "b07230f3-c268-4680-943f-5f8f81414002",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-provider",
+      "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
+        ["linkText=Add a new metadata provider", "linkText"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
+        ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
+        ["xpath=//a[2]", "xpath:position"],
+        ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "004dbab9-263e-4f90-9c5f-9d2948d80ab5",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "d77381c8-2164-499d-91fa-e762792644ec",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=ExternalMetadataResolver"
+    }, {
+      "id": "8edf9e5e-188e-435d-acbd-a0ee770df39d",
+      "comment": "",
+      "command": "type",
+      "target": "name=name",
+      "targets": [
+        ["name=name", "name"],
+        ["css=.form-control", "css:finder"],
+        ["xpath=//input[@name='name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/form/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "ExternalTest"
+    }, {
+      "id": "d652c1d5-44d2-448a-8dae-85d266b51638",
+      "comment": "",
+      "command": "click",
+      "target": "css=.direction",
+      "targets": [
+        ["css=.direction", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button/span[2]", "xpath:idRelative"],
+        ["xpath=//span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'Next')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "d1294ac3-d91c-495a-ab0b-cc3183cc08d5",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "b15dcd2a-9360-4831-a95c-8797eb235972",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_xmlId",
+      "targets": [
+        ["id=root_xmlId", "id"],
+        ["css=#root_xmlId", "css:finder"],
+        ["xpath=//input[@id='root_xmlId']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "1"
+    }, {
+      "id": "657ee88c-4777-485b-b3de-a467657e6fe4",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_description",
+      "targets": [
+        ["id=root_description", "id"],
+        ["css=#root_description", "css:finder"],
+        ["xpath=//textarea[@id='root_description']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div[2]/div/div/textarea", "xpath:idRelative"],
+        ["xpath=//textarea", "xpath:position"]
+      ],
+      "value": "External Test"
+    }, {
+      "id": "5548997c-2f3a-4376-89a9-606b5b948ef1",
+      "comment": "",
+      "command": "click",
+      "target": "css=.label:nth-child(1)",
+      "targets": [
+        ["css=.label:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button/span", "xpath:idRelative"],
+        ["xpath=//li[3]/button/span", "xpath:position"],
+        ["xpath=//span[contains(.,'2. Finished!')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "826e7804-88f0-436e-9951-11e8065671ed",
+      "comment": "",
+      "command": "click",
+      "target": "css=.save",
+      "targets": [
+        ["css=.save", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "ab15e915-02b9-4616-9f92-ffcb0386918c",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=ExternalTest",
+      "targets": [
+        ["linkText=ExternalTest", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'ExternalTest')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[2]/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/0e237f9c-3ffe-49da-a60d-289733126d92/configuration/options')]", "xpath:href"],
+        ["xpath=//td[2]/a", "xpath:position"],
+        ["xpath=//a[contains(.,'ExternalTest')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "3ece6089-c462-437e-9384-62cede8afc7d",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Add Filter",
+      "targets": [
+        ["linkText=Add Filter", "linkText"],
+        ["css=#filters .btn", "css:finder"],
+        ["xpath=//div[@id='filters']/div/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/0e237f9c-3ffe-49da-a60d-289733126d92/filter/new')]", "xpath:href"],
+        ["xpath=//div[3]/div/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,' Add Filter')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "b409c3ea-3066-4d06-a660-4702cdace6ec",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "84111b1d-6927-4536-b883-0b057f13d898",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=EntityAttributes"
+    }, {
+      "id": "ec27be24-7951-4d76-9457-4a5dbe5866ef",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=root_name",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "bea341ae-4cdf-432e-8032-c827e9c8a7b8",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_name",
+      "targets": [
+        ["id=root_name", "id"],
+        ["css=#root_name", "css:finder"],
+        ["xpath=//input[@id='root_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "1"
+    }, {
+      "id": "79f5b0a9-57e9-4f6b-8980-4af6258a5aa4",
+      "comment": "",
+      "command": "click",
+      "target": "id=dropdown-label.filter-target-type",
+      "targets": [
+        ["id=dropdown-label.filter-target-type", "id"],
+        ["css=#dropdown-label\\.filter-target-type", "css:finder"],
+        ["xpath=//button[@id='dropdown-label.filter-target-type']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[6]/div/div/div/fieldset/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//fieldset/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Entity ID ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "d01e44ab-802b-4d85-ac2e-e2e03a00c1c0",
+      "comment": "",
+      "command": "click",
+      "target": "css=.dropdown-item:nth-child(3)",
+      "targets": [
+        ["css=.dropdown-item:nth-child(3)", "css:finder"],
+        ["xpath=(//button[@type='button'])[17]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[6]/div/div/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"],
+        ["xpath=//div/button[3]", "xpath:position"],
+        ["xpath=//button[contains(.,'Script')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "f401438a-0154-4610-be40-580829ba76a9",
+      "comment": "",
+      "command": "type",
+      "target": "css=.npm__react-simple-code-editor__textarea",
+      "targets": [
+        ["css=.npm__react-simple-code-editor__textarea", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[6]/div/div/div/fieldset/div/div/div[2]/div/div/div/div/textarea", "xpath:idRelative"],
+        ["xpath=//textarea", "xpath:position"]
+      ],
+      "value": "true;"
+    }, {
+      "id": "75563d4f-487d-4c08-81d9-26a8ef989711",
+      "comment": "",
+      "command": "click",
+      "target": "css=.btn-info",
+      "targets": [
+        ["css=.btn-info", "css:finder"],
+        ["xpath=(//button[@type='button'])[7]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div/div[2]/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,' Save')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "21f5c73b-0aa2-41cd-a97c-35c05a892275",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Add Filter",
+      "targets": [
+        ["linkText=Add Filter", "linkText"],
+        ["css=#filters > .numbered-header .btn", "css:finder"],
+        ["xpath=//div[@id='filters']/div/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/0e237f9c-3ffe-49da-a60d-289733126d92/filter/new')]", "xpath:href"],
+        ["xpath=//div[3]/div/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,' Add Filter')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "6eb76a2f-370a-4547-b05e-f0dc8bdb60ba",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=NameIDFormat"
+    }, {
+      "id": "fcacadd8-7b9e-4878-b1cc-3d5da56e6660",
+      "comment": "",
+      "command": "click",
+      "target": "css=.col-12 > .mb-3 > div > div",
+      "targets": [
+        ["css=.col-12 > .mb-3 > div > div", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div/div/div/div/div", "xpath:idRelative"],
+        ["xpath=//div/div/div/div/div/div/div/div", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "4d206821-ace7-483e-876e-99c7a0490144",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=root_name",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "62afd5f1-e565-4bb8-a142-9eda83e98a1c",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_name",
+      "targets": [
+        ["id=root_name", "id"],
+        ["css=#root_name", "css:finder"],
+        ["xpath=//input[@id='root_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "2"
+    }, {
+      "id": "da90db0c-c7e6-4dc5-b643-13a3c2029f05",
+      "comment": "",
+      "command": "click",
+      "target": "id=dropdown-label.filter-target-type",
+      "targets": [
+        ["id=dropdown-label.filter-target-type", "id"],
+        ["css=#dropdown-label\\.filter-target-type", "css:finder"],
+        ["xpath=//button[@id='dropdown-label.filter-target-type']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//fieldset/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Entity ID ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "bce0cd29-246e-4f6e-a860-0eade5c73850",
+      "comment": "",
+      "command": "click",
+      "target": "css=.dropdown-item:nth-child(3)",
+      "targets": [
+        ["css=.dropdown-item:nth-child(3)", "css:finder"],
+        ["xpath=(//button[@type='button'])[16]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/div/button[3]", "xpath:idRelative"],
+        ["xpath=//button[3]", "xpath:position"],
+        ["xpath=//button[contains(.,'Script')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "2923ab38-d8ff-4d3f-b247-1d977d06a0dd",
+      "comment": "",
+      "command": "click",
+      "target": "id=dropdown-label.filter-target-type",
+      "targets": [
+        ["id=dropdown-label.filter-target-type", "id"],
+        ["css=#dropdown-label\\.filter-target-type", "css:finder"],
+        ["xpath=//button[@id='dropdown-label.filter-target-type']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//fieldset/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Script ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "7141ca97-429a-4d1f-9efb-68a23fc92748",
+      "comment": "",
+      "command": "click",
+      "target": "css=.show > .dropdown-item:nth-child(2)",
+      "targets": [
+        ["css=.show > .dropdown-item:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[15]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/div/button[2]", "xpath:idRelative"],
+        ["xpath=//fieldset/div/div/div/div/div/button[2]", "xpath:position"],
+        ["xpath=//button[contains(.,'Regex')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "e15eab26-07bd-45e9-ba8e-ee2a400baee9",
+      "comment": "",
+      "command": "type",
+      "target": "id=targetInput",
+      "targets": [
+        ["id=targetInput", "id"],
+        ["name=script", "name"],
+        ["css=#targetInput", "css:finder"],
+        ["xpath=//input[@id='targetInput']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div[2]/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/input", "xpath:position"]
+      ],
+      "value": ".*unicon.*"
+    }, {
+      "id": "55cc5ef6-1b05-48a9-bc9d-58551b751feb",
+      "comment": "",
+      "command": "click",
+      "target": "css=.fa-floppy-disk > path",
+      "targets": [
+        ["css=.fa-floppy-disk > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "802be014-0d04-4bda-93d1-ca7a5d7f802d",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=.text:nth-child(2)",
+      "targets": [
+        ["css=.text:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div/h2/span[2]", "xpath:idRelative"],
+        ["xpath=//h2/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'Common Attributes')]", "xpath:innerText"]
+      ],
+      "value": "30000"
+    }, {
+      "id": "7e3e7d65-e0ff-4a2d-a0e9-5080bfefd4df",
+      "comment": "",
+      "command": "click",
+      "target": "css=.btn-outline-secondary",
+      "targets": [
+        ["css=.btn-outline-secondary", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Enable')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "42929ec9-7860-467a-a52b-946df9965de5",
+      "comment": "",
+      "command": "click",
+      "target": "xpath=//div[@id='filters']/ul/li/div/span[3]/div/input",
+      "targets": [
+        ["id=customSwitch-df84f9b7-6cbe-4727-b71e-733eb9b46ca0", "id"],
+        ["css=#customSwitch-df84f9b7-6cbe-4727-b71e-733eb9b46ca0", "css:finder"],
+        ["xpath=//input[@id='customSwitch-df84f9b7-6cbe-4727-b71e-733eb9b46ca0']", "xpath:attributes"],
+        ["xpath=//div[@id='filters']/ul/li/div/span[3]/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "3bb95cdd-23aa-425d-af75-e4d69b819235",
+      "comment": "",
+      "command": "click",
+      "target": "xpath=//div[@id='filters']/ul/li[2]/div/span[3]/div/input",
+      "targets": [
+        ["id=customSwitch-be9ce5a5-1242-4884-882a-7a977cd7bbd5", "id"],
+        ["css=#customSwitch-be9ce5a5-1242-4884-882a-7a977cd7bbd5", "css:finder"],
+        ["xpath=//input[@id='customSwitch-be9ce5a5-1242-4884-882a-7a977cd7bbd5']", "xpath:attributes"],
+        ["xpath=//div[@id='filters']/ul/li[2]/div/span[3]/div/input", "xpath:idRelative"],
+        ["xpath=//li[2]/div/span[3]/div/input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "038ab74e-cab9-486e-bbfc-25a7c1cfad82",
+      "comment": "",
+      "command": "open",
+      "target": "/api/MetadataResolvers/External",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "9e6390c9-3122-4038-8dce-61ae0c157e4a",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=#folder4 > .opened > .line > span",
+      "targets": [
+        ["css=#folder4 > .opened > .line > span", "css:finder"]
+      ],
+      "value": "<![CDATA[ true; ]]>"
+    }, {
+      "id": "8c32b412-dc63-4be5-98fb-8c3cd67895af",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=#folder7 > .opened > .line > span",
+      "targets": [
+        ["css=#folder7 > .opened > .line > span", "css:finder"]
+      ],
+      "value": "<![CDATA[ \"use strict\"; /.*unicon.*/.test(input.getEntityID()); ]]>"
+    }]
+  }],
+  "suites": [{
+    "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
+    "name": "Default Suite",
+    "persistSession": false,
+    "parallel": false,
+    "timeout": 300,
+    "tests": ["841ade0e-83bd-4a4b-94f2-de6bd5c536b2"]
+  }],
+  "urls": ["http://localhost:10101/"],
+  "plugins": []
+}
\ No newline at end of file

From 9ff06c11d48709dd11c9f356eadbaf599fb539fb Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Mon, 25 Jul 2022 13:29:48 -0700
Subject: [PATCH 23/81] RELEASE 1.11.0

Merging master to branch to fix conflicts


Former-commit-id: ca579c451c13bdb69de3d0e85d4233ded2469235
---
 build.gradle | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 505350c6f..518a7baa6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,15 +28,4 @@ release {
 }
 
 afterReleaseBuild.dependsOn project.getTasksByName('githubRelease', false)
-afterReleaseBuild.dependsOn project.getTasksByName('dockerTagsPush', true)
-
-// force log4j version
-allprojects {
-    configurations.all {
-        resolutionStrategy.eachDependency { d ->
-            if (d.requested.group == 'org.apache.logging.log4j') {
-                d.useVersion project.'log4j.version'
-            }
-        }
-    }
-}
\ No newline at end of file
+afterReleaseBuild.dependsOn project.getTasksByName('dockerTagsPush', true)
\ No newline at end of file

From 9695c43fdedc1143c46145cda40b9c4a6e1a67ba Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Mon, 25 Jul 2022 13:51:45 -0700
Subject: [PATCH 24/81] RELEASE 1.11.0

gitignore


Former-commit-id: 3a38367eadee06dc9326631d3337d30adb59116a
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0848cc3ed..b298de799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -412,3 +412,6 @@ beacon/spring/out
 
 # macOS jenv
 .java-version
+/a.xml
+/application.yml
+/backend/src/test/resources/conf/deletem.xml

From e1e5ce81cf3d8c7f36004dd2c60896a2804f191c Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Mon, 25 Jul 2022 14:01:23 -0700
Subject: [PATCH 25/81] [Gradle Release Plugin] - pre tag commit:  'y'.

Former-commit-id: 9f4a26ac35e7144ca5607741cb757621df2daeb3
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index f891afd02..82d6905dc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.11.0-SNAPSHOT
+version=y
 
 ### library versions ###
 commonsCollections4Version=4.4

From e9faf9639e8cd0411a962e04a90a70a28b978fc4 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Mon, 25 Jul 2022 14:15:35 -0700
Subject: [PATCH 26/81] NOJIRA

removing docker tasks related to master from Jenkinsfile


Former-commit-id: dacfbcb24b2a16c7f7c0edc0ebbacf8e5548a945
---
 .gitignore  |  3 +++
 Jenkinsfile | 28 +---------------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0848cc3ed..b298de799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -412,3 +412,6 @@ beacon/spring/out
 
 # macOS jenv
 .java-version
+/a.xml
+/application.yml
+/backend/src/test/resources/conf/deletem.xml
diff --git a/Jenkinsfile b/Jenkinsfile
index 3ae5f4595..60f82aca1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,32 +16,6 @@ pipeline {
         }
       }
     }
-
-    stage('Build Docker images') {
-      when {
-        expression {
-          return GIT_BRANCH in ['master']
-        }
-      }
-      steps {
-        sh '''./gradlew docker -x test
-        '''
-      }
-    }
-
-    stage('Deploy') {
-      when {
-        expression {
-          return GIT_BRANCH in ['master']
-        }
-      }
-      steps {
-        sh '''
-        docker stop shibui || true && docker rm shibui || true
-        docker run -d --restart always --name shibui -p 8080:8080 -v /etc/shibui:/conf -v /etc/shibui/application.yml:/application.yml -m 2GB --memory-swap=4GB --entrypoint /usr/bin/java unicon/shibui:latest -Xmx1G -jar app.war
-        '''
-      }
-    }
   }
   post {
     failure {
@@ -54,4 +28,4 @@ pipeline {
       cleanWs()
     }
   }
-}
+}
\ No newline at end of file

From e472aea6ed40448db9267fb4932162cfcb0222fd Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Mon, 25 Jul 2022 14:40:15 -0700
Subject: [PATCH 27/81] NOJIRA

correcting version from faulty release


Former-commit-id: 66a10e95d505192f23f8e6e129acdbabd0a9e02c
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 82d6905dc..f891afd02 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=y
+version=1.11.0-SNAPSHOT
 
 ### library versions ###
 commonsCollections4Version=4.4

From bd522dab63a8cf562402192dda9337e30373d85b Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Mon, 25 Jul 2022 15:42:26 -0700
Subject: [PATCH 28/81] NOJIRA

gitignore


Former-commit-id: d7b4b0e9063667d3599433c16e9b65e7f9f0f0f3
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0848cc3ed..b298de799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -412,3 +412,6 @@ beacon/spring/out
 
 # macOS jenv
 .java-version
+/a.xml
+/application.yml
+/backend/src/test/resources/conf/deletem.xml

From 5ef58ad69c75345022638d5ade7e46d1d4883c27 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Tue, 26 Jul 2022 10:24:01 -0400
Subject: [PATCH 29/81] SHIBUI-2188

Couple quick stability fixes.


Former-commit-id: e51e953befc8ebd770bb241f3a122641a9486948
---
 .../integration/resources/SHIBUI-1364-1.side  | 31 +++++++++------
 .../integration/resources/SHIBUI-1364-4.side  | 21 +++-------
 .../integration/resources/SHIBUI-1732-3.side  | 38 +++++++++----------
 3 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/backend/src/integration/resources/SHIBUI-1364-1.side b/backend/src/integration/resources/SHIBUI-1364-1.side
index b1cb09526..8fe9da05e 100644
--- a/backend/src/integration/resources/SHIBUI-1364-1.side
+++ b/backend/src/integration/resources/SHIBUI-1364-1.side
@@ -2330,13 +2330,22 @@
         ["xpath=//button[contains(.,'Compare Selected(2)')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "9ddfc4d9-0fbd-44f2-8584-4d7fcb6d0c6b",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "css=#filters > div:nth-child(3) > div:nth-child(2) > div > button",
+      "targets": [
+        ["css=.d-flex:nth-child(3) > .border-primary:nth-child(2) .svg-inline--fa", "css:finder"]
+      ],
+      "value": "30000"
     }, {
       "id": "2ff5a597-9fe0-46b4-9ca5-63123ddb3cef",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div/div/div[4]/div[2]/div/button",
+      "target": "css=#filters > div:nth-child(3) > div:nth-child(2) > div > button",
       "targets": [
-        ["css=.border-primary:nth-child(2) .fa-square", "css:finder"]
+        ["css=.d-flex:nth-child(3) > .border-primary:nth-child(2) .svg-inline--fa", "css:finder"]
       ],
       "value": ""
     }, {
@@ -2356,23 +2365,23 @@
       "id": "d7b5550d-1db8-4fa5-800f-fde753413c13",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) .p-2 > div > div:nth-child(1) .d-block:nth-child(2)",
+      "target": "css=.bg-diff > .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(8) .p-2 > div > div:nth-child(1) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[5]/div/div[2]/div[2]/div/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[5]/div/div[2]/div[2]/div/div/span[2]", "xpath:position"],
-        ["xpath=//span[contains(.,'Entity Attributes Filter')]", "xpath:innerText"]
+        ["css=.bg-diff > .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='filters']/section/div/div[2]/div[2]/div/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[2]/section/div/div[2]/div[2]/div/div/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'Entity Attributes Filter Version 2')]", "xpath:innerText"]
       ],
       "value": "Entity Attributes Filter Version 2"
     }, {
       "id": "ad797f09-746e-4778-954e-6f92ac5934ea",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) .p-2 > div > div:nth-child(1) .d-block:nth-child(3)",
+      "target": "css=.bg-diff > .d-block:nth-child(3)",
       "targets": [
-        ["css=.mb-4:nth-child(8) .p-2 > div > div:nth-child(1) .d-block:nth-child(3)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[5]/div/div[2]/div[2]/div/div/span[3]", "xpath:idRelative"],
-        ["xpath=//section[5]/div/div[2]/div[2]/div/div/span[3]", "xpath:position"]
+        ["css=.bg-diff > .d-block:nth-child(3)", "css:finder"],
+        ["xpath=//div[@id='filters']/section/div/div[2]/div[2]/div/div/span[3]", "xpath:idRelative"],
+        ["xpath=//div[2]/section/div/div[2]/div[2]/div/div/span[3]", "xpath:position"]
       ],
       "value": "Entity Attributes Filter"
     }, {
diff --git a/backend/src/integration/resources/SHIBUI-1364-4.side b/backend/src/integration/resources/SHIBUI-1364-4.side
index 8f5192665..3384d27ea 100644
--- a/backend/src/integration/resources/SHIBUI-1364-4.side
+++ b/backend/src/integration/resources/SHIBUI-1364-4.side
@@ -1417,23 +1417,14 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": ""
-    }, {
-      "id": "e83dc2da-ad95-4e50-b969-57721eb8f1dc",
-      "comment": "",
-      "command": "click",
-      "target": "css=.d-flex:nth-child(5) > .border-primary:nth-child(2) .svg-inline--fa",
-      "targets": [
-        ["css=.d-flex:nth-child(5) > .border-primary:nth-child(2) .svg-inline--fa", "css:finder"]
-      ],
-      "value": ""
     }, {
       "id": "c2102a31-6e18-4d6c-8146-e23459403b65",
       "comment": "",
       "command": "assertText",
-      "target": "css=.border-primary:nth-child(2) > .bg-primary-light .mb-0:nth-child(1)",
+      "target": "css=.d-flex:nth-child(3) > .border-primary:nth-child(2) .mb-0:nth-child(1)",
       "targets": [
-        ["css=.border-primary:nth-child(2) > .bg-primary-light .mb-0:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/div[4]/div[2]/div/div/p", "xpath:idRelative"],
+        ["css=.d-flex:nth-child(3) > .border-primary:nth-child(2) .mb-0:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='filters']/div[3]/div[2]/div/div/p", "xpath:idRelative"],
         ["xpath=//p", "xpath:position"],
         ["xpath=//p[contains(.,'Entity Attributes Filter V2')]", "xpath:innerText"]
       ],
@@ -1442,10 +1433,10 @@
       "id": "cac6c125-c81b-40af-ae21-2b717df9511e",
       "comment": "",
       "command": "assertText",
-      "target": "css=.border-primary:nth-child(3) > .bg-primary-light .mb-0:nth-child(1)",
+      "target": "css=.d-flex:nth-child(3) .bg-lighter .mb-0:nth-child(1)",
       "targets": [
-        ["css=.border-primary:nth-child(3) > .bg-primary-light .mb-0:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/div[4]/div[3]/div/div/p", "xpath:idRelative"],
+        ["css=.d-flex:nth-child(3) .bg-lighter .mb-0:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='filters']/div[3]/div[3]/div/div/p", "xpath:idRelative"],
         ["xpath=//div[3]/div/div/p", "xpath:position"]
       ],
       "value": "Entity Attributes Filter"
diff --git a/backend/src/integration/resources/SHIBUI-1732-3.side b/backend/src/integration/resources/SHIBUI-1732-3.side
index c7d0f9fd4..54573d88b 100644
--- a/backend/src/integration/resources/SHIBUI-1732-3.side
+++ b/backend/src/integration/resources/SHIBUI-1732-3.side
@@ -1325,13 +1325,9 @@
       "id": "2dd7992f-ee99-45a3-ad85-20488c4bd4b1",
       "comment": "",
       "command": "click",
-      "target": "xpath=//section/div/div/div[4]/div[2]/div/button",
+      "target": "css=#filters > div:nth-child(3) > div:nth-child(2) > div > button",
       "targets": [
-        ["css=.border-primary:nth-child(2) .mx-auto", "css:finder"],
-        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/div[4]/div[2]/div/button", "xpath:idRelative"],
-        ["xpath=//div[2]/div/button", "xpath:position"],
-        ["xpath=//button[contains(.,'Compare')]", "xpath:innerText"]
+        ["css=.border-primary:nth-child(2) .svg-inline--fa", "css:finder"]
       ],
       "value": ""
     }, {
@@ -1553,21 +1549,21 @@
         ["xpath=//ul[2]/li[2]/span", "xpath:position"]
       ],
       "value": "bar"
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "575d414c-556d-45f7-b2f2-c9971ad51348",

From dcfeae0cf874c81d1677571f8cc48778aabd66ef Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 27 Jul 2022 10:06:31 -0700
Subject: [PATCH 30/81] Consolidated messages files

Former-commit-id: e318e00840321dc6e42c010ef097d51899b985c7
---
 .../main/resources/i18n/messages.properties   |  23 +-
 .../resources/i18n/messages_en.properties     | 566 ------------------
 2 files changed, 18 insertions(+), 571 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index d5202280e..a9a0560be 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -216,7 +216,7 @@ label.select-protocol=Select Protocol
 label.nameid-format=NameID Format
 label.nameid-formats=NameID Formats
 label.name-and-entity-id=Name and Entity ID
-label.organization-information=SP/Organization Information
+label.organization-information=Organization Information
 label.contact-information=Contact Information
 label.given-name=Given Name
 label.contact-type=Contact Type
@@ -282,7 +282,7 @@ label.add-a-new-metadata-source=Add a new metadata source - Finish Summary
 label.name-and-entityid=Name and Entity ID.
 label.finish-summary-validation=Finished!
 label.select-entity-id-to-copy=Select the Entity ID to copy
-label.metadata-source-name-dashboard-display-only=Metadata Source Name (Dashboard Display Only)
+label.metadata-source-name-dashboard-display-only=Service Provider Name (Dashboard Display Only)
 label.new-entity-id=New Entity ID
 label.sections-to-copy=Sections to Copy?
 label.add-a-new-metadata-resolver=Add a new metadata source
@@ -417,6 +417,7 @@ label.dynamic-attributes=Dynamic Attributes
 label.metadata-filter-plugins=Metadata Filter Plugins
 label.advanced-settings=Advanced Settings
 label.edit-metadata-provider=Edit Metadata Provider
+label.edit-metadata-source=Edit Metadata Source
 label.http-settings-advanced=Http Settings (Advanced)
 
 label.metadata-ui=User Interface / MDUI Information
@@ -439,6 +440,7 @@ label.attribute-eduPersonUniqueId=eduPersonUniqueId
 label.attribute-employeeNumber=employeeNumber
 label.force-authn=Force AuthN
 
+label.dynamic-attributes=Dynamic Attributes
 label.min-cache-duration=Min Cache Duration
 label.max-cache-duration=Max Cache Duration
 label.max-idle-entity-data=Max Idle Entity Data
@@ -466,14 +468,20 @@ label.nameid-formats-type=NameID Type
 label.select-filter-type=Select Filter Type
 
 label.admin=Admin
+label.action-required=Action Required
+label.user-access-request=User Access Request
 label.user-maintenance=User Maintenance
 label.user-id=UserId
 label.email=Email
+label.role=Role
 label.delete=Delete?
-
-label.title=Title
+label.delete-request=Delete Request
+label.enable=Enable
+label.disable=Disable
 label.enabled=Enabled
 label.disabled=Disabled
+label.enable-metadata-sources=Enable Metadata Sources
+label.title=Title
 label.author=Author
 label.creation-date=Creation Date
 label.order=Order
@@ -543,6 +551,7 @@ message.uri-valid-format=URI must be valid format.
 message.id-unique=ID must be unique.
 message.name-unique=Service provider name must be unique.
 message.array-items-must-be-unique=Items in list must be unique.
+message.real-number=Optional. If using a value, must be a real number between 0-1.
 message.valid-duration=Must be a valid duration.
 message.valid-name=No special characters or whitespace allowed.
 message.required=Missing required property.
@@ -592,7 +601,9 @@ message.database-constraint=There was a database constraint problem processing t
 
 message.no-filters=No Filters
 message.no-filters-added=No filters have been added to this Metadata Provider
-
+message.user-request-received-title=User request received
+message.user-request-received-body=Your request has been received and is being reviewed. You will be notified with access status.
+message.filter-fail=A server error occured, and the filter failed to save.
 message.create-new-version-from-version=Create New Version from Previous Settings
 message.restoring-this-version-will-copy=Restoring this version will copy the Version ({ date }) configuration and create a new Version from the selected version settings. You can then edit the configuration before saving the new version.
 
@@ -628,6 +639,8 @@ tooltip.certificate-name=Certificate Name
 tooltip.certificate-type=Certificate Type
 tooltip.certificate=Certificate
 tooltip.logout-endpoints=Logout Endpoints
+tooltip.logout-endpoints-url=Logout Endpoints Url
+tooltip.logout-endpoints-binding-type=Logout Endpoints Binding Type
 tooltip.url=Logout Endpoints Url
 tooltip.binding-type=Logout Endpoints Binding Type
 tooltip.mdui-display-name=Typically, the IdP Display Name field will be presented on IdP discovery service interfaces.
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index ca93cdbb3..e69de29bb 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -1,566 +0,0 @@
-# Fill this file with key/value pairs, as follows:
-#
-# some.test.message=This is a test message.
-#
-# Then, create a copy using the name of the language code:
-#
-# messages_<code>.properties
-#
-# Do this for each language we want to support.
-# Ideally, all messages should exist for each language.
-
-action.dashboard=Dashboard
-action.logout=Logout
-action.add=Add
-action.add-new=Add New
-action.add-new-provider=Add a new metadata provider
-action.add-new-source=Add a new metadata source
-action.clear=Clear
-action.delete=Delete
-action.remove=Remove
-action.save=Save
-action.toggle=Toggle
-action.add-contact=Add Contact
-action.add-contacts=Add Contacts
-action.use-mine=Use My Changes
-action.use-theirs=Use Their Changes
-action.discard-changes=Discard Changes
-action.add-endpoint=Add Endpoint
-action.add-nameid-format=Add NameID Format
-action.add-certificate=Add Certificate
-action.add-entity-id=Add Entity ID
-action.download-file=Download File
-action.cancel=Cancel
-action.search=Search
-action.select-id=Select ID
-action.finish-later=Finish Later
-action.back=Back
-action.next=Next
-action.create=Create
-action.copy=Copy
-action.choose-file=Choose File
-action.search-by=Search By
-action.preview=Preview
-action.select-metadata-filter-type=Select a metadata filter type
-action.add-authentication-method=Add Authentication Method
-action.move-up=Move Up
-action.move-down=Move Down
-action.edit=Edit
-action.add-filter=Add Filter
-action.manage-filters=Manage Filters
-
-value.enabled=Enabled
-value.disabled=Disabled
-value.none=None
-value.file=File
-value.memory=Memory
-value.true=true
-value.false=false
-value.regex=Regex
-value.script=Script
-value.entity-id=Entity ID
-
-value.support=Support
-value.technical=Technical
-value.administrative=Administrative
-value.other=Other
-
-value.signing=Signing
-value.encryption=Encryption
-value.both=Both
-
-value.entity=Entity
-value.condition-ref=ConditionRef
-value.condition-script=ConditionScript
-
-value.file-backed-http-metadata-provider=FileBackedHttpMetadataProvider
-value.file-system-metadata-provider=FileSystemMetadataProvider
-value.local-dynamic-metadata-provider=LocalDynamicMetadataProvider
-value.dynamic-http-metadata-provider=DynamicHttpMetadataProvider
-value.entity-attributes-filter=EntityAttributes Filter
-value.spdescriptor=SPSSODescriptor
-value.attr-auth-descriptor=AttributeAuthorityDescriptor
-value.dynamic-http-metadata-provider=DynamicHttpMetadataProvider
-value.local-dynamic-metadata-provider=LocalDynamicMetadataProvider
-
-value.md-query-protocol=MetadataQueryProtocol
-value.template=Template
-
-brand.header.title=Source Management
-brand.logo-link-label=Shibboleth
-brand.logo-link-description=Link to Shibboleth Website
-brand.logo-alt=Shibboleth Logo - Click to be directed to www.shibboleth.net
-brand.footer.text=Links to Shibboleth resources:
-brand.footer.links-label-1=Home Page
-brand.footer.links-desc-1=Shibboleth.net open-source community home page
-brand.footer.links-label-2=Wiki
-brand.footer.links-desc-2=Shibboleth.net open-source community wiki
-brand.footer.links-label-3=Issue Tracker
-brand.footer.links-desc-3=Shibboleth.net open-source community issue tracker
-brand.footer.links-label-4=Mailing List
-brand.footer.links-desc-4=Shibboleth.net open-source community mailing list
-brand.footer.copyright=Copyright \u00A9 {year} Internet2
-
-brand.in-partnership-with=In partnership with
-brand.and=and
-
-heading.shibboleth=Shibboleth
-
-label.metadata-source=Metadata Source
-label.metadata-sources=Metadata Sources
-label.metadata-provider=Metadata Provider
-label.metadata-providers=Metadata Providers
-label.source-management=Source Management
-label.search-files=Search Files
-label.service-provider-entity-id=Service Provider Entity ID
-label.service-provider-name-dashboard-display-only=Service Provider Name (Dashboard Display Only)
-label.enable-this-service=Enable this service?
-label.organization-name=Organization Name
-label.organization-display-name=Organization Display Name
-label.organization-url=Organization URL
-label.name=Name
-label.type=Type
-label.email-address=Email Address
-label.assertion-consumer-service-endpoints=Assertion Consumer Service Endpoints
-label.my-changes=My Changes
-label.their-changes=Their Changes
-label.new-endpoint=New Endpoint
-label.select-binding=Select Binding Type
-label.mark-as-default=Mark as Default
-label.attribute-name=Attribute Name
-label.yes=Yes
-label.check-all-attributes=Check All Attributes
-label.clear-all-attributes=Clear All Attributes
-label.protocol-support-enumeration=Protocol Support Enumeration
-label.select-protocol=Select Protocol
-label.nameid-format=NameID Format
-label.nameid-formats=NameID Formats
-label.name-and-entity-id=Name and Entity ID
-label.organization-information=Organization Information
-label.contact-information=Contact Information
-label.given-name=Given Name
-label.contact-type=Contact Type
-label.user-interface-mdui-infromation=User Interface / MDUI Information
-label.display-name=Display Name
-label.information-url=Information URL
-label.description=Description
-label.privacy-statement=Privacy Statement URL
-label.logo-url=Logo URL
-label.logo-width=Logo Width
-label.logo-height=Logo Height
-label.sp-sso-descriptor-information=SP SSO Descriptor Information
-label.logout-endpoints=Logout Endpoints
-label.binding-types=Binding Type
-label.security-information=Security Information
-label.is-there-a-x509-certificate=Is there a X509 Certificate?
-label.authentication-requests-signed=Authentication Requests Signed?
-label.want-assertions-signed=Want Assertions Signed?
-label.x509-certificates=X509 Certificates
-label.certificate-name-display-only=Certificate Name (Display Only)
-label.certificate=Certificate
-label.assertion-consumer-services=Assertion Consumer Services
-label.assertion-consumer-service-location=Location
-label.assertion-consumer-service-endpoint=Assertion Consumer Service Endpoints
-label.default=(default)
-label.assertion-consumer-service-location-binding=Location Binding
-label.relying-party-overrides=Relying Party Overrides
-label.sign-the-assertion=Sign the Assertion?
-label.turn-off-encryption-of-response=Turn off Encryption of Response?
-label.use-sha1-signing-algorithm=Use SHA1 Signing Algorithm?
-label.ignore-any-sp-requested-authentication-method=Ignore any SP-Requested Authentication Method?
-label.omit-not-before-condition=Omit Not Before Condition?
-label.responderid=ResponderID
-label.attribute-release=Attribute Release
-label.true=True
-label.false=False
-label.no=No
-label.new-cert=New Certificate
-label.url=URL
-label.privacy-statement-url=Privacy Statement URL
-label.contact-name=Contact Name
-label.select-contact-type=Select Contact Type
-label.contact-email-address=Contact Email Address
-label.dont-sign-the-response=Don\u0027t Sign the Response
-label.nameid-format-to-send=NameID Format to Send
-label.authentication-methods-to-use=Authentication Methods to Use
-label.auth-method-indexed=Authentication Method
-label.preview-provider=Preview XML
-label.search-entity-id=Search Entity Id
-label.edit-filter=Edit Filter
-label.min-4-chars=Minimum 4 characters.
-label.new-filter=New Filter
-label.service-provider=Metadata Source Name:
-label.created-date=Created Date:
-label.service-entity-id=Metadata Source Entity ID:
-label.service-provider-status=Metadata Source Status:
-label.current-metadata-sources=Current Metadata Sources
-label.current-metadata-providers=Current Metadata Providers
-label.add-a-new-metadata-provider=Add a new metadata provider
-label.service-resolver-name-dashboard-display-only=Service Provider Name (Dashboard Display Only)
-label.service-resolver-entity-id=Service Provider Entity ID
-label.add-a-new-metadata-source=Add a new metadata source - Finish Summary
-label.name-and-entityid=Name and Entity ID.
-label.finish-summary-validation=Finished!
-label.select-entity-id-to-copy=Select the Entity ID to copy
-label.metadata-source-name-dashboard-display-only=Service Provider Name (Dashboard Display Only)
-label.new-entity-id=New Entity ID
-label.sections-to-copy=Sections to Copy?
-label.add-a-new-metadata-resolver=Add a new metadata source
-label.how-are-you-adding-the-metadata-information=How are you adding the metadata information?
-label.upload-url=Upload/URL
-label.or=or
-label.name-and-upload-url=Name and Upload Url
-label.service-resolver-file=Select Provider Metadata File
-label.service-resolver-metadata-url=Service Provider Metadata URL
-label.search-criteria-by=Search Criteria by { displayType }
-label.entity-ids-added=Entity Ids Added
-label.ui-mdui-info=User Interface / MDUI Information
-label.sp-sso-descriptor-info=SP SSO Descriptor Information
-label.security-info=Security Information
-label.sp-org-info=SP/Organization Information
-label.finished=Finished!
-label.signing=Signing
-label.encryption=Encryption
-label.both=Both
-label.org-info=Organization Information
-label.security-descriptor-info=Security Descriptor Information
-label.entity-id=Entity ID
-label.service-provider-name=Service Provider Name
-label.organization=Organization
-label.contacts=Contacts
-label.contact=Contact
-label.mdui=MDUI Information
-label.service-provider-sso-descriptor=Service Provider Sso Descriptor
-label.service-enabled=Service Enabled
-label.filter-name=Filter Name
-label.filter-enabled=Filter Enabled
-label.filter-target=FilterTarget
-label.filter-type=Filter Type
-label.value=Value
-label.binding-type=Binding Type
-label.sign-assertion=Sign Assertions
-label.dont-sign-response=Don\u0027t Sign Response
-label.turn-off-encryption=Turn off encryption
-label.use-sha=Use Sha
-label.ignore-authentication-method=Ignore Authentication Method
-label.omit-not-before=Omit Not Before
-label.responder-id=Responder ID
-label.name-id-formats=Name ID Formats
-label.name-id-format= Name ID Format
-label.authentication-methods=Authentication Methods
-label.authentication-method=Authentication Method
-label.x509-certificate-available=x509 Certificate Available
-label.protocol-support-enum=Protocol Support Enumeration
-label.binding=Binding
-label.location-url=Location URL
-label.make-default=Make Default
-label.metadata-provider-name-dashboard-display-only=Metadata Provider Name (Dashboard Display Only)
-label.default-authentication-methods=Default Authentication Method(s)
-label.new-of-type=New { type }
-
-label.metadata-filter-name=Metadata Filter Name (Dashboard Display Only)
-label.filter-enable=Enable this Filter?
-label.search-criteria=Search Criteria
-label.metadata-filter=Metadata Filter
-label.metadata-filter-type=Metadata Filter Type
-
-label.http-connection-attributes=HTTP Connection Attributes
-label.http-security-attributes=HTTP Security Attributes
-label.http-proxy-attributes=HTTP Proxy Attributes
-label.http-caching-attributes=HTTP Caching Attributes
-
-label.connection-request-timeout=Connection Request Timeout
-label.connection-timeout=Connection Timeout
-label.socket-timeout=Socket Timeout
-label.disregard-tls-cert=Disregard TLS Certificate?
-label.proxy-host=Proxy Host
-label.proxy-port=Proxy Port
-label.proxy-user=Proxy User
-label.proxy-password=Proxy Password
-label.http-caching=HTTP Caching?
-label.select-caching-type=Select Caching Type
-label.http-caching-directory=HTTP Cache Directory
-label.http-max-cache-entries=HTTP Max Cache Entries
-label.max-cache-entry-size=HTTP Max Cache Entry Size
-label.duration=Duration
-label.real-number=Real Number (between 0.0 and 1.0)
-label.min-refresh-delay=Min Refresh Delay
-label.max-refresh-delay=Max Refresh Delay
-label.refresh-delay-factor=Refresh Delay Factor
-label.resolve-via-predicates-only=Resolve Via Predicates Only?
-label.expiration-warning-threshold=Expiration Warning Threshold
-
-label.satisfy-any-predicates=Satisfy Any Predicates?
-label.use-default-predicate-reg=Use Default Predicate Registry?
-label.fail-fast-init=Fail Fast Initialization?
-label.require-valid-metadata=Require Valid Metadata?
-label.backup-file-init-refresh-delay=Backup File Init Next Refresh Delay
-label.backing-file=Backing File
-label.init-from-backup=Initialize From Backup File?
-label.metadata-url=Metadata URL
-label.xml-id=ID
-label.enable-service=Enable this service?
-label.metadata-provider-type=Metadata Provider Type
-label.metadata-provider-name=Metadata Provider Name
-label.select-metadata-type=Select a metadata provider type
-label.metadata-provider-status=Metadata Provider Status
-label.enable-provider-upon-saving=Enable Metadata Provider?
-label.certificate-type=Type
-
-label.metadata-file=Metadata File
-
-label.enable-filter=Enable Filter?
-label.required-valid-until=Required Valid Until Filter
-label.max-validity-interval=Max Validity Interval
-label.signature-validation-filter=Signature Validation Filter
-label.require-signed-root=Require Signed Root
-label.certificate-file=Certificate File
-label.entity-role-whitelist=Entity Role Whitelist Filter
-label.retained-roles=Retained Roles
-label.remove-roleless-entity-descriptors=Remove Roleless Entity Descriptors?
-label.remove-empty-entities-descriptors=Remove Empty Entities Descriptors?
-
-label.select-metadata-provider-type=Select Metadata Provider Type
-label.filter-list=Filter List
-label.common-attributes=Common Attributes
-label.reloading-attributes=Reloading Attributes
-label.dynamic-attributes=Dynamic Attributes
-label.metadata-filter-plugins=Metadata Filter Plugins
-label.advanced-settings=Advanced Settings
-label.edit-metadata-provider=Edit Metadata Provider
-label.edit-metadata-source=Edit Metadata Source
-label.http-settings-advanced=Http Settings (Advanced)
-
-label.metadata-ui=User Interface / MDUI Information
-label.descriptor-info=SP SSO Descriptor Information
-label.key-info=Security Information
-label.assertion=Assertion Consumer Service
-label.relying-party=Relying Party Overrides
-
-label.attribute-eduPersonPrincipalName=eduPersonPrincipalName (EPPN)
-label.attribute-uid=uid
-label.attribute-mail=mail
-label.attribute-surname=surname
-label.attribute-givenName=givenName
-label.attribute-eduPersonAffiliation=eduPersonAffiliation
-label.attribute-eduPersonScopedAffiliation=eduPersonScopedAffiliation
-label.attribute-eduPersonPrimaryAffiliation=eduPersonPrimaryAffiliation
-label.attribute-eduPersonEntitlement=eduPersonEntitlement
-label.attribute-eduPersonAssurance=eduPersonAssurance
-label.attribute-eduPersonUniqueId=eduPersonUniqueId
-label.attribute-employeeNumber=employeeNumber
-label.force-authn=Force AuthN
-
-label.dynamic-attributes=Dynamic Attributes
-label.min-cache-duration=Min Cache Duration
-label.max-cache-duration=Max Cache Duration
-label.max-idle-entity-data=Max Idle Entity Data
-label.cleanup-task-interval=Cleanup Task Interval
-label.persistent-cache-manager-directory=Persistent Cache Manager Directory
-label.initialize-from-persistent-cache-in-background=Initialize from Persistent Cache in Background?
-label.background-init-from-cache-delay=Background Initialization from Cache Delay
-label.source-directory=Source Directory
-label.remove-idle-entity-data=Remove Idle Entity Data?
-label.do-resolver-initialization=Initialize
-label.file-doesnt-exist=The file specified in the resolver does not exist on the file system. Therefore, the resolver cannot be initialized.
-
-label.md-request-type=Metadata Request URL Construction Type
-label.md-request-value=Metadata Request URL Construction Value
-label.transform-ref=Transform Ref
-label.encoding-style=Encoding Style
-label.velocity-engine=Velocity Engine
-label.match=Match
-
-label.remove-existing-formats=Remove Existing Formats?
-label.nameid-formats-format=NameID Format
-label.nameid-formats-value=NameID Value
-label.nameid-formats-type=NameID Type
-
-label.select-filter-type=Select Filter Type
-
-label.admin=Admin
-label.action-required=Action Required
-label.user-access-request=User Access Request
-label.user-maintenance=User Maintenance
-label.user-id=UserId
-label.email=Email
-label.role=Role
-label.delete=Delete?
-label.delete-request=Delete Request
-
-label.enable=Enable
-label.disable=Disable
-label.enable-metadata-sources=Enable Metadata Sources
-
-label.source=Metadata Source
-label.provider=Metadata Provider
-
-message.delete-user-title=Delete User?
-message.delete-user-body=You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue?
-
-message.must-be-unique=Must be unique.
-message.name-must-be-unique=Name must be unique.
-message.uri-valid-format=URI must be valid format.
-message.id-unique=ID must be unique.
-message.array-items-must-be-unique=Items in list must be unique.
-message.real-number=Optional. If using a value, must be a real number between 0-1.
-
-message.org-name-required=Organization Name is required.
-message.org-displayName-required=Organization Name is required.
-message.org-url-required=Organization Name is required.
-message.org-incomplete=These three fields must all be entered if any single field has a value.
-
-message.type-required=Missing required property: Type
-message.match-required=Missing required property: Match
-message.value-required=Missing required property: Value
-message.required=Missing required property.
-
-message.conflict=Conflict
-message.data-version-contention=Data Version Contention
-message.contention-new-version=A newer version of this metadata source has been saved. Below are a list of changes. You can use your changes or their changes.
-message.organization-feedback=These three fields must all be entered if any single field has a value.
-message.valid-email=Must be a valid Email Address
-message.valid-url=Must be a valid URL
-message.must-be-valid-url=Must be a valid URL
-message.must-be-integer=Must be an integer equal to or greater than 0
-message.delete-source-title=Delete Metadata Source?
-message.delete-source-body=You are deleting a metadata source. This cannot be undone. Continue?
-message.incomplete-form=Incomplete Form
-message.delete-filter-title=Delete Metadata Filter?
-message.delete-filter-body=You are deleting a metadata filter. This cannot be undone. Continue?
-message.unsaved-dialog-title=Save your information?
-message.unsaved-editor=You have not saved your changes. If you exit this screen, your changes will be lost.
-message.editor-invalid=All forms must be valid before changes can be saved!
-message.unsaved-source-1=You have not completed the wizard! Do you wish to save this information? You can finish the wizard later by clicking the \u0027Edit\u0027
-message.unsaved-source-2=icon on the dashboard.
-message.service-resolver-name-required=Service Provider Name is required
-message.entity-id-required=Entity ID is required
-message.entity-id-must-be-unique=Entity ID must be unique
-message.target-required=Entity ID to copy is required
-message.file-upload-alert=Note: You can only import a file with a single entityID (EntityDescriptor element) in it. Anything more in that file will result in an error.
-message.add-new-md-resolver=Add a new metadata source
-message.wizard-status=Step { index } of { length }
-message.entity-id-min-unique=You must add at least one entity id target and they must each be unique.
-message.required-for-scripts=Required for Scripts
-message.required-for-regex=Required for Regex
-message.file-doesnt-exist=The requested file to be processed does not exist on the server.
-message.database-constraint=There was a database constraint problem processing the request. Check the request to ensure that fields that must be unique are truly unique.
-
-message.user-request-received-title=User request received
-message.user-request-received-body=Your request has been received and is being reviewed. You will be notified with access status.
-
-message.filter-fail=A server error occured, and the filter failed to save.
-
-tooltip.entity-id=Entity ID
-tooltip.service-provider-name=Service Provider Name (Dashboard Display Only)
-tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process
-tooltip.service-provider-name-dashboard-display-only=Service Provider Name (Dashboard Display Only)
-tooltip.service-provider-entity-id=Service Provider Entity ID
-tooltip.organization-name=Organization Name
-tooltip.organization-display-name=Organization Display Name
-tooltip.organization-url=Organization URL
-tooltip.name=Name
-tooltip.type=Type
-tooltip.email-address=Email Address
-tooltip.assertion-consumer-service-location=Assertion Consumer Service Location
-tooltip.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding
-tooltip.mark-as-default=Mark as Default
-tooltip.protocol-support-enumeration=Protocol Support Enumeration
-tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or {{<ConditionRef>}}elements.
-tooltip.enable-this-service-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
-tooltip.authentication-requests-signed=Authentication Requests Signed
-tooltip.want-assertions-signed=Want Assertions Signed
-tooltip.certificate-name=Certificate Name
-tooltip.certificate-type=Certificate Type
-tooltip.certificate=Certificate
-tooltip.logout-endpoints-url=Logout Endpoints Url
-tooltip.logout-endpoints-binding-type=Logout Endpoints Binding Type
-tooltip.mdui-display-name=Typically, the IdP Display Name field will be presented on IdP discovery service interfaces.
-tooltip.mdui-information-url=The IdP Information URL is a link to a comprehensive information page about the IdP. This page should expand on the content of the IdP Description field.
-tooltip.mdui-description=The IdP Description is a brief description of the IdP service. On a well-designed discovery interface, the IdP Description will be presented to the user in addition to the IdP Display Name, and so the IdP Description helps disambiguate duplicate or similar IdP Display Names.
-tooltip.mdui-privacy-statement-url=The IdP Privacy Statement URL is a link to the IdP\u0027s Privacy Statement. The content of the Privacy Statement should be targeted at end users.
-tooltip.mdui-logo-url=The IdP Logo URL in metadata points to an image file on a remote server. A discovery service, for example, may rely on a visual cue (i.e., a logo) instead of or in addition to the IdP Display Name.
-tooltip.mdui-logo-width=The logo should have a minimum width of 100 pixels
-tooltip.mdui-logo-height=The logo should have a minimum height of 75 pixels and a maximum height of 150 pixels (or the application will scale it proportionally)
-tooltip.contact-name=Contact Name
-tooltip.contact-type=Contact Type
-tooltip.contact-email=Contact Email
-tooltip.sign-assertion=Sign Assertion
-tooltip.dont-sign-response=Don\u0027t Sign Response
-tooltip.turn-off-encryption=Turn Off Encryption of Response
-tooltip.usa-sha-algorithm=Use SHA1 Signing Algorithm
-tooltip.authentication-methods-to-use=Authentication Methods to Use
-tooltip.ignore-auth-method=Ignore any SP-Requested Authentication Method
-tooltip.omit-not-before-condition=Omit Not Before Condition
-tooltip.responder-id=ResponderId
-tooltip.instruction=Information icon
-tooltip.attribute-release-table=Attribute release table - select the attributes you want to release (default unchecked)
-tooltip.metadata-filter-name=Metadata Filter Name
-tooltip.metadata-filter-type=Metadata Filter Type
-tooltip.connection-request-timeout=The maximum amount of time to wait for a connection to be returned from the HTTP client\u0027s connection pool manager. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
-tooltip.connection-timeout=The maximum amount of time to wait to establish a connection with the remote server. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
-tooltip.socket-timeout=The maximum amount of time to wait between two consecutive packets while reading from the socket connected to the remote server. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
-tooltip.disregard-tls-cert=If true, no TLS certificate checking will take place over an HTTPS connection. This attribute is incompatible with httpClientRef. (Be careful with this setting, it is typically only used during testing. See the HttpClientConfiguration topic for more information.)
-tooltip.proxy-host=The hostname of the HTTP proxy through which connections will be made. This attribute is incompatible with httpClientRef.
-tooltip.proxy-port=The port of the HTTP proxy through which connections will be made. This attribute is incompatible with httpClientRef.
-tooltip.proxy-user=The username used with the HTTP proxy through which connections will be made. This attribute is incompatible with httpClientRef.
-tooltip.proxy-password=The password used with the HTTP proxy through which connections will be made. This attribute is incompatible with httpClientRef.
-tooltip.http-caching=The type of low-level HTTP caching to perform. There are three choices: 'none' indicates the HTTP response is not cached by the client library, 'file' indicates the HTTP response is written to disk (but will not survive a restart), 'memory' indicates the HTTP response is stored in memory. This attribute is incompatible with httpClientRef and its value may not be specified as a bean property. Some metadata providers, most notably the reloading 'batch-oriented' providers, implement HTTP caching at a higher layer and tend to work best with httpCaching='none'.
-tooltip.http-caching-directory=If httpCaching='file', this attribute specifies where retrieved files are to be cached. This attribute is incompatible with httpClientRef.
-tooltip.http-max-cache-entries=The maximum number of responses written to cache. This attribute is incompatible with httpClientRef.
-tooltip.max-cache-entry-size=The maximum response body size that may be cached, in bytes. This attribute is incompatible with httpClientRef.
-
-tooltip.metadata-provider-name=Metadata Provider Name (for display on the Dashboard only)
-tooltip.metadata-provider-type=Metadata Provider Type
-tooltip.xml-id=Identifier for logging, identification for command line reload, etc.
-tooltip.metadata-url=The URL that the metadata is served from.
-tooltip.metadata-file=The absolute path to the local metadata file to be loaded.
-tooltip.init-from-backup=Flag indicating whether initialization should first attempt to load metadata from the backup file.  If true, foreground initialization will be performed by loading the backing file, and then a refresh from the remote HTTP server will be scheduled to execute in a background thread, after a configured delay. This can improve IdP startup times when the remote HTTP file is large in size.
-tooltip.backing-file=Specifies where the backing file is located. If the remote server is unavailable at startup, the backing file is loaded instead.
-tooltip.backup-file-init-refresh-delay=Delay duration after which to schedule next HTTP refresh when initialized from the backing file.
-tooltip.require-valid-metadata=Whether candidate metadata found by the resolver must be valid in order to be returned (where validity is implementation specific, but in SAML cases generally depends on a validUntil attribute.) If this flag is true, then invalid candidate metadata will not be returned.
-tooltip.fail-fast-init=Whether to fail initialization of the underlying MetadataResolverService (and possibly the IdP as a whole) if the initialization of a metadata provider fails. When false, the IdP may start, and will continue to attempt to reload valid metadata if configured to do so, but operations that require valid metadata will fail until it does.
-tooltip.use-default-predicate-reg=Flag which determines whether the default CriterionPredicateRegistry will be used if a custom one is not supplied explicitly.
-tooltip.satisfy-any-predicates=Flag which determines whether predicates used in filtering are connected by a logical 'OR' (true) or by logical 'AND' (false).
-tooltip.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
-
-tooltip.max-validity-interval=Defines the window within which the metadata is valid.
-tooltip.require-signed-root=If true, this fails to load metadata with no signature on the root XML element.
-tooltip.certificate-file=A path (on the local file system) to a certificate file whose key is used to verify the signature. Conflicts with trustEngineRef and both of the child elements.
-tooltip.retained-roles=Note that property replacement cannot be used on this element.
-tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntityDescriptor> element must include at least one role descriptor.
-tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntitiesDescriptor> element must include at least one child element, either an <md:EntityDescriptor> element or an <md:EntitiesDescriptor> element.
-
-tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration. Setting this to 0 will result in the default value being used.
-tooltip.max-refresh-delay=Upper bound on the next refresh from the time calculated based on the metadata\u0027s expiration.
-tooltip.refresh-delay-factor=A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata\u0027s expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay.
-tooltip.resolve-via-predicates-only=Flag indicating whether resolution may be performed solely by applying predicates to the entire metadata collection, when an entityID input criterion is not supplied.
-tooltip.expiration-warning-threshold=For each attempted metadata refresh (whether or not fresh metadata is obtained), if requireValidMetadata is true, and there is a validUntil XML attribute on the document root element, and the difference between validUntil and the current time is less than expirationWarningThreshold, the system logs a warning about the impending expiration.
-
-tooltip.filter-name=Filter Name
-tooltip.enable-filter=Enable Filter?
-tooltip.enable-service=Enable Service?
-
-tooltip.min-cache-duration=The minimum duration for which metadata will be cached before it is refreshed.
-tooltip.max-cache-duration=The maximum duration for which metadata will be cached before it is refreshed.
-tooltip.max-idle-entity-data=The maximum duration for which metadata will be allowed to be idle (no requests for it) before it is removed from the cache.
-tooltip.cleanup-task-interval=The interval at which the internal cleanup task should run.  This task performs background maintenance tasks, such as the removal of expired and idle metadata.
-tooltip.persistent-cache-manager-directory=The optional manager for the persistent cache store for resolved metadata.  On metadata provider initialization, data present in the persistent cache will be loaded to memory, effectively restoring the state of the provider as closely as possible to that which existed before the previous shutdown.  Each individual cache entry will only be loaded if 1) the entry is still valid as determined by the internal provider logic, and 2) the entry passes the (optional) predicate supplied via initializationFromCachePredicateRef.
-tooltip.initialize-from-persistent-cache-in-background=Flag indicating whether should initialize from the persistent cache in the background.  Initializing from the cache in the background will improve IdP startup times.
-tooltip.background-init-from-cache-delay=The delay after which to schedule the background initialization from the persistent cache when initializeFromPersistentCacheInBackground=true.
-
-tooltip.source-directory=Convenience mechanism for wiring a FilesystemLoadSaveManager, loading from the specified source directory in the local filesystem. This attribute will be ignored if sourceManagerRef is also specified.  Either this attribute or sourceManagerRef is required.
-tooltip.remove-idle-entity-data=Flag indicating whether idle metadata should be removed.
-
-tooltip.do-resolver-initialization=Initialize this resolver? In the case of Filesystem resolvers, this will cause the system to read the file and index the resolver.
-tooltip.md-request-type=Options are 1) Metadata Query Protocol, 2) Regex.
-tooltip.md-request-value=Content of the element.
-tooltip.transform-ref=A reference to a transform function for the entityID. If used, the child element must be empty.
-tooltip.encoding-style=Determines whether and how the entityID value will be URL encoded prior to replacement.  Allowed values are: 1) "none" - no encoding is performed, 2) "form" - encoded using URL form parameter encoding (for query parameters), 3) "path" - encoded using URL path encoding, or 4) "fragment" - encoded using URL fragment encoding. The precise definition of these terms is defined in the documentation for the methods of the Guava library\u0027s UrlEscapers class.
-tooltip.velocity-engine=This attribute may be used to specify the name of the Velocity engine defined within the application.
-tooltip.match=A regular expression against which the entityID is evaluated.
-
-tooltip.remove-existing-formats=Whether to remove any existing formats from a role if any are added by the filter (unmodified roles will be untouched regardless of this setting)
-tooltip.nameid-formats-format=Format
-tooltip.nameid-formats-value=Value
-tooltip.nameid-formats-type=Type
\ No newline at end of file

From 6fdc603a8533de020fe813736396a37beda3c94d Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 27 Jul 2022 13:31:27 -0700
Subject: [PATCH 31/81] SHIBUI-2327

Adding missing libraries and needed marshalling configuration for using pac4j


Former-commit-id: 9c5571b7a80f91563d119e6d5d685e428e4a4505
---
 .../resources/modified-saml2-assertion-config.xml  | 14 +++++++++++++-
 pac4j-module/build.gradle                          |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/resources/modified-saml2-assertion-config.xml b/backend/src/main/resources/modified-saml2-assertion-config.xml
index 2f09fa77b..3349e4558 100644
--- a/backend/src/main/resources/modified-saml2-assertion-config.xml
+++ b/backend/src/main/resources/modified-saml2-assertion-config.xml
@@ -230,7 +230,19 @@
             <MarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeMarshaller"/>
             <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeUnmarshaller"/>
         </ObjectProvider>
- 
+
+        <ObjectProvider qualifiedName="saml2:Issuer">
+            <BuilderClass className="org.opensaml.saml.saml2.core.impl.IssuerBuilder"/>
+            <MarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeUnmarshaller"/>
+        </ObjectProvider>
+
+        <ObjectProvider qualifiedName="saml2:IssuerType">
+            <BuilderClass className="org.opensaml.saml.saml2.core.impl.IssuerBuilder"/>
+            <MarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.saml.saml2.core.impl.NameIDTypeUnmarshaller"/>
+        </ObjectProvider>
+
         <!-- OneTimeUse -->
         <ObjectProvider qualifiedName="saml2:OneTimeUse">
             <BuilderClass className="org.opensaml.saml.saml2.core.impl.OneTimeUseBuilder"/>
diff --git a/pac4j-module/build.gradle b/pac4j-module/build.gradle
index 6a1295758..4080df12a 100644
--- a/pac4j-module/build.gradle
+++ b/pac4j-module/build.gradle
@@ -46,8 +46,11 @@ dependencies {
         exclude group: 'org.opensaml'
         exclude group: 'commons-collections'
     }
+    // But we do need this opensaml lib that wasn't provided
+    implementation "org.opensaml:opensaml-storage-impl:${project.'opensamlVersion'}"
     compile "org.apache.commons:commons-collections4:${project.'commonsCollections4Version'}"
 
+
     testCompile project(':backend')
     testCompile "org.opensaml:opensaml-saml-api:${project.'opensamlVersion'}"
 

From e0f0074f8ccfc66f469b1d0c6f7ecf8982eebff5 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 27 Jul 2022 15:01:09 -0700
Subject: [PATCH 32/81] Updated spinners

Former-commit-id: 0b6d9d6dd551433b898a514754ee9408a3eb2968
---
 ui/src/app/metadata/hoc/MetadataSchema.js           | 13 +++++++++++--
 ui/src/app/metadata/hoc/MetadataVersionsLoader.js   |  2 +-
 ui/src/app/metadata/view/MetadataWizard.js          |  6 ++++--
 .../app/metadata/wizard/MetadataProviderWizard.js   |  6 +++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ui/src/app/metadata/hoc/MetadataSchema.js b/ui/src/app/metadata/hoc/MetadataSchema.js
index 025e7a415..d2d257623 100644
--- a/ui/src/app/metadata/hoc/MetadataSchema.js
+++ b/ui/src/app/metadata/hoc/MetadataSchema.js
@@ -9,6 +9,7 @@ export const MetadataDefinitionContext = React.createContext();
 export function MetadataSchema({ type, children, wizard = false }) {
 
     const definition = React.useMemo(() => wizard ? getWizard(type) : getDefinition(type), [type, wizard]);
+    const [loading, setLoading] = React.useState(false);
 
     const { get, response } = useFetch(``, {
         cachePolicy: 'no-cache'
@@ -21,18 +22,20 @@ export function MetadataSchema({ type, children, wizard = false }) {
         if (response.ok) {
             setSchema(source);
         }
+        setLoading(false);
     }
 
     /*eslint-disable react-hooks/exhaustive-deps*/
     React.useEffect(() => {
         setSchema(null);
         loadSchema(definition);
+        setLoading(true);
     }, [definition]);
 
     return (
         <MetadataDefinitionContext.Provider value={definition}>
             {type && definition && schema &&
-                <MetadataSchemaContext.Provider value={schema}>
+                <MetadataSchemaContext.Provider value={{ schema, loading }}>
                     {children}
                 </MetadataSchemaContext.Provider>
             }
@@ -41,7 +44,13 @@ export function MetadataSchema({ type, children, wizard = false }) {
 }
 
 export function useMetadataSchemaContext () {
-    return React.useContext(MetadataSchemaContext);
+    const {schema} = React.useContext(MetadataSchemaContext);
+    return schema;
+}
+
+export function useMetadataSchemaLoading () {
+    const {loading} = React.useContext(MetadataSchemaContext);
+    return loading;
 }
 
 export function useMetadataDefinitionContext() {
diff --git a/ui/src/app/metadata/hoc/MetadataVersionsLoader.js b/ui/src/app/metadata/hoc/MetadataVersionsLoader.js
index f552db8c4..d957903d9 100644
--- a/ui/src/app/metadata/hoc/MetadataVersionsLoader.js
+++ b/ui/src/app/metadata/hoc/MetadataVersionsLoader.js
@@ -52,8 +52,8 @@ export function MetadataVersionsLoader ({versions, children}) {
 
     return (
         <React.Fragment>
-            {children(versions.map(v => list[v]).filter(v => !!v))}
             {loading && <div className="d-flex justify-content-center text-primary"><Spinner size="4x" /></div> }
+            {children(versions.map(v => list[v]).filter(v => !!v))}
         </React.Fragment>
     );
 }
\ No newline at end of file
diff --git a/ui/src/app/metadata/view/MetadataWizard.js b/ui/src/app/metadata/view/MetadataWizard.js
index 8dc5a9d51..d48cc4330 100644
--- a/ui/src/app/metadata/view/MetadataWizard.js
+++ b/ui/src/app/metadata/view/MetadataWizard.js
@@ -58,11 +58,13 @@ export function MetadataWizard ({type, data, onCallback}) {
             />
             <Wizard>
                 {type === 'source' ?
-                    <MetadataSourceWizard onSave={save} loading={loading} block={setBlocking} onShowNav={onCallback} />
+                    <React.Fragment>
+                        <MetadataSourceWizard onSave={save} loading={loading} block={setBlocking} onShowNav={onCallback} />
+                        {loading && <div className="d-flex justify-content-center text-primary col-6"><Spinner size="4x" /></div> }
+                    </React.Fragment>
                     :
                     <MetadataProviderWizard onSave={save} loading={loading} block={setBlocking} onRestart={onCallback} />
                 }
-                {loading && <div className="d-flex justify-content-center text-primary col-6"><Spinner size="4x" /></div> }
             </Wizard>
         </MetadataForm>
     );
diff --git a/ui/src/app/metadata/wizard/MetadataProviderWizard.js b/ui/src/app/metadata/wizard/MetadataProviderWizard.js
index 7193c0573..72df681fd 100644
--- a/ui/src/app/metadata/wizard/MetadataProviderWizard.js
+++ b/ui/src/app/metadata/wizard/MetadataProviderWizard.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { WizardNav } from './WizardNav';
 import { MetadataWizardForm } from './MetadataWizardForm';
 import { setWizardIndexAction, useCurrentIndex, useIsLastPage, useWizardDispatcher } from './Wizard';
-import { useMetadataDefinitionContext, useMetadataDefinitionValidator, useMetadataSchemaContext } from '../hoc/MetadataSchema';
+import { useMetadataDefinitionContext, useMetadataDefinitionValidator, useMetadataSchemaContext, useMetadataSchemaLoading } from '../hoc/MetadataSchema';
 import { checkChanges, useMetadataSchema } from '../hooks/schema';
 import { useMetadataFormDispatcher, setFormDataAction, setFormErrorAction, useMetadataFormData, useMetadataFormErrors } from '../hoc/MetadataFormContext';
 import { MetadataConfiguration } from '../component/MetadataConfiguration';
@@ -12,6 +12,7 @@ import { useMetadataProviders } from '../hooks/api';
 import { removeNull } from '../../core/utility/remove_null';
 
 import { useUserGroup } from '../../core/user/UserContext';
+import Spinner from '../../core/components/Spinner';
 
 export function MetadataProviderWizard({onSave, loading, block}) {
 
@@ -20,6 +21,7 @@ export function MetadataProviderWizard({onSave, loading, block}) {
 
     const definition = useMetadataDefinitionContext();
     const schema = useMetadataSchemaContext();
+    const schemaLoading = useMetadataSchemaLoading();
 
     const processed = useMetadataSchema(definition, schema);
 
@@ -49,6 +51,7 @@ export function MetadataProviderWizard({onSave, loading, block}) {
 
     return (
         <>
+            
             <div className="row mb-4">
                 <div className="col-12">
                     <WizardNav onSave={save}
@@ -57,6 +60,7 @@ export function MetadataProviderWizard({onSave, loading, block}) {
                 </div>
             </div>
             <hr />
+            {schemaLoading && <div className="d-flex justify-content-center text-primary col-6"><Spinner size="4x" /></div> }
             <div className="row">
                 <div className="col-12">
                     <MetadataWizardForm

From 953f1fda942c95a5878ebdeda1d93bbf1aacfaaf Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 28 Jul 2022 07:57:21 -0700
Subject: [PATCH 33/81] Fixed issue with configuration loading

Former-commit-id: b2ab61a5066a7ce64a94e5619fc93bf4c74a6b3c
---
 ui/src/app/metadata/hoc/MetadataSchema.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ui/src/app/metadata/hoc/MetadataSchema.js b/ui/src/app/metadata/hoc/MetadataSchema.js
index d2d257623..ea14361d9 100644
--- a/ui/src/app/metadata/hoc/MetadataSchema.js
+++ b/ui/src/app/metadata/hoc/MetadataSchema.js
@@ -5,6 +5,7 @@ import { useTranslator } from '../../i18n/hooks';
 
 export const MetadataSchemaContext = React.createContext();
 export const MetadataDefinitionContext = React.createContext();
+export const MetadataSchemaLoading = React.createContext();
 
 export function MetadataSchema({ type, children, wizard = false }) {
 
@@ -35,8 +36,10 @@ export function MetadataSchema({ type, children, wizard = false }) {
     return (
         <MetadataDefinitionContext.Provider value={definition}>
             {type && definition && schema &&
-                <MetadataSchemaContext.Provider value={{ schema, loading }}>
-                    {children}
+                <MetadataSchemaContext.Provider value={ schema }>
+                    <MetadataSchemaLoading.Provider value={ loading }>
+                        {children}
+                    </MetadataSchemaLoading.Provider>
                 </MetadataSchemaContext.Provider>
             }
         </MetadataDefinitionContext.Provider>
@@ -44,13 +47,11 @@ export function MetadataSchema({ type, children, wizard = false }) {
 }
 
 export function useMetadataSchemaContext () {
-    const {schema} = React.useContext(MetadataSchemaContext);
-    return schema;
+    return React.useContext(MetadataSchemaContext);
 }
 
 export function useMetadataSchemaLoading () {
-    const {loading} = React.useContext(MetadataSchemaContext);
-    return loading;
+    return React.useContext(MetadataSchemaLoading);
 }
 
 export function useMetadataDefinitionContext() {

From 34b46b7854c483d5c438f322e5e66caebdf05abd Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 28 Jul 2022 09:50:01 -0700
Subject: [PATCH 34/81] Fixed loading spinner

Former-commit-id: 81760a5d89c563c4cbb2b979cbeaf6251fd77d80
---
 ui/src/app/metadata/view/MetadataWizard.js         | 6 +-----
 ui/src/app/metadata/wizard/MetadataSourceWizard.js | 5 ++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ui/src/app/metadata/view/MetadataWizard.js b/ui/src/app/metadata/view/MetadataWizard.js
index d48cc4330..a95ca777c 100644
--- a/ui/src/app/metadata/view/MetadataWizard.js
+++ b/ui/src/app/metadata/view/MetadataWizard.js
@@ -8,7 +8,6 @@ import { useMetadataEntity } from '../hooks/api';
 import { createNotificationAction, NotificationTypes, useNotificationDispatcher } from '../../notifications/hoc/Notifications';
 import { Prompt, useHistory } from 'react-router-dom';
 import { useTranslator } from '../../i18n/hooks';
-import Spinner from '../../core/components/Spinner';
 
 export function MetadataWizard ({type, data, onCallback}) {
 
@@ -58,10 +57,7 @@ export function MetadataWizard ({type, data, onCallback}) {
             />
             <Wizard>
                 {type === 'source' ?
-                    <React.Fragment>
-                        <MetadataSourceWizard onSave={save} loading={loading} block={setBlocking} onShowNav={onCallback} />
-                        {loading && <div className="d-flex justify-content-center text-primary col-6"><Spinner size="4x" /></div> }
-                    </React.Fragment>
+                    <MetadataSourceWizard onSave={save} loading={loading} block={setBlocking} onShowNav={onCallback} />
                     :
                     <MetadataProviderWizard onSave={save} loading={loading} block={setBlocking} onRestart={onCallback} />
                 }
diff --git a/ui/src/app/metadata/wizard/MetadataSourceWizard.js b/ui/src/app/metadata/wizard/MetadataSourceWizard.js
index 5dae8319a..b14c5c6d4 100644
--- a/ui/src/app/metadata/wizard/MetadataSourceWizard.js
+++ b/ui/src/app/metadata/wizard/MetadataSourceWizard.js
@@ -8,7 +8,7 @@ import Col from 'react-bootstrap/Col';
 import { WizardNav } from './WizardNav';
 import { MetadataWizardForm } from './MetadataWizardForm';
 import { setWizardIndexAction, useCurrentIndex, useIsFirstPage, useIsLastPage, useWizardDispatcher } from './Wizard';
-import { useMetadataDefinitionContext, useMetadataSchemaContext, useMetadataDefinitionValidator } from '../hoc/MetadataSchema';
+import { useMetadataDefinitionContext, useMetadataSchemaContext, useMetadataDefinitionValidator, useMetadataSchemaLoading } from '../hoc/MetadataSchema';
 import { useMetadataFormDispatcher, setFormDataAction, setFormErrorAction, useMetadataFormData, useMetadataFormErrors } from '../hoc/MetadataFormContext';
 import { MetadataConfiguration } from '../component/MetadataConfiguration';
 import { Configuration } from '../hoc/Configuration';
@@ -17,6 +17,7 @@ import { useMetadataSources } from '../hooks/api';
 import Translate from '../../i18n/components/translate';
 import { checkChanges } from '../hooks/utility';
 import { useCurrentUserLoader, useUserGroup } from '../../core/user/UserContext';
+import Spinner from '../../core/components/Spinner';
 
 
 export function MetadataSourceWizard ({ onShowNav, onSave, block, loading }) {
@@ -24,6 +25,7 @@ export function MetadataSourceWizard ({ onShowNav, onSave, block, loading }) {
     const group = useUserGroup();
 
     const userLoader = useCurrentUserLoader();
+    const schemaLoading = useMetadataSchemaLoading();
 
     /*eslint-disable react-hooks/exhaustive-deps*/
     React.useEffect(() => {
@@ -75,6 +77,7 @@ export function MetadataSourceWizard ({ onShowNav, onSave, block, loading }) {
                 </div>
             </div>
             <hr />
+            {schemaLoading && <div className="d-flex justify-content-center text-primary col-6"><Spinner size="4x" /></div> }
             {warnings && warnings.hasOwnProperty(current) &&
                 <Row className="mb-4">
                     <Col xs="12" lg="6" className="align-items-start">

From 540f2693d2843c576d00b93901430ccddd5591fc Mon Sep 17 00:00:00 2001
From: Jj! <jsjohnson@unicon.net>
Date: Fri, 29 Jul 2022 16:21:52 -0500
Subject: [PATCH 35/81] [SHIBUI-2327] add provider configuration for signatures
 implement method for X509

Former-commit-id: d0db1c5de489d2ebc92a5f25908107272f0f7db5
---
 .../shibboleth/admin/ui/domain/X509Data.java  |   4 +-
 .../main/resources/jpa-signature-config.xml   | 268 ++++++++++++++++++
 2 files changed, 271 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Data.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Data.java
index e875932cd..7afd88814 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Data.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/X509Data.java
@@ -19,6 +19,7 @@
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -74,10 +75,11 @@ public void addX509Certificate(edu.internet2.tier.shibboleth.admin.ui.domain.X50
         this.xmlObjects.add(x509Certificate);
     }
 
+    // TODO: might need to really implement this
     @Nonnull
     @Override
     public List<X509CRL> getX509CRLs() {
-        return null;
+        return Collections.EMPTY_LIST;
     }
 
     @Nonnull
diff --git a/backend/src/main/resources/jpa-signature-config.xml b/backend/src/main/resources/jpa-signature-config.xml
index 0a6696db5..22f00e04b 100644
--- a/backend/src/main/resources/jpa-signature-config.xml
+++ b/backend/src/main/resources/jpa-signature-config.xml
@@ -39,6 +39,274 @@
             <MarshallingClass className="org.opensaml.xmlsec.signature.impl.X509DataMarshaller"/>
             <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.X509DataUnmarshaller"/>
         </ObjectProvider>
+
+        <!-- Jj! -->
+
+        <!-- CryptoBinary type -->
+        <ObjectProvider qualifiedName="ds:CryptoBinary">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- DigestMethod -->
+        <ObjectProvider qualifiedName="ds:DigestMethod">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.DigestMethodBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.DigestMethodMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.DigestMethodUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- DSAKeyValue -->
+        <ObjectProvider qualifiedName="ds:DSAKeyValue">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.DSAKeyValueBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.DSAKeyValueMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.DSAKeyValueUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- Exponent -->
+        <ObjectProvider qualifiedName="ds:Exponent">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.ExponentBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- G -->
+        <ObjectProvider qualifiedName="ds:G">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.GBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- J -->
+        <ObjectProvider qualifiedName="ds:J">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.JBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- KeyValue -->
+        <ObjectProvider qualifiedName="ds:KeyValue">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.KeyValueBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.KeyValueMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.KeyValueUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- MgmtData -->
+        <ObjectProvider qualifiedName="ds:MgmtData">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.MgmtDataBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- Modulus -->
+        <ObjectProvider qualifiedName="ds:Modulus">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.ModulusBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- P -->
+        <ObjectProvider qualifiedName="ds:P">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.PBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- PgenCounter -->
+        <ObjectProvider qualifiedName="ds:PgenCounter">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.PgenCounterBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- PGPData -->
+        <ObjectProvider qualifiedName="ds:PGPData">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.PGPDataBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.PGPDataMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.PGPDataUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- PGPKeyID -->
+        <ObjectProvider qualifiedName="ds:PGPKeyID">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.PGPKeyIDBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- PGPKeyPacket -->
+        <ObjectProvider qualifiedName="ds:PGPKeyPacket">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.PGPKeyPacketBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- Q -->
+        <ObjectProvider qualifiedName="ds:Q">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.QBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- RetrievalMethod -->
+        <ObjectProvider qualifiedName="ds:RetrievalMethod">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.RetrievalMethodBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.RetrievalMethodMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.RetrievalMethodUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- RSAKeyValue -->
+        <ObjectProvider qualifiedName="ds:RSAKeyValue">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.RSAKeyValueBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.RSAKeyValueMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.RSAKeyValueUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- Seed -->
+        <ObjectProvider qualifiedName="ds:Seed">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.SeedBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- Signature -->
+        <ObjectProvider qualifiedName="ds:Signature">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.SignatureBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.SignatureMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.SignatureUnmarshaller"/>
+        </ObjectProvider>
+        <ObjectProvider qualifiedName="ds:SignatureType">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.SignatureBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.SignatureMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.SignatureUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- SPKIData -->
+        <ObjectProvider qualifiedName="ds:SPKIData">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.SPKIDataBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.SPKIDataMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.SPKIDataUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- SPKISexp -->
+        <ObjectProvider qualifiedName="ds:SPKISexp">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.SPKISexpBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- Transform -->
+        <ObjectProvider qualifiedName="ds:Transform">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.TransformBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.TransformMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.TransformUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- Transforms -->
+        <ObjectProvider qualifiedName="ds:Transforms">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.TransformsBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.TransformsMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.TransformsUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- XPath -->
+        <ObjectProvider qualifiedName="ds:XPath">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.XPathBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- X509CRL -->
+        <ObjectProvider qualifiedName="ds:X509CRL">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.X509CRLBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- X509IssuerName -->
+        <ObjectProvider qualifiedName="ds:X509IssuerName">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.X509IssuerNameBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- X509IssuerSerial -->
+        <ObjectProvider qualifiedName="ds:X509IssuerSerial">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.X509IssuerSerialBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.X509IssuerSerialMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.X509IssuerSerialUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- X509SerialNumber -->
+        <ObjectProvider qualifiedName="ds:X509SerialNumber">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.X509SerialNumberBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.X509SerialNumberMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.X509SerialNumberUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- X509SKI -->
+        <ObjectProvider qualifiedName="ds:X509SKI">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.X509SKIBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- X509SubjectName -->
+        <ObjectProvider qualifiedName="ds:X509SubjectName">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.X509SubjectNameBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- Y -->
+        <ObjectProvider qualifiedName="ds:Y">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.YBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- 1.1 Stuff -->
+
+        <!-- DEREncodedKeyValue -->
+        <ObjectProvider qualifiedName="ds11:DEREncodedKeyValue">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.DEREncodedKeyValueBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.DEREncodedKeyValueMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.DEREncodedKeyValueUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- ECKeyValue -->
+        <ObjectProvider qualifiedName="ds11:ECKeyValue">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.ECKeyValueBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.ECKeyValueMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.ECKeyValueUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- KeyInfoReference -->
+        <ObjectProvider qualifiedName="ds11:KeyInfoReference">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.KeyInfoReferenceBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.KeyInfoReferenceMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.KeyInfoReferenceUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- NamedCurve -->
+        <ObjectProvider qualifiedName="ds11:NamedCurve">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.NamedCurveBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.NamedCurveMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.NamedCurveUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- PublicKey -->
+        <ObjectProvider qualifiedName="ds11:PublicKey">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.PublicKeyBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.CryptoBinaryUnmarshaller"/>
+        </ObjectProvider>
+
+        <!-- X509Digest -->
+        <ObjectProvider qualifiedName="ds11:X509Digest">
+            <BuilderClass className="org.opensaml.xmlsec.signature.impl.X509DigestBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.signature.impl.X509DigestMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.signature.impl.X509DigestUnmarshaller"/>
+        </ObjectProvider>
         
     </ObjectProviders>
     

From 789d9f7680cb1801f138b84c281d67b4d0b5ce25 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 29 Jul 2022 15:56:56 -0700
Subject: [PATCH 36/81] SHIBUI-2327

Commented out block of builder-marshaller-unmarshaller that was causing conflict with testing


Former-commit-id: cc4893a54a815f4046e28ad30fc70ad3f92cb585
---
 backend/src/main/resources/jpa-signature-config.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/resources/jpa-signature-config.xml b/backend/src/main/resources/jpa-signature-config.xml
index 22f00e04b..9a8da32e8 100644
--- a/backend/src/main/resources/jpa-signature-config.xml
+++ b/backend/src/main/resources/jpa-signature-config.xml
@@ -250,12 +250,12 @@
             <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSBase64BinaryUnmarshaller"/>
         </ObjectProvider>
 
-        <!-- X509SubjectName -->
+        <!-- X509SubjectName : CONFLICT/BREAKING to add this
         <ObjectProvider qualifiedName="ds:X509SubjectName">
             <BuilderClass className="org.opensaml.xmlsec.signature.impl.X509SubjectNameBuilder"/>
             <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
             <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
-        </ObjectProvider>
+        </ObjectProvider>-->
 
         <!-- Y -->
         <ObjectProvider qualifiedName="ds:Y">
@@ -310,4 +310,4 @@
         
     </ObjectProviders>
     
-</XMLTooling>
+</XMLTooling>
\ No newline at end of file

From effede98577e87aa87290aa616a6c76a17d13ccc Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Mon, 1 Aug 2022 12:27:39 -0700
Subject: [PATCH 37/81] SHIBUI-2327

Correcting security filter to work properly using the pac4j settup


Former-commit-id: 563d725369ed11e770e802d14393b33fefc53ae1
---
 .../src/main/java/net/unicon/shibui/pac4j/WebSecurity.java | 7 +++++--
 testbed/authentication/docker-compose.yml                  | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/WebSecurity.java b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/WebSecurity.java
index a67bf4a96..884569ac7 100644
--- a/pac4j-module/src/main/java/net/unicon/shibui/pac4j/WebSecurity.java
+++ b/pac4j-module/src/main/java/net/unicon/shibui/pac4j/WebSecurity.java
@@ -5,7 +5,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.security.service.IRolesService;
 import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService;
 import edu.internet2.tier.shibboleth.admin.ui.service.EmailService;
-import static net.unicon.shibui.pac4j.Pac4jConfiguration.PAC4J_CLIENT_NAME;
+import org.pac4j.core.authorization.authorizer.DefaultAuthorizers;
 import org.pac4j.core.config.Config;
 import org.pac4j.core.matching.matcher.Matcher;
 import org.pac4j.springframework.security.web.CallbackFilter;
@@ -26,6 +26,8 @@
 import javax.servlet.Filter;
 import java.util.Optional;
 
+import static net.unicon.shibui.pac4j.Pac4jConfiguration.PAC4J_CLIENT_NAME;
+
 @Configuration
 @AutoConfigureOrder(-1)
 @ConditionalOnProperty(name = "shibui.pac4j-enabled", havingValue = "true")
@@ -62,7 +64,8 @@ public Pac4jWebSecurityConfigurerAdapter(final Config config, UserService userSe
         protected void configure(HttpSecurity http) throws Exception {
             http.authorizeRequests().antMatchers("/unsecured/**/*").permitAll();
 
-            final SecurityFilter securityFilter = new SecurityFilter(this.config, PAC4J_CLIENT_NAME);
+            // adding the authorizor bypasses the default behavior of checking CSRF in Pac4J's default securitylogic+defaultauthorizationchecker
+            final SecurityFilter securityFilter = new SecurityFilter(this.config, PAC4J_CLIENT_NAME, DefaultAuthorizers.IS_AUTHENTICATED);
 
             // add filter based on auth type 
             http.antMatcher("/**").addFilterBefore(getFilter(config, pac4jConfigurationProperties.getTypeOfAuth()), BasicAuthenticationFilter.class);
diff --git a/testbed/authentication/docker-compose.yml b/testbed/authentication/docker-compose.yml
index 884042c4a..42b12cb6a 100644
--- a/testbed/authentication/docker-compose.yml
+++ b/testbed/authentication/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - "8080:8080"
       - "443:443"
       - "8443:8443"
-#      - "8000:8000"
+      - "9090:9090"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ../reverse-proxy/:/configuration/
@@ -72,6 +72,7 @@ services:
       - ./shibui/application.yml:/application.yml
     ports:
       - "8000:8000"
+#      - "9090:9090"
     entrypoint: ["/usr/bin/java", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8000", "-jar", "app.war"]
 networks:
   reverse-proxy:

From f3c7b62ec667d642a00d376fec851854485b30b3 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Mon, 1 Aug 2022 14:16:55 -0700
Subject: [PATCH 38/81]  [Gradle Release Plugin] - pre tag commit:  '1.11.1'.

Former-commit-id: 48a76662aa94f342dfe8c7c51401c343d36463cc
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7efe1ae08..a834b2548 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.12.0-SNAPSHOT
+version=1.11.1
 
 ### library versions ###
 commonsCollections4Version=4.4

From 3a4eda32e073dc2edc602a32f11e1fae07453602 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Mon, 1 Aug 2022 14:37:46 -0700
Subject: [PATCH 39/81] NOJIRA Reverting version to fix release

Former-commit-id: 70eeff2b9d5105b6a2daa75703619399aeff49da
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a834b2548..f5fa06b55 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.11.1
+version=1.11.0-SNAPSHOT
 
 ### library versions ###
 commonsCollections4Version=4.4

From 21b417909a389e029b27823f050b746fa1219131 Mon Sep 17 00:00:00 2001
From: Charles Hasegawa <chasegawa@unicon.net>
Date: Mon, 1 Aug 2022 22:53:09 +0000
Subject: [PATCH 40/81] gradle.properties edited online with Bitbucket -
 correcting version number

Former-commit-id: e25dcd42fd857d05e0bd4418f6bbe6d502426c12
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index f5fa06b55..7efe1ae08 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.11.0-SNAPSHOT
+version=1.12.0-SNAPSHOT
 
 ### library versions ###
 commonsCollections4Version=4.4

From 8e25e15382d092f2e23379b0b7e4d1554d0376ed Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 2 Aug 2022 08:25:55 -0700
Subject: [PATCH 41/81] Updated tooltips for FileBacked Provider

Former-commit-id: 58708bc501e1e39a6eac0b881b3532efe1e06ac3
---
 backend/src/main/resources/i18n/messages.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index a9a0560be..12c4337ec 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -679,7 +679,7 @@ tooltip.http-max-cache-entries=The maximum number of responses written to cache.
 tooltip.max-cache-entry-size=The maximum response body size that may be cached, in bytes. This attribute is incompatible with httpClientRef.
 
 tooltip.metadata-provider-name=Metadata Provider Name (for display on the Dashboard only)
-tooltip.metadata-provider-type=Metadata Provider Type
+tooltip.metadata-provider-type=The precise behavior of any <MetadataProvider> element is controlled by the xsi:type attribute. This specifies the exact type of provider to use.
 tooltip.xml-id=Identifier for logging, identification for command line reload, etc.
 tooltip.metadata-url=The URL that the metadata is served from.
 tooltip.metadata-file=The absolute path to the local metadata file to be loaded.
@@ -707,7 +707,7 @@ tooltip.expiration-warning-threshold=For each attempted metadata refresh (whethe
 
 tooltip.filter-name=Filter Name
 tooltip.enable-filter=Enable Filter?
-tooltip.enable-service=Enable Service?
+tooltip.enable-service=A boolean value representing whether or not this metadata should be enabled within the Shibboleth IDP UI.
 
 tooltip.min-cache-duration=The minimum duration for which metadata will be cached before it is refreshed.
 tooltip.max-cache-duration=The maximum duration for which metadata will be cached before it is refreshed.

From 21a20e5bc6f14cc1d0b91c84f2c9798fcecbe121 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 2 Aug 2022 08:41:03 -0700
Subject: [PATCH 42/81] Updated tooltips for DynamicHttp Provider

Former-commit-id: 9ceb46be312916bd01d76241d0b8ee982ebf6c53
---
 backend/src/main/resources/i18n/messages.properties          | 4 ++--
 ui/public/assets/schema/provider/filebacked-http.schema.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 12c4337ec..c3912d507 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -721,8 +721,8 @@ tooltip.source-directory=Convenience mechanism for wiring a FilesystemLoadSaveMa
 tooltip.remove-idle-entity-data=Flag indicating whether idle metadata should be removed.
 
 tooltip.do-resolver-initialization=Initialize this resolver? In the case of Filesystem resolvers, this will cause the system to read the file and index the resolver.
-tooltip.md-request-type=Options are 1) Metadata Query Protocol, 2) Regex.
-tooltip.md-request-value=Content of the element.
+tooltip.md-request-type=Constructs the metadata request URL based on 1) Metadata Query Protocol, or 2) Regex (a regular expression).
+tooltip.md-request-value=Content of the element based on the Metadata Request URL Construction Type.
 tooltip.transform-ref=A reference to a transform function for the entityID. If used, the child element must be empty.
 tooltip.encoding-style=Determines whether and how the entityID value will be URL encoded prior to replacement.  Allowed values are: 1) "none" - no encoding is performed, 2) "form" - encoded using URL form parameter encoding (for query parameters), 3) "path" - encoded using URL path encoding, or 4) "fragment" - encoded using URL fragment encoding. The precise definition of these terms is defined in the documentation for the methods of the Guava library\u0027s UrlEscapers class.
 tooltip.velocity-engine=This attribute may be used to specify the name of the Velocity engine defined within the application.
diff --git a/ui/public/assets/schema/provider/filebacked-http.schema.json b/ui/public/assets/schema/provider/filebacked-http.schema.json
index dffeaa65e..e1b0d95c7 100644
--- a/ui/public/assets/schema/provider/filebacked-http.schema.json
+++ b/ui/public/assets/schema/provider/filebacked-http.schema.json
@@ -42,8 +42,8 @@
             "const": "FileBackedHttpMetadataResolver"
         },
         "enabled": {
-            "title": "label.enable-service",
-            "description": "tooltip.enable-service",
+            "title": "label.enable-provider-upon-saving",
+            "description": "tooltip.enable-provider-upon-saving",
             "type": "boolean",
             "default": false
         },

From d0eb6511b76b16129cfbc58a50f4e7cd80dade08 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 2 Aug 2022 14:24:07 -0700
Subject: [PATCH 43/81] Updated tooltips for Metadata Sources and filters

Former-commit-id: 82ba43969aae58b68c4453931bcf4470949dcf16
---
 .../main/resources/i18n/messages.properties   | 75 ++++++++++---------
 .../resources/metadata-sources-ui-schema.json |  2 +-
 .../component/fields/FilterTargetField.js     |  4 +-
 .../wizard/MetadataFilterTypeSelector.js      |  4 +-
 4 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index c3912d507..8da49adb7 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -615,34 +615,35 @@ message.session-timeout-heading=Session timed out
 message.session-timeout-body=Your session has timed out. Please login again.
 message.session-timeout=An error has occurred while saving. Your session may have timed out.
 
-tooltip.entity-id=Entity ID
+tooltip.entity-id=An entityID is the SAML identifier that uniquely names a service provider.
 tooltip.service-provider-name=Service Provider Name (Dashboard Display Only)
-tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process
+tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process.
 tooltip.service-provider-name-dashboard-display-only=Service Provider Name (Dashboard Display Only)
 tooltip.service-provider-entity-id=Service Provider Entity ID
-tooltip.organization-name=Organization Name
-tooltip.organization-display-name=Organization Display Name
-tooltip.organization-url=Organization URL
+tooltip.organization-name=Name of the organization standing up the entity.
+tooltip.organization-display-name=Name of the organization standing up the entity to be used for display purposes.
+tooltip.organization-url=URL of the organization standing up the entity.
 tooltip.name=Name
 tooltip.type=Type
 tooltip.email-address=Email Address
-tooltip.assertion-consumer-service-location=Assertion Consumer Service Location
-tooltip.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding
-tooltip.mark-as-default=Mark as Default
-tooltip.protocol-support-enumeration=Protocol Support Enumeration
-tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or {{<ConditionRef>}}elements.
-tooltip.enable-this-service-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
+tooltip.assertion-consumer-service-location=Path used to invoke handler (when appended to the base handlerURL).
+tooltip.assertion-consumer-service-location-binding=The binding attribute of the <md:AssertionConsumerService> element is a standard URI specified in the SAML 2.0 Binding specification.
+tooltip.assertion-consumer-service-endpoints=An Assertion Consumer Service (or ACS) is SAML terminology for the location at a ServiceProvider that accepts <samlp:Response> messages (or SAML artifacts) for the purpose of establishing a session based on an assertion.
+tooltip.mark-as-default=Whether to mark this endpoint as the default by setting the "isDefault" property.
+tooltip.protocol-support-enumeration=This attribute contains a space-delimited collection of URIs that represent general classes of protocol support for the role in question. There are URIs defined by the various standards and profiles to represent the fact that an entity acting in a role "supports" a particular protocol family, such as SAML 2.0 or the Shibboleth profile of SAML 1.1.
+tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or <ConditionRef> elements.
+tooltip.enable-this-service-upon-saving=If checkbox is clicked, the metadata is enabled for integration with the IdP
 tooltip.is-there-a-x509-certificate=Is there a X509 Certificate?
-tooltip.authentication-requests-signed=Authentication Requests Signed
-tooltip.want-assertions-signed=Want Assertions Signed
-tooltip.certificate-name=Certificate Name
-tooltip.certificate-type=Certificate Type
-tooltip.certificate=Certificate
-tooltip.logout-endpoints=Logout Endpoints
-tooltip.logout-endpoints-url=Logout Endpoints Url
-tooltip.logout-endpoints-binding-type=Logout Endpoints Binding Type
-tooltip.url=Logout Endpoints Url
-tooltip.binding-type=Logout Endpoints Binding Type
+tooltip.authentication-requests-signed=Whether to sign requests.
+tooltip.want-assertions-signed=Whether to sign assertions. Element declares that the service provider wants the <saml:Assertion> element to be digitally signed.
+tooltip.certificate-name=Value used by the IDP UI to identify certificates.
+tooltip.certificate-type=Describes the use to which the credential will be put (as defined by the SAML standard)
+tooltip.certificate=A certificate containing a public key to use to require and verify an XML signature over the resource.
+tooltip.logout-endpoints=If your SP supports SAML 2.0 Single Logout, you will need to include one or more <md:SingleLogoutService> endpoint elements in the metadata.
+tooltip.logout-endpoints-url=The location of the handler (when combined with the base handlerURL). This is the location to which an IdP sends messages using whatever protocol and binding it shares with the SP. Each combination of SLO protocol and binding is installed at a unique location to improve efficiency.
+tooltip.logout-endpoints-binding-type=Identifies the protocol binding supported by the handler. Bindings describe how the message is packaged by the IdP (or by the browser in some cases) for consumption by the handler.
+tooltip.url=The location of the handler (when combined with the base handlerURL). This is the location to which an IdP sends messages using whatever protocol and binding it shares with the SP. Each combination of SLO protocol and binding is installed at a unique location to improve efficiency.
+tooltip.binding-type=Identifies the protocol binding supported by the handler. Bindings describe how the message is packaged by the IdP (or by the browser in some cases) for consumption by the handler.
 tooltip.mdui-display-name=Typically, the IdP Display Name field will be presented on IdP discovery service interfaces.
 tooltip.mdui-information-url=The IdP Information URL is a link to a comprehensive information page about the IdP. This page should expand on the content of the IdP Description field.
 tooltip.mdui-description=The IdP Description is a brief description of the IdP service. On a well-designed discovery interface, the IdP Description will be presented to the user in addition to the IdP Display Name, and so the IdP Description helps disambiguate duplicate or similar IdP Display Names.
@@ -650,21 +651,21 @@ tooltip.mdui-privacy-statement-url=The IdP Privacy Statement URL is a link to th
 tooltip.mdui-logo-url=The IdP Logo URL in metadata points to an image file on a remote server. A discovery service, for example, may rely on a visual cue (i.e., a logo) instead of or in addition to the IdP Display Name.
 tooltip.mdui-logo-width=The logo should have a minimum width of 100 pixels
 tooltip.mdui-logo-height=The logo should have a minimum height of 75 pixels and a maximum height of 150 pixels (or the application will scale it proportionally)
-tooltip.contact-name=Contact Name
-tooltip.contact-type=Contact Type
-tooltip.contact-email=Contact Email
-tooltip.sign-assertion=Sign Assertion
-tooltip.dont-sign-response=Don\u0027t Sign Response
-tooltip.turn-off-encryption=Turn Off Encryption of Response
-tooltip.usa-sha-algorithm=Use SHA1 Signing Algorithm
-tooltip.authentication-methods-to-use=Authentication Methods to Use
-tooltip.ignore-auth-method=Ignore any SP-Requested Authentication Method
-tooltip.omit-not-before-condition=Omit Not Before Condition
-tooltip.responder-id=ResponderId
+tooltip.contact-name=The given name of the contact.
+tooltip.contact-type=Type / role of the contact.
+tooltip.contact-email=Email address of the contact.
+tooltip.sign-assertion=Sign Assertion declares that the service provider wants the <saml:Assertion> element to be digitally signed.
+tooltip.dont-sign-response=Don\u0027t Sign Response.
+tooltip.turn-off-encryption=Whether to turn off encryption of the response.
+tooltip.usa-sha-algorithm=Whether to use the SHA1 Signing Algorithm.
+tooltip.authentication-methods-to-use=The method used to authenticate the subject.
+tooltip.ignore-auth-method=Whether to ignore any SP-Requested Authentication Method.
+tooltip.omit-not-before-condition=Whether to include a NotBefore attribute in assertions.
+tooltip.responder-id=Identifier of the selected SAML IdP entity.
 tooltip.instruction=Information icon
 tooltip.attribute-release-table=Attribute release table - select the attributes you want to release (default unchecked)
 tooltip.metadata-filter-name=Metadata Filter Name
-tooltip.metadata-filter-type=Metadata Filter Type
+tooltip.metadata-filter-type=The precise behavior of any <MetadataFilter> element is controlled by the xsi:type attribute.
 tooltip.connection-request-timeout=The maximum amount of time to wait for a connection to be returned from the HTTP client\u0027s connection pool manager. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
 tooltip.connection-timeout=The maximum amount of time to wait to establish a connection with the remote server. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
 tooltip.socket-timeout=The maximum amount of time to wait between two consecutive packets while reading from the socket connected to the remote server. Set to PT0S to disable. This attribute is incompatible with httpClientRef.
@@ -690,7 +691,7 @@ tooltip.require-valid-metadata=Whether candidate metadata found by the resolver
 tooltip.fail-fast-init=Whether to fail initialization of the underlying MetadataResolverService (and possibly the IdP as a whole) if the initialization of a metadata provider fails. When false, the IdP may start, and will continue to attempt to reload valid metadata if configured to do so, but operations that require valid metadata will fail until it does.
 tooltip.use-default-predicate-reg=Flag which determines whether the default CriterionPredicateRegistry will be used if a custom one is not supplied explicitly.
 tooltip.satisfy-any-predicates=Flag which determines whether predicates used in filtering are connected by a logical 'OR' (true) or by logical 'AND' (false).
-tooltip.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
+tooltip.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP.
 
 tooltip.max-validity-interval=Defines the window within which the metadata is valid.
 tooltip.require-signed-root=If true, this fails to load metadata with no signature on the root XML element.
@@ -706,9 +707,9 @@ tooltip.resolve-via-predicates-only=Flag indicating whether resolution may be pe
 tooltip.expiration-warning-threshold=For each attempted metadata refresh (whether or not fresh metadata is obtained), if requireValidMetadata is true, and there is a validUntil XML attribute on the document root element, and the difference between validUntil and the current time is less than expirationWarningThreshold, the system logs a warning about the impending expiration.
 
 tooltip.filter-name=Filter Name
-tooltip.enable-filter=Enable Filter?
+tooltip.enable-filter=If checkbox is clicked, the metadata filter is enabled for integration with the IdP.
 tooltip.enable-service=A boolean value representing whether or not this metadata should be enabled within the Shibboleth IDP UI.
-
+tooltip.search-by=Indicates the type of search to be performed.
 tooltip.min-cache-duration=The minimum duration for which metadata will be cached before it is refreshed.
 tooltip.max-cache-duration=The maximum duration for which metadata will be cached before it is refreshed.
 tooltip.max-idle-entity-data=The maximum duration for which metadata will be allowed to be idle (no requests for it) before it is removed from the cache.
@@ -739,4 +740,4 @@ tooltip.group-description=Group Description
 tooltip.role-name=Role Name
 tooltip.role-description=Role Description
 
-tooltip.contact-information=Contact Information
\ No newline at end of file
+tooltip.contact-information=Contacts provide information about how to contact the organization responsible for standing up the entity.
\ No newline at end of file
diff --git a/backend/src/main/resources/metadata-sources-ui-schema.json b/backend/src/main/resources/metadata-sources-ui-schema.json
index 09abb43c1..2d64f96bb 100644
--- a/backend/src/main/resources/metadata-sources-ui-schema.json
+++ b/backend/src/main/resources/metadata-sources-ui-schema.json
@@ -102,7 +102,7 @@
         },
         "assertionConsumerServices": {
             "title": "label.assertion-consumer-service-endpoints",
-            "description": "",
+            "description": "tooltip.assertion-consumer-service-endpoints",
             "type": "array",
             "items": {
                 "$ref": "#/definitions/AssertionConsumerService"
diff --git a/ui/src/app/form/component/fields/FilterTargetField.js b/ui/src/app/form/component/fields/FilterTargetField.js
index 0cdaa50ce..afb4f7828 100644
--- a/ui/src/app/form/component/fields/FilterTargetField.js
+++ b/ui/src/app/form/component/fields/FilterTargetField.js
@@ -145,7 +145,7 @@ const FilterTargetField = ({
                         <label htmlFor={id} className="d-flex justify-content-start align-items-center control-label">
                             <Translate value="action.search-by">Search By</Translate>
                             <FontAwesomeIcon icon={faAsterisk} className="text-danger ms-1 me-2" />
-                            <InfoIcon value={translate('action.search-by')}></InfoIcon>
+                            <InfoIcon value={translate('tooltip.search-by')}></InfoIcon>
                         </label>
                         <Dropdown>
                             <Dropdown.Toggle variant="outline-secondary" id={`dropdown-${type.title}`}>
@@ -170,7 +170,7 @@ const FilterTargetField = ({
                                 <i className="fa fa-asterisk text-danger" aria-hidden="true"></i>
                             </span>
                             <span>
-                                <InfoIcon value={translate('label.search-criteria-by')} params={{ displayType: translate(displayType) }}></InfoIcon>
+                                <InfoIcon value={translate('label.search-criteria-by', { displayType: translate(displayType) })}></InfoIcon>
                             </span>
                         </label>
                         <div className="d-flex justify-content-between">
diff --git a/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js b/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js
index 09260c018..8318bbda1 100644
--- a/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js
+++ b/ui/src/app/metadata/wizard/MetadataFilterTypeSelector.js
@@ -41,8 +41,8 @@ export function MetadataFilterTypeSelector({ types = [], children, actions}) {
                             <Form onSubmit={handleSubmit()}>
                                 <Form.Group className="mb-0">
                                     <Form.Label>
-                                        <span><Translate value={'label.metadata-provider-type'} /></span>
-                                        <InfoIcon value="tooltip.metadata-provider-type" />
+                                        <span><Translate value={'label.metadata-filter-type'} /></span>
+                                        <InfoIcon value="tooltip.metadata-filter-type" />
                                     </Form.Label>
                                     <Form.Select
                                         defaultValue={''}

From 178f47b319d7ce15dcf6a418c44382cea0938dde Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 2 Aug 2022 14:36:26 -0700
Subject: [PATCH 44/81] Updated tooltips for Groups and Roles

Former-commit-id: 18357f2e77c956d2c6edee20236a03676ec73ba4
---
 .../main/resources/i18n/messages.properties   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 8da49adb7..0f22d95b6 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -152,21 +152,21 @@ heading.shibboleth=Shibboleth
 label.source-configuration=Metadata Source Configuration
 label.provider-configuration=Metadata Provider Configuration
 label.entity-attribute-name=Custom Entity Attribute Name
-tooltip.entity-attribute-name=Custom Entity Attribute Name
+tooltip.entity-attribute-name=Name of the attribute that the service provider uses and requires from the identity provider. It corresponds to the <saml:Attribute Name=""> element in the SAML assertion.
 label.entity-attribute-type=Attribute Type
-tooltip.entity-attribute-type=Attribute Type
+tooltip.entity-attribute-type=Data type of the attribute such as boolean or string.
 label.entity-attribute-help=Help Text
-tooltip.entity-attribute-help=Help Text
+tooltip.entity-attribute-help=Defines help text used in the Shibboleth IDP UI when adding the attribute.
 label.entity-attribute-default=Default Value
-tooltip.entity-attribute-default=Default Value
+tooltip.entity-attribute-default=The default value of the attribute.
 label.entity-attribute-list-options=List options
-tooltip.entity-attribute-list-options=List options
+tooltip.entity-attribute-list-options=A list of pre-defined selectable options for a user to select from in the Shibboleth IDP UI.
 label.entity-attribute-friendly-name=Friendly name
-tooltip.entity-attribute-friendly-name=Friendly name
+tooltip.entity-attribute-friendly-name=A descriptive or human-friendly name for users of the Shibboleth IDP UI.
 label.entity-attribute-attr-name=Attribute name
-tooltip.entity-attribute-attr-name=This is normally a uri or urn
+tooltip.entity-attribute-attr-name=Indicates how to interpret the attribute name. It corresponds to the <saml:Attribute NameFormat=""> element in the SAML assertion. This is normally a uri or urn.
 label.entity-attribute-display-name=Display name
-tooltip.entity-attribute-display-name=Display name
+tooltip.entity-attribute-display-name=Provides a human readable value that identifies the subject. This value is not guaranteed to be unique and is designed to be used only for display purposes.
 
 label.entity-attribute-persist-value=Persist Value
 label.entity-attribute-persist-type=Persist Type
@@ -508,7 +508,7 @@ label.source=Metadata Source
 label.provider=Metadata Provider
 
 label.url-validation-regex=URL validation regular expression
-tooltip.url-validation-regex=URL validation regular expression
+tooltip.url-validation-regex=URL validation regular expression. This is used by the Shibboleth IDP UI to restrict entities that may be targetted by this group and is added as form validation.
 
 label.bundle-name=Bundle name
 label.bundle-disp=Bundle - {name}
@@ -734,10 +734,10 @@ tooltip.nameid-formats-format=Format
 tooltip.nameid-formats-value=Value
 tooltip.nameid-formats-type=Type
 
-tooltip.group-name=Group Name
-tooltip.group-description=Group Description
+tooltip.group-name=A user friendly name used to identify the group.
+tooltip.group-description=A description of the purpose of the group.
 
-tooltip.role-name=Role Name
-tooltip.role-description=Role Description
+tooltip.role-name=A user friendly name used to identify the role.
+tooltip.role-description=A description of the purpose of the role.
 
 tooltip.contact-information=Contacts provide information about how to contact the organization responsible for standing up the entity.
\ No newline at end of file

From e9f1bd5ab8684c25d5c64a77ab08783503bb26c2 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 2 Aug 2022 14:59:52 -0700
Subject: [PATCH 45/81] Fixed issue with scrollbar on dashboard

Former-commit-id: 8c5c29392d932da493211d12ba7ab96a2fed0182
---
 .../domain/provider/component/ProviderList.js | 151 +++++++++---------
 .../domain/source/component/SourceList.js     |   9 +-
 2 files changed, 83 insertions(+), 77 deletions(-)

diff --git a/ui/src/app/metadata/domain/provider/component/ProviderList.js b/ui/src/app/metadata/domain/provider/component/ProviderList.js
index 1b367a69d..9a9ac90d4 100644
--- a/ui/src/app/metadata/domain/provider/component/ProviderList.js
+++ b/ui/src/app/metadata/domain/provider/component/ProviderList.js
@@ -18,83 +18,86 @@ export function ProviderList({ children, entities, reorder = true, first, last,
     const translator = useTranslator();
 
     return (
-        <Scroller entities={entities}>
-        {(limited) => <div className="table-responsive mt-3 provider-list!">
-            <table className="table table-striped w-100 table-hover">
-                <thead>
-                    <tr>
-                        <th><Translate value="label.order">Order</Translate></th>
-                        <th className="w-25"><Translate value="label.title">Title</Translate></th>
-                        <th className="w-15"><Translate value="label.provider-type">Provider Type</Translate></th>
-                        <th className="w-15"><Translate value="label.author">Author</Translate></th>
-                        <th className="w-15"><Translate value="label.creation-date">Created Date</Translate></th>
-                        <th className="text-end w-15"><Translate value="label.enabled">Enabled</Translate></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {limited.map((provider, idx) =>
-                        <tr key={idx}>
-                            <td className="align-middle">
-                                <div className="d-flex align-items-center">
-                                    {reorder ?
-                                        <div className="provider-index text-center text-primary font-weight-bold">{idx + 1}</div>
+        <React.Fragment>
+            <Scroller entities={entities}>
+            {(limited) => <div className="table-responsive mt-3 provider-list!">
+                <table className="table table-striped w-100 table-hover">
+                    <thead>
+                        <tr>
+                            <th><Translate value="label.order">Order</Translate></th>
+                            <th className="w-25"><Translate value="label.title">Title</Translate></th>
+                            <th className="w-15"><Translate value="label.provider-type">Provider Type</Translate></th>
+                            <th className="w-15"><Translate value="label.author">Author</Translate></th>
+                            <th className="w-15"><Translate value="label.creation-date">Created Date</Translate></th>
+                            <th className="text-end w-15"><Translate value="label.enabled">Enabled</Translate></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {limited.map((provider, idx) =>
+                            <tr key={idx}>
+                                <td className="align-middle">
+                                    <div className="d-flex align-items-center">
+                                        {reorder ?
+                                            <div className="provider-index text-center text-primary font-weight-bold">{idx + 1}</div>
+                                            :
+                                            <div className="provider-index text-center text-primary font-weight-bold">&mdash;</div>
+                                        }
+                                        &nbsp;
+                                        <Button 
+                                            onClick={ () => onOrderDown(provider.resourceId) }
+                                            variant="link"
+                                            className=" px-1"
+                                            disabled={provider.resourceId === last || !reorder}
+                                            aria-label="Decrease reorder by 1">
+                                                <FontAwesomeIcon className="text-info" icon={faChevronCircleDown} size="lg" />
+                                            <i className="fa text-info fa-lg fa-chevron-circle-down" aria-hidden="true"></i>
+                                        </Button>
+                                        <Button
+                                            onClick={ () => onOrderUp(provider.resourceId) }
+                                            variant="link"
+                                            className="px-1"
+                                            aria-label="Increase reorder by 1"
+                                            disabled={provider.resourceId === first || !reorder}>
+                                            <FontAwesomeIcon className="text-info" icon={faChevronCircleUp} size="lg" />
+                                            <i className="fa text-info fa-lg fa-chevron-circle-up" aria-hidden="true"></i>
+                                        </Button>
+                                    </div>
+                                </td>
+                                <td className="align-middle">
+                                    <Link to={`/metadata/provider/${provider.resourceId}/configuration/options`}>{provider.name}</Link>
+                                </td>
+                                <td className="align-middle">{ provider['@type'] }</td>
+                                <td className="align-middle">{ provider.createdBy }</td>
+                                <td className="align-middle"><FormattedDate date={provider.createdDate} /></td>
+                                <td className="align-middle">
+                                    <span className="d-flex justify-content-end">
+                                    {onEnable && isAdmin ?
+                                        <Form.Check
+                                            size="lg"
+                                            type="switch"
+                                            id={`enable-switch-${provider.resourceId}`}
+                                            aria-label={translator(provider.enabled ? 'label.disable' : 'label.enable')}
+                                            onChange={({ target: { checked } }) => onEnable(provider, checked)}
+                                            checked={provider.enabled}
+                                        >
+                                        </Form.Check>
                                         :
-                                        <div className="provider-index text-center text-primary font-weight-bold">&mdash;</div>
+                                        <Badge variant={provider.enabled ? 'success' : 'danger'}>
+                                            <Translate value={provider.enabnled ? 'value.enabled' : 'value.disabled'}></Translate>
+                                        </Badge>
                                     }
-                                    &nbsp;
-                                    <Button 
-                                        onClick={ () => onOrderDown(provider.resourceId) }
-                                        variant="link"
-                                        className=" px-1"
-                                        disabled={provider.resourceId === last || !reorder}
-                                        aria-label="Decrease reorder by 1">
-                                            <FontAwesomeIcon className="text-info" icon={faChevronCircleDown} size="lg" />
-                                        <i className="fa text-info fa-lg fa-chevron-circle-down" aria-hidden="true"></i>
-                                    </Button>
-                                    <Button
-                                        onClick={ () => onOrderUp(provider.resourceId) }
-                                        variant="link"
-                                        className="px-1"
-                                        aria-label="Increase reorder by 1"
-                                        disabled={provider.resourceId === first || !reorder}>
-                                        <FontAwesomeIcon className="text-info" icon={faChevronCircleUp} size="lg" />
-                                        <i className="fa text-info fa-lg fa-chevron-circle-up" aria-hidden="true"></i>
-                                    </Button>
-                                </div>
-                            </td>
-                            <td className="align-middle">
-                                <Link to={`/metadata/provider/${provider.resourceId}/configuration/options`}>{provider.name}</Link>
-                            </td>
-                            <td className="align-middle">{ provider['@type'] }</td>
-                            <td className="align-middle">{ provider.createdBy }</td>
-                            <td className="align-middle"><FormattedDate date={provider.createdDate} /></td>
-                            <td className="align-middle">
-                                <span className="d-flex justify-content-end">
-                                {onEnable && isAdmin ?
-                                    <Form.Check
-                                        size="lg"
-                                        type="switch"
-                                        id={`enable-switch-${provider.resourceId}`}
-                                        aria-label={translator(provider.enabled ? 'label.disable' : 'label.enable')}
-                                        onChange={({ target: { checked } }) => onEnable(provider, checked)}
-                                        checked={provider.enabled}
-                                    >
-                                    </Form.Check>
-                                    :
-                                    <Badge variant={provider.enabled ? 'success' : 'danger'}>
-                                        <Translate value={provider.enabnled ? 'value.enabled' : 'value.disabled'}></Translate>
-                                    </Badge>
-                                }
-                                </span>
-                            </td>
-                        </tr>
-                    )}
-                </tbody>
-            </table>
+                                    </span>
+                                </td>
+                            </tr>
+                        )}
+                    </tbody>
+                </table>
+            </div>
+            }
+            </Scroller>
             {children}
-        </div>
-        }
-        </Scroller>
+        </React.Fragment>
+        
     );
 }
 
diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js
index 42af027dd..8e8a10825 100644
--- a/ui/src/app/metadata/domain/source/component/SourceList.js
+++ b/ui/src/app/metadata/domain/source/component/SourceList.js
@@ -23,7 +23,8 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup
     const canEnable = useCanEnable();
 
     return (
-        <Scroller entities={entities}>
+        <React.Fragment>
+            <Scroller entities={entities}>
             {(limited) =>
                 <div className="table-responsive mt-3 source-list">
                     <table className="table table-striped w-100 table-hover">
@@ -122,9 +123,11 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup
                             </GroupsProvider>
                         </tbody>
                     </table>
-                    {children}
                 </div>
             }
-        </Scroller>
+            </Scroller>
+            {children}
+        </React.Fragment>
+        
     );
 }

From 3c2cde47054ba06f2940cebd76af0f138b447d1c Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Tue, 2 Aug 2022 19:15:09 -0400
Subject: [PATCH 46/81] SHIBUI-1978

Small test tweak for stability.


Former-commit-id: 9f3792a8374ecd91862bdc12d97907adcb350f16
---
 .../integration/resources/SHIBUI-1732-4.side  | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/backend/src/integration/resources/SHIBUI-1732-4.side b/backend/src/integration/resources/SHIBUI-1732-4.side
index 6aab66e67..214a49cbd 100644
--- a/backend/src/integration/resources/SHIBUI-1732-4.side
+++ b/backend/src/integration/resources/SHIBUI-1732-4.side
@@ -992,6 +992,13 @@
         ["xpath=//div[3]/div/div/div[3]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "14c486b1-bdff-4474-94e3-b4286303a8fd",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "e3892564-1a1b-4ee6-bbab-49d3cb3079d7",
       "comment": "",
@@ -999,21 +1006,21 @@
       "target": "css=table > tbody > tr",
       "targets": [],
       "value": ""
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "575d414c-556d-45f7-b2f2-c9971ad51348",

From 372bac2bc9c6f7493fff1662a19963f294a43a24 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 4 Aug 2022 11:32:22 -0700
Subject: [PATCH 47/81] Set popover icons to placement auto

Former-commit-id: 49e9a7f18cc1fd9e48e6a8a54b451dc786132386
---
 ui/src/app/form/component/InfoIcon.js                | 2 +-
 ui/src/app/form/component/fields/DescriptionField.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/form/component/InfoIcon.js b/ui/src/app/form/component/InfoIcon.js
index 209e4f426..a9dbb9363 100644
--- a/ui/src/app/form/component/InfoIcon.js
+++ b/ui/src/app/form/component/InfoIcon.js
@@ -7,7 +7,7 @@ import Button from 'react-bootstrap/Button';
 import Translate from '../../i18n/components/translate';
 import { useTranslator } from '../../i18n/hooks';
 
-export function InfoIcon ({ value = '', placement='left', ...props }) {
+export function InfoIcon ({ value = '', placement='auto', ...props }) {
     const translate = useTranslator();
     return(
         <OverlayTrigger trigger={['hover', 'focus', 'click']} placement={placement} overlay={(
diff --git a/ui/src/app/form/component/fields/DescriptionField.js b/ui/src/app/form/component/fields/DescriptionField.js
index aeea23ace..0b5d67871 100644
--- a/ui/src/app/form/component/fields/DescriptionField.js
+++ b/ui/src/app/form/component/fields/DescriptionField.js
@@ -3,7 +3,7 @@ import { InfoIcon } from "../InfoIcon";
 
 const DescriptionField = ({ description }) => {
     if (description) {
-        return <InfoIcon value={description} />;
+        return <InfoIcon value={description} placement="auto" />;
     }
 
     return null;

From d6567acaa2f55352d490c7f6fcdefb1a5d24607e Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Fri, 5 Aug 2022 08:49:47 -0400
Subject: [PATCH 48/81] added ignoreRequestSignatures

Former-commit-id: a37482fe6f460f7cb11c11b1e8a75f0d275027e6
---
 backend/src/main/resources/application.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index ffeab970c..bf1367934 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -156,4 +156,10 @@ custom:
       displayType: boolean
       helpText: tooltip.force-authn
       attributeName: http://shibboleth.net/ns/profiles/forceAuthn
-      attributeFriendlyName: forceAuthn
\ No newline at end of file
+      attributeFriendlyName: forceAuthn
+    - name: ignoreRequestSignatures
+      displayName: label.ignore-request-signatures
+      displayType: boolean
+      helpText: tooltip.ignore-request-signatures
+      attributeName: http://shibboleth.net/ns/profiles/ignoreRequestSignatures
+      attributeFriendlyName: ignoreRequestSignatures
\ No newline at end of file

From f803fd0b9116bfaea96a186db3da59550074e940 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Wed, 10 Aug 2022 00:07:14 -0400
Subject: [PATCH 49/81] SHIBUI-1674

Initial version of selenium tests for tooltip verification. At least one
of these will need updating once some UI issues are fixed.


Former-commit-id: 6b5116b4b27b7ed18a66ac504259d567b4d006d0
---
 .../internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
index 14a65b52b..1792f948c 100644
--- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
+++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -154,5 +154,8 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-2052: Logged in user & role appear on dashboard'            | '/SHIBUI-2052.side'
         'SHIBUI-2116: Verify entity attribute bundle highlights'            | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script).
         'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
+        'SHIBUI-1674: Verify metadata source tooltips'                      | '/SHIBUI-1674-1.side'
+        'SHIBUI-1674: Verify metadata provider tooltips'                    | '/SHIBUI-1674-2.side'
+        'SHIBUI-1674: Verify advanced menu tooltips'                        | '/SHIBUI-1674-3.side'
     }
 }

From 8ae250bbc134aa9541c7a18055724bef16f5baf1 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 10 Aug 2022 08:48:18 -0700
Subject: [PATCH 50/81] Updated algorithm filter

Former-commit-id: 85dd0d50ac84befa33a3881b06cecfa40e547dd9
---
 .../main/resources/i18n/messages.properties   | 13 ++++++++++-
 .../schema/filter/algorithm.schema.json       | 23 +++++++++++++++++++
 .../definition/AlgorithmFilterDefinition.js   |  4 +++-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 3b3e67e83..9dcdc22b3 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -727,4 +727,15 @@ tooltip.group-description=Group Description
 tooltip.role-name=Role Name
 tooltip.role-description=Role Description
 
-tooltip.contact-information=Contact Information
\ No newline at end of file
+tooltip.contact-information=Contact Information
+
+label.algorithm=Algorithm
+tooltip.algorithm=Block encryption algorithms are designed for encrypting and decrypting data in fixed size, multiple octet blocks.
+
+value.algorithm-gcm-256=GCM (256) - http://www.w3.org/2009/xmlenc11#aes256-gcm
+value.algorithm-gcm-192=GCM (192) - http://www.w3.org/2009/xmlenc11#aes192-gcm
+value.algorithm-gcm-128=GCM (128) - http://www.w3.org/2009/xmlenc11#aes128-gcm
+value.algorithm-cbc-256=CBC (256) - http://www.w3.org/2001/04/xmlenc#aes256-cbc
+value.algorithm-cbc-192=CBC (192) - http://www.w3.org/2001/04/xmlenc#aes192-cbc
+value.algorithm-cbc-128=CBC (128) - http://www.w3.org/2001/04/xmlenc#aes128-cbc
+value.algorithm-cbc-tripledes=CBC (TRIPLEDES) - http://www.w3.org/2001/04/xmlenc#tripledes-cbc
diff --git a/ui/public/assets/schema/filter/algorithm.schema.json b/ui/public/assets/schema/filter/algorithm.schema.json
index 0c0c74444..879bb4ddc 100644
--- a/ui/public/assets/schema/filter/algorithm.schema.json
+++ b/ui/public/assets/schema/filter/algorithm.schema.json
@@ -47,6 +47,29 @@
         },
         "version": {
             "type": "integer"
+        },
+        "algorithm": {
+            "title": "label.algorithm",
+            "description": "tooltip.algorithm",
+            "type": "string",
+            "enum": [
+                "http://www.w3.org/2009/xmlenc11#aes256-gcm",
+                "http://www.w3.org/2009/xmlenc11#aes192-gcm",
+                "http://www.w3.org/2009/xmlenc11#aes128-gcm",
+                "http://www.w3.org/2001/04/xmlenc#aes256-cbc",
+                "http://www.w3.org/2001/04/xmlenc#aes192-cbc",
+                "http://www.w3.org/2001/04/xmlenc#aes128-cbc",
+                "http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
+            ],
+            "enumNames": [
+                "value.algorithm-gcm-256",
+                "value.algorithm-gcm-192",
+                "value.algorithm-gcm-128",
+                "value.algorithm-cbc-256",
+                "value.algorithm-cbc-192",
+                "value.algorithm-cbc-128",
+                "value.algorithm-cbc-tripledes"
+            ]
         }
     },
     "definitions": {}
diff --git a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
index e0c15bf80..4841b5c89 100644
--- a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
+++ b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
@@ -53,7 +53,9 @@ export const AlgorithmFilterEditor = {
             label: 'label.options',
             index: 2,
             initialValues: [],
-            fields: []
+            fields: [
+                'algorithm'
+            ]
         }
     ]
 };
\ No newline at end of file

From 34b9b938d43f28649466c7dae8f73f0fda70e2d9 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 10 Aug 2022 13:31:31 -0700
Subject: [PATCH 51/81] Integrating with backend

Former-commit-id: 3098d4de3aced709b636caa23a84821e037e4fb6
---
 .../resources/algorithm-filter.schema.json    | 137 ++++++++++--------
 .../main/resources/i18n/messages.properties   |   1 +
 .../schema/filter/algorithm.schema.json       |  60 ++++----
 ui/src/app/core/components/ProtectRoute.js    |   7 +-
 .../component/fields/FilterTargetField.js     |  24 ++-
 ui/src/app/metadata/Filter.js                 |   2 +
 .../definition/AlgorithmFilterDefinition.js   |  14 +-
 .../filter/definition/BaseFilterDefinition.js |   7 +
 8 files changed, 154 insertions(+), 98 deletions(-)

diff --git a/backend/src/main/resources/algorithm-filter.schema.json b/backend/src/main/resources/algorithm-filter.schema.json
index f570dacb7..552d92ec2 100644
--- a/backend/src/main/resources/algorithm-filter.schema.json
+++ b/backend/src/main/resources/algorithm-filter.schema.json
@@ -1,65 +1,82 @@
 {
-    "type": "object",
-    "required": [
-        "name"
-    ],
-    "properties": {
-        "name": {
-            "title": "label.filter-name",
-            "description": "tooltip.filter-name",
-            "type": "string"
-        },
-        "filterEnabled": {
-            "title": "label.enable-filter",
-            "description": "tooltip.enable-filter",
-            "type": "boolean",
-            "default": false
-        },
-        "AlgorithmFilterTarget": {
-            "title": "label.search-criteria",
-            "description": "tooltip.search-criteria",
-            "type": "object",
-            "properties": {
-                "nameIdFormatFilterTargetType": {
-                    "title": "label.filter-target-type",
-                    "type": "string",
-                    "default": "ENTITY",
-                    "enum": [
-                        "ENTITY",
-                        "CONDITION_REF",
-                        "CONDITION_SCRIPT"
-                    ],
-                    "enumNames": [
-                        "value.entity-id",
-                        "value.reference",
-                        "value.script"
-                    ]
-                },
-                "value": {
-                    "title": "label.filter-target-value",
-                    "type": "array",
-                    "minItems": 1,
-                    "uniqueItems": true,
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            },
-            "required": [
-                "value",
-                "algorithmFilterTargetType"
-            ]
-        },
-        "@type": {
-            "type": "string",
-            "default": "Algorithm"
-        },
-        "version": {
-            "type": "integer"
+  "type": "object",
+  "required": ["name"],
+  "properties": {
+    "name": {
+      "title": "label.filter-name",
+      "description": "tooltip.filter-name",
+      "type": "string"
+    },
+    "filterEnabled": {
+      "title": "label.enable-filter",
+      "description": "tooltip.enable-filter",
+      "type": "boolean",
+      "default": false
+    },
+    "algorithmFilterTarget": {
+      "title": "label.search-criteria",
+      "description": "tooltip.search-criteria",
+      "type": "object",
+      "properties": {
+        "algorithmFilterTargetType": {
+          "title": "label.filter-target-type",
+          "type": "string",
+          "default": "ENTITY",
+          "enum": ["ENTITY", "CONDITION_REF", "CONDITION_SCRIPT"],
+          "enumNames": ["value.entity-id", "value.reference", "value.script"]
         },
-        "resourceId": {
+        "value": {
+          "title": "label.filter-target-value",
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
             "type": "string"
+          }
         }
+      },
+      "required": ["value", "algorithmFilterTargetType"]
+    },
+    "@type": {
+      "type": "string",
+      "default": "Algorithm"
+    },
+    "version": {
+      "type": "integer"
+    },
+    "resourceId": {
+      "type": "string"
     },
-    "definitions": {}
-}
\ No newline at end of file
+    "algorithms": {
+      "$ref": "#/definitions/AlgorithmList"
+    }
+  },
+  "definitions": {
+    "AlgorithmList": {
+      "title": "label.algorithm",
+      "description": "tooltip.algorithm",
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": [
+          "http://www.w3.org/2009/xmlenc11#aes256-gcm",
+          "http://www.w3.org/2009/xmlenc11#aes192-gcm",
+          "http://www.w3.org/2009/xmlenc11#aes128-gcm",
+          "http://www.w3.org/2001/04/xmlenc#aes256-cbc",
+          "http://www.w3.org/2001/04/xmlenc#aes192-cbc",
+          "http://www.w3.org/2001/04/xmlenc#aes128-cbc",
+          "http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
+        ],
+        "enumNames": [
+          "value.algorithm-gcm-256",
+          "value.algorithm-gcm-192",
+          "value.algorithm-gcm-128",
+          "value.algorithm-cbc-256",
+          "value.algorithm-cbc-192",
+          "value.algorithm-cbc-128",
+          "value.algorithm-cbc-tripledes"
+        ]
+      }
+    }
+  }
+}
diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 8cc2c8dd3..3f23fc105 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -589,6 +589,7 @@ message.wizard-status=Step { index } of { length }
 message.entity-id-min-unique=You must add at least one entity id target and they must each be unique.
 message.required-for-scripts=Required for Scripts
 message.required-for-regex=Required for Regex
+message.required-for-condition-ref=Required for Condition Ref
 message.file-doesnt-exist=The requested file to be processed does not exist on the server.
 message.database-constraint=There was a database constraint problem processing the request. Check the request to ensure that fields that must be unique are truly unique.
 
diff --git a/ui/public/assets/schema/filter/algorithm.schema.json b/ui/public/assets/schema/filter/algorithm.schema.json
index 879bb4ddc..a7abba111 100644
--- a/ui/public/assets/schema/filter/algorithm.schema.json
+++ b/ui/public/assets/schema/filter/algorithm.schema.json
@@ -22,10 +22,10 @@
                     "title": "label.filter-target-type",
                     "type": "string",
                     "default": "ENTITY",
-                    "enum": ["ENTITY", "REGEX", "CONDITION_SCRIPT"],
+                    "enum": ["ENTITY", "CONDITION_REF", "CONDITION_SCRIPT"],
                     "enumNames": [
                         "value.entity-id",
-                        "value.regex",
+                        "value.reference",
                         "value.script"
                     ]
                 },
@@ -43,34 +43,44 @@
         },
         "@type": {
             "type": "string",
-            "default": "NameIDFormat"
+            "default": "Algorithm"
         },
         "version": {
             "type": "integer"
         },
-        "algorithm": {
+        "resourceId": {
+            "type": "string"
+        },
+        "algorithms": {
+            "$ref": "#/definitions/AlgorithmList"
+        }
+    },
+    "definitions": {
+        "AlgorithmList": {
             "title": "label.algorithm",
             "description": "tooltip.algorithm",
-            "type": "string",
-            "enum": [
-                "http://www.w3.org/2009/xmlenc11#aes256-gcm",
-                "http://www.w3.org/2009/xmlenc11#aes192-gcm",
-                "http://www.w3.org/2009/xmlenc11#aes128-gcm",
-                "http://www.w3.org/2001/04/xmlenc#aes256-cbc",
-                "http://www.w3.org/2001/04/xmlenc#aes192-cbc",
-                "http://www.w3.org/2001/04/xmlenc#aes128-cbc",
-                "http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
-            ],
-            "enumNames": [
-                "value.algorithm-gcm-256",
-                "value.algorithm-gcm-192",
-                "value.algorithm-gcm-128",
-                "value.algorithm-cbc-256",
-                "value.algorithm-cbc-192",
-                "value.algorithm-cbc-128",
-                "value.algorithm-cbc-tripledes"
-            ]
+            "type": "array",
+            "items": {
+                "type": "string",
+                "enum": [
+                    "http://www.w3.org/2009/xmlenc11#aes256-gcm",
+                    "http://www.w3.org/2009/xmlenc11#aes192-gcm",
+                    "http://www.w3.org/2009/xmlenc11#aes128-gcm",
+                    "http://www.w3.org/2001/04/xmlenc#aes256-cbc",
+                    "http://www.w3.org/2001/04/xmlenc#aes192-cbc",
+                    "http://www.w3.org/2001/04/xmlenc#aes128-cbc",
+                    "http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
+                ],
+                "enumNames": [
+                    "value.algorithm-gcm-256",
+                    "value.algorithm-gcm-192",
+                    "value.algorithm-gcm-128",
+                    "value.algorithm-cbc-256",
+                    "value.algorithm-cbc-192",
+                    "value.algorithm-cbc-128",
+                    "value.algorithm-cbc-tripledes"
+                ]
+            }
         }
-    },
-    "definitions": {}
+    }
 }
diff --git a/ui/src/app/core/components/ProtectRoute.js b/ui/src/app/core/components/ProtectRoute.js
index c01706920..68420b3b9 100644
--- a/ui/src/app/core/components/ProtectRoute.js
+++ b/ui/src/app/core/components/ProtectRoute.js
@@ -1,9 +1,14 @@
+import { isUndefined } from 'lodash';
 import React from 'react';
 import { Redirect } from 'react-router-dom';
 
-import { useIsAdmin } from '../user/UserContext';
+import { useCurrentUser, useIsAdmin } from '../user/UserContext';
 
 export function ProtectRoute({ children, redirectTo, ...rest }) {
+    const user = useCurrentUser();
     const isAdmin = useIsAdmin();
+    if (isUndefined(user.role)) {
+        return <></>
+    }
     return isAdmin ? children : <Redirect to={redirectTo} />;
 }
\ No newline at end of file
diff --git a/ui/src/app/form/component/fields/FilterTargetField.js b/ui/src/app/form/component/fields/FilterTargetField.js
index 0866ab2bf..6bcb94218 100644
--- a/ui/src/app/form/component/fields/FilterTargetField.js
+++ b/ui/src/app/form/component/fields/FilterTargetField.js
@@ -128,7 +128,8 @@ const FilterTargetField = ({
     };
 
     const selectType = (option) => {
-        setSelectedTarget([]);
+        const t = option.value === 'REGEX' || option.value === 'CONDITION_REF' ? [''] : [];
+        setSelectedTarget(t);
         setSelectedType(option);
     };
 
@@ -240,7 +241,6 @@ const FilterTargetField = ({
                                         {errorSchema?.value?.__errors ?
                                             <small className="form-text text-danger">
                                                 {errors}
-                                                
                                             </small> :
                                             <small id="regex-help" className="form-text text-secondary">
                                                 <Translate value="message.required-for-regex">Required for Regex</Translate>
@@ -249,7 +249,25 @@ const FilterTargetField = ({
                                         }
                                     </>
                                 }
-                                
+                                {targetType === 'CONDITION_REF' &&
+                                    <>
+                                        <input id="targetInput"
+                                            className="form-control"
+                                            type="text"
+                                            name="script"
+                                            value={selectedTarget[0]}
+                                            onChange={ ({target: { value }}) => handleTextChange(value) } />
+                                        {errorSchema?.value?.__errors ?
+                                            <small className="form-text text-danger">
+                                                {errors}
+                                            </small> :
+                                            <small id="regex-help" className="form-text text-secondary">
+                                                <Translate value="message.required-for-condition-ref">Required for Condition Ref</Translate>
+                                                &nbsp;
+                                            </small>
+                                        }
+                                    </>
+                                }
                             </div>
                             {targetType === 'ENTITY' &&
                                 <div className="ms-2">
diff --git a/ui/src/app/metadata/Filter.js b/ui/src/app/metadata/Filter.js
index 4c1bc707c..58b867040 100644
--- a/ui/src/app/metadata/Filter.js
+++ b/ui/src/app/metadata/Filter.js
@@ -11,6 +11,8 @@ export function Filter() {
 
     const { path, url } = useRouteMatch();
 
+    console.log(path, url)
+
     return (
         <Switch>
             <Route path={`${path}/list`} render={() =>
diff --git a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
index 4841b5c89..51e3fa846 100644
--- a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
+++ b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
@@ -1,6 +1,5 @@
 import defaultsDeep from "lodash/defaultsDeep";
-// import API_BASE_PATH from "../../../../App.constant";
-import { BASE_PATH } from '../../../../App.constant';
+import API_BASE_PATH from "../../../../App.constant";
 import { BaseFilterDefinition } from "./BaseFilterDefinition";
 
 export const AlgorithmFilterWizard = {
@@ -10,19 +9,16 @@ export const AlgorithmFilterWizard = {
             'ui:field': 'FilterTargetField',
             api: ''
         },
-        formats: {
+        algorithms: {
             "ui:options": {
                 orderable: false
-            },
-            items: {
-                'ui:widget': 'OptionWidget'
             }
         }
     }, BaseFilterDefinition.uiSchema),
     label: 'Algorithm',
     type: 'Algorithm',
-    // schema: `${API_BASE_PATH}/ui/AlgorithmFilter`,
-    schema: `${BASE_PATH}assets/schema/filter/algorithm.schema.json`,
+    schema: `${API_BASE_PATH}/ui/AlgorithmFilter`,
+    // schema: `${BASE_PATH}assets/schema/filter/algorithm.schema.json`,
     steps: [],
     validator: (data = [], current = { resourceId: null }, group) => {
         return BaseFilterDefinition.validator(data, current, group, 'algorithmFilterTarget', 'algorithmFilterTargetType')
@@ -54,7 +50,7 @@ export const AlgorithmFilterEditor = {
             index: 2,
             initialValues: [],
             fields: [
-                'algorithm'
+                'algorithms'
             ]
         }
     ]
diff --git a/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js
index daed4cadc..1f8191cdc 100644
--- a/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js
+++ b/ui/src/app/metadata/domain/filter/definition/BaseFilterDefinition.js
@@ -29,6 +29,13 @@ export const BaseFilterDefinition = {
                         errors[targetProp].value.addError('message.required-for-scripts');
                     }
                 }
+
+                if (formData[targetProp][typeProp] === 'CONDITION_REF') {
+                    const { [targetProp]: { value } } = formData;
+                    if (!value[0]) {
+                        errors[targetProp].value.addError('message.required-for-condition-ref');
+                    }
+                }
             }
             
             return errors;

From 0eea6f07531a46f9af91a2c374d7bc07db45b920 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 10 Aug 2022 16:58:07 -0700
Subject: [PATCH 52/81] SHIBUI-2267

Filling in the missing display title and tooltip


Former-commit-id: 38a1a76b689e3b2c5cd26f0d04a6ccc97df539e0
---
 .../main/resources/i18n/messages.properties   |   2 +
 .../resources/i18n/messages_en.properties     | 208 ++++++++++++++++--
 2 files changed, 189 insertions(+), 21 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 3b3e67e83..ab537ed03 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -439,6 +439,7 @@ label.attribute-eduPersonAssurance=eduPersonAssurance
 label.attribute-eduPersonUniqueId=eduPersonUniqueId
 label.attribute-employeeNumber=employeeNumber
 label.force-authn=Force AuthN
+label.ignore-request-signatures=Ignore Request Signatures
 
 label.min-cache-duration=Min Cache Duration
 label.max-cache-duration=Max Cache Duration
@@ -608,6 +609,7 @@ message.session-timeout=An error has occurred while saving. Your session may hav
 tooltip.entity-id=Entity ID
 tooltip.service-provider-name=Service Provider Name (Dashboard Display Only)
 tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process
+tooltip.ignore-request-signatures=Whether to skip validation of signatures on requests when dealing with badly broken or incompetently operated services
 tooltip.service-provider-name-dashboard-display-only=Service Provider Name (Dashboard Display Only)
 tooltip.service-provider-entity-id=Service Provider Entity ID
 tooltip.organization-name=Organization Name
diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
index ca93cdbb3..ab537ed03 100644
--- a/backend/src/main/resources/i18n/messages_en.properties
+++ b/backend/src/main/resources/i18n/messages_en.properties
@@ -11,6 +11,7 @@
 
 action.dashboard=Dashboard
 action.logout=Logout
+action.logged-in=Logged in as {username}
 action.add=Add
 action.add-new=Add New
 action.add-new-provider=Add a new metadata provider
@@ -41,6 +42,7 @@ action.copy=Copy
 action.choose-file=Choose File
 action.search-by=Search By
 action.preview=Preview
+action.preview-xml=Preview XML
 action.select-metadata-filter-type=Select a metadata filter type
 action.add-authentication-method=Add Authentication Method
 action.move-up=Move Up
@@ -48,9 +50,38 @@ action.move-down=Move Down
 action.edit=Edit
 action.add-filter=Add Filter
 action.manage-filters=Manage Filters
+action.version-history=Version History
+action.options=Options
+action.xml=XML
+action.manage=Manage
+action.close=Close
+action.back-to-top=Back to Top
+action.restore=Restore
+action.view-only-changes=View Only Changes
+action.user-role=User Role
+action.toggle-view=Toggle view
+action.advanced=Advanced
+action.add-new-attribute=Add new attribute
+action.add-new-group=Add new group
+action.add-attribute=Add attribute
+action.custom-entity-attributes=Custom entity attributes
+action.groups=Groups
+action.source-group=Group
+action.enable=Enable
+action.disable=Disable
+action.get-latest=Get latest changes
+
+action.add-new-role=Add new role
+action.roles=Roles
+action.source-role=Role
+action.select-bundle=Select Bundle
+
+action.get-latest=Get latest
 
 value.enabled=Enabled
 value.disabled=Disabled
+value.current=Current
+value.not-current=Not Current
 value.none=None
 value.file=File
 value.memory=Memory
@@ -80,11 +111,23 @@ value.dynamic-http-metadata-provider=DynamicHttpMetadataProvider
 value.entity-attributes-filter=EntityAttributes Filter
 value.spdescriptor=SPSSODescriptor
 value.attr-auth-descriptor=AttributeAuthorityDescriptor
-value.dynamic-http-metadata-provider=DynamicHttpMetadataProvider
-value.local-dynamic-metadata-provider=LocalDynamicMetadataProvider
 
 value.md-query-protocol=MetadataQueryProtocol
 value.template=Template
+value.string=String
+value.boolean=Boolean
+value.list=List
+value.long=Long
+value.double=Double
+value.duration=Duration
+value.spring-bean-id=Spring Bean ID
+value.BOOLEAN=Boolean
+value.SELECTION_LIST=List
+value.STRING=String
+value.LONG=Long
+value.DOUBLE=Double
+value.DURATION=Duration
+value.SPRING_BEAN_ID=Spring Bean ID
 
 brand.header.title=Source Management
 brand.logo-link-label=Shibboleth
@@ -106,6 +149,41 @@ brand.and=and
 
 heading.shibboleth=Shibboleth
 
+label.source-configuration=Metadata Source Configuration
+label.provider-configuration=Metadata Provider Configuration
+label.entity-attribute-name=Custom Entity Attribute Name
+tooltip.entity-attribute-name=Custom Entity Attribute Name
+label.entity-attribute-type=Attribute Type
+tooltip.entity-attribute-type=Attribute Type
+label.entity-attribute-help=Help Text
+tooltip.entity-attribute-help=Help Text
+label.entity-attribute-default=Default Value
+tooltip.entity-attribute-default=Default Value
+label.entity-attribute-list-options=List options
+tooltip.entity-attribute-list-options=List options
+label.entity-attribute-friendly-name=Friendly name
+tooltip.entity-attribute-friendly-name=Friendly name
+label.entity-attribute-attr-name=Attribute name
+tooltip.entity-attribute-attr-name=This is normally a uri or urn
+label.entity-attribute-display-name=Display name
+tooltip.entity-attribute-display-name=Display name
+
+label.entity-attribute-persist-value=Persist Value
+label.entity-attribute-persist-type=Persist Type
+tooltip.entity-attribute-persist-value=Persist Value
+tooltip.entity-attribute-persist-type=Persist Type
+label.entity-attribute-invert=Invert
+tooltip.entity-attribute-invert=Invert
+
+label.entity-attributes=Entity Attributes
+label.custom-entity-attributes=Custom Entity Attributes
+label.help-text=Help text
+label.default-value=Default Value
+label.groups-management=Groups Management
+label.new-group=New Group
+label.new-attribute=New Custom Entity Attribute
+label.edit-group=Edit Group
+
 label.metadata-source=Metadata Source
 label.metadata-sources=Metadata Sources
 label.metadata-provider=Metadata Provider
@@ -128,6 +206,8 @@ label.new-endpoint=New Endpoint
 label.select-binding=Select Binding Type
 label.mark-as-default=Mark as Default
 label.attribute-name=Attribute Name
+label.group-name=Group Name
+label.group-description=Group Description
 label.yes=Yes
 label.check-all-attributes=Check All Attributes
 label.clear-all-attributes=Clear All Attributes
@@ -136,7 +216,7 @@ label.select-protocol=Select Protocol
 label.nameid-format=NameID Format
 label.nameid-formats=NameID Formats
 label.name-and-entity-id=Name and Entity ID
-label.organization-information=Organization Information
+label.organization-information=SP/Organization Information
 label.contact-information=Contact Information
 label.given-name=Given Name
 label.contact-type=Contact Type
@@ -202,7 +282,7 @@ label.add-a-new-metadata-source=Add a new metadata source - Finish Summary
 label.name-and-entityid=Name and Entity ID.
 label.finish-summary-validation=Finished!
 label.select-entity-id-to-copy=Select the Entity ID to copy
-label.metadata-source-name-dashboard-display-only=Service Provider Name (Dashboard Display Only)
+label.metadata-source-name-dashboard-display-only=Metadata Source Name (Dashboard Display Only)
 label.new-entity-id=New Entity ID
 label.sections-to-copy=Sections to Copy?
 label.add-a-new-metadata-resolver=Add a new metadata source
@@ -236,6 +316,11 @@ label.filter-name=Filter Name
 label.filter-enabled=Filter Enabled
 label.filter-target=FilterTarget
 label.filter-type=Filter Type
+label.filter-target-type=Filter Target Type
+label.filter-target-value=Filter Target Value
+label.target=Filter Target
+label.option=Option
+label.options=Options
 label.value=Value
 label.binding-type=Binding Type
 label.sign-assertion=Sign Assertions
@@ -257,12 +342,16 @@ label.make-default=Make Default
 label.metadata-provider-name-dashboard-display-only=Metadata Provider Name (Dashboard Display Only)
 label.default-authentication-methods=Default Authentication Method(s)
 label.new-of-type=New { type }
+label.filters=Filters
+label.attributes=Attributes
+label.metadata-resolver-id=Metadata Resolver ID
 
 label.metadata-filter-name=Metadata Filter Name (Dashboard Display Only)
 label.filter-enable=Enable this Filter?
 label.search-criteria=Search Criteria
 label.metadata-filter=Metadata Filter
 label.metadata-filter-type=Metadata Filter Type
+label.filter-versions=Filter Versions
 
 label.http-connection-attributes=HTTP Connection Attributes
 label.http-security-attributes=HTTP Security Attributes
@@ -321,6 +410,7 @@ label.remove-roleless-entity-descriptors=Remove Roleless Entity Descriptors?
 label.remove-empty-entities-descriptors=Remove Empty Entities Descriptors?
 
 label.select-metadata-provider-type=Select Metadata Provider Type
+label.select-metadata-filter-type=Select Metadata Filter Type
 label.filter-list=Filter List
 label.common-attributes=Common Attributes
 label.reloading-attributes=Reloading Attributes
@@ -328,7 +418,6 @@ label.dynamic-attributes=Dynamic Attributes
 label.metadata-filter-plugins=Metadata Filter Plugins
 label.advanced-settings=Advanced Settings
 label.edit-metadata-provider=Edit Metadata Provider
-label.edit-metadata-source=Edit Metadata Source
 label.http-settings-advanced=Http Settings (Advanced)
 
 label.metadata-ui=User Interface / MDUI Information
@@ -350,8 +439,8 @@ label.attribute-eduPersonAssurance=eduPersonAssurance
 label.attribute-eduPersonUniqueId=eduPersonUniqueId
 label.attribute-employeeNumber=employeeNumber
 label.force-authn=Force AuthN
+label.ignore-request-signatures=Ignore Request Signatures
 
-label.dynamic-attributes=Dynamic Attributes
 label.min-cache-duration=Min Cache Duration
 label.max-cache-duration=Max Cache Duration
 label.max-idle-entity-data=Max Idle Entity Data
@@ -379,31 +468,86 @@ label.nameid-formats-type=NameID Type
 label.select-filter-type=Select Filter Type
 
 label.admin=Admin
-label.action-required=Action Required
-label.user-access-request=User Access Request
 label.user-maintenance=User Maintenance
 label.user-id=UserId
 label.email=Email
-label.role=Role
 label.delete=Delete?
-label.delete-request=Delete Request
 
-label.enable=Enable
-label.disable=Disable
-label.enable-metadata-sources=Enable Metadata Sources
+label.title=Title
+label.enabled=Enabled
+label.disabled=Disabled
+label.author=Author
+label.creation-date=Creation Date
+label.order=Order
+label.provider-type=Provider Type
+label.version-history=Version History
+label.metadata-resolver-history=Metadata resolver history
+label.metadata-version-history=Metadata Version History
+label.select-version=Select Version
+label.version=Version
+label.save-date=Save Date
+label.changed-by=Changed By
+label.actions=Actions
+label.check-to-select=Check to select
+label.current=Current
+label.restore=Restore
+label.compare-selected=Compare Selected
+label.restore-version=Restore Version ({ date })
+label.group=Group
+
+label.saved=Saved
+label.by=By
 
 label.source=Metadata Source
 label.provider=Metadata Provider
 
+label.url-validation-regex=URL validation regular expression
+tooltip.url-validation-regex=URL validation regular expression
+
+label.bundle-name=Bundle name
+label.bundle-disp=Bundle - {name}
+action.add-new-bundle=Add bundle
+tooltip.bundle-name=A user friendly name to identify the bundle
+action.attribute-bundles=Attribute bundles
+label.new-attribute-bundle=New attribute bundle
+label.edit-attribute-bundle=Edit attribute bundle
+label.bundled-attributes=Bundled Attributes
+label.attribute-bundles=Attribute Bundles
+message.user-role-admin-group=Cannot change group for ROLE_ADMIN users.
+
+label.roles-management=Role Management
+label.new-role=New Role
+label.edit-role=Edit Role
+label.role-name=Role Name
+label.role-description=Role Description
+label.role=Role
+
+message.delete-role-title=Delete Role?
+
+message.delete-role-body=You are requesting to delete a role. If you complete this process the role will be removed. This cannot be undone. Do you wish to continue?
+message.duration=Requires a valid ISO 8601 duration (ex. PT2D)
+
 message.delete-user-title=Delete User?
 message.delete-user-body=You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue?
 
+message.delete-group-title=Delete Group?
+message.delete-group-body=You are requesting to delete a group. If you complete this process the group will be removed. This cannot be undone. Do you wish to continue?
+
+message.delete-attribute-title=Delete Attribute?
+message.delete-attribute-body=You are requesting to delete a custom attribute. If you complete this process the attribute will be removed. This cannot be undone. Do you wish to continue?
+
+message.group-pattern-fail=Pattern must match group url validation pattern: {regex}
+
 message.must-be-unique=Must be unique.
+message.must-be-number=Must be a number.
 message.name-must-be-unique=Name must be unique.
 message.uri-valid-format=URI must be valid format.
 message.id-unique=ID must be unique.
+message.name-unique=Service provider name must be unique.
 message.array-items-must-be-unique=Items in list must be unique.
-message.real-number=Optional. If using a value, must be a real number between 0-1.
+message.valid-duration=Must be a valid duration.
+message.valid-name=No special characters or whitespace allowed.
+message.required=Missing required property.
 
 message.org-name-required=Organization Name is required.
 message.org-displayName-required=Organization Name is required.
@@ -413,11 +557,13 @@ message.org-incomplete=These three fields must all be entered if any single fiel
 message.type-required=Missing required property: Type
 message.match-required=Missing required property: Match
 message.value-required=Missing required property: Value
-message.required=Missing required property.
+
+message.protocol-support-required=Protocol Support Enumeration is required if any NameID formats are defined.
 
 message.conflict=Conflict
 message.data-version-contention=Data Version Contention
 message.contention-new-version=A newer version of this metadata source has been saved. Below are a list of changes. You can use your changes or their changes.
+message.contention-error=There was a problem saving due to a mismatched version.
 message.organization-feedback=These three fields must all be entered if any single field has a value.
 message.valid-email=Must be a valid Email Address
 message.valid-url=Must be a valid URL
@@ -446,14 +592,24 @@ message.required-for-regex=Required for Regex
 message.file-doesnt-exist=The requested file to be processed does not exist on the server.
 message.database-constraint=There was a database constraint problem processing the request. Check the request to ensure that fields that must be unique are truly unique.
 
-message.user-request-received-title=User request received
-message.user-request-received-body=Your request has been received and is being reviewed. You will be notified with access status.
+message.no-filters=No Filters
+message.no-filters-added=No filters have been added to this Metadata Provider
+
+message.create-new-version-from-version=Create New Version from Previous Settings
+message.restoring-this-version-will-copy=Restoring this version will copy the Version ({ date }) configuration and create a new Version from the selected version settings. You can then edit the configuration before saving the new version.
 
-message.filter-fail=A server error occured, and the filter failed to save.
+message.invalid-regex-pattern=Invalid Regular Expression
+
+message.invalid-signing=Unless the response or the assertions are signed, SAML security is compromised  and the service should reject the SAML response. (If it doesn\u0027t, investigate, as that is serious unless the HTTP-Artifact binding is in use.)
+
+message.session-timeout-heading=Session timed out
+message.session-timeout-body=Your session has timed out. Please login again.
+message.session-timeout=An error has occurred while saving. Your session may have timed out.
 
 tooltip.entity-id=Entity ID
 tooltip.service-provider-name=Service Provider Name (Dashboard Display Only)
 tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process
+tooltip.ignore-request-signatures=Whether to skip validation of signatures on requests when dealing with badly broken or incompetently operated services
 tooltip.service-provider-name-dashboard-display-only=Service Provider Name (Dashboard Display Only)
 tooltip.service-provider-entity-id=Service Provider Entity ID
 tooltip.organization-name=Organization Name
@@ -468,13 +624,15 @@ tooltip.mark-as-default=Mark as Default
 tooltip.protocol-support-enumeration=Protocol Support Enumeration
 tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or {{<ConditionRef>}}elements.
 tooltip.enable-this-service-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
+tooltip.is-there-a-x509-certificate=Is there a X509 Certificate?
 tooltip.authentication-requests-signed=Authentication Requests Signed
 tooltip.want-assertions-signed=Want Assertions Signed
 tooltip.certificate-name=Certificate Name
 tooltip.certificate-type=Certificate Type
 tooltip.certificate=Certificate
-tooltip.logout-endpoints-url=Logout Endpoints Url
-tooltip.logout-endpoints-binding-type=Logout Endpoints Binding Type
+tooltip.logout-endpoints=Logout Endpoints
+tooltip.url=Logout Endpoints Url
+tooltip.binding-type=Logout Endpoints Binding Type
 tooltip.mdui-display-name=Typically, the IdP Display Name field will be presented on IdP discovery service interfaces.
 tooltip.mdui-information-url=The IdP Information URL is a link to a comprehensive information page about the IdP. This page should expand on the content of the IdP Description field.
 tooltip.mdui-description=The IdP Description is a brief description of the IdP service. On a well-designed discovery interface, the IdP Description will be presented to the user in addition to the IdP Display Name, and so the IdP Description helps disambiguate duplicate or similar IdP Display Names.
@@ -563,4 +721,12 @@ tooltip.match=A regular expression against which the entityID is evaluated.
 tooltip.remove-existing-formats=Whether to remove any existing formats from a role if any are added by the filter (unmodified roles will be untouched regardless of this setting)
 tooltip.nameid-formats-format=Format
 tooltip.nameid-formats-value=Value
-tooltip.nameid-formats-type=Type
\ No newline at end of file
+tooltip.nameid-formats-type=Type
+
+tooltip.group-name=Group Name
+tooltip.group-description=Group Description
+
+tooltip.role-name=Role Name
+tooltip.role-description=Role Description
+
+tooltip.contact-information=Contact Information
\ No newline at end of file

From 7b4175ba2b3b5a394d606281bccb649d71011513 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 10 Aug 2022 17:09:39 -0700
Subject: [PATCH 53/81] SHIBUI-2267

Updated files so that new override is part of the default set


Former-commit-id: ca9f665c66bd3f988cde3262780a483b5b4f4ee2
---
 .../resources/entity-attributes-filters-ui-schema.json    | 5 +++++
 .../CustomPropertiesConfigurationTests.groovy             | 8 ++++----
 .../src/test/resources/entity-descriptor-json-schema.json | 3 +++
 .../assets/schema/filter/entity-attributes.schema.json    | 7 ++++++-
 ui/public/assets/schema/source/metadata-source.json       | 8 +++++++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/resources/entity-attributes-filters-ui-schema.json b/backend/src/main/resources/entity-attributes-filters-ui-schema.json
index 1db03af99..66d6018df 100644
--- a/backend/src/main/resources/entity-attributes-filters-ui-schema.json
+++ b/backend/src/main/resources/entity-attributes-filters-ui-schema.json
@@ -90,6 +90,11 @@
                     "description": "tooltip.force-authn",
                     "type": "boolean"
                 },
+                "ignoreRequestSignatures": {
+                    "title": "label.ignore-request-signatures",
+                    "description": "tooltip.ignore-request-signatures",
+                    "type": "boolean"
+                },
                 "omitNotBefore": {
                     "title": "label.omit-not-before-condition",
                     "type": "boolean",
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomPropertiesConfigurationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomPropertiesConfigurationTests.groovy
index 4113b372c..9e13dd370 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomPropertiesConfigurationTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomPropertiesConfigurationTests.groovy
@@ -25,7 +25,7 @@ class CustomPropertiesConfigurationTests extends AbstractBaseDataJpaTest {
 
         expect:
         ceadService.getAllDefinitions().size() == 0
-        configUnderTest.getOverrides().size() == 10
+        configUnderTest.getOverrides().size() == 11
         
         def ca = new CustomEntityAttributeDefinition().with {
             it.name = "newDefName"
@@ -38,7 +38,7 @@ class CustomPropertiesConfigurationTests extends AbstractBaseDataJpaTest {
         entityManager.flush()
         
         ceadService.getAllDefinitions().size() == 1
-        configUnderTest.getOverrides().size() == 11
+        configUnderTest.getOverrides().size() == 12
         
         def ca2 = new CustomEntityAttributeDefinition().with {
             it.name = "newDefName2"
@@ -51,12 +51,12 @@ class CustomPropertiesConfigurationTests extends AbstractBaseDataJpaTest {
         entityManager.flush()
         
         ceadService.getAllDefinitions().size() == 2
-        configUnderTest.getOverrides().size() == 12
+        configUnderTest.getOverrides().size() == 13
         
         ceadService.deleteDefinition(ca)
         entityManager.flush()
         
         ceadService.getAllDefinitions().size() == 1
-        configUnderTest.getOverrides().size() == 11
+        configUnderTest.getOverrides().size() == 12
     }
 }
\ No newline at end of file
diff --git a/backend/src/test/resources/entity-descriptor-json-schema.json b/backend/src/test/resources/entity-descriptor-json-schema.json
index cb9e3a46c..db40ba086 100644
--- a/backend/src/test/resources/entity-descriptor-json-schema.json
+++ b/backend/src/test/resources/entity-descriptor-json-schema.json
@@ -243,6 +243,9 @@
         "omitNotBefore": {
           "type": "boolean"
         },
+        "ignoreRequestSignatures": {
+          "type": "boolean"
+        },
         "responderId": {
           "type": "string"
         },
diff --git a/ui/public/assets/schema/filter/entity-attributes.schema.json b/ui/public/assets/schema/filter/entity-attributes.schema.json
index e754c4983..84b341606 100644
--- a/ui/public/assets/schema/filter/entity-attributes.schema.json
+++ b/ui/public/assets/schema/filter/entity-attributes.schema.json
@@ -92,6 +92,11 @@
                     "description": "tooltip.ignore-auth-method",
                     "type": "boolean"
                 },
+                "ignoreRequestSignatures": {
+                    "title": "label.ignore-request-signatures",
+                    "description": "tooltip.ignore-request-signatures",
+                    "type": "boolean"
+                },
                 "omitNotBefore": {
                     "title": "label.omit-not-before-condition",
                     "description": "tooltip.omit-not-before-condition",
@@ -178,4 +183,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ui/public/assets/schema/source/metadata-source.json b/ui/public/assets/schema/source/metadata-source.json
index 0a2f6baba..7348000d7 100644
--- a/ui/public/assets/schema/source/metadata-source.json
+++ b/ui/public/assets/schema/source/metadata-source.json
@@ -194,6 +194,12 @@
                     "type": "boolean",
                     "default": false
                 },
+                "ignoreRequestSignatures": {
+                    "title": "label.ignore-request-signatures",
+                    "description": "tooltip.ignore-request-signatures",
+                    "type": "boolean",
+                    "default": false
+                },
                 "useSha": {
                     "title": "label.use-sha1-signing-algorithm",
                     "description": "tooltip.usa-sha-algorithm",
@@ -640,4 +646,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From 163c781e1096f0ef774edceeb8672502bcead565 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 11 Aug 2022 14:05:09 -0700
Subject: [PATCH 54/81] SHIBUI-2268

added missing subtype to list


Former-commit-id: 0e0412cccbc792685370f8db3f3e3ecd97b8ada4
---
 .../shibboleth/admin/ui/domain/filters/MetadataFilter.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java
index c566576df..29612b15d 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java
@@ -36,7 +36,8 @@
         @JsonSubTypes.Type(value=EntityAttributesFilter.class, name="EntityAttributes"),
         @JsonSubTypes.Type(value=SignatureValidationFilter.class, name="SignatureValidation"),
         @JsonSubTypes.Type(value=RequiredValidUntilFilter.class, name="RequiredValidUntil"),
-        @JsonSubTypes.Type(value=NameIdFormatFilter.class, name="NameIDFormat")})
+        @JsonSubTypes.Type(value=NameIdFormatFilter.class, name="NameIDFormat"),
+        @JsonSubTypes.Type(value=AlgorithmFilter.class, name="Algorithm")})
 @Audited
 @AuditOverride(forClass = AbstractAuditable.class)
 public abstract class MetadataFilter extends AbstractAuditable implements IConcreteMetadataFilterType<MetadataFilter>, IActivatable {

From f1da2276e15c23f8326aa1b1dfd171f0089b0d78 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 11 Aug 2022 15:15:01 -0700
Subject: [PATCH 55/81] Added validation for algorithm filter

Former-commit-id: 364a9e83f7f3bb37d98cb63991641f031f094834
---
 .../main/resources/i18n/messages.properties   |  1 +
 ui/src/app/core/components/ProtectRoute.js    |  2 +-
 .../app/core/components/ProtectRoute.test.js  |  3 ++-
 .../form/component/widgets/SelectWidget.js    |  4 ++++
 .../definition/AlgorithmFilterDefinition.js   | 24 +++++++++++++++++--
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 3f23fc105..2cb49fb3d 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -741,3 +741,4 @@ value.algorithm-cbc-256=CBC (256) - http://www.w3.org/2001/04/xmlenc#aes256-cbc
 value.algorithm-cbc-192=CBC (192) - http://www.w3.org/2001/04/xmlenc#aes192-cbc
 value.algorithm-cbc-128=CBC (128) - http://www.w3.org/2001/04/xmlenc#aes128-cbc
 value.algorithm-cbc-tripledes=CBC (TRIPLEDES) - http://www.w3.org/2001/04/xmlenc#tripledes-cbc
+message.algorithms-unique=Each algorithm may only be used once.
\ No newline at end of file
diff --git a/ui/src/app/core/components/ProtectRoute.js b/ui/src/app/core/components/ProtectRoute.js
index 68420b3b9..77133d9e7 100644
--- a/ui/src/app/core/components/ProtectRoute.js
+++ b/ui/src/app/core/components/ProtectRoute.js
@@ -7,7 +7,7 @@ import { useCurrentUser, useIsAdmin } from '../user/UserContext';
 export function ProtectRoute({ children, redirectTo, ...rest }) {
     const user = useCurrentUser();
     const isAdmin = useIsAdmin();
-    if (isUndefined(user.role)) {
+    if (isUndefined(user?.role)) {
         return <></>
     }
     return isAdmin ? children : <Redirect to={redirectTo} />;
diff --git a/ui/src/app/core/components/ProtectRoute.test.js b/ui/src/app/core/components/ProtectRoute.test.js
index 0edd7662e..477707774 100644
--- a/ui/src/app/core/components/ProtectRoute.test.js
+++ b/ui/src/app/core/components/ProtectRoute.test.js
@@ -6,7 +6,8 @@ import { ProtectRoute } from './ProtectRoute';
 const mockIsAdmin = jest.fn();
 
 jest.mock('../user/UserContext', () => ({
-    useIsAdmin: () => mockIsAdmin()
+    useIsAdmin: () => mockIsAdmin(),
+    useCurrentUser: () => ({role: 'ROLE_ADMIN'}),
 }));
 
 const renderWithRouter = (ui, { route = '/' } = {}) => {
diff --git a/ui/src/app/form/component/widgets/SelectWidget.js b/ui/src/app/form/component/widgets/SelectWidget.js
index 2bf62bb2d..57f18b532 100644
--- a/ui/src/app/form/component/widgets/SelectWidget.js
+++ b/ui/src/app/form/component/widgets/SelectWidget.js
@@ -61,6 +61,7 @@ const SelectWidget = ({
     onFocus,
     placeholder,
     rawErrors = [],
+    uiSchema,
 }) => {
     const { enumOptions, enumDisabled } = options;
 
@@ -120,6 +121,9 @@ const SelectWidget = ({
                 onChange={(event) => {
                     const newValue = getValue(event, multiple);
                     onChange(processValue(schema, newValue));
+                    if (uiSchema.checkOnChange) {
+                        setTouched(true);
+                    }
                 }}>
                 {!multiple && schema.default === undefined && (
                     <option value="">{translator(placeholder)}</option>
diff --git a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
index 51e3fa846..5d19288fb 100644
--- a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
+++ b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
@@ -11,7 +11,10 @@ export const AlgorithmFilterWizard = {
         },
         algorithms: {
             "ui:options": {
-                orderable: false
+                orderable: false,
+            },
+            items: {
+                checkOnChange: true
             }
         }
     }, BaseFilterDefinition.uiSchema),
@@ -21,7 +24,24 @@ export const AlgorithmFilterWizard = {
     // schema: `${BASE_PATH}assets/schema/filter/algorithm.schema.json`,
     steps: [],
     validator: (data = [], current = { resourceId: null }, group) => {
-        return BaseFilterDefinition.validator(data, current, group, 'algorithmFilterTarget', 'algorithmFilterTargetType')
+        const base = BaseFilterDefinition.validator(data, current, group, 'algorithmFilterTarget', 'algorithmFilterTargetType');
+
+        return (formData, errors) => {
+            const errorList = base(formData, errors);
+            const { algorithms } = formData;
+
+            const dupes = algorithms.filter((item, index) => index !== algorithms.indexOf(item));
+            
+            if (dupes.length) {
+                algorithms.forEach((value, index) => {
+                    if (dupes.indexOf(value) > -1) {
+                        errors.algorithms[index].addError('message.algorithms-unique');
+                    }
+                });
+            }
+
+            return errorList;
+        }
     },
     formatter: (changes) => ({
         ...changes,

From 76e32f3ac3a5a62f0973ab0995a445fc30372a5c Mon Sep 17 00:00:00 2001
From: Charles Hasegawa <chasegawa@unicon.net>
Date: Fri, 12 Aug 2022 15:11:07 +0000
Subject: [PATCH 56/81] README.md edited online with Bitbucket

Former-commit-id: cc089f9d9fd928355236f40267535472e77ec05f
---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index c34cf18bc..3afd1b078 100644
--- a/README.md
+++ b/README.md
@@ -91,10 +91,6 @@ spring.h2.console.enabled=true
 #spring.datasource.tomcat.initialSize=50
 #spring.datasource.tomcat.validationQuery=select 1
 
-# Liquibase properties
-liquibase.enabled=false
-#liquibase.change-log=classpath:edu/internet2/tier/shibboleth/admin/ui/database/masterchangelog.xml
-
 # Hibernate properties
 # for production never ever use create, create-drop. It's BEST to use validate
 spring.jpa.hibernate.ddl-auto=create

From b7a6129e4f85fc4fae47c2382084c85c5a5273e1 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 12 Aug 2022 09:25:00 -0700
Subject: [PATCH 57/81] Updated tooltips

Former-commit-id: de97ae372ebb1e105a1e7697610e05cd692f1574
---
 backend/src/main/resources/external.schema.json     |  4 ++--
 backend/src/main/resources/i18n/messages.properties | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/resources/external.schema.json b/backend/src/main/resources/external.schema.json
index daa8c4503..8efb9141e 100644
--- a/backend/src/main/resources/external.schema.json
+++ b/backend/src/main/resources/external.schema.json
@@ -35,8 +35,8 @@
             "default": false
         },
         "description": {
-            "title": "label.description",
-            "description": "tooltip.description",
+            "title": "label.external-description",
+            "description": "tooltip.external-description",
             "type": "string"
         }
     }
diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index ef550b934..ed0a55465 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -632,10 +632,10 @@ tooltip.assertion-consumer-service-location-binding=The binding attribute of the
 tooltip.assertion-consumer-service-endpoints=An Assertion Consumer Service (or ACS) is SAML terminology for the location at a ServiceProvider that accepts <samlp:Response> messages (or SAML artifacts) for the purpose of establishing a session based on an assertion.
 tooltip.mark-as-default=Whether to mark this endpoint as the default by setting the "isDefault" property.
 tooltip.protocol-support-enumeration=This attribute contains a space-delimited collection of URIs that represent general classes of protocol support for the role in question. There are URIs defined by the various standards and profiles to represent the fact that an entity acting in a role "supports" a particular protocol family, such as SAML 2.0 or the Shibboleth profile of SAML 1.1.
-tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or <ConditionRef> elements.
+tooltip.nameid-format=Contains all name identifiers which are added to all applicable roles of the entities that match any of the following <Entity> or <ConditionRef> elements.
 tooltip.enable-this-service-upon-saving=If checkbox is clicked, the metadata is enabled for integration with the IdP
 tooltip.is-there-a-x509-certificate=Is there a X509 Certificate?
-tooltip.authentication-requests-signed=Whether to sign requests.
+tooltip.authentication-requests-signed=Whether to sign requests. Signing requests helps to verify that the request from the SP is authentic.
 tooltip.want-assertions-signed=Whether to sign assertions. Element declares that the service provider wants the <saml:Assertion> element to be digitally signed.
 tooltip.certificate-name=Value used by the IDP UI to identify certificates.
 tooltip.certificate-type=Describes the use to which the credential will be put (as defined by the SAML standard)
@@ -656,7 +656,7 @@ tooltip.contact-name=The given name of the contact.
 tooltip.contact-type=Type / role of the contact.
 tooltip.contact-email=Email address of the contact.
 tooltip.sign-assertion=Sign Assertion declares that the service provider wants the <saml:Assertion> element to be digitally signed.
-tooltip.dont-sign-response=Don\u0027t Sign Response.
+tooltip.dont-sign-response=Do not sign the full authentication response to the service provider. Enabling this property will reduce the size of the response to service providers who may have limitations to the size of the response.
 tooltip.turn-off-encryption=Whether to turn off encryption of the response.
 tooltip.usa-sha-algorithm=Whether to use the SHA1 Signing Algorithm.
 tooltip.authentication-methods-to-use=The method used to authenticate the subject.
@@ -716,7 +716,7 @@ tooltip.max-cache-duration=The maximum duration for which metadata will be cache
 tooltip.max-idle-entity-data=The maximum duration for which metadata will be allowed to be idle (no requests for it) before it is removed from the cache.
 tooltip.cleanup-task-interval=The interval at which the internal cleanup task should run.  This task performs background maintenance tasks, such as the removal of expired and idle metadata.
 tooltip.persistent-cache-manager-directory=The optional manager for the persistent cache store for resolved metadata.  On metadata provider initialization, data present in the persistent cache will be loaded to memory, effectively restoring the state of the provider as closely as possible to that which existed before the previous shutdown.  Each individual cache entry will only be loaded if 1) the entry is still valid as determined by the internal provider logic, and 2) the entry passes the (optional) predicate supplied via initializationFromCachePredicateRef.
-tooltip.initialize-from-persistent-cache-in-background=Flag indicating whether should initialize from the persistent cache in the background.  Initializing from the cache in the background will improve IdP startup times.
+tooltip.initialize-from-persistent-cache-in-background=Flag indicating whether system should initialize from the persistent cache in the background.  Initializing from the cache in the background will improve IdP startup times.
 tooltip.background-init-from-cache-delay=The delay after which to schedule the background initialization from the persistent cache when initializeFromPersistentCacheInBackground=true.
 
 tooltip.source-directory=Convenience mechanism for wiring a FilesystemLoadSaveManager, loading from the specified source directory in the local filesystem. This attribute will be ignored if sourceManagerRef is also specified.  Either this attribute or sourceManagerRef is required.
@@ -741,4 +741,7 @@ tooltip.group-description=A description of the purpose of the group.
 tooltip.role-name=A user friendly name used to identify the role.
 tooltip.role-description=A description of the purpose of the role.
 
-tooltip.contact-information=Contacts provide information about how to contact the organization responsible for standing up the entity.
\ No newline at end of file
+tooltip.contact-information=Add a contact to organization information. Contacts provide information about how to contact the organization responsible for standing up the entity.
+
+label.external-description=Description
+tooltip.external-description=A brief description of the purpose of this filter.
\ No newline at end of file

From e42eb88268c6f1939f714fa3da0d28315a042890 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 12 Aug 2022 10:00:47 -0700
Subject: [PATCH 58/81] Updated tooltips

Former-commit-id: e6a98632436ceff221dd6286c3ae644d4a795d5a
---
 backend/src/main/resources/i18n/messages.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index ed0a55465..6002afbcc 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -158,7 +158,7 @@ tooltip.entity-attribute-type=Data type of the attribute such as boolean or stri
 label.entity-attribute-help=Help Text
 tooltip.entity-attribute-help=Defines help text used in the Shibboleth IDP UI when adding the attribute.
 label.entity-attribute-default=Default Value
-tooltip.entity-attribute-default=The default value of the attribute.
+tooltip.entity-attribute-default=The default value used when no value is provided.
 label.entity-attribute-list-options=List options
 tooltip.entity-attribute-list-options=A list of pre-defined selectable options for a user to select from in the Shibboleth IDP UI.
 label.entity-attribute-friendly-name=Friendly name
@@ -170,10 +170,10 @@ tooltip.entity-attribute-display-name=Provides a human readable value that ident
 
 label.entity-attribute-persist-value=Persist Value
 label.entity-attribute-persist-type=Persist Type
-tooltip.entity-attribute-persist-value=Persist Value
+tooltip.entity-attribute-persist-value=The value that is persisted in the database.
 tooltip.entity-attribute-persist-type=Persist Type
 label.entity-attribute-invert=Invert
-tooltip.entity-attribute-invert=Invert
+tooltip.entity-attribute-invert=Whether to invert the boolean value (true means false, false means true).
 
 label.entity-attributes=Entity Attributes
 label.custom-entity-attributes=Custom Entity Attributes

From 9c888dd5301d7de595d845c1485ae23449998146 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 12 Aug 2022 10:03:56 -0700
Subject: [PATCH 59/81] Updated tooltips

Former-commit-id: b7df52816a21ee5f6915de2381489402d471df7b
---
 backend/src/main/resources/i18n/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 6002afbcc..c0433d99a 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -658,7 +658,7 @@ tooltip.contact-email=Email address of the contact.
 tooltip.sign-assertion=Sign Assertion declares that the service provider wants the <saml:Assertion> element to be digitally signed.
 tooltip.dont-sign-response=Do not sign the full authentication response to the service provider. Enabling this property will reduce the size of the response to service providers who may have limitations to the size of the response.
 tooltip.turn-off-encryption=Whether to turn off encryption of the response.
-tooltip.usa-sha-algorithm=Whether to use the SHA1 Signing Algorithm.
+tooltip.usa-sha-algorithm=Whether to use the SHA1 Signing Algorithm. In cryptography, SHA-1 (Secure Hash Algorithm 1) is cryptographically broken but still widely used. It takes an input and produces a 160-bit (20-byte) hash value.
 tooltip.authentication-methods-to-use=The method used to authenticate the subject.
 tooltip.ignore-auth-method=Whether to ignore any SP-Requested Authentication Method.
 tooltip.omit-not-before-condition=Whether to include a NotBefore attribute in assertions.

From 7d6ece7a3d56b90caf57e82d195d250ca4bcd3a4 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 12 Aug 2022 10:08:44 -0700
Subject: [PATCH 60/81] Updated tooltips

Former-commit-id: f34ebc6b9d2313c36f9e0ac1e75f0b2398828b59
---
 backend/src/main/resources/i18n/messages.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index c0433d99a..51b0cf332 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -292,7 +292,7 @@ label.or=or
 label.name-and-upload-url=Name and Upload Url
 label.service-resolver-file=Select Provider Metadata File
 label.service-resolver-metadata-url=Service Provider Metadata URL
-label.search-criteria-by=Search Criteria by { displayType }
+label.search-criteria-by=The value used to search against, such as a regex pattern or entityID to match against.
 label.entity-ids-added=Entity Ids Added
 label.ui-mdui-info=User Interface / MDUI Information
 label.sp-sso-descriptor-info=SP SSO Descriptor Information
@@ -312,7 +312,7 @@ label.contact=Contact
 label.mdui=MDUI Information
 label.service-provider-sso-descriptor=Service Provider Sso Descriptor
 label.service-enabled=Service Enabled
-label.filter-name=Filter Name
+label.filter-name=A name given to this filter to identify it within the Shibboleth IDP UI (used for display purposes only).
 label.filter-enabled=Filter Enabled
 label.filter-target=FilterTarget
 label.filter-type=Filter Type

From b865d6d20b30b4245d8b279c6a52431ef3459c96 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 15 Aug 2022 08:04:19 -0700
Subject: [PATCH 61/81] Updated ignore auth method tooltip

Former-commit-id: 101dd3dc4d4425832bb373f58a094e8827740bd1
---
 backend/src/main/resources/i18n/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 51b0cf332..b76133d20 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -660,7 +660,7 @@ tooltip.dont-sign-response=Do not sign the full authentication response to the s
 tooltip.turn-off-encryption=Whether to turn off encryption of the response.
 tooltip.usa-sha-algorithm=Whether to use the SHA1 Signing Algorithm. In cryptography, SHA-1 (Secure Hash Algorithm 1) is cryptographically broken but still widely used. It takes an input and produces a 160-bit (20-byte) hash value.
 tooltip.authentication-methods-to-use=The method used to authenticate the subject.
-tooltip.ignore-auth-method=Whether to ignore any SP-Requested Authentication Method.
+tooltip.ignore-auth-method=Reject any AuthnReuests from this SP that contain an explicitly requested AuthnContext class
 tooltip.omit-not-before-condition=Whether to include a NotBefore attribute in assertions.
 tooltip.responder-id=Identifier of the selected SAML IdP entity.
 tooltip.instruction=Information icon

From 4f5759c9108cd3f9448b178a390e13d637f77c3d Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Mon, 15 Aug 2022 23:39:35 -0400
Subject: [PATCH 62/81] SHIBUI-2267

Added test for new relying party override. Various other fixes and
enhancements in an effort to help stabilize the tests.


Former-commit-id: 7302d11ed02841c3531b2a41e2f1134c3240dc9a
---
 .../admin/ui/SeleniumSIDETest.groovy          |   1 +
 .../integration/resources/SHIBUI-1334-1.side  |  35 +-
 .../integration/resources/SHIBUI-1364-4.side  |  14 +
 .../integration/resources/SHIBUI-1385-1.side  |  69 ++-
 .../integration/resources/SHIBUI-1407-1.side  |  37 +-
 .../integration/resources/SHIBUI-1732-1.side  |  96 ++--
 .../integration/resources/SHIBUI-1732-2.side  |  94 ++--
 .../integration/resources/SHIBUI-1732-3.side  | 136 +++---
 .../integration/resources/SHIBUI-1732-4.side  |  75 +--
 .../integration/resources/SHIBUI-1732-5.side  |  94 ++--
 .../integration/resources/SHIBUI-1732-7.side  |  93 ++--
 .../integration/resources/SHIBUI-2267.side    | 455 ++++++++++++++++++
 12 files changed, 848 insertions(+), 351 deletions(-)
 create mode 100644 backend/src/integration/resources/SHIBUI-2267.side

diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
index 14a65b52b..a45acac94 100644
--- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
+++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -153,6 +153,7 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1744: Verify attribute bundles in entity attribute filters' | '/SHIBUI-1744-3.side'
         'SHIBUI-2052: Logged in user & role appear on dashboard'            | '/SHIBUI-2052.side'
         'SHIBUI-2116: Verify entity attribute bundle highlights'            | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script).
+        'SHIBUI-2267: Verify new RPO CRUD'                                  | '/SHIBUI-2267.side'
         'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
     }
 }
diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
index f0491037d..af9840182 100644
--- a/backend/src/integration/resources/SHIBUI-1334-1.side
+++ b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -2695,6 +2695,13 @@
         ["xpath=//span[contains(.,'Display Name v3')]", "xpath:innerText"]
       ],
       "value": "30000"
+    }, {
+      "id": "bde2bbbb-df66-4e07-a770-ec9125fe3e81",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "5a976e2c-dc5f-4021-9cc6-3cad12e771ea",
       "comment": "",
@@ -2718,20 +2725,20 @@
       ],
       "value": "Display Name"
     }, {
-             "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-             "comment": "",
-             "command": "open",
-             "target": "/api/heheheheheheheWipeout",
-             "targets": [],
-             "value": ""
-           }, {
-             "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-             "comment": "",
-             "command": "assertText",
-             "target": "css=body",
-             "targets": [],
-             "value": "yes, you did it"
-           }]
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
diff --git a/backend/src/integration/resources/SHIBUI-1364-4.side b/backend/src/integration/resources/SHIBUI-1364-4.side
index 3384d27ea..ef58a9c8d 100644
--- a/backend/src/integration/resources/SHIBUI-1364-4.side
+++ b/backend/src/integration/resources/SHIBUI-1364-4.side
@@ -1417,6 +1417,20 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "a9bd983c-7743-4bec-87ad-7484e60cff99",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=.d-flex:nth-child(3) > .border-primary:nth-child(2) .mb-0:nth-child(1)",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "0d53853f-597f-4c2a-8f6b-ef4e1109bf3c",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c2102a31-6e18-4d6c-8146-e23459403b65",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side
index 801580133..43178ab01 100644
--- a/backend/src/integration/resources/SHIBUI-1385-1.side
+++ b/backend/src/integration/resources/SHIBUI-1385-1.side
@@ -2629,45 +2629,38 @@
       ],
       "value": ""
     }, {
-      "id": "56094f6e-45b7-42f6-9102-e4e19673240d",
+      "id": "85af384a-77b1-4d88-8915-9430afae4845",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(2)",
-      "targets": [
-        ["css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[2]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:position"]
-      ],
+      "target": "css=div:nth-child(1) > div > .bg-diff > .d-block:nth-child(2)",
+      "targets": [],
       "value": "30000"
+    }, {
+      "id": "eb302999-153d-492c-869c-8bf26e8134a0",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "5a976e2c-dc5f-4021-9cc6-3cad12e771ea",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(2)",
+      "target": "css=div:nth-child(1) > div > .bg-diff > .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(2)", "css:finder"],
+        ["css=div:nth-child(1) > div > .bg-diff > .d-block:nth-child(2)", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div/section[2]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:position"]
+        ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'Display Name v3')]", "xpath:innerText"]
       ],
       "value": "Display Name v3"
-    }, {
-      "id": "c2ebc46c-e443-47b9-b17b-0ac6d23b882c",
-      "comment": "",
-      "command": "waitForElementVisible",
-      "target": "css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(3)",
-      "targets": [
-        ["css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(3)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:idRelative"],
-        ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:position"]
-      ],
-      "value": "30000"
     }, {
       "id": "72328587-fe8d-4dc8-bc3d-a163f91a1ad6",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(3)",
+      "target": "css=div:nth-child(1) > div > .bg-diff > .d-block:nth-child(3)",
       "targets": [
-        ["css=.mb-4:nth-child(3) div:nth-child(1) > .d-flex > .d-block:nth-child(3)", "css:finder"],
+        ["css=div:nth-child(1) > div > .bg-diff > .d-block:nth-child(3)", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div/section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:idRelative"],
         ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:position"]
       ],
@@ -2878,21 +2871,21 @@
         ["xpath=//section[2]/div/div[2]/div[2]/div/div/div/span[3]", "xpath:position"]
       ],
       "value": "Display Name"
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
index 2a6525167..46d1c6fa1 100644
--- a/backend/src/integration/resources/SHIBUI-1407-1.side
+++ b/backend/src/integration/resources/SHIBUI-1407-1.side
@@ -2459,6 +2459,13 @@
         ["xpath=//span[3]", "xpath:position"]
       ],
       "value": "Test Provider"
+    }, {
+      "id": "39637add-5eb4-40d0-b840-8eb1972ede0f",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "138ad58b-f0a2-436b-a8b0-43484f4180e6",
       "comment": "",
@@ -2608,21 +2615,21 @@
       "target": "isPresent",
       "targets": [],
       "value": "true"
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
diff --git a/backend/src/integration/resources/SHIBUI-1732-1.side b/backend/src/integration/resources/SHIBUI-1732-1.side
index 38720ef67..5c1d1daec 100644
--- a/backend/src/integration/resources/SHIBUI-1732-1.side
+++ b/backend/src/integration/resources/SHIBUI-1732-1.side
@@ -400,11 +400,11 @@
       "id": "002e853c-ed14-430a-ba32-a3c59da26305",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(7) span",
+      "target": "css=.row:nth-child(8) .form-label > span",
       "targets": [
-        ["css=.row:nth-child(7) span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[7]/div/div/div/div/label/span", "xpath:idRelative"],
-        ["xpath=//div[7]/div/div/div/div/label/span", "xpath:position"],
+        ["css=.row:nth-child(8) .form-label > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[8]/div/div/div/div/label/span", "xpath:idRelative"],
+        ["xpath=//div[8]/div/div/div/div/label/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom String Display')]", "xpath:innerText"]
       ],
       "value": "Custom String Display"
@@ -475,11 +475,11 @@
       "id": "220200b4-4b3f-4c1b-9d89-e17a136fb4c1",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(1)",
+      "target": "css=div:nth-child(8) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
+        ["css=div:nth-child(8) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/div/span", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom String Display')]", "xpath:innerText"]
       ],
       "value": "Custom String Display"
@@ -487,11 +487,11 @@
       "id": "33312edd-a161-428c-9e5a-63d1d245b1c7",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=div:nth-child(8) .text-truncate",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(8) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'Custom String Default Edited')]", "xpath:innerText"]
       ],
       "value": "Custom String Default Edited"
@@ -533,11 +533,11 @@
       "id": "77768da6-c87e-49c6-a2d1-322218196038",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=div:nth-child(8) .text-truncate",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(8) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'Custom String Default Edited')]", "xpath:innerText"]
       ],
       "value": "Custom String Default Edited"
@@ -545,11 +545,11 @@
       "id": "edb8ae5b-b1d6-4078-b3d2-d41ece0bbd28",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)",
+      "target": "css=div:nth-child(8) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
+        ["css=div:nth-child(8) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom String Display')]", "xpath:innerText"]
       ],
       "value": "Custom String Display"
@@ -862,11 +862,11 @@
       "id": "62aae077-0f97-48ec-97cb-2111ea9e3400",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(7) > .col-12 > .mb-3 > div > div > .form-label > span",
+      "target": "css=.row:nth-child(8) .form-label > span",
       "targets": [
-        ["css=.row:nth-child(7) > .col-12 > .mb-3 > div > div > .form-label > span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[7]/div/div/div/div/label/span", "xpath:idRelative"],
-        ["xpath=//div[7]/div/div/div/div/label/span", "xpath:position"],
+        ["css=.row:nth-child(8) .form-label > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[8]/div/div/div/div/label/span", "xpath:idRelative"],
+        ["xpath=//div[8]/div/div/div/div/label/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom String Display')]", "xpath:innerText"]
       ],
       "value": "Custom String Display"
@@ -939,11 +939,11 @@
       "id": "848c273e-a5b1-4ff8-90e2-ee0ecbadff2d",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(7) .d-block:nth-child(1)",
+      "target": "css=.mb-4:nth-child(4) div:nth-child(8) .d-block:nth-child(1)",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
-        ["xpath=//div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(4) div:nth-child(8) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[8]/div/span", "xpath:idRelative"],
+        ["xpath=//section[2]/div/div[2]/div[2]/div/div[8]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom String Display')]", "xpath:innerText"]
       ],
       "value": "Custom String Display"
@@ -951,12 +951,12 @@
       "id": "4524e88f-bbfc-4f4f-b72d-30cce97564da",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(7) .text-truncate",
+      "target": "css=.mb-4:nth-child(4) div:nth-child(8) .d-block:nth-child(2)",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(7) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
-        ["xpath=//span[contains(.,'Custom String Default')]", "xpath:innerText"]
+        ["css=.mb-4:nth-child(4) div:nth-child(8) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[2]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'Custom String Default Edited')]", "xpath:innerText"]
       ],
       "value": "Custom String Default Edited"
     }, {
@@ -1031,21 +1031,21 @@
       "target": "css=table > tbody > tr",
       "targets": [],
       "value": ""
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "a9b788f1-5f67-4d2c-82a5-30dc53eb75e9",
diff --git a/backend/src/integration/resources/SHIBUI-1732-2.side b/backend/src/integration/resources/SHIBUI-1732-2.side
index 39b05afb3..fdfad5dc8 100644
--- a/backend/src/integration/resources/SHIBUI-1732-2.side
+++ b/backend/src/integration/resources/SHIBUI-1732-2.side
@@ -374,11 +374,11 @@
       "id": "fb8782e1-3376-4c59-af8a-5cf383c78239",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(6) .d-flex > span",
+      "target": "css=.row:nth-child(7) .d-flex > span",
       "targets": [
-        ["css=.row:nth-child(6) .d-flex > span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[6]/div/div/div/div/div/label/span/span", "xpath:idRelative"],
-        ["xpath=//div[6]/div/div/div/div/div/label/span/span", "xpath:position"]
+        ["css=.row:nth-child(7) .d-flex > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[7]/div/div/div/div/div/label/span/span", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/label/span/span", "xpath:position"]
       ],
       "value": "Custom Boolean Display"
     }, {
@@ -435,11 +435,11 @@
       "id": "a7db0511-2584-4cb0-bbaa-2341a705ef07",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(6) .d-block:nth-child(1)",
+      "target": "css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(6) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[6]/div/span", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[6]/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Boolean Display')]", "xpath:innerText"]
       ],
       "value": "Custom Boolean Display"
@@ -447,11 +447,11 @@
       "id": "771a8f70-ed99-486f-90f3-3401215d8743",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(6) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(6) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[6]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[6]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
       "value": "true"
@@ -493,11 +493,11 @@
       "id": "4dc24329-7c83-43c9-86d6-95f9bf5da92d",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(6) .d-block:nth-child(1)",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(6) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[6]/div/span", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[6]/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Boolean Display')]", "xpath:innerText"]
       ],
       "value": "Custom Boolean Display"
@@ -505,11 +505,11 @@
       "id": "32f6aaa6-a256-4c36-932e-7c45b4045cba",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(6) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(6) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[6]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[6]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
       ],
       "value": "true"
@@ -840,11 +840,11 @@
       "id": "73e0928e-a395-4cdd-b90c-229a01cbe7c4",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(6) .d-flex > span",
+      "target": "css=.row:nth-child(7) > .col-12 > .mb-3 > div > .checkbox .d-flex > span",
       "targets": [
-        ["css=.row:nth-child(6) .d-flex > span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[6]/div/div/div/div/div/label/span/span", "xpath:idRelative"],
-        ["xpath=//div[6]/div/div/div/div/div/label/span/span", "xpath:position"]
+        ["css=.row:nth-child(7) > .col-12 > .mb-3 > div > .checkbox .d-flex > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[7]/div/div/div/div/div/label/span/span", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/label/span/span", "xpath:position"]
       ],
       "value": "Custom Boolean Display"
     }, {
@@ -897,11 +897,11 @@
       "id": "d445f01f-b936-4ebb-b011-8ce2f056e06c",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(6) > .d-flex > .d-block:nth-child(1)",
+      "target": "css=div:nth-child(1) > div:nth-child(7) .d-block:nth-child(1)",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(6) > .d-flex > .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[6]/div/span", "xpath:idRelative"],
-        ["xpath=//div[2]/div[2]/div/div[6]/div/span", "xpath:position"],
+        ["css=div:nth-child(1) > div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
+        ["xpath=//div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Boolean Display')]", "xpath:innerText"]
       ],
       "value": "Custom Boolean Display"
@@ -909,11 +909,11 @@
       "id": "662f922e-4d41-4274-b7a3-aae312fe8c36",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(6) > .d-flex > .text-truncate",
+      "target": "css=div:nth-child(1) > div:nth-child(7) .text-truncate",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(6) > .d-flex > .text-truncate", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[6]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div[2]/div/div[6]/div/span[2]", "xpath:position"]
+        ["css=div:nth-child(1) > div:nth-child(7) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"]
       ],
       "value": "true"
     }, {
@@ -967,21 +967,21 @@
         ["xpath=//div[3]/div/div/div[3]/button", "xpath:position"]
       ],
       "value": ""
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "4c985215-babb-4f22-8422-505980ce939b",
diff --git a/backend/src/integration/resources/SHIBUI-1732-3.side b/backend/src/integration/resources/SHIBUI-1732-3.side
index 54573d88b..436cdd74f 100644
--- a/backend/src/integration/resources/SHIBUI-1732-3.side
+++ b/backend/src/integration/resources/SHIBUI-1732-3.side
@@ -462,11 +462,11 @@
       "id": "95c2701d-82d8-4d2d-b83e-82bb4bd2cf8c",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(6) .control-label",
+      "target": "css=.row:nth-child(7) .control-label",
       "targets": [
-        ["css=.row:nth-child(6) .control-label", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[6]/div/div/div/div/div/div/span", "xpath:idRelative"],
-        ["xpath=//div[6]/div/div/div/div/div/div/span", "xpath:position"],
+        ["css=.row:nth-child(7) .control-label", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[7]/div/div/div/div/div/div/span", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom List Display')]", "xpath:innerText"]
       ],
       "value": "Custom List Display"
@@ -474,12 +474,12 @@
       "id": "d6d968f3-a549-4e0b-8fe0-0ad37d80fea7",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(6) .array-add-button",
+      "target": "css=.row:nth-child(7) .array-add-button",
       "targets": [
-        ["css=.row:nth-child(6) .array-add-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[14]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[6]/div/div/div/div/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[6]/div/div/div/div/div/div/button", "xpath:position"]
+        ["css=.row:nth-child(7) .array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[15]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -493,7 +493,7 @@
       "id": "01d8abc6-d8a5-46d2-9487-d5b02b95521c",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(6) .array-add-button",
+      "target": "css=.row:nth-child(7) .array-add-button",
       "targets": [
         ["css=.row:nth-child(6) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[14]", "xpath:attributes"],
@@ -571,11 +571,11 @@
       "id": "9ce37583-508a-4ed4-9027-3b7c1f408895",
       "comment": "",
       "command": "assertText",
-      "target": "css=.align-items-start:nth-child(6) > .p-2",
+      "target": "css=.align-items-start:nth-child(7) > .p-2",
       "targets": [
-        ["css=.align-items-start:nth-child(6) > .p-2", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[6]/span", "xpath:idRelative"],
-        ["xpath=//div[6]/span", "xpath:position"],
+        ["css=.align-items-start:nth-child(7) > .p-2", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/span", "xpath:idRelative"],
+        ["xpath=//div[7]/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom List Display')]", "xpath:innerText"]
       ],
       "value": "Custom List Display"
@@ -586,7 +586,7 @@
       "target": "css=.align-items-center:nth-child(1) > .d-block",
       "targets": [
         ["css=.align-items-center:nth-child(1) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[6]/ul/li/span", "xpath:idRelative"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/ul/li/span", "xpath:idRelative"],
         ["xpath=//li/span", "xpath:position"],
         ["xpath=//span[contains(.,'baz')]", "xpath:innerText"]
       ],
@@ -598,7 +598,7 @@
       "target": "css=.d-flex:nth-child(2) > .d-block",
       "targets": [
         ["css=.d-flex:nth-child(2) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[6]/ul/li[2]/span", "xpath:idRelative"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/ul/li[2]/span", "xpath:idRelative"],
         ["xpath=//li[2]/span", "xpath:position"],
         ["xpath=//span[contains(.,'bar')]", "xpath:innerText"]
       ],
@@ -634,14 +634,19 @@
       "id": "63e0b87d-4da3-4fb8-aa9f-6412e0562709",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=main > div > section > div > div > section:nth-child(9) > div > div.p-2 > div:nth-child(2) > div > div:nth-child(6) > ul > li:nth-child(1) > span",
-      "targets": [],
+      "target": "css=.align-items-start:nth-child(7) > .p-2",
+      "targets": [
+        ["css=.align-items-start:nth-child(7) > .p-2", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/span", "xpath:idRelative"],
+        ["xpath=//div[7]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'Custom List Display')]", "xpath:innerText"]
+      ],
       "value": "30000"
     }, {
       "id": "bc1292d6-d326-4146-baa8-62d9f4e97cf0",
       "comment": "",
       "command": "assertText",
-      "target": "css=main > div > section > div > div > section:nth-child(9) > div > div.p-2 > div:nth-child(2) > div > div:nth-child(6) > span",
+      "target": "css=.align-items-start:nth-child(7) > .p-2",
       "targets": [
         ["css=.align-items-start:nth-child(6) > .p-2", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[6]/span", "xpath:idRelative"],
@@ -653,10 +658,10 @@
       "id": "296ea08c-0cb0-40a4-8111-3de97b28e099",
       "comment": "",
       "command": "assertText",
-      "target": "css=main > div > section > div > div > section:nth-child(9) > div > div.p-2 > div:nth-child(2) > div > div:nth-child(6) > ul > li:nth-child(1) > span",
+      "target": "css=.align-items-center:nth-child(1) > .d-block",
       "targets": [
         ["css=.align-items-center:nth-child(1) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[6]/ul/li/span", "xpath:idRelative"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/ul/li/span", "xpath:idRelative"],
         ["xpath=//ul/li/span", "xpath:position"],
         ["xpath=//span[contains(.,'baz')]", "xpath:innerText"]
       ],
@@ -665,10 +670,10 @@
       "id": "9b4d38f8-e630-463b-b7a6-1073f2092cda",
       "comment": "",
       "command": "assertText",
-      "target": "css=main > div > section > div > div > section:nth-child(9) > div > div.p-2 > div:nth-child(2) > div > div:nth-child(6) > ul > li:nth-child(2) > span",
+      "target": "css=.d-flex:nth-child(2) > .d-block",
       "targets": [
         ["css=.d-flex:nth-child(2) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[6]/ul/li[2]/span", "xpath:idRelative"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/ul/li[2]/span", "xpath:idRelative"],
         ["xpath=//ul/li[2]/span", "xpath:position"],
         ["xpath=//span[contains(.,'bar')]", "xpath:innerText"]
       ],
@@ -749,17 +754,22 @@
       "id": "5e82eb5e-ac64-4f01-8362-af72c19978b8",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=main > div > section > div > div > section:nth-child(9) > div > div.p-2 > div:nth-child(2) > div > div:nth-child(6) > ul > li:nth-child(1) > span",
-      "targets": [],
+      "target": "css=.align-items-center:nth-child(1) > .d-block",
+      "targets": [
+        ["css=.align-items-start:nth-child(7) > .p-2", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/span", "xpath:idRelative"],
+        ["xpath=//div[7]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'Custom List Display')]", "xpath:innerText"]
+      ],
       "value": "30000"
     }, {
       "id": "5e43fd63-8e71-4bf6-a7da-91ed55c202a2",
       "comment": "",
       "command": "assertText",
-      "target": "css=main > div > section > div > div > section:nth-child(9) > div > div.p-2 > div:nth-child(2) > div > div:nth-child(6) > ul > li:nth-child(1) > span",
+      "target": "css=.align-items-center:nth-child(1) > .d-block",
       "targets": [
         ["css=.align-items-center:nth-child(1) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[6]/ul/li/span", "xpath:idRelative"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/ul/li/span", "xpath:idRelative"],
         ["xpath=//ul/li/span", "xpath:position"],
         ["xpath=//span[contains(.,'foo')]", "xpath:innerText"]
       ],
@@ -768,10 +778,10 @@
       "id": "b023fa7f-ec8a-4bb7-84cd-c0fbcb721aac",
       "comment": "",
       "command": "assertText",
-      "target": "css=main > div > section > div > div > section:nth-child(9) > div > div.p-2 > div:nth-child(2) > div > div:nth-child(6) > ul > li:nth-child(2) > span",
+      "target": "css=.d-flex:nth-child(2) > .d-block",
       "targets": [
         ["css=.d-flex:nth-child(2) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[6]/ul/li[2]/span", "xpath:idRelative"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/ul/li[2]/span", "xpath:idRelative"],
         ["xpath=//ul/li[2]/span", "xpath:position"],
         ["xpath=//span[contains(.,'bar')]", "xpath:innerText"]
       ],
@@ -1079,11 +1089,11 @@
       "id": "f4efaf0c-a75f-4016-8808-1db34e6c29f2",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(6) .control-label",
+      "target": "css=.row:nth-child(7) > .col-12 > .mb-3 > div > .p-0 > .p-0 .control-label",
       "targets": [
-        ["css=.row:nth-child(6) .control-label", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[6]/div/div/div/div/div/div/span", "xpath:idRelative"],
-        ["xpath=//div[6]/div/div/div/div/div/div/span", "xpath:position"],
+        ["css=.row:nth-child(7) > .col-12 > .mb-3 > div > .p-0 > .p-0 .control-label", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[7]/div/div/div/div/div/div/span", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom List Display')]", "xpath:innerText"]
       ],
       "value": "Custom List Display"
@@ -1091,12 +1101,12 @@
       "id": "61f236f1-5170-4b98-ac5b-7262a65a7bb7",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(6) .array-add-button",
+      "target": "css=.row:nth-child(7) > .col-12 > .mb-3 > div > .p-0 > .p-0 .array-add-button",
       "targets": [
-        ["css=.row:nth-child(6) .array-add-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[19]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[6]/div/div/div/div/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[6]/div/div/div/div/div/div/button", "xpath:position"]
+        ["css=.row:nth-child(7) > .col-12 > .mb-3 > div > .p-0 > .p-0 .array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[20]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -1156,11 +1166,11 @@
       "id": "5d21315a-5180-4d09-9a02-a7739af2d452",
       "comment": "",
       "command": "assertText",
-      "target": "css=.align-items-start:nth-child(6) > .p-2",
+      "target": "css=.align-items-start:nth-child(7) > .p-2",
       "targets": [
-        ["css=.align-items-start:nth-child(6) > .p-2", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[6]/span", "xpath:idRelative"],
-        ["xpath=//div[6]/span", "xpath:position"],
+        ["css=.align-items-start:nth-child(7) > .p-2", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/span", "xpath:idRelative"],
+        ["xpath=//div[7]/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom List Display')]", "xpath:innerText"]
       ],
       "value": "Custom List Display"
@@ -1168,11 +1178,11 @@
       "id": "f357c4e6-acbb-4f90-ba48-18f6afec80f5",
       "comment": "",
       "command": "assertText",
-      "target": "css=.d-flex:nth-child(6) .d-block",
+      "target": "css=.d-flex:nth-child(7) .d-block",
       "targets": [
-        ["css=.d-flex:nth-child(6) .d-block", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[6]/ul/li/span", "xpath:idRelative"],
-        ["xpath=//div[6]/ul/li/span", "xpath:position"],
+        ["css=.d-flex:nth-child(7) .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/ul/li/span", "xpath:idRelative"],
+        ["xpath=//div[7]/ul/li/span", "xpath:position"],
         ["xpath=//span[contains(.,'bar')]", "xpath:innerText"]
       ],
       "value": "bar"
@@ -1207,12 +1217,12 @@
       "id": "774df87c-643a-4c71-985c-f7920f956fb6",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(6) .array-add-button",
+      "target": "css=.row:nth-child(7) > .col-12 > .mb-3 > div > .p-0 > .p-0 .array-add-button",
       "targets": [
-        ["css=.row:nth-child(6) .array-add-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[6]/div/div/div/div/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[6]/div/div/div/div/div/div/button", "xpath:position"]
+        ["css=.row:nth-child(7) > .col-12 > .mb-3 > div > .p-0 > .p-0 .array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[19]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -1252,11 +1262,11 @@
       "id": "83aa335b-5efb-4ca2-9e41-f06213cc68e2",
       "comment": "",
       "command": "assertText",
-      "target": "css=.d-flex:nth-child(6) .d-flex:nth-child(1) > .d-block",
+      "target": "css=.d-flex:nth-child(7) .d-flex:nth-child(1) > .d-block",
       "targets": [
-        ["css=.d-flex:nth-child(6) .d-flex:nth-child(1) > .d-block", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[6]/ul/li/span", "xpath:idRelative"],
-        ["xpath=//div[6]/ul/li/span", "xpath:position"],
+        ["css=.d-flex:nth-child(7) .d-flex:nth-child(1) > .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/ul/li/span", "xpath:idRelative"],
+        ["xpath=//div[7]/ul/li/span", "xpath:position"],
         ["xpath=//span[contains(.,'bar')]", "xpath:innerText"]
       ],
       "value": "bar"
@@ -1267,7 +1277,7 @@
       "target": "css=.d-flex:nth-child(2) > .d-block",
       "targets": [
         ["css=.d-flex:nth-child(2) > .d-block", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[6]/ul/li[2]/span", "xpath:idRelative"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/ul/li[2]/span", "xpath:idRelative"],
         ["xpath=//ul/li[2]/span", "xpath:position"]
       ],
       "value": "foo"
@@ -1359,11 +1369,11 @@
       "id": "60be08c4-004e-4a41-907c-e82fdbedddf2",
       "comment": "",
       "command": "assertText",
-      "target": "css=.d-flex:nth-child(6) > .list-unstyled:nth-child(3) > .d-flex:nth-child(1) > .d-block",
+      "target": "css=.d-flex:nth-child(7) > .list-unstyled:nth-child(3) > .d-flex:nth-child(1) > .d-block",
       "targets": [
-        ["css=.d-flex:nth-child(6) > .list-unstyled:nth-child(3) > .d-flex:nth-child(1) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[6]/div/div[2]/div[2]/div/div[6]/ul/li/span", "xpath:idRelative"],
-        ["xpath=//div[6]/ul/li/span", "xpath:position"],
+        ["css=.d-flex:nth-child(7) > .list-unstyled:nth-child(3) > .d-flex:nth-child(1) > .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/section[2]/div/div[2]/div[2]/div/div[7]/ul/li/span", "xpath:idRelative"],
+        ["xpath=//div[7]/ul/li/span", "xpath:position"],
         ["xpath=//span[contains(.,'bar')]", "xpath:innerText"]
       ],
       "value": "bar"
@@ -1374,7 +1384,7 @@
       "target": "css=.d-flex:nth-child(2) > .d-block",
       "targets": [
         ["css=.d-flex:nth-child(2) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[6]/div/div[2]/div[2]/div/div[6]/ul/li[2]/span", "xpath:idRelative"],
+        ["xpath=//div[@id='filters']/section[2]/div/div[2]/div[2]/div/div[7]/ul/li[2]/span", "xpath:idRelative"],
         ["xpath=//ul/li[2]/span", "xpath:position"]
       ],
       "value": "foo"
@@ -1385,8 +1395,8 @@
       "target": "css=.list-unstyled:nth-child(4) .d-block",
       "targets": [
         ["css=.list-unstyled:nth-child(4) .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[6]/div/div[2]/div[2]/div/div[6]/ul[2]/li/span", "xpath:idRelative"],
-        ["xpath=//div[6]/ul[2]/li/span", "xpath:position"]
+        ["xpath=//div[@id='filters']/section[2]/div/div[2]/div[2]/div/div[7]/ul[2]/li/span", "xpath:idRelative"],
+        ["xpath=//div[7]/ul[2]/li/span", "xpath:position"]
       ],
       "value": "bar"
     }, {
diff --git a/backend/src/integration/resources/SHIBUI-1732-4.side b/backend/src/integration/resources/SHIBUI-1732-4.side
index 214a49cbd..707dc5808 100644
--- a/backend/src/integration/resources/SHIBUI-1732-4.side
+++ b/backend/src/integration/resources/SHIBUI-1732-4.side
@@ -374,11 +374,11 @@
       "id": "fc60ee8f-44fb-4e6a-b445-a7f78d13ee0b",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(7) span",
+      "target": "css=.row:nth-child(8) .form-label > span",
       "targets": [
-        ["css=.row:nth-child(7) span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[7]/div/div/div/div/label/span", "xpath:idRelative"],
-        ["xpath=//div[7]/div/div/div/div/label/span", "xpath:position"],
+        ["css=.row:nth-child(8) .form-label > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[8]/div/div/div/div/label/span", "xpath:idRelative"],
+        ["xpath=//div[8]/div/div/div/div/label/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Long Display')]", "xpath:innerText"]
       ],
       "value": "Custom Long Display"
@@ -449,11 +449,11 @@
       "id": "7da12988-b453-4025-adba-cc1b9e916a2f",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(1)",
+      "target": "css=div:nth-child(8) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
+        ["css=div:nth-child(8) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/div/span", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Long Display')]", "xpath:innerText"]
       ],
       "value": "Custom Long Display"
@@ -461,11 +461,11 @@
       "id": "ad3b6ecd-ad20-4a8e-be55-b9cda50e7091",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=div:nth-child(8) .text-truncate",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(8) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'999999999999999999')]", "xpath:innerText"]
       ],
       "value": "999999999999999999"
@@ -500,18 +500,23 @@
       "id": "2b68bce2-618f-4ff8-b5e4-8c5625b5daf3",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)",
-      "targets": [],
-      "value": "Custom Long Display"
+      "target": "css=div:nth-child(8) .d-block:nth-child(1)",
+      "targets": [
+        ["css=div:nth-child(8) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span", "xpath:position"],
+        ["xpath=//span[contains(.,'Custom Long Display')]", "xpath:innerText"]
+      ],
+      "value": "30000"
     }, {
       "id": "4f6f46bd-cbb0-4d04-a637-f6c33b394488",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)",
+      "target": "css=div:nth-child(8) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
+        ["css=div:nth-child(8) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span", "xpath:idRelative"],
+        ["xpath=//div/div[8]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Long Display')]", "xpath:innerText"]
       ],
       "value": "Custom Long Display"
@@ -519,11 +524,11 @@
       "id": "ddc15b34-fa22-4a4a-a739-fab21337c82d",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=div:nth-child(8) .text-truncate",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(8) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[8]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'999999999999999999')]", "xpath:innerText"]
       ],
       "value": "999999999999999999"
@@ -830,11 +835,11 @@
       "id": "af84ef03-8d0a-4201-b217-40926b723582",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(7) > .col-12 > .mb-3 > div > div > .form-label > span",
+      "target": "css=.row:nth-child(8) .form-label > span",
       "targets": [
-        ["css=.row:nth-child(7) > .col-12 > .mb-3 > div > div > .form-label > span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[7]/div/div/div/div/label/span", "xpath:idRelative"],
-        ["xpath=//div[7]/div/div/div/div/label/span", "xpath:position"],
+        ["css=.row:nth-child(8) .form-label > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[8]/div/div/div/div/label/span", "xpath:idRelative"],
+        ["xpath=//div[8]/div/div/div/div/label/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Long Display')]", "xpath:innerText"]
       ],
       "value": "Custom Long Display"
@@ -921,11 +926,11 @@
       "id": "46402b0f-8b3c-459b-a325-665eafbb79f3",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(7) .d-block:nth-child(1)",
+      "target": "css=.mb-4:nth-child(4) div:nth-child(8) .d-block:nth-child(1)",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
-        ["xpath=//div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(4) div:nth-child(8) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[8]/div/span", "xpath:idRelative"],
+        ["xpath=//section[2]/div/div[2]/div[2]/div/div[8]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Long Display')]", "xpath:innerText"]
       ],
       "value": "Custom Long Display"
@@ -933,11 +938,11 @@
       "id": "3064a431-f448-44c2-bc90-1dc746bf0f83",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(7) .text-truncate",
+      "target": "css=.mb-4:nth-child(4) div:nth-child(8) .d-block:nth-child(2)",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(7) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(4) div:nth-child(8) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[2]/div/div[2]/div[2]/div/div[8]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'999999999999999999')]", "xpath:innerText"]
       ],
       "value": "999999999999999999"
diff --git a/backend/src/integration/resources/SHIBUI-1732-5.side b/backend/src/integration/resources/SHIBUI-1732-5.side
index f9886d3f5..8991b0941 100644
--- a/backend/src/integration/resources/SHIBUI-1732-5.side
+++ b/backend/src/integration/resources/SHIBUI-1732-5.side
@@ -374,11 +374,11 @@
       "id": "7e4914a1-bd67-451b-8618-ec89fbbdc608",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(6) span",
+      "target": "css=.row:nth-child(7) .form-label > span",
       "targets": [
-        ["css=.row:nth-child(6) span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[6]/div/div/div/div/label/span", "xpath:idRelative"],
-        ["xpath=//div[6]/div/div/div/div/label/span", "xpath:position"],
+        ["css=.row:nth-child(7) .form-label > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[7]/div/div/div/div/label/span", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/label/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Double Display')]", "xpath:innerText"]
       ],
       "value": "Custom Double Display"
@@ -449,11 +449,11 @@
       "id": "6a2b0c7e-4629-4f02-9361-ef6afdb97227",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(6) .d-block:nth-child(1)",
+      "target": "css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(6) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[6]/div/span", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[6]/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Double Display')]", "xpath:innerText"]
       ],
       "value": "Custom Double Display"
@@ -461,11 +461,11 @@
       "id": "75f95b74-c4e5-49a3-858f-a516ca1ac57e",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(8) div:nth-child(6) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(8) div:nth-child(6) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[6]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div/div[6]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(8) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'3.141592653589')]", "xpath:innerText"]
       ],
       "value": "3.141592653589"
@@ -507,11 +507,11 @@
       "id": "bfe564c1-7a44-4e18-8e12-f9a2069ca022",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(6) .d-block:nth-child(1)",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(6) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[6]/div/span", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[6]/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Double Display')]", "xpath:innerText"]
       ],
       "value": "Custom Double Display"
@@ -519,11 +519,11 @@
       "id": "822de10a-24bc-45ca-a28c-242f880b7d11",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(6) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(6) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[6]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[6]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'3.141592653589')]", "xpath:innerText"]
       ],
       "value": "3.141592653589"
@@ -837,11 +837,11 @@
       "id": "302b95c3-ca6d-4f67-9553-d248544a121c",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(6) span",
+      "target": "css=.row:nth-child(7) > .col-12 > .mb-3 > div > div > .form-label > span",
       "targets": [
-        ["css=.row:nth-child(6) span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[6]/div/div/div/div/label/span", "xpath:idRelative"],
-        ["xpath=//div[6]/div/div/div/div/label/span", "xpath:position"],
+        ["css=.row:nth-child(7) > .col-12 > .mb-3 > div > div > .form-label > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[7]/div/div/div/div/label/span", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/label/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Double Display')]", "xpath:innerText"]
       ],
       "value": "Custom Double Display"
@@ -928,11 +928,11 @@
       "id": "692d0155-2e73-45da-ba35-180e2195045e",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(6) > .d-flex > .d-block:nth-child(1)",
+      "target": "css=div:nth-child(1) > div:nth-child(7) .d-block:nth-child(1)",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(6) > .d-flex > .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[6]/div/span", "xpath:idRelative"],
-        ["xpath=//div[2]/div[2]/div/div[6]/div/span", "xpath:position"],
+        ["css=div:nth-child(1) > div:nth-child(7) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/div/span", "xpath:idRelative"],
+        ["xpath=//div[2]/div[2]/div/div[7]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Double Display')]", "xpath:innerText"]
       ],
       "value": "Custom Double Display"
@@ -940,11 +940,11 @@
       "id": "fc1c7695-9b42-413f-9c17-a3fcce2be919",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(1) > div:nth-child(6) > .d-flex > .text-truncate",
+      "target": "css=div:nth-child(1) > div:nth-child(7) .text-truncate",
       "targets": [
-        ["css=div:nth-child(1) > div:nth-child(6) > .d-flex > .text-truncate", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[6]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[2]/div[2]/div/div[6]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(1) > div:nth-child(7) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'3.141592653589')]", "xpath:innerText"]
       ],
       "value": "3.141592653589"
@@ -1006,21 +1006,21 @@
       "target": "css=table > tbody > tr",
       "targets": [],
       "value": ""
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "575d414c-556d-45f7-b2f2-c9971ad51348",
diff --git a/backend/src/integration/resources/SHIBUI-1732-7.side b/backend/src/integration/resources/SHIBUI-1732-7.side
index 1403a1b68..cd8f4786d 100644
--- a/backend/src/integration/resources/SHIBUI-1732-7.side
+++ b/backend/src/integration/resources/SHIBUI-1732-7.side
@@ -374,11 +374,11 @@
       "id": "b5aaed88-02ef-49b7-93fb-55c179ae27c1",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(9) span",
+      "target": "css=.row:nth-child(10) .form-label > span",
       "targets": [
-        ["css=.row:nth-child(9) span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[9]/div/div/div/div/label/span", "xpath:idRelative"],
-        ["xpath=//div[9]/div/div/div/div/label/span", "xpath:position"],
+        ["css=.row:nth-child(10) .form-label > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[10]/div/div/div/div/label/span", "xpath:idRelative"],
+        ["xpath=//div[10]/div/div/div/div/label/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Spring Display')]", "xpath:innerText"]
       ],
       "value": "Custom Spring Display"
@@ -476,30 +476,35 @@
       "id": "e888dee8-ae1c-4abe-884f-08829c3767b9",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=div:nth-child(9) .d-block:nth-child(1)",
-      "targets": [],
+      "target": "css=div:nth-child(10) .d-block:nth-child(1)",
+      "targets": [
+        ["css=div:nth-child(10) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[10]/div/span", "xpath:idRelative"],
+        ["xpath=//div[10]/div/span", "xpath:position"],
+        ["xpath=//span[contains(.,'Custom Spring Display')]", "xpath:innerText"]
+      ],
       "value": "30000"
     }, {
       "id": "fe8b707d-37b1-4369-8f0f-574edbdec412",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(9) .d-block:nth-child(1)",
+      "target": "css=div:nth-child(10) .d-block:nth-child(1)",
       "targets": [
-        ["css=div:nth-child(9) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[9]/div/span", "xpath:idRelative"],
-        ["xpath=//div[9]/div/span", "xpath:position"],
-        ["xpath=//span[contains(.,'Custom Spring Display')]", "xpath:innerText"]
+        ["css=div:nth-child(10) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[10]/div/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'Custom Spring Bean Default Edited')]", "xpath:innerText"]
       ],
       "value": "Custom Spring Display"
     }, {
       "id": "3846ad98-da0d-4b51-abda-4c06225033c2",
       "comment": "",
       "command": "assertText",
-      "target": "css=div:nth-child(9) .text-truncate",
+      "target": "css=div:nth-child(10) .text-truncate",
       "targets": [
-        ["css=div:nth-child(9) .text-truncate", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[9]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//div[9]/div/span[2]", "xpath:position"],
+        ["css=div:nth-child(10) .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[10]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Spring Bean Default Edited')]", "xpath:innerText"]
       ],
       "value": "Custom Spring Bean Default Edited"
@@ -820,11 +825,11 @@
       "id": "fbef6ebb-1f20-4dcd-a907-735e4113c382",
       "comment": "",
       "command": "assertText",
-      "target": "css=.row:nth-child(9) span",
+      "target": "css=.row:nth-child(10) .form-label > span",
       "targets": [
-        ["css=.row:nth-child(9) span", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[9]/div/div/div/div/label/span", "xpath:idRelative"],
-        ["xpath=//div[9]/div/div/div/div/label/span", "xpath:position"],
+        ["css=.row:nth-child(10) .form-label > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[10]/div/div/div/div/label/span", "xpath:idRelative"],
+        ["xpath=//div[10]/div/div/div/div/label/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Spring Display')]", "xpath:innerText"]
       ],
       "value": "Custom Spring Display"
@@ -837,8 +842,8 @@
         ["id=root_relyingPartyOverrides_CustomSpringBean", "id"],
         ["css=#root_relyingPartyOverrides_CustomSpringBean", "css:finder"],
         ["xpath=//input[@id='root_relyingPartyOverrides_CustomSpringBean']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[9]/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//div[9]/div/div/div/div/input", "xpath:position"]
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[10]/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[10]/div/div/div/div/input", "xpath:position"]
       ],
       "value": "Custom Spring Bean Default"
     }, {
@@ -904,11 +909,11 @@
       "id": "47f8360f-1b8d-4e0f-9792-e51d34dbee95",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(4) div:nth-child(9) .d-block:nth-child(1)",
+      "target": "css=.mb-4:nth-child(4) div:nth-child(10) .d-block:nth-child(1)",
       "targets": [
-        ["css=.mb-4:nth-child(4) div:nth-child(9) .d-block:nth-child(1)", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[9]/div/span", "xpath:idRelative"],
-        ["xpath=//section[2]/div/div[2]/div[2]/div/div[9]/div/span", "xpath:position"],
+        ["css=.mb-4:nth-child(4) div:nth-child(10) .d-block:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[10]/div/span", "xpath:idRelative"],
+        ["xpath=//section[2]/div/div[2]/div[2]/div/div[10]/div/span", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Spring Display')]", "xpath:innerText"]
       ],
       "value": "Custom Spring Display"
@@ -916,11 +921,11 @@
       "id": "93126f8b-823c-4b79-87c8-df32ece80ad6",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(4) div:nth-child(9) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(4) div:nth-child(10) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(4) div:nth-child(9) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[9]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[2]/div/div[2]/div[2]/div/div[9]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(4) div:nth-child(10) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[2]/div/div[2]/div[2]/div/div[10]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'Custom Spring Bean Default Edited')]", "xpath:innerText"]
       ],
       "value": "Custom Spring Bean Default Edited"
@@ -982,21 +987,21 @@
       "target": "css=table > tbody > tr",
       "targets": [],
       "value": ""
-    },{
-            "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
-            "comment": "",
-            "command": "open",
-            "target": "/api/heheheheheheheWipeout",
-            "targets": [],
-            "value": ""
-          }, {
-            "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
-            "comment": "",
-            "command": "assertText",
-            "target": "css=body",
-            "targets": [],
-            "value": "yes, you did it"
-          }]
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
   }],
   "suites": [{
     "id": "575d414c-556d-45f7-b2f2-c9971ad51348",
diff --git a/backend/src/integration/resources/SHIBUI-2267.side b/backend/src/integration/resources/SHIBUI-2267.side
new file mode 100644
index 000000000..ac4919662
--- /dev/null
+++ b/backend/src/integration/resources/SHIBUI-2267.side
@@ -0,0 +1,455 @@
+{
+  "id": "1b31a551-eb09-4bd4-8db9-694bf1539a46",
+  "version": "2.0",
+  "name": "SHIBUI-2267",
+  "url": "http://localhost:10101",
+  "tests": [{
+    "id": "841ade0e-83bd-4a4b-94f2-de6bd5c536b2",
+    "name": "SHIBUI-2267",
+    "commands": [{
+      "id": "d6b23986-6d14-4b10-be7b-a7e6f576e3b2",
+      "comment": "",
+      "command": "open",
+      "target": "/login",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "f77ecd77-01c2-4463-944e-1a69600f5297",
+      "comment": "",
+      "command": "type",
+      "target": "name=username",
+      "targets": [
+        ["name=username", "name"],
+        ["css=tr:nth-child(1) input", "css:finder"],
+        ["xpath=//input[@name='username']", "xpath:attributes"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "admin"
+    }, {
+      "id": "c9bf0a22-faa9-494c-b2ed-6c9653248551",
+      "comment": "",
+      "command": "type",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "adminpass"
+    }, {
+      "id": "7ab1d854-3582-4101-bd19-f94b8f438090",
+      "comment": "",
+      "command": "sendKeys",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "${KEY_ENTER}"
+    }, {
+      "id": "4059cae7-b9f9-49d0-a213-343bcaba66d1",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "f03af8d5-5875-4a2c-b93a-c3ddcbd4b16a",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "081f495b-4d84-4758-824c-1e85b6311e7f",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }, {
+      "id": "9e912dd5-6ace-45be-bafd-2d1655906575",
+      "comment": "",
+      "command": "open",
+      "target": "/",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "ad3811ad-f95b-4cca-a5d9-63a10063a652",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "1caf8be6-a4d9-4b3b-ace1-0f76d3600d62",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-source",
+      "targets": [
+        ["id=metadata-nav-dropdown-source", "id"],
+        ["linkText=Add a new metadata source", "linkText"],
+        ["css=#metadata-nav-dropdown-source", "css:finder"],
+        ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"],
+        ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "218e51fd-49e6-400b-9d7f-61bcd8e0c074",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_serviceProviderName",
+      "targets": [
+        ["id=root_serviceProviderName", "id"],
+        ["css=#root_serviceProviderName", "css:finder"],
+        ["xpath=//input[@id='root_serviceProviderName']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/div/form/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "9ee43e46-ab9e-46b1-8eb2-9718fb98bda2",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_serviceProviderName",
+      "targets": [
+        ["id=field1", "id"],
+        ["name=field1", "name"],
+        ["css=#field1", "css:finder"],
+        ["xpath=//input[@id='field1']", "xpath:attributes"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "Ignore Request Signatures Test"
+    }, {
+      "id": "7fe7298b-275c-4797-8d1b-f4547b63eb02",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_entityId",
+      "targets": [
+        ["id=root_entityId", "id"],
+        ["css=#root_entityId", "css:finder"],
+        ["xpath=//input[@id='root_entityId']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/div/form/div/div/div/div/div/div[2]/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/input", "xpath:position"]
+      ],
+      "value": "test-1234"
+    }, {
+      "id": "8739ddfa-7812-46b3-bee7-b4bc73a3dd35",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "fdda1155-876f-46a4-ae4f-c3519ed34b62",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "79c55e8f-286d-4c64-a1bc-1a19a7554f7a",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "4f61120b-7c6b-4f8e-8543-898298451a56",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "8a2a07b4-9e37-467b-bca8-1ecd0f2dda49",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "a47fdf43-1336-4fdb-a395-f14f0fe131de",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "4e64d71e-8e6f-4288-b277-3d3945f57c53",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "51e71f30-c1e5-454b-bacb-6f1a2b3b6c13",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_relyingPartyOverrides_ignoreRequestSignatures",
+      "targets": [
+        ["id=root_relyingPartyOverrides_ignoreRequestSignatures", "id"],
+        ["css=#root_relyingPartyOverrides_ignoreRequestSignatures", "css:finder"],
+        ["xpath=//input[@id='root_relyingPartyOverrides_ignoreRequestSignatures']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[5]/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/div/input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "d113cc67-659a-48f0-a50c-98355a07b187",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "204ea80c-4aac-497f-8956-6370967ba73e",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "3baa7bd3-55c0-4d10-8aa3-c0daa63ec4d4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.mb-4:nth-child(8) div:nth-child(5) .d-block:nth-child(2)",
+      "targets": [
+        ["css=.mb-4:nth-child(8) div:nth-child(5) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
+      ],
+      "value": "true"
+    }, {
+      "id": "1406d7e4-907d-4359-8de8-a40206f0993e",
+      "comment": "",
+      "command": "click",
+      "target": "css=.save",
+      "targets": [
+        ["css=.save", "css:finder"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "4e0fa4f5-817f-41fb-9885-60f37b699436",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=td:nth-child(1)",
+      "targets": [
+        ["css=.lead", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/span", "xpath:idRelative"],
+        ["xpath=//section/div/div/span", "xpath:position"],
+        ["xpath=//span[contains(.,'Current Metadata Sources')]", "xpath:innerText"]
+      ],
+      "value": "10000"
+    }, {
+      "id": "ba9fb8e8-d332-45bd-accd-703284744136",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=td:nth-child(1)",
+      "targets": [
+        ["linkText=Test Provider", "linkText"],
+        ["css=td > a", "css:finder"],
+        ["xpath=//a[contains(text(),'Test Provider')]", "xpath:link"],
+        ["xpath=//a[contains(@href, '/metadata/resolver/ee3aedc4-b56a-46c4-b8db-09603dd5b473/configuration/options')]", "xpath:href"],
+        ["xpath=//td/a", "xpath:position"],
+        ["xpath=//a[contains(.,'Test Provider')]", "xpath:innerText"]
+      ],
+      "value": "Ignore Request Signatures Test"
+    }, {
+      "id": "eff4c9fe-7daf-4082-a162-4a9dff323293",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=td:nth-child(2)",
+      "targets": [
+        ["css=td:nth-child(2)", "css:finder"],
+        ["xpath=//td[2]", "xpath:position"],
+        ["xpath=//td[contains(.,'test-1234')]", "xpath:innerText"]
+      ],
+      "value": "test-1234"
+    }, {
+      "id": "b2d9f789-fb94-459f-9947-5364cebc43d1",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=td:nth-child(3)",
+      "targets": [
+        ["css=td:nth-child(3)", "css:finder"],
+        ["xpath=//td[3]", "xpath:position"],
+        ["xpath=//td[contains(.,'root')]", "xpath:innerText"]
+      ],
+      "value": "admin"
+    }, {
+      "id": "549253bc-b6e0-4968-8058-f52700e9e3b2",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Ignore Request Signatures Test",
+      "targets": [
+        ["linkText=Ignore Request Signatures Test", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'Ignore Request Signatures Test')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/source/e85e1ba1-82b1-4a2b-9ee7-740b0be72253/configuration/options')]", "xpath:href"],
+        ["xpath=//td/a", "xpath:position"],
+        ["xpath=//a[contains(.,'Ignore Request Signatures Test')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "42a3f6c2-f2f7-4466-8cc6-35b1dd781154",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(5) .d-block:nth-child(2)",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "121a6247-05d6-4553-b565-ebee2552f7e9",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(5) .d-block:nth-child(2)",
+      "targets": [
+        ["css=.mb-4:nth-child(9) div:nth-child(5) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'true')]", "xpath:innerText"]
+      ],
+      "value": "true"
+    }, {
+      "id": "e8ece399-3f6c-45f2-afc5-d46f7f61dbcf",
+      "comment": "",
+      "command": "click",
+      "target": "css=.mb-4:nth-child(9) .edit-link",
+      "targets": [
+        ["css=.mb-4:nth-child(9) .edit-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div/div/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "16514b3c-fceb-4ef3-8a9c-14e719ef46c6",
+      "comment": "",
+      "command": "assertChecked",
+      "target": "id=root_relyingPartyOverrides_ignoreRequestSignatures",
+      "targets": [
+        ["id=root_relyingPartyOverrides_ignoreRequestSignatures", "id"],
+        ["css=#root_relyingPartyOverrides_ignoreRequestSignatures", "css:finder"],
+        ["xpath=//input[@id='root_relyingPartyOverrides_ignoreRequestSignatures']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div/form/div/div/div/div/div[8]/div/div/div/div[5]/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/div/input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "859707e1-f8fe-4f2d-b3aa-7fd9ce45ef20",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_relyingPartyOverrides_ignoreRequestSignatures",
+      "targets": [
+        ["id=root_relyingPartyOverrides_ignoreRequestSignatures", "id"],
+        ["css=#root_relyingPartyOverrides_ignoreRequestSignatures", "css:finder"],
+        ["xpath=//input[@id='root_relyingPartyOverrides_ignoreRequestSignatures']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div/form/div/div/div/div/div[8]/div/div/div/div[5]/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/div/input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "155d4d90-d190-4c52-aafe-94014464f753",
+      "comment": "",
+      "command": "click",
+      "target": "css=button.btn.btn-info",
+      "targets": [
+        ["css=.fa-floppy-disk > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "f2c93769-ccd0-4fea-b4f4-9ba583110931",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(5) .d-block:nth-child(2)",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "8424965f-ca12-4e1d-8dd9-15a71cba30e4",
+      "comment": "",
+      "command": "pause",
+      "target": "5000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "68ca436c-5db0-412b-a45f-c1cc92c29013",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(5) .d-block:nth-child(2)",
+      "targets": [
+        ["css=.mb-4:nth-child(9) div:nth-child(5) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[5]/div/span[2]", "xpath:position"]
+      ],
+      "value": "-"
+    }, {
+      "id": "4ec2c493-85e4-403b-9b09-031c5728f498",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "e074980a-8f21-4c22-8412-c4b6fcdcd1a4",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
+  }],
+  "suites": [{
+    "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
+    "name": "Default Suite",
+    "persistSession": false,
+    "parallel": false,
+    "timeout": 300,
+    "tests": ["841ade0e-83bd-4a4b-94f2-de6bd5c536b2"]
+  }],
+  "urls": ["http://localhost:10101/"],
+  "plugins": []
+}
\ No newline at end of file

From 6d618bcbe527b7b54f9afa70e6bfbac131a8a9f8 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Tue, 16 Aug 2022 11:40:40 -0400
Subject: [PATCH 63/81] SHIBUI-1674

Added .side files for related tests.


Former-commit-id: 74253ace1125ae4f6a1a3304ff3de435e5f16959
---
 .../integration/resources/SHIBUI-1674-1.side  |  762 +++++++++
 .../integration/resources/SHIBUI-1674-2.side  | 1448 +++++++++++++++++
 .../integration/resources/SHIBUI-1674-3.side  |  443 +++++
 3 files changed, 2653 insertions(+)
 create mode 100644 backend/src/integration/resources/SHIBUI-1674-1.side
 create mode 100644 backend/src/integration/resources/SHIBUI-1674-2.side
 create mode 100644 backend/src/integration/resources/SHIBUI-1674-3.side

diff --git a/backend/src/integration/resources/SHIBUI-1674-1.side b/backend/src/integration/resources/SHIBUI-1674-1.side
new file mode 100644
index 000000000..b9fed57ad
--- /dev/null
+++ b/backend/src/integration/resources/SHIBUI-1674-1.side
@@ -0,0 +1,762 @@
+{
+  "id": "1b31a551-eb09-4bd4-8db9-694bf1539a46",
+  "version": "2.0",
+  "name": "SHIBUI-1674-1",
+  "url": "http://localhost:10101",
+  "tests": [{
+    "id": "841ade0e-83bd-4a4b-94f2-de6bd5c536b2",
+    "name": "SHIBUI-1674-1",
+    "commands": [{
+      "id": "d6b23986-6d14-4b10-be7b-a7e6f576e3b2",
+      "comment": "",
+      "command": "open",
+      "target": "/login",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "f77ecd77-01c2-4463-944e-1a69600f5297",
+      "comment": "",
+      "command": "type",
+      "target": "name=username",
+      "targets": [
+        ["name=username", "name"],
+        ["css=tr:nth-child(1) input", "css:finder"],
+        ["xpath=//input[@name='username']", "xpath:attributes"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "admin"
+    }, {
+      "id": "c9bf0a22-faa9-494c-b2ed-6c9653248551",
+      "comment": "",
+      "command": "type",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "adminpass"
+    }, {
+      "id": "7ab1d854-3582-4101-bd19-f94b8f438090",
+      "comment": "",
+      "command": "sendKeys",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "${KEY_ENTER}"
+    }, {
+      "id": "4059cae7-b9f9-49d0-a213-343bcaba66d1",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "f03af8d5-5875-4a2c-b93a-c3ddcbd4b16a",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "081f495b-4d84-4758-824c-1e85b6311e7f",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }, {
+      "id": "9e912dd5-6ace-45be-bafd-2d1655906575",
+      "comment": "",
+      "command": "open",
+      "target": "/",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "3bb52950-667c-4852-a98f-6a6fb5632ba5",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "fc2df69a-a340-44c4-b3c3-ec21670be567",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "2db70b89-b8e2-471f-8db9-cc9361058e72",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-source",
+      "targets": [
+        ["id=metadata-nav-dropdown-source", "id"],
+        ["linkText=Add a new metadata source", "linkText"],
+        ["css=#metadata-nav-dropdown-source", "css:finder"],
+        ["xpath=//a[contains(text(),'Add a new metadata source')]", "xpath:link"],
+        ["xpath=//a[@id='metadata-nav-dropdown-source']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/source/new')]", "xpath:href"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,'Add a new metadata source')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "93d20204-7dfa-44c0-8e61-6741e73594f5",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "css=.mb-3:nth-child(2) .btn path",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "a7b2b925-2274-4dcc-a4e3-3b727c9a047a",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(2) .btn path",
+      "targets": [
+        ["css=.mb-3:nth-child(2) .btn path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "ca3dfd3d-553f-4f75-8bff-50fd057db7db",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "An entityID is the SAML identifier that uniquely names a service provider."
+    }, {
+      "id": "8b4eb229-ecfe-4994-902a-d08b55b86504",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_serviceProviderName",
+      "targets": [
+        ["id=root_serviceProviderName", "id"],
+        ["css=#root_serviceProviderName", "css:finder"],
+        ["xpath=//input[@id='root_serviceProviderName']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/div/form/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "Tooltip Test"
+    }, {
+      "id": "8a48a499-f163-425a-a704-4a7efbb2c311",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_entityId",
+      "targets": [
+        ["id=root_entityId", "id"],
+        ["css=#root_entityId", "css:finder"],
+        ["xpath=//input[@id='root_entityId']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/div/form/div/div/div/div/div/div[2]/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/input", "xpath:position"]
+      ],
+      "value": "Test"
+    }, {
+      "id": "e8110e2e-5973-412c-b719-fe61261f4c06",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "ca21608c-baaa-400d-b8bd-8ad0eb4b7a53",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(1) > .col-12 > .mb-3 path",
+      "targets": [
+        ["css=.row:nth-child(1) > .col-12 > .mb-3 path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "5370bc80-c637-4b2b-8e5d-b3db821a228a",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Name of the organization standing up the entity."
+    }, {
+      "id": "63043982-9758-4a64-8df7-6c902359979f",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "b56c1325-5438-4b5a-b626-79b030d04313",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.d-empty-none:nth-child(2) > .mb-3:nth-child(1) path",
+      "targets": [
+        ["css=.d-empty-none:nth-child(2) > .mb-3:nth-child(1) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "63fb1e52-b70d-4a2e-a71b-52a47a80b732",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "The IdP Privacy Statement URL is a link to the IdP's Privacy Statement. The content of the Privacy Statement should be targeted at end users."
+    }, {
+      "id": "2b80c885-9e61-489c-bf8a-db8efc7c6a0e",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "f041b735-85f2-4005-ad80-16a82c683f60",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.ms-2 > path",
+      "targets": [
+        ["css=.ms-2 > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "2f7c3fc3-d1ac-445a-850b-3696be0c22cf",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "This attribute contains a space-delimited collection of URIs that represent general classes of protocol support for the role in question. There are URIs defined by the various standards and profiles to represent the fact that an entity acting in a role \"supports\" a particular protocol family, such as SAML 2.0 or the Shibboleth profile of SAML 1.1."
+    }, {
+      "id": "c1eb927c-0f47-4b7a-8f7a-39f88f01f645",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "be222605-95ec-4a48-b02c-9b29f47e1ef5",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.fa-circle-info > path",
+      "targets": [
+        ["css=.fa-circle-info > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "00d5a2db-9b4d-48c0-97d9-724f62415559",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "If your SP supports SAML 2.0 Single Logout, you will need to include one or more <md:SingleLogoutService> endpoint elements in the metadata."
+    }, {
+      "id": "45ff7f8d-4001-48bd-8f23-52b6d15cf94c",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "397a8204-b6b1-442f-a491-4c89b1d320ff",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(1) > div > .mb-3 path",
+      "targets": [
+        ["css=.mb-3:nth-child(1) > div > .mb-3 path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "8d29bc2d-68e2-4e4c-b111-b9637ac4a7b3",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Whether to sign requests."
+    }, {
+      "id": "e1c906a3-bd1d-4684-b6fb-56de3a653579",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "6cfdcca2-1deb-4055-9b75-afbfbf728783",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.fa-circle-info > path",
+      "targets": [
+        ["css=.fa-circle-info > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "8e3694e9-fcb8-40e9-94d9-4b3fe7dd4e46",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "An Assertion Consumer Service (or ACS) is SAML terminology for the location at a ServiceProvider that accepts <samlp:Response> messages (or SAML artifacts) for the purpose of establishing a session based on an assertion."
+    }, {
+      "id": "2658b197-a2d5-4060-9b34-eb80aee1ded2",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "56f49fe8-340c-46fa-bda9-0b3c0de98bdb",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(1) > .col-12:nth-child(1) > .mb-3:nth-child(1) path:nth-child(1)",
+      "targets": [
+        ["css=.row:nth-child(1) > .col-12:nth-child(1) > .mb-3:nth-child(1) path:nth-child(1)", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "6f3d1d4a-f1ca-461b-9416-9d8e18ffccef",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Sign Assertion declares that the service provider wants the <saml:Assertion> element to be digitally signed."
+    }, {
+      "id": "5c718136-9eba-46f9-b93b-da820abe2719",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.row:nth-child(1) > .col-12:nth-child(1) > .mb-3:nth-child(1) path:nth-child(1)",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "268b3df4-a184-4a39-bec3-70dfc598b073",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "f5024e0f-960b-4ce6-873e-4259e0d79ce8",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "54a74399-69aa-4412-85c2-a5bbb543d8be",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(8) path:nth-child(1)",
+      "targets": [
+        ["css=.row:nth-child(8) path:nth-child(1)", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "e6976eca-f54b-4015-8f87-ba06a469ab28",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Whether to ignore any SP-Requested Authentication Method."
+    }, {
+      "id": "87036a6f-aebd-4ef1-8cb8-03d082676c03",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.row:nth-child(8) path:nth-child(1)",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "31fdddde-2472-4921-950c-ca56555c2d5b",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "30ec5f42-49cb-4917-aca8-640736b8f948",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "809daed0-c5d7-4cb6-89d7-be9409f1d7ae",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "1fae7d2d-1e36-486a-b3a8-c76a3db141e4",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.next", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "23f5b4ad-7f9c-46e3-bf3f-b1ea57eb1ac7",
+      "comment": "",
+      "command": "click",
+      "target": "css=.save",
+      "targets": [
+        ["css=.save", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "17c42282-eaa5-4641-8f39-969c0a13f561",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "linkText=Tooltip Test",
+      "targets": [
+        ["linkText=Tooltip Test", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'Tooltip Test')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/source/14b50734-c3e2-48ac-bdb9-342b91174ca7/configuration/options')]", "xpath:href"],
+        ["xpath=//td/a", "xpath:position"],
+        ["xpath=//a[contains(.,'Tooltip Test')]", "xpath:innerText"]
+      ],
+      "value": "30000"
+    }, {
+      "id": "beae53d2-254a-4422-a302-06a72dc6aacc",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Tooltip Test",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "edd4c7ed-ec92-4f61-8f2d-16bec5c79b60",
+      "comment": "",
+      "command": "click",
+      "target": "css=.mb-4:nth-child(3) .edit-link",
+      "targets": [
+        ["css=.mb-4:nth-child(3) .edit-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[7]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//section/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,' Edit')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "c974e795-454e-4271-86ef-609e3538b28f",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(1) > .col-12 .svg-inline--fa",
+      "targets": [
+        ["css=.row:nth-child(1) > .col-12 .svg-inline--fa", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "e2e21f5c-bcf5-484f-b840-e1f2104b0921",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Name of the organization standing up the entity."
+    }, {
+      "id": "2177712e-3ffa-4d70-a546-4425fa6b6565",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link:nth-child(2)",
+      "targets": [
+        ["css=.nav-link:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/nav/button[2]", "xpath:idRelative"],
+        ["xpath=//nav/button[2]", "xpath:position"],
+        ["xpath=//button[contains(.,'User Interface / MDUI Information')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "5b8ce0c5-f2d1-4bca-acb1-c22a3ed02fd7",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.d-empty-none:nth-child(1) > .mb-3:nth-child(2) path",
+      "targets": [
+        ["css=.d-empty-none:nth-child(1) > .mb-3:nth-child(2) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "65551475-41fb-42a3-aeea-2c92884adf6a",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "The IdP Information URL is a link to a comprehensive information page about the IdP. This page should expand on the content of the IdP Description field."
+    }, {
+      "id": "a952c81f-7dc1-4f26-812e-8c1a4101fa7a",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link:nth-child(3)",
+      "targets": [
+        ["css=.nav-link:nth-child(3)", "css:finder"],
+        ["xpath=(//button[@type='button'])[10]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/nav/button[3]", "xpath:idRelative"],
+        ["xpath=//button[3]", "xpath:position"],
+        ["xpath=//button[contains(.,'SP SSO Descriptor Information')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "013648f1-be7a-4fbf-a5c4-07482ca9fc96",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.ms-2 > path",
+      "targets": [
+        ["css=.ms-2 > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "6851171e-6a6f-46e4-9317-bab6ad077127",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "This attribute contains a space-delimited collection of URIs that represent general classes of protocol support for the role in question. There are URIs defined by the various standards and profiles to represent the fact that an entity acting in a role \"supports\" a particular protocol family, such as SAML 2.0 or the Shibboleth profile of SAML 1.1."
+    }, {
+      "id": "b9c465ec-b07a-4c57-9caf-988bb1eac6ed",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link:nth-child(4)",
+      "targets": [
+        ["css=.nav-link:nth-child(4)", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/nav/button[4]", "xpath:idRelative"],
+        ["xpath=//button[4]", "xpath:position"],
+        ["xpath=//button[contains(.,'Logout Endpoints')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "d727cd8d-5195-45e5-9df3-1e1d386e6f81",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[16]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div/form/div/div/div/div/div[5]/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "825b4bb3-e40e-4b02-a053-5f8e15b9b672",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(1) > .col-12 .btn > .svg-inline--fa",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "8b309a28-ff0d-4e6b-8c49-26a9e13822d8",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [
+        ["css=.row:nth-child(1) > .col-12 .btn > .svg-inline--fa", "css:finder"]
+      ],
+      "value": "The location of the handler (when combined with the base handlerURL). This is the location to which an IdP sends messages using whatever protocol and binding it shares with the SP. Each combination of SLO protocol and binding is installed at a unique location to improve efficiency."
+    }, {
+      "id": "687f9331-fd88-43c5-ad58-0c4e04bc5adf",
+      "comment": "",
+      "command": "click",
+      "target": "css=.m-0 > .text-danger",
+      "targets": [
+        ["css=.m-0 > .text-danger", "css:finder"],
+        ["xpath=(//button[@type='button'])[19]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div/form/div/div/div/div/div[5]/div/div/div/div/div[2]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Delete')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "eb728c91-52d6-4505-85c2-ad274be14f88",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link:nth-child(5)",
+      "targets": [
+        ["css=.nav-link:nth-child(5)", "css:finder"],
+        ["xpath=(//button[@type='button'])[12]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/nav/button[5]", "xpath:idRelative"],
+        ["xpath=//button[5]", "xpath:position"],
+        ["xpath=//button[contains(.,'Security Information')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "84415564-f9d8-4b75-a6cf-5c269cb8eb9f",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(2) path",
+      "targets": [
+        ["css=.mb-3:nth-child(2) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "75ae4766-62a2-47e1-9328-a7030fbfcdb1",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [
+        ["css=.row:nth-child(1) > .col-12 .btn > .svg-inline--fa", "css:finder"]
+      ],
+      "value": "Whether to sign assertions. Element declares that the service provider wants the <saml:Assertion> element to be digitally signed."
+    }, {
+      "id": "c069fd81-2679-4e6c-9115-63cf783a4b82",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link:nth-child(6)",
+      "targets": [
+        ["css=.nav-link:nth-child(6)", "css:finder"],
+        ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/nav/button[6]", "xpath:idRelative"],
+        ["xpath=//button[6]", "xpath:position"],
+        ["xpath=//button[contains(.,'Assertion Consumer Service')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "ae3fd3f3-d7e9-4594-8f62-0bdd81fe207f",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[16]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div/form/div/div/div/div/div[7]/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "ff8f4f9f-0832-4a08-910d-778156869d6a",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3 > .form-label > .btn path",
+      "targets": [
+        ["css=.mb-3 > .form-label > .btn path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "201ad760-133b-4ab6-8be9-ef0ef1849930",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [
+        ["css=.row:nth-child(1) > .col-12 .btn > .svg-inline--fa", "css:finder"]
+      ],
+      "value": "The binding attribute of the <md:AssertionConsumerService> element is a standard URI specified in the SAML 2.0 Binding specification."
+    }, {
+      "id": "a1a1d817-93ba-4a09-b52e-b660f000b018",
+      "comment": "",
+      "command": "click",
+      "target": "css=.fa-trash > path",
+      "targets": [
+        ["css=.fa-trash > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "acea6b6b-04c4-4224-831c-9067cc09ee9a",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link:nth-child(7)",
+      "targets": [
+        ["css=.nav-link:nth-child(7)", "css:finder"],
+        ["xpath=(//button[@type='button'])[14]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/nav/button[7]", "xpath:idRelative"],
+        ["xpath=//button[7]", "xpath:position"],
+        ["xpath=//button[contains(.,'Relying Party Overrides')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "2928ba27-b934-499e-8dda-8441dbbb463d",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(6) path:nth-child(1)",
+      "targets": [
+        ["css=.row:nth-child(6) path:nth-child(1)", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "085ff864-1a6b-469f-9009-9d6072e2d689",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [
+        ["css=.row:nth-child(1) > .col-12 .btn > .svg-inline--fa", "css:finder"]
+      ],
+      "value": "Disallows use (or reuse) of authentication results and login flows that don't provide a real-time proof of user presence in the login process."
+    }, {
+      "id": "1ff63b39-ee65-46a0-9258-56209aa63e4b",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "0bc97fad-e6a1-4cb7-9c50-f43f5ff436a6",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
+  }],
+  "suites": [{
+    "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
+    "name": "Default Suite",
+    "persistSession": false,
+    "parallel": false,
+    "timeout": 300,
+    "tests": ["841ade0e-83bd-4a4b-94f2-de6bd5c536b2"]
+  }],
+  "urls": ["http://localhost:10101/"],
+  "plugins": []
+}
\ No newline at end of file
diff --git a/backend/src/integration/resources/SHIBUI-1674-2.side b/backend/src/integration/resources/SHIBUI-1674-2.side
new file mode 100644
index 000000000..f05b1e1f9
--- /dev/null
+++ b/backend/src/integration/resources/SHIBUI-1674-2.side
@@ -0,0 +1,1448 @@
+{
+  "id": "1b31a551-eb09-4bd4-8db9-694bf1539a46",
+  "version": "2.0",
+  "name": "SHIBUI-1674-2",
+  "url": "http://localhost:10101",
+  "tests": [{
+    "id": "841ade0e-83bd-4a4b-94f2-de6bd5c536b2",
+    "name": "SHIBUI-1674-2",
+    "commands": [{
+      "id": "d6b23986-6d14-4b10-be7b-a7e6f576e3b2",
+      "comment": "",
+      "command": "open",
+      "target": "/login",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "f77ecd77-01c2-4463-944e-1a69600f5297",
+      "comment": "",
+      "command": "type",
+      "target": "name=username",
+      "targets": [
+        ["name=username", "name"],
+        ["css=tr:nth-child(1) input", "css:finder"],
+        ["xpath=//input[@name='username']", "xpath:attributes"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "admin"
+    }, {
+      "id": "c9bf0a22-faa9-494c-b2ed-6c9653248551",
+      "comment": "",
+      "command": "type",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "adminpass"
+    }, {
+      "id": "7ab1d854-3582-4101-bd19-f94b8f438090",
+      "comment": "",
+      "command": "sendKeys",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "${KEY_ENTER}"
+    }, {
+      "id": "4059cae7-b9f9-49d0-a213-343bcaba66d1",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "f03af8d5-5875-4a2c-b93a-c3ddcbd4b16a",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "081f495b-4d84-4758-824c-1e85b6311e7f",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }, {
+      "id": "9e912dd5-6ace-45be-bafd-2d1655906575",
+      "comment": "",
+      "command": "open",
+      "target": "/",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "3bb52950-667c-4852-a98f-6a6fb5632ba5",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "fc2df69a-a340-44c4-b3c3-ec21670be567",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "64e1be5d-4fd2-4b94-b714-48736a0bbc3d",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-provider",
+      "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
+        ["linkText=Add a new metadata provider", "linkText"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
+        ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
+        ["xpath=//a[2]", "xpath:position"],
+        ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "4d377f17-a1ca-4c06-97c0-86f0240bb3ee",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "6b7f87a2-e822-4289-8e83-f6c879b485f7",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=FileBackedHttpMetadataResolver"
+    }, {
+      "id": "e469e748-3433-4561-97b3-20eca852bb98",
+      "comment": "",
+      "command": "type",
+      "target": "name=name",
+      "targets": [
+        ["name=name", "name"],
+        ["css=.form-control", "css:finder"],
+        ["xpath=//input[@name='name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/form/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "FBHMR"
+    }, {
+      "id": "2f6171c0-f11f-4d3a-99fe-4ba3ef743f3f",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(2) path",
+      "targets": [
+        ["css=.mb-3:nth-child(2) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "e1f5e376-772a-456c-9c62-c2543687a154",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "The precise behavior of any <MetadataProvider> element is controlled by the xsi:type attribute. This specifies the exact type of provider to use."
+    }, {
+      "id": "d925e00f-1d00-4541-bbb5-e6a2d668de9a",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "6d8efa55-ad05-4a15-b65a-74622feff0af",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_xmlId",
+      "targets": [
+        ["id=root_xmlId", "id"],
+        ["css=#root_xmlId", "css:finder"],
+        ["xpath=//input[@id='root_xmlId']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "1"
+    }, {
+      "id": "88bd1be4-5c22-4147-85f1-e20b05b0b3a0",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_metadataURL",
+      "targets": [
+        ["id=root_metadataURL", "id"],
+        ["css=#root_metadataURL", "css:finder"],
+        ["xpath=//input[@id='root_metadataURL']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div[2]/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/input", "xpath:position"]
+      ],
+      "value": "https://idp.unicon.net/idp/shibboleth"
+    }, {
+      "id": "c531d779-4bc8-44bd-9aa1-c04262edcd36",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_backingFile",
+      "targets": [
+        ["id=root_backingFile", "id"],
+        ["css=#root_backingFile", "css:finder"],
+        ["xpath=//input[@id='root_backingFile']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div[4]/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/input", "xpath:position"]
+      ],
+      "value": "%{idp.home}/foo"
+    }, {
+      "id": "f9d5dd8a-10e3-4ec0-955e-12c2c3e4df26",
+      "comment": "",
+      "command": "click",
+      "target": "css=.toggle-button",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "be6afcb8-e7b5-4838-876a-2304a69c078f",
+      "comment": "",
+      "command": "click",
+      "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-3",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "c3323c50-da68-42be-8ecf-1754be5f402e",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(7) path",
+      "targets": [
+        ["css=.mb-3:nth-child(7) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "2c70ddbd-4a58-4e23-a134-dd168dbfdf62",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Whether to fail initialization of the underlying MetadataResolverService (and possibly the IdP as a whole) if the initialization of a metadata provider fails. When false, the IdP may start, and will continue to attempt to reload valid metadata if configured to do so, but operations that require valid metadata will fail until it does."
+    }, {
+      "id": "3a2ee060-bea9-4ee6-86ac-0bfec851a0f4",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "f9c24b89-5e95-439f-9f94-13e5482ba269",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(2) .form-label > .btn > .svg-inline--fa",
+      "targets": [
+        ["css=.row:nth-child(2) .form-label > .btn > .svg-inline--fa", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "c656db9f-fa69-4476-8760-f15c91c4db6e",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Upper bound on the next refresh from the time calculated based on the metadata's expiration."
+    }, {
+      "id": "dd29f528-f275-4258-9495-11039074c599",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "8b9ab8e9-4856-4382-824b-37332e504342",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(3) > .col-12 > .mb-3 .form-label path",
+      "targets": [
+        ["css=.row:nth-child(3) > .col-12 > .mb-3 .form-label path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "670d88ef-01fe-4d6f-aa03-22df00784246",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "A path (on the local file system) to a certificate file whose key is used to verify the signature. Conflicts with trustEngineRef and both of the child elements."
+    }, {
+      "id": "7dabc0ab-d5ed-4f6b-9695-075d332bc00e",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "06ed36cf-160c-4a0c-ad36-3ad27e8c6274",
+      "comment": "",
+      "command": "click",
+      "target": "css=.save",
+      "targets": [
+        ["css=.save", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button", "xpath:idRelative"],
+        ["xpath=//li[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "e88c3946-6bba-453c-bd76-a87602b7a26c",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "linkText=FBHMR",
+      "targets": [
+        ["linkText=FBHMR", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'FBHMR')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[2]/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/b33533c3-dd67-418a-b387-188045e2f821/configuration/options')]", "xpath:href"],
+        ["xpath=//td[2]/a", "xpath:position"],
+        ["xpath=//a[contains(.,'FBHMR')]", "xpath:innerText"]
+      ],
+      "value": "30000"
+    }, {
+      "id": "0feeadff-9325-4a92-992e-51da6e4611d6",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "78070ae0-e6cc-4204-8faa-becd9ec407e6",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-provider",
+      "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
+        ["linkText=Add a new metadata provider", "linkText"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
+        ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
+        ["xpath=//a[2]", "xpath:position"],
+        ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "cd46f9d7-156e-4930-9694-645d6988fc3c",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "ebee4d22-84b6-451d-9a62-0dfc7999e7c0",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=FilesystemMetadataResolver"
+    }, {
+      "id": "ca977b80-c080-4ca4-ace8-7428f293c79b",
+      "comment": "",
+      "command": "type",
+      "target": "name=name",
+      "targets": [
+        ["name=name", "name"],
+        ["css=.form-control", "css:finder"],
+        ["xpath=//input[@name='name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/form/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "FSMR"
+    }, {
+      "id": "3e9efc71-b8e5-4d0e-99f1-5605f0984768",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(1) path",
+      "targets": [
+        ["css=.mb-3:nth-child(1) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "2a2271ae-e8c5-4d03-adf9-63a271831418",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Metadata Provider Name (for display on the Dashboard only)"
+    }, {
+      "id": "c3f51d32-f01e-4f4f-aec8-65d6c212096e",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "b83ea670-06b0-45e7-b4e3-af137de66d44",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=root_xmlId",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "76c3cf2f-2e79-4a14-88a9-82fa0909de4f",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_xmlId",
+      "targets": [
+        ["id=root_xmlId", "id"],
+        ["css=#root_xmlId", "css:finder"],
+        ["xpath=//input[@id='root_xmlId']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "2"
+    }, {
+      "id": "869cd022-e518-4708-b314-daa54733a807",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_metadataFile",
+      "targets": [
+        ["id=root_metadataFile", "id"],
+        ["css=#root_metadataFile", "css:finder"],
+        ["xpath=//input[@id='root_metadataFile']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div[2]/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/input", "xpath:position"]
+      ],
+      "value": "%{idp.home}/foo"
+    }, {
+      "id": "1086624e-fc87-470b-85bf-246fd3a42f64",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.d-block path",
+      "targets": [
+        ["css=.d-block path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "be0a9921-3263-405c-a312-0e39fa53c316",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Initialize this resolver? In the case of Filesystem resolvers, this will cause the system to read the file and index the resolver."
+    }, {
+      "id": "3e0adde0-48e9-402d-952d-f682b5c68f93",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "d910ef5c-1e0f-48b8-bfbb-3dc0f2e65864",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.ms-2:nth-child(2) > path",
+      "targets": [
+        ["css=.ms-2:nth-child(2) > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "596d3f35-eb2c-4b8b-a99a-7f92f5441361",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "A factor applied to the initially determined refresh time in order to determine the next refresh time (typically to ensure refresh takes place prior to the metadata's expiration). Attempts to refresh metadata will generally begin around the product of this number and the maximum refresh delay."
+    }, {
+      "id": "33fff05f-db8e-495a-89b4-05fbb6de1062",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "806fe667-1f0a-41be-9f67-e05613a54304",
+      "comment": "",
+      "command": "click",
+      "target": "css=.save",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "cf2d85ab-412e-4cc8-824c-214e5bed17f1",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "linkText=FSMR",
+      "targets": [
+        ["linkText=FBHMR", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'FBHMR')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[2]/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/b33533c3-dd67-418a-b387-188045e2f821/configuration/options')]", "xpath:href"],
+        ["xpath=//td[2]/a", "xpath:position"],
+        ["xpath=//a[contains(.,'FBHMR')]", "xpath:innerText"]
+      ],
+      "value": "30000"
+    }, {
+      "id": "e7b255a9-e86c-41a9-aff8-e72088f7f19c",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "5ab84f87-6038-4e5e-8c1e-f4caad237004",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-provider",
+      "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
+        ["linkText=Add a new metadata provider", "linkText"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
+        ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
+        ["xpath=//a[2]", "xpath:position"],
+        ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "f8654e3e-7bc2-4fde-8471-0b979916ba3e",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "d7378c6c-85c6-4c04-8793-a7a7bcba9afa",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=LocalDynamicMetadataResolver"
+    }, {
+      "id": "83a312ec-7e52-427d-8d1f-f1adc569a288",
+      "comment": "",
+      "command": "type",
+      "target": "name=name",
+      "targets": [
+        ["name=name", "name"],
+        ["css=.form-control", "css:finder"],
+        ["xpath=//input[@name='name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/form/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "LDMR"
+    }, {
+      "id": "3982eb88-4841-4bbc-929b-a5905c06e981",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "0b590f05-e52c-44a6-af23-5b2f46a10663",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_xmlId",
+      "targets": [
+        ["id=root_xmlId", "id"],
+        ["css=#root_xmlId", "css:finder"],
+        ["xpath=//input[@id='root_xmlId']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "3"
+    }, {
+      "id": "873f31c3-3488-452b-bf9d-db3cfdaacb6b",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_sourceDirectory",
+      "targets": [
+        ["id=root_sourceDirectory", "id"],
+        ["css=#root_sourceDirectory", "css:finder"],
+        ["xpath=//input[@id='root_sourceDirectory']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div[2]/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/input", "xpath:position"]
+      ],
+      "value": "%{idp.home}"
+    }, {
+      "id": "cc967bcc-786d-4fa3-a94e-d4571597a3dd",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(2) .btn path",
+      "targets": [
+        ["css=.mb-3:nth-child(2) .btn path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "0a95e107-a515-46fe-80be-a4a102be8b95",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Convenience mechanism for wiring a FilesystemLoadSaveManager, loading from the specified source directory in the local filesystem. This attribute will be ignored if sourceManagerRef is also specified. Either this attribute or sourceManagerRef is required."
+    }, {
+      "id": "f5837e71-6c43-449e-8580-ee1ace17da5e",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "718a6f12-5933-4a38-a84f-c9061d238656",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(2) path",
+      "targets": [
+        ["css=.row:nth-child(2) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "927b5586-bea4-4ac5-a15b-8239540813e3",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "The minimum duration for which metadata will be cached before it is refreshed."
+    }, {
+      "id": "6afe9417-450d-4820-8ed4-300188f38196",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.row:nth-child(2) path",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "da0ce3d8-75e6-4b84-b3a7-8b423399044e",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "b00df7f8-aa3c-4d5d-a518-61e822e1aece",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "5f3a17b8-9ab0-43b9-a6e9-47dfc036760a",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.d-block path",
+      "targets": [
+        ["css=.d-block path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "4ce1c46e-ebde-4444-a539-97c9697c04f1",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Flag indicating whether idle metadata should be removed."
+    }, {
+      "id": "1a2a4e97-e088-445f-af42-b918e6705d83",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "997ea47d-d04e-4f9b-80a8-de6f891bd112",
+      "comment": "",
+      "command": "click",
+      "target": "css=.save",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "48022847-6110-435c-9bcb-b99f6f510c06",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "linkText=LDMR",
+      "targets": [
+        ["linkText=FBHMR", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'FBHMR')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[2]/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/b33533c3-dd67-418a-b387-188045e2f821/configuration/options')]", "xpath:href"],
+        ["xpath=//td[2]/a", "xpath:position"],
+        ["xpath=//a[contains(.,'FBHMR')]", "xpath:innerText"]
+      ],
+      "value": "30000"
+    }, {
+      "id": "2e40dcab-b51f-4cc6-94e7-fa4de7bc59b9",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "949ba487-777e-49d3-ab7c-9d922c69583b",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-provider",
+      "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
+        ["linkText=Add a new metadata provider", "linkText"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
+        ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
+        ["xpath=//a[2]", "xpath:position"],
+        ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "139a8974-e20a-40ed-b09c-5fbf7c045cb7",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "ca32e1ac-1b14-4511-8ee1-3786d9d54908",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=DynamicHttpMetadataResolver"
+    }, {
+      "id": "f22135c5-c05b-4f03-8f75-75a818048264",
+      "comment": "",
+      "command": "type",
+      "target": "name=name",
+      "targets": [
+        ["name=name", "name"],
+        ["css=.form-control", "css:finder"],
+        ["xpath=//input[@name='name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/form/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "DHMR"
+    }, {
+      "id": "72d3d8ee-1c0e-4886-8a04-b696acd55ba9",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "7b4daefd-0731-4a52-b743-f18ec09de8c7",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_xmlId",
+      "targets": [
+        ["id=root_xmlId", "id"],
+        ["css=#root_xmlId", "css:finder"],
+        ["xpath=//input[@id='root_xmlId']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[3]/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "4"
+    }, {
+      "id": "85a6208a-fa62-40df-90ef-40e6169dbe47",
+      "comment": "",
+      "command": "select",
+      "target": "id=root_metadataRequestURLConstructionScheme_@type",
+      "targets": [
+        ["id=root_metadataRequestURLConstructionScheme_@type", "id"],
+        ["css=#root_metadataRequestURLConstructionScheme_\\@type", "css:finder"],
+        ["xpath=//select[@id='root_metadataRequestURLConstructionScheme_@type']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[3]/div[2]/div/div/div/div/div/div/div/select", "xpath:idRelative"],
+        ["xpath=//select", "xpath:position"]
+      ],
+      "value": "label=Regex"
+    }, {
+      "id": "a6f1b350-eaa3-4748-8eb8-34ecac96ef01",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_metadataRequestURLConstructionScheme_content",
+      "targets": [
+        ["id=root_metadataRequestURLConstructionScheme_content", "id"],
+        ["css=#root_metadataRequestURLConstructionScheme_content", "css:finder"],
+        ["xpath=//input[@id='root_metadataRequestURLConstructionScheme_content']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[3]/div[2]/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div/div/input", "xpath:position"]
+      ],
+      "value": "foo"
+    }, {
+      "id": "93a5bbcd-9ee1-4fbc-9fd0-8ce2654edc8b",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_metadataRequestURLConstructionScheme_match",
+      "targets": [
+        ["id=root_metadataRequestURLConstructionScheme_match", "id"],
+        ["css=#root_metadataRequestURLConstructionScheme_match", "css:finder"],
+        ["xpath=//input[@id='root_metadataRequestURLConstructionScheme_match']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[3]/div[2]/div/div/div[3]/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[3]/div/div/div/div/input", "xpath:position"]
+      ],
+      "value": "unicon.*"
+    }, {
+      "id": "b0bbc709-2c6a-4600-8eac-d3b4182b3bb8",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(3) > .col-12 > .mb-3 .btn > .svg-inline--fa",
+      "targets": [
+        ["css=.row:nth-child(3) > .col-12 > .mb-3 .btn > .svg-inline--fa", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "bafeaf78-91f6-496c-a199-52f2fb3681fe",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "A regular expression against which the entityID is evaluated."
+    }, {
+      "id": "36549098-a4b0-4660-a913-9aeb0ac83996",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "bdfb17e5-a4c9-408b-858b-7e2fddd7c350",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(2) path",
+      "targets": [
+        ["css=.row:nth-child(2) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "16cee316-9f39-481d-99be-34b61e0ed010",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "The minimum duration for which metadata will be cached before it is refreshed."
+    }, {
+      "id": "687d2359-86f5-45de-bbfd-6557f62fd6d1",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.row:nth-child(2) path",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "fba778ef-2d9a-4fe9-9e6a-291560e3d807",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "86512870-b695-44b6-a112-ea60375586f4",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "8f77dc16-2b54-46d7-b6bd-bf6fd046e8b6",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(8) .svg-inline--fa",
+      "targets": [
+        ["css=.row:nth-child(8) .svg-inline--fa", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "3fd29e97-1178-4bb5-9e76-22e89bca717c",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Flag indicating whether should initialize from the persistent cache in the background. Initializing from the cache in the background will improve IdP startup times."
+    }, {
+      "id": "d1ee0afc-651b-4da5-bd99-eac47bbceb78",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "aea0e033-111e-4a5d-8038-ec222786a695",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(4) .svg-inline--fa:nth-child(2)",
+      "targets": [
+        ["css=.row:nth-child(4) .svg-inline--fa:nth-child(2)", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "80e0d456-3951-4858-8423-7e04d6debb96",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Controls whether to keep entities descriptors that contain no entity descriptors. Note: If this attribute is set to false, the resulting output may not be schema-valid since an <md:EntitiesDescriptor> element must include at least one child element, either an <md:EntityDescriptor> element or an <md:EntitiesDescriptor> element."
+    }, {
+      "id": "148a84ef-0353-425d-9a63-79ccaa01478d",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "a4dea76b-c360-4093-badc-75920e2f4f77",
+      "comment": "",
+      "command": "click",
+      "target": "css=.save",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "3e26de95-6680-4b4e-af58-1f03b73feabc",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "linkText=DHMR",
+      "targets": [
+        ["linkText=FBHMR", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'FBHMR')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[2]/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/b33533c3-dd67-418a-b387-188045e2f821/configuration/options')]", "xpath:href"],
+        ["xpath=//td[2]/a", "xpath:position"],
+        ["xpath=//a[contains(.,'FBHMR')]", "xpath:innerText"]
+      ],
+      "value": "30000"
+    }, {
+      "id": "a43927f1-4fbb-4963-b0c8-692422473e74",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "e0f16faa-8a59-47d6-882e-be0641aeea24",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-provider",
+      "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
+        ["linkText=Add a new metadata provider", "linkText"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
+        ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
+        ["xpath=//a[2]", "xpath:position"],
+        ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "b2e14d51-46d1-4ab6-963e-6783a7dc647f",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "b87c519c-2b8a-416f-aede-e982badbfd9c",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=ExternalMetadataResolver"
+    }, {
+      "id": "0e186c0d-53cc-432c-b12d-28dd6ed7c3d4",
+      "comment": "",
+      "command": "type",
+      "target": "name=name",
+      "targets": [
+        ["name=name", "name"],
+        ["css=.form-control", "css:finder"],
+        ["xpath=//input[@name='name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/form/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "ExMR"
+    }, {
+      "id": "bfee0b94-d6aa-4623-81c5-d9241794e5f1",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "2c2c7589-3d4c-4db1-a5fc-d8e66e0b8831",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_xmlId",
+      "targets": [
+        ["id=root_xmlId", "id"],
+        ["css=#root_xmlId", "css:finder"],
+        ["xpath=//input[@id='root_xmlId']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "5"
+    }, {
+      "id": "63444e5f-23c1-4da3-a5ba-e2ef8ad7b869",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_description",
+      "targets": [
+        ["id=root_description", "id"],
+        ["css=#root_description", "css:finder"],
+        ["xpath=//textarea[@id='root_description']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div[2]/div/div/textarea", "xpath:idRelative"],
+        ["xpath=//textarea", "xpath:position"]
+      ],
+      "value": "foo"
+    }, {
+      "id": "52604851-991e-4055-b926-21a8eae2d293",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3 > div > .form-label > .btn path",
+      "targets": [
+        ["css=.mb-3 > div > .form-label > .btn path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "0c41fa31-f8ce-4247-8384-5ffe9dbb2a96",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "this tooltip is broken"
+    }, {
+      "id": "3252a66e-f891-479e-8a6a-53460b3af55c",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "dfb684d2-91d6-452f-ad3a-5072c318deb9",
+      "comment": "",
+      "command": "click",
+      "target": "css=.save",
+      "targets": [
+        ["css=.nav-link", "css:finder"],
+        ["xpath=(//button[@type='button'])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button", "xpath:idRelative"],
+        ["xpath=//li[2]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "3c17b8c4-b76b-44d9-9240-90753ded5476",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "linkText=ExMR",
+      "targets": [
+        ["linkText=FBHMR", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'FBHMR')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[2]/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/b33533c3-dd67-418a-b387-188045e2f821/configuration/options')]", "xpath:href"],
+        ["xpath=//td[2]/a", "xpath:position"],
+        ["xpath=//a[contains(.,'FBHMR')]", "xpath:innerText"]
+      ],
+      "value": "30000"
+    }, {
+      "id": "fe1c0584-e64f-478b-a9ba-5197b7c1fff7",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=FBHMR",
+      "targets": [
+        ["linkText=FBHMR", "linkText"],
+        ["css=tr:nth-child(1) a", "css:finder"],
+        ["xpath=//a[contains(text(),'FBHMR')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[2]/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/69410b01-394d-428c-b164-ae0ecc277bf9/configuration/options')]", "xpath:href"],
+        ["xpath=//td[2]/a", "xpath:position"],
+        ["xpath=//a[contains(.,'FBHMR')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "cfb977fd-934b-4a2d-94b9-3e1fddc9d86f",
+      "comment": "",
+      "command": "click",
+      "target": "css=.btn:nth-child(2)",
+      "targets": [
+        ["css=.btn:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='navigation']/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,' Filters')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "3f1b1b9c-ac27-4a85-89f5-1edd350b134b",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Add Filter",
+      "targets": [
+        ["linkText=Add Filter", "linkText"],
+        ["css=#filters .btn", "css:finder"],
+        ["xpath=//div[@id='filters']/div/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/69410b01-394d-428c-b164-ae0ecc277bf9/filter/new')]", "xpath:href"],
+        ["xpath=//div[3]/div/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,' Add Filter')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "7fa035f2-c14b-4452-8437-f15901428d76",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.fa-circle-info > path",
+      "targets": [
+        ["css=.fa-circle-info > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "1b66bf16-76ba-48db-a1b8-a230198ae4a2",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "The precise behavior of any <MetadataFilter> element is controlled by the xsi:type attribute."
+    }, {
+      "id": "6f9ae687-770a-4932-bdc9-a33706a698b7",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [
+        ["name=type", "name"],
+        ["css=.form-select", "css:finder"],
+        ["xpath=//select[@name='type']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/div/div/form/div/select", "xpath:idRelative"],
+        ["xpath=//select", "xpath:position"]
+      ],
+      "value": "label=EntityAttributes"
+    }, {
+      "id": "e2b1a582-a3ce-4adb-b10c-0804f44a56ae",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.justify-content-start > .btn path",
+      "targets": [
+        ["css=.justify-content-start > .btn path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "c42fe40a-496c-491b-834e-694181da46d1",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Indicates the type of search to be performed."
+    }, {
+      "id": "e4596fdd-7ffc-4636-95d3-870d6bd51f20",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link:nth-child(2)",
+      "targets": [
+        ["css=.nav-link:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[10]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div/nav/button[2]", "xpath:idRelative"],
+        ["xpath=//nav/button[2]", "xpath:position"],
+        ["xpath=//button[contains(.,'Options')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "583b61c9-b021-452b-b488-1faf2be311b6",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.row:nth-child(5) path:nth-child(1)",
+      "targets": [
+        ["css=.row:nth-child(5) path:nth-child(1)", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "112094e0-5983-4de2-80c9-b667a85c0334",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Whether to turn off encryption of the response."
+    }, {
+      "id": "62691575-441e-4251-afd8-658fe8763578",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [
+        ["name=type", "name"],
+        ["css=.form-select", "css:finder"],
+        ["xpath=//select[@name='type']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/div/div/form/div/select", "xpath:idRelative"],
+        ["xpath=//select", "xpath:position"]
+      ],
+      "value": "label=NameIDFormat"
+    }, {
+      "id": "b358a7c0-87a5-4b74-8013-c0ab379278c2",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.ms-2 > path",
+      "targets": [
+        ["css=.ms-2 > path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "5444d5e6-b455-4afa-8154-036c6e55303e",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Whether to remove any existing formats from a role if any are added by the filter (unmodified roles will be untouched regardless of this setting)"
+    }, {
+      "id": "59d268fc-f9ba-4c9c-b412-f17ca72b67d1",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link:nth-child(1)",
+      "targets": [
+        ["css=.nav-link:nth-child(1)", "css:finder"],
+        ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div/nav/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/nav/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Filter Target')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "8657a3bf-3547-456a-8802-a23eaf657e7c",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.btn-text:nth-child(1) > .svg-inline--fa",
+      "targets": [
+        ["css=.btn-text:nth-child(1) > .svg-inline--fa", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "424c3f2e-c1ed-4895-ad42-78953ea3bf39",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Search Criteria by Entity ID"
+    }, {
+      "id": "6dc07848-bf6c-4468-8cb9-6434fb61098c",
+      "comment": "",
+      "command": "click",
+      "target": "id=dropdown-label.filter-target-type",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "98b5db64-05cd-498e-a644-df6d2c8492a6",
+      "comment": "",
+      "command": "click",
+      "target": "css=.show > .dropdown-item:nth-child(2)",
+      "targets": [
+        ["css=.show > .dropdown-item:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[15]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/div/button[2]", "xpath:idRelative"],
+        ["xpath=//fieldset/div/div/div/div/div/button[2]", "xpath:position"],
+        ["xpath=//button[contains(.,'Regex')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "f65720ad-5b7b-4193-a8d6-3ca976d2c976",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.btn-text:nth-child(1) path",
+      "targets": [
+        ["css=.btn-text:nth-child(1) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "46e83d10-00d0-4535-8387-2d84e1559ec2",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Search Criteria by Regex"
+    }, {
+      "id": "0067cff3-9879-4a44-a6a1-70711255dc7c",
+      "comment": "",
+      "command": "click",
+      "target": "id=dropdown-label.filter-target-type",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "96873967-eccb-48a1-9dd2-0d189919789c",
+      "comment": "",
+      "command": "click",
+      "target": "css=.show > .dropdown-item:nth-child(3)",
+      "targets": [
+        ["css=.show > .dropdown-item:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[15]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/div/button[2]", "xpath:idRelative"],
+        ["xpath=//fieldset/div/div/div/div/div/button[2]", "xpath:position"],
+        ["xpath=//button[contains(.,'Regex')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "295c441f-78c8-4949-9c0c-c9c6202c8943",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.btn-text:nth-child(1) path",
+      "targets": [
+        ["css=.btn-text:nth-child(1) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "7544cfe4-4314-4182-8518-6db7f951ca93",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Search Criteria by Script"
+    }, {
+      "id": "cbfaac4f-35af-4014-b0a9-0748c9ae78f0",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "7fe511ed-178f-4922-8539-ea5beaf82ad2",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
+  }],
+  "suites": [{
+    "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
+    "name": "Default Suite",
+    "persistSession": false,
+    "parallel": false,
+    "timeout": 300,
+    "tests": ["841ade0e-83bd-4a4b-94f2-de6bd5c536b2"]
+  }],
+  "urls": ["http://localhost:10101/"],
+  "plugins": []
+}
\ No newline at end of file
diff --git a/backend/src/integration/resources/SHIBUI-1674-3.side b/backend/src/integration/resources/SHIBUI-1674-3.side
new file mode 100644
index 000000000..fa0a6f0cd
--- /dev/null
+++ b/backend/src/integration/resources/SHIBUI-1674-3.side
@@ -0,0 +1,443 @@
+{
+  "id": "1b31a551-eb09-4bd4-8db9-694bf1539a46",
+  "version": "2.0",
+  "name": "SHIBUI-1674-3",
+  "url": "http://localhost:10101",
+  "tests": [{
+    "id": "841ade0e-83bd-4a4b-94f2-de6bd5c536b2",
+    "name": "SHIBUI-1674-3",
+    "commands": [{
+      "id": "d6b23986-6d14-4b10-be7b-a7e6f576e3b2",
+      "comment": "",
+      "command": "open",
+      "target": "/login",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "f77ecd77-01c2-4463-944e-1a69600f5297",
+      "comment": "",
+      "command": "type",
+      "target": "name=username",
+      "targets": [
+        ["name=username", "name"],
+        ["css=tr:nth-child(1) input", "css:finder"],
+        ["xpath=//input[@name='username']", "xpath:attributes"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "admin"
+    }, {
+      "id": "c9bf0a22-faa9-494c-b2ed-6c9653248551",
+      "comment": "",
+      "command": "type",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "adminpass"
+    }, {
+      "id": "7ab1d854-3582-4101-bd19-f94b8f438090",
+      "comment": "",
+      "command": "sendKeys",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "${KEY_ENTER}"
+    }, {
+      "id": "4059cae7-b9f9-49d0-a213-343bcaba66d1",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "f03af8d5-5875-4a2c-b93a-c3ddcbd4b16a",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "081f495b-4d84-4758-824c-1e85b6311e7f",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }, {
+      "id": "9e912dd5-6ace-45be-bafd-2d1655906575",
+      "comment": "",
+      "command": "open",
+      "target": "/",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "3bb52950-667c-4852-a98f-6a6fb5632ba5",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "36f741ba-efc6-4837-b4ee-6afaf64eaa9a",
+      "comment": "",
+      "command": "click",
+      "target": "id=advanced-nav-dropdown-toggle",
+      "targets": [
+        ["id=advanced-nav-dropdown-toggle", "id"],
+        ["css=#advanced-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='advanced-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='advanced-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[3]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Advanced')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "c1ece675-f7dd-467b-a559-5abf32c5bbe2",
+      "comment": "",
+      "command": "click",
+      "target": "id=advanced-nav-dropdown-attr",
+      "targets": [
+        ["id=advanced-nav-dropdown-attr", "id"],
+        ["linkText=Custom entity attributes", "linkText"],
+        ["css=#advanced-nav-dropdown-attr", "css:finder"],
+        ["xpath=//a[contains(text(),'Custom entity attributes')]", "xpath:link"],
+        ["xpath=//a[@id='advanced-nav-dropdown-attr']", "xpath:attributes"],
+        ["xpath=//div[@id='advanced-nav-dropdown']/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/attributes')]", "xpath:href"],
+        ["xpath=//div[3]/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,'Custom entity attributes')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "b2d7669c-99d8-493c-8fa9-588191d0b7dc",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Add new attribute",
+      "targets": [
+        ["linkText=Add new attribute", "linkText"],
+        ["css=.btn-success", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/attributes/new')]", "xpath:href"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,'  Add new attribute')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "6a47d0aa-0afe-4e61-afbf-44a56507a2e8",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(1) > div > div > .form-label > .btn path",
+      "targets": [
+        ["css=.mb-3:nth-child(1) > div > div > .form-label > .btn path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "f0c42874-f4d4-4bd6-ba45-d5456555df77",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Name of the attribute that the service provider uses and requires from the identity provider. It corresponds to the <saml:Attribute Name=\"\"> element in the SAML assertion."
+    }, {
+      "id": "462beca1-71e3-4519-a478-f4e66824c3cc",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.mb-3:nth-child(1) > div > div > .form-label > .btn path",
+      "targets": [
+        ["css=.mb-3:nth-child(1) > div > div > .form-label > .btn path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "1d0954f7-b5f4-4c6d-9e4f-90d1557ff57f",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "0500c6db-2e9a-41be-a4f8-7ca36e3a2949",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "d316301e-1e75-4c95-bc8a-efa5575b3cfb",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3 > .form-label > .btn > .svg-inline--fa",
+      "targets": [
+        ["css=.mb-3 > .form-label > .btn > .svg-inline--fa", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "587a92b2-743d-4c22-8788-103995b8a593",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Data type of the attribute such as boolean or string."
+    }, {
+      "id": "f2335699-a48b-4da0-906a-6b41fac18795",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.mb-3 > .form-label > .btn > .svg-inline--fa",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "15ab5915-5ee7-4942-9417-382d7171872f",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "37cdbafc-1379-4338-bce0-cb9bdfedc31f",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "9d4d25d7-3f22-4ca9-976b-fde51c951f44",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(3) .btn > .svg-inline--fa",
+      "targets": [
+        ["css=.mb-3:nth-child(3) .btn > .svg-inline--fa", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "b1c748cd-a506-4d83-be8b-d4a768b815d8",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "A descriptive or human-friendly name for users of the Shibboleth IDP UI."
+    }, {
+      "id": "37ac1e21-a74a-48b8-a8da-5639d4c3daf0",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.mb-3:nth-child(3) .btn > .svg-inline--fa",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "a5db41a9-79cb-4ac5-b637-15ab28b661a2",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "2d273ecb-241c-4cdd-b7a9-202a9ca0241d",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "6b365142-29d2-4d6f-a3ff-bcc06f8102ac",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(4) .btn path",
+      "targets": [
+        ["css=.mb-3:nth-child(4) .btn path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "cc340bf7-11bd-4d80-9878-852d06e0a6a0",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Indicates how to interpret the attribute name. It corresponds to the <saml:Attribute NameFormat=\"\"> element in the SAML assertion. This is normally a uri or urn."
+    }, {
+      "id": "bb6a3d64-d0a9-43ab-b60c-20dab1f04e15",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.mb-3:nth-child(4) .btn path",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "5ed8705f-fc06-43c4-8fb0-2200f2b17417",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "ad456296-65ae-4eb3-ac6e-5d806fd8a9ba",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "4d5c9b81-fa8b-4202-9617-9e66b11c6453",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(5) .btn path",
+      "targets": [
+        ["css=.mb-3:nth-child(5) .btn path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "e7f5bec5-f0a7-464c-88e0-762dd3fd814d",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Provides a human readable value that identifies the subject. This value is not guaranteed to be unique and is designed to be used only for display purposes."
+    }, {
+      "id": "535899ed-dfc1-4e6d-98bf-1d798eba2653",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.mb-3:nth-child(5) .btn path",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "dd9c55ae-367a-4dc6-acd3-9a4fc70af3c8",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "7f273e47-802d-42ce-9290-3ae6768a3835",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "5e69982a-5611-4276-9145-b2ae74cafc5e",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.mb-3:nth-child(6) path",
+      "targets": [
+        ["css=.mb-3:nth-child(6) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "e40ca8bd-05f0-4266-85cd-ddc6f072b268",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "Defines help text used in the Shibboleth IDP UI when adding the attribute."
+    }, {
+      "id": "1903d80f-cd05-4b27-a8ee-7450f6ddfb1f",
+      "comment": "",
+      "command": "mouseOut",
+      "target": "css=.mb-3:nth-child(6) path",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "8d9f307d-d310-4fec-91d8-2d228bf07328",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "a20bb255-c02f-46a2-a117-365506bf9820",
+      "comment": "",
+      "command": "pause",
+      "target": "1000",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "ff071936-517f-497a-bc8a-ffcc0244a860",
+      "comment": "",
+      "command": "click",
+      "target": "id=advanced-nav-dropdown-toggle",
+      "targets": [
+        ["id=advanced-nav-dropdown-toggle", "id"],
+        ["css=#advanced-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='advanced-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='advanced-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[3]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Advanced')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "bf20a8b1-5efa-44b6-bae6-2f0c44216c5a",
+      "comment": "",
+      "command": "click",
+      "target": "id=advanced-nav-dropdown-bundles",
+      "targets": [
+        ["id=advanced-nav-dropdown-bundles", "id"],
+        ["linkText=Attribute bundles", "linkText"],
+        ["css=#advanced-nav-dropdown-bundles", "css:finder"],
+        ["xpath=//a[contains(text(),'Attribute bundles')]", "xpath:link"],
+        ["xpath=//a[@id='advanced-nav-dropdown-bundles']", "xpath:attributes"],
+        ["xpath=//div[@id='advanced-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/attributes/bundles')]", "xpath:href"],
+        ["xpath=//a[2]", "xpath:position"],
+        ["xpath=//a[contains(.,'Attribute bundles')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "a076e422-2bc2-4e73-b976-018306d00d42",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Add bundle",
+      "targets": [
+        ["linkText=Add bundle", "linkText"],
+        ["css=.btn-success", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/div/section/div/div[2]/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/attributes/bundles/new')]", "xpath:href"],
+        ["xpath=//div[2]/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,'  Add bundle')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "ca5dd037-f651-49bc-ae8e-2c4892a8dd8a",
+      "comment": "",
+      "command": "mouseOver",
+      "target": "css=.fa-circle-info",
+      "targets": [
+        ["css=.fa-circle-info", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "189111fe-dec8-4858-87dd-c2ae3b0d3318",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div[role=\"tooltip\"]",
+      "targets": [],
+      "value": "A user friendly name to identify the bundle"
+    }, {
+      "id": "18eb0ada-bc95-4bad-b891-b5c952ce25d1",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "de808d8a-e49a-4c10-99fb-25e28127437d",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
+  }],
+  "suites": [{
+    "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
+    "name": "Default Suite",
+    "persistSession": false,
+    "parallel": false,
+    "timeout": 300,
+    "tests": ["841ade0e-83bd-4a4b-94f2-de6bd5c536b2"]
+  }],
+  "urls": ["http://localhost:10101/"],
+  "plugins": []
+}
\ No newline at end of file

From c722fbc033bb5d61aec8d58b97695761a254461a Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 16 Aug 2022 10:44:11 -0700
Subject: [PATCH 64/81] Fixed issues with tooltips

Former-commit-id: ddebc4c6be8ac2cbdf94f9c9e43bdf601a723e76
---
 backend/src/main/resources/external.schema.json              | 2 +-
 backend/src/main/resources/i18n/messages.properties          | 5 +++--
 backend/src/main/resources/metadata-sources-ui-schema.json   | 1 +
 ui/public/assets/schema/provider/filebacked-http.schema.json | 2 +-
 ui/src/app/form/component/InfoIcon.js                        | 2 +-
 ui/src/theme/project/buttons.scss                            | 4 ++++
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/resources/external.schema.json b/backend/src/main/resources/external.schema.json
index 8efb9141e..317d5ff7d 100644
--- a/backend/src/main/resources/external.schema.json
+++ b/backend/src/main/resources/external.schema.json
@@ -9,7 +9,7 @@
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-dashboard-display-only",
-            "description": "tooltip.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name",
             "type": "string",
             "widget": {
                 "id": "string",
diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 8dbd4d06a..12d5e1935 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -312,7 +312,7 @@ label.contact=Contact
 label.mdui=MDUI Information
 label.service-provider-sso-descriptor=Service Provider Sso Descriptor
 label.service-enabled=Service Enabled
-label.filter-name=A name given to this filter to identify it within the Shibboleth IDP UI (used for display purposes only).
+label.filter-name=Filter Name
 label.filter-enabled=Filter Enabled
 label.filter-target=FilterTarget
 label.filter-type=Filter Type
@@ -666,6 +666,7 @@ tooltip.ignore-auth-method=Reject any AuthnReuests from this SP that contain an
 tooltip.omit-not-before-condition=Whether to include a NotBefore attribute in assertions.
 tooltip.responder-id=Identifier of the selected SAML IdP entity.
 tooltip.instruction=Information icon
+tooltip.x509-certificates=Add an X509 Certificate, a digital certificate that uses the widely accepted international X509 public key infrastructure (PKI) standard to verify that a public key belongs to the service identity contained within the certificate.
 tooltip.attribute-release-table=Attribute release table - select the attributes you want to release (default unchecked)
 tooltip.metadata-filter-name=Metadata Filter Name
 tooltip.metadata-filter-type=The precise behavior of any <MetadataFilter> element is controlled by the xsi:type attribute.
@@ -709,7 +710,7 @@ tooltip.refresh-delay-factor=A factor applied to the initially determined refres
 tooltip.resolve-via-predicates-only=Flag indicating whether resolution may be performed solely by applying predicates to the entire metadata collection, when an entityID input criterion is not supplied.
 tooltip.expiration-warning-threshold=For each attempted metadata refresh (whether or not fresh metadata is obtained), if requireValidMetadata is true, and there is a validUntil XML attribute on the document root element, and the difference between validUntil and the current time is less than expirationWarningThreshold, the system logs a warning about the impending expiration.
 
-tooltip.filter-name=Filter Name
+tooltip.filter-name=A name given to this filter to identify it within the Shibboleth IDP UI (used for display purposes only).
 tooltip.enable-filter=If checkbox is clicked, the metadata filter is enabled for integration with the IdP.
 tooltip.enable-service=A boolean value representing whether or not this metadata should be enabled within the Shibboleth IDP UI.
 tooltip.search-by=Indicates the type of search to be performed.
diff --git a/backend/src/main/resources/metadata-sources-ui-schema.json b/backend/src/main/resources/metadata-sources-ui-schema.json
index 2d64f96bb..93ad3ec81 100644
--- a/backend/src/main/resources/metadata-sources-ui-schema.json
+++ b/backend/src/main/resources/metadata-sources-ui-schema.json
@@ -93,6 +93,7 @@
                 },
                 "x509Certificates": {
                     "title": "label.x509-certificates",
+                    "description": "tooltip.x509-certificates",
                     "type": "array",
                     "items": {
                         "$ref": "#/definitions/Certificate"
diff --git a/ui/public/assets/schema/provider/filebacked-http.schema.json b/ui/public/assets/schema/provider/filebacked-http.schema.json
index e1b0d95c7..0c4fe29f6 100644
--- a/ui/public/assets/schema/provider/filebacked-http.schema.json
+++ b/ui/public/assets/schema/provider/filebacked-http.schema.json
@@ -28,7 +28,7 @@
     "properties": {
         "name": {
             "title": "label.metadata-provider-name-dashboard-display-only",
-            "description": "tooltip.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name",
             "type": "string",
             "widget": {
                 "id": "string",
diff --git a/ui/src/app/form/component/InfoIcon.js b/ui/src/app/form/component/InfoIcon.js
index a9dbb9363..1456cbd4b 100644
--- a/ui/src/app/form/component/InfoIcon.js
+++ b/ui/src/app/form/component/InfoIcon.js
@@ -16,7 +16,7 @@ export function InfoIcon ({ value = '', placement='auto', ...props }) {
             </Popover>
         )}
         aria-label={translate('tooltip.instruction')}>
-            <Button variant="text">
+            <Button variant="text" className="info-icon">
                 <span className="sr-only">Description</span>
                 <FontAwesomeIcon className="text-primary" icon={faInfoCircle} size="lg" {...props} />
             </Button>
diff --git a/ui/src/theme/project/buttons.scss b/ui/src/theme/project/buttons.scss
index 149e2e722..407d13bb1 100644
--- a/ui/src/theme/project/buttons.scss
+++ b/ui/src/theme/project/buttons.scss
@@ -16,6 +16,10 @@ $custom-control-spacer-x: 1rem;
     background: none;
 }
 
+.btn.btn-text.info-icon {
+    color: $brand-primary;
+}
+
 .btn.btn-link {
     &:focus {
         outline: 5px auto -webkit-focus-ring-color;

From 1e179f1992de4877cfd16acb8f30d4391bba5101 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 16 Aug 2022 11:58:53 -0700
Subject: [PATCH 65/81] Fixed grammar

Former-commit-id: 420f55fbd68bcd4bfb24fc44b034ac46c4745e1b
---
 backend/src/main/resources/i18n/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 12d5e1935..c225aa4c3 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -719,7 +719,7 @@ tooltip.max-cache-duration=The maximum duration for which metadata will be cache
 tooltip.max-idle-entity-data=The maximum duration for which metadata will be allowed to be idle (no requests for it) before it is removed from the cache.
 tooltip.cleanup-task-interval=The interval at which the internal cleanup task should run.  This task performs background maintenance tasks, such as the removal of expired and idle metadata.
 tooltip.persistent-cache-manager-directory=The optional manager for the persistent cache store for resolved metadata.  On metadata provider initialization, data present in the persistent cache will be loaded to memory, effectively restoring the state of the provider as closely as possible to that which existed before the previous shutdown.  Each individual cache entry will only be loaded if 1) the entry is still valid as determined by the internal provider logic, and 2) the entry passes the (optional) predicate supplied via initializationFromCachePredicateRef.
-tooltip.initialize-from-persistent-cache-in-background=Flag indicating whether system should initialize from the persistent cache in the background.  Initializing from the cache in the background will improve IdP startup times.
+tooltip.initialize-from-persistent-cache-in-background=Flag indicating whether the system should initialize from the persistent cache in the background.  Initializing from the cache in the background will improve IdP startup times.
 tooltip.background-init-from-cache-delay=The delay after which to schedule the background initialization from the persistent cache when initializeFromPersistentCacheInBackground=true.
 
 tooltip.source-directory=Convenience mechanism for wiring a FilesystemLoadSaveManager, loading from the specified source directory in the local filesystem. This attribute will be ignored if sourceManagerRef is also specified.  Either this attribute or sourceManagerRef is required.

From a5330c7442f545a6b47f5e293047404a2af64863 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Tue, 16 Aug 2022 16:13:18 -0400
Subject: [PATCH 66/81] SHIBUI-1674

Test fixes and optimizations.


Former-commit-id: 1b57540567627209870b8e981bbb331ed5e81e3e
---
 .../admin/ui/SeleniumSIDETest.groovy          |  2 +-
 .../integration/resources/SHIBUI-1674-1.side  | 14 +++++----
 .../integration/resources/SHIBUI-1674-2.side  | 31 ++++++++++++-------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
index de68850a5..363f1a06f 100644
--- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
+++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -154,9 +154,9 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-2052: Logged in user & role appear on dashboard'            | '/SHIBUI-2052.side'
         'SHIBUI-2116: Verify entity attribute bundle highlights'            | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script).
         'SHIBUI-2267: Verify new RPO CRUD'                                  | '/SHIBUI-2267.side'
-        'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
         'SHIBUI-1674: Verify metadata source tooltips'                      | '/SHIBUI-1674-1.side'
         'SHIBUI-1674: Verify metadata provider tooltips'                    | '/SHIBUI-1674-2.side'
         'SHIBUI-1674: Verify advanced menu tooltips'                        | '/SHIBUI-1674-3.side'
+        'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
     }
 }
diff --git a/backend/src/integration/resources/SHIBUI-1674-1.side b/backend/src/integration/resources/SHIBUI-1674-1.side
index b9fed57ad..e2c62c188 100644
--- a/backend/src/integration/resources/SHIBUI-1674-1.side
+++ b/backend/src/integration/resources/SHIBUI-1674-1.side
@@ -303,7 +303,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Whether to sign requests."
+      "value": "Whether to sign requests. Signing requests helps to verify that the request from the SP is authentic."
     }, {
       "id": "e1c906a3-bd1d-4684-b6fb-56de3a653579",
       "comment": "",
@@ -387,7 +387,9 @@
       "command": "mouseOver",
       "target": "css=.row:nth-child(8) path:nth-child(1)",
       "targets": [
-        ["css=.row:nth-child(8) path:nth-child(1)", "css:finder"]
+        ["css=.app-root", "css:finder"],
+        ["xpath=//div[@id='root']/div", "xpath:idRelative"],
+        ["xpath=//div[3]/div", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -396,7 +398,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Whether to ignore any SP-Requested Authentication Method."
+      "value": "Do not sign the full authentication response to the service provider. Enabling this property will reduce the size of the response to service providers who may have limitations to the size of the response."
     }, {
       "id": "87036a6f-aebd-4ef1-8cb8-03d082676c03",
       "comment": "",
@@ -719,9 +721,9 @@
       "id": "2928ba27-b934-499e-8dda-8441dbbb463d",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(6) path:nth-child(1)",
+      "target": "css=.row:nth-child(7) path:nth-child(1)",
       "targets": [
-        ["css=.row:nth-child(6) path:nth-child(1)", "css:finder"]
+        ["css=.row:nth-child(7) path:nth-child(1)", "css:finder"]
       ],
       "value": ""
     }, {
@@ -732,7 +734,7 @@
       "targets": [
         ["css=.row:nth-child(1) > .col-12 .btn > .svg-inline--fa", "css:finder"]
       ],
-      "value": "Disallows use (or reuse) of authentication results and login flows that don't provide a real-time proof of user presence in the login process."
+      "value": "Disallows use (or reuse) of authentication results and login flows that don't provide a real-time proof of user presence in the login process"
     }, {
       "id": "1ff63b39-ee65-46a0-9258-56209aa63e4b",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1674-2.side b/backend/src/integration/resources/SHIBUI-1674-2.side
index f05b1e1f9..fb33695f5 100644
--- a/backend/src/integration/resources/SHIBUI-1674-2.side
+++ b/backend/src/integration/resources/SHIBUI-1674-2.side
@@ -146,9 +146,9 @@
       "id": "2f6171c0-f11f-4d3a-99fe-4ba3ef743f3f",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.mb-3:nth-child(2) path",
+      "target": "css=.mb-3:nth-child(2) .info-icon > .svg-inline--fa",
       "targets": [
-        ["css=.mb-3:nth-child(2) path", "css:finder"]
+        ["css=.mb-3:nth-child(2) .info-icon > .svg-inline--fa", "css:finder"]
       ],
       "value": ""
     }, {
@@ -396,9 +396,9 @@
       "id": "3e9efc71-b8e5-4d0e-99f1-5605f0984768",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.mb-3:nth-child(1) path",
+      "target": "css=.mb-3:nth-child(1) .info-icon path",
       "targets": [
-        ["css=.mb-3:nth-child(1) path", "css:finder"]
+        ["css=.mb-3:nth-child(1) .info-icon path", "css:finder"]
       ],
       "value": ""
     }, {
@@ -423,7 +423,7 @@
     }, {
       "id": "b83ea670-06b0-45e7-b4e3-af137de66d44",
       "comment": "",
-      "command": "waitForElementEditable",
+      "command": "waitForElementVisible",
       "target": "id=root_xmlId",
       "targets": [],
       "value": "30000"
@@ -954,7 +954,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Flag indicating whether should initialize from the persistent cache in the background. Initializing from the cache in the background will improve IdP startup times."
+      "value": "Flag indicating whether the system should initialize from the persistent cache in the background. Initializing from the cache in the background will improve IdP startup times."
     }, {
       "id": "d1ee0afc-651b-4da5-bd99-eac47bbceb78",
       "comment": "",
@@ -1133,7 +1133,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "this tooltip is broken"
+      "value": "A brief description of the purpose of this filter."
     }, {
       "id": "3252a66e-f891-479e-8a6a-53460b3af55c",
       "comment": "",
@@ -1231,6 +1231,13 @@
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
       "value": "The precise behavior of any <MetadataFilter> element is controlled by the xsi:type attribute."
+    }, {
+      "id": "e4442dad-6000-49dd-96ca-85ea2a49e805",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
     }, {
       "id": "6f9ae687-770a-4932-bdc9-a33706a698b7",
       "comment": "",
@@ -1277,9 +1284,9 @@
       "id": "583b61c9-b021-452b-b488-1faf2be311b6",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(5) path:nth-child(1)",
+      "target": "css=.row:nth-child(6) .svg-inline--fa:nth-child(2)",
       "targets": [
-        ["css=.row:nth-child(5) path:nth-child(1)", "css:finder"]
+        ["css=.row:nth-child(6) .svg-inline--fa:nth-child(2)", "css:finder"]
       ],
       "value": ""
     }, {
@@ -1346,7 +1353,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Search Criteria by Entity ID"
+      "value": "The value used to search against, such as a regex pattern or entityID to match against."
     }, {
       "id": "6dc07848-bf6c-4468-8cb9-6434fb61098c",
       "comment": "",
@@ -1382,7 +1389,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Search Criteria by Regex"
+      "value": "The value used to search against, such as a regex pattern or entityID to match against."
     }, {
       "id": "0067cff3-9879-4a44-a6a1-70711255dc7c",
       "comment": "",
@@ -1418,7 +1425,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Search Criteria by Script"
+      "value": "The value used to search against, such as a regex pattern or entityID to match against."
     }, {
       "id": "cbfaac4f-35af-4014-b0a9-0748c9ae78f0",
       "comment": "",

From 0e9d686571e1e01f359b48f2fa1c691ff48441bf Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 16 Aug 2022 15:51:45 -0700
Subject: [PATCH 67/81] Fixed bug

Former-commit-id: 7286936de5d9dbf833c6781f5b81abfda28f8e24
---
 backend/src/main/resources/i18n/messages.properties            | 3 ++-
 ui/src/app/form/component/fields/FilterTargetField.js          | 2 +-
 .../domain/filter/definition/AlgorithmFilterDefinition.js      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 0a03daf3f..92f1edb6f 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -293,7 +293,7 @@ label.or=or
 label.name-and-upload-url=Name and Upload Url
 label.service-resolver-file=Select Provider Metadata File
 label.service-resolver-metadata-url=Service Provider Metadata URL
-label.search-criteria-by=The value used to search against, such as a regex pattern or entityID to match against.
+label.search-criteria-by=Search Criteria by { displayType }
 label.entity-ids-added=Entity Ids Added
 label.ui-mdui-info=User Interface / MDUI Information
 label.sp-sso-descriptor-info=SP SSO Descriptor Information
@@ -753,6 +753,7 @@ tooltip.external-description=A brief description of the purpose of this filter.
 
 label.algorithm=Algorithm
 tooltip.algorithm=Block encryption algorithms are designed for encrypting and decrypting data in fixed size, multiple octet blocks.
+tooltip.search-criteria-by=The value used to search against, such as a regex pattern or entityID to match against.
 
 value.algorithm-gcm-256=GCM (256) - http://www.w3.org/2009/xmlenc11#aes256-gcm
 value.algorithm-gcm-192=GCM (192) - http://www.w3.org/2009/xmlenc11#aes192-gcm
diff --git a/ui/src/app/form/component/fields/FilterTargetField.js b/ui/src/app/form/component/fields/FilterTargetField.js
index 59c6ab178..f78c522dd 100644
--- a/ui/src/app/form/component/fields/FilterTargetField.js
+++ b/ui/src/app/form/component/fields/FilterTargetField.js
@@ -171,7 +171,7 @@ const FilterTargetField = ({
                                 <i className="fa fa-asterisk text-danger" aria-hidden="true"></i>
                             </span>
                             <span>
-                                <InfoIcon value={translate('label.search-criteria-by', { displayType: translate(displayType) })}></InfoIcon>
+                                <InfoIcon value={translate('tooltip.search-criteria-by', { displayType: translate(displayType) })}></InfoIcon>
                             </span>
                         </label>
                         <div className="d-flex justify-content-between">
diff --git a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
index 5d19288fb..8b206b1c4 100644
--- a/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
+++ b/ui/src/app/metadata/domain/filter/definition/AlgorithmFilterDefinition.js
@@ -28,7 +28,7 @@ export const AlgorithmFilterWizard = {
 
         return (formData, errors) => {
             const errorList = base(formData, errors);
-            const { algorithms } = formData;
+            const { algorithms = [] } = formData;
 
             const dupes = algorithms.filter((item, index) => index !== algorithms.indexOf(item));
             

From 7c77d37c6b2477e9d140d5d76fe217ce4be49e87 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 17 Aug 2022 11:13:17 -0700
Subject: [PATCH 68/81] SHIBUI-2268

Resolving XML issue seeing a single resolver in XML


Former-commit-id: 7bf3afd17307e7d84d8f3faeaa34e28524a5eb0c
---
 .../JPAMetadataResolverServiceImpl.groovy     | 39 +++++++++++++++++++
 .../MetadataResolversController.java          | 17 ++++++++
 .../ui/service/MetadataResolverService.java   |  2 +
 3 files changed, 58 insertions(+)

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
index 2ac4ecafe..cc7bc869e 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -550,6 +550,45 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
         }
     }
 
+    @Override
+    Document generateSingleMetadataConfiguration(edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver mr) {
+        new StringWriter().withCloseable { writer ->
+            def xml = new MarkupBuilder(writer)
+            xml.omitEmptyAttributes = true
+            xml.omitNullAttributes = true
+
+            xml.MetadataProvider(id: 'ShibbolethIdPUIGeneratedMetadata',
+                    xmlns: 'urn:mace:shibboleth:2.0:metadata',
+                    'xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
+                    'xsi:type': 'ChainingMetadataProvider',
+                    'xsi:schemaLocation': 'urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd urn:mace:shibboleth:2.0:resource http://shibboleth.net/schema/idp/shibboleth-resource.xsd urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd urn:oasis:names:tc:SAML:2.0:assertion http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd'
+            ) {
+                // We do not currently marshall the internal incommon chaining resolver (with BaseMetadataResolver type)
+                // We do not want to include the custom type: ExternalMetadataResolver
+                if ((mr.type != 'BaseMetadataResolver') && (mr.type != 'ExternalMetadataResolver') && (mr.enabled)) {
+                    constructXmlNodeForResolver(mr, delegate) {
+                        //TODO: enhance
+                        def didNamespaceProtectionFilter = !(shibUIConfiguration.protectedAttributeNamespaces && shibUIConfiguration.protectedAttributeNamespaces.size() > 0)
+                        def doNamespaceProtectionFilter = { def filter ->
+                            if (mr.type in ['FileBackedMetadataResolver', 'DynamicHttpMetadataResolver'] && (filter == null || filter instanceof EntityAttributesFilter) && !didNamespaceProtectionFilter) {
+                                constructXmlNodeForEntityAttributeNamespaceProtection(delegate)
+                                didNamespaceProtectionFilter = true
+                            }
+                        }
+                        mr.metadataFilters.each { edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter filter ->
+                            if (filter.isFilterEnabled()) {
+                                doNamespaceProtectionFilter()
+                                constructXmlNodeForFilter(filter, delegate)
+                            }
+                        }
+                        doNamespaceProtectionFilter()
+                    }
+                }
+            }
+            return DOMBuilder.newInstance().parseText(writer.toString())
+        }
+    }
+
     @Override
     Document generateExternalMetadataFilterConfiguration() {
         // TODO: this can probably be a better writer
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
index 6a11f07a2..1b030ad74 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
@@ -35,6 +35,7 @@
 
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
@@ -102,6 +103,22 @@ public ResponseEntity<?> getXml() throws IOException, TransformerException {
         }
     }
 
+    @GetMapping(value = "/MetadataResolvers/{resourceId}", produces = "application/xml")
+    @Transactional(readOnly = true)
+    public ResponseEntity<?> getOneXml(@PathVariable String resourceId) throws TransformerException {
+        MetadataResolver resolver = resolverRepository.findByResourceId(resourceId);
+        if (resolver == null) {
+            return ResponseEntity.notFound().build();
+        }
+        StringWriter writer = new StringWriter();
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+
+        transformer.transform(new DOMSource(metadataResolverService.generateSingleMetadataConfiguration(resolver)), new StreamResult(writer));
+        return ResponseEntity.ok(writer.toString());
+    }
+
     @GetMapping(value = "/MetadataResolvers/External", produces = "application/xml")
     @Transactional(readOnly = true)
     public ResponseEntity<?> getExternalXml() throws IOException, TransformerException {
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverService.java
index d851cd021..6c921509e 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverService.java
@@ -14,6 +14,8 @@ public interface MetadataResolverService {
 
     public Document generateConfiguration();
 
+    public Document generateSingleMetadataConfiguration(MetadataResolver mr);
+
     public void reloadFilters(String metadataResolverName);
 
     public MetadataResolver updateMetadataResolverEnabledStatus(MetadataResolver existingResolver) throws ForbiddenException, MetadataFileNotFoundException, InitializationException;

From 33109f0156befd9dfd48eb20761979ffb6949f1f Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 17 Aug 2022 11:30:02 -0700
Subject: [PATCH 69/81] SHIBUI-2268

fixed test issue


Former-commit-id: df0b1a788e1534fcf18fa3b77970a7c328b33f53
---
 .../ui/controller/MetadataFiltersControllerTests.groovy      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy
index 82bee21b2..2820533e9 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy
@@ -90,6 +90,11 @@ class MetadataFiltersControllerTests extends AbstractBaseDataJpaTest {
                         return null
                     }
 
+                    @Override
+                    Document generateSingleMetadataConfiguration(MetadataResolver mr) {
+                        return null
+                    }
+
                     @Override
                     MetadataResolver updateMetadataResolverEnabledStatus(MetadataResolver existingResolver) throws ForbiddenException, MetadataFileNotFoundException, InitializationException {
                         // This won't get called

From d7ff6fa01e87513c49f9ca471b4f4e4f2151bfca Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 23 Aug 2022 14:02:35 -0700
Subject: [PATCH 70/81] SHIBUI-2270

SHIBUI-2354 fixing display issue for filter target type


Former-commit-id: b4f2c09836819c4de8f1c5e9b69a4f9a1bf7ebf1
---
 .../service/JPAMetadataResolverServiceImpl.groovy  |  2 +-
 .../ui/domain/filters/AlgorithmFilterTarget.java   | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
index cc7bc869e..ddd925e7c 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -114,7 +114,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 method.setAlgorithm(algValue)
                 mkp.yieldUnescaped(openSamlObjects.marshalToXmlString(method, false))
             }
-            switch (filter.algorithmFilterTarget.targetType) {
+            switch (filter.algorithmFilterTarget.algorithmFilterTargetType) {
                 case AlgorithmFilterTarget.AlgorithmFilterTargetType.ENTITY:
                     filter.algorithmFilterTarget.value.each {
                         Entity(it)
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/AlgorithmFilterTarget.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/AlgorithmFilterTarget.java
index 0b881a987..8a80dba6a 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/AlgorithmFilterTarget.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/AlgorithmFilterTarget.java
@@ -1,9 +1,12 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.filters;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable;
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.AbstractFilterTarget;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.envers.AuditOverride;
 import org.hibernate.envers.Audited;
@@ -17,15 +20,14 @@
 @AuditOverride(forClass = AbstractAuditable.class)
 @JsonIgnoreProperties({"handler", "hibernateLazyInitializer"})
 public class AlgorithmFilterTarget extends AbstractFilterTarget {
-    private AlgorithmFilterTargetType targetType;
+    @Getter
+    @Setter
+    private AlgorithmFilterTargetType algorithmFilterTargetType;
 
     @Override
+    @JsonIgnore
     public String getTargetTypeValue() {
-        return targetType == null ? "NONE" : targetType.name();
-    }
-
-    public void setAlgorithmFilterTargetType(AlgorithmFilterTargetType type) {
-        this.targetType = type;
+        return algorithmFilterTargetType == null ? "NONE" : algorithmFilterTargetType.name();
     }
 
     public enum AlgorithmFilterTargetType {

From 200a6e15757fdc714fff56e30b2a9890c66f1682 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Tue, 23 Aug 2022 21:55:42 -0400
Subject: [PATCH 71/81] SHIBUI-2268

Added CRUD test for algorithm filter.


Former-commit-id: 220714282853921573728dd491484eb9a18738da
---
 .../internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
index 363f1a06f..beb593a70 100644
--- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
+++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -157,6 +157,7 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1674: Verify metadata source tooltips'                      | '/SHIBUI-1674-1.side'
         'SHIBUI-1674: Verify metadata provider tooltips'                    | '/SHIBUI-1674-2.side'
         'SHIBUI-1674: Verify advanced menu tooltips'                        | '/SHIBUI-1674-3.side'
+        'SHIBUI-2268: Verify Algorithm Filter'                              | '/SHIBUI-2268.side'
         'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
     }
 }

From 68d6fb5a83079cd20e468c011aebb04a43e501b1 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 24 Aug 2022 07:14:41 -0700
Subject: [PATCH 72/81] Fixed label issue

Former-commit-id: 9e0a6512ebdfe62841fd8c0cc594c6e9638d009e
---
 ui/src/app/metadata/component/properties/PropertyValue.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/metadata/component/properties/PropertyValue.js b/ui/src/app/metadata/component/properties/PropertyValue.js
index 8e5beb226..ef2e89e59 100644
--- a/ui/src/app/metadata/component/properties/PropertyValue.js
+++ b/ui/src/app/metadata/component/properties/PropertyValue.js
@@ -14,7 +14,7 @@ export function PropertyValue ({ name, value, columns, className }) {
         { name && value !== null && value !== undefined  ? 
                 <OverlayTrigger trigger={['hover', 'focus']} placement="left" overlay={(
                     <Popover variant="info">
-                        <Popover.Body>{value.toString()}</Popover.Body>
+                        <Popover.Body><Translate value={value.toString()}>{value.toString()}</Translate></Popover.Body>
                     </Popover>
                 )}>
                 <span

From fbfb3f91f1b2c38094ef0f0bd667733c26da64a3 Mon Sep 17 00:00:00 2001
From: Bill Smith <wsmith@unicon.net>
Date: Wed, 24 Aug 2022 17:38:24 -0400
Subject: [PATCH 73/81] SHIBUI-2268

Added the selenium test SIDE file that I forgot to include in my
previous commit.


Former-commit-id: a62adb03bf6c594c5e737510dca34bb582f03716
---
 .../integration/resources/SHIBUI-2268.side    | 995 ++++++++++++++++++
 1 file changed, 995 insertions(+)
 create mode 100644 backend/src/integration/resources/SHIBUI-2268.side

diff --git a/backend/src/integration/resources/SHIBUI-2268.side b/backend/src/integration/resources/SHIBUI-2268.side
new file mode 100644
index 000000000..a9533b8c8
--- /dev/null
+++ b/backend/src/integration/resources/SHIBUI-2268.side
@@ -0,0 +1,995 @@
+{
+  "id": "1b31a551-eb09-4bd4-8db9-694bf1539a46",
+  "version": "2.0",
+  "name": "SHIBUI-2268",
+  "url": "http://localhost:10101",
+  "tests": [{
+    "id": "841ade0e-83bd-4a4b-94f2-de6bd5c536b2",
+    "name": "SHIBUI-2268",
+    "commands": [{
+      "id": "d6b23986-6d14-4b10-be7b-a7e6f576e3b2",
+      "comment": "",
+      "command": "open",
+      "target": "/login",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "f77ecd77-01c2-4463-944e-1a69600f5297",
+      "comment": "",
+      "command": "type",
+      "target": "name=username",
+      "targets": [
+        ["name=username", "name"],
+        ["css=tr:nth-child(1) input", "css:finder"],
+        ["xpath=//input[@name='username']", "xpath:attributes"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "admin"
+    }, {
+      "id": "c9bf0a22-faa9-494c-b2ed-6c9653248551",
+      "comment": "",
+      "command": "type",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "adminpass"
+    }, {
+      "id": "7ab1d854-3582-4101-bd19-f94b8f438090",
+      "comment": "",
+      "command": "sendKeys",
+      "target": "name=password",
+      "targets": [
+        ["name=password", "name"],
+        ["css=tr:nth-child(2) input", "css:finder"],
+        ["xpath=//input[@name='password']", "xpath:attributes"],
+        ["xpath=//tr[2]/td[2]/input", "xpath:position"]
+      ],
+      "value": "${KEY_ENTER}"
+    }, {
+      "id": "4059cae7-b9f9-49d0-a213-343bcaba66d1",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "f03af8d5-5875-4a2c-b93a-c3ddcbd4b16a",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "081f495b-4d84-4758-824c-1e85b6311e7f",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }, {
+      "id": "9e912dd5-6ace-45be-bafd-2d1655906575",
+      "comment": "",
+      "command": "open",
+      "target": "/",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "ad3811ad-f95b-4cca-a5d9-63a10063a652",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-toggle",
+      "targets": [
+        ["id=metadata-nav-dropdown-toggle", "id"],
+        ["css=#metadata-nav-dropdown-toggle", "css:finder"],
+        ["xpath=//button[@id='metadata-nav-dropdown-toggle']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/button", "xpath:idRelative"],
+        ["xpath=//div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add New')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "c47bd884-187f-4702-9a9d-0155cf2c61a0",
+      "comment": "",
+      "command": "click",
+      "target": "id=metadata-nav-dropdown-provider",
+      "targets": [
+        ["id=metadata-nav-dropdown-provider", "id"],
+        ["linkText=Add a new metadata provider", "linkText"],
+        ["css=#metadata-nav-dropdown-provider", "css:finder"],
+        ["xpath=//a[contains(text(),'Add a new metadata provider')]", "xpath:link"],
+        ["xpath=//a[@id='metadata-nav-dropdown-provider']", "xpath:attributes"],
+        ["xpath=//div[@id='metadata-nav-dropdown']/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/new')]", "xpath:href"],
+        ["xpath=//a[2]", "xpath:position"],
+        ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "14908519-6a02-48db-b35c-c31895bbc693",
+      "comment": "",
+      "command": "type",
+      "target": "name=name",
+      "targets": [
+        ["name=name", "name"],
+        ["css=.form-control", "css:finder"],
+        ["xpath=//input[@name='name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/form/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "FBHMR"
+    }, {
+      "id": "60f88cda-2d8a-4921-b712-9bfde45ae64d",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=FileBackedHttpMetadataResolver"
+    }, {
+      "id": "8f939d91-fb81-4cb6-a37e-3d6bbca9c2e7",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.label", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/nav/ul/li[2]/button/span", "xpath:idRelative"],
+        ["xpath=//li[2]/button/span", "xpath:position"],
+        ["xpath=//span[contains(.,'2. Common Attributes')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "a17b7150-4228-4301-a996-18eb930b553d",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_xmlId",
+      "targets": [
+        ["id=root_xmlId", "id"],
+        ["css=#root_xmlId", "css:finder"],
+        ["xpath=//input[@id='root_xmlId']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "1"
+    }, {
+      "id": "8fd7f246-f96f-40eb-b899-7dfda17b3113",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_metadataURL",
+      "targets": [
+        ["id=root_metadataURL", "id"],
+        ["css=#root_metadataURL", "css:finder"],
+        ["xpath=//input[@id='root_metadataURL']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div[2]/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/input", "xpath:position"]
+      ],
+      "value": "https://idp.unicon.net/idp/shibboleth"
+    }, {
+      "id": "a056da7c-811f-47b5-894f-fd110aac9ec5",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_backingFile",
+      "targets": [
+        ["id=root_backingFile", "id"],
+        ["css=#root_backingFile", "css:finder"],
+        ["xpath=//input[@id='root_backingFile']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div[4]/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/input", "xpath:position"]
+      ],
+      "value": "%{idp.home}/foo"
+    }, {
+      "id": "57bf7cfe-5677-4a44-ae97-afa123b56d17",
+      "comment": "",
+      "command": "click",
+      "target": "id=option-selector-root_backupFileInitNextRefreshDelay",
+      "targets": [
+        ["id=option-selector-root_backupFileInitNextRefreshDelay", "id"],
+        ["css=#option-selector-root_backupFileInitNextRefreshDelay", "css:finder"],
+        ["xpath=//input[@id='option-selector-root_backupFileInitNextRefreshDelay']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[2]/div[5]/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/input", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "2941c513-6f49-4681-af06-4e8cdb9916d2",
+      "comment": "",
+      "command": "click",
+      "target": "id=option-selector-items-root_backupFileInitNextRefreshDelay-item-2",
+      "targets": [
+        ["id=option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "id"],
+        ["linkText=PT30S", "linkText"],
+        ["css=#option-selector-items-root_backupFileInitNextRefreshDelay-item-2", "css:finder"],
+        ["xpath=//a[@id='option-selector-items-root_backupFileInitNextRefreshDelay-item-2']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-items-root_backupFileInitNextRefreshDelay']/a[3]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[3]", "xpath:href"],
+        ["xpath=//a[3]", "xpath:position"],
+        ["xpath=//a[contains(.,'PT30S')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "bef48138-60ec-44e5-b9f9-72ad9280edfb",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.label:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button/span", "xpath:idRelative"],
+        ["xpath=//li[3]/button/span", "xpath:position"],
+        ["xpath=//span[contains(.,'3. Reloading Attributes')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "2c6543c6-b4c6-42a8-8960-92955125635f",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.label:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button/span", "xpath:idRelative"],
+        ["xpath=//li[3]/button/span", "xpath:position"],
+        ["xpath=//span[contains(.,'4. Metadata Filter Plugins')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "f309e7b3-5379-45c3-9dc2-93c9a98f4d48",
+      "comment": "",
+      "command": "click",
+      "target": "css=.next",
+      "targets": [
+        ["css=.label:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/nav/ul/li[3]/button/span", "xpath:idRelative"],
+        ["xpath=//li[3]/button/span", "xpath:position"],
+        ["xpath=//span[contains(.,'5. Finished!')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "a844a1e3-61c3-4b09-9923-0dd29b1ae090",
+      "comment": "",
+      "command": "click",
+      "target": "css=.save",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "f49a10af-88be-447f-84a5-a47126158a72",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=FBHMR",
+      "targets": [
+        ["linkText=FBHMR", "linkText"],
+        ["css=.align-middle > a", "css:finder"],
+        ["xpath=//a[contains(text(),'FBHMR')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div[2]/div/div/div/table/tbody/tr/td[2]/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/b5adf5e8-a494-49c8-ae1b-5e9cb2e4acc4/configuration/options')]", "xpath:href"],
+        ["xpath=//td[2]/a", "xpath:position"],
+        ["xpath=//a[contains(.,'FBHMR')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "1cb419ae-3b96-486e-bb7d-326d6116b7f7",
+      "comment": "",
+      "command": "click",
+      "target": "css=.btn-link:nth-child(2)",
+      "targets": [
+        ["css=.btn-link:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='navigation']/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,' Filters')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "88556432-8cdb-4cd3-a933-28db3b7b1c8f",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Add Filter",
+      "targets": [
+        ["linkText=Add Filter", "linkText"],
+        ["css=#filters .btn", "css:finder"],
+        ["xpath=//div[@id='filters']/div/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/b5adf5e8-a494-49c8-ae1b-5e9cb2e4acc4/filter/new')]", "xpath:href"],
+        ["xpath=//div[3]/div/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,' Add Filter')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "60f8b3ce-19af-4369-9246-a81cf6b3728d",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=Algorithm"
+    }, {
+      "id": "54495332-08c2-4e37-8898-99346632de5b",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "id=root_name",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "dbf26501-319b-4a0e-9b94-a2b47a8a863c",
+      "comment": "",
+      "command": "type",
+      "target": "id=root_name",
+      "targets": [
+        ["id=root_name", "id"],
+        ["css=#root_name", "css:finder"],
+        ["xpath=//input[@id='root_name']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//input", "xpath:position"]
+      ],
+      "value": "Algorithm Test"
+    }, {
+      "id": "b89fdf2c-c5cc-468d-a88f-56fd752235df",
+      "comment": "",
+      "command": "type",
+      "target": "css=.rbt-input-main",
+      "targets": [
+        ["css=.rbt-input-main", "css:finder"],
+        ["xpath=//input[@value='foo']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div[2]/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div/div/input", "xpath:position"]
+      ],
+      "value": "foo"
+    }, {
+      "id": "450646dd-2c5f-4b55-ae70-0971f75cf1da",
+      "comment": "",
+      "command": "click",
+      "target": "css=.btn-success",
+      "targets": [
+        ["css=.btn-success", "css:finder"],
+        ["xpath=(//button[@type='button'])[19]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div[2]/div/div[2]/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div[2]/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add Entity ID  ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "3d3041ca-b6e4-45fd-8394-1f129e3ec160",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link:nth-child(2)",
+      "targets": [
+        ["css=.nav-link:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[10]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div/nav/button[2]", "xpath:idRelative"],
+        ["xpath=//nav/button[2]", "xpath:position"],
+        ["xpath=//button[contains(.,'Options')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "f69c47c5-cea9-4a01-9388-6e03279db488",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "0e591beb-3feb-4a0f-9746-0d77487ab083",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_algorithms_0",
+      "targets": [
+        ["id=root_algorithms_0", "id"],
+        ["css=#root_algorithms_0", "css:finder"],
+        ["xpath=//select[@id='root_algorithms_0']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div[2]/div/div/div/div/div/div/select", "xpath:idRelative"],
+        ["xpath=//div/div/select", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "cf2b807b-4c0a-4a23-aeda-3b7865de2b96",
+      "comment": "",
+      "command": "select",
+      "target": "id=root_algorithms_0",
+      "targets": [],
+      "value": "label=GCM (256) - http://www.w3.org/2009/xmlenc11#aes256-gcm"
+    }, {
+      "id": "fe50f455-a2c5-492a-900c-41b2c4a4373b",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "e5789dd9-8e03-4eda-be7d-32d495b8d4a5",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_algorithms_1",
+      "targets": [
+        ["id=root_algorithms_1", "id"],
+        ["css=#root_algorithms_1", "css:finder"],
+        ["xpath=//select[@id='root_algorithms_1']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div[2]/div[2]/div/div/div/div/div/select", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/div/div/div/select", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "0fb47623-654b-4dd1-8b03-d273cba16502",
+      "comment": "",
+      "command": "select",
+      "target": "id=root_algorithms_1",
+      "targets": [],
+      "value": "label=GCM (192) - http://www.w3.org/2009/xmlenc11#aes192-gcm"
+    }, {
+      "id": "579e8683-e6a9-4630-92ae-8d61885d355f",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "27c7a598-679e-450a-a71a-ecdc258ad45c",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_algorithms_2",
+      "targets": [
+        ["id=root_algorithms_2", "id"],
+        ["css=#root_algorithms_2", "css:finder"],
+        ["xpath=//select[@id='root_algorithms_2']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div[2]/div[3]/div/div/div/div/div/select", "xpath:idRelative"],
+        ["xpath=//div[3]/div/div/div/div/div/select", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "7498fe45-5fda-49c1-bca7-2f4954346fae",
+      "comment": "",
+      "command": "select",
+      "target": "id=root_algorithms_2",
+      "targets": [],
+      "value": "label=GCM (128) - http://www.w3.org/2009/xmlenc11#aes128-gcm"
+    }, {
+      "id": "d777d547-3614-4a3c-99c6-dcffffea4400",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "e1145572-f207-415e-8908-500bf348e750",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_algorithms_3",
+      "targets": [
+        ["id=root_algorithms_3", "id"],
+        ["css=#root_algorithms_3", "css:finder"],
+        ["xpath=//select[@id='root_algorithms_3']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/select", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/select", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "d4bb89e3-f855-4ca3-9ea3-941e93219a29",
+      "comment": "",
+      "command": "select",
+      "target": "id=root_algorithms_3",
+      "targets": [],
+      "value": "label=CBC (256) - http://www.w3.org/2001/04/xmlenc#aes256-cbc"
+    }, {
+      "id": "b8b5241d-0712-469c-aaec-bbaf0db9ec39",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "f4b10a72-9ef4-465f-9c3c-39a8e555a748",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_algorithms_4",
+      "targets": [
+        ["id=root_algorithms_4", "id"],
+        ["css=#root_algorithms_4", "css:finder"],
+        ["xpath=//select[@id='root_algorithms_4']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/select", "xpath:idRelative"],
+        ["xpath=//div[5]/div/div/div/div/div/select", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "03ed33bd-f797-4608-83bd-ff328054cd94",
+      "comment": "",
+      "command": "select",
+      "target": "id=root_algorithms_4",
+      "targets": [],
+      "value": "label=CBC (192) - http://www.w3.org/2001/04/xmlenc#aes192-cbc"
+    }, {
+      "id": "209015c5-5aef-448b-b297-6c1269f3c6e3",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "2085d727-c9fc-42cd-a233-4fad48a20e78",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_algorithms_5",
+      "targets": [
+        ["id=root_algorithms_5", "id"],
+        ["css=#root_algorithms_5", "css:finder"],
+        ["xpath=//select[@id='root_algorithms_5']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div[2]/div[6]/div/div/div/div/div/select", "xpath:idRelative"],
+        ["xpath=//div[6]/div/div/div/div/div/select", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "537feda7-72d7-4fd6-b680-c733f3577a54",
+      "comment": "",
+      "command": "select",
+      "target": "id=root_algorithms_5",
+      "targets": [],
+      "value": "label=CBC (128) - http://www.w3.org/2001/04/xmlenc#aes128-cbc"
+    }, {
+      "id": "ad4084f8-cb8c-46e1-b949-c55ae8d6498c",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "cfbf52c7-4303-40d1-bf43-4bd4abb23785",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_algorithms_6",
+      "targets": [
+        ["id=root_algorithms_6", "id"],
+        ["css=#root_algorithms_6", "css:finder"],
+        ["xpath=//select[@id='root_algorithms_6']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div[2]/div[7]/div/div/div/div/div/select", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/select", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "8053bff4-b13f-48c6-9c50-ce94a2c12789",
+      "comment": "",
+      "command": "select",
+      "target": "id=root_algorithms_6",
+      "targets": [],
+      "value": "label=CBC (TRIPLEDES) - http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
+    }, {
+      "id": "6ba09b16-4bc5-4609-87fe-4f481e9dbe60",
+      "comment": "",
+      "command": "click",
+      "target": "css=.array-add-button",
+      "targets": [
+        ["css=.array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[11]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "1aab279c-5db0-4cee-8049-1d3dd7705210",
+      "comment": "",
+      "command": "click",
+      "target": "id=root_algorithms_7",
+      "targets": [
+        ["id=root_algorithms_7", "id"],
+        ["css=#root_algorithms_7", "css:finder"],
+        ["xpath=//select[@id='root_algorithms_7']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div[2]/div[8]/div/div/div/div/div/select", "xpath:idRelative"],
+        ["xpath=//div[8]/div/div/div/div/div/select", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "6041d01a-8271-4768-8df7-7503de2e4999",
+      "comment": "",
+      "command": "select",
+      "target": "id=root_algorithms_7",
+      "targets": [],
+      "value": "label=CBC (192) - http://www.w3.org/2001/04/xmlenc#aes192-cbc"
+    }, {
+      "id": "ccc82782-8d9c-4a5c-bde3-180bce9e0267",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.border-0 > .m-0",
+      "targets": [
+        ["css=.border-0 > .m-0", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div/div[2]/div[8]/div/div/div/div/div/ul/li/small", "xpath:idRelative"],
+        ["xpath=//small", "xpath:position"],
+        ["xpath=//small[contains(.,'Each algorithm may only be used once.')]", "xpath:innerText"]
+      ],
+      "value": "Each algorithm may only be used once."
+    }, {
+      "id": "dffd83ae-108a-4cf1-87bf-3de8e4ecb2a1",
+      "comment": "",
+      "command": "click",
+      "target": "css=.mt-2:nth-child(8) path",
+      "targets": [
+        ["css=.mt-2:nth-child(8) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "0d6e43e3-88b7-4e90-b4bf-88bc662cc43f",
+      "comment": "",
+      "command": "click",
+      "target": "css=.btn-info",
+      "targets": [
+        ["css=.btn-info", "css:finder"],
+        ["xpath=(//button[@type='button'])[7]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div/div[2]/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,' Save')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "089770b5-dcc0-4857-966b-a9b855e8a3da",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=div:nth-child(2) > div:nth-child(1) > .d-flex > .text-truncate",
+      "targets": [
+        ["css=div:nth-child(2) > div:nth-child(1) > .d-flex > .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div/span[2]", "xpath:position"]
+      ],
+      "value": "30000"
+    }, {
+      "id": "fe9a428a-7940-46b2-8433-1630e62bf4c5",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div:nth-child(2) > div:nth-child(1) > .d-flex > .text-truncate",
+      "targets": [],
+      "value": "FBHMR"
+    }, {
+      "id": "0bba7bb6-ced5-482b-bd5a-5cd23f498c0d",
+      "comment": "",
+      "command": "click",
+      "target": "css=div:nth-child(1) > .btn:nth-child(2)",
+      "targets": [
+        ["css=div:nth-child(1) > .btn:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='navigation']/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,' Filters')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "2bd19215-f9e2-4acc-a224-575998285a28",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=.mx-4",
+      "targets": [],
+      "value": "30000"
+    }, {
+      "id": "96fc373a-b871-4307-adeb-fdab78d464a0",
+      "comment": "",
+      "command": "click",
+      "target": "css=.mx-4",
+      "targets": [
+        ["css=.mx-4", "css:finder"],
+        ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
+        ["xpath=//div[@id='filters']/ul/li/div/button", "xpath:idRelative"],
+        ["xpath=//li/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Algorithm Test')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "fced2579-7ff3-40f6-893f-8208370e8b2c",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div:nth-child(2) > .mb-4 .p-2 > div > div:nth-child(1) .d-block:nth-child(2)",
+      "targets": [
+        ["css=div:nth-child(2) > .mb-4 .p-2 > div > div:nth-child(1) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section/div/div[2]/div[2]/div/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[2]/section/div/div[2]/div[2]/div/div/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'Algorithm Test')]", "xpath:innerText"]
+      ],
+      "value": "Algorithm Test"
+    }, {
+      "id": "900af1be-bb32-4052-9290-b8b4a73f0717",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.d-flex:nth-child(1) > .list-unstyled > .d-flex:nth-child(1) > .d-block",
+      "targets": [
+        ["css=.d-flex:nth-child(1) > .list-unstyled > .d-flex:nth-child(1) > .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/ul/li/span", "xpath:idRelative"],
+        ["xpath=//div[2]/div/ul/li/span", "xpath:position"],
+        ["xpath=//span[contains(.,'http://www.w3.org/2009/xmlenc11#aes256-gcm')]", "xpath:innerText"]
+      ],
+      "value": "http://www.w3.org/2009/xmlenc11#aes256-gcm"
+    }, {
+      "id": "3d622935-40af-4807-8843-1d71605ef480",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.d-flex:nth-child(2) > .d-block",
+      "targets": [
+        ["css=.d-flex:nth-child(2) > .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/ul/li[2]/span", "xpath:idRelative"],
+        ["xpath=//ul/li[2]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'http://www.w3.org/2009/xmlenc11#aes192-gcm')]", "xpath:innerText"]
+      ],
+      "value": "http://www.w3.org/2009/xmlenc11#aes192-gcm"
+    }, {
+      "id": "12dfe6bb-acb1-4f9f-acb0-00e244ca3ac3",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.d-flex:nth-child(3) > .d-block",
+      "targets": [
+        ["css=.d-flex:nth-child(3) > .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/ul/li[3]/span", "xpath:idRelative"],
+        ["xpath=//li[3]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'http://www.w3.org/2009/xmlenc11#aes128-gcm')]", "xpath:innerText"]
+      ],
+      "value": "http://www.w3.org/2009/xmlenc11#aes128-gcm"
+    }, {
+      "id": "47bf69fa-e126-4c06-b9ae-504d09a0d37b",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.d-flex:nth-child(4) > .d-block",
+      "targets": [
+        ["css=.d-flex:nth-child(4) > .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/ul/li[4]/span", "xpath:idRelative"],
+        ["xpath=//li[4]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'http://www.w3.org/2001/04/xmlenc#aes256-cbc')]", "xpath:innerText"]
+      ],
+      "value": "http://www.w3.org/2001/04/xmlenc#aes256-cbc"
+    }, {
+      "id": "223043f1-e31c-4019-b68f-d654f3fea9b0",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.d-flex:nth-child(5) > .d-block",
+      "targets": [
+        ["css=.d-flex:nth-child(5) > .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/ul/li[5]/span", "xpath:idRelative"],
+        ["xpath=//li[5]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'http://www.w3.org/2001/04/xmlenc#aes192-cbc')]", "xpath:innerText"]
+      ],
+      "value": "http://www.w3.org/2001/04/xmlenc#aes192-cbc"
+    }, {
+      "id": "2ecdc8fe-d63d-48e8-bcdf-eb675cd8912f",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.d-flex:nth-child(6) > .d-block",
+      "targets": [
+        ["css=.d-flex:nth-child(6) > .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/ul/li[6]/span", "xpath:idRelative"],
+        ["xpath=//li[6]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'http://www.w3.org/2001/04/xmlenc#aes128-cbc')]", "xpath:innerText"]
+      ],
+      "value": "http://www.w3.org/2001/04/xmlenc#aes128-cbc"
+    }, {
+      "id": "8c87d87e-6b09-456e-806b-1d69dc9b2cc8",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.d-flex:nth-child(7) > .d-block",
+      "targets": [
+        ["css=.d-flex:nth-child(7) > .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/ul/li[7]/span", "xpath:idRelative"],
+        ["xpath=//li[7]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'http://www.w3.org/2001/04/xmlenc#tripledes-cbc')]", "xpath:innerText"]
+      ],
+      "value": "http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
+    }, {
+      "id": "79f7ca40-090b-485f-a220-9e43728f4bc1",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.d-flex:nth-child(1) > .p-2",
+      "targets": [
+        ["css=.d-flex:nth-child(1) > .p-2", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/span", "xpath:idRelative"],
+        ["xpath=//section[2]/div/div[2]/div[2]/div/span", "xpath:position"]
+      ],
+      "value": "Algorithm"
+    }, {
+      "id": "8e4fb6e0-618b-46f2-934b-8bf474615815",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=div:nth-child(4) > div:nth-child(1) > .d-flex > .text-truncate",
+      "targets": [
+        ["css=div:nth-child(4) > div:nth-child(1) > .d-flex > .text-truncate", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section/div/div[2]/div[2]/div[3]/div/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div[2]/div[3]/div/div/span[2]", "xpath:position"],
+        ["xpath=//span[contains(.,'Entity ID')]", "xpath:innerText"]
+      ],
+      "value": "Entity ID"
+    }, {
+      "id": "3d1b105b-9dec-40f4-802e-b5a3ddcbc2fc",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Edit",
+      "targets": [
+        ["linkText=Edit", "linkText"],
+        ["css=.d-flex:nth-child(1) > .btn:nth-child(1)", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/div/div/a", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/66d0dbbb-4049-4584-8a6f-17707dc2a8d1/filter/62ffb91c-9af1-466b-83ac-307f21c0cebd/edit/common')]", "xpath:href"],
+        ["xpath=//div[2]/div/div/a", "xpath:position"],
+        ["xpath=//a[contains(.,' Edit')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "bfd501c9-e06c-4dd5-ad25-60b21fca1eb1",
+      "comment": "",
+      "command": "click",
+      "target": "css=.nav-link:nth-child(2)",
+      "targets": [
+        ["css=.nav-link:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div/nav/button[2]", "xpath:idRelative"],
+        ["xpath=//nav/button[2]", "xpath:position"],
+        ["xpath=//button[contains(.,'Options')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "493533af-c18e-46f6-b7df-82f7c3aa548e",
+      "comment": "",
+      "command": "click",
+      "target": "css=.mt-2:nth-child(7) path",
+      "targets": [
+        ["css=.mt-2:nth-child(7) path", "css:finder"]
+      ],
+      "value": ""
+    }, {
+      "id": "cfc916c7-80a6-4cdc-b2c0-2425b168bcc4",
+      "comment": "",
+      "command": "click",
+      "target": "css=.btn-info",
+      "targets": [
+        ["css=.btn-info", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div[2]/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,' Save')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "269c4acd-2e59-4f76-816c-9a7f06b4ce87",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=div:nth-child(2) > div:nth-child(1) > .d-flex > .text-truncate",
+      "targets": [
+        ["css=div:nth-child(2) > div:nth-child(1) > .d-flex > .text-truncate", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section/div/div[2]/div[2]/div/div/span[2]", "xpath:idRelative"],
+        ["xpath=//div/span[2]", "xpath:position"]
+      ],
+      "value": "30000"
+    }, {
+      "id": "40fb10d5-231f-4d1a-8891-c4f48ea2c1b6",
+      "comment": "",
+      "command": "click",
+      "target": "css=div:nth-child(1) > .btn:nth-child(2)",
+      "targets": [
+        ["css=div:nth-child(1) > .btn:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[6]", "xpath:attributes"],
+        ["xpath=//div[@id='navigation']/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,' Filters')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "e26e03eb-f01c-433c-aa19-683f1887c472",
+      "comment": "",
+      "command": "click",
+      "target": "css=.mx-4",
+      "targets": [
+        ["css=.mx-4", "css:finder"],
+        ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
+        ["xpath=//div[@id='filters']/ul/li/div/button", "xpath:idRelative"],
+        ["xpath=//li/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Algorithm Test')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "10fbd6c4-804a-4bcc-866b-7bf221ffa266",
+      "comment": "",
+      "command": "assertElementNotPresent",
+      "target": "css=.d-flex:nth-child(7) > .d-block",
+      "targets": [
+        ["css=.d-flex:nth-child(7) > .d-block", "css:finder"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/section[2]/div/div[2]/div[2]/div/ul/li[7]/span", "xpath:idRelative"],
+        ["xpath=//li[7]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'http://www.w3.org/2001/04/xmlenc#tripledes-cbc')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "6af1cc94-05df-47db-8672-d078928260ed",
+      "comment": "",
+      "command": "click",
+      "target": "css=.justify-content-end .btn:nth-child(2)",
+      "targets": [
+        ["css=.justify-content-end .btn:nth-child(2)", "css:finder"],
+        ["xpath=(//button[@type='button'])[14]", "xpath:attributes"],
+        ["xpath=//div[@id='filters']/ul/li/div[2]/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[2]/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,' Delete')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "b44418d1-ed8c-4199-92a6-4b130bfe2cb2",
+      "comment": "",
+      "command": "click",
+      "target": "css=.btn-danger",
+      "targets": [
+        ["css=.btn-danger", "css:finder"],
+        ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
+        ["xpath=//div[4]/div/div/div[3]/button", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "6cd2789b-4ec1-4153-8d4e-fb896a1b0e5e",
+      "comment": "",
+      "command": "click",
+      "target": "css=.align-items-end",
+      "targets": [
+        ["css=.align-items-end", "css:finder"],
+        ["xpath=//div[@id='root']/div/footer/div/div[2]/div", "xpath:idRelative"],
+        ["xpath=//footer/div/div[2]/div", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "b9432398-233d-4872-8b56-9aa8fd48ca85",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=.alert",
+      "targets": [],
+      "value": "No FiltersNo filters have been added to this Metadata Provider"
+    }, {
+      "id": "3543733a-3e14-4f07-9aaa-e29a26fe36b1",
+      "comment": "",
+      "command": "open",
+      "target": "/api/heheheheheheheWipeout",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "da1edae7-e865-404e-971c-37bdb13c2845",
+      "comment": "",
+      "command": "assertText",
+      "target": "css=body",
+      "targets": [],
+      "value": "yes, you did it"
+    }]
+  }],
+  "suites": [{
+    "id": "d2caeac4-7520-4e3c-96b1-840610b6983c",
+    "name": "Default Suite",
+    "persistSession": false,
+    "parallel": false,
+    "timeout": 300,
+    "tests": ["841ade0e-83bd-4a4b-94f2-de6bd5c536b2"]
+  }],
+  "urls": ["http://localhost:10101/"],
+  "plugins": []
+}
\ No newline at end of file

From 13f25caef98ec265f6ccb36042bd8b86441c8687 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Thu, 25 Aug 2022 08:52:34 -0700
Subject: [PATCH 74/81] NOJIRA

fixing display issue for external metadata filter


Former-commit-id: f65419f5cda81577edbd0c08bc5c902b9a3e93be
---
 .../admin/ui/service/JPAMetadataResolverServiceImpl.groovy     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
index ddd925e7c..bb86a1915 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -552,6 +552,9 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
 
     @Override
     Document generateSingleMetadataConfiguration(edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver mr) {
+        if (mr instanceof ExternalMetadataResolver) {
+            return generateExternalMetadataFilterConfiguration();
+        }
         new StringWriter().withCloseable { writer ->
             def xml = new MarkupBuilder(writer)
             xml.omitEmptyAttributes = true

From 4a1c3bf4631565eb2a335bc54d3cd9d09f72f396 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 26 Aug 2022 14:34:59 -0700
Subject: [PATCH 75/81]  [Gradle Release Plugin] - pre tag commit:  '1.12.0'.

Former-commit-id: 21f5c8c21c6ab86303d96accb72a220f0a5b2903
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7efe1ae08..da3a66a9f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.12.0-SNAPSHOT
+version=1.12.0
 
 ### library versions ###
 commonsCollections4Version=4.4

From 614fede64265373af57d71e71a089f29d2e812a3 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 26 Aug 2022 15:35:42 -0700
Subject: [PATCH 76/81] NOJIRA

change to version to snapshot


Former-commit-id: 6dc0b7df54c91ba9a9eae53aa99eaf99c6eafdbf
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index da3a66a9f..7efe1ae08 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.12.0
+version=1.12.0-SNAPSHOT
 
 ### library versions ###
 commonsCollections4Version=4.4

From cdfc34977dc2bc40132418709ab654c586b60e14 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 26 Aug 2022 15:51:32 -0700
Subject: [PATCH 77/81]  [Gradle Release Plugin] - pre tag commit:  '1.12.0'.

Former-commit-id: d23265d0c394f490dc81d563be38f07437123bb6
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7efe1ae08..da3a66a9f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.12.0-SNAPSHOT
+version=1.12.0
 
 ### library versions ###
 commonsCollections4Version=4.4

From 3e9d0710a1c1e378474f154f34cfcee9475b2982 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 26 Aug 2022 15:56:33 -0700
Subject: [PATCH 78/81] NOJIRA

change to version to snapshot


Former-commit-id: 27410d2c775443d069663268dbcc5394e3303794
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index da3a66a9f..7efe1ae08 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.12.0
+version=1.12.0-SNAPSHOT
 
 ### library versions ###
 commonsCollections4Version=4.4

From a289a963b5d691172ace311d573b2ccd5c66018c Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 26 Aug 2022 16:26:50 -0700
Subject: [PATCH 79/81]  [Gradle Release Plugin] - pre tag commit:  '1.12.0'.

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7efe1ae08..da3a66a9f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.12.0-SNAPSHOT
+version=1.12.0
 
 ### library versions ###
 commonsCollections4Version=4.4

From 6112bc4ffedbe837e65c2b3a2c591c7b3bc147a5 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 26 Aug 2022 18:25:34 -0700
Subject: [PATCH 80/81] NOJIRA

change to version to snapshot
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index da3a66a9f..7efe1ae08 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.12.0
+version=1.12.0-SNAPSHOT
 
 ### library versions ###
 commonsCollections4Version=4.4

From 949d9538652662d9ecbfec6f4fdfdc5732a78acc Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 26 Aug 2022 18:35:08 -0700
Subject: [PATCH 81/81]  [Gradle Release Plugin] - pre tag commit:  '1.12.0'.

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 7efe1ae08..da3a66a9f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 name=shibui
 group=edu.internet2.tier.shibboleth.admin.ui
-version=1.12.0-SNAPSHOT
+version=1.12.0
 
 ### library versions ###
 commonsCollections4Version=4.4