From b59210971fcaba732408f16edabd75263ca665be Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Tue, 24 Jul 2018 12:03:43 -0400
Subject: [PATCH 01/39] WIP1

---
 .../resolvers/MetadataResolversOrderContainer.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversOrderContainer.java

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversOrderContainer.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversOrderContainer.java
new file mode 100644
index 000000000..5b5d0d87f
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversOrderContainer.java
@@ -0,0 +1,14 @@
+package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers;
+
+/**
+ * This is a persistent entity abstraction encapsulating a collection of metadata resolver ids
+ * for the purpose of maintaining an order of all persistent metadata resolvers which becomes significant during
+ * generation of XML metadata for the resolvers.
+ *
+ * Maintaining this separate entity enables UI layer for example to explicitly manipulate ordering e.g. use REST
+ * API to reorder resolvers, etc.
+ *
+ * @author Dmitriy
+ */
+public class MetadataResolversOrderContainer {
+}

From ed1a7ea6da17ec48617930b555c0b229394d00b2 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Tue, 24 Jul 2018 15:48:45 -0400
Subject: [PATCH 02/39] SHIBUI-645: WIP

---
 ...tadataResolversPositionOrderContainer.java | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java
new file mode 100644
index 000000000..63d62881a
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java
@@ -0,0 +1,42 @@
+package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers;
+
+import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.OrderColumn;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This is a persistent entity abstraction encapsulating a collection of metadata resolver ids
+ * for the purpose of maintaining an order of all persistent metadata resolvers which becomes significant during
+ * generation of XML metadata for the resolvers.
+ *
+ * Maintaining this separate entity enables UI layer for example to explicitly manipulate ordering e.g. use REST
+ * API to reorder resolvers, etc.
+ *
+ * @author Dmitriy Kopylenko
+ */
+@Entity
+@EqualsAndHashCode
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+public class MetadataResolversPositionOrderContainer extends AbstractAuditable {
+
+    @ElementCollection
+    @CollectionTable(name="METADATA_RESOLVER_POSITION_ORDER", joinColumns=@JoinColumn(name="METADATA_RESOLVER_POSITION_ORDER_CONTAINER_ID"))
+    @Column(name="METADATA_RESOLVER_RESOURCE_ID")
+    @OrderColumn
+    private List<String> resourceIds = new ArrayList<>();
+}

From 9a9a50648075692d23303fba5e1a39b03e7f8a3e Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Tue, 24 Jul 2018 15:48:56 -0400
Subject: [PATCH 03/39] SHIBUI-645: WIP

---
 ...olversPositionOrderContainerRepository.java | 13 +++++++++++++
 ...ResolversPositionOrderContainerService.java | 18 ++++++++++++++++++
 ...ResolversPositionOrderContainerService.java | 17 +++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolversPositionOrderContainerRepository.java
 create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
 create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolversPositionOrderContainerRepository.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolversPositionOrderContainerRepository.java
new file mode 100644
index 000000000..6afe35ded
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolversPositionOrderContainerRepository.java
@@ -0,0 +1,13 @@
+package edu.internet2.tier.shibboleth.admin.ui.repository;
+
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer;
+import org.springframework.data.repository.CrudRepository;
+
+/**
+ * Spring Data Repository API for persistence operations on instances of {@link MetadataResolversPositionOrderContainer}.
+ *
+ * @author Dmitriy Kopylenko
+ */
+public interface MetadataResolversPositionOrderContainerRepository
+        extends CrudRepository<MetadataResolversPositionOrderContainer, Long> {
+}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
new file mode 100644
index 000000000..bfbe70e0d
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
@@ -0,0 +1,18 @@
+package edu.internet2.tier.shibboleth.admin.ui.service;
+
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer;
+
+import java.util.Optional;
+
+public class DefaultMetadataResolversPositionOrderContainerService implements MetadataResolversPositionOrderContainerService {
+
+    @Override
+    public Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists() {
+        return Optional.empty();
+    }
+
+    @Override
+    public void persistPositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer) {
+
+    }
+}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
new file mode 100644
index 000000000..52ffaeba1
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
@@ -0,0 +1,17 @@
+package edu.internet2.tier.shibboleth.admin.ui.service;
+
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer;
+
+import java.util.Optional;
+
+/**
+ * Service interface for manipulation of instances of {@link MetadataResolversPositionOrderContainer}.
+ *
+ * @author Dmitriy Kopylenko
+ */
+public interface MetadataResolversPositionOrderContainerService {
+
+    Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists();
+
+    void persistPositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer);
+}

From 017746cfc310f0766ada3da2979d316e8482c971 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 25 Jul 2018 10:42:12 -0400
Subject: [PATCH 04/39] SHIBUI-645: Implement ordering SPI

---
 .../JPAMetadataResolverServiceImpl.groovy     | 10 +++-
 .../CoreShibUiConfiguration.java              | 13 +++++
 ...esolversPositionOrderContainerService.java | 42 +++++++++++++--
 ...esolversPositionOrderContainerService.java | 12 +++--
 ...sPositionOrderContainerServiceTests.groovy | 53 +++++++++++++++++++
 5 files changed, 121 insertions(+), 9 deletions(-)
 create mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerServiceTests.groovy

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 b60c9b0c8..f63dbad31 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
@@ -43,6 +43,9 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
     @Autowired
     private OpenSamlObjects openSamlObjects
 
+    @Autowired
+    private MetadataResolversPositionOrderContainerService resolversPositionOrderContainerService
+
     // TODO: enhance
     @Override
     void reloadFilters(String metadataResolverName) {
@@ -98,8 +101,11 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                     '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'
             ) {
-                metadataResolverRepository.findAll().each { edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver mr ->
-                    //TODO: We cannot/do not currently have the code to marshall the internal incommon chaining resolver
+
+
+                resolversPositionOrderContainerService.allMetadataResolversInDefinedOrderOrUnordered.each {
+                    edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver mr ->
+                    //TODO: We do not currently marshall the internal incommon chaining resolver (with BaseMetadataResolver type)
                     if ((mr.type != 'BaseMetadataResolver') && (mr.enabled)) {
                         constructXmlNodeForResolver(mr, delegate) {
                             MetadataFilter(
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java
index ca7be77ea..c630752f8 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java
@@ -1,8 +1,11 @@
 package edu.internet2.tier.shibboleth.admin.ui.configuration;
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityIdsSearchResultRepresentation;
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer;
 import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects;
 import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository;
+import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
+import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository;
 import edu.internet2.tier.shibboleth.admin.ui.scheduled.EntityDescriptorFilesScheduledTasks;
 import edu.internet2.tier.shibboleth.admin.ui.service.*;
 import edu.internet2.tier.shibboleth.admin.util.AttributeUtility;
@@ -162,4 +165,14 @@ public void addInterceptors(InterceptorRegistry registry) {
             }
         };
     }
+
+    @Bean
+    public MetadataResolversPositionOrderContainerService
+        metadataResolversPositionOrderContainerService(MetadataResolversPositionOrderContainerRepository
+                                                               positionOrderContainerRepository,
+                                                       MetadataResolverRepository resolverRepository) {
+
+        return new DefaultMetadataResolversPositionOrderContainerService(positionOrderContainerRepository, resolverRepository);
+
+    }
 }
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
index bfbe70e0d..7e1e63396 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
@@ -1,18 +1,54 @@
 package edu.internet2.tier.shibboleth.admin.ui.service;
 
+import com.google.common.collect.Lists;
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver;
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer;
+import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
+import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
+import static java.util.stream.Collectors.toList;
+
+
 public class DefaultMetadataResolversPositionOrderContainerService implements MetadataResolversPositionOrderContainerService {
 
-    @Override
-    public Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists() {
-        return Optional.empty();
+    private MetadataResolversPositionOrderContainerRepository positionOrderContainerRepository;
+
+    private MetadataResolverRepository metadataResolverRepository;
+
+    public DefaultMetadataResolversPositionOrderContainerService(MetadataResolversPositionOrderContainerRepository positionOrderRepository,
+                                                                 MetadataResolverRepository metadataResolverRepository) {
+        this.positionOrderContainerRepository = positionOrderRepository;
+        this.metadataResolverRepository = metadataResolverRepository;
     }
 
     @Override
+    @Transactional
     public void persistPositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer) {
+        positionOrderContainerRepository.save(metadataResolversPositionOrderContainer);
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered() {
+        Optional<MetadataResolversPositionOrderContainer> orderContainer = getPositionOrderContainerIfExists();
+        if(orderContainer.isPresent()) {
+            return orderContainer.get().getResourceIds()
+                    .stream()
+                    .map(metadataResolverRepository::findByResourceId)
+                    .collect(toList());
+        }
+
+        return Lists.newArrayList(metadataResolverRepository.findAll());
+    }
 
+    private Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists() {
+        return positionOrderContainerRepository.findAll().iterator().hasNext()
+                ? Optional.of(positionOrderContainerRepository.findAll().iterator().next())
+                : Optional.empty();
     }
 }
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
index 52ffaeba1..d3e3da40f 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
@@ -1,17 +1,21 @@
 package edu.internet2.tier.shibboleth.admin.ui.service;
 
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver;
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer;
 
-import java.util.Optional;
+import java.util.List;
 
 /**
- * Service interface for manipulation of instances of {@link MetadataResolversPositionOrderContainer}.
+ * Service interface for manipulation of instances of {@link MetadataResolversPositionOrderContainer} and
+ * encapsulate MetadataResolvers ordering logic.
  *
  * @author Dmitriy Kopylenko
  */
 public interface MetadataResolversPositionOrderContainerService {
 
-    Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists();
-
     void persistPositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer);
+
+    List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered();
+
+
 }
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerServiceTests.groovy
new file mode 100644
index 000000000..de4af7e8e
--- /dev/null
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerServiceTests.groovy
@@ -0,0 +1,53 @@
+package edu.internet2.tier.shibboleth.admin.ui.service
+
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer
+import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
+import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository
+import spock.lang.Specification
+import spock.lang.Subject
+
+/**
+ * @author Dmitriy Kopylenko
+ */
+class MetadataResolversPositionOrderContainerServiceTests extends Specification {
+
+    def "no order container has been provided and saved, so using unordered persisted resolvers"() {
+        given:
+        def resolverRepo = Mock(MetadataResolverRepository)
+        resolverRepo.findAll() >> [new MetadataResolver(resourceId: 'second'), new MetadataResolver(resourceId: 'first')]
+        def positionOrderRepo = Mock(MetadataResolversPositionOrderContainerRepository)
+        positionOrderRepo.findAll() >> []
+        @Subject
+        def positionContainerSvc = new DefaultMetadataResolversPositionOrderContainerService(positionOrderRepo, resolverRepo)
+
+        when:
+        def unorderedResolvers = positionContainerSvc.getAllMetadataResolversInDefinedOrderOrUnordered()
+
+        then:
+        unorderedResolvers[0].resourceId == 'second'
+        unorderedResolvers[1].resourceId == 'first'
+
+    }
+
+    def "an order container has been provided and saved, so using resolvers with order defined in that position order container"() {
+        given:
+        def resolverRepo = Mock(MetadataResolverRepository)
+        resolverRepo.findAll() >> [new MetadataResolver(resourceId: 'second'), new MetadataResolver(resourceId: 'first')]
+        resolverRepo.findByResourceId('first') >> new MetadataResolver(resourceId: 'first')
+        resolverRepo.findByResourceId('second') >> new MetadataResolver(resourceId: 'second')
+        def positionOrderRepo = Mock(MetadataResolversPositionOrderContainerRepository)
+        positionOrderRepo.findAll() >> [new MetadataResolversPositionOrderContainer(resourceIds: ['first', 'second'])]
+        positionOrderRepo.findAll() >> []
+        @Subject
+        def positionContainerSvc = new DefaultMetadataResolversPositionOrderContainerService(positionOrderRepo, resolverRepo)
+
+        when:
+        def orderedResolvers = positionContainerSvc.getAllMetadataResolversInDefinedOrderOrUnordered()
+
+        then:
+        orderedResolvers[0].resourceId == 'first'
+        orderedResolvers[1].resourceId == 'second'
+
+    }
+}

From 0e8b039a119279fed87539508a2afee2027ec52a Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 25 Jul 2018 10:44:15 -0400
Subject: [PATCH 05/39] Polishing

---
 .../DefaultMetadataResolversPositionOrderContainerService.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
index 7e1e63396..efeb8fc69 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
@@ -7,7 +7,6 @@
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 

From 69e63dd0153e08980e15a5ebb8be7cc32b754c7f Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 25 Jul 2018 10:45:21 -0400
Subject: [PATCH 06/39] Polishing

---
 .../resolvers/MetadataResolversPositionOrderContainer.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java
index 63d62881a..7e17b78ec 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java
@@ -27,7 +27,7 @@
  * @author Dmitriy Kopylenko
  */
 @Entity
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Getter
 @Setter

From e7418982a52a865a576c70ac026af1dc61fc475b Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 25 Jul 2018 10:48:21 -0400
Subject: [PATCH 07/39] Polishing

---
 .../MetadataResolversPositionOrderContainerService.java       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
index d3e3da40f..0cf833559 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
@@ -7,7 +7,7 @@
 
 /**
  * Service interface for manipulation of instances of {@link MetadataResolversPositionOrderContainer} and
- * encapsulate MetadataResolvers ordering logic.
+ * to abstract away  MetadataResolvers ordering logic.
  *
  * @author Dmitriy Kopylenko
  */
@@ -16,6 +16,4 @@ public interface MetadataResolversPositionOrderContainerService {
     void persistPositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer);
 
     List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered();
-
-
 }

From 9518c7d62289ee17bfd997e63ffd631d9e7ad711 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 25 Jul 2018 10:56:50 -0400
Subject: [PATCH 08/39] SHIBUI-645: use immutable list

---
 ...DefaultMetadataResolversPositionOrderContainerService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
index efeb8fc69..57fd8756c 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
@@ -1,6 +1,5 @@
 package edu.internet2.tier.shibboleth.admin.ui.service;
 
-import com.google.common.collect.Lists;
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver;
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer;
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
@@ -10,6 +9,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import static com.google.common.collect.FluentIterable.from;
 import static java.util.stream.Collectors.toList;
 
 
@@ -42,7 +42,7 @@ public List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered()
                     .collect(toList());
         }
 
-        return Lists.newArrayList(metadataResolverRepository.findAll());
+        return from(metadataResolverRepository.findAll()).toList();
     }
 
     private Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists() {

From b61cd31e0ac23a34146f813722360837a73e7932 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 25 Jul 2018 16:05:28 -0400
Subject: [PATCH 09/39] SHIBUI-645: Implement REST API WIP

---
 ...adataResolversPositionOrderController.java | 22 +++++++++++++++++++
 ...esolversPositionOrderContainerService.java | 13 ++++++++++-
 ...esolversPositionOrderContainerService.java |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java
new file mode 100644
index 000000000..51680e753
--- /dev/null
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java
@@ -0,0 +1,22 @@
+package edu.internet2.tier.shibboleth.admin.ui.controller;
+
+
+import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Dmitriy Kopylenko
+ */
+@RestController
+@RequestMapping("/api/MetadataResolversPositionOrder")
+public class MetadataResolversPositionOrderController {
+
+    @PostMapping
+    public ResponseEntity<?> createOrUpdate(@RequestBody MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer) {
+        return ResponseEntity.ok().build();
+    }
+}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
index 57fd8756c..4da7c4031 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
@@ -13,6 +13,11 @@
 import static java.util.stream.Collectors.toList;
 
 
+/**
+ * Default implementation of {@link MetadataResolversPositionOrderContainer}.
+ *
+ * @author Dmitriy Kopylenko
+ */
 public class DefaultMetadataResolversPositionOrderContainerService implements MetadataResolversPositionOrderContainerService {
 
     private MetadataResolversPositionOrderContainerRepository positionOrderContainerRepository;
@@ -27,7 +32,13 @@ public DefaultMetadataResolversPositionOrderContainerService(MetadataResolversPo
 
     @Override
     @Transactional
-    public void persistPositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer) {
+    public void addOrUpdatePositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer) {
+        MetadataResolversPositionOrderContainer existingPositionOrder = positionOrderContainerRepository.findAll().iterator().next();
+        if (existingPositionOrder != null) {
+            existingPositionOrder.setResourceIds(metadataResolversPositionOrderContainer.getResourceIds());
+            positionOrderContainerRepository.save(existingPositionOrder);
+            return;
+        }
         positionOrderContainerRepository.save(metadataResolversPositionOrderContainer);
     }
 
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
index 0cf833559..1fc06ee81 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
@@ -13,7 +13,7 @@
  */
 public interface MetadataResolversPositionOrderContainerService {
 
-    void persistPositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer);
+    void addOrUpdatePositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer);
 
     List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered();
 }

From 975061f80aad851175779412981007e24ff4a692 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 25 Jul 2018 16:48:40 -0400
Subject: [PATCH 10/39] SHIBUI-645: WIP

---
 .../admin/ui/controller/MetadataResolversController.java  | 7 ++++++-
 .../MetadataResolversPositionOrderController.java         | 8 +++++++-
 ...ultMetadataResolversPositionOrderContainerService.java | 8 ++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

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 9705ddacc..c6b648e8c 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
@@ -5,6 +5,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolverValidationService;
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository;
 import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverService;
+import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolversPositionOrderContainerService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -30,6 +31,7 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.URI;
+import java.util.List;
 
 import static edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolverValidator.ValidationResult;
 
@@ -47,6 +49,9 @@ public class MetadataResolversController {
     @Autowired
     MetadataResolverService metadataResolverService;
 
+    @Autowired
+    MetadataResolversPositionOrderContainerService positionOrderContainerService;
+
     @ExceptionHandler({InvalidTypeIdException.class, IOException.class, HttpMessageNotReadableException.class})
     public ResponseEntity<?> unableToParseJson(Exception ex) {
         return ResponseEntity.badRequest().body(new ErrorResponse(HttpStatus.BAD_REQUEST.toString(), ex.getMessage()));
@@ -55,7 +60,7 @@ public ResponseEntity<?> unableToParseJson(Exception ex) {
     @GetMapping("/MetadataResolvers")
     @Transactional(readOnly = true)
     public ResponseEntity<?> getAll() {
-        Iterable<MetadataResolver> resolvers = resolverRepository.findAll();
+        List<MetadataResolver> resolvers = positionOrderContainerService.getAllMetadataResolversInDefinedOrderOrUnordered();
         resolvers.forEach(MetadataResolver::updateVersion);
         return ResponseEntity.ok(resolvers);
     }
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java
index 51680e753..ed3344e1c 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java
@@ -2,6 +2,8 @@
 
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer;
+import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolversPositionOrderContainerService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,8 +17,12 @@
 @RequestMapping("/api/MetadataResolversPositionOrder")
 public class MetadataResolversPositionOrderController {
 
+    @Autowired
+    MetadataResolversPositionOrderContainerService positionOrderContainerService;
+
     @PostMapping
     public ResponseEntity<?> createOrUpdate(@RequestBody MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer) {
-        return ResponseEntity.ok().build();
+        this.positionOrderContainerService.addOrUpdatePositionOrderContainer(metadataResolversPositionOrderContainer);
+        return ResponseEntity.noContent().build();
     }
 }
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
index 4da7c4031..37b6b7c09 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
@@ -6,6 +6,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 
@@ -33,7 +34,7 @@ public DefaultMetadataResolversPositionOrderContainerService(MetadataResolversPo
     @Override
     @Transactional
     public void addOrUpdatePositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer) {
-        MetadataResolversPositionOrderContainer existingPositionOrder = positionOrderContainerRepository.findAll().iterator().next();
+        MetadataResolversPositionOrderContainer existingPositionOrder = getPositionOrderContainerIfExists().orElse(null);
         if (existingPositionOrder != null) {
             existingPositionOrder.setResourceIds(metadataResolversPositionOrderContainer.getResourceIds());
             positionOrderContainerRepository.save(existingPositionOrder);
@@ -57,8 +58,7 @@ public List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered()
     }
 
     private Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists() {
-        return positionOrderContainerRepository.findAll().iterator().hasNext()
-                ? Optional.of(positionOrderContainerRepository.findAll().iterator().next())
-                : Optional.empty();
+        Iterator<MetadataResolversPositionOrderContainer> iter = positionOrderContainerRepository.findAll().iterator();
+        return iter.hasNext() ? Optional.of(iter.next()) : Optional.empty();
     }
 }

From bbbf4ca8f596b9ea5d6a6a3ff4171b2c7a3f1718 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Fri, 27 Jul 2018 11:10:44 -0400
Subject: [PATCH 11/39] SHIBUI-645: Controller implementation

---
 .../MetadataResolversPositionOrderController.java  |  8 +++++++-
 .../MetadataResolversPositionOrderContainer.java   | 14 +++++++++++---
 ...dataResolversPositionOrderContainerService.java |  5 +++++
 ...dataResolversPositionOrderContainerService.java |  2 ++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java
index ed3344e1c..ab78e4a52 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversPositionOrderController.java
@@ -5,6 +5,7 @@
 import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolversPositionOrderContainerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +23,12 @@ public class MetadataResolversPositionOrderController {
 
     @PostMapping
     public ResponseEntity<?> createOrUpdate(@RequestBody MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer) {
-        this.positionOrderContainerService.addOrUpdatePositionOrderContainer(metadataResolversPositionOrderContainer);
+        positionOrderContainerService.addOrUpdatePositionOrderContainer(metadataResolversPositionOrderContainer);
         return ResponseEntity.noContent().build();
     }
+
+    @GetMapping
+    public ResponseEntity<?> getPositionOrderContainer() {
+        return ResponseEntity.ok(positionOrderContainerService.retrieveExistingOrEmpty());
+    }
 }
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java
index 7e17b78ec..883069531 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolversPositionOrderContainer.java
@@ -1,6 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -11,6 +11,9 @@
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OrderColumn;
 import java.util.ArrayList;
@@ -27,12 +30,17 @@
  * @author Dmitriy Kopylenko
  */
 @Entity
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode
 @NoArgsConstructor
 @Getter
 @Setter
 @ToString
-public class MetadataResolversPositionOrderContainer extends AbstractAuditable {
+public class MetadataResolversPositionOrderContainer {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    @JsonIgnore
+    protected Long id;
 
     @ElementCollection
     @CollectionTable(name="METADATA_RESOLVER_POSITION_ORDER", joinColumns=@JoinColumn(name="METADATA_RESOLVER_POSITION_ORDER_CONTAINER_ID"))
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
index 37b6b7c09..07128f5d0 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
@@ -57,6 +57,11 @@ public List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered()
         return from(metadataResolverRepository.findAll()).toList();
     }
 
+    @Override
+    public MetadataResolversPositionOrderContainer retrieveExistingOrEmpty() {
+        return getPositionOrderContainerIfExists().orElseGet(MetadataResolversPositionOrderContainer::new);
+    }
+
     private Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists() {
         Iterator<MetadataResolversPositionOrderContainer> iter = positionOrderContainerRepository.findAll().iterator();
         return iter.hasNext() ? Optional.of(iter.next()) : Optional.empty();
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
index 1fc06ee81..3b67f6018 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
@@ -13,6 +13,8 @@
  */
 public interface MetadataResolversPositionOrderContainerService {
 
+    MetadataResolversPositionOrderContainer retrieveExistingOrEmpty();
+
     void addOrUpdatePositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer);
 
     List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered();

From a55b424af99db8319c41fa381dbff552ccb332bc Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Fri, 27 Jul 2018 15:44:37 -0400
Subject: [PATCH 12/39] SHIBUI-645: handle default position order when
 persisting new metadata resolvers

---
 .../admin/ui/controller/MetadataResolversController.java  | 1 +
 ...ultMetadataResolversPositionOrderContainerService.java | 8 ++++++++
 .../MetadataResolversPositionOrderContainerService.java   | 2 ++
 3 files changed, 11 insertions(+)

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 c6b648e8c..2b1ddc6b5 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
@@ -104,6 +104,7 @@ public ResponseEntity<?> create(@RequestBody MetadataResolver newResolver) {
 
         newResolver.convertFiltersFromTransientRepresentationIfNecessary();
         MetadataResolver persistedResolver = resolverRepository.save(newResolver);
+        positionOrderContainerService.appendPositionOrderForNew(persistedResolver);
         persistedResolver.updateVersion();
 
         persistedResolver.convertFiltersIntoTransientRepresentationIfNecessary();
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
index 07128f5d0..76ac86cea 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
@@ -62,6 +62,14 @@ public MetadataResolversPositionOrderContainer retrieveExistingOrEmpty() {
         return getPositionOrderContainerIfExists().orElseGet(MetadataResolversPositionOrderContainer::new);
     }
 
+    @Override
+    @Transactional
+    public void appendPositionOrderForNew(MetadataResolver metadataResolver) {
+        MetadataResolversPositionOrderContainer positionOrderContainer = retrieveExistingOrEmpty();
+        positionOrderContainer.getResourceIds().add(metadataResolver.getResourceId());
+        positionOrderContainerRepository.save(positionOrderContainer);
+    }
+
     private Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists() {
         Iterator<MetadataResolversPositionOrderContainer> iter = positionOrderContainerRepository.findAll().iterator();
         return iter.hasNext() ? Optional.of(iter.next()) : Optional.empty();
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
index 3b67f6018..7de6490af 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
@@ -18,4 +18,6 @@ public interface MetadataResolversPositionOrderContainerService {
     void addOrUpdatePositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer);
 
     List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered();
+
+    void appendPositionOrderForNew(MetadataResolver metadataResolver);
 }

From 9a2ae7087b5a6a69b96a296daca86d28545906d8 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Tue, 31 Jul 2018 10:44:01 -0400
Subject: [PATCH 13/39] SHIBUI-682: Dead code cleanup

---
 ...DynamicHttpMetadataResolverRepository.java |  18 ---
 .../EntityRoleWhiteListFilterRepository.java  |  16 ---
 ...eBackedHttpMetadataResolverRepository.java |  14 --
 ...ocalDynamicMetadataResolverRepository.java |  16 ---
 .../RoleDescriptorResolverRepository.java     |  12 --
 .../SignatureValidationFilterRepository.java  |  16 ---
 ...HttpMetadataResolverRepositoryTests.groovy | 130 ------------------
 ...amicMetadataResolverRepositoryTests.groovy |  78 -----------
 8 files changed, 300 deletions(-)
 delete mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/DynamicHttpMetadataResolverRepository.java
 delete mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityRoleWhiteListFilterRepository.java
 delete mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepository.java
 delete mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/LocalDynamicMetadataResolverRepository.java
 delete mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/RoleDescriptorResolverRepository.java
 delete mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/SignatureValidationFilterRepository.java
 delete mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepositoryTests.groovy
 delete mode 100644 backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/LocalDynamicMetadataResolverRepositoryTests.groovy

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/DynamicHttpMetadataResolverRepository.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/DynamicHttpMetadataResolverRepository.java
deleted file mode 100644
index c4a08804f..000000000
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/DynamicHttpMetadataResolverRepository.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository;
-
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver;
-import org.springframework.data.repository.CrudRepository;
-
-/**
- * Spring Data CRUD repository for instances of {@link DynamicHttpMetadataResolver}s.
- *
- * @author Bill Smith (wsmith@unicon.net)
- */
-public interface DynamicHttpMetadataResolverRepository extends CrudRepository<DynamicHttpMetadataResolver, Long> {
-
-    DynamicHttpMetadataResolver findByName(String name);
-
-    boolean deleteByResourceId(String resourceId);
-
-    DynamicHttpMetadataResolver findByResourceId(String resourceId);
-}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityRoleWhiteListFilterRepository.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityRoleWhiteListFilterRepository.java
deleted file mode 100644
index afa830773..000000000
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityRoleWhiteListFilterRepository.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository;
-
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityRoleWhiteListFilter;
-import org.springframework.data.repository.CrudRepository;
-
-/**
- * Spring Data CRUD repository for instances of {@link EntityRoleWhiteListFilter}s.
- */
-public interface EntityRoleWhiteListFilterRepository extends CrudRepository<EntityRoleWhiteListFilter, Long> {
-
-    EntityRoleWhiteListFilter findByName(String name);
-
-    EntityRoleWhiteListFilter findByResourceId(String resourceId);
-
-    boolean deleteByResourceId(String resourceId);
-}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepository.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepository.java
deleted file mode 100644
index 97d069173..000000000
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepository.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository;
-
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver;
-import org.springframework.data.repository.CrudRepository;
-
-/**
- * Spring Data CRUD repository for instances of {@link FileBackedHttpMetadataResolver}s.
- */
-public interface FileBackedHttpMetadataResolverRepository extends CrudRepository<FileBackedHttpMetadataResolver, Long> {
-
-    FileBackedHttpMetadataResolver findByName(String name);
-    boolean deleteByResourceId(String resourceId);
-    FileBackedHttpMetadataResolver findByResourceId(String resourceId);
-}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/LocalDynamicMetadataResolverRepository.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/LocalDynamicMetadataResolverRepository.java
deleted file mode 100644
index 323b470d5..000000000
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/LocalDynamicMetadataResolverRepository.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository;
-
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver;
-import org.springframework.data.repository.CrudRepository;
-
-/**
- * Spring Data CRUD repository for instances of {@link LocalDynamicMetadataResolver}s.
- */
-public interface LocalDynamicMetadataResolverRepository extends CrudRepository<LocalDynamicMetadataResolver, Long> {
-
-    LocalDynamicMetadataResolver findByName(String name);
-
-    boolean deleteByResourceId(String resourceId);
-
-    LocalDynamicMetadataResolver findByResourceId(String resourceId);
-}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/RoleDescriptorResolverRepository.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/RoleDescriptorResolverRepository.java
deleted file mode 100644
index c2cbef436..000000000
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/RoleDescriptorResolverRepository.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository;
-
-import edu.internet2.tier.shibboleth.admin.ui.domain.RoleDescriptorResolver;
-import org.springframework.data.repository.CrudRepository;
-
-
-/**
- * Repository to manage {@link RoleDescriptorResolver} instances.
- */
-public interface RoleDescriptorResolverRepository extends CrudRepository<RoleDescriptorResolver, Long> {
-
-}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/SignatureValidationFilterRepository.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/SignatureValidationFilterRepository.java
deleted file mode 100644
index 7b1c70e0f..000000000
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/SignatureValidationFilterRepository.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository;
-
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.SignatureValidationFilter;
-import org.springframework.data.repository.CrudRepository;
-
-/**
- * Spring Data CRUD repository for instances of {@link SignatureValidationFilter}s.
- */
-public interface SignatureValidationFilterRepository extends CrudRepository<SignatureValidationFilter, Long> {
-
-    SignatureValidationFilter findByName(String name);
-
-    SignatureValidationFilter findByResourceId(String resourceId);
-
-    boolean deleteByResourceId(String resourceId);
-}
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepositoryTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepositoryTests.groovy
deleted file mode 100644
index 46f582501..000000000
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/FileBackedHttpMetadataResolverRepositoryTests.groovy
+++ /dev/null
@@ -1,130 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResolverAttributes
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ReloadableMetadataResolverAttributes
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.autoconfigure.domain.EntityScan
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories
-import org.springframework.test.annotation.DirtiesContext
-import org.springframework.test.context.ContextConfiguration
-import spock.lang.Specification
-
-import javax.persistence.EntityManager
-
-import static edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY
-import static edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.HttpMetadataResolverAttributes.HttpCachingType.memory
-
-@DataJpaTest
-@ContextConfiguration(classes=[CoreShibUiConfiguration, SearchConfiguration, TestConfiguration, InternationalizationConfiguration])
-@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
-@EntityScan("edu.internet2.tier.shibboleth.admin.ui")
-@DirtiesContext(methodMode = DirtiesContext.MethodMode.BEFORE_METHOD)
-class FileBackedHttpMetadataResolverRepositoryTests extends Specification {
-
-    @Autowired
-    MetadataResolverRepository repositoryUnderTest
-
-    @Autowired
-    EntityManager entityManager
-
-    def "file backed http metadata resolver instances persist OK"() {
-        when:
-        def mdr = new FileBackedHttpMetadataResolver().with {
-            it.name = "FileBackedHttpMetadata"
-
-            it.httpMetadataResolverAttributes = new HttpMetadataResolverAttributes().with {
-                it.connectionRequestTimeout = "PT05"
-                it.disregardTLSCertificate = true
-                it.httpCaching = memory
-                it
-            }
-            it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {
-                it.indexesRef = "indexesSpringBeanId"
-                it
-            }
-
-            it.metadataFilters.add(new EntityAttributesFilter().with {
-                it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with {
-                    it.entityAttributesFilterTargetType = ENTITY
-                    it.setValue(["hola"])
-                    it
-                }
-                it
-            })
-            it
-        }
-        repositoryUnderTest.save(mdr)
-
-        then:
-        repositoryUnderTest.findAll().size() > 0
-        FileBackedHttpMetadataResolver item = repositoryUnderTest.findByName("FileBackedHttpMetadata")
-
-        item.name == "FileBackedHttpMetadata"
-        item.metadataFilters.size() == 1
-        item.metadataFilters[0].entityAttributesFilterTarget.entityAttributesFilterTargetType == ENTITY
-        item.metadataFilters[0].entityAttributesFilterTarget.value.size() == 1
-        item.metadataFilters[0].entityAttributesFilterTarget.value.get(0) == "hola"
-        item.httpMetadataResolverAttributes.connectionRequestTimeout == "PT05"
-        item.httpMetadataResolverAttributes.disregardTLSCertificate
-        item.httpMetadataResolverAttributes.httpCaching == memory
-        item.reloadableMetadataResolverAttributes.indexesRef == "indexesSpringBeanId"
-    }
-
-    def "FileBackedHttpMetadataResolver hashcode works as desired"() {
-        given:
-        // TODO: There is weirdness here if reloadableMetadataResolverAttributes is empty.
-        // I suspect similar weirdness if httpMetadataResolverAttributes is an empty object, too.
-        def resolverJson = '''{
-	"name": "name",
-	"@type": "FileBackedHttpMetadataResolver",
-	"requireValidMetadata": true,
-	"failFastInitialization": true,
-	"sortKey": 7,
-	"criterionPredicateRegistryRef": "criterionPredicateRegistryRef",
-	"useDefaultPredicateRegistry": true,
-	"satisfyAnyPredicates": true,
-	"metadataFilters": [],
-	"reloadableMetadataResolverAttributes": {
-	    "parserPoolRef": "parserPoolRef"
-	},
-	"httpMetadataResolverAttributes": {
-		"httpClientRef": "httpClientRef",
-		"connectionRequestTimeout": "connectionRequestTimeout",
-		"connectionTimeout": "connectionTimeout",
-		"socketTimeout": "socketTimeout",
-		"disregardTLSCertificate": true,
-		"tlsTrustEngineRef": "tlsTrustEngineRef",
-		"httpClientSecurityParametersRef": "httpClientSecurityParametersRef",
-		"proxyHost": "proxyHost",
-		"proxyPort": "proxyPort",
-		"proxyUser": "proxyUser",
-		"proxyPassword": "proxyPassword",
-		"httpCaching": "none",
-		"httpCacheDirectory": "httpCacheDirectory",
-	    "httpMaxCacheEntries": 1,
-		"httpMaxCacheEntrySize": 2
-	}
-}'''
-
-        when:
-        def resolver = new ObjectMapper().readValue(resolverJson.bytes, FileBackedHttpMetadataResolver)
-        def persistedResolver = repositoryUnderTest.save(resolver)
-        entityManager.flush()
-
-        then:
-        def item1 = repositoryUnderTest.findByName(persistedResolver.name)
-        entityManager.clear()
-        def item2 = repositoryUnderTest.findByName(persistedResolver.name)
-
-        item1.hashCode() == item2.hashCode()
-    }
-}
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/LocalDynamicMetadataResolverRepositoryTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/LocalDynamicMetadataResolverRepositoryTests.groovy
deleted file mode 100644
index 63ae7018c..000000000
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/LocalDynamicMetadataResolverRepositoryTests.groovy
+++ /dev/null
@@ -1,78 +0,0 @@
-package edu.internet2.tier.shibboleth.admin.ui.repository
-
-import edu.internet2.tier.shibboleth.admin.ui.configuration.CoreShibUiConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.configuration.InternationalizationConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicMetadataResolverAttributes
-import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.LocalDynamicMetadataResolver
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.autoconfigure.domain.EntityScan
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories
-import org.springframework.test.context.ContextConfiguration
-import spock.lang.Specification
-
-import javax.persistence.EntityManager
-
-import static edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY
-
-@DataJpaTest
-@ContextConfiguration(classes=[CoreShibUiConfiguration, SearchConfiguration, TestConfiguration, InternationalizationConfiguration])
-@EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
-@EntityScan("edu.internet2.tier.shibboleth.admin.ui")
-class LocalDynamicMetadataResolverRepositoryTests extends Specification {
-
-    @Autowired
-    LocalDynamicMetadataResolverRepository repositoryUnderTest
-
-    @Autowired
-    EntityManager entityManager
-
-    def "local dynamic metadata resolver instances persist OK"() {
-        when:
-        def mdr = new LocalDynamicMetadataResolver().with {
-            it.name = 'LocalDynamicMetadataResolver'
-            it.sourceDirectory = '/etc/shibui'
-            it.sourceKeyGeneratorRef = 'sourceKeyGeneratorBean'
-            it.sourceManagerRef = 'sourceManagerBean'
-            it.dynamicMetadataResolverAttributes = new DynamicMetadataResolverAttributes().with {
-                it.cleanupTaskInterval = 'PT5H'
-                it.maxCacheDuration = 'PT8H'
-                it.initializeFromPersistentCacheInBackground = true
-                it
-            }
-
-            it.metadataFilters.add(new EntityAttributesFilter().with {
-                it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with {
-                    it.entityAttributesFilterTargetType = ENTITY
-                    it.setValue(['hola'])
-                    it
-                }
-                it
-            })
-
-            it
-        }
-        repositoryUnderTest.save(mdr)
-
-        then:
-        repositoryUnderTest.findAll().size() > 0
-        def item = repositoryUnderTest.findByName("LocalDynamicMetadataResolver")
-
-        item.name == "LocalDynamicMetadataResolver"
-        item.metadataFilters.size() == 1
-        item.metadataFilters[0].entityAttributesFilterTarget.entityAttributesFilterTargetType == ENTITY
-        item.metadataFilters[0].entityAttributesFilterTarget.value.size() == 1
-        item.metadataFilters[0].entityAttributesFilterTarget.value.get(0) == "hola"
-        item.sourceDirectory == '/etc/shibui'
-        item.sourceKeyGeneratorRef == 'sourceKeyGeneratorBean'
-        item.sourceManagerRef == 'sourceManagerBean'
-        item.dynamicMetadataResolverAttributes.cleanupTaskInterval == 'PT5H'
-        item.dynamicMetadataResolverAttributes.maxCacheDuration == 'PT8H'
-        item.dynamicMetadataResolverAttributes.initializeFromPersistentCacheInBackground
-    }
-
-}

From 67ab1bc381f96746266dc415a1ccc4d1d45c6e0e Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 31 Jul 2018 18:52:38 +0000
Subject: [PATCH 14/39] Merged in feature/SHIBUI-624 (pull request #131)

SHIBUI-624 Created filter list, Integrated filters functionality

* SHIBUI-624 structured routes for filter list

* SHIBUI-624 Integrated filters functionality

* Implemented Filter editor, fixed tests

* SHIBUI-624 Added tests

Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>
Approved-by: Ryan Mathis <rmathis@unicon.net>
---
 .../entity/filter/entity-attributes-filter.ts |   2 +-
 .../domain/service/filter.service.spec.ts     |  34 +++---
 .../metadata/domain/service/filter.service.ts |  16 +--
 .../filter/action/collection.action.ts        |   2 +-
 .../filter/container/edit-filter.component.ts |   6 +-
 .../filter/container/filter.component.html    |   4 +-
 .../filter/effect/collection.effect.ts        |  51 ++++-----
 .../metadata/filter/effect/filter.effect.ts   |   3 +-
 ui/src/app/metadata/filter/filter.module.ts   |  25 +----
 .../filter/reducer/collection.reducer.spec.ts |  73 ++++++++++---
 .../filter/reducer/collection.reducer.ts      |  34 +++++-
 ui/src/app/metadata/filter/reducer/index.ts   |  18 ++++
 .../component/provider-item.component.html    |   2 +-
 .../component/provider-item.component.spec.ts |  69 ++++++++++++
 .../component/provider-item.component.ts      |   4 +-
 .../dashboard-providers-list.component.html   |   1 +
 .../dashboard-providers-list.component.ts     |  10 +-
 .../manager/reducer/search.reducer.ts         |  17 ---
 .../app/metadata/metadata.component.spec.ts   |   2 +-
 ui/src/app/metadata/metadata.component.ts     |   1 -
 .../provider-editor-nav.component.html        |  61 +++++++++++
 .../provider-editor-nav.component.ts          |  50 +++++++++
 .../container/provider-edit.component.html    |  48 ++-------
 .../container/provider-edit.component.spec.ts |  12 +--
 .../container/provider-edit.component.ts      |  26 ++---
 .../provider-filter-list.component.html       | 101 +++++++++++++++++-
 .../provider-filter-list.component.scss       |  17 +++
 .../provider-filter-list.component.spec.ts    |   6 ++
 .../provider-filter-list.component.ts         |  33 +++++-
 .../container/provider-select.component.ts    |  24 ++++-
 .../model/file-backed-http.provider.form.ts   |   9 +-
 .../app/metadata/provider/provider.module.ts  |  15 ++-
 .../app/metadata/provider/provider.routing.ts |  30 +++++-
 ui/src/app/metadata/provider/reducer/index.ts |   4 +
 .../provider/resolver/provider.resolver.ts    |  34 ++++++
 ui/src/app/wizard/reducer/index.spec.ts       |   4 +-
 ui/src/app/wizard/reducer/index.ts            |   2 +
 37 files changed, 635 insertions(+), 215 deletions(-)
 create mode 100644 ui/src/app/metadata/manager/component/provider-item.component.spec.ts
 create mode 100644 ui/src/app/metadata/provider/component/provider-editor-nav.component.html
 create mode 100644 ui/src/app/metadata/provider/component/provider-editor-nav.component.ts
 create mode 100644 ui/src/app/metadata/provider/container/provider-filter-list.component.scss
 create mode 100644 ui/src/app/metadata/provider/resolver/provider.resolver.ts

diff --git a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts
index 82b5ae9d6..c3b9edc98 100644
--- a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts
+++ b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts
@@ -73,7 +73,7 @@ export class EntityAttributesFilter implements MetadataFilter, MetadataEntity {
         return {
             attributeRelease: this.attributeRelease,
             relyingPartyOverrides: this.relyingPartyOverrides,
-            entityAttributesFilterTarget: { ...this.entityAttributesFilterTarget },
+            entityAttributesFilterTarget: this.entityAttributesFilterTarget,
             filterEnabled: this.filterEnabled,
             name: this.name,
             '@type': 'EntityAttributes'
diff --git a/ui/src/app/metadata/domain/service/filter.service.spec.ts b/ui/src/app/metadata/domain/service/filter.service.spec.ts
index 1410f6723..571940935 100644
--- a/ui/src/app/metadata/domain/service/filter.service.spec.ts
+++ b/ui/src/app/metadata/domain/service/filter.service.spec.ts
@@ -6,6 +6,8 @@ import { EntityAttributesFilter } from '../entity';
 
 describe(`Metadata Filter Service`, () => {
 
+    const provider = 'foo';
+
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [
@@ -21,53 +23,53 @@ describe(`Metadata Filter Service`, () => {
     describe('query method', () => {
         it(`should send an expected GET[] request`, async(inject([MetadataFilterService, HttpTestingController],
             (service: MetadataFilterService, backend: HttpTestingController) => {
-                service.query().subscribe();
+                service.query(provider).subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
-                    return req.url === `${service.base}${service.endpoint}`
+                    return req.url === `${service.base}${service.endpoint}/${provider}/Filters`
                         && req.method === 'GET';
-                }, `GET MetadataResolvers collection`);
+                }, `GET MetadataFilter collection`);
             }
         )));
     });
     describe('find method', () => {
         it(`should send an expected GET request`, async(inject([MetadataFilterService, HttpTestingController],
             (service: MetadataFilterService, backend: HttpTestingController) => {
-                const id = 'foo';
-                service.find(id).subscribe();
+                const id = 'bar';
+                service.find(provider, id).subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
-                    return req.url === `${service.base}${service.endpoint}/${id}`
+                    return req.url === `${service.base}${service.endpoint}/${provider}/Filters/${id}`
                         && req.method === 'GET';
-                }, `GET MetadataResolvers collection`);
+                }, `GET MetadataFilter`);
             }
         )));
     });
     describe('update method', () => {
         it(`should send an expected PUT request`, async(inject([MetadataFilterService, HttpTestingController],
             (service: MetadataFilterService, backend: HttpTestingController) => {
-                const id = 'foo';
-                const filter = new EntityAttributesFilter({ id });
-                service.update(filter).subscribe();
+                const id = 'bar';
+                const filter = new EntityAttributesFilter({ resourceId: id });
+                service.update(provider, filter).subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
-                    return req.url === `${service.base}${service.endpoint}/${id}`
+                    return req.url === `${service.base}${service.endpoint}/${provider}/Filters/${ id }`
                         && req.method === 'PUT';
-                }, `PUT (update) MetadataResolvers collection`);
+                }, `PUT (update) MetadataFilter`);
             }
         )));
     });
     describe('save method', () => {
         it(`should send an expected POST request`, async(inject([MetadataFilterService, HttpTestingController],
             (service: MetadataFilterService, backend: HttpTestingController) => {
-                const id = 'foo';
+                const id = 'bar';
                 const filter = new EntityAttributesFilter({ id });
-                service.save(filter).subscribe();
+                service.save(provider, filter).subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
-                    return req.url === `${service.base}${service.endpoint}`
+                    return req.url === `${service.base}${service.endpoint}/${provider}/Filters`
                         && req.method === 'POST';
-                }, `POST MetadataResolvers collection`);
+                }, `POST MetadataFilter`);
             }
         )));
     });
diff --git a/ui/src/app/metadata/domain/service/filter.service.ts b/ui/src/app/metadata/domain/service/filter.service.ts
index b96907eca..ac9bc8ce1 100644
--- a/ui/src/app/metadata/domain/service/filter.service.ts
+++ b/ui/src/app/metadata/domain/service/filter.service.ts
@@ -13,20 +13,20 @@ export class MetadataFilterService {
     constructor(
         private http: HttpClient
     ) { }
-    query(): Observable<MetadataFilter[]> {
-        return this.http.get<MetadataFilter[]>(`${this.base}${this.endpoint}`, {});
+    query(providerId: string): Observable<MetadataFilter[]> {
+        return this.http.get<MetadataFilter[]>(`${this.base}${this.endpoint}/${providerId}/Filters`);
     }
 
-    find(id: string): Observable<MetadataFilter> {
+    find(providerId: string, filterId: string): Observable<MetadataFilter> {
         // console.log(id);
-        return this.http.get<MetadataFilter>(`${this.base}${this.endpoint}/${id}`);
+        return this.http.get<MetadataFilter>(`${this.base}${this.endpoint}/${providerId}/Filters/${ filterId }`);
     }
 
-    update(filter: MetadataFilter): Observable<MetadataFilter> {
-        return this.http.put<MetadataFilter>(`${this.base}${this.endpoint}/${filter.id}`, filter);
+    update(providerId: string, filter: MetadataFilter): Observable<MetadataFilter> {
+        return this.http.put<MetadataFilter>(`${this.base}${this.endpoint}/${providerId}/Filters/${ filter.resourceId }`, filter);
     }
 
-    save(filter: MetadataFilter): Observable<MetadataFilter> {
-        return this.http.post<MetadataFilter>(`${this.base}${this.endpoint}`, filter);
+    save(providerId: string, filter: MetadataFilter): Observable<MetadataFilter> {
+        return this.http.post<MetadataFilter>(`${this.base}${this.endpoint}/${providerId}/Filters`, filter);
     }
 }
diff --git a/ui/src/app/metadata/filter/action/collection.action.ts b/ui/src/app/metadata/filter/action/collection.action.ts
index 9ed93aaff..f220d84bb 100644
--- a/ui/src/app/metadata/filter/action/collection.action.ts
+++ b/ui/src/app/metadata/filter/action/collection.action.ts
@@ -53,7 +53,7 @@ export class SelectFilterFail implements Action {
 export class LoadFilterRequest implements Action {
     readonly type = FilterCollectionActionTypes.LOAD_FILTER_REQUEST;
 
-    constructor() { }
+    constructor(public payload: string) { }
 }
 
 export class LoadFilterSuccess implements Action {
diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.ts b/ui/src/app/metadata/filter/container/edit-filter.component.ts
index 41d10a3e9..d2921013f 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.ts
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.ts
@@ -63,12 +63,14 @@ export class EditFilterComponent implements OnInit, OnDestroy {
         private valueEmitter: ProviderValueEmitter,
         private fb: FormBuilder
     ) {
-        this.changes$ = this.store.select(fromFilter.getFilter);
+        this.changes$ = this.store.select(fromFilter.getFilterWithChanges);
         this.changes$
             .pipe(
                 distinctUntilChanged()
             )
-            .subscribe(c => this.changes = new EntityAttributesFilter(c));
+            .subscribe(c => {
+                this.changes = new EntityAttributesFilter(c);
+            });
 
         this.showMore$ = this.store.select(fromFilter.getViewingMore);
         this.selected$ = this.store.select(fromFilter.getSelected);
diff --git a/ui/src/app/metadata/filter/container/filter.component.html b/ui/src/app/metadata/filter/container/filter.component.html
index 90c6b6463..3793ba3bf 100644
--- a/ui/src/app/metadata/filter/container/filter.component.html
+++ b/ui/src/app/metadata/filter/container/filter.component.html
@@ -1 +1,3 @@
-<router-outlet></router-outlet>
\ No newline at end of file
+<ng-container *ngIf="filter$ | async">
+    <router-outlet></router-outlet>
+</ng-container>
\ No newline at end of file
diff --git a/ui/src/app/metadata/filter/effect/collection.effect.ts b/ui/src/app/metadata/filter/effect/collection.effect.ts
index 5422f2d99..788e51329 100644
--- a/ui/src/app/metadata/filter/effect/collection.effect.ts
+++ b/ui/src/app/metadata/filter/effect/collection.effect.ts
@@ -4,11 +4,12 @@ import { Store } from '@ngrx/store';
 import { Router } from '@angular/router';
 
 import { of } from 'rxjs';
-import { switchMap, map, catchError, tap } from 'rxjs/operators';
+import { switchMap, map, catchError, tap, combineLatest, skipWhile } from 'rxjs/operators';
 
 import * as actions from '../action/collection.action';
 import { FilterCollectionActionTypes } from '../action/collection.action';
 import * as fromFilter from '../reducer';
+import * as fromProvider from '../../provider/reducer';
 import { MetadataFilter } from '../../domain/model';
 import { removeNulls } from '../../../shared/util';
 import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
@@ -21,9 +22,11 @@ export class FilterCollectionEffects {
     @Effect()
     loadFilters$ = this.actions$.pipe(
         ofType<actions.LoadFilterRequest>(FilterCollectionActionTypes.LOAD_FILTER_REQUEST),
-        switchMap(() =>
+        map(action => action.payload),
+        skipWhile(providerId => !providerId),
+        switchMap(providerId =>
             this.filterService
-                .query()
+                .query(providerId)
                 .pipe(
                     map(filters => new actions.LoadFilterSuccess(filters)),
                     catchError(error => of(new actions.LoadFilterError(error)))
@@ -34,9 +37,10 @@ export class FilterCollectionEffects {
     selectFilterRequest$ = this.actions$.pipe(
         ofType<actions.SelectFilter>(FilterCollectionActionTypes.SELECT_FILTER),
         map(action => action.payload),
-        switchMap(id => {
+        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        switchMap(([filterId, providerId]) => {
             return this.filterService
-                .find(id)
+                .find(providerId, filterId)
                 .pipe(
                     map(p => new actions.SelectFilterSuccess(p)),
                     catchError(error => of(new actions.SelectFilterFail(error)))
@@ -55,41 +59,37 @@ export class FilterCollectionEffects {
                 relyingPartyOverrides: removeNulls(new EntityAttributesFilter(filter).relyingPartyOverrides)
             };
         }),
-        switchMap(unsaved =>
-            this.filterService
-                .save(unsaved as MetadataFilter)
+        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        switchMap(([unsaved, providerId]) => {
+            return this.filterService
+                .save(providerId, unsaved as MetadataFilter)
                 .pipe(
                     map(saved => new actions.AddFilterSuccess(saved)),
                     catchError(error => of(new actions.AddFilterFail(error)))
-                )
-        )
+                );
+        })
     );
     @Effect({ dispatch: false })
     addFilterSuccessRedirect$ = this.actions$.pipe(
         ofType<actions.AddFilterSuccess>(FilterCollectionActionTypes.ADD_FILTER_SUCCESS),
         map(action => action.payload),
-        tap(filter => this.router.navigate(['/dashboard']))
-    );
-
-    @Effect()
-    addFilterSuccessReload$ = this.actions$.pipe(
-        ofType<actions.AddFilterSuccess>(FilterCollectionActionTypes.ADD_FILTER_SUCCESS),
-        map(action => action.payload),
-        map(filter => new actions.LoadFilterRequest())
+        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        tap(([filter, provider]) => this.router.navigate(['/', 'metadata', 'provider', provider, 'filters']))
     );
 
     @Effect()
     updateFilter$ = this.actions$.pipe(
         ofType<actions.UpdateFilterRequest>(FilterCollectionActionTypes.UPDATE_FILTER_REQUEST),
         map(action => action.payload),
-        switchMap(filter => {
+        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        switchMap(([filter, providerId]) => {
             delete filter.modifiedDate;
             delete filter.createdDate;
             return this.filterService
-                .update(filter)
+                .update(providerId, filter)
                 .pipe(
                     map(p => new actions.UpdateFilterSuccess({
-                        id: p.id,
+                        id: p.resourceId,
                         changes: p
                     })),
                     catchError(err => of(new actions.UpdateFilterFail(filter)))
@@ -100,13 +100,8 @@ export class FilterCollectionEffects {
     updateFilterSuccessRedirect$ = this.actions$.pipe(
         ofType<actions.UpdateFilterSuccess>(FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS),
         map(action => action.payload),
-        tap(filter => this.router.navigate(['/dashboard']))
-    );
-    @Effect()
-    updateFilterSuccessReload$ = this.actions$.pipe(
-        ofType<actions.UpdateFilterSuccess>(FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS),
-        map(action => action.payload),
-        map(filter => new actions.LoadFilterRequest())
+        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        tap(([filter, provider]) => this.router.navigate(['/', 'metadata', 'provider', provider, 'filters']))
     );
 
     constructor(
diff --git a/ui/src/app/metadata/filter/effect/filter.effect.ts b/ui/src/app/metadata/filter/effect/filter.effect.ts
index 87b5a7f1c..1698333dd 100644
--- a/ui/src/app/metadata/filter/effect/filter.effect.ts
+++ b/ui/src/app/metadata/filter/effect/filter.effect.ts
@@ -58,18 +58,19 @@ export class FilterEffects {
         )
     );
 
+    /*
     @Effect({ dispatch: false })
     saveFilterSuccess$ = this.actions$.pipe(
         ofType<AddFilterSuccess>(FilterCollectionActionTypes.ADD_FILTER_SUCCESS),
         switchMap(() => this.router.navigate(['/dashboard']))
     );
-
     @Effect()
     cancelChanges$ = this.actions$.pipe(
         ofType<CancelCreateFilter>(FilterActionTypes.CANCEL_CREATE_FILTER),
         map(() => new LoadFilterRequest()),
         tap(() => this.router.navigate(['/dashboard']))
     );
+    */
 
     constructor(
         private store: Store<fromRoot.State>,
diff --git a/ui/src/app/metadata/filter/filter.module.ts b/ui/src/app/metadata/filter/filter.module.ts
index 22a7ed992..24111a113 100644
--- a/ui/src/app/metadata/filter/filter.module.ts
+++ b/ui/src/app/metadata/filter/filter.module.ts
@@ -19,27 +19,7 @@ import { SearchIdEffects } from './effect/search.effect';
 import { FilterExistsGuard } from './guard/filter-exists.guard';
 import { DomainModule } from '../domain/domain.module';
 import { ModuleWithProviders } from '@angular/compiler/src/core';
-
-
-export const routes: Routes = [
-    {
-        path: 'new',
-        component: NewFilterComponent,
-        canActivate: []
-    },
-    {
-        path: ':id',
-        component: FilterComponent,
-        canActivate: [FilterExistsGuard],
-        children: [
-            {
-                path: 'edit',
-                component: EditFilterComponent,
-                canDeactivate: []
-            }
-        ]
-    }
-];
+import { FilterCollectionEffects } from './effect/collection.effect';
 
 @NgModule({
     declarations: [
@@ -77,9 +57,8 @@ export class FilterModule {
 @NgModule({
     imports: [
         FilterModule,
-        RouterModule.forChild(routes),
         StoreModule.forFeature('filter', reducers),
-        EffectsModule.forFeature([FilterEffects, SearchIdEffects]),
+        EffectsModule.forFeature([FilterEffects, SearchIdEffects, FilterCollectionEffects]),
     ],
 })
 export class RootFilterModule { }
diff --git a/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
index 0a5d9f74f..abd35ab48 100644
--- a/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
+++ b/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
@@ -1,20 +1,19 @@
-import { reducer } from './collection.reducer';
+import { reducer, initialState as snapshot } from './collection.reducer';
 import * as fromFilter from './collection.reducer';
 import {
     FilterCollectionActionTypes,
     LoadFilterSuccess,
     UpdateFilterSuccess,
-    SelectFilter
+    SelectFilter,
+    SelectFilterSuccess,
+    AddFilterRequest,
+    UpdateFilterRequest,
+    AddFilterSuccess,
+    AddFilterFail,
+    UpdateFilterFail
 } from '../action/collection.action';
 import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
 
-const snapshot: fromFilter.CollectionState = {
-    ids: [],
-    entities: {},
-    selectedFilterId: null,
-    loaded: false
-};
-
 describe('Filter Reducer', () => {
     describe('undefined action', () => {
         it('should return the default state', () => {
@@ -37,8 +36,8 @@ describe('Filter Reducer', () => {
         it('should add the loaded filters to the collection', () => {
             spyOn(fromFilter.adapter, 'addAll').and.callThrough();
             const filters = [
-                new EntityAttributesFilter({ id: 'foo', createdDate: new Date().toLocaleDateString() }),
-                new EntityAttributesFilter({ id: 'bar', createdDate: new Date().toLocaleDateString() })
+                new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() }),
+                new EntityAttributesFilter({ resourceId: 'bar', createdDate: new Date().toLocaleDateString() })
             ];
             const action = new LoadFilterSuccess(filters);
             const result = reducer(snapshot, action);
@@ -46,12 +45,60 @@ describe('Filter Reducer', () => {
         });
     });
 
+    describe(`${FilterCollectionActionTypes.SELECT_FILTER_SUCCESS}`, () => {
+        it('should add the loaded filter to the collection', () => {
+            spyOn(fromFilter.adapter, 'addOne').and.callThrough();
+            const filter = new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
+            const action = new SelectFilterSuccess(filter);
+            const result = reducer(snapshot, action);
+            expect(fromFilter.adapter.addOne).toHaveBeenCalled();
+        });
+    });
+
+    describe(`${FilterCollectionActionTypes.ADD_FILTER}`, () => {
+        it('should set saving to true', () => {
+            const filter = new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
+            const action = new AddFilterRequest(filter);
+            expect(reducer(snapshot, action).saving).toBe(true);
+        });
+    });
+    describe(`${FilterCollectionActionTypes.UPDATE_FILTER_REQUEST}`, () => {
+        it('should set saving to true', () => {
+            const filter = new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
+            const action = new UpdateFilterRequest(filter);
+            expect(reducer(snapshot, action).saving).toBe(true);
+        });
+    });
+
+    describe(`${FilterCollectionActionTypes.ADD_FILTER_SUCCESS}`, () => {
+        it('should set saving to false', () => {
+            const filter = new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
+            const action = new AddFilterSuccess(filter);
+            expect(reducer(snapshot, action).saving).toBe(false);
+        });
+    });
+
+    describe(`${FilterCollectionActionTypes.ADD_FILTER_FAIL}`, () => {
+        it('should set saving to false', () => {
+            const action = new AddFilterFail(new Error('error'));
+            expect(reducer(snapshot, action).saving).toBe(false);
+        });
+    });
+
+    describe(`${FilterCollectionActionTypes.UPDATE_FILTER_FAIL}`, () => {
+        it('should set saving to false', () => {
+            const filter = new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
+            const action = new UpdateFilterFail(filter);
+            expect(reducer(snapshot, action).saving).toBe(false);
+        });
+    });
+
     describe(`${FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS}`, () => {
-        it('should add the loaded filters to the collection', () => {
+        it('should update the filter in the collection', () => {
             spyOn(fromFilter.adapter, 'updateOne').and.callThrough();
             const update = {
                 id: 'foo',
-                changes: new EntityAttributesFilter({ id: 'foo', name: 'bar', createdDate: new Date().toLocaleDateString() }),
+                changes: new EntityAttributesFilter({ resourceId: 'foo', name: 'bar', createdDate: new Date().toLocaleDateString() }),
             };
             const action = new UpdateFilterSuccess(update);
             const result = reducer(snapshot, action);
diff --git a/ui/src/app/metadata/filter/reducer/collection.reducer.ts b/ui/src/app/metadata/filter/reducer/collection.reducer.ts
index 2eeff6ff1..e71f0947c 100644
--- a/ui/src/app/metadata/filter/reducer/collection.reducer.ts
+++ b/ui/src/app/metadata/filter/reducer/collection.reducer.ts
@@ -5,6 +5,7 @@ import { MetadataFilter } from '../../domain/model';
 export interface CollectionState extends EntityState<MetadataFilter> {
     selectedFilterId: string | null;
     loaded: boolean;
+    saving: boolean;
 }
 
 export function sortByDate(a: MetadataFilter, b: MetadataFilter): number {
@@ -18,7 +19,8 @@ export const adapter: EntityAdapter<MetadataFilter> = createEntityAdapter<Metada
 
 export const initialState: CollectionState = adapter.getInitialState({
     selectedFilterId: null,
-    loaded: false
+    loaded: false,
+    saving: false
 });
 
 export function reducer(state = initialState, action: FilterCollectionActionsUnion): CollectionState {
@@ -32,8 +34,35 @@ export function reducer(state = initialState, action: FilterCollectionActionsUni
             return s;
         }
 
+        case FilterCollectionActionTypes.SELECT_FILTER_SUCCESS: {
+            return adapter.addOne(action.payload, {
+                ...state,
+                selectedFilterId: action.payload.resourceId
+            });
+        }
+
+        case FilterCollectionActionTypes.ADD_FILTER:
+        case FilterCollectionActionTypes.UPDATE_FILTER_REQUEST: {
+            return {
+                ...state,
+                saving: true
+            };
+        }
+
         case FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS: {
-            return adapter.updateOne(action.payload, state);
+            return adapter.updateOne(action.payload, {
+                ...state,
+                saving: false
+            });
+        }
+
+        case FilterCollectionActionTypes.ADD_FILTER_SUCCESS:
+        case FilterCollectionActionTypes.ADD_FILTER_FAIL:
+        case FilterCollectionActionTypes.UPDATE_FILTER_FAIL: {
+            return {
+                ...state,
+                saving: false
+            };
         }
 
         case FilterCollectionActionTypes.SELECT_FILTER: {
@@ -51,6 +80,7 @@ export function reducer(state = initialState, action: FilterCollectionActionsUni
 
 export const getSelectedFilterId = (state: CollectionState) => state.selectedFilterId;
 export const getIsLoaded = (state: CollectionState) => state.loaded;
+export const getIsSaving = (state: CollectionState) => state.saving;
 export const {
     selectIds: selectFilterIds,
     selectEntities: selectFilterEntities,
diff --git a/ui/src/app/metadata/filter/reducer/index.ts b/ui/src/app/metadata/filter/reducer/index.ts
index 5ae10da51..6724af3a7 100644
--- a/ui/src/app/metadata/filter/reducer/index.ts
+++ b/ui/src/app/metadata/filter/reducer/index.ts
@@ -50,8 +50,26 @@ export const getViewingMore = createSelector(getSearchFromState, fromSearch.getV
 */
 export const getCollectionState = createSelector(getFilterState, getCollectionFromStateFn);
 export const getAllFilters = createSelector(getCollectionState, fromCollection.selectAllFilters);
+export const getFiltersSaving = createSelector(getCollectionState, fromCollection.getIsSaving);
+
+export const notAddtlFilters = ['RequiredValidUntil', 'SignatureValidation', 'EntityRoleWhiteList'];
+
+export const getAdditionalFilters = createSelector(
+    getAllFilters,
+    filters => filters.filter(f => notAddtlFilters.indexOf(f['@type']) === -1)
+);
+
+
 export const getFilterEntities = createSelector(getCollectionState, fromCollection.selectFilterEntities);
 export const getSelectedFilterId = createSelector(getCollectionState, fromCollection.getSelectedFilterId);
 export const getSelectedFilter = createSelector(getFilterEntities, getSelectedFilterId, utils.getInCollectionFn);
 export const getFilterIds = createSelector(getCollectionState, fromCollection.selectFilterIds);
 export const getFilterCollectionIsLoaded = createSelector(getCollectionState, fromCollection.getIsLoaded);
+
+/*
+ *   Combine pieces of State
+*/
+
+export const mergeFn = (changes, filter) => ({ ...filter, ...changes });
+
+export const getFilterWithChanges = createSelector(getFilter, getSelectedFilter, mergeFn);
diff --git a/ui/src/app/metadata/manager/component/provider-item.component.html b/ui/src/app/metadata/manager/component/provider-item.component.html
index 32cfd1d21..537ca75af 100644
--- a/ui/src/app/metadata/manager/component/provider-item.component.html
+++ b/ui/src/app/metadata/manager/component/provider-item.component.html
@@ -28,7 +28,7 @@
                 </div>
             </div>
             <div class="col-2 text-right">
-                <button class="btn btn-primary btn-filter pull-left">
+                <button class="btn btn-primary btn-filter pull-left" (click)="viewFilters.emit(provider)">
                         <i class="fa fa-filter"></i>&nbsp;
                         <span class="label">Active Filters</span>&nbsp;
                         <span class="badge badge-light">{{ provider.metadataFilters.length }}</span>
diff --git a/ui/src/app/metadata/manager/component/provider-item.component.spec.ts b/ui/src/app/metadata/manager/component/provider-item.component.spec.ts
new file mode 100644
index 000000000..23ad6bc62
--- /dev/null
+++ b/ui/src/app/metadata/manager/component/provider-item.component.spec.ts
@@ -0,0 +1,69 @@
+import { TestBed, ComponentFixture } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ProviderItemComponent } from './provider-item.component';
+import { ViewChild, Component } from '@angular/core';
+import { MetadataProvider } from '../../domain/model';
+
+@Component({
+    template: `
+        <provider-item
+            [provider]="provider"
+            [isOpen]="isOpen">
+        </provider-item>
+    `
+})
+class TestHostComponent {
+    @ViewChild(ProviderItemComponent)
+    public componentUnderTest: ProviderItemComponent;
+
+    private _provider;
+    private _open;
+
+    public set isOpen(open: boolean) {
+        this._open = open;
+    }
+
+    public get isOpen(): boolean {
+        return this._open;
+    }
+
+    public set provider(provider: MetadataProvider) {
+        this._provider = provider;
+    }
+
+    public get provider(): MetadataProvider {
+        return this._provider;
+    }
+}
+
+describe('Provider List item', () => {
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            providers: [],
+            imports: [
+                NoopAnimationsModule
+            ],
+            declarations: [
+                ProviderItemComponent,
+                TestHostComponent
+            ],
+        });
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+
+        instance.provider = <MetadataProvider>{
+            resourceId: 'foo',
+            metadataFilters: []
+        };
+    });
+
+    it('should compile', () => {
+        fixture.detectChanges();
+
+        expect(fixture).toBeDefined();
+    });
+});
diff --git a/ui/src/app/metadata/manager/component/provider-item.component.ts b/ui/src/app/metadata/manager/component/provider-item.component.ts
index 26249d7ab..b8f676f40 100644
--- a/ui/src/app/metadata/manager/component/provider-item.component.ts
+++ b/ui/src/app/metadata/manager/component/provider-item.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, ChangeDetectionStrategy } from '@angular/core';
+import { Component, Input, ChangeDetectionStrategy, Output, EventEmitter } from '@angular/core';
 
 import { MetadataProvider } from '../../domain/model';
 import { EntityItemComponent } from './entity-item.component';
@@ -12,4 +12,6 @@ import { EntityItemComponent } from './entity-item.component';
 
 export class ProviderItemComponent extends EntityItemComponent {
     @Input() provider: MetadataProvider;
+
+    @Output() viewFilters: EventEmitter<MetadataProvider> = new EventEmitter();
 }
diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
index dd6319e6c..7d2eab50a 100644
--- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
+++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
@@ -15,6 +15,7 @@
                         [provider]="provider"
                         [isOpen]="(providersOpen$ | async)[provider.resourceId]"
                         (select)="edit(provider)"
+                        (viewFilters)="gotoFilters(provider)"
                         (toggle)="toggleEntity(provider)">
                     </provider-item>
                 </li>
diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
index 54f122c7c..bc2e609c4 100644
--- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
+++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
@@ -29,8 +29,16 @@ export class DashboardProvidersListComponent {
         this.providersOpen$ = store.select(fromDashboard.getOpenProviders);
     }
 
+    view(id: string, page: string): void {
+        this.router.navigate(['metadata', 'provider', id, page]);
+    }
+
     edit(provider: MetadataProvider): void {
-        this.router.navigate(['metadata', 'provider', provider.resourceId, 'edit']);
+        this.view(provider.resourceId, 'edit');
+    }
+
+    gotoFilters(provider: MetadataProvider): void {
+        this.view(provider.resourceId, 'filters');
     }
 
     toggleEntity(provider: MetadataProvider): void {
diff --git a/ui/src/app/metadata/manager/reducer/search.reducer.ts b/ui/src/app/metadata/manager/reducer/search.reducer.ts
index 2ab931fc0..8614cbf94 100644
--- a/ui/src/app/metadata/manager/reducer/search.reducer.ts
+++ b/ui/src/app/metadata/manager/reducer/search.reducer.ts
@@ -25,23 +25,6 @@ export function reducer(state = initialState, action: searchActions.Actions): Se
             };
         }
 
-        case searchActions.ENTITY_FILTER: {
-            return {
-                ...state,
-                kind: action.payload,
-                loading: true
-            };
-        }
-
-        case searchActions.ENTITY_SEARCH_COMPLETE: {
-            return {
-                entities: action.payload,
-                loading: false,
-                query: state.query,
-                kind: state.kind
-            };
-        }
-
         default: {
             return state;
         }
diff --git a/ui/src/app/metadata/metadata.component.spec.ts b/ui/src/app/metadata/metadata.component.spec.ts
index dffc99361..89b2fc4ac 100644
--- a/ui/src/app/metadata/metadata.component.spec.ts
+++ b/ui/src/app/metadata/metadata.component.spec.ts
@@ -50,6 +50,6 @@ describe('Metadata Root Component', () => {
 
     it('should load metadata objects', async(() => {
         expect(app).toBeTruthy();
-        expect(store.dispatch).toHaveBeenCalledTimes(4);
+        expect(store.dispatch).toHaveBeenCalledTimes(3);
     }));
 });
diff --git a/ui/src/app/metadata/metadata.component.ts b/ui/src/app/metadata/metadata.component.ts
index 62170d286..1eb87324f 100644
--- a/ui/src/app/metadata/metadata.component.ts
+++ b/ui/src/app/metadata/metadata.component.ts
@@ -19,7 +19,6 @@ export class MetadataPageComponent {
         private store: Store<fromRoot.State>
     ) {
         this.store.dispatch(new LoadResolverRequest());
-        this.store.dispatch(new LoadFilterRequest());
         this.store.dispatch(new LoadDraftRequest());
         this.store.dispatch(new LoadProviderRequest());
     }
diff --git a/ui/src/app/metadata/provider/component/provider-editor-nav.component.html b/ui/src/app/metadata/provider/component/provider-editor-nav.component.html
new file mode 100644
index 000000000..3ce1eef57
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/provider-editor-nav.component.html
@@ -0,0 +1,61 @@
+<ng-container  [ngSwitch]="format">
+    <div class="dropdown" ngbDropdown #dropdown="ngbDropdown" *ngSwitchCase="formats.DROPDOWN">
+        <button
+            class="btn btn-secondary"
+            role="button"
+            aria-haspopup="true"
+            aria-expanded="false"
+            ngbDropdownToggle>
+            <i class="fa fa-fw fa-bars fa-lg" aria-hidden="true"></i>
+            <span class="d-inline-block mx-2">
+                <i18n-text [key]="currentPage$ | async"></i18n-text>
+            </span>
+        </button>
+        <div class="dropdown-menu" aria-labelledby="dropdownMenuLink" ngbDropdownMenu>
+            <a class="dropdown-item"
+                [routerLink]="['../', 'filters']"
+                routerLinkActive="active"
+                aria-label="Filter List"
+                role="button">
+                <i18n-text key="Filter List"></i18n-text>
+            </a>
+            <a *ngFor="let route of routes$ | async"
+                href=""
+                class="dropdown-item"
+                [routerLink]="['./', route.path]"
+                [ngClass]="{'active': (currentPage$ | async) === route.path}"
+                [attr.aria-label]="route.label"
+                role="button">
+                <i18n-text [key]="route.label"></i18n-text>
+                <valid-form-icon *ngIf="(invalidForms$ | async).indexOf(route.path) > -1" status="INVALID"></valid-form-icon>
+            </a>
+        </div>
+    </div>
+    <ng-container  *ngSwitchCase="formats.TABS">
+        <nav class="nav nav-pills flex-column" role="navigation">
+            <a *ngFor="let route of routes$ | async"
+                href=""
+                class="nav-link"
+                [ngClass]="{'active': (currentPage$ | async) === route.path}"
+                [routerLink]="['../', 'edit', route.path]"
+                role="button"
+                [attr.aria-label]="route.label">
+                <i18n-text [key]="route.label"></i18n-text>
+                <valid-form-icon
+                    *ngIf="(invalidForms$ | async).indexOf(route.path) > -1"
+                    status="INVALID">
+                </valid-form-icon>
+            </a>
+        </nav>
+        <hr />
+        <nav class="nav nav-pills flex-column" role="navigation">
+            <a class="nav-link"
+                [routerLink]="['../', 'filters']"
+                routerLinkActive="active"
+                aria-label="Filter List"
+                role="button">
+                <i18n-text key="Filter List"></i18n-text>
+            </a>
+        </nav>
+    </ng-container>
+</ng-container>
diff --git a/ui/src/app/metadata/provider/component/provider-editor-nav.component.ts b/ui/src/app/metadata/provider/component/provider-editor-nav.component.ts
new file mode 100644
index 000000000..fd244a18f
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/provider-editor-nav.component.ts
@@ -0,0 +1,50 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Store } from '@ngrx/store';
+
+import { Observable } from 'rxjs';
+import { skipWhile, combineLatest, map } from 'rxjs/operators';
+
+import * as fromProvider from '../reducer';
+import { WizardStep, Wizard } from '../../../wizard/model';
+import * as fromWizard from '../../../wizard/reducer';
+import { MetadataProvider } from '../../domain/model';
+
+export enum NAV_FORMATS {
+    DROPDOWN = 'NAV_DROPDOWN',
+    TABS = 'NAV_TABS'
+}
+
+@Component({
+    selector: 'provider-editor-nav',
+    templateUrl: './provider-editor-nav.component.html',
+    styleUrls: []
+})
+
+export class ProviderEditorNavComponent {
+    @Input() format: string;
+
+    @Output() onPageSelect: EventEmitter<string> = new EventEmitter();
+
+    formats = NAV_FORMATS;
+
+    currentPage$: Observable<string>;
+    index$: Observable<string>;
+    invalidForms$: Observable<string[]>;
+    routes$: Observable<{ path: string, label: string }[]>;
+
+    constructor(
+        private store: Store<fromProvider.ProviderState>
+    ) {
+        this.index$ = this.store.select(fromWizard.getWizardIndex).pipe(skipWhile(i => !i));
+        this.routes$ = this.store.select(fromWizard.getRoutes);
+        this.currentPage$ = this.store.select(fromWizard.getCurrent).pipe(
+            map(p => p ? p.id : 'filters')
+        );
+        this.invalidForms$ = this.store.select(fromProvider.getInvalidEditorForms);
+    }
+
+    gotoPage(page: string = ''): void {
+        this.onPageSelect.emit(page);
+    }
+}
+
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.html b/ui/src/app/metadata/provider/container/provider-edit.component.html
index 98c8b0f64..6f15638b7 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.html
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.html
@@ -10,31 +10,10 @@
     <div class="section-body p-4 border border-top-0 border-info">
         <div class="row">
             <div class="col-6 d-lg-none order-1">
-                <div class="dropdown" ngbDropdown #dropdown="ngbDropdown">
-                    <button
-                        class="btn btn-secondary"
-                        role="button"
-                        aria-haspopup="true"
-                        aria-expanded="false"
-                        ngbDropdownToggle>
-                        <i class="fa fa-fw fa-bars fa-lg" aria-hidden="true"></i>
-                        <span class="d-inline-block mx-2">
-                            <i18n-text [key]="(currentPage$ | async).label"></i18n-text>
-                        </span>
-                    </button>
-                    <div class="dropdown-menu" aria-labelledby="dropdownMenuLink" ngbDropdownMenu>
-                        <a *ngFor="let route of (definition$ | async).steps"
-                            href=""
-                            class="dropdown-item"
-                            [ngClass]="{'active': (editorIndex$ | async) === route.index}"
-                            (click)="setIndex($event, route.id); dropdown.close()"
-                            [attr.aria-label]="route.label"
-                            role="button">
-                            <i18n-text [key]="route.label"></i18n-text>
-                            <valid-form-icon *ngIf="(invalidForms$ | async).indexOf(route.id) > -1" status="INVALID"></valid-form-icon>
-                        </a>
-                    </div>
-                </div>
+                <provider-editor-nav
+                    [format]="formats.DROPDOWN"
+                    (onPageSelect)="setIndex($event)">
+                </provider-editor-nav>
             </div>
             <div class="col-6 col-lg-3 order-2 text-right">
                 <button class="btn btn-info"
@@ -63,21 +42,10 @@
         <hr />
         <div class="row">
             <div class="col-lg-3 d-none d-lg-block">
-                <nav class="nav nav-pills flex-column" role="navigation">
-                    <a *ngFor="let route of (definition$ | async).steps"
-                        href=""
-                        class="nav-link"
-                        [ngClass]="{'active': (index$ | async) === route.id}"
-                        (click)="setIndex($event, route.id)"
-                        role="button"
-                        [attr.aria-label]="route.label">
-                        <i18n-text [key]="route.label"></i18n-text>
-                        <valid-form-icon
-                            *ngIf="(invalidForms$ | async).indexOf(route.id) > -1"
-                            status="INVALID">
-                        </valid-form-icon>
-                    </a>
-                </nav>
+                <provider-editor-nav
+                    [format]="formats.TABS"
+                    (onPageSelect)="setIndex($event)">
+                </provider-editor-nav>
             </div>
             <div class="col-lg-6">
                 <router-outlet></router-outlet>
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
index 096a269c7..a62734833 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
@@ -11,6 +11,7 @@ import * as fromWizard from '../../../wizard/reducer';
 import { SharedModule } from '../../../shared/shared.module';
 import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
 import { FileBackedHttpMetadataProviderEditor } from '../model';
+import { ProviderEditorNavComponent } from '../component/provider-editor-nav.component';
 
 @Component({
     template: `
@@ -55,7 +56,8 @@ describe('Provider Edit Component', () => {
             ],
             declarations: [
                 ProviderEditComponent,
-                TestHostComponent
+                TestHostComponent,
+                ProviderEditorNavComponent
             ],
             providers: [
                 { provide: ActivatedRoute, useValue: activatedRoute },
@@ -79,13 +81,7 @@ describe('Provider Edit Component', () => {
 
     describe('setIndex method', () => {
         it('should interrupt event default and dispatch an event', () => {
-            const ev = <any>{
-                preventDefault: jasmine.createSpy('preventDefault'),
-                stopPropagation: jasmine.createSpy('stopPropagation')
-            };
-            app.setIndex(ev, 'common');
-            expect(ev.preventDefault).toHaveBeenCalled();
-            expect(ev.stopPropagation).toHaveBeenCalled();
+            app.setIndex('common');
             expect(store.dispatch).toHaveBeenCalled();
         });
     });
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts
index 79f5cb2a6..07a79a7cf 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.ts
@@ -9,9 +9,9 @@ import { ClearWizard, SetDefinition, SetIndex } from '../../../wizard/action/wiz
 import { ClearEditor, LoadSchemaRequest } from '../action/editor.action';
 import { MetadataProvider } from '../../domain/model';
 import { ClearProvider } from '../action/entity.action';
-import { MetadataProviderEditorTypes } from '../model';
-import { Wizard, WizardStep } from '../../../wizard/model';
+import { Wizard } from '../../../wizard/model';
 import { UpdateProviderRequest } from '../action/collection.action';
+import { NAV_FORMATS } from '../component/provider-editor-nav.component';
 
 @Component({
     selector: 'provider-edit',
@@ -24,8 +24,6 @@ export class ProviderEditComponent implements OnDestroy {
     provider$: Observable<MetadataProvider>;
     definition$: Observable<Wizard<MetadataProvider>>;
     index$: Observable<string>;
-    invalidForms$: Observable<string[]>;
-    currentPage$: Observable<WizardStep>;
 
     valid$: Observable<boolean>;
     isInvalid$: Observable<boolean>;
@@ -33,6 +31,8 @@ export class ProviderEditComponent implements OnDestroy {
 
     latest: MetadataProvider;
 
+    formats = NAV_FORMATS;
+
     constructor(
         private store: Store<fromProvider.ProviderState>,
         private router: Router,
@@ -46,7 +46,7 @@ export class ProviderEditComponent implements OnDestroy {
         this.status$ = this.store.select(fromProvider.getInvalidEditorForms);
 
         let startIndex$ = this.route.firstChild ?
-            this.route.firstChild.params.pipe(map(p => p.form || 'filter-list')) :
+            this.route.firstChild.params.pipe(map(p => p.form || 'filters')) :
             this.definition$.pipe(map(d => d.steps[0].id));
 
         startIndex$
@@ -54,13 +54,6 @@ export class ProviderEditComponent implements OnDestroy {
                 this.store.dispatch(new SetIndex(index));
             });
 
-        this.provider$
-            .subscribe(provider => {
-                this.store.dispatch(new SetDefinition({
-                    ...MetadataProviderEditorTypes.find(def => def.type === provider['@type'])
-                }));
-            });
-
         this.index$.subscribe(id => this.go(id));
 
         this.store
@@ -73,20 +66,13 @@ export class ProviderEditComponent implements OnDestroy {
             });
 
         this.store.select(fromProvider.getEntityChanges).subscribe(changes => this.latest = changes);
-
-        this.invalidForms$ = this.store.select(fromProvider.getInvalidEditorForms);
-        this.currentPage$ = this.index$.pipe(
-            combineLatest(this.definition$, (index, definition) => (definition.steps.find(r => r.id === index)))
-        );
     }
 
     go(id: string): void {
         this.router.navigate(['./', id], { relativeTo: this.route });
     }
 
-    setIndex($event: Event, id: string): void {
-        $event.preventDefault();
-        $event.stopPropagation();
+    setIndex(id: string): void {
         this.store.dispatch(new SetIndex(id));
     }
 
diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.html b/ui/src/app/metadata/provider/container/provider-filter-list.component.html
index a1c8e0b1d..53e99847c 100644
--- a/ui/src/app/metadata/provider/container/provider-filter-list.component.html
+++ b/ui/src/app/metadata/provider/container/provider-filter-list.component.html
@@ -1,5 +1,96 @@
-<form>
-    <fieldset>
-        <legend>Filter list.</legend>
-    </fieldset>
-</form>
\ No newline at end of file
+<section *ngIf="provider$ | async" class="section" [attr.aria-label]="'Edit metadata provider - ' + (provider$ | async).name"
+    tabindex="0">
+    <div class="section-header bg-info p-2 text-white">
+        <div class="row justify-content-between">
+            <div class="col-md-12">
+                <span class="display-6">
+                    <i class="fa fa-fw fa-gears"></i> Edit Metadata Provider - {{ (provider$ | async).name }}</span>
+            </div>
+        </div>
+    </div>
+    <div class="section-body p-4 border border-top-0 border-info">
+        <div class="row">
+            <div class="col-6 d-lg-none order-1">
+                <provider-editor-nav
+                    [format]="formats.DROPDOWN">
+                </provider-editor-nav>
+            </div>
+            <div class="col-6 col-lg-12 order-2 text-right">
+                <a [routerLink]="['../', 'filter', 'new']"
+                    class="btn btn-success">
+                    <i class="fa fa-plus-circle"></i>
+                    Add Filter
+                </a>
+            </div>
+        </div>
+        <hr />
+        <div class="row">
+            <div class="col-lg-3 d-none d-lg-block">
+                <provider-editor-nav
+                    [format]="formats.TABS">
+                </provider-editor-nav>
+            </div>
+            <div class="col-lg-9">
+                <table class="table table-striped table-hover">
+                    <thead class="">
+                        <tr>
+                            <!--<th>Sorting</th>-->
+                            <th></th>
+                            <th>Filter Name</th>
+                            <th>Filter Type</th>
+                            <th>Enabled?</th>
+                            <th>Edit</th>
+                            <!--<th>Delete</th>-->
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr *ngFor="let filter of filters$ | async; let i = index;">
+                            <!--<td class="td-sm">
+                                <button class="btn btn-link">
+                                    <i class="fa fa-arrow-circle-up fa-lg sr-hidden"></i>
+                                    <span class="sr-only">Move Up</span>
+                                </button>
+                                <button class="btn btn-link">
+                                    <i class="fa fa-arrow-circle-down fa-lg sr-hidden"></i>
+                                    <span class="sr-only">Move Down</span>
+                                </button>
+                            </td>
+                             -->
+                            <td class="td-xs">{{ i + 1 }}</td>
+                            <td class="td-lg">{{ filter.name }}</td>
+                            <td class="td-lg">{{ filter['@type'] }}</td>
+                            <td class="td-sm">
+                                <button class="btn btn-link" (click)="toggleEnabled(filter)" [disabled]="isSaving$ | async">
+                                    <i class="fa fa-lg sr-hidden "
+                                        [ngClass]="{
+                                            'fa-check-square text-success': filter.filterEnabled,
+                                            'fa-square-o text-dark': !filter.filterEnabled
+                                        }"></i>
+                                    <span class="sr-only" *ngIf="!filter.filterEnabled">Enable</span>
+                                    <span class="sr-only" *ngIf="filter.filterEnabled">Disable</span>
+                                </button>
+                                <i class="fa fa-spinner fa-pulse fa-lg fa-fw" *ngIf="isSaving$ | async"></i>
+                            </td>
+                            <td class="td-sm">
+                                <a class="btn btn-link"
+                                    [class.disabled]="isSaving$ | async"
+                                    [routerLink]="['../', 'filter', filter.resourceId, 'edit']">
+                                    <i class="fa fa-edit fa-lg sr-hidden text-info"></i>
+                                    <span class="sr-only">Edit</span>
+                                </a>
+                            </td>
+                            <!--
+                            <td class="td-sm">
+                                <button class="btn btn-link">
+                                    <i class="fa fa-trash fa-lg sr-hidden text-danger"></i>
+                                    <span class="sr-only">Delete</span>
+                                </button>
+                            </td>
+                            -->
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.scss b/ui/src/app/metadata/provider/container/provider-filter-list.component.scss
new file mode 100644
index 000000000..e1a2e17b9
--- /dev/null
+++ b/ui/src/app/metadata/provider/container/provider-filter-list.component.scss
@@ -0,0 +1,17 @@
+:host {
+    .table {
+        .td-sm {
+            max-width: 100px;
+        }
+        .td-xs {
+            max-width: 20px;
+        }
+        .td-lg {
+            width: 30%;
+        }
+
+        td {
+            vertical-align: middle;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.spec.ts b/ui/src/app/metadata/provider/container/provider-filter-list.component.spec.ts
index dd8c2ef95..f24673419 100644
--- a/ui/src/app/metadata/provider/container/provider-filter-list.component.spec.ts
+++ b/ui/src/app/metadata/provider/container/provider-filter-list.component.spec.ts
@@ -6,6 +6,9 @@ import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { ProviderFilterListComponent } from './provider-filter-list.component';
 import * as fromRoot from '../reducer';
 import * as fromWizard from '../../../wizard/reducer';
+import { ProviderEditorNavComponent } from '../component/provider-editor-nav.component';
+import { I18nTextComponent } from '../../../shared/component/i18n-text.component';
+import { ValidFormIconComponent } from '../../../shared/component/valid-form-icon.component';
 
 @Component({
     template: `
@@ -36,6 +39,9 @@ describe('Provider Filter List Component', () => {
             ],
             declarations: [
                 ProviderFilterListComponent,
+                ProviderEditorNavComponent,
+                I18nTextComponent,
+                ValidFormIconComponent,
                 TestHostComponent
             ],
             providers: []
diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.ts b/ui/src/app/metadata/provider/container/provider-filter-list.component.ts
index a35bb9fc3..25dbcb0f1 100644
--- a/ui/src/app/metadata/provider/container/provider-filter-list.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-filter-list.component.ts
@@ -1,14 +1,43 @@
 import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { skipWhile } from 'rxjs/operators';
 import * as fromProvider from '../reducer';
+import * as fromFilter from '../../filter/reducer';
+import { MetadataFilter, MetadataProvider } from '../../domain/model';
+import { NAV_FORMATS } from '../component/provider-editor-nav.component';
+import { SetIndex } from '../../../wizard/action/wizard.action';
+import { UpdateFilterRequest, LoadFilterRequest } from '../../filter/action/collection.action';
 
 @Component({
     selector: 'provider-filter-list',
     templateUrl: './provider-filter-list.component.html',
-    styleUrls: []
+    styleUrls: ['./provider-filter-list.component.scss']
 })
 export class ProviderFilterListComponent {
+
+    filters$: Observable<MetadataFilter[]>;
+    provider$: Observable<MetadataProvider>;
+    isSaving$: Observable<boolean>;
+
+    formats = NAV_FORMATS;
+
     constructor(
         private store: Store<fromProvider.ProviderState>
-    ) { }
+    ) {
+        this.filters$ = this.store.select(fromFilter.getAdditionalFilters);
+        this.provider$ = this.store.select(fromProvider.getSelectedProvider).pipe(skipWhile(p => !p));
+
+        this.store.dispatch(new SetIndex('filters'));
+
+        this.provider$.subscribe(p => {
+            this.store.dispatch(new LoadFilterRequest(p.resourceId));
+        });
+
+        this.isSaving$ = this.store.select(fromFilter.getFiltersSaving);
+    }
+
+    toggleEnabled(filter: MetadataFilter): void {
+        this.store.dispatch(new UpdateFilterRequest({ ...filter, filterEnabled: !filter.filterEnabled }));
+    }
 }
diff --git a/ui/src/app/metadata/provider/container/provider-select.component.ts b/ui/src/app/metadata/provider/container/provider-select.component.ts
index dc0bcaa6b..7ae2b180c 100644
--- a/ui/src/app/metadata/provider/container/provider-select.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-select.component.ts
@@ -1,11 +1,14 @@
 import { Component, OnDestroy } from '@angular/core';
-import { Subscription } from 'rxjs';
+import { Subscription, Observable } from 'rxjs';
 import { Store } from '@ngrx/store';
 
 import { ActivatedRoute } from '@angular/router';
-import { map, distinctUntilChanged } from 'rxjs/operators';
+import { map, distinctUntilChanged, skipWhile } from 'rxjs/operators';
 import { SelectProviderRequest } from '../action/collection.action';
 import * as fromProviders from '../reducer';
+import { MetadataProvider } from '../../domain/model';
+import { SetDefinition } from '../../../wizard/action/wizard.action';
+import { MetadataProviderEditorTypes } from '../model';
 
 @Component({
     selector: 'provider-select',
@@ -16,14 +19,25 @@ import * as fromProviders from '../reducer';
 export class ProviderSelectComponent implements OnDestroy {
     actionsSubscription: Subscription;
 
+    provider$: Observable<MetadataProvider>;
+
     constructor(
-        store: Store<fromProviders.State>,
-        route: ActivatedRoute
+        private store: Store<fromProviders.State>,
+        private route: ActivatedRoute
     ) {
-        this.actionsSubscription = route.params.pipe(
+        this.actionsSubscription = this.route.params.pipe(
             distinctUntilChanged(),
             map(params => new SelectProviderRequest(params.providerId))
         ).subscribe(store);
+
+        this.provider$ = this.store.select(fromProviders.getSelectedProvider).pipe(skipWhile(p => !p));
+
+        this.provider$
+            .subscribe(provider => {
+                this.store.dispatch(new SetDefinition({
+                    ...MetadataProviderEditorTypes.find(def => def.type === provider['@type'])
+                }));
+            });
     }
 
     ngOnDestroy() {
diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
index 8d091c463..4ac744009 100644
--- a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
@@ -35,7 +35,7 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadata
             schema: 'assets/schema/provider/filebacked-http-reloading.schema.json'
         },
         {
-            id: 'filters',
+            id: 'plugins',
             label: 'Metadata Filter Plugins',
             index: 4,
             initialValues: [
@@ -57,11 +57,6 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadata
 export const FileBackedHttpMetadataProviderEditor: Wizard<FileBackedHttpMetadataProvider> = {
     ...FileBackedHttpMetadataProviderWizard,
     steps: [
-        {
-            id: 'filter-list',
-            label: 'Filter List',
-            index: 0
-        },
         {
             id: 'common',
             label: 'Common Attributes',
@@ -77,7 +72,7 @@ export const FileBackedHttpMetadataProviderEditor: Wizard<FileBackedHttpMetadata
             schema: 'assets/schema/provider/filebacked-http-reloading.schema.json'
         },
         {
-            id: 'filters',
+            id: 'plugins',
             label: 'Metadata Filter Plugins',
             index: 3,
             initialValues: [
diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts
index 288adf30b..afd8409c4 100644
--- a/ui/src/app/metadata/provider/provider.module.ts
+++ b/ui/src/app/metadata/provider/provider.module.ts
@@ -4,13 +4,15 @@ import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import { StoreModule } from '@ngrx/store';
 
+import { EffectsModule } from '@ngrx/effects';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+
 import { ProviderWizardComponent } from './container/provider-wizard.component';
 import { ProviderWizardStepComponent } from './container/provider-wizard-step.component';
 import { ProviderWizardSummaryComponent } from './component/provider-wizard-summary.component';
 import { ProviderComponent } from './container/provider.component';
 import { WizardModule } from '../../wizard/wizard.module';
 import * as fromProvider from './reducer';
-import { EffectsModule } from '@ngrx/effects';
 import { EditorEffects } from './effect/editor.effect';
 
 import { WidgetRegistry} from 'ngx-schema-form';
@@ -24,7 +26,9 @@ import { ProviderSelectComponent } from './container/provider-select.component';
 import { ProviderEditStepComponent } from './container/provider-edit-step.component';
 import { EntityEffects } from './effect/entity.effect';
 import { ProviderFilterListComponent } from './container/provider-filter-list.component';
-import { NgbDropdownModule } from '../../../../node_modules/@ng-bootstrap/ng-bootstrap';
+
+import { ProviderEditorNavComponent } from './component/provider-editor-nav.component';
+import { ProviderResolver } from './resolver/provider.resolver';
 
 @NgModule({
     declarations: [
@@ -36,7 +40,8 @@ import { NgbDropdownModule } from '../../../../node_modules/@ng-bootstrap/ng-boo
         ProviderEditStepComponent,
         ProviderSelectComponent,
         ProviderFilterListComponent,
-        SummaryPropertyComponent
+        SummaryPropertyComponent,
+        ProviderEditorNavComponent
     ],
     entryComponents: [],
     imports: [
@@ -46,6 +51,7 @@ import { NgbDropdownModule } from '../../../../node_modules/@ng-bootstrap/ng-boo
         RouterModule,
         SharedModule,
         FormModule,
+        RouterModule,
         NgbDropdownModule
     ],
     exports: []
@@ -55,7 +61,8 @@ export class ProviderModule {
         return {
             ngModule: RootProviderModule,
             providers: [
-                { provide: WidgetRegistry, useClass: CustomWidgetRegistry }
+                { provide: WidgetRegistry, useClass: CustomWidgetRegistry },
+                ProviderResolver
             ]
         };
     }
diff --git a/ui/src/app/metadata/provider/provider.routing.ts b/ui/src/app/metadata/provider/provider.routing.ts
index cf491a92f..bd32d63e6 100644
--- a/ui/src/app/metadata/provider/provider.routing.ts
+++ b/ui/src/app/metadata/provider/provider.routing.ts
@@ -7,6 +7,11 @@ import { ProviderEditComponent } from './container/provider-edit.component';
 import { ProviderEditStepComponent } from './container/provider-edit-step.component';
 import { ProviderSelectComponent } from './container/provider-select.component';
 import { ProviderFilterListComponent } from './container/provider-filter-list.component';
+import { NewFilterComponent } from '../filter/container/new-filter.component';
+import { FilterComponent } from '../filter/container/filter.component';
+import { FilterExistsGuard } from '../filter/guard/filter-exists.guard';
+import { EditFilterComponent } from '../filter/container/edit-filter.component';
+import { ProviderResolver } from './resolver/provider.resolver';
 
 export const ProviderRoutes: Routes = [
     {
@@ -36,15 +41,32 @@ export const ProviderRoutes: Routes = [
                         path: 'edit',
                         component: ProviderEditComponent,
                         children: [
-                            {
-                                path: 'filter-list',
-                                component: ProviderFilterListComponent
-                            },
+                            { path: '', redirectTo: 'common', pathMatch: 'prefix' },
                             {
                                 path: ':form',
                                 component: ProviderEditStepComponent
                             }
                         ]
+                    },
+                    {
+                        path: 'filters',
+                        component: ProviderFilterListComponent
+                    },
+                    {
+                        path: 'filter/new',
+                        component: NewFilterComponent
+                    },
+                    {
+                        path: 'filter/:id',
+                        component: FilterComponent,
+                        canActivate: [],
+                        children: [
+                            {
+                                path: 'edit',
+                                component: EditFilterComponent,
+                                canDeactivate: []
+                            }
+                        ]
                     }
                 ]
             }
diff --git a/ui/src/app/metadata/provider/reducer/index.ts b/ui/src/app/metadata/provider/reducer/index.ts
index 7655e4314..d56ba8c0a 100644
--- a/ui/src/app/metadata/provider/reducer/index.ts
+++ b/ui/src/app/metadata/provider/reducer/index.ts
@@ -95,4 +95,8 @@ export const getProviderIds = createSelector(getCollectionState, fromCollection.
 export const getProviderCollectionIsLoaded = createSelector(getCollectionState, fromCollection.getIsLoaded);
 
 export const getProviderNames = createSelector(getAllProviders, (providers: MetadataProvider[]) => providers.map(p => p.name));
+
+export const getProviderFilters = createSelector(getSelectedProvider, provider => provider.metadataFilters);
+
 export const getProviderXmlIds = createSelector(getAllProviders, (providers: MetadataProvider[]) => providers.map(p => p.xmlId));
+
diff --git a/ui/src/app/metadata/provider/resolver/provider.resolver.ts b/ui/src/app/metadata/provider/resolver/provider.resolver.ts
new file mode 100644
index 000000000..9a527b8a9
--- /dev/null
+++ b/ui/src/app/metadata/provider/resolver/provider.resolver.ts
@@ -0,0 +1,34 @@
+import { Injectable } from '@angular/core';
+import { Resolve, ActivatedRoute } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { Observable, of } from 'rxjs';
+import { map, distinctUntilChanged, skipWhile } from 'rxjs/operators';
+
+import * as fromCollection from '../reducer';
+import { MetadataProviderService } from '../../domain/service/provider.service';
+import { MetadataProvider } from '../../domain/model';
+import { SelectProviderRequest } from '../action/collection.action';
+
+/**
+ * Guards are hooks into the route resolution process, providing an opportunity
+ * to inform the router's navigation process whether the route should continue
+ * to activate this route. Guards must return an of true or false.
+ */
+@Injectable()
+export class ProviderResolver implements Resolve<Observable<MetadataProvider>> {
+    constructor(
+        private store: Store<fromCollection.State>,
+        private route: ActivatedRoute
+    ) { }
+
+    resolve() {
+        this.route.params.pipe(
+            distinctUntilChanged(),
+            map(params => {
+                return new SelectProviderRequest(params.providerId);
+            })
+        ).subscribe(this.store);
+
+        return this.store.select(fromCollection.getSelectedProvider).pipe(skipWhile(id => !id));
+    }
+}
diff --git a/ui/src/app/wizard/reducer/index.spec.ts b/ui/src/app/wizard/reducer/index.spec.ts
index 9c8b246f9..4bf95f7ae 100644
--- a/ui/src/app/wizard/reducer/index.spec.ts
+++ b/ui/src/app/wizard/reducer/index.spec.ts
@@ -83,8 +83,8 @@ describe('wizard index selectors', () => {
 
     describe('getModelFn method', () => {
         it('should return the model', () => {
-            const step = FileBackedHttpMetadataProviderWizard.steps.find(s => s.id === 'filters');
-            expect(selectors.getModelFn(step)).toEqual({ metadataFilters: [] });
+            const step = FileBackedHttpMetadataProviderWizard.steps.find(s => s.id === 'common');
+            expect(selectors.getModelFn(step)).toEqual({});
         });
     });
 });
diff --git a/ui/src/app/wizard/reducer/index.ts b/ui/src/app/wizard/reducer/index.ts
index 7e3db4c01..80e69255a 100644
--- a/ui/src/app/wizard/reducer/index.ts
+++ b/ui/src/app/wizard/reducer/index.ts
@@ -65,3 +65,5 @@ export const getCurrent = createSelector(getWizardIndex, getWizardDefinition, ge
 export const getNext = createSelector(getWizardIndex, getWizardDefinition, getNextFn);
 export const getLast = createSelector(getWizardIndex, getWizardDefinition, getLastFn);
 export const getModel = createSelector(getCurrent, getModelFn);
+
+export const getRoutes = createSelector(getWizardDefinition, d => d.steps.map(step => ({ path: step.id, label: step.label })));

From 8c278c43dd46837755ae17bed904594266fde9fb Mon Sep 17 00:00:00 2001
From: Jodie Muramoto <jmuramoto@unicon.net>
Date: Fri, 3 Aug 2018 12:30:40 -0700
Subject: [PATCH 15/39] SHIBUI-688: Fixed enabled/disabled icons on provider
 dashboard; added flex to provider accordion for better mobile display;

---
 .../manager/component/provider-item.component.html   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/src/app/metadata/manager/component/provider-item.component.html b/ui/src/app/metadata/manager/component/provider-item.component.html
index 537ca75af..9a5d1fbc7 100644
--- a/ui/src/app/metadata/manager/component/provider-item.component.html
+++ b/ui/src/app/metadata/manager/component/provider-item.component.html
@@ -1,6 +1,6 @@
 <div class="card">
     <div class="card-header" (click)="toggle.emit(provider)" (keydown.space)="toggle.emit(provider)" tabindex="0">
-        <div class="row">
+        <div class="d-flex">
             <div class="reorder-card">
                 <p class="text-center text-primary font-weight-bold">1</p>
                 <button class="btn btn-link" disabled>
@@ -10,7 +10,7 @@
                     <i class="fa text-info fa-lg fa-chevron-circle-up" aria-hidden="true"></i>
                 </button>
             </div>
-            <div class="col-9 clearfix">
+            <div class="flex-grow-1">
                 <div class="w-10 pr-3 pull-left">
                     <i class="fa fa-fw fa-3x text-primary" [class.fa-caret-right]="!isOpen" [class.fa-caret-down]="isOpen"></i>
                     &nbsp;
@@ -18,16 +18,16 @@
                         <i class="fa fa-fw fa-3x text-info fa-cubes"></i>
                     </span>
                 </div>
-                <div>
+                <div class="px-2">
                     {{ provider.name }}
-                    <i *ngIf="!provider.enabled" class="fa fa-fw" [ngClass]="{
+                    <i class="fa fa-fw" [ngClass]="{
                         'fa-check-circle text-success': provider.enabled,
                         'fa-times-circle text-danger': !provider.enabled
                     }"></i>
                     <small class="d-block">{{ provider['@type'] }}</small>
                 </div>
             </div>
-            <div class="col-2 text-right">
+            <div>
                 <button class="btn btn-primary btn-filter pull-left" (click)="viewFilters.emit(provider)">
                         <i class="fa fa-filter"></i>&nbsp;
                         <span class="label">Active Filters</span>&nbsp;
@@ -61,7 +61,7 @@
                         <div class="col text-right font-weight-bold">
                             Metadata Provider Status:
                         </div>
-                        <div class="col" *ngIf="!provider.enabled">
+                        <div class="col">
                             <i class="fa fa-fw" [ngClass]="{
                                 'fa-check-circle text-success': provider.enabled,
                                 'fa-times-circle text-danger': !provider.enabled

From 41d948fec6b3b1236ba1a2110722843594a6ee9f Mon Sep 17 00:00:00 2001
From: Jodie Muramoto <jmuramoto@unicon.net>
Date: Mon, 6 Aug 2018 17:43:24 -0700
Subject: [PATCH 16/39] SHIBUI-668: Updated Finish/Summary wizard navigation
 text to metadata source Finish/summary wizard navigation;;

---
 .../metadata/provider/model/file-backed-http.provider.form.ts | 4 ++--
 .../metadata/resolver/container/confirm-copy.component.html   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
index 4ac744009..17238df3b 100644
--- a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
@@ -45,8 +45,8 @@ export const FileBackedHttpMetadataProviderWizard: Wizard<FileBackedHttpMetadata
         },
         {
             id: 'summary',
-            label: 'FINISH SUMMARY AND VALIDATION',
-            index: null,
+            label: 'Finished!',
+            index: 5,
             initialValues: [],
             schema: 'assets/schema/provider/metadata-provider-summary.schema.json'
         }
diff --git a/ui/src/app/metadata/resolver/container/confirm-copy.component.html b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
index 3939bf935..f9a1ff437 100644
--- a/ui/src/app/metadata/resolver/container/confirm-copy.component.html
+++ b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
@@ -23,7 +23,7 @@
                 <li class="nav-item">
                     <h3 class="tag tag-primary">
                         <span class="index"><i class="fa fa-fw fa-check fa-lg"></i></span>
-                        <ng-container i18n="@@label--finish-summary-validation">FINISH SUMMARY AND VALIDATION</ng-container>
+                        <ng-container i18n="@@label--finish-summary-validation">5. Finished!</ng-container>
                     </h3>
                 </li>
                 <li class="nav-item">

From 3f44340c568b052fabf40e00f7e6af9d3d74ebe0 Mon Sep 17 00:00:00 2001
From: Jodie Muramoto <jmuramoto@unicon.net>
Date: Mon, 6 Aug 2018 17:55:12 -0700
Subject: [PATCH 17/39] SHIBUI-668: Updated copy resolver text not to include
 number; fixed check mark icon so it fits in the wizard nav;

---
 .../metadata/resolver/container/confirm-copy.component.html   | 4 ++--
 .../metadata/resolver/container/copy-resolver.component.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/metadata/resolver/container/confirm-copy.component.html b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
index f9a1ff437..36fd55936 100644
--- a/ui/src/app/metadata/resolver/container/confirm-copy.component.html
+++ b/ui/src/app/metadata/resolver/container/confirm-copy.component.html
@@ -22,8 +22,8 @@
                 </li>
                 <li class="nav-item">
                     <h3 class="tag tag-primary">
-                        <span class="index"><i class="fa fa-fw fa-check fa-lg"></i></span>
-                        <ng-container i18n="@@label--finish-summary-validation">5. Finished!</ng-container>
+                        <span class="index"><i class="fa fa-fw fa-check"></i></span>
+                        <ng-container i18n="@@label--finish-summary-validation">Finished!</ng-container>
                     </h3>
                 </li>
                 <li class="nav-item">
diff --git a/ui/src/app/metadata/resolver/container/copy-resolver.component.html b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
index 62f420492..f49d4e388 100644
--- a/ui/src/app/metadata/resolver/container/copy-resolver.component.html
+++ b/ui/src/app/metadata/resolver/container/copy-resolver.component.html
@@ -12,7 +12,7 @@ <h3 class="tag tag-primary">
                     <button class="nav-link next btn clearfix" (click)="next()" [disabled]="providerForm.invalid" aria-label="Next: Step 2, Organization information"
                         role="button">
                         <span class="label pull-left" i18n="@@label--finish-validate">
-                            FINISH AND VALIDATE
+                            Finished!
                         </span>
                         <span class="direction pull-right">
                             <i class="fa fa-fw fa-arrow-circle-right d-block fa-2x"></i>

From 576d48af5f3ca2a56fcc89fcf27bea0a081673c6 Mon Sep 17 00:00:00 2001
From: Jodie Muramoto <jmuramoto@unicon.net>
Date: Tue, 7 Aug 2018 08:15:26 -0700
Subject: [PATCH 18/39] SHIBUI-668: Matched enable checkbox and behavior
 (unchecked) with metadata source finish summary page;

---
 .../schema/provider/metadata-provider-summary.schema.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/assets/schema/provider/metadata-provider-summary.schema.json b/ui/src/assets/schema/provider/metadata-provider-summary.schema.json
index b3cc3b73c..1ef02d8bc 100644
--- a/ui/src/assets/schema/provider/metadata-provider-summary.schema.json
+++ b/ui/src/assets/schema/provider/metadata-provider-summary.schema.json
@@ -2,10 +2,10 @@
     "type": "object",
     "properties": {
         "enabled": {
-            "title": "Enable Metadata Provider",
-            "description": "Enable Metadata Provider",
+            "title": "Enable Metadata Provider upon saving?",
+            "description": "Enable Metadata Provider upon saving?",
             "type": "boolean",
-            "default": true
+            "default": false
         }
     }
-}
\ No newline at end of file
+}

From 8c6e0d61333b215ff26f647215f82cb32d79ed5c Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 7 Aug 2018 12:24:20 -0700
Subject: [PATCH 19/39] SHIBUI-736 Fixed bug with resolvers not appearing on
 dashboard

---
 .../app/metadata/manager/effect/search.effects.ts | 15 ++++++---------
 ui/src/app/metadata/manager/reducer/index.ts      |  5 -----
 .../metadata/manager/reducer/search.reducer.ts    | 14 +++++++++-----
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/ui/src/app/metadata/manager/effect/search.effects.ts b/ui/src/app/metadata/manager/effect/search.effects.ts
index fa3386def..e1da7c539 100644
--- a/ui/src/app/metadata/manager/effect/search.effects.ts
+++ b/ui/src/app/metadata/manager/effect/search.effects.ts
@@ -13,12 +13,6 @@ import { FileBackedHttpMetadataResolver } from '../../domain/entity';
 
 @Injectable()
 export class SearchEffects {
-    @Effect()
-    filter$ = this.actions$.pipe(
-        ofType<entitySearch.FilterAction>(entitySearch.ENTITY_FILTER),
-        switchMap(() => this.performSearch())
-    );
-
     @Effect()
     search$ = this.actions$.pipe(
         ofType<entitySearch.SearchAction>(entitySearch.ENTITY_SEARCH),
@@ -45,9 +39,12 @@ export class SearchEffects {
             ),
             combineLatest(
                 this.store.select(fromManager.getSearchQuery),
-                (entities, term) => entities.filter(
-                    e => this.matcher(e.name, term) || this.matcher(e.entityId, term)
-                )
+                (entities, term) => {
+                    const filtered = entities.filter(
+                        e => this.matcher(e.name, term) || this.matcher(e.entityId, term)
+                    );
+                    return filtered;
+                }
             ),
             map(entities => new entitySearch.SearchCompleteAction(entities))
         );
diff --git a/ui/src/app/metadata/manager/reducer/index.ts b/ui/src/app/metadata/manager/reducer/index.ts
index fae0c5418..2585fb182 100644
--- a/ui/src/app/metadata/manager/reducer/index.ts
+++ b/ui/src/app/metadata/manager/reducer/index.ts
@@ -31,15 +31,10 @@ export const getSearchResults = createSelector(
     getSearchState,
     fromSearch.getEntities
 );
-
 export const getSearchQuery = createSelector(
     getSearchState,
     fromSearch.getQuery
 );
-export const getFilterType = createSelector(
-    getSearchState,
-    fromSearch.getFilter
-);
 export const getSearchLoading = createSelector(
     getSearchState,
     fromSearch.getLoading
diff --git a/ui/src/app/metadata/manager/reducer/search.reducer.ts b/ui/src/app/metadata/manager/reducer/search.reducer.ts
index 8614cbf94..17e700abd 100644
--- a/ui/src/app/metadata/manager/reducer/search.reducer.ts
+++ b/ui/src/app/metadata/manager/reducer/search.reducer.ts
@@ -5,14 +5,12 @@ export interface SearchState {
     entities: MetadataEntity[];
     loading: boolean;
     query: string;
-    kind: string;
 }
 
 const initialState: SearchState = {
     entities: [],
     loading: false,
-    query: '',
-    kind: 'all'
+    query: ''
 };
 
 export function reducer(state = initialState, action: searchActions.Actions): SearchState {
@@ -25,6 +23,14 @@ export function reducer(state = initialState, action: searchActions.Actions): Se
             };
         }
 
+        case searchActions.ENTITY_SEARCH_COMPLETE: {
+            return {
+                entities: action.payload,
+                loading: false,
+                query: state.query
+            };
+        }
+
         default: {
             return state;
         }
@@ -36,5 +42,3 @@ export const getEntities = (state: SearchState) => state.entities;
 export const getQuery = (state: SearchState) => state.query;
 
 export const getLoading = (state: SearchState) => state.loading;
-
-export const getFilter = (state: SearchState) => state.kind;

From 15e46afafb1dcead6afe310d243efa3ca8e0278e Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 7 Aug 2018 20:40:54 +0000
Subject: [PATCH 20/39] Merged in feature/SHIBUI-629 (pull request #138)

SHIBUI-629 Implemented multi-entity-id selection for filters

Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>
Approved-by: Ryan Mathis <rmathis@unicon.net>
---
 .../filters/EntityAttributesFilterTarget.java |   2 +-
 ui/src/app/metadata/domain/domain.type.ts     |   4 +-
 .../domain/effect/entity.effect.spec.ts       |   4 +-
 .../filter/entity-attributes-filter.spec.ts   |  17 ++
 .../entity/filter/entity-attributes-filter.ts |   4 +-
 .../metadata/domain/model/metadata-filter.ts  |   3 +-
 .../domain/service/filter.service.spec.ts     |   6 +-
 .../container/edit-filter.component.html      | 201 +++-------------
 .../container/edit-filter.component.spec.ts   |  99 ++++++++
 .../filter/container/edit-filter.component.ts | 181 +++-----------
 .../container/new-filter.component.html       | 156 ++----------
 .../container/new-filter.component.spec.ts    |  34 ++-
 .../filter/container/new-filter.component.ts  | 135 +++--------
 .../filter/effect/collection.effect.ts        |   4 +-
 .../metadata/filter/effect/filter.effect.ts   |  18 +-
 ui/src/app/metadata/filter/filter.module.ts   |   4 +-
 .../model/entity-attributes.filter.spec.ts    |  14 ++
 .../filter/model/entity-attributes.filter.ts  |  16 ++
 ui/src/app/metadata/filter/model/index.ts     |   7 +
 .../filter/reducer/collection.reducer.spec.ts |  18 +-
 .../filter/reducer/filter.reducer.spec.ts     |  10 +-
 .../app/metadata/filter/reducer/index.spec.ts |  21 ++
 ui/src/app/metadata/filter/reducer/index.ts   |   7 +-
 .../app/metadata/provider/provider.routing.ts |   2 -
 ui/src/app/schema-form/registry.ts            |  10 +-
 ui/src/app/schema-form/schema-form.module.ts  |  12 +-
 .../service/schema.service.spec.ts            |  45 ++++
 .../widget/array/array.component.html         |   6 +
 .../widget/check/checklist.component.html     |  51 ++++
 .../widget/check/checklist.component.ts       |  41 ++++
 .../widget/datalist/datalist.component.html   |   2 +-
 .../widget/fieldset/fieldset.component.html   |  28 ++-
 .../filter-target.component.html              |  61 +++++
 .../filter-target.component.scss              |   3 +
 .../filter-target/filter-target.component.ts  | 112 +++++++++
 .../widget/string/string.component.html       |   2 +-
 .../autocomplete/autocomplete.component.html  |   2 +-
 .../autocomplete/autocomplete.component.ts    |   3 +-
 .../contenteditable.directive.spec.ts         |  67 ++++++
 .../contenteditable.directive.ts              |  64 +++++
 ui/src/app/shared/shared.module.ts            |   7 +-
 ui/src/app/wizard/model/form-definition.ts    |  10 +
 ui/src/app/wizard/model/index.ts              |   1 +
 ui/src/app/wizard/model/wizard.ts             |  12 +-
 .../filter/entity-attributes.schema.json      | 225 ++++++++++++++++++
 .../schema/filter/metadata-filter.schema.json |  48 ++++
 ui/src/styles.scss                            |   1 +
 ui/src/theme/forms.scss                       |   7 +
 ui/src/theme/list.scss                        |  16 ++
 49 files changed, 1165 insertions(+), 638 deletions(-)
 create mode 100644 ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts
 create mode 100644 ui/src/app/metadata/filter/model/entity-attributes.filter.spec.ts
 create mode 100644 ui/src/app/metadata/filter/model/entity-attributes.filter.ts
 create mode 100644 ui/src/app/metadata/filter/model/index.ts
 create mode 100644 ui/src/app/metadata/filter/reducer/index.spec.ts
 create mode 100644 ui/src/app/schema-form/service/schema.service.spec.ts
 create mode 100644 ui/src/app/schema-form/widget/check/checklist.component.html
 create mode 100644 ui/src/app/schema-form/widget/check/checklist.component.ts
 create mode 100644 ui/src/app/schema-form/widget/filter-target/filter-target.component.html
 create mode 100644 ui/src/app/schema-form/widget/filter-target/filter-target.component.scss
 create mode 100644 ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
 create mode 100644 ui/src/app/shared/contenteditable/contenteditable.directive.spec.ts
 create mode 100644 ui/src/app/shared/contenteditable/contenteditable.directive.ts
 create mode 100644 ui/src/app/wizard/model/form-definition.ts
 create mode 100644 ui/src/assets/schema/filter/entity-attributes.schema.json
 create mode 100644 ui/src/assets/schema/filter/metadata-filter.schema.json
 create mode 100644 ui/src/theme/list.scss

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 68cab1d4c..5effdae3d 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
@@ -16,7 +16,7 @@
 @EqualsAndHashCode(callSuper = true)
 public class EntityAttributesFilterTarget extends AbstractAuditable {
     public enum EntityAttributesFilterTargetType {
-        ENTITY, CONDITION_SCRIPT, CONDITION_REF
+        ENTITY, CONDITION_SCRIPT, CONDITION_REF, REGEX
     }
 
     private static Logger LOGGER = LoggerFactory.getLogger(EntityAttributesFilterTarget.class);
diff --git a/ui/src/app/metadata/domain/domain.type.ts b/ui/src/app/metadata/domain/domain.type.ts
index 3cda36b83..e62766ed8 100644
--- a/ui/src/app/metadata/domain/domain.type.ts
+++ b/ui/src/app/metadata/domain/domain.type.ts
@@ -5,7 +5,7 @@ import {
 } from './model';
 
 import {
-    EntityAttributesFilter,
+    EntityAttributesFilterEntity,
     FileBackedHttpMetadataResolver
 } from './entity';
 import {
@@ -13,7 +13,7 @@ import {
 } from './model/providers';
 
 export type Filter =
-    | EntityAttributesFilter;
+    | EntityAttributesFilterEntity;
 
 export type Resolver =
     | FileBackedHttpMetadataResolver;
diff --git a/ui/src/app/metadata/domain/effect/entity.effect.spec.ts b/ui/src/app/metadata/domain/effect/entity.effect.spec.ts
index d42817b6e..710b55909 100644
--- a/ui/src/app/metadata/domain/effect/entity.effect.spec.ts
+++ b/ui/src/app/metadata/domain/effect/entity.effect.spec.ts
@@ -8,7 +8,7 @@ import { EntityIdService } from '../service/entity-id.service';
 import { ResolverService } from '../service/resolver.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { NgbModalStub } from '../../../../testing/modal.stub';
-import { EntityAttributesFilter } from '../entity';
+import { EntityAttributesFilterEntity } from '../entity';
 
 describe('Entity Effects', () => {
     let effects: EntityEffects;
@@ -48,7 +48,7 @@ describe('Entity Effects', () => {
         it('should open a modal window', fakeAsync(() => {
             spyOn(modal, 'open').and.returnValue({componentInstance: <any>{}});
             spyOn(idService, 'preview').and.returnValue(of('<foo></foo>'));
-            effects.openModal(new EntityAttributesFilter());
+            effects.openModal(new EntityAttributesFilterEntity());
             expect(idService.preview).toHaveBeenCalled();
             tick(10);
             expect(modal.open).toHaveBeenCalled();
diff --git a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts
new file mode 100644
index 000000000..04d1234be
--- /dev/null
+++ b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts
@@ -0,0 +1,17 @@
+import { EntityAttributesFilterEntity } from './entity-attributes-filter';
+
+describe('EntityAttributesFilter Entity', () => {
+    let entity: EntityAttributesFilterEntity;
+    beforeEach(() => {
+        entity = new EntityAttributesFilterEntity({
+            resourceId: 'foo',
+            filterEnabled: false
+        });
+    });
+
+    it('should be an instance', () => {
+        expect(entity).toBeDefined();
+        expect(entity.resourceId).toBe('foo');
+        expect(entity.enabled).toBe(entity.filterEnabled);
+    });
+});
diff --git a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts
index c3b9edc98..304e6055e 100644
--- a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts
+++ b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.ts
@@ -2,7 +2,7 @@ import { MetadataFilter, MetadataEntity, RelyingPartyOverrides } from '../../mod
 import { MetadataTypes } from '../../domain.type';
 import { FilterTarget } from '../../model';
 
-export class EntityAttributesFilter implements MetadataFilter, MetadataEntity {
+export class EntityAttributesFilterEntity implements MetadataFilter, MetadataEntity {
     createdDate?: string;
     modifiedDate?: string;
     version: string;
@@ -25,7 +25,7 @@ export class EntityAttributesFilter implements MetadataFilter, MetadataEntity {
         value: ['']
     };
 
-    constructor(obj?: Partial<EntityAttributesFilter>) {
+    constructor(obj?: Partial<EntityAttributesFilterEntity>) {
         Object.assign(this, { ...obj });
     }
 
diff --git a/ui/src/app/metadata/domain/model/metadata-filter.ts b/ui/src/app/metadata/domain/model/metadata-filter.ts
index 093fc4cf6..5cb50e2ea 100644
--- a/ui/src/app/metadata/domain/model/metadata-filter.ts
+++ b/ui/src/app/metadata/domain/model/metadata-filter.ts
@@ -1,11 +1,10 @@
 import { MetadataBase } from './metadata-base';
 
 export interface MetadataFilter extends MetadataBase {
-    entityId: string;
     name: string;
     filterEnabled?: boolean;
     type: string;
     resourceId: string;
 
-    serialize(): any;
+    [key: string]: any;
 }
diff --git a/ui/src/app/metadata/domain/service/filter.service.spec.ts b/ui/src/app/metadata/domain/service/filter.service.spec.ts
index 571940935..218054885 100644
--- a/ui/src/app/metadata/domain/service/filter.service.spec.ts
+++ b/ui/src/app/metadata/domain/service/filter.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, async, inject } from '@angular/core/testing';
 import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing';
 import { HttpClientModule, HttpRequest } from '@angular/common/http';
 import { MetadataFilterService } from './filter.service';
-import { EntityAttributesFilter } from '../entity';
+import { EntityAttributesFilterEntity } from '../entity';
 
 describe(`Metadata Filter Service`, () => {
 
@@ -49,7 +49,7 @@ describe(`Metadata Filter Service`, () => {
         it(`should send an expected PUT request`, async(inject([MetadataFilterService, HttpTestingController],
             (service: MetadataFilterService, backend: HttpTestingController) => {
                 const id = 'bar';
-                const filter = new EntityAttributesFilter({ resourceId: id });
+                const filter = new EntityAttributesFilterEntity({ resourceId: id });
                 service.update(provider, filter).subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
@@ -63,7 +63,7 @@ describe(`Metadata Filter Service`, () => {
         it(`should send an expected POST request`, async(inject([MetadataFilterService, HttpTestingController],
             (service: MetadataFilterService, backend: HttpTestingController) => {
                 const id = 'bar';
-                const filter = new EntityAttributesFilter({ id });
+                const filter = new EntityAttributesFilterEntity({ resourceId: id });
                 service.save(provider, filter).subscribe();
 
                 backend.expectOne((req: HttpRequest<any>) => {
diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.html b/ui/src/app/metadata/filter/container/edit-filter.component.html
index 2a2267d26..3dedb28f6 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.html
@@ -1,184 +1,41 @@
 <div class="container-fluid p-3" role="main">
-    <section class="section" *ngIf="filter$ | async">
+    <section class="section">
         <div class="section-header bg-info p-2 text-white">
             <div class="row justify-content-between">
                 <div class="col-md-12">
                     <span class="display-6">
                         <i class="fa fa-fw fa-gears"></i>
-                        <ng-container i18n="@@label--edit-filter">Edit Filter - {{ (filter$ | async).name }}</ng-container>
+                        <ng-container i18n="@@label--new-filter">new EntityAttributesFilter</ng-container>
                     </span>
                 </div>
             </div>
         </div>
-        <div class="section-body p-4 border border-top-0 border-info">
-            <form [formGroup]="form">
-                <div class="row">
-                    <div class="col-lg-6 col-xs-9 ">
-                        <fieldset class="">
-                            <div class="form-group">
-                                <div class="row">
-                                    <label for="name" class="col-sm-10">
-                                        <span>
-                                            <ng-container i18n="@@label--filter-name">
-                                                Filter Name
-                                            </ng-container>
-                                            <ng-container i18n="@@label--dashboard-display-only">
-                                                (Dashboard Display Only)
-                                            </ng-container>
-                                            <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
-                                        </span>
-                                    </label>
-                                    <span class="text-right col-sm-2">
-                                        <ng-template #tooltipFilterName i18n="@@tooltip--filter-name">Filter Name</ng-template>
-                                        <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltipFilterName" i18n-aria-label="@@tooltip--instruction"
-                                            aria-label="Information icon - press spacebar to read additional information for this form field"></i>
-                                    </span>
-                                </div>
-                                <input id="name" type="text" class="form-control" placeholder="" formControlName="name" />
-                                <ng-container *ngIf="form.get('name').touched && form.get('name').invalid">
-                                    <small class="form-text text-danger" *ngIf="form.get('name').hasError('required')">
-                                        <ng-container i18n="@@message--filter-name-required">Filter Name is required</ng-container>
-                                    </small>
-                                </ng-container>
-                            </div>
-                            <div class="form-group">
-                                <div class="row">
-                                    <label for="entityId" class="col-sm-10">
-                                        <span>
-                                            <ng-container i18n="@@label--search-entity-id">Search Entity ID</ng-container>
-                                            <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
-                                            <i class="fa fa-fw fa-spinner fa-pulse fa-fw" *ngIf="processing$ | async"></i>
-                                        </span>
-                                    </label>
-                                    <span class="text-right col-sm-2">
-                                        <ng-template #tooltipFilterEntityId i18n="@@tooltip--search-entity-id">Search Entity ID</ng-template>
-                                        <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltipFilterEntityId" i18n-aria-label="@@tooltip--instruction"
-                                            aria-label="Information icon - press spacebar to read additional information for this form field"></i>
-                                    </span>
-                                </div>
-                                <label for="entityId" class="sr-only" i18n="@@label--search-entity-id">Search Entity ID</label>
-                                <div class="row">
-                                    <div class="col-9">
-                                        <auto-complete id="entityId"
-                                            #entityInput
-                                            class="component-control"
-                                            formControlName="entityId"
-                                            limit="10"
-                                            [matches]="entityIds$ | async"
-                                            [required]="true"
-                                            [processing]="(processing$ | async)"
-                                            (more)="onViewMore($event)">
-                                        </auto-complete>
-                                        <small class="form-text text-muted" i18n="@@label--min-chars">
-                                            Minimum 4 characters.
-                                        </small>
-                                        <ng-container *ngIf="form.get('entityId').touched && form.get('entityId').invalid">
-                                            <small class="form-text text-danger">
-                                                <ng-container *ngIf="form.get('entityId').hasError('required')" i18n="@@message--entity-id-required">Entity ID is required</ng-container>
-                                                <ng-container *ngIf="form.get('entityId').hasError('exists')" i18n="@@message--entity-id-not-found">Entity ID not found</ng-container>
-                                            </small>
-                                        </ng-container>
-                                    </div>
-                                    <div class="col-3">
-                                        <button
-                                            *ngIf="form.get('entityId').disabled"
-                                            class="btn btn-block btn-secondary"
-                                            type="button"
-                                            (click)="onChangeId()">
-                                            Change ID
-                                        </button>
-                                        <button
-                                            *ngIf="form.get('entityId').enabled"
-                                            class="btn btn-block btn-outline-secondary"
-                                            type="button"
-                                            (click)="onCancelChangeId()">
-                                            Cancel
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-                        </fieldset>
-                    </div>
-                    <div class="col-lg-6 col-xs-3 text-right">
-                        <button (click)="this.preview(filter)" type="submit" class="btn btn-success">
-                            <i class="fa fa-fw fa-eye fa-lg"></i>
-                            <ng-container i18n="@@action--save">Preview XML</ng-container>
-                        </button>
-                        &nbsp;
-                        <button
-                            (click)="this.save($event)"
-                            type="submit"
-                            class="btn btn-primary"
-                            [disabled]="form.invalid || (isSaving$ | async)">
-                            <i class="fa fa-fw fa-lg"
-                                [ngClass]="{
-                                    'fa-save': !(isSaving$ | async),
-                                    'fa-spinner': (isSaving$ | async),
-                                    'fa-pulse': (isSaving$ | async)
-                                }"></i>
-                            <ng-container i18n="@@action--save">Save</ng-container>
-                        </button>
-                        &nbsp;
-                        <button
-                            (click)="this.cancel()"
-                            type="reset"
-                            class="btn btn-secondary"
-                            [disabled]="isSaving$ | async   ">
-                            <ng-container i18n="@@action--cancel">Cancel</ng-container>
-                        </button>
-                    </div>
-                </div>
-                <section>
-                    <hr />
-                    <div class="row" *ngIf="preview$ | async">
-                        <fieldset class="col-lg-6">
-                            <div class="form-group">
-                                <div class="row">
-                                    <label for="name" class="col-sm-10"  i18n="@@label--entity-preview">
-                                         Entity ID Preview (read-only)
-                                    </label>
-                                    <span class="text-right col-sm-2">
-                                        <ng-template #tooltipName i18n="@@tooltip--entity-preview">Entity Preview</ng-template>
-                                        <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltipName" i18n-aria-label="@@tooltip--instruction"
-                                            aria-label="Information icon - press spacebar to read additional information for this form field"></i>
-                                    </span>
-                                </div>
-                                <dl>
-                                    <dt class="text-primary" i18n="@@label--display-name">Display Name</dt>
-                                    <dd class="value">{{ (preview$ | async).displayName }}</dd>
-                                    <dt class="text-primary" i18n="@@label--description">Description</dt>
-                                    <dd class="value">{{ (preview$ | async).description || '&mdash;' }}</dd>
-                                </dl>
-                            </div>
-                            <hr />
-                        </fieldset>
-                    </div>
-                    <div class="row">
-                        <div class="col-12">
-                            <div class="form-group">
-                                <div class="custom-control custom-checkbox custom-control-inline custom-control-reverse" for="filterEnabled">
-                                    <input disableValidation="true" class="custom-control-input" type="checkbox" formControlName="filterEnabled" id="filterEnabled"
-                                        name="filterEnabled" role="checkbox">
-                                    <label class="custom-control-label" i18n="@@label--enable-this-filter" for="filterEnabled" aria-label="Enable this filter?">
-                                        Enable this filter?
-                                    </label>
-                                </div>
-                                <ng-template #tooltipEnableThisFilterUponSaving i18n="@@tooltip--enable-this-filter-upon-saving">Enable this filter upon saving popover</ng-template>
-                                <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltipEnableThisFilterUponSaving" i18n-aria-label="@@tooltip--instruction"
-                                    role="tooltip"></i>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row" *ngIf="filter$ | async">
-                        <div class="col-lg-6">
-                            <relying-party-form [resolver]="filter$ | async"></relying-party-form>
-                        </div>
-                        <div class="col-lg-6">
-                            <attribute-release-form [resolver]="filter$ | async"></attribute-release-form>
-                        </div>
-                    </div>
-                </section>
-            </form>
+        <div class="section-body p-4 border border-top-0 border-info" *ngIf="schema$ | async">
+            <div class="mx-3 my-2 d-flex justify-content-end">
+                <button (click)="this.preview(filter)" type="submit" class="btn btn-success">
+                    <i class="fa fa-fw fa-eye fa-lg"></i>
+                    <ng-container i18n="@@action--save">Preview XML</ng-container>
+                </button>
+                &nbsp;
+                <button (click)="this.save()" type="submit" class="btn btn-primary" [disabled]="!isValid || (isSaving$ | async)">
+                    <i class="fa fa-fw fa-lg" [ngClass]="{
+                        'fa-save': !(isSaving$ | async),
+                        'fa-spinner': (isSaving$ | async),
+                        'fa-pulse': (isSaving$ | async)
+                    }"></i>
+                    <ng-container i18n="@@action--save">Save</ng-container>
+                </button>
+                &nbsp;
+                <button (click)="this.cancel()" type="reset" class="btn btn-secondary" [disabled]="isSaving$ | async">
+                    <ng-container i18n="@@action--cancel">Cancel</ng-container>
+                </button>
+            </div>
+            <sf-form
+                [schema]="schema$ | async"
+                [model]="model$ | async"
+                [validators]="definition.getValidators()"
+                (onChange)="valueChangeSubject.next($event)"
+                (onErrorChange)="statusChangeSubject.next($event)"></sf-form>
         </div>
     </section>
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.spec.ts b/ui/src/app/metadata/filter/container/edit-filter.component.spec.ts
index e69de29bb..8f632b0d8 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.spec.ts
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.spec.ts
@@ -0,0 +1,99 @@
+import { TestBed, ComponentFixture } from '@angular/core/testing';
+import { ReactiveFormsModule, FormBuilder } from '@angular/forms';
+import { StoreModule, Store, combineReducers } from '@ngrx/store';
+import { NewFilterComponent } from './new-filter.component';
+import * as fromFilter from '../reducer';
+import { ProviderEditorFormModule } from '../../domain/component';
+import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
+import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap';
+import { NavigatorService } from '../../../core/service/navigator.service';
+import { SharedModule } from '../../../shared/shared.module';
+import { EditFilterComponent } from './edit-filter.component';
+import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form';
+import { SchemaService } from '../../../schema-form/service/schema.service';
+import { HttpClientModule } from '@angular/common/http';
+
+describe('New Metadata Filter Page', () => {
+    let fixture: ComponentFixture<EditFilterComponent>;
+    let store: Store<fromFilter.State>;
+    let instance: EditFilterComponent;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            providers: [
+                ProviderStatusEmitter,
+                ProviderValueEmitter,
+                FormBuilder,
+                NgbPopoverConfig,
+                NavigatorService,
+                SchemaService,
+                { provide: WidgetRegistry, useClass: DefaultWidgetRegistry }
+            ],
+            imports: [
+                StoreModule.forRoot({
+                    'filter': combineReducers(fromFilter.reducers),
+                }),
+                ReactiveFormsModule,
+                ProviderEditorFormModule,
+                NgbPopoverModule,
+                SharedModule,
+                HttpClientModule,
+                SchemaFormModule.forRoot()
+            ],
+            declarations: [
+                EditFilterComponent
+            ],
+        });
+
+        fixture = TestBed.createComponent(EditFilterComponent);
+        instance = fixture.componentInstance;
+        store = TestBed.get(Store);
+
+        spyOn(store, 'dispatch').and.callThrough();
+    });
+
+    it('should compile', () => {
+        fixture.detectChanges();
+
+        expect(fixture).toBeDefined();
+    });
+
+    describe('cancel method', () => {
+        it('should dispatch a cancel changes action', () => {
+            fixture.detectChanges();
+            instance.cancel();
+            expect(store.dispatch).toHaveBeenCalled();
+        });
+    });
+
+    describe('preview method', () => {
+        it('should dispatch a cancel changes action', () => {
+            fixture.detectChanges();
+            instance.cancel();
+            expect(store.dispatch).toHaveBeenCalled();
+        });
+    });
+
+    describe('status emitter', () => {
+        it('should set the isValid property to true', () => {
+            fixture.detectChanges();
+            instance.statusChangeSubject.next({value: []});
+            fixture.detectChanges();
+            expect(instance.isValid).toBe(true);
+        });
+
+        it('should set the isValid property to true if value is undefined', () => {
+            fixture.detectChanges();
+            instance.statusChangeSubject.next({value: null});
+            fixture.detectChanges();
+            expect(instance.isValid).toBe(true);
+        });
+
+        it('should set the isValid property to false', () => {
+            fixture.detectChanges();
+            instance.statusChangeSubject.next({ value: [{control: 'foo'}] });
+            fixture.detectChanges();
+            expect(instance.isValid).toBe(false);
+        });
+    });
+});
diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.ts b/ui/src/app/metadata/filter/container/edit-filter.component.ts
index d2921013f..f12429000 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.ts
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.ts
@@ -1,178 +1,67 @@
-import { Component, OnInit, OnDestroy, SimpleChanges, ViewChild, ElementRef } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Observable, Subject } from 'rxjs';
-import { withLatestFrom, distinctUntilChanged, takeUntil, startWith, filter } from 'rxjs/operators';
+import { Subject, Observable, of } from 'rxjs';
 
-import * as fromRoot from '../../../app.reducer';
 import * as fromFilter from '../reducer';
-
-import { ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
-import { CancelCreateFilter, SelectId, UpdateFilterChanges } from '../action/filter.action';
-import { UpdateFilterRequest } from '../../filter/action/collection.action';
-import { MetadataFilter } from '../../domain/model/metadata-filter';
-import { EntityValidators } from '../../domain/service/entity-validators.service';
-import { QueryEntityIds, ViewMoreIds, ClearSearch } from '../action/search.action';
-import { AutoCompleteComponent } from '../../../shared/autocomplete/autocomplete.component';
-import { MDUI } from '../../domain/model';
+import { MetadataFilterTypes, EntityAttributesFilter } from '../model';
+import { FormDefinition } from '../../../wizard/model';
+import { MetadataFilter, MetadataEntity } from '../../domain/model';
+import { SchemaService } from '../../../schema-form/service/schema.service';
+import { UpdateFilterRequest } from '../action/collection.action';
+import { CancelCreateFilter, UpdateFilterChanges } from '../action/filter.action';
 import { PreviewEntity } from '../../domain/action/entity.action';
-import { MetadataEntity } from '../../domain/model';
-import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
+import { EntityAttributesFilterEntity } from '../../domain/entity';
 
 @Component({
     selector: 'edit-filter-page',
     templateUrl: './edit-filter.component.html'
 })
-export class EditFilterComponent implements OnInit, OnDestroy {
-
-    @ViewChild(AutoCompleteComponent) entityInput: AutoCompleteComponent;
+export class EditFilterComponent {
 
-    private ngUnsubscribe: Subject<void> = new Subject<void>();
+    valueChangeSubject = new Subject<Partial<any>>();
+    private valueChangeEmitted$ = this.valueChangeSubject.asObservable();
 
-    changeId = false;
+    statusChangeSubject = new Subject<{ value: any[] }>();
+    private statusChangeEmitted$ = this.statusChangeSubject.asObservable();
 
-    changes$: Observable<MetadataFilter>;
-    changes: MetadataFilter;
+    definition: FormDefinition<MetadataFilter>;
+    schema$: Observable<any>;
 
-    ids: string[];
-    entityIds$: Observable<string[]>;
-    showMore$: Observable<boolean>;
-    selected$: Observable<string>;
-    filter$: Observable<MetadataFilter>;
-    loading$: Observable<boolean>;
-    processing$: Observable<boolean>;
-    preview$: Observable<MDUI>;
+    model$: Observable<MetadataFilter>;
     isSaving$: Observable<boolean>;
-
-    form: FormGroup = this.fb.group({
-        entityId: [
-            '',
-            [Validators.required]
-        ],
-        name: ['', [Validators.required]],
-        filterEnabled: [false]
-    });
-
     filter: MetadataFilter;
-    filterEntity: EntityAttributesFilter;
-
-    isValid = false;
+    isValid: boolean;
 
     constructor(
-        private store: Store<fromRoot.State>,
-        private valueEmitter: ProviderValueEmitter,
-        private fb: FormBuilder
+        private store: Store<fromFilter.State>,
+        private schemaService: SchemaService
     ) {
-        this.changes$ = this.store.select(fromFilter.getFilterWithChanges);
-        this.changes$
-            .pipe(
-                distinctUntilChanged()
-            )
-            .subscribe(c => {
-                this.changes = new EntityAttributesFilter(c);
-            });
+        this.definition = MetadataFilterTypes.EntityAttributesFilter;
 
-        this.showMore$ = this.store.select(fromFilter.getViewingMore);
-        this.selected$ = this.store.select(fromFilter.getSelected);
-        this.filter$ = this.store.select(fromFilter.getSelectedFilter);
-        this.entityIds$ = this.store.select(fromFilter.getEntityCollection);
-        this.loading$ = this.store.select(fromFilter.getIsLoading);
-        this.processing$ = this.loading$.pipe(withLatestFrom(this.showMore$, (l, s) => !s && l));
-        this.preview$ = this.store.select(fromFilter.getPreview);
+        this.schema$ = this.schemaService.get(this.definition.schema);
         this.isSaving$ = this.store.select(fromFilter.getSaving);
+        this.model$ = this.store.select(fromFilter.getSelectedFilter);
 
-        this.entityIds$.subscribe(ids => this.ids = ids);
-
-        this.filter$
-            .pipe(
-                filter(f => !!f)
-            )
-            .subscribe(filter => {
-                this.filterEntity = new EntityAttributesFilter(filter);
-                let { entityId, name, filterEnabled } = this.filterEntity;
-                this.form.patchValue({
-                    entityId,
-                    name,
-                    filterEnabled
-                });
-                this.filter = filter;
-                this.store.dispatch(new SelectId(entityId));
+        this.valueChangeEmitted$.subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes.value)));
+        this.statusChangeEmitted$.subscribe(valid => {
+            this.isValid = valid.value ? valid.value.length === 0 : true;
+        });
 
-                this.form.get('entityId').disable();
-            });
+        this.store
+            .select(fromFilter.getFilter)
+            .subscribe(filter => this.filter = filter);
     }
 
-    ngOnInit(): void {
-        let id = this.form.get('entityId');
-        id.valueChanges.pipe(distinctUntilChanged())
-            .subscribe(query => this.searchEntityIds(query));
-
-        this.form.valueChanges.pipe(
-            takeUntil(this.ngUnsubscribe),
-            startWith(this.form.value)
-        ).subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes)));
-
-        this.valueEmitter.changeEmitted$.pipe(
-            takeUntil(this.ngUnsubscribe),
-            startWith(this.form.value)
-        ).subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes)));
-
-        id.valueChanges
-            .pipe(distinctUntilChanged())
-            .subscribe(entityId => id.valid ? this.store.dispatch(new SelectId(entityId)) : null);
-
-        this.selected$
-            .pipe(distinctUntilChanged())
-            .subscribe(entityId => id.setValue(entityId));
-    }
-
-    ngOnDestroy(): void {
-        this.ngUnsubscribe.next();
-        this.ngUnsubscribe.complete();
-    }
-
-    onChangeId(): void {
-        const input = this.form.get('entityId');
-        input.enable();
-        input.setAsyncValidators(EntityValidators.existsInCollection(this.store.select(fromFilter.getEntityCollection)));
-        input.reset('');
-        this.entityInput.inputField.nativeElement.focus();
-    }
-
-    onCancelChangeId(): void {
-        const input = this.form.get('entityId');
-        input.disable();
-        input.clearAsyncValidators();
-        input.setValue(this.filterEntity.entityId);
-    }
-
-    searchEntityIds(term: string): void {
-        if (term && term.length >= 4 && this.ids.indexOf(term) < 0) {
-            this.store.dispatch(new QueryEntityIds({
-                term,
-                limit: 10
-            }));
-        }
-    }
-
-    onViewMore(query: string): void {
-        this.store.dispatch(new ViewMoreIds(query));
-    }
-
-    onStatusChange(status): void {
-        this.isValid = status === 'VALID';
-    }
-
-    save($event): void {
-        $event.preventDefault();
-        this.store.dispatch(new UpdateFilterRequest({...this.filter, ...this.changes.serialize()}));
+    save(): void {
+        this.store.dispatch(new UpdateFilterRequest(this.filter));
     }
 
     cancel(): void {
         this.store.dispatch(new CancelCreateFilter());
     }
 
-    preview(entity: MetadataEntity): void {
-        this.store.dispatch(new PreviewEntity(new EntityAttributesFilter(entity)));
+    preview(entity: MetadataFilter): void {
+        this.store.dispatch(new PreviewEntity(new EntityAttributesFilterEntity(entity)));
     }
 }
+
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.html b/ui/src/app/metadata/filter/container/new-filter.component.html
index 0985f9764..2ab55b2ae 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.html
+++ b/ui/src/app/metadata/filter/container/new-filter.component.html
@@ -10,141 +10,27 @@
                 </div>
             </div>
         </div>
-        <div class="section-body p-4 border border-top-0 border-info">
-            <form [formGroup]="form">
-                <div class="row">
-                    <div class="col-lg-6 col-xs-9 ">
-                        <fieldset class="">
-                            <div class="form-group">
-                                <div class="row">
-                                    <label for="name" class="col-sm-10">
-                                        <span>
-                                            <ng-container i18n="@@label--filter-name">
-                                                Filter Name
-                                            </ng-container>
-                                            <ng-container i18n="@@label--dashboard-display-only">
-                                                (Dashboard Display Only)
-                                            </ng-container>
-                                            <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
-                                        </span>
-                                    </label>
-                                    <span class="text-right col-sm-2">
-                                        <ng-template #tooltipName i18n="@@tooltip--filter-name">Filter Name</ng-template>
-                                        <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltipName" i18n-aria-label="@@tooltip--instruction"
-                                            aria-label="Information icon - press spacebar to read additional information for this form field"></i>
-                                    </span>
-                                </div>
-                                <input id="name" type="text" class="form-control" placeholder="" formControlName="name" />
-                                <ng-container *ngIf="form.get('name').touched && form.get('name').invalid">
-                                    <small class="form-text text-danger" *ngIf="form.get('name').hasError('required')">
-                                        <ng-container i18n="@@message--service-provider-name-required">Filter Name is required</ng-container>
-                                    </small>
-                                </ng-container>
-                            </div>
-                            <div class="form-group">
-                                <div class="row">
-                                    <label for="entityId" class="col-sm-10">
-                                        <span>
-                                            <ng-container i18n="@@label--search-entity-id">Search Entity ID</ng-container>
-                                            <i class="fa fa-fw fa-asterisk text-danger" aria-hidden="true"></i>
-                                            <i class="fa fa-fw fa-spinner fa-pulse fa-fw" *ngIf="processing$ | async"></i>
-                                        </span>
-                                    </label>
-                                    <span class="text-right col-sm-2">
-                                        <ng-template #tooltipFilterEntityId i18n="@@tooltip--search-entity-id">Search Entity ID</ng-template>
-                                        <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltipFilterEntityId" i18n-aria-label="@@tooltip--instruction"
-                                            aria-label="Information icon - press spacebar to read additional information for this form field"></i>
-                                    </span>
-                                </div>
-                                <label for="entityId" class="sr-only">Search Entity ID</label>
-                                <auto-complete id="entityId" class="component-control" formControlName="entityId" limit="10" [matches]="entityIds$ | async"
-                                    [required]="true" [processing]="(processing$ | async)" (more)="onViewMore($event)">
-                                </auto-complete>
-                                <small class="form-text text-muted" i18n="@@label--min-4-chars">
-                                    Minimum 4 characters.
-                                </small>
-                                <ng-container *ngIf="form.get('entityId').touched && form.get('entityId').invalid">
-                                    <small class="form-text text-danger">
-                                        <ng-container *ngIf="form.get('entityId').hasError('required')" i18n="@@message--entity-id-required">Entity ID is required</ng-container>
-                                        <ng-container *ngIf="form.get('entityId').hasError('exists')" i18n="@@message--entity-id-not-found">Entity ID not found</ng-container>
-                                    </small>
-                                </ng-container>
-                            </div>
-                        </fieldset>
-                    </div>
-                    <div class="col-lg-6 col-xs-3 text-right">
-                        <button (click)="this.save()"
-                            type="submit"
-                            class="btn btn-primary"
-                            [disabled]="form.invalid || (isSaving$ | async)">
-                            <i class="fa fa-fw fa-lg"
-                                [ngClass]="{
-                                    'fa-save': !(isSaving$ | async),
-                                    'fa-spinner': (isSaving$ | async),
-                                    'fa-pulse': (isSaving$ | async)
-                                }"></i>
-                            <ng-container i18n="@@action--save">Save</ng-container>
-                        </button>
-                         &nbsp;
-                        <button (click)="this.cancel()"
-                            type="reset"
-                            class="btn btn-secondary"
-                            [disabled]="isSaving$ | async">
-                            <ng-container i18n="@@action--cancel">Cancel</ng-container>
-                        </button>
-                    </div>
-                </div>
-                <section *ngIf="form.get('entityId').valid">
-                    <hr />
-                    <div class="row" *ngIf="preview$ | async">
-                        <fieldset class="col-lg-6">
-                            <div class="form-group">
-                                <div class="row">
-                                    <label for="name" class="col-sm-10" i18n="@@label--entity-preview">
-                                        Entity ID Preview (read-only)
-                                    </label>
-                                    <span class="text-right col-sm-2">
-                                        <ng-template #tooltipName i18n="@@tooltip--entity-preview">Entity Preview</ng-template>
-                                        <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltipName" i18n-aria-label="@@tooltip--instruction"
-                                            aria-label="Information icon - press spacebar to read additional information for this form field"></i>
-                                    </span>
-                                </div>
-                                <dl>
-                                    <dt class="text-primary" i18n="@@label--display-name">Display Name</dt>
-                                    <dd class="value">{{ (preview$ | async).displayName }}</dd>
-                                    <dt class="text-primary" i18n="@@label--description">Description</dt>
-                                    <dd class="value">{{ (preview$ | async).description || '&mdash;' }}</dd>
-                                </dl>
-                            </div>
-                            <hr />
-                        </fieldset>
-                    </div>
-                    <div class="row">
-                        <div class="col-12">
-                            <div class="form-group">
-                                <div class="custom-control custom-checkbox custom-control-inline custom-control-reverse" for="filterEnabled">
-                                    <input disableValidation="true" class="custom-control-input" type="checkbox" formControlName="filterEnabled" id="filterEnabled"
-                                        name="filterEnabled" role="checkbox">
-                                    <label class="custom-control-label" i18n="@@label--enable-this-filter" for="filterEnabled" aria-label="Enable this filter?">
-                                        Enable this filter?
-                                    </label>
-                                </div>
-                                <ng-template #tooltipEnableThisFilterUponSaving i18n="@@tooltip--enable-this-filter-upon-saving">Enable this filter upon saving popover</ng-template>
-                                <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltipEnableThisFilterUponSaving" i18n-aria-label="@@tooltip--instruction"
-                                    role="tooltip"></i>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-lg-6">
-                            <relying-party-form [resolver]="filter"></relying-party-form>
-                        </div>
-                        <div class="col-lg-6">
-                            <attribute-release-form [resolver]="filter"></attribute-release-form>
-                        </div>
-                    </div>
-                </section>
-            </form>
+        <div class="section-body p-4 border border-top-0 border-info" *ngIf="schema$ | async">
+            <div class="mx-3 my-2 d-flex justify-content-end">
+                <button (click)="this.save()" type="submit" class="btn btn-primary" [disabled]="!isValid || (isSaving$ | async)">
+                    <i class="fa fa-fw fa-lg" [ngClass]="{
+                                        'fa-save': !(isSaving$ | async),
+                                        'fa-spinner': (isSaving$ | async),
+                                        'fa-pulse': (isSaving$ | async)
+                                    }"></i>
+                    <ng-container i18n="@@action--save">Save</ng-container>
+                </button>
+                &nbsp;
+                <button (click)="this.cancel()" type="reset" class="btn btn-secondary" [disabled]="isSaving$ | async">
+                    <ng-container i18n="@@action--cancel">Cancel</ng-container>
+                </button>
+            </div>
+            <sf-form
+                [schema]="schema$ | async"
+                [model]="model$ | async"
+                [validators]="definition.getValidators()"
+                (onChange)="valueChangeSubject.next($event)"
+                (onErrorChange)="statusChangeSubject.next($event)"></sf-form>
         </div>
     </section>
 </div>
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.spec.ts b/ui/src/app/metadata/filter/container/new-filter.component.spec.ts
index e954c1cbf..cf96683ac 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.spec.ts
+++ b/ui/src/app/metadata/filter/container/new-filter.component.spec.ts
@@ -8,6 +8,9 @@ import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/servic
 import { NgbPopoverModule, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap';
 import { NavigatorService } from '../../../core/service/navigator.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { SchemaFormModule, WidgetRegistry, DefaultWidgetRegistry } from 'ngx-schema-form';
+import { SchemaService } from '../../../schema-form/service/schema.service';
+import { HttpClientModule } from '@angular/common/http';
 
 describe('New Metadata Filter Page', () => {
     let fixture: ComponentFixture<NewFilterComponent>;
@@ -21,7 +24,9 @@ describe('New Metadata Filter Page', () => {
                 ProviderValueEmitter,
                 FormBuilder,
                 NgbPopoverConfig,
-                NavigatorService
+                NavigatorService,
+                SchemaService,
+                { provide: WidgetRegistry, useClass: DefaultWidgetRegistry }
             ],
             imports: [
                 StoreModule.forRoot({
@@ -30,7 +35,9 @@ describe('New Metadata Filter Page', () => {
                 ReactiveFormsModule,
                 ProviderEditorFormModule,
                 NgbPopoverModule,
-                SharedModule
+                SharedModule,
+                HttpClientModule,
+                SchemaFormModule.forRoot()
             ],
             declarations: [
                 NewFilterComponent
@@ -57,4 +64,27 @@ describe('New Metadata Filter Page', () => {
             expect(store.dispatch).toHaveBeenCalled();
         });
     });
+
+    describe('status emitter', () => {
+        it('should set the isValid property to true', () => {
+            fixture.detectChanges();
+            instance.statusChangeSubject.next({ value: [] });
+            fixture.detectChanges();
+            expect(instance.isValid).toBe(true);
+        });
+
+        it('should set the isValid property to true if value is undefined', () => {
+            fixture.detectChanges();
+            instance.statusChangeSubject.next({ value: null });
+            fixture.detectChanges();
+            expect(instance.isValid).toBe(true);
+        });
+
+        it('should set the isValid property to false', () => {
+            fixture.detectChanges();
+            instance.statusChangeSubject.next({ value: [{ control: 'foo' }] });
+            fixture.detectChanges();
+            expect(instance.isValid).toBe(false);
+        });
+    });
 });
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.ts b/ui/src/app/metadata/filter/container/new-filter.component.ts
index 840d2d9a4..244cb3a85 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.ts
+++ b/ui/src/app/metadata/filter/container/new-filter.component.ts
@@ -1,132 +1,57 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Observable, Subject } from 'rxjs';
-import { withLatestFrom, distinctUntilChanged, startWith, takeUntil } from 'rxjs/operators';
+import { Subject, Observable, of } from 'rxjs';
 
 import * as fromFilter from '../reducer';
-import { ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
-import { CancelCreateFilter, SelectId, UpdateFilterChanges } from '../action/filter.action';
+import { MetadataFilterTypes } from '../model';
+import { FormDefinition } from '../../../wizard/model';
+import { MetadataFilter } from '../../domain/model';
+import { SchemaService } from '../../../schema-form/service/schema.service';
 import { AddFilterRequest } from '../action/collection.action';
-import { MetadataFilter } from '../../domain/model/metadata-filter';
-import { EntityValidators } from '../../domain/service/entity-validators.service';
-import { QueryEntityIds, ViewMoreIds, ClearSearch } from '../action/search.action';
-import { MDUI } from '../../domain/model';
-import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
+import { CancelCreateFilter, UpdateFilterChanges } from '../action/filter.action';
 
 @Component({
     selector: 'new-filter-page',
     templateUrl: './new-filter.component.html'
 })
-export class NewFilterComponent implements OnInit, OnDestroy {
+export class NewFilterComponent {
 
-    private ngUnsubscribe: Subject<void> = new Subject<void>();
+    valueChangeSubject = new Subject<Partial<any>>();
+    private valueChangeEmitted$ = this.valueChangeSubject.asObservable();
 
-    changes$: Observable<MetadataFilter>;
-    changes: MetadataFilter;
-    filter: EntityAttributesFilter = new EntityAttributesFilter({
-        entityId: '',
-        name: '',
-        relyingPartyOverrides: {
-            signAssertion: false,
-            dontSignResponse: false,
-            turnOffEncryption: false,
-            useSha: false,
-            ignoreAuthenticationMethod: false,
-            omitNotBefore: false,
-            responderId: '',
-            nameIdFormats: [],
-            authenticationMethods: []
-        },
-        attributeRelease: []
-    });
+    statusChangeSubject = new Subject<{ value: any[] }>();
+    private statusChangeEmitted$ = this.statusChangeSubject.asObservable();
 
-    ids: string[];
-    entityIds$: Observable<string[]>;
-    showMore$: Observable<boolean>;
-    selected$: Observable<string>;
-    loading$: Observable<boolean>;
-    processing$: Observable<boolean>;
-    preview$: Observable<MDUI>;
-    isSaving$: Observable<boolean>;
-
-    form: FormGroup = this.fb.group({
-        entityId: ['', [Validators.required], [
-            EntityValidators.existsInCollection(this.store.select(fromFilter.getEntityCollection))
-        ]],
-        name: ['', [Validators.required]],
-        filterEnabled: [false]
-    });
+    definition: FormDefinition<MetadataFilter>;
+    schema$: Observable<any>;
 
-    isValid = false;
+    model$: Observable<MetadataFilter>;
+    isSaving$: Observable<boolean>;
+    filter: MetadataFilter;
+    isValid: boolean;
 
     constructor(
         private store: Store<fromFilter.State>,
-        private valueEmitter: ProviderValueEmitter,
-        private fb: FormBuilder
+        private schemaService: SchemaService
     ) {
-        this.store.dispatch(new ClearSearch());
-        this.changes$ = this.store.select(fromFilter.getFilter);
-        this.changes$.subscribe(c => this.changes = new EntityAttributesFilter(c));
+        this.definition = MetadataFilterTypes.EntityAttributesFilter;
 
-        this.showMore$ = this.store.select(fromFilter.getViewingMore);
-        this.selected$ = this.store.select(fromFilter.getSelected);
-        this.entityIds$ = this.store.select(fromFilter.getEntityCollection);
-        this.loading$ = this.store.select(fromFilter.getIsLoading);
-        this.processing$ = this.loading$.pipe(withLatestFrom(this.showMore$, (l, s) => !s && l));
-        this.preview$ = this.store.select(fromFilter.getPreview);
+        this.schema$ = this.schemaService.get(this.definition.schema);
         this.isSaving$ = this.store.select(fromFilter.getSaving);
+        this.model$ = of(<MetadataFilter>{});
 
-        this.entityIds$.subscribe(ids => this.ids = ids);
-    }
-
-    ngOnInit(): void {
-        let id = this.form.get('entityId');
-        id.valueChanges.pipe(distinctUntilChanged())
-            .subscribe(query => this.searchEntityIds(query));
-
-        this.form.valueChanges.pipe(
-            takeUntil(this.ngUnsubscribe),
-            startWith(this.form.value)
-        ).subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes)));
-        this.valueEmitter
-            .changeEmitted$
-            .pipe(
-                takeUntil(this.ngUnsubscribe),
-                startWith(this.form.value)
-            )
-            .subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes)));
-
-        id.valueChanges.pipe(distinctUntilChanged())
-            .subscribe(entityId => id.valid ? this.store.dispatch(new SelectId(entityId)) : null);
-        this.selected$.pipe(distinctUntilChanged())
-            .subscribe(entityId => id.setValue(entityId));
-    }
-
-    ngOnDestroy(): void {
-        this.ngUnsubscribe.next();
-        this.ngUnsubscribe.complete();
-    }
-
-    searchEntityIds(term: string): void {
-        if (term && term.length >= 4 && this.ids.indexOf(term) < 0) {
-            this.store.dispatch(new QueryEntityIds({
-                term,
-                limit: 10
-            }));
-        }
-    }
-
-    onViewMore(query: string): void {
-        this.store.dispatch(new ViewMoreIds(query));
-    }
+        this.valueChangeEmitted$.subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes.value)));
+        this.statusChangeEmitted$.subscribe(valid => {
+            this.isValid = valid.value ? valid.value.length === 0 : true;
+        });
 
-    onStatusChange(status): void {
-        this.isValid = status === 'VALID';
+        this.store
+            .select(fromFilter.getFilter)
+            .subscribe(filter => this.filter = filter);
     }
 
     save(): void {
-        this.store.dispatch(new AddFilterRequest(this.changes.serialize()));
+        this.store.dispatch(new AddFilterRequest(this.filter));
     }
 
     cancel(): void {
diff --git a/ui/src/app/metadata/filter/effect/collection.effect.ts b/ui/src/app/metadata/filter/effect/collection.effect.ts
index 788e51329..44651d0c2 100644
--- a/ui/src/app/metadata/filter/effect/collection.effect.ts
+++ b/ui/src/app/metadata/filter/effect/collection.effect.ts
@@ -12,7 +12,7 @@ import * as fromFilter from '../reducer';
 import * as fromProvider from '../../provider/reducer';
 import { MetadataFilter } from '../../domain/model';
 import { removeNulls } from '../../../shared/util';
-import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
+import { EntityAttributesFilterEntity } from '../../domain/entity/filter/entity-attributes-filter';
 import { MetadataFilterService } from '../../domain/service/filter.service';
 
 /* istanbul ignore next */
@@ -56,7 +56,7 @@ export class FilterCollectionEffects {
         map(filter => {
             return {
                 ...filter,
-                relyingPartyOverrides: removeNulls(new EntityAttributesFilter(filter).relyingPartyOverrides)
+                relyingPartyOverrides: removeNulls(new EntityAttributesFilterEntity(filter).relyingPartyOverrides)
             };
         }),
         combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
diff --git a/ui/src/app/metadata/filter/effect/filter.effect.ts b/ui/src/app/metadata/filter/effect/filter.effect.ts
index 1698333dd..9cf67e5ea 100644
--- a/ui/src/app/metadata/filter/effect/filter.effect.ts
+++ b/ui/src/app/metadata/filter/effect/filter.effect.ts
@@ -2,18 +2,17 @@ import { Injectable } from '@angular/core';
 import { Effect, Actions, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { of } from 'rxjs';
-import { map, switchMap, catchError, withLatestFrom, tap } from 'rxjs/operators';
+import { map, switchMap, catchError, withLatestFrom, tap, combineLatest, skipWhile } from 'rxjs/operators';
 
 import { Router } from '@angular/router';
 
 import * as fromFilter from '../reducer';
+import * as fromProvider from '../../provider/reducer';
 import * as fromRoot from '../../../app.reducer';
 import {
     FilterCollectionActionTypes,
     UpdateFilterFail,
-    UpdateFilterRequest,
-    AddFilterSuccess,
-    LoadFilterRequest
+    UpdateFilterRequest
 } from '../action/collection.action';
 import {
     SelectId,
@@ -58,19 +57,12 @@ export class FilterEffects {
         )
     );
 
-    /*
-    @Effect({ dispatch: false })
-    saveFilterSuccess$ = this.actions$.pipe(
-        ofType<AddFilterSuccess>(FilterCollectionActionTypes.ADD_FILTER_SUCCESS),
-        switchMap(() => this.router.navigate(['/dashboard']))
-    );
     @Effect()
     cancelChanges$ = this.actions$.pipe(
         ofType<CancelCreateFilter>(FilterActionTypes.CANCEL_CREATE_FILTER),
-        map(() => new LoadFilterRequest()),
-        tap(() => this.router.navigate(['/dashboard']))
+        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        tap(([filter, provider]) => this.router.navigate(['/', 'metadata', 'provider', provider, 'filters']))
     );
-    */
 
     constructor(
         private store: Store<fromRoot.State>,
diff --git a/ui/src/app/metadata/filter/filter.module.ts b/ui/src/app/metadata/filter/filter.module.ts
index 24111a113..f4f86b486 100644
--- a/ui/src/app/metadata/filter/filter.module.ts
+++ b/ui/src/app/metadata/filter/filter.module.ts
@@ -20,6 +20,7 @@ import { FilterExistsGuard } from './guard/filter-exists.guard';
 import { DomainModule } from '../domain/domain.module';
 import { ModuleWithProviders } from '@angular/compiler/src/core';
 import { FilterCollectionEffects } from './effect/collection.effect';
+import { FormModule } from '../../schema-form/schema-form.module';
 
 @NgModule({
     declarations: [
@@ -40,7 +41,8 @@ import { FilterCollectionEffects } from './effect/collection.effect';
         SharedModule,
         DomainModule,
         HttpClientModule,
-        RouterModule
+        RouterModule,
+        FormModule
     ]
 })
 export class FilterModule {
diff --git a/ui/src/app/metadata/filter/model/entity-attributes.filter.spec.ts b/ui/src/app/metadata/filter/model/entity-attributes.filter.spec.ts
new file mode 100644
index 000000000..35ebaff95
--- /dev/null
+++ b/ui/src/app/metadata/filter/model/entity-attributes.filter.spec.ts
@@ -0,0 +1,14 @@
+import { EntityAttributesFilter } from './entity-attributes.filter';
+
+describe('Entity Attributes filter form', () => {
+    it('should return an empty object for validators', () => {
+        expect(EntityAttributesFilter.getValidators()).toEqual({});
+    });
+
+    describe('transformer', () => {
+        it('should not modify the object', () => {
+            expect(EntityAttributesFilter.translate.formatter({})).toEqual({});
+            expect(EntityAttributesFilter.translate.parser({})).toEqual({});
+        });
+    });
+});
diff --git a/ui/src/app/metadata/filter/model/entity-attributes.filter.ts b/ui/src/app/metadata/filter/model/entity-attributes.filter.ts
new file mode 100644
index 000000000..bf2cec9b4
--- /dev/null
+++ b/ui/src/app/metadata/filter/model/entity-attributes.filter.ts
@@ -0,0 +1,16 @@
+import { FormDefinition } from '../../../wizard/model';
+import { MetadataFilter } from '../../domain/model';
+
+export const EntityAttributesFilter: FormDefinition<MetadataFilter> = {
+    label: 'EntityAttributes',
+    type: 'EntityAttributes',
+    schema: 'assets/schema/filter/entity-attributes.schema.json',
+    getValidators(): any {
+        const validators = {};
+        return validators;
+    },
+    translate: {
+        parser: (changes: any): MetadataFilter => changes,
+        formatter: (changes: MetadataFilter): any => changes
+    }
+};
diff --git a/ui/src/app/metadata/filter/model/index.ts b/ui/src/app/metadata/filter/model/index.ts
new file mode 100644
index 000000000..c77b3a90f
--- /dev/null
+++ b/ui/src/app/metadata/filter/model/index.ts
@@ -0,0 +1,7 @@
+import { EntityAttributesFilter } from './entity-attributes.filter';
+
+export const MetadataFilterTypes = {
+    EntityAttributesFilter
+};
+
+export * from './entity-attributes.filter';
diff --git a/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
index abd35ab48..32c46601c 100644
--- a/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
+++ b/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
@@ -12,7 +12,7 @@ import {
     AddFilterFail,
     UpdateFilterFail
 } from '../action/collection.action';
-import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
+import { EntityAttributesFilterEntity } from '../../domain/entity/filter/entity-attributes-filter';
 
 describe('Filter Reducer', () => {
     describe('undefined action', () => {
@@ -36,8 +36,8 @@ describe('Filter Reducer', () => {
         it('should add the loaded filters to the collection', () => {
             spyOn(fromFilter.adapter, 'addAll').and.callThrough();
             const filters = [
-                new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() }),
-                new EntityAttributesFilter({ resourceId: 'bar', createdDate: new Date().toLocaleDateString() })
+                new EntityAttributesFilterEntity({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() }),
+                new EntityAttributesFilterEntity({ resourceId: 'bar', createdDate: new Date().toLocaleDateString() })
             ];
             const action = new LoadFilterSuccess(filters);
             const result = reducer(snapshot, action);
@@ -48,7 +48,7 @@ describe('Filter Reducer', () => {
     describe(`${FilterCollectionActionTypes.SELECT_FILTER_SUCCESS}`, () => {
         it('should add the loaded filter to the collection', () => {
             spyOn(fromFilter.adapter, 'addOne').and.callThrough();
-            const filter = new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
+            const filter = new EntityAttributesFilterEntity({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
             const action = new SelectFilterSuccess(filter);
             const result = reducer(snapshot, action);
             expect(fromFilter.adapter.addOne).toHaveBeenCalled();
@@ -57,14 +57,14 @@ describe('Filter Reducer', () => {
 
     describe(`${FilterCollectionActionTypes.ADD_FILTER}`, () => {
         it('should set saving to true', () => {
-            const filter = new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
+            const filter = new EntityAttributesFilterEntity({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
             const action = new AddFilterRequest(filter);
             expect(reducer(snapshot, action).saving).toBe(true);
         });
     });
     describe(`${FilterCollectionActionTypes.UPDATE_FILTER_REQUEST}`, () => {
         it('should set saving to true', () => {
-            const filter = new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
+            const filter = new EntityAttributesFilterEntity({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
             const action = new UpdateFilterRequest(filter);
             expect(reducer(snapshot, action).saving).toBe(true);
         });
@@ -72,7 +72,7 @@ describe('Filter Reducer', () => {
 
     describe(`${FilterCollectionActionTypes.ADD_FILTER_SUCCESS}`, () => {
         it('should set saving to false', () => {
-            const filter = new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
+            const filter = new EntityAttributesFilterEntity({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
             const action = new AddFilterSuccess(filter);
             expect(reducer(snapshot, action).saving).toBe(false);
         });
@@ -87,7 +87,7 @@ describe('Filter Reducer', () => {
 
     describe(`${FilterCollectionActionTypes.UPDATE_FILTER_FAIL}`, () => {
         it('should set saving to false', () => {
-            const filter = new EntityAttributesFilter({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
+            const filter = new EntityAttributesFilterEntity({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
             const action = new UpdateFilterFail(filter);
             expect(reducer(snapshot, action).saving).toBe(false);
         });
@@ -98,7 +98,7 @@ describe('Filter Reducer', () => {
             spyOn(fromFilter.adapter, 'updateOne').and.callThrough();
             const update = {
                 id: 'foo',
-                changes: new EntityAttributesFilter({ resourceId: 'foo', name: 'bar', createdDate: new Date().toLocaleDateString() }),
+                changes: new EntityAttributesFilterEntity({ resourceId: 'foo', name: 'bar', createdDate: new Date().toLocaleDateString() }),
             };
             const action = new UpdateFilterSuccess(update);
             const result = reducer(snapshot, action);
diff --git a/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts
index f4f4cbe82..f9ed5b7a5 100644
--- a/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts
+++ b/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts
@@ -16,7 +16,7 @@ import {
 } from '../action/collection.action';
 import { MDUI } from '../../domain/model';
 import { MetadataFilter } from '../../domain/model';
-import { EntityAttributesFilter } from '../../domain/entity/filter/entity-attributes-filter';
+import { EntityAttributesFilterEntity } from '../../domain/entity/filter/entity-attributes-filter';
 
 
 const snapshot: fromFilter.FilterState = {
@@ -72,26 +72,26 @@ describe('Filter Reducer', () => {
 
     describe(`${FilterCollectionActionTypes.ADD_FILTER} action`, () => {
         it('should set saving to true', () => {
-            const result = reducer(snapshot, new AddFilterRequest(new EntityAttributesFilter()));
+            const result = reducer(snapshot, new AddFilterRequest(new EntityAttributesFilterEntity()));
             expect(result.saving).toBe(true);
         });
     });
     describe(`${FilterCollectionActionTypes.UPDATE_FILTER_REQUEST} action`, () => {
         it('should set saving to true', () => {
-            const result = reducer(snapshot, new UpdateFilterRequest(new EntityAttributesFilter()));
+            const result = reducer(snapshot, new UpdateFilterRequest(new EntityAttributesFilterEntity()));
             expect(result.saving).toBe(true);
         });
     });
 
     describe(`${FilterCollectionActionTypes.ADD_FILTER_SUCCESS} action`, () => {
         it('should set saving to true', () => {
-            const result = reducer(snapshot, new AddFilterSuccess(new EntityAttributesFilter()));
+            const result = reducer(snapshot, new AddFilterSuccess(new EntityAttributesFilterEntity()));
             expect(result).toEqual(fromFilter.initialState);
         });
     });
     describe(`${FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS} action`, () => {
         it('should set saving to true', () => {
-            const update = {id: 'foo', changes: new EntityAttributesFilter({id: 'foo'})};
+            const update = {id: 'foo', changes: new EntityAttributesFilterEntity({id: 'foo'})};
             const result = reducer(snapshot, new UpdateFilterSuccess(update));
             expect(result).toEqual(fromFilter.initialState);
         });
diff --git a/ui/src/app/metadata/filter/reducer/index.spec.ts b/ui/src/app/metadata/filter/reducer/index.spec.ts
new file mode 100644
index 000000000..3d30cf891
--- /dev/null
+++ b/ui/src/app/metadata/filter/reducer/index.spec.ts
@@ -0,0 +1,21 @@
+import * as selectors from './index';
+
+describe('filter selectors', () => {
+    describe('mergeFn', () => {
+        it('should return merged objects', () => {
+            expect(selectors.mergeFn({foo: 'bar' }, { resourceId: 'baz' })).toEqual({foo: 'bar', resourceId: 'baz'});
+        });
+    });
+
+    describe('filterTypeFn', () => {
+        it('should return filtered objects', () => {
+            const filters = [{ '@type': 'EntityAttributes' }];
+            expect(selectors.filterTypeFn(filters)).toEqual(filters);
+        });
+
+        it('should return filtered objects', () => {
+            const filters = [{ '@type': 'EntityAttributes' }, { '@type': 'EntityRoleWhiteList' }];
+            expect(selectors.filterTypeFn(filters).length).toBe(1);
+        });
+    });
+});
diff --git a/ui/src/app/metadata/filter/reducer/index.ts b/ui/src/app/metadata/filter/reducer/index.ts
index 6724af3a7..951c05e51 100644
--- a/ui/src/app/metadata/filter/reducer/index.ts
+++ b/ui/src/app/metadata/filter/reducer/index.ts
@@ -53,12 +53,9 @@ export const getAllFilters = createSelector(getCollectionState, fromCollection.s
 export const getFiltersSaving = createSelector(getCollectionState, fromCollection.getIsSaving);
 
 export const notAddtlFilters = ['RequiredValidUntil', 'SignatureValidation', 'EntityRoleWhiteList'];
+export const filterTypeFn = filters => filters.filter(f => notAddtlFilters.indexOf(f['@type']) === -1);
 
-export const getAdditionalFilters = createSelector(
-    getAllFilters,
-    filters => filters.filter(f => notAddtlFilters.indexOf(f['@type']) === -1)
-);
-
+export const getAdditionalFilters = createSelector(getAllFilters, filterTypeFn);
 
 export const getFilterEntities = createSelector(getCollectionState, fromCollection.selectFilterEntities);
 export const getSelectedFilterId = createSelector(getCollectionState, fromCollection.getSelectedFilterId);
diff --git a/ui/src/app/metadata/provider/provider.routing.ts b/ui/src/app/metadata/provider/provider.routing.ts
index bd32d63e6..8e6ecc3f5 100644
--- a/ui/src/app/metadata/provider/provider.routing.ts
+++ b/ui/src/app/metadata/provider/provider.routing.ts
@@ -9,9 +9,7 @@ import { ProviderSelectComponent } from './container/provider-select.component';
 import { ProviderFilterListComponent } from './container/provider-filter-list.component';
 import { NewFilterComponent } from '../filter/container/new-filter.component';
 import { FilterComponent } from '../filter/container/filter.component';
-import { FilterExistsGuard } from '../filter/guard/filter-exists.guard';
 import { EditFilterComponent } from '../filter/container/edit-filter.component';
-import { ProviderResolver } from './resolver/provider.resolver';
 
 export const ProviderRoutes: Routes = [
     {
diff --git a/ui/src/app/schema-form/registry.ts b/ui/src/app/schema-form/registry.ts
index 44a20841a..050edbf42 100644
--- a/ui/src/app/schema-form/registry.ts
+++ b/ui/src/app/schema-form/registry.ts
@@ -2,11 +2,10 @@ import { BooleanRadioComponent } from './widget/boolean-radio/boolean-radio.comp
 import { FieldsetComponent } from './widget/fieldset/fieldset.component';
 import { CustomStringComponent } from './widget/string/string.component';
 
-import { WidgetRegistry } from 'ngx-schema-form';
+import { WidgetRegistry, ObjectWidget } from 'ngx-schema-form';
 
 import { ButtonWidget } from 'ngx-schema-form';
 import { FileWidget } from 'ngx-schema-form';
-import { ObjectWidget } from 'ngx-schema-form';
 import { RadioWidget } from 'ngx-schema-form';
 import { RangeWidget } from 'ngx-schema-form';
 import { CustomSelectComponent } from './widget/select/select.component';
@@ -15,6 +14,8 @@ import { CustomCheckboxComponent } from './widget/check/checkbox.component';
 import { CustomTextAreaComponent } from './widget/textarea/textarea.component';
 import { CustomArrayComponent } from './widget/array/array.component';
 import { CustomIntegerComponent } from './widget/number/number.component';
+import { FilterTargetComponent } from './widget/filter-target/filter-target.component';
+import { ChecklistComponent } from './widget/check/checklist.component';
 
 
 export class CustomWidgetRegistry extends WidgetRegistry {
@@ -36,9 +37,10 @@ export class CustomWidgetRegistry extends WidgetRegistry {
         this.register('boolean-radio', BooleanRadioComponent);
 
         this.register('fieldset', FieldsetComponent);
-        this.register('object', FieldsetComponent);
+        this.register('object', ObjectWidget);
 
         this.register('array', CustomArrayComponent);
+        this.register('checklist', ChecklistComponent);
 
         this.register('select', CustomSelectComponent);
         this.register('boolean', CustomCheckboxComponent);
@@ -51,6 +53,8 @@ export class CustomWidgetRegistry extends WidgetRegistry {
 
         this.register('datalist', DatalistComponent);
 
+        this.register('filter-target', FilterTargetComponent);
+
         /* NGX-Form */
         this.register('range', RangeWidget);
 
diff --git a/ui/src/app/schema-form/schema-form.module.ts b/ui/src/app/schema-form/schema-form.module.ts
index 8e01833f5..a637d629c 100644
--- a/ui/src/app/schema-form/schema-form.module.ts
+++ b/ui/src/app/schema-form/schema-form.module.ts
@@ -7,7 +7,7 @@ import { BooleanRadioComponent } from './widget/boolean-radio/boolean-radio.comp
 import { SchemaService } from './service/schema.service';
 import { FieldsetComponent } from './widget/fieldset/fieldset.component';
 import { CustomStringComponent } from './widget/string/string.component';
-import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbPopoverModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { SharedModule } from '../shared/shared.module';
 import { CustomSelectComponent } from './widget/select/select.component';
 import { DatalistComponent } from './widget/datalist/datalist.component';
@@ -15,6 +15,8 @@ import { CustomCheckboxComponent } from './widget/check/checkbox.component';
 import { CustomTextAreaComponent } from './widget/textarea/textarea.component';
 import { CustomArrayComponent } from './widget/array/array.component';
 import { CustomIntegerComponent } from './widget/number/number.component';
+import { FilterTargetComponent } from './widget/filter-target/filter-target.component';
+import { ChecklistComponent } from './widget/check/checklist.component';
 
 export const COMPONENTS = [
     BooleanRadioComponent,
@@ -25,7 +27,9 @@ export const COMPONENTS = [
     CustomCheckboxComponent,
     CustomTextAreaComponent,
     CustomArrayComponent,
-    CustomIntegerComponent
+    CustomIntegerComponent,
+    FilterTargetComponent,
+    ChecklistComponent
 ];
 
 @NgModule({
@@ -33,6 +37,7 @@ export const COMPONENTS = [
         CommonModule,
         ReactiveFormsModule,
         NgbPopoverModule,
+        NgbDropdownModule,
         SharedModule,
         SchemaFormModule.forRoot()
     ],
@@ -40,7 +45,8 @@ export const COMPONENTS = [
     entryComponents: COMPONENTS,
     exports: [
         ...COMPONENTS,
-        SchemaFormModule
+        SchemaFormModule,
+        SharedModule
     ],
 })
 export class FormModule {
diff --git a/ui/src/app/schema-form/service/schema.service.spec.ts b/ui/src/app/schema-form/service/schema.service.spec.ts
new file mode 100644
index 000000000..6d259d6a9
--- /dev/null
+++ b/ui/src/app/schema-form/service/schema.service.spec.ts
@@ -0,0 +1,45 @@
+import { TestBed, async, inject } from '@angular/core/testing';
+import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing';
+import { HttpClientModule, HttpRequest } from '@angular/common/http';
+import { SchemaService } from './schema.service';
+
+describe(`Schema Service`, () => {
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                HttpClientModule,
+                HttpClientTestingModule
+            ],
+            providers: [
+                SchemaService
+            ]
+        });
+    });
+
+    describe('isRequired method', () => {
+        it(`should return false if no property is provided`, inject([SchemaService], (service: SchemaService) => {
+            expect(service.isRequired(null)).toBe(false);
+        }));
+        it(`should return false if no properties are defined`, inject([SchemaService], (service: SchemaService) => {
+            expect(service.isRequired({
+                parent: { schema: {} },
+                path: ''
+            })).toBe(false);
+        }));
+
+        it(`should return true if the property is required`, inject([SchemaService], (service: SchemaService) => {
+            expect(service.isRequired({
+                parent: { schema: {
+                    properties: {
+                        foo: {
+                            type: 'string'
+                        }
+                    },
+                    required: 'foo'
+                } },
+                path: ''
+            })).toBe(true);
+        }));
+    });
+});
diff --git a/ui/src/app/schema-form/widget/array/array.component.html b/ui/src/app/schema-form/widget/array/array.component.html
index 577c084f9..c85b8f8de 100644
--- a/ui/src/app/schema-form/widget/array/array.component.html
+++ b/ui/src/app/schema-form/widget/array/array.component.html
@@ -8,6 +8,12 @@
             Add &nbsp;
             <i class="fa fa-plus" aria-hidden="true"></i>
         </button>
+        &nbsp;
+        <span class="text-right" *ngIf="schema.description">
+            <ng-template #tooltip>{{ schema.description }}</ng-template>
+            <i class="info-icon fa fa-fw fa-info-circle text-primary fa-lg" [ngbPopover]="tooltip" i18n-aria-label="@@tooltip--instruction"
+                aria-label="Information icon - press spacebar to read additional information for this form field"></i>
+        </span>
     </div>
     <div *ngFor="let itemProperty of formProperty.properties; let i=index; trackBy:trackByIndex" class="mt-2">
         <div class="row">
diff --git a/ui/src/app/schema-form/widget/check/checklist.component.html b/ui/src/app/schema-form/widget/check/checklist.component.html
new file mode 100644
index 000000000..7285f1bb9
--- /dev/null
+++ b/ui/src/app/schema-form/widget/check/checklist.component.html
@@ -0,0 +1,51 @@
+<fieldset [attr.aria-label]="schema.description" tabindex="0">
+    <legend *ngIf="schema.title">{{ schema.title }}</legend>
+    <table class="table table-striped table-sm">
+        <thead>
+            <tr class="table-secondary">
+                <th i18n="@@label--attribute-name">Attribute Name</th>
+                <th i18n="@@label--yes">Yes</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let attr of schema.widget.data; let i=index;">
+                <td scope="col">{{ attr.label }}</td>
+                <td scope="col">
+                    <fieldset>
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox"
+                                class="custom-control-input"
+                                (change)="onCheck(attr.key)"
+                                [checked]="checked[attr.key]"
+                                id="input-{{ i }}"
+                                [attr.name]="attr.label"
+                                [attr.aria-label]="attr.label"
+                                role="checkbox"
+                                aria-checked="false"
+                            />
+                            <label class="custom-control-label" for="input-{{ i }}"></label>
+                        </div>
+                    </fieldset>
+                </td>
+            </tr>
+            <tr>
+                <td scope="col" i18n="@@label--check-all-attributes">Check All Attributes</td>
+                <td scope="col">
+                    <button class="btn btn-text text-success btn-sm" (click)="onCheckAll()">
+                        <i class="fa fa-fw fa-check"></i>
+                        <span class="sr-only" i18n="@@label--check-all-attributes">Check All Attributes</span>
+                    </button>
+                </td>
+            </tr>
+            <tr>
+                <td scope="col" i18n="@@label--clear-all-attributes">Clear All Attributes</td>
+                <td scope="col">
+                    <button class="btn btn-text text-danger btn-sm" (click)="onCheckNone()">
+                        <i class="fa fa-fw fa-times"></i>
+                        <span class="sr-only" i18n="@@label--clear-all-attributes">Clear All Attributes</span>
+                    </button>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</fieldset>
\ No newline at end of file
diff --git a/ui/src/app/schema-form/widget/check/checklist.component.ts b/ui/src/app/schema-form/widget/check/checklist.component.ts
new file mode 100644
index 000000000..aca5b12b5
--- /dev/null
+++ b/ui/src/app/schema-form/widget/check/checklist.component.ts
@@ -0,0 +1,41 @@
+import { Component, AfterViewInit } from '@angular/core';
+
+import { ArrayWidget } from 'ngx-schema-form';
+
+/* istanbul ignore next */
+@Component({
+    selector: 'checklist-component',
+    templateUrl: `./checklist.component.html`
+})
+export class ChecklistComponent extends ArrayWidget implements AfterViewInit {
+    checked: any = {};
+
+    ngAfterViewInit(): void {
+        super.ngAfterViewInit();
+        this.formProperty.value.forEach(val => this.checked[val] = true);
+    }
+
+    private commitValue(): void {
+        this.formProperty.setValue(Object.keys(this.checked), false);
+    }
+
+    onCheck(value) {
+        if (!this.checked[value]) {
+            this.checked[value] = true;
+        } else {
+            delete this.checked[value];
+        }
+        this.commitValue();
+    }
+
+    onCheckAll(): void {
+        this.schema.widget.data.forEach(attr => this.checked[attr.key] = true);
+        this.commitValue();
+    }
+    onCheckNone(event: Event | null = null): void {
+        this.schema.widget.data.forEach(attr => {
+            delete this.checked[attr.key];
+        });
+        this.commitValue();
+    }
+}
diff --git a/ui/src/app/schema-form/widget/datalist/datalist.component.html b/ui/src/app/schema-form/widget/datalist/datalist.component.html
index c1265ac47..adff71539 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.html
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.html
@@ -19,7 +19,7 @@
         [matches]="schema.widget.data"
         [required]="true"
         [dropdown]="true"
-        [placeholder]="schema.placeholder"
+        [placeholder]="schema.placeholder || ''"
         [attr.disabled]="schema.readOnly?true:null"
         role="textbox"
         aria-label="Name ID Format (type for auto-complete)">
diff --git a/ui/src/app/schema-form/widget/fieldset/fieldset.component.html b/ui/src/app/schema-form/widget/fieldset/fieldset.component.html
index 5e145e33e..fc880ad04 100644
--- a/ui/src/app/schema-form/widget/fieldset/fieldset.component.html
+++ b/ui/src/app/schema-form/widget/fieldset/fieldset.component.html
@@ -1,9 +1,21 @@
-<fieldset *ngFor="let fieldset of formProperty.schema.fieldsets" [class.d-none]="fieldset.type === 'hidden'">
-    <legend class="text-primary" *ngIf="fieldset.title">{{ fieldset.title }}</legend>
-    <p *ngIf="fieldset.description">{{ fieldset.description }}</p>
-    <div [ngClass]="{'bg-light border rounded px-4 pt-4 pb-1': fieldset.type === 'section' || formProperty.schema.widget.id === 'fieldset'}">
-        <div *ngFor="let fieldId of fieldset.fields">
-            <sf-form-element [formProperty]="formProperty.getProperty(fieldId)"></sf-form-element>
-        </div>
+<div class="container-fluid">
+    <div class="row">
+        <ng-container *ngFor="let fieldset of formProperty.schema.fieldsets; let i = index;">
+            <fieldset
+                class="col"
+                [class.d-none]="fieldset.type === 'hidden'"
+                [class.col-lg-6]="fieldset.type === 'group'"
+                [class.col-lg-12]="fieldset.type === 'group-lg'">
+                <legend class="text-primary" *ngIf="fieldset.title">{{ fieldset.title }}</legend>
+                <p *ngIf="fieldset.description">{{ fieldset.description }}</p>
+                <div [ngClass]="{
+                    'bg-light border rounded px-4 pt-4 pb-1': fieldset.type === 'section' || (!fieldset.type && formProperty.schema.widget.id === 'fieldset')
+                }">
+                    <div *ngFor="let fieldId of fieldset.fields">
+                        <sf-form-element [formProperty]="formProperty.getProperty(fieldId)"></sf-form-element>
+                    </div>
+                </div>
+            </fieldset>
+        </ng-container>
     </div>
-</fieldset>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
new file mode 100644
index 000000000..1dc7c42c4
--- /dev/null
+++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
@@ -0,0 +1,61 @@
+<fieldset>
+    <div class="row">
+        <div class="col-lg-6">
+            <div ngbDropdown>
+                <button ngbDropdownToggle
+                    class="btn btn-outline-secondary dropdown-toggle"
+                    type="button"
+                    data-toggle="dropdown"
+                    aria-haspopup="true"
+                    aria-expanded="false">
+                    {{ this.displayType }}
+                </button>
+                <div class="dropdown-menu" ngbDropdownMenu>
+                    <a *ngFor="let option of typeOptions" class="dropdown-item" href="#" (click)="$event.preventDefault(); select(option.value);">
+                        {{ option.description }}
+                    </a>
+                </div>
+            </div>
+            <br />
+            <div class="d-flex justify-content-between">
+                <div class="w-100" [ngSwitch]="this.entityAttributesFilterTargetType">
+                    <ng-container *ngSwitchDefault>
+                        <auto-complete
+                            id="entityId"
+                            class="component-control"
+                            limit="10"
+                            [formControl]="search"
+                            [matches]="ids$ | async"
+                            (keydown.enter)="onSelectValue(search.value)">
+                        </auto-complete>
+                    </ng-container>
+                    <ng-container *ngSwitchCase="'CONDITION_SCRIPT'">
+                        <p class="codearea form-control" rows="8" contenteditable [formControl]="script" name="script"></p>
+                    </ng-container>
+                    <ng-container *ngSwitchCase="'REGEX'">
+                        <input class="form-control" type="text" [formControl]="script" name="script" />
+                    </ng-container>
+                </div>
+                <div class="ml-2" *ngIf="entityAttributesFilterTargetType === 'ENTITY'">
+                    <button
+                        class="btn btn-success"
+                        [disabled]="search.invalid"
+                        (click)="onSelectValue(search.value)">
+                        Add Entity ID
+                    </button>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-6">
+            <ul class="list-group list-group-sm list-group-scroll" *ngIf="entityAttributesFilterTargetType === 'ENTITY'">
+                <li class="list-group-item d-flex justify-content-between align-items-center" *ngFor="let id of targets">
+                    {{ id }}
+                    <button class="btn btn-link text-right">
+                        <i class="fa fa-trash fa-lg text-danger"></i>
+                    </button>
+                </li>
+            </ul>
+        </div>
+    </div>
+</fieldset>
+<hr class="w-100" />
\ No newline at end of file
diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.scss b/ui/src/app/schema-form/widget/filter-target/filter-target.component.scss
new file mode 100644
index 000000000..13926cdb3
--- /dev/null
+++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.scss
@@ -0,0 +1,3 @@
+:host {
+    
+}
\ No newline at end of file
diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts b/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
new file mode 100644
index 000000000..badc78eec
--- /dev/null
+++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
@@ -0,0 +1,112 @@
+import { Component, OnDestroy, AfterViewInit } from '@angular/core';
+import { FormControl, Validators } from '@angular/forms';
+import { ObjectWidget } from 'ngx-schema-form';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { distinctUntilChanged, skipWhile } from 'rxjs/operators';
+
+import * as fromRoot from '../../../app.reducer';
+import * as fromFilters from '../../../metadata/filter/reducer';
+
+import { QueryEntityIds, ClearSearch } from '../../../metadata/filter/action/search.action';
+import { EntityValidators } from '../../../metadata/domain/service/entity-validators.service';
+
+/* istanbul ignore next */
+@Component({
+    selector: 'filter-target',
+    templateUrl: `./filter-target.component.html`,
+    styleUrls: ['./filter-target.component.scss']
+})
+export class FilterTargetComponent extends ObjectWidget implements OnDestroy, AfterViewInit {
+
+    ids$: Observable<string[]>;
+    ids: string[];
+
+    search: FormControl = new FormControl(
+        '',
+        [],
+        [EntityValidators.existsInCollection(this.store.select(fromFilters.getEntityCollection))]
+    );
+
+    script: FormControl = new FormControl(
+        '',
+        [Validators.required]
+    );
+
+    constructor(
+        private store: Store<fromRoot.State>
+    ) {
+        super();
+        this.ids$ = this.store.select(fromFilters.getEntityCollection);
+        this.ids$.subscribe(ids => this.ids = ids);
+
+        this.search
+            .valueChanges
+            .pipe(distinctUntilChanged())
+            .subscribe(query => this.searchEntityIds(query));
+
+        this.script
+            .valueChanges
+            .pipe(
+                distinctUntilChanged(),
+                skipWhile(() => this.entityAttributesFilterTargetType === 'ENTITY')
+            )
+            .subscribe(script => {
+                this.setTargetValue([script]);
+            });
+    }
+
+    ngAfterViewInit(): void {
+        super.ngAfterViewInit();
+        this.script.setValue(this.targets[0]);
+    }
+
+    searchEntityIds(term: string): void {
+        if (term && term.length >= 4 && this.ids.indexOf(term) < 0) {
+            this.store.dispatch(new QueryEntityIds({
+                term,
+                limit: 10
+            }));
+        }
+    }
+
+    get targets(): string[] {
+        return this.formProperty.getProperty('value').value;
+    }
+
+    get entityAttributesFilterTargetType(): string {
+        return this.formProperty.getProperty('entityAttributesFilterTargetType').value;
+    }
+
+    get displayType(): string {
+        return this.typeOptions.find(opt => opt.value === this.entityAttributesFilterTargetType).description;
+    }
+
+    get typeOptions(): any[] {
+        return this.formProperty
+                    .getProperty('entityAttributesFilterTargetType')
+                    .schema
+                    .oneOf
+                    .map(option => ({ ...option, value: option.enum[0] }));
+    }
+
+    select(value: string): void {
+        this.formProperty.getProperty('entityAttributesFilterTargetType').setValue(value);
+        this.setTargetValue([]);
+        this.script.setValue(null);
+        this.search.setValue(null);
+    }
+
+    setTargetValue(value: string[]): void {
+        this.formProperty.getProperty('value').setValue(value);
+    }
+
+    onSelectValue(value: string): void {
+        this.setTargetValue([...this.formProperty.getProperty('value').value, value]);
+        this.search.reset(null);
+    }
+
+    ngOnDestroy(): void {
+        this.store.dispatch(new ClearSearch());
+    }
+}
diff --git a/ui/src/app/schema-form/widget/string/string.component.html b/ui/src/app/schema-form/widget/string/string.component.html
index 10f19f0ab..d2704acbd 100644
--- a/ui/src/app/schema-form/widget/string/string.component.html
+++ b/ui/src/app/schema-form/widget/string/string.component.html
@@ -1,4 +1,4 @@
-<div class="widget form-group">
+<div class="widget form-group" [class.d-none]="this.getInputType() === 'hidden'">
     <label [attr.for]="id" class="d-flex justify-content-between control-label">
         <span>{{ schema.title }} <i class="fa fa-asterisk text-danger" aria-hidden="true" *ngIf="required"></i></span>
         <span *ngIf="schema.description">
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.html b/ui/src/app/shared/autocomplete/autocomplete.component.html
index 6820973fd..103ed7467 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.html
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.html
@@ -21,7 +21,7 @@
                 type="button"
                 aria-haspopup="true"
                 aria-expanded="false"
-                (click)="state.setState({menuOpen: true})">
+                (click)="state.setState({menuOpen: !state.currentState.menuOpen})">
                 <i class="fa fa-caret-down"></i>
             </button>
         </div>
diff --git a/ui/src/app/shared/autocomplete/autocomplete.component.ts b/ui/src/app/shared/autocomplete/autocomplete.component.ts
index 9f2ebb52a..d6237742a 100644
--- a/ui/src/app/shared/autocomplete/autocomplete.component.ts
+++ b/ui/src/app/shared/autocomplete/autocomplete.component.ts
@@ -13,7 +13,8 @@ import {
     SimpleChanges,
     forwardRef,
     ChangeDetectionStrategy,
-    OnChanges
+    OnChanges,
+    HostListener
 } from '@angular/core';
 import { FormControl, ControlValueAccessor, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
 import { Observable, Subject, Subscription, interval } from 'rxjs';
diff --git a/ui/src/app/shared/contenteditable/contenteditable.directive.spec.ts b/ui/src/app/shared/contenteditable/contenteditable.directive.spec.ts
new file mode 100644
index 000000000..80ee92c16
--- /dev/null
+++ b/ui/src/app/shared/contenteditable/contenteditable.directive.spec.ts
@@ -0,0 +1,67 @@
+import { Component, DebugElement, Renderer2 } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { TestBed, ComponentFixture } from '@angular/core/testing';
+import { ContenteditableDirective } from './contenteditable.directive';
+import { FormControl, ReactiveFormsModule } from '@angular/forms';
+
+
+
+@Component({
+    template: `<div contenteditable="true" [formControl]="control"></div>`
+})
+class TestComponent {
+    control: FormControl = new FormControl('');
+}
+
+describe('Content Editable Directive', () => {
+    let component: TestComponent;
+    let fixture: ComponentFixture<TestComponent>;
+    let element: DebugElement;
+    let renderer: Renderer2;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            providers: [
+                { provide: Renderer2, useClass: Renderer2 }
+            ],
+            imports: [
+                ReactiveFormsModule
+            ],
+            declarations: [
+                ContenteditableDirective,
+                TestComponent
+            ],
+        });
+
+        fixture = TestBed.createComponent(TestComponent);
+        element = fixture.debugElement.query(By.css('div'));
+        fixture.detectChanges();
+
+        renderer = TestBed.get(Renderer2);
+    });
+
+    describe('functions', () => {
+        it('should compile', () => {
+            expect(element).toBeDefined();
+        });
+    });
+
+    describe('setDisabledState', () => {
+        it('should set the field to disabled', () => {
+            fixture.componentInstance.control.disable();
+            expect(element.attributes.disabled).toBeDefined();
+        });
+
+        it('should set the field to enabled', () => {
+            fixture.componentInstance.control.disable();
+            fixture.detectChanges();
+            fixture.componentInstance.control.enable();
+            expect(element.attributes.disabled).toBeNull();
+        });
+
+        it('should set the field to enabled', () => {
+            fixture.componentInstance.control.enable();
+            expect(element.attributes.disabled).toBeUndefined();
+        });
+    });
+});
diff --git a/ui/src/app/shared/contenteditable/contenteditable.directive.ts b/ui/src/app/shared/contenteditable/contenteditable.directive.ts
new file mode 100644
index 000000000..13b90bd0f
--- /dev/null
+++ b/ui/src/app/shared/contenteditable/contenteditable.directive.ts
@@ -0,0 +1,64 @@
+import {
+    Directive,
+    ElementRef,
+    Renderer2,
+    HostListener,
+    forwardRef,
+    Input,
+    OnInit
+} from '@angular/core';
+
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+
+@Directive({
+    selector: '[contenteditable]',
+    providers:
+        [
+            { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => ContenteditableDirective), multi: true }
+        ]
+})
+export class ContenteditableDirective implements ControlValueAccessor {
+    @Input() propValueAccessor = 'textContent';
+
+    private removeDisabledState: () => void;
+
+    private propagateChange = (_: any | null) => { };
+    private propagateTouched = (_: any | null) => { };
+
+    constructor(private elementRef: ElementRef, private renderer: Renderer2) {}
+
+    @HostListener('input')
+    callOnChange() {
+        this.propagateChange(this.elementRef.nativeElement[this.propValueAccessor]);
+    }
+
+    @HostListener('blur')
+    callOnTouched() {
+        this.propagateTouched(null);
+    }
+    writeValue(value: any): void {
+        const normalizedValue = value || '';
+        this.renderer.setProperty(this.elementRef.nativeElement, this.propValueAccessor, normalizedValue);
+    }
+    registerOnChange(fn: any): void {
+        this.propagateChange = fn;
+    }
+    registerOnTouched(fn: any): void {
+        this.propagateTouched = fn;
+    }
+    setDisabledState(isDisabled: boolean): void {
+        if (isDisabled) {
+            this.renderer.setAttribute(this.elementRef.nativeElement, 'disabled', 'true');
+            this.removeDisabledState = this.renderer.listen(this.elementRef.nativeElement, 'keydown', this.listenerDisabledState);
+        } else {
+            if (this.removeDisabledState) {
+                this.renderer.removeAttribute(this.elementRef.nativeElement, 'disabled');
+                this.removeDisabledState();
+            }
+        }
+    }
+
+    private listenerDisabledState(e: KeyboardEvent) {
+        e.preventDefault();
+    }
+}
diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts
index 92fbce0de..1c148a5ea 100644
--- a/ui/src/app/shared/shared.module.ts
+++ b/ui/src/app/shared/shared.module.ts
@@ -10,6 +10,7 @@ import { ValidFormIconComponent } from './component/valid-form-icon.component';
 import { InfoLabelDirective } from './directive/info-label.directive';
 import { PrettyXml } from './pipe/pretty-xml.pipe';
 import { ToggleSwitchComponent } from './switch/switch.component';
+import { ContenteditableDirective } from './contenteditable/contenteditable.directive';
 
 @NgModule({
     imports: [
@@ -26,7 +27,8 @@ import { ToggleSwitchComponent } from './switch/switch.component';
         I18nTextComponent,
         ValidFormIconComponent,
         InfoLabelDirective,
-        PrettyXml
+        PrettyXml,
+        ContenteditableDirective
     ],
     exports: [
         HighlightPipe,
@@ -39,7 +41,8 @@ import { ToggleSwitchComponent } from './switch/switch.component';
         I18nTextComponent,
         ValidFormIconComponent,
         ValidationClassDirective,
-        InfoLabelDirective
+        InfoLabelDirective,
+        ContenteditableDirective
     ]
 })
 export class SharedModule { }
diff --git a/ui/src/app/wizard/model/form-definition.ts b/ui/src/app/wizard/model/form-definition.ts
new file mode 100644
index 000000000..9cd42184b
--- /dev/null
+++ b/ui/src/app/wizard/model/form-definition.ts
@@ -0,0 +1,10 @@
+export interface FormDefinition<T> {
+    label: string;
+    type: string;
+    schema?: string;
+    translate: {
+        parser(changes: Partial<T>, schema?: any),
+        formatter(changes: Partial<T>, schema?: any)
+    };
+    getValidators?(...args: any[]): { [key: string]: any };
+}
diff --git a/ui/src/app/wizard/model/index.ts b/ui/src/app/wizard/model/index.ts
index ec5f15d6a..b42933239 100644
--- a/ui/src/app/wizard/model/index.ts
+++ b/ui/src/app/wizard/model/index.ts
@@ -1 +1,2 @@
 export * from './wizard';
+export * from './form-definition';
diff --git a/ui/src/app/wizard/model/wizard.ts b/ui/src/app/wizard/model/wizard.ts
index b3f598ad6..71389c7c0 100644
--- a/ui/src/app/wizard/model/wizard.ts
+++ b/ui/src/app/wizard/model/wizard.ts
@@ -1,13 +1,7 @@
-export interface Wizard<T> {
-    label: string;
-    type: string;
-    steps: WizardStep[];
-    translate: {
-        parser(changes: Partial<T>, schema?: any),
-        formatter(changes: Partial<T>, schema?: any)
-    };
+import { FormDefinition } from './form-definition';
 
-    getValidators?(...args: any[]): { [key: string]: any };
+export interface Wizard<T> extends FormDefinition<T> {
+    steps: WizardStep[];
 }
 
 export interface WizardStep {
diff --git a/ui/src/assets/schema/filter/entity-attributes.schema.json b/ui/src/assets/schema/filter/entity-attributes.schema.json
new file mode 100644
index 000000000..e1b747a6d
--- /dev/null
+++ b/ui/src/assets/schema/filter/entity-attributes.schema.json
@@ -0,0 +1,225 @@
+{
+    "title": "EntityAttributes Filter",
+    "type": "object",
+    "widget": {
+        "id": "fieldset"
+    },
+    "properties": {
+        "name": {
+            "title": "Filter Name (Dashboard Display Only)",
+            "description": "Filter Name",
+            "type": "string",
+            "widget": {
+                "id": "string",
+                "help": "Must be unique."
+            }
+        },
+        "@type": {
+            "type": "string",
+            "widget": {
+                "id": "hidden"
+            },
+            "default": "EntityAttributes"
+        },
+        "resourceId": {
+            "type": "string",
+            "widget": {
+                "id": "hidden"
+            }
+        },
+        "version": {
+            "type": "integer",
+            "widget": {
+                "id": "hidden"
+            }
+        },
+        "filterEnabled": {
+            "title": "Enable this Filter?",
+            "description": "Enable this Filter?",
+            "type": "boolean",
+            "default": false
+        },
+        "entityAttributesFilterTarget": {
+            "title": "Search Criteria",
+            "description": "Filter Name",
+            "type": "object",
+            "widget": {
+                "id": "filter-target"
+            },
+            "properties": {
+                "entityAttributesFilterTargetType": {
+                    "title": "",
+                    "type": "string",
+                    "default": "ENTITY",
+                    "oneOf": [
+                        {
+                            "enum": [
+                                "ENTITY"
+                            ],
+                            "description": "Entity Id"
+                        },
+                        {
+                            "enum": [
+                                "REGEX"
+                            ],
+                            "description": "Regex"
+                        },
+                        {
+                            "enum": [
+                                "CONDITION_SCRIPT"
+                            ],
+                            "description": "Script"
+                        }
+                    ]
+                },
+                "value": {
+                    "type": "array",
+                    "minItems": 1,
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": ["value"]
+        },
+        "relyingPartyOverrides": {
+            "type": "object",
+            "properties": {
+                "signAssertion": {
+                    "title": "Sign the Assertion",
+                    "description": "Sign Assertion popover",
+                    "type": "boolean",
+                    "default": false
+                },
+                "dontSignResponse": {
+                    "title": "Don't sign the Response",
+                    "description": "Don't Sign Response popover",
+                    "type": "boolean",
+                    "default": false
+                },
+                "turnOffEncryption": {
+                    "title": "Turn off Encryption of Response",
+                    "description": "Turn Off Encryption of Response popover",
+                    "type": "boolean",
+                    "default": false
+                },
+                "useSha": {
+                    "title": "Use SHA1 Algorithm",
+                    "description": "Use SHA1 Signing Algorithm popover",
+                    "type": "boolean",
+                    "default": false
+                },
+                "ignoreAuthenticationMethod": {
+                    "title": "Ignore any SP-Requested Authentication Method",
+                    "description": "Ignore any SP-Requested Authentication Method popover",
+                    "type": "boolean",
+                    "default": false
+                },
+                "omitNotBefore": {
+                    "title": "Omit Not Before Condition",
+                    "type": "boolean",
+                    "description": "Omit Not Before Condition popover",
+                    "default": false
+                },
+                "responderId": {
+                    "title": "ResponderID",
+                    "description": "ResponderId popover",
+                    "type": "string"
+                },
+                "nameIdFormats": {
+                    "title": "NameID Format to Send",
+                    "placeholder": "NameID Format",
+                    "description": "NameID Format to Send popover",
+                    "type": "array",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string",
+                        "widget": {
+                            "id": "datalist",
+                            "data": [
+                                "urn:oasis:names:tc:SAML: 1.1:nameid-format:unspecified",
+                                "urn:oasis:names:tc:SAML: 1.1:nameid-format:emailAddress",
+                                "urn:oasis:names:tc:SAML: 2.0:nameid-format:persistent",
+                                "urn:oasis:names:tc:SAML: 2.0:nameid-format:transient"
+                            ]
+                        }
+                    },
+                    "default": null
+                },
+                "authenticationMethods": {
+                    "title": "Authentication Method to Use",
+                    "description": "Authentication Methods to Use popover",
+                    "type": "array",
+                    "placeholder": "Authentication Method",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string",
+                        "widget": {
+                            "id": "datalist",
+                            "data": [
+                                "https://refeds.org/profile/mfa",
+                                "urn:oasis:names:tc:SAML: 2.0:ac:classes:TimeSyncToken",
+                                "urn:oasis:names:tc:SAML: 2.0:ac:classes:PasswordProtectedTransport"
+                            ]
+                        }
+                    },
+                    "default": null
+                }
+            }
+        },
+        "attributeRelease": {
+            "type": "array",
+            "description": "Attribute release table - select the attributes you want to release (default unchecked)",
+            "widget": {
+                "id": "checklist",
+                "data": [
+                    { "key": "eduPersonPrincipalName", "label": "eduPersonPrincipalName (EPPN)" },
+                    { "key": "uid", "label": "uid" },
+                    { "key": "mail", "label": "mail" },
+                    { "key": "surname", "label": "surname" },
+                    { "key": "givenName", "label": "givenName" },
+                    { "key": "displayName", "label": "displayName" },
+                    { "key": "eduPersonAffiliation", "label": "eduPersonAffiliation" },
+                    { "key": "eduPersonScopedAffiliation", "label": "eduPersonScopedAffiliation" },
+                    { "key": "eduPersonPrimaryAffiliation", "label": "eduPersonPrimaryAffiliation" },
+                    { "key": "eduPersonEntitlement", "label": "eduPersonEntitlement" },
+                    { "key": "eduPersonAssurance", "label": "eduPersonAssurance" },
+                    { "key": "eduPersonUniqueId", "label": "eduPersonUniqueId" },
+                    { "key": "employeeNumber", "label": "employeeNumber" }
+                ]
+            },
+            "items": {
+                "type": "string"
+            }
+        }
+    },
+    "required": [
+        "name"
+    ],
+    "fieldsets": [
+        {
+            "type": "group-lg",
+            "fields": [
+                "name",
+                "@type",
+                "resourceId",
+                "version",
+                "entityAttributesFilterTarget"
+            ]
+        },
+        {
+            "type": "group",
+            "fields": [
+                "filterEnabled",
+                "relyingPartyOverrides"
+            ]
+        },
+        {
+            "type": "group",
+            "fields": [
+                "attributeRelease"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/ui/src/assets/schema/filter/metadata-filter.schema.json b/ui/src/assets/schema/filter/metadata-filter.schema.json
new file mode 100644
index 000000000..704b7b9df
--- /dev/null
+++ b/ui/src/assets/schema/filter/metadata-filter.schema.json
@@ -0,0 +1,48 @@
+{
+    "title": "MetadataFilter",
+    "type": "object",
+    "widget": {
+        "id": "fieldset"
+    },
+    "properties": {
+        "name": {
+            "title": "Metadata Filter Name (Dashboard Display Only)",
+            "description": "Metadata Filter Name",
+            "type": "string",
+            "widget": {
+                "id": "string",
+                "help": "Must be unique."
+            }
+        },
+        "@type": {
+            "title": "Metadata Filter Type",
+            "description": "Metadata Filter Type",
+            "placeholder": "Select a metadata filter type",
+            "type": "string",
+            "widget": {
+                "id": "select"
+            },
+            "oneOf": [
+                {
+                    "enum": [
+                        "EntityAttributes"
+                    ],
+                    "description": "EntityAttributes Filter"
+                }
+            ]
+        }
+    },
+    "required": [
+        "name",
+        "@type"
+    ],
+    "fieldsets": [
+        {
+            "type": "section",
+            "fields": [
+                "name",
+                "@type"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/ui/src/styles.scss b/ui/src/styles.scss
index 6aaec38da..454ccba2e 100644
--- a/ui/src/styles.scss
+++ b/ui/src/styles.scss
@@ -5,6 +5,7 @@
 @import './theme/tags';
 @import './theme/alert';
 @import './theme/typography';
+@import './theme/list';
 
 body {
     background-color: theme-color("light");
diff --git a/ui/src/theme/forms.scss b/ui/src/theme/forms.scss
index 96323bcaa..5d4664008 100644
--- a/ui/src/theme/forms.scss
+++ b/ui/src/theme/forms.scss
@@ -71,6 +71,13 @@ Json schema form
     @include component-validation-state("invalid", $form-feedback-invalid-color);
 }
 
+.codearea {
+    white-space: pre-wrap;
+    resize: vertical;
+    font-family: monospace;
+    min-height: 166px;
+}
+
 @media only screen and (max-width: 1200px) {
     .form-section:not(:first-child) {
         border-left: 0px;
diff --git a/ui/src/theme/list.scss b/ui/src/theme/list.scss
new file mode 100644
index 000000000..2fa09b033
--- /dev/null
+++ b/ui/src/theme/list.scss
@@ -0,0 +1,16 @@
+.list-group {
+    &.list-group-sm {
+        & > .list-group-item {
+            padding: 0rem 0.75rem;
+        }
+    }
+
+    &.list-group-scroll {
+        overflow: scroll;
+        max-height: 48px * 5;
+
+        & > .list-group-item {
+            min-height: 30px;
+        }
+    }
+}
\ No newline at end of file

From 43d7aa3020201ef4d6e5729395c84b4b4637f81b Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 7 Aug 2018 14:06:16 -0700
Subject: [PATCH 21/39] SHIBUI-714 Fixed issue with duplicate ids

---
 ui/src/app/schema-form/widget/datalist/datalist.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/app/schema-form/widget/datalist/datalist.component.html b/ui/src/app/schema-form/widget/datalist/datalist.component.html
index adff71539..6b3c9286d 100644
--- a/ui/src/app/schema-form/widget/datalist/datalist.component.html
+++ b/ui/src/app/schema-form/widget/datalist/datalist.component.html
@@ -14,7 +14,7 @@
     </label>
     <span *ngIf="schema.description" class="sr-only">{{ schema.description }}</span>
     <auto-complete
-        [attr.id]="id"
+        [id]="id"
         [formControl]="control"
         [matches]="schema.widget.data"
         [required]="true"

From 8d61a4e6599910477c31d0b22bad6918a19b3b7b Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 7 Aug 2018 14:25:13 -0700
Subject: [PATCH 22/39] SHIBUI-716 Fixed issue with duplicate id validation for
 providers

---
 .../metadata/domain/effect/entity.effect.spec.ts    | 13 +++++++++++--
 .../container/provider-wizard-step.component.ts     | 12 +++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ui/src/app/metadata/domain/effect/entity.effect.spec.ts b/ui/src/app/metadata/domain/effect/entity.effect.spec.ts
index 710b55909..9039a4cd9 100644
--- a/ui/src/app/metadata/domain/effect/entity.effect.spec.ts
+++ b/ui/src/app/metadata/domain/effect/entity.effect.spec.ts
@@ -8,7 +8,7 @@ import { EntityIdService } from '../service/entity-id.service';
 import { ResolverService } from '../service/resolver.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { NgbModalStub } from '../../../../testing/modal.stub';
-import { EntityAttributesFilterEntity } from '../entity';
+import { EntityAttributesFilterEntity, FileBackedHttpMetadataResolver } from '../entity';
 
 describe('Entity Effects', () => {
     let effects: EntityEffects;
@@ -45,7 +45,7 @@ describe('Entity Effects', () => {
     });
 
     describe('openModal', () => {
-        it('should open a modal window', fakeAsync(() => {
+        it('should open a modal window for a filter', fakeAsync(() => {
             spyOn(modal, 'open').and.returnValue({componentInstance: <any>{}});
             spyOn(idService, 'preview').and.returnValue(of('<foo></foo>'));
             effects.openModal(new EntityAttributesFilterEntity());
@@ -53,5 +53,14 @@ describe('Entity Effects', () => {
             tick(10);
             expect(modal.open).toHaveBeenCalled();
         }));
+
+        it('should open a modal window for a provider', fakeAsync(() => {
+            spyOn(modal, 'open').and.returnValue({ componentInstance: <any>{} });
+            spyOn(providerService, 'preview').and.returnValue(of('<foo></foo>'));
+            effects.openModal(new FileBackedHttpMetadataResolver());
+            expect(providerService.preview).toHaveBeenCalled();
+            tick(10);
+            expect(modal.open).toHaveBeenCalled();
+        }));
     });
 });
diff --git a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
index dce4187d7..0b9a7469e 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard-step.component.ts
@@ -46,9 +46,15 @@ export class ProviderWizardStepComponent implements OnDestroy {
         this.definition$ = this.store.select(fromWizard.getWizardDefinition);
         this.changes$ = this.store.select(fromProvider.getEntityChanges);
 
-        this.validators$ = this.store.select(fromProvider.getProviderNames).pipe(
-            withLatestFrom(this.definition$),
-            map(([names, def]) => def.getValidators(names))
+        this.validators$ = this.definition$.pipe(
+            withLatestFrom(
+                this.store.select(fromProvider.getProviderNames),
+                this.store.select(fromProvider.getProviderXmlIds),
+            ),
+            map(([def, names, ids]) => def.getValidators(
+                names,
+                ids
+            ))
         );
 
         this.model$ = this.schema$.pipe(

From a1fe98b3dc375c7025b655006ac6a06e0b52878b Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 8 Aug 2018 09:41:59 -0700
Subject: [PATCH 23/39] SHIBUI-706 Implemented fix for disabling type in
 provider editor

---
 ui/src/app/schema-form/widget/select/select.component.html     | 1 -
 ui/src/app/schema-form/widget/select/select.component.ts       | 2 +-
 .../schema/provider/filebacked-http-common.editor.schema.json  | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/schema-form/widget/select/select.component.html b/ui/src/app/schema-form/widget/select/select.component.html
index 4a60d6425..174f6798d 100644
--- a/ui/src/app/schema-form/widget/select/select.component.html
+++ b/ui/src/app/schema-form/widget/select/select.component.html
@@ -18,7 +18,6 @@
     <select *ngIf="schema.type !== 'array'"
         [formControl]="control"
         [attr.name]="name"
-        [attr.disabled]="schema.readOnly"
         class="form-control">
         <option disabled selected>{{ schema.placeholder || schema.title }}</option>
         <option *ngFor="let option of schema.oneOf" [ngValue]="option.enum[0]">{{option.description}}</option>
diff --git a/ui/src/app/schema-form/widget/select/select.component.ts b/ui/src/app/schema-form/widget/select/select.component.ts
index fb95fe77d..c8d59ee9f 100644
--- a/ui/src/app/schema-form/widget/select/select.component.ts
+++ b/ui/src/app/schema-form/widget/select/select.component.ts
@@ -16,7 +16,7 @@ export class CustomSelectComponent extends SelectWidget implements AfterViewInit
 
     ngAfterViewInit(): void {
         super.ngAfterViewInit();
-        if (this.schema.readOnly) {
+        if (this.schema.readOnly || this.schema.widget.disabled) {
             this.control.disable();
         } else {
             this.control.enable();
diff --git a/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json
index 1cff7715e..8001aa1c5 100644
--- a/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json
@@ -83,7 +83,8 @@
             "type": "string",
             "readOnly": true,
             "widget": {
-                "id": "select"
+                "id": "select",
+                "disabled": true
             },
             "oneOf": [
                 {

From bc6166700760beb3b4979d55db22d6a2d713b774 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 8 Aug 2018 10:40:05 -0700
Subject: [PATCH 24/39] SHIBUI-739 Fixed issue with saving provider after
 adding filter

---
 .../app/metadata/filter/effect/filter.effect.ts   |  2 +-
 .../metadata/provider/action/collection.action.ts |  2 +-
 .../metadata/provider/effect/collection.effect.ts | 15 ++++++++++++++-
 .../filter-target/filter-target.component.html    |  3 ++-
 .../filter-target/filter-target.component.ts      |  5 +++++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/metadata/filter/effect/filter.effect.ts b/ui/src/app/metadata/filter/effect/filter.effect.ts
index 9cf67e5ea..0c0ce98fe 100644
--- a/ui/src/app/metadata/filter/effect/filter.effect.ts
+++ b/ui/src/app/metadata/filter/effect/filter.effect.ts
@@ -57,7 +57,7 @@ export class FilterEffects {
         )
     );
 
-    @Effect()
+    @Effect({ dispatch: false })
     cancelChanges$ = this.actions$.pipe(
         ofType<CancelCreateFilter>(FilterActionTypes.CANCEL_CREATE_FILTER),
         combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
diff --git a/ui/src/app/metadata/provider/action/collection.action.ts b/ui/src/app/metadata/provider/action/collection.action.ts
index 7eaf7d1df..6746ffad5 100644
--- a/ui/src/app/metadata/provider/action/collection.action.ts
+++ b/ui/src/app/metadata/provider/action/collection.action.ts
@@ -45,7 +45,7 @@ export class LoadProviderError implements Action {
 export class SelectProviderRequest implements Action {
     readonly type = ProviderCollectionActionTypes.SELECT_PROVIDER_REQUEST;
 
-    constructor(public payload: any) { }
+    constructor(public payload: string) { }
 }
 
 export class SelectProviderSuccess implements Action {
diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts
index a3f8aa723..df8fc574d 100644
--- a/ui/src/app/metadata/provider/effect/collection.effect.ts
+++ b/ui/src/app/metadata/provider/effect/collection.effect.ts
@@ -23,6 +23,8 @@ import {
 } from '../action/collection.action';
 import { MetadataProviderService } from '../../domain/service/provider.service';
 import * as fromProvider from '../reducer';
+import * as fromRoot from '../../../app.reducer';
+import { AddFilterSuccess, FilterCollectionActionTypes } from '../../filter/action/collection.action';
 
 
 /* istanbul ignore next */
@@ -114,10 +116,21 @@ export class CollectionEffects {
         map(provider => new LoadProviderRequest())
     );
 
+    @Effect({ dispatch: false })
+    newFilterSuccessUpdate = this.actions$.pipe(
+        ofType<AddFilterSuccess>(FilterCollectionActionTypes.ADD_FILTER_SUCCESS),
+        map(action => action.payload),
+        withLatestFrom(this.store.select(fromProvider.getSelectedProviderId)),
+        map(([filter, id]) => id),
+        tap(id => {
+            this.store.dispatch(new SelectProviderRequest(id));
+        })
+    );
+
     constructor(
         private actions$: Actions,
         private router: Router,
-        private store: Store<fromProvider.ProviderState>,
+        private store: Store<fromRoot.State>,
         private providerService: MetadataProviderService
     ) { }
 } /* istanbul ignore next */
diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
index 1dc7c42c4..61b522b0c 100644
--- a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
+++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
@@ -47,10 +47,11 @@
             </div>
         </div>
         <div class="col-lg-6">
+            <p *ngIf="!targets.length">You must add at least one entity id target.</p>
             <ul class="list-group list-group-sm list-group-scroll" *ngIf="entityAttributesFilterTargetType === 'ENTITY'">
                 <li class="list-group-item d-flex justify-content-between align-items-center" *ngFor="let id of targets">
                     {{ id }}
-                    <button class="btn btn-link text-right">
+                    <button class="btn btn-link text-right" (click)="removeId(id)">
                         <i class="fa fa-trash fa-lg text-danger"></i>
                     </button>
                 </li>
diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts b/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
index badc78eec..5912c9cd5 100644
--- a/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
+++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
@@ -97,6 +97,11 @@ export class FilterTargetComponent extends ObjectWidget implements OnDestroy, Af
         this.search.setValue(null);
     }
 
+    removeId(id: string): void {
+        let rest = this.targets.filter(target => target !== id);
+        this.setTargetValue(rest);
+    }
+
     setTargetValue(value: string[]): void {
         this.formProperty.getProperty('value').setValue(value);
     }

From c0fb25a0dabe80219095a0c1ec0052b934471069 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 8 Aug 2018 12:03:20 -0700
Subject: [PATCH 25/39] SHIBUI-742 Text updates

---
 .../metadata/filter/container/edit-filter.component.html   | 7 +------
 .../manager/component/provider-item.component.html         | 3 +--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.html b/ui/src/app/metadata/filter/container/edit-filter.component.html
index 3dedb28f6..72b4d690f 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.html
@@ -5,18 +5,13 @@
                 <div class="col-md-12">
                     <span class="display-6">
                         <i class="fa fa-fw fa-gears"></i>
-                        <ng-container i18n="@@label--new-filter">new EntityAttributesFilter</ng-container>
+                        <ng-container i18n="@@label--new-filter">Edit EntityAttributesFilter - {{ filter.name }}</ng-container>
                     </span>
                 </div>
             </div>
         </div>
         <div class="section-body p-4 border border-top-0 border-info" *ngIf="schema$ | async">
             <div class="mx-3 my-2 d-flex justify-content-end">
-                <button (click)="this.preview(filter)" type="submit" class="btn btn-success">
-                    <i class="fa fa-fw fa-eye fa-lg"></i>
-                    <ng-container i18n="@@action--save">Preview XML</ng-container>
-                </button>
-                &nbsp;
                 <button (click)="this.save()" type="submit" class="btn btn-primary" [disabled]="!isValid || (isSaving$ | async)">
                     <i class="fa fa-fw fa-lg" [ngClass]="{
                         'fa-save': !(isSaving$ | async),
diff --git a/ui/src/app/metadata/manager/component/provider-item.component.html b/ui/src/app/metadata/manager/component/provider-item.component.html
index 9a5d1fbc7..f8441c696 100644
--- a/ui/src/app/metadata/manager/component/provider-item.component.html
+++ b/ui/src/app/metadata/manager/component/provider-item.component.html
@@ -30,8 +30,7 @@
             <div>
                 <button class="btn btn-primary btn-filter pull-left" (click)="viewFilters.emit(provider)">
                         <i class="fa fa-filter"></i>&nbsp;
-                        <span class="label">Active Filters</span>&nbsp;
-                        <span class="badge badge-light">{{ provider.metadataFilters.length }}</span>
+                        <span class="label">Manage Filters</span>
                 </button>
                 <button class="btn btn-link pull-right" (click)="select.emit(provider)" aria-label="Edit selected service provider">
                     <i class="fa fa-fw fa-edit fa-2x"></i>

From 19ea8cce0d9565885651dd11dd3c3e4cd5020bc8 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 8 Aug 2018 12:07:48 -0700
Subject: [PATCH 26/39] SHIBUI-742 Fixed bug with cancel button

---
 ui/src/app/metadata/filter/container/edit-filter.component.html | 2 +-
 ui/src/app/metadata/filter/container/new-filter.component.html  | 2 +-
 ui/src/app/metadata/filter/effect/filter.effect.ts              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.html b/ui/src/app/metadata/filter/container/edit-filter.component.html
index 72b4d690f..33ea36cc7 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.html
@@ -5,7 +5,7 @@
                 <div class="col-md-12">
                     <span class="display-6">
                         <i class="fa fa-fw fa-gears"></i>
-                        <ng-container i18n="@@label--new-filter">Edit EntityAttributesFilter - {{ filter.name }}</ng-container>
+                        <ng-container i18n="@@label--new-filter">&nbsp; Edit EntityAttributesFilter - {{ filter.name }}</ng-container>
                     </span>
                 </div>
             </div>
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.html b/ui/src/app/metadata/filter/container/new-filter.component.html
index 2ab55b2ae..22c07b036 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.html
+++ b/ui/src/app/metadata/filter/container/new-filter.component.html
@@ -5,7 +5,7 @@
                 <div class="col-md-12">
                     <span class="display-6">
                         <i class="fa fa-fw fa-gears"></i>
-                        <ng-container i18n="@@label--new-filter">new EntityAttributesFilter</ng-container>
+                        <ng-container i18n="@@label--new-filter">&nbsp; New Filter - EntityAttributes</ng-container>
                     </span>
                 </div>
             </div>
diff --git a/ui/src/app/metadata/filter/effect/filter.effect.ts b/ui/src/app/metadata/filter/effect/filter.effect.ts
index 9cf67e5ea..a83a3e9ab 100644
--- a/ui/src/app/metadata/filter/effect/filter.effect.ts
+++ b/ui/src/app/metadata/filter/effect/filter.effect.ts
@@ -57,7 +57,7 @@ export class FilterEffects {
         )
     );
 
-    @Effect()
+    @Effect({dispatch: false})
     cancelChanges$ = this.actions$.pipe(
         ofType<CancelCreateFilter>(FilterActionTypes.CANCEL_CREATE_FILTER),
         combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),

From ee4ce62ce1b5f63b7ccb1a5d51e88184a6f245a0 Mon Sep 17 00:00:00 2001
From: Jodie Muramoto <jmuramoto@unicon.net>
Date: Thu, 9 Aug 2018 11:06:28 -0700
Subject: [PATCH 27/39] SHIBUI-712: Changed text format for better color
 contrast (accessibility);

---
 ui/src/app/schema-form/widget/string/string.component.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/schema-form/widget/string/string.component.html b/ui/src/app/schema-form/widget/string/string.component.html
index d2704acbd..d5703b37a 100644
--- a/ui/src/app/schema-form/widget/string/string.component.html
+++ b/ui/src/app/schema-form/widget/string/string.component.html
@@ -15,7 +15,7 @@
         [attr.readonly]="schema.readOnly?true:null"
         class="text-widget.id textline-widget form-control"
         [attr.type]="this.getInputType()"
-        [attr.id]="id" 
+        [attr.id]="id"
         [formControl]="control"
         [attr.placeholder]="schema.placeholder"
         [attr.maxLength]="schema.maxLength || null"
@@ -25,7 +25,7 @@
     <small class="form-text text-danger" *ngIf="errorMessages && errorMessages.length && control.touched">
         {{ errorMessages }}
     </small>
-    <small class="form-text text-muted" *ngIf="!(control.touched && errorMessages && errorMessages.length) && schema.widget.help">
+    <small class="form-text text-secondary" *ngIf="!(control.touched && errorMessages && errorMessages.length) && schema.widget.help">
         {{ schema.widget.help }}
     </small>
-</div>
\ No newline at end of file
+</div>

From 82ac224cb310797755a01d0cda83196b3de6b7b4 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 9 Aug 2018 20:11:54 +0000
Subject: [PATCH 28/39] Merged in bugfix/SHIBUI-677 (pull request #145)

* Fixed minor bugs SHIBUI-741, SHIBUI-677, SHIBUI-737

Approved-by: Ryan Mathis <rmathis@unicon.net>
Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>
---
 .../container/edit-filter.component.html      |  2 +-
 .../provider/effect/collection.effect.ts      |  4 +-
 .../filter-target.component.html              | 40 ++++++++++++-------
 .../filter-target/filter-target.component.ts  |  4 +-
 .../filter/entity-attributes.schema.json      |  2 +-
 .../filebacked-http-common.editor.schema.json |  3 +-
 .../filebacked-http-common.schema.json        |  2 +-
 ui/src/theme/buttons.scss                     |  6 +++
 ui/src/theme/forms.scss                       |  1 +
 9 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.html b/ui/src/app/metadata/filter/container/edit-filter.component.html
index 33ea36cc7..cbdf2df18 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.html
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.html
@@ -5,7 +5,7 @@
                 <div class="col-md-12">
                     <span class="display-6">
                         <i class="fa fa-fw fa-gears"></i>
-                        <ng-container i18n="@@label--new-filter">&nbsp; Edit EntityAttributesFilter - {{ filter.name }}</ng-container>
+                        <ng-container i18n="@@label--new-filter">&nbsp; Edit EntityAttributesFilter</ng-container>
                     </span>
                 </div>
             </div>
diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts
index df8fc574d..6d135bdd1 100644
--- a/ui/src/app/metadata/provider/effect/collection.effect.ts
+++ b/ui/src/app/metadata/provider/effect/collection.effect.ts
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { Router } from '@angular/router';
 
 import { of } from 'rxjs';
-import { map, catchError, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import { map, catchError, switchMap, tap, withLatestFrom, debounceTime } from 'rxjs/operators';
 import {
     ProviderCollectionActionsUnion,
     ProviderCollectionActionTypes,
@@ -25,6 +25,7 @@ import { MetadataProviderService } from '../../domain/service/provider.service';
 import * as fromProvider from '../reducer';
 import * as fromRoot from '../../../app.reducer';
 import { AddFilterSuccess, FilterCollectionActionTypes } from '../../filter/action/collection.action';
+import { debounce } from '../../../../../node_modules/rxjs-compat/operator/debounce';
 
 
 /* istanbul ignore next */
@@ -48,6 +49,7 @@ export class CollectionEffects {
     selectProviders$ = this.actions$.pipe(
         ofType<SelectProviderRequest>(ProviderCollectionActionTypes.SELECT_PROVIDER_REQUEST),
         map(action => action.payload),
+        debounceTime(500),
         switchMap(id =>
             this.providerService
                 .find(id)
diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
index 61b522b0c..482803777 100644
--- a/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
+++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.html
@@ -1,20 +1,24 @@
 <fieldset>
     <div class="row">
         <div class="col-lg-6">
-            <div ngbDropdown>
-                <button ngbDropdownToggle
-                    class="btn btn-outline-secondary dropdown-toggle"
-                    type="button"
-                    data-toggle="dropdown"
-                    aria-haspopup="true"
-                    aria-expanded="false">
-                    {{ this.displayType }}
-                </button>
-                <div class="dropdown-menu" ngbDropdownMenu>
-                    <a *ngFor="let option of typeOptions" class="dropdown-item" href="#" (click)="$event.preventDefault(); select(option.value);">
-                        {{ option.description }}
-                    </a>
+            <div class="d-flex justify-content-start">
+                <div ngbDropdown>
+                    <button ngbDropdownToggle
+                        class="btn btn-outline-secondary dropdown-toggle"
+                        type="button"
+                        data-toggle="dropdown"
+                        aria-haspopup="true"
+                        aria-expanded="false">
+                        {{ this.displayType }}
+                    </button>
+                    <div class="dropdown-menu" ngbDropdownMenu>
+                        <a *ngFor="let option of typeOptions" class="dropdown-item" href="#" (click)="$event.preventDefault(); select(option.value);">
+                            {{ option.description }}
+                        </a>
+                    </div>
                 </div>
+                &nbsp;
+                <i class="fa fa-asterisk text-danger"></i>
             </div>
             <br />
             <div class="d-flex justify-content-between">
@@ -28,12 +32,21 @@
                             [matches]="ids$ | async"
                             (keydown.enter)="onSelectValue(search.value)">
                         </auto-complete>
+                        <small>You must add at least one entity id target.</small>
                     </ng-container>
                     <ng-container *ngSwitchCase="'CONDITION_SCRIPT'">
                         <p class="codearea form-control" rows="8" contenteditable [formControl]="script" name="script"></p>
+                        <small id="script-help" class="text-danger">
+                            <ng-container *ngIf="script.invalid && script.touched">Required for Scripts</ng-container>
+                            &nbsp;
+                        </small>
                     </ng-container>
                     <ng-container *ngSwitchCase="'REGEX'">
                         <input class="form-control" type="text" [formControl]="script" name="script" />
+                        <small id="regex-help" class="text-danger">
+                            <ng-container *ngIf="script.invalid && script.touched">Required for Regex</ng-container>
+                            &nbsp;
+                        </small>
                     </ng-container>
                 </div>
                 <div class="ml-2" *ngIf="entityAttributesFilterTargetType === 'ENTITY'">
@@ -47,7 +60,6 @@
             </div>
         </div>
         <div class="col-lg-6">
-            <p *ngIf="!targets.length">You must add at least one entity id target.</p>
             <ul class="list-group list-group-sm list-group-scroll" *ngIf="entityAttributesFilterTargetType === 'ENTITY'">
                 <li class="list-group-item d-flex justify-content-between align-items-center" *ngFor="let id of targets">
                     {{ id }}
diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts b/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
index 5912c9cd5..ab810dc32 100644
--- a/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
+++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
@@ -93,8 +93,8 @@ export class FilterTargetComponent extends ObjectWidget implements OnDestroy, Af
     select(value: string): void {
         this.formProperty.getProperty('entityAttributesFilterTargetType').setValue(value);
         this.setTargetValue([]);
-        this.script.setValue(null);
-        this.search.setValue(null);
+        this.script.reset();
+        this.search.reset();
     }
 
     removeId(id: string): void {
diff --git a/ui/src/assets/schema/filter/entity-attributes.schema.json b/ui/src/assets/schema/filter/entity-attributes.schema.json
index e1b747a6d..e57792b00 100644
--- a/ui/src/assets/schema/filter/entity-attributes.schema.json
+++ b/ui/src/assets/schema/filter/entity-attributes.schema.json
@@ -81,7 +81,7 @@
                     }
                 }
             },
-            "required": ["value"]
+            "required": ["value", "entityAttributesFilterTargetType"]
         },
         "relyingPartyOverrides": {
             "type": "object",
diff --git a/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json
index 8001aa1c5..98545e7e4 100644
--- a/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json
@@ -14,6 +14,7 @@
         "satisfyAnyPredicates"
     ],
     "required": [
+        "name",
         "xmlId",
         "metadataURL"
     ],
@@ -223,7 +224,7 @@
             "default": true
         },
         "satisfyAnyPredicates": {
-            "title": "Satisy Any Predicates?",
+            "title": "Satisfy Any Predicates?",
             "description": "Flag which determines whether predicates used in filtering are connected by a logical 'OR' (true) or by logical 'AND' (false).",
             "type": "boolean",
             "widget": {
diff --git a/ui/src/assets/schema/provider/filebacked-http-common.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.schema.json
index 73414de00..4e01b4f76 100644
--- a/ui/src/assets/schema/provider/filebacked-http-common.schema.json
+++ b/ui/src/assets/schema/provider/filebacked-http-common.schema.json
@@ -168,7 +168,7 @@
             "default": true
         },
         "satisfyAnyPredicates": {
-            "title": "Satisy Any Predicates?",
+            "title": "Satisfy Any Predicates?",
             "description": "Flag which determines whether predicates used in filtering are connected by a logical 'OR' (true) or by logical 'AND' (false).",
             "type": "boolean",
             "widget": {
diff --git a/ui/src/theme/buttons.scss b/ui/src/theme/buttons.scss
index 6cb4a68f5..0897adbbe 100644
--- a/ui/src/theme/buttons.scss
+++ b/ui/src/theme/buttons.scss
@@ -9,6 +9,12 @@
     background: none;
 }
 
+.btn.btn-link {
+    &:focus {
+        outline: 5px auto -webkit-focus-ring-color;
+    }
+}
+
 .nav.nav-wizard {
     .nav-item {
         margin-right: $custom-control-spacer-x * 3;
diff --git a/ui/src/theme/forms.scss b/ui/src/theme/forms.scss
index 5d4664008..3b0db210f 100644
--- a/ui/src/theme/forms.scss
+++ b/ui/src/theme/forms.scss
@@ -76,6 +76,7 @@ Json schema form
     resize: vertical;
     font-family: monospace;
     min-height: 166px;
+    margin-bottom: 0px;
 }
 
 @media only screen and (max-width: 1200px) {

From 4e7e5177e16e76ace36012e9d0cfdc31e60af736 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 9 Aug 2018 15:09:53 -0700
Subject: [PATCH 29/39] SHIBUI-668 Added icon to nav

---
 .../wizard/component/wizard.component.html    |  5 ++--
 .../app/wizard/component/wizard.component.ts  | 24 ++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
index 3d62f7d7a..587605407 100644
--- a/ui/src/app/wizard/component/wizard.component.html
+++ b/ui/src/app/wizard/component/wizard.component.html
@@ -16,8 +16,9 @@
         <li class="nav-item">
             <h3 class="tag tag-primary">
                 <span class="index">{{ (current$ | async).index }} </span>
-                <ng-container *ngIf="(current$ | async).index">
-                    {{ (current$ | async).index }}. 
+                <ng-container [ngSwitch]="currentIcon$ | async">
+                    <ng-container *ngSwitchDefault>{{ (current$ | async).index }}.</ng-container>
+                    <ng-container *ngSwitchCase="icons.CHECK"><i class="fa fa-check"></i></ng-container>
                 </ng-container>
                 {{ (current$ | async).label }}
             </h3>
diff --git a/ui/src/app/wizard/component/wizard.component.ts b/ui/src/app/wizard/component/wizard.component.ts
index da9cdafb0..a75a3bb2d 100644
--- a/ui/src/app/wizard/component/wizard.component.ts
+++ b/ui/src/app/wizard/component/wizard.component.ts
@@ -3,6 +3,13 @@ import { Store } from '@ngrx/store';
 import { Wizard, WizardStep } from '../model';
 import * as fromWizard from '../reducer';
 import { Observable } from 'rxjs';
+import { withLatestFrom, map } from 'rxjs/operators';
+
+export enum ICONS {
+    CHECK = 'CHECK',
+    INDEX = 'INDEX'
+}
+
 
 /*tslint:disable:component-selector */
 @Component({
@@ -10,7 +17,7 @@ import { Observable } from 'rxjs';
     templateUrl: './wizard.component.html',
     styleUrls: ['./wizard.component.scss']
 })
-export class WizardComponent implements OnChanges {
+export class WizardComponent {
     @Output() onNext = new EventEmitter();
     @Output() onPrevious = new EventEmitter();
     @Output() onLast = new EventEmitter();
@@ -29,6 +36,10 @@ export class WizardComponent implements OnChanges {
     current$: Observable<WizardStep>;
     last$: Observable<WizardStep>;
 
+    currentIcon$: Observable<string>;
+
+    icons = ICONS;
+
     constructor(
         private store: Store<fromWizard.WizardState>
     ) {
@@ -39,11 +50,12 @@ export class WizardComponent implements OnChanges {
         this.next$ = this.store.select(fromWizard.getNext);
         this.current$ = this.store.select(fromWizard.getCurrent);
         this.last$ = this.store.select(fromWizard.getLast);
-    }
 
-    ngOnChanges(): void {
-        // this.currentPage = this.wizard.find(r => r.index === this.index);
-        // this.previousPage = this.wizard.find(r => r.index === this.index - 1);
-        // this.nextPage = this.wizard.find(r => r.index === this.index + 1);
+        this.currentIcon$ = this.current$.pipe(
+            withLatestFrom(this.last$),
+            map(([current, last]) => {
+                return (last && current.index === last.index) ? ICONS.CHECK : ICONS.INDEX;
+            })
+        );
     }
 }

From a7274db8d32ca687cc101e8919f710a1351a17db Mon Sep 17 00:00:00 2001
From: Jodie Muramoto <jmuramoto@unicon.net>
Date: Thu, 9 Aug 2018 16:56:21 -0700
Subject: [PATCH 30/39] SHIBUI-668: Modifying switch code to include the large
 font text inside the wizard nav;

---
 ui/src/app/wizard/component/wizard.component.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
index 587605407..ed670ea60 100644
--- a/ui/src/app/wizard/component/wizard.component.html
+++ b/ui/src/app/wizard/component/wizard.component.html
@@ -15,12 +15,13 @@
         </li>
         <li class="nav-item">
             <h3 class="tag tag-primary">
-                <span class="index">{{ (current$ | async).index }} </span>
-                <ng-container [ngSwitch]="currentIcon$ | async">
-                    <ng-container *ngSwitchDefault>{{ (current$ | async).index }}.</ng-container>
-                    <ng-container *ngSwitchCase="icons.CHECK"><i class="fa fa-check"></i></ng-container>
-                </ng-container>
-                {{ (current$ | async).label }}
+                <span class="index">
+                    <ng-container [ngSwitch]="currentIcon$ | async">
+                        <ng-container *ngSwitchDefault>{{ (current$ | async).index }}</ng-container>
+                        <ng-container *ngSwitchCase="icons.CHECK"><i class="fa fa-check"></i></ng-container>
+                    </ng-container>
+                </span>
+                {{ (current$ | async).index }}. {{ (current$ | async).label }}
             </h3>
         </li>
         <li class="nav-item" *ngIf="(next$ | async)">

From f48ba27210152729e77c11ba8f60cc10179e61ca Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 10 Aug 2018 12:57:39 -0700
Subject: [PATCH 31/39] SHIBUI-751 Fixed issue with duplicate filters

---
 ui/package-lock.json                          |  5 +++
 ui/package.json                               |  1 +
 ui/src/app/app.module.ts                      |  6 +++
 .../metadata/domain/service/filter.service.ts |  1 +
 .../filter/action/collection.action.ts        | 37 +++++++------------
 .../filter/container/edit-filter.component.ts |  2 +-
 .../filter/container/new-filter.component.ts  | 29 +++++++++++----
 .../filter/effect/collection.effect.ts        | 16 ++++----
 .../filter/reducer/collection.reducer.spec.ts |  4 +-
 .../filter/reducer/collection.reducer.ts      |  4 +-
 .../filter/reducer/filter.reducer.spec.ts     | 23 +-----------
 .../metadata/filter/reducer/filter.reducer.ts | 22 +----------
 ui/src/app/metadata/filter/reducer/index.ts   |  3 +-
 ui/src/app/metadata/metadata.component.ts     |  1 -
 .../provider-filter-list.component.ts         | 26 ++++++++-----
 .../container/provider-select.component.ts    |  1 -
 .../provider/effect/collection.effect.ts      | 13 +------
 .../app/metadata/provider/provider.module.ts  |  4 +-
 .../provider/reducer/collection.reducer.ts    |  2 +-
 .../provider/resolver/provider.resolver.ts    | 34 -----------------
 20 files changed, 85 insertions(+), 149 deletions(-)
 delete mode 100644 ui/src/app/metadata/provider/resolver/provider.resolver.ts

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 0fd8aeb12..1228abd2d 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -1366,6 +1366,11 @@
       "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-5.2.0.tgz",
       "integrity": "sha1-Yn7XTJzZVGKTBIXZEqVXEXsjkD4="
     },
+    "@ngrx/store-devtools": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-6.1.0.tgz",
+      "integrity": "sha512-Uc0g/NCbJIbzvIMuCy3skiZVD5hoIrOAAvaninXkVHt7bXpbsSAdvJlmnozuGQqTbC0UQhYRwAR7InRSrzIbMQ=="
+    },
     "@ngtools/webpack": {
       "version": "6.0.0-rc.11",
       "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-6.0.0-rc.11.tgz",
diff --git a/ui/package.json b/ui/package.json
index c0199ee2d..6dc630ba9 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -31,6 +31,7 @@
     "@ngrx/entity": "^5.2.0",
     "@ngrx/router-store": "^5.2.0",
     "@ngrx/store": "^5.2.0",
+    "@ngrx/store-devtools": "^6.1.0",
     "bootstrap": "4.1.1",
     "core-js": "^2.4.1",
     "deep-object-diff": "^1.1.0",
diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts
index e51a919f2..aea2a20f6 100644
--- a/ui/src/app/app.module.ts
+++ b/ui/src/app/app.module.ts
@@ -2,6 +2,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
+import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { StoreRouterConnectingModule, RouterStateSerializer } from '@ngrx/router-store';
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 
@@ -22,6 +23,7 @@ import { ContentionModule } from './contention/contention.module';
 import { SharedModule } from './shared/shared.module';
 import { WizardModule } from './wizard/wizard.module';
 import { FormModule } from './schema-form/schema-form.module';
+import { environment } from '../environments/environment.prod';
 
 @NgModule({
     declarations: [
@@ -31,6 +33,10 @@ import { FormModule } from './schema-form/schema-form.module';
         StoreModule.forRoot(reducers, {
             metaReducers
         }),
+        StoreDevtoolsModule.instrument({
+            maxAge: 25, // Retains last 25 states
+            logOnly: environment.production, // Restrict extension to log-only mode
+        }),
         EffectsModule.forRoot([]),
         BrowserModule,
         CoreModule.forRoot(),
diff --git a/ui/src/app/metadata/domain/service/filter.service.ts b/ui/src/app/metadata/domain/service/filter.service.ts
index ac9bc8ce1..7334ee301 100644
--- a/ui/src/app/metadata/domain/service/filter.service.ts
+++ b/ui/src/app/metadata/domain/service/filter.service.ts
@@ -27,6 +27,7 @@ export class MetadataFilterService {
     }
 
     save(providerId: string, filter: MetadataFilter): Observable<MetadataFilter> {
+        console.log(providerId, filter);
         return this.http.post<MetadataFilter>(`${this.base}${this.endpoint}/${providerId}/Filters`, filter);
     }
 }
diff --git a/ui/src/app/metadata/filter/action/collection.action.ts b/ui/src/app/metadata/filter/action/collection.action.ts
index f220d84bb..c93c563d8 100644
--- a/ui/src/app/metadata/filter/action/collection.action.ts
+++ b/ui/src/app/metadata/filter/action/collection.action.ts
@@ -3,37 +3,29 @@ import { MetadataFilter } from '../../domain/model/metadata-filter';
 import { Update } from '@ngrx/entity';
 
 export enum FilterCollectionActionTypes {
-    FIND = '[Metadata Filter] Find',
-    SELECT_FILTER = '[Metadata Filter] Select Request',
-    SELECT_FILTER_SUCCESS = '[Metadata Filter] Select Success',
-    SELECT_FILTER_FAIL = '[Metadata Filter] Select Fail',
+    SELECT_FILTER_REQUEST = '[Metadata Filter Collection] Select Filter Request',
+    SELECT_FILTER_SUCCESS = '[Metadata Filter Collection] Select Filter Success',
+    SELECT_FILTER_FAIL = '[Metadata Filter Collection] Select Filter Fail',
 
-    UPDATE_FILTER_REQUEST = '[Metadata Filter] Update Request',
-    UPDATE_FILTER_SUCCESS = '[Metadata Filter] Update Success',
-    UPDATE_FILTER_FAIL = '[Metadata Filter] Update Fail',
+    UPDATE_FILTER_REQUEST = '[Metadata Filter Collection] Update Filter Request',
+    UPDATE_FILTER_SUCCESS = '[Metadata Filter Collection] Update Filter Success',
+    UPDATE_FILTER_FAIL = '[Metadata Filter Collection] Update Filter Fail',
 
-    LOAD_FILTER_REQUEST = '[Metadata Filter Collection] Filter REQUEST',
-    LOAD_FILTER_SUCCESS = '[Metadata Filter Collection] Filter SUCCESS',
-    LOAD_FILTER_ERROR = '[Metadata Filter Collection] Filter ERROR',
+    LOAD_FILTER_REQUEST = '[Metadata Filter Collection] Load Filter Request',
+    LOAD_FILTER_SUCCESS = '[Metadata Filter Collection] Load Filter Success',
+    LOAD_FILTER_ERROR = '[Metadata Filter Collection] Load Filter Error',
 
-    ADD_FILTER = '[Metadata Filter Collection] Add Filter',
+    ADD_FILTER_REQUEST = '[Metadata Filter Collection] Add Filter Request',
     ADD_FILTER_SUCCESS = '[Metadata Filter Collection] Add Filter Success',
     ADD_FILTER_FAIL = '[Metadata Filter Collection] Add Filter Fail',
 
-    REMOVE_FILTER = '[Metadata Filter Collection] Remove Filter',
+    REMOVE_FILTER_REQUEST = '[Metadata Filter Collection] Remove Filter Request',
     REMOVE_FILTER_SUCCESS = '[Metadata Filter Collection] Remove Filter Success',
     REMOVE_FILTER_FAIL = '[Metadata Filter Collection] Remove Filter Fail'
 }
 
-
-export class FindFilter implements Action {
-    readonly type = FilterCollectionActionTypes.FIND;
-
-    constructor(public payload: string) { }
-}
-
 export class SelectFilter implements Action {
-    readonly type = FilterCollectionActionTypes.SELECT_FILTER;
+    readonly type = FilterCollectionActionTypes.SELECT_FILTER_REQUEST;
 
     constructor(public payload: string) { }
 }
@@ -87,7 +79,7 @@ export class UpdateFilterFail implements Action {
 }
 
 export class AddFilterRequest implements Action {
-    readonly type = FilterCollectionActionTypes.ADD_FILTER;
+    readonly type = FilterCollectionActionTypes.ADD_FILTER_REQUEST;
 
     constructor(public payload: MetadataFilter) { }
 }
@@ -105,7 +97,7 @@ export class AddFilterFail implements Action {
 }
 
 export class RemoveFilterRequest implements Action {
-    readonly type = FilterCollectionActionTypes.REMOVE_FILTER;
+    readonly type = FilterCollectionActionTypes.REMOVE_FILTER_REQUEST;
 
     constructor(public payload: MetadataFilter) { }
 }
@@ -132,7 +124,6 @@ export type FilterCollectionActionsUnion =
     | RemoveFilterRequest
     | RemoveFilterSuccess
     | RemoveFilterFail
-    | FindFilter
     | SelectFilter
     | SelectFilterSuccess
     | SelectFilterFail
diff --git a/ui/src/app/metadata/filter/container/edit-filter.component.ts b/ui/src/app/metadata/filter/container/edit-filter.component.ts
index f12429000..50184abf8 100644
--- a/ui/src/app/metadata/filter/container/edit-filter.component.ts
+++ b/ui/src/app/metadata/filter/container/edit-filter.component.ts
@@ -39,7 +39,7 @@ export class EditFilterComponent {
         this.definition = MetadataFilterTypes.EntityAttributesFilter;
 
         this.schema$ = this.schemaService.get(this.definition.schema);
-        this.isSaving$ = this.store.select(fromFilter.getSaving);
+        this.isSaving$ = this.store.select(fromFilter.getCollectionSaving);
         this.model$ = this.store.select(fromFilter.getSelectedFilter);
 
         this.valueChangeEmitted$.subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes.value)));
diff --git a/ui/src/app/metadata/filter/container/new-filter.component.ts b/ui/src/app/metadata/filter/container/new-filter.component.ts
index 244cb3a85..542126491 100644
--- a/ui/src/app/metadata/filter/container/new-filter.component.ts
+++ b/ui/src/app/metadata/filter/container/new-filter.component.ts
@@ -1,6 +1,7 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Subject, Observable, of } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
 
 import * as fromFilter from '../reducer';
 import { MetadataFilterTypes } from '../model';
@@ -14,7 +15,9 @@ import { CancelCreateFilter, UpdateFilterChanges } from '../action/filter.action
     selector: 'new-filter-page',
     templateUrl: './new-filter.component.html'
 })
-export class NewFilterComponent {
+export class NewFilterComponent implements OnDestroy, OnInit {
+
+    private ngUnsubscribe: Subject<void> = new Subject<void>();
 
     valueChangeSubject = new Subject<Partial<any>>();
     private valueChangeEmitted$ = this.valueChangeSubject.asObservable();
@@ -37,19 +40,31 @@ export class NewFilterComponent {
         this.definition = MetadataFilterTypes.EntityAttributesFilter;
 
         this.schema$ = this.schemaService.get(this.definition.schema);
-        this.isSaving$ = this.store.select(fromFilter.getSaving);
+        this.isSaving$ = this.store.select(fromFilter.getCollectionSaving);
         this.model$ = of(<MetadataFilter>{});
+    }
 
-        this.valueChangeEmitted$.subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes.value)));
-        this.statusChangeEmitted$.subscribe(valid => {
-            this.isValid = valid.value ? valid.value.length === 0 : true;
-        });
+    ngOnInit(): void {
+        this.valueChangeEmitted$
+            .pipe(takeUntil(this.ngUnsubscribe))
+            .subscribe(changes => this.store.dispatch(new UpdateFilterChanges(changes.value)));
+        this.statusChangeEmitted$
+            .pipe(takeUntil(this.ngUnsubscribe))
+            .subscribe(valid => {
+                this.isValid = valid.value ? valid.value.length === 0 : true;
+            });
 
         this.store
             .select(fromFilter.getFilter)
+            .pipe(takeUntil(this.ngUnsubscribe))
             .subscribe(filter => this.filter = filter);
     }
 
+    ngOnDestroy(): void {
+        this.ngUnsubscribe.next();
+        this.ngUnsubscribe.complete();
+    }
+
     save(): void {
         this.store.dispatch(new AddFilterRequest(this.filter));
     }
diff --git a/ui/src/app/metadata/filter/effect/collection.effect.ts b/ui/src/app/metadata/filter/effect/collection.effect.ts
index 44651d0c2..cc41754c2 100644
--- a/ui/src/app/metadata/filter/effect/collection.effect.ts
+++ b/ui/src/app/metadata/filter/effect/collection.effect.ts
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { Router } from '@angular/router';
 
 import { of } from 'rxjs';
-import { switchMap, map, catchError, tap, combineLatest, skipWhile } from 'rxjs/operators';
+import { switchMap, map, catchError, tap, combineLatest, skipWhile, debounceTime, withLatestFrom } from 'rxjs/operators';
 
 import * as actions from '../action/collection.action';
 import { FilterCollectionActionTypes } from '../action/collection.action';
@@ -35,9 +35,9 @@ export class FilterCollectionEffects {
     );
     @Effect()
     selectFilterRequest$ = this.actions$.pipe(
-        ofType<actions.SelectFilter>(FilterCollectionActionTypes.SELECT_FILTER),
+        ofType<actions.SelectFilter>(FilterCollectionActionTypes.SELECT_FILTER_REQUEST),
         map(action => action.payload),
-        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        withLatestFrom(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
         switchMap(([filterId, providerId]) => {
             return this.filterService
                 .find(providerId, filterId)
@@ -51,7 +51,7 @@ export class FilterCollectionEffects {
 
     @Effect()
     addFilter$ = this.actions$.pipe(
-        ofType<actions.AddFilterRequest>(FilterCollectionActionTypes.ADD_FILTER),
+        ofType<actions.AddFilterRequest>(FilterCollectionActionTypes.ADD_FILTER_REQUEST),
         map(action => action.payload),
         map(filter => {
             return {
@@ -59,7 +59,7 @@ export class FilterCollectionEffects {
                 relyingPartyOverrides: removeNulls(new EntityAttributesFilterEntity(filter).relyingPartyOverrides)
             };
         }),
-        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        withLatestFrom(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
         switchMap(([unsaved, providerId]) => {
             return this.filterService
                 .save(providerId, unsaved as MetadataFilter)
@@ -73,7 +73,7 @@ export class FilterCollectionEffects {
     addFilterSuccessRedirect$ = this.actions$.pipe(
         ofType<actions.AddFilterSuccess>(FilterCollectionActionTypes.ADD_FILTER_SUCCESS),
         map(action => action.payload),
-        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        withLatestFrom(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
         tap(([filter, provider]) => this.router.navigate(['/', 'metadata', 'provider', provider, 'filters']))
     );
 
@@ -81,7 +81,7 @@ export class FilterCollectionEffects {
     updateFilter$ = this.actions$.pipe(
         ofType<actions.UpdateFilterRequest>(FilterCollectionActionTypes.UPDATE_FILTER_REQUEST),
         map(action => action.payload),
-        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        withLatestFrom(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
         switchMap(([filter, providerId]) => {
             delete filter.modifiedDate;
             delete filter.createdDate;
@@ -100,7 +100,7 @@ export class FilterCollectionEffects {
     updateFilterSuccessRedirect$ = this.actions$.pipe(
         ofType<actions.UpdateFilterSuccess>(FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS),
         map(action => action.payload),
-        combineLatest(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        withLatestFrom(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
         tap(([filter, provider]) => this.router.navigate(['/', 'metadata', 'provider', provider, 'filters']))
     );
 
diff --git a/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
index 32c46601c..dfe5fc107 100644
--- a/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
+++ b/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
@@ -23,7 +23,7 @@ describe('Filter Reducer', () => {
         });
     });
 
-    describe(`${FilterCollectionActionTypes.SELECT_FILTER}`, () => {
+    describe(`${FilterCollectionActionTypes.SELECT_FILTER_REQUEST}`, () => {
         it('should set the selected id in the store', () => {
             const selectedFilterId = 'foo';
             const action = new SelectFilter(selectedFilterId);
@@ -55,7 +55,7 @@ describe('Filter Reducer', () => {
         });
     });
 
-    describe(`${FilterCollectionActionTypes.ADD_FILTER}`, () => {
+    describe(`${FilterCollectionActionTypes.ADD_FILTER_REQUEST}`, () => {
         it('should set saving to true', () => {
             const filter = new EntityAttributesFilterEntity({ resourceId: 'foo', createdDate: new Date().toLocaleDateString() });
             const action = new AddFilterRequest(filter);
diff --git a/ui/src/app/metadata/filter/reducer/collection.reducer.ts b/ui/src/app/metadata/filter/reducer/collection.reducer.ts
index e71f0947c..35074b696 100644
--- a/ui/src/app/metadata/filter/reducer/collection.reducer.ts
+++ b/ui/src/app/metadata/filter/reducer/collection.reducer.ts
@@ -41,7 +41,7 @@ export function reducer(state = initialState, action: FilterCollectionActionsUni
             });
         }
 
-        case FilterCollectionActionTypes.ADD_FILTER:
+        case FilterCollectionActionTypes.ADD_FILTER_REQUEST:
         case FilterCollectionActionTypes.UPDATE_FILTER_REQUEST: {
             return {
                 ...state,
@@ -65,7 +65,7 @@ export function reducer(state = initialState, action: FilterCollectionActionsUni
             };
         }
 
-        case FilterCollectionActionTypes.SELECT_FILTER: {
+        case FilterCollectionActionTypes.SELECT_FILTER_REQUEST: {
             return {
                 ...state,
                 selectedFilterId: action.payload,
diff --git a/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts
index f9ed5b7a5..ff832e198 100644
--- a/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts
+++ b/ui/src/app/metadata/filter/reducer/filter.reducer.spec.ts
@@ -1,4 +1,4 @@
-import { reducer } from './filter.reducer';
+import { reducer, initialState as snapshot } from './filter.reducer';
 import * as fromFilter from './filter.reducer';
 import { SelectId, LoadEntityPreviewSuccess, UpdateFilterChanges, FilterActionTypes, CancelCreateFilter } from '../action/filter.action';
 import { SearchActionTypes } from '../action/search.action';
@@ -18,14 +18,6 @@ import { MDUI } from '../../domain/model';
 import { MetadataFilter } from '../../domain/model';
 import { EntityAttributesFilterEntity } from '../../domain/entity/filter/entity-attributes-filter';
 
-
-const snapshot: fromFilter.FilterState = {
-    selected: null,
-    changes: null,
-    preview: null,
-    saving: false
-};
-
 const mdui: MDUI = {
     displayName: 'foo',
     informationUrl: 'bar',
@@ -70,19 +62,6 @@ describe('Filter Reducer', () => {
         });
     });
 
-    describe(`${FilterCollectionActionTypes.ADD_FILTER} action`, () => {
-        it('should set saving to true', () => {
-            const result = reducer(snapshot, new AddFilterRequest(new EntityAttributesFilterEntity()));
-            expect(result.saving).toBe(true);
-        });
-    });
-    describe(`${FilterCollectionActionTypes.UPDATE_FILTER_REQUEST} action`, () => {
-        it('should set saving to true', () => {
-            const result = reducer(snapshot, new UpdateFilterRequest(new EntityAttributesFilterEntity()));
-            expect(result.saving).toBe(true);
-        });
-    });
-
     describe(`${FilterCollectionActionTypes.ADD_FILTER_SUCCESS} action`, () => {
         it('should set saving to true', () => {
             const result = reducer(snapshot, new AddFilterSuccess(new EntityAttributesFilterEntity()));
diff --git a/ui/src/app/metadata/filter/reducer/filter.reducer.ts b/ui/src/app/metadata/filter/reducer/filter.reducer.ts
index 3bce96ae3..653d53740 100644
--- a/ui/src/app/metadata/filter/reducer/filter.reducer.ts
+++ b/ui/src/app/metadata/filter/reducer/filter.reducer.ts
@@ -13,14 +13,12 @@ export interface FilterState {
     selected: string | null;
     changes: MetadataFilter | null;
     preview: MDUI | null;
-    saving: boolean;
 }
 
 export const initialState: FilterState = {
     selected: null,
     changes: null,
-    preview: null,
-    saving: false
+    preview: null
 };
 
 export function reducer(state = initialState, action: FilterActionsUnion | SearchActionsUnion | FilterCollectionActionsUnion): FilterState {
@@ -46,23 +44,6 @@ export function reducer(state = initialState, action: FilterActionsUnion | Searc
                 }
             };
         }
-        case FilterCollectionActionTypes.ADD_FILTER:
-        case FilterCollectionActionTypes.UPDATE_FILTER_REQUEST: {
-            return {
-                ...state,
-                saving: true
-            };
-        }
-        case FilterCollectionActionTypes.ADD_FILTER_FAIL:
-        case FilterCollectionActionTypes.UPDATE_FILTER_FAIL: {
-            return {
-                ...state,
-                saving: false
-            };
-        }
-        case FilterCollectionActionTypes.ADD_FILTER_SUCCESS:
-        case FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS:
-        case SearchActionTypes.CLEAR_SEARCH:
         case FilterActionTypes.CANCEL_CREATE_FILTER: {
             return {
                 ...initialState
@@ -77,4 +58,3 @@ export function reducer(state = initialState, action: FilterActionsUnion | Searc
 export const getSelected = (state: FilterState) => state.selected;
 export const getFilterChanges = (state: FilterState) => state.changes;
 export const getPreview = (state: FilterState) => state.preview;
-export const getSaving = (state: FilterState) => state.saving;
diff --git a/ui/src/app/metadata/filter/reducer/index.ts b/ui/src/app/metadata/filter/reducer/index.ts
index 951c05e51..5d9a4ecbe 100644
--- a/ui/src/app/metadata/filter/reducer/index.ts
+++ b/ui/src/app/metadata/filter/reducer/index.ts
@@ -32,7 +32,6 @@ export const getFilterFromState = createSelector(getFilterState, getFiltersFromS
 export const getSelected = createSelector(getFilterFromState, fromFilter.getSelected);
 export const getFilter = createSelector(getFilterFromState, fromFilter.getFilterChanges);
 export const getPreview = createSelector(getFilterFromState, fromFilter.getPreview);
-export const getSaving = createSelector(getFilterFromState, fromFilter.getSaving);
 
 /*
  *   Select pieces of Search Collection
@@ -50,7 +49,7 @@ export const getViewingMore = createSelector(getSearchFromState, fromSearch.getV
 */
 export const getCollectionState = createSelector(getFilterState, getCollectionFromStateFn);
 export const getAllFilters = createSelector(getCollectionState, fromCollection.selectAllFilters);
-export const getFiltersSaving = createSelector(getCollectionState, fromCollection.getIsSaving);
+export const getCollectionSaving = createSelector(getCollectionState, fromCollection.getIsSaving);
 
 export const notAddtlFilters = ['RequiredValidUntil', 'SignatureValidation', 'EntityRoleWhiteList'];
 export const filterTypeFn = filters => filters.filter(f => notAddtlFilters.indexOf(f['@type']) === -1);
diff --git a/ui/src/app/metadata/metadata.component.ts b/ui/src/app/metadata/metadata.component.ts
index 1eb87324f..df271e2fd 100644
--- a/ui/src/app/metadata/metadata.component.ts
+++ b/ui/src/app/metadata/metadata.component.ts
@@ -2,7 +2,6 @@ import { Component, ChangeDetectionStrategy } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { LoadResolverRequest } from './resolver/action/collection.action';
-import { LoadFilterRequest } from './filter/action/collection.action';
 import { LoadDraftRequest } from './resolver/action/draft.action';
 import * as fromRoot from '../app.reducer';
 import { LoadProviderRequest } from './provider/action/collection.action';
diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.ts b/ui/src/app/metadata/provider/container/provider-filter-list.component.ts
index 25dbcb0f1..92c346505 100644
--- a/ui/src/app/metadata/provider/container/provider-filter-list.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-filter-list.component.ts
@@ -1,7 +1,7 @@
-import { Component } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { skipWhile } from 'rxjs/operators';
+import { Observable, Subject } from 'rxjs';
+import { skipWhile, distinctUntilChanged, takeUntil, map } from 'rxjs/operators';
 import * as fromProvider from '../reducer';
 import * as fromFilter from '../../filter/reducer';
 import { MetadataFilter, MetadataProvider } from '../../domain/model';
@@ -14,7 +14,9 @@ import { UpdateFilterRequest, LoadFilterRequest } from '../../filter/action/coll
     templateUrl: './provider-filter-list.component.html',
     styleUrls: ['./provider-filter-list.component.scss']
 })
-export class ProviderFilterListComponent {
+export class ProviderFilterListComponent implements OnDestroy {
+
+    private ngUnsubscribe: Subject<void> = new Subject<void>();
 
     filters$: Observable<MetadataFilter[]>;
     provider$: Observable<MetadataProvider>;
@@ -27,17 +29,23 @@ export class ProviderFilterListComponent {
     ) {
         this.filters$ = this.store.select(fromFilter.getAdditionalFilters);
         this.provider$ = this.store.select(fromProvider.getSelectedProvider).pipe(skipWhile(p => !p));
+        this.provider$
+            .pipe(takeUntil(this.ngUnsubscribe))
+            .subscribe(p => {
+                this.store.dispatch(new LoadFilterRequest(p.resourceId));
+            });
 
         this.store.dispatch(new SetIndex('filters'));
 
-        this.provider$.subscribe(p => {
-            this.store.dispatch(new LoadFilterRequest(p.resourceId));
-        });
-
-        this.isSaving$ = this.store.select(fromFilter.getFiltersSaving);
+        this.isSaving$ = this.store.select(fromFilter.getCollectionSaving);
     }
 
     toggleEnabled(filter: MetadataFilter): void {
         this.store.dispatch(new UpdateFilterRequest({ ...filter, filterEnabled: !filter.filterEnabled }));
     }
+
+    ngOnDestroy(): void {
+        this.ngUnsubscribe.next();
+        this.ngUnsubscribe.complete();
+    }
 }
diff --git a/ui/src/app/metadata/provider/container/provider-select.component.ts b/ui/src/app/metadata/provider/container/provider-select.component.ts
index 7ae2b180c..a540df912 100644
--- a/ui/src/app/metadata/provider/container/provider-select.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-select.component.ts
@@ -26,7 +26,6 @@ export class ProviderSelectComponent implements OnDestroy {
         private route: ActivatedRoute
     ) {
         this.actionsSubscription = this.route.params.pipe(
-            distinctUntilChanged(),
             map(params => new SelectProviderRequest(params.providerId))
         ).subscribe(store);
 
diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts
index 6d135bdd1..fbf4a6c1e 100644
--- a/ui/src/app/metadata/provider/effect/collection.effect.ts
+++ b/ui/src/app/metadata/provider/effect/collection.effect.ts
@@ -118,21 +118,10 @@ export class CollectionEffects {
         map(provider => new LoadProviderRequest())
     );
 
-    @Effect({ dispatch: false })
-    newFilterSuccessUpdate = this.actions$.pipe(
-        ofType<AddFilterSuccess>(FilterCollectionActionTypes.ADD_FILTER_SUCCESS),
-        map(action => action.payload),
-        withLatestFrom(this.store.select(fromProvider.getSelectedProviderId)),
-        map(([filter, id]) => id),
-        tap(id => {
-            this.store.dispatch(new SelectProviderRequest(id));
-        })
-    );
-
     constructor(
         private actions$: Actions,
         private router: Router,
         private store: Store<fromRoot.State>,
         private providerService: MetadataProviderService
     ) { }
-} /* istanbul ignore next */
+}
diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts
index afd8409c4..dfd95fa8f 100644
--- a/ui/src/app/metadata/provider/provider.module.ts
+++ b/ui/src/app/metadata/provider/provider.module.ts
@@ -28,7 +28,6 @@ import { EntityEffects } from './effect/entity.effect';
 import { ProviderFilterListComponent } from './container/provider-filter-list.component';
 
 import { ProviderEditorNavComponent } from './component/provider-editor-nav.component';
-import { ProviderResolver } from './resolver/provider.resolver';
 
 @NgModule({
     declarations: [
@@ -61,8 +60,7 @@ export class ProviderModule {
         return {
             ngModule: RootProviderModule,
             providers: [
-                { provide: WidgetRegistry, useClass: CustomWidgetRegistry },
-                ProviderResolver
+                { provide: WidgetRegistry, useClass: CustomWidgetRegistry }
             ]
         };
     }
diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.ts
index 8cc0c6f0c..7d74cb5af 100644
--- a/ui/src/app/metadata/provider/reducer/collection.reducer.ts
+++ b/ui/src/app/metadata/provider/reducer/collection.reducer.ts
@@ -26,7 +26,7 @@ export function reducer(state = initialState, action: ProviderCollectionActionsU
         case ProviderCollectionActionTypes.SELECT_PROVIDER_SUCCESS: {
             return adapter.upsertOne(action.payload, {
                 ...state,
-                selectedProviderId: action.payload.id.toString()
+                selectedProviderId: action.payload.id as string
             });
         }
 
diff --git a/ui/src/app/metadata/provider/resolver/provider.resolver.ts b/ui/src/app/metadata/provider/resolver/provider.resolver.ts
deleted file mode 100644
index 9a527b8a9..000000000
--- a/ui/src/app/metadata/provider/resolver/provider.resolver.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Resolve, ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { Observable, of } from 'rxjs';
-import { map, distinctUntilChanged, skipWhile } from 'rxjs/operators';
-
-import * as fromCollection from '../reducer';
-import { MetadataProviderService } from '../../domain/service/provider.service';
-import { MetadataProvider } from '../../domain/model';
-import { SelectProviderRequest } from '../action/collection.action';
-
-/**
- * Guards are hooks into the route resolution process, providing an opportunity
- * to inform the router's navigation process whether the route should continue
- * to activate this route. Guards must return an of true or false.
- */
-@Injectable()
-export class ProviderResolver implements Resolve<Observable<MetadataProvider>> {
-    constructor(
-        private store: Store<fromCollection.State>,
-        private route: ActivatedRoute
-    ) { }
-
-    resolve() {
-        this.route.params.pipe(
-            distinctUntilChanged(),
-            map(params => {
-                return new SelectProviderRequest(params.providerId);
-            })
-        ).subscribe(this.store);
-
-        return this.store.select(fromCollection.getSelectedProvider).pipe(skipWhile(id => !id));
-    }
-}

From e6ef569d3f1565ada545d7d24484d6284e446c32 Mon Sep 17 00:00:00 2001
From: Jodie Muramoto <jmuramoto@unicon.net>
Date: Fri, 10 Aug 2018 22:32:04 +0000
Subject: [PATCH 32/39] Merged in bug/SHIBUI-712 (pull request #152)

SHIBUI-712: Updated $gray-700 value to meet color contrast accessibility guidelines;
---
 ui/src/theme/_palette.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/theme/_palette.scss b/ui/src/theme/_palette.scss
index c94195318..4a8adb95a 100644
--- a/ui/src/theme/_palette.scss
+++ b/ui/src/theme/_palette.scss
@@ -9,7 +9,7 @@ $gray-300: #dee2e6;
 $gray-400: #ced4da;
 $gray-500: #adb5bd;
 $gray-600: #868e96;
-$gray-700: #697581;
+$gray-700: #495057;
 $gray-800: #343a40;
 $gray-900: #212529;
 $black:  #000;

From 3549b7c3b0ef4be7d8077d1726f9a2fd9b3d6732 Mon Sep 17 00:00:00 2001
From: Jodie Muramoto <jmuramoto@unicon.net>
Date: Fri, 10 Aug 2018 16:11:55 -0700
Subject: [PATCH 33/39] SHIBUI-668: Made the wizard summary page current
 navigation label consistent across sources and providers;

---
 .../metadata/resolver/component/wizard-nav.component.html | 8 +++++++-
 ui/src/app/wizard/component/wizard.component.html         | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ui/src/app/metadata/resolver/component/wizard-nav.component.html b/ui/src/app/metadata/resolver/component/wizard-nav.component.html
index cba134ecf..02ff3865f 100644
--- a/ui/src/app/metadata/resolver/component/wizard-nav.component.html
+++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.html
@@ -11,12 +11,18 @@
                 </span>
             </button>
         </li>
-        <li class="nav-item">
+        <li class="nav-item" *ngIf="!isLastPage">
             <h3 class="tag tag-primary">
                 <span class="index">{{ currentPage.index }}</span>
                 <i18n-text [key]="currentPage.path"></i18n-text>
             </h3>
         </li>
+        <li class="nav-item" *ngIf="isLastPage">
+            <h3 class="tag tag-primary">
+                <span class="index"><i class="fa fa-check"></i></span>
+                <i18n-text [key]="currentPage.path"></i18n-text>
+            </h3>
+        </li>
         <li class="nav-item" *ngIf="!isLastPage">
             <button class="nav-link next btn clearfix" (click)="onNext.emit(nextPage.index)" [disabled]="wizardIsInvalid$ | async" [attr.aria-label]="nextPage.path" role="button">
                 <span class="label pull-left">
diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
index ed670ea60..cf59c451f 100644
--- a/ui/src/app/wizard/component/wizard.component.html
+++ b/ui/src/app/wizard/component/wizard.component.html
@@ -21,7 +21,11 @@ <h3 class="tag tag-primary">
                         <ng-container *ngSwitchCase="icons.CHECK"><i class="fa fa-check"></i></ng-container>
                     </ng-container>
                 </span>
-                {{ (current$ | async).index }}. {{ (current$ | async).label }}
+                <ng-container [ngSwitch]="currentIcon$ | async">
+                    <ng-container *ngSwitchDefault>{{ (current$ | async).index }}. {{ (current$ | async).label }}</ng-container>
+                    <ng-container *ngSwitchCase="icons.CHECK">{{ (current$ | async).label }}</ng-container>
+                </ng-container>
+                <!-- {{ (current$ | async).index }}. {{ (current$ | async).label }} -->
             </h3>
         </li>
         <li class="nav-item" *ngIf="(next$ | async)">

From 4b0f3f669e2c7c50bdfbea2c9eb1c5474dccb955 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 14 Aug 2018 14:05:57 +0000
Subject: [PATCH 34/39] Merged in feature/SHIBUI-707 (pull request #154)

* SHIBUI-707 Implemented provider re-ordering

Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>
Approved-by: Ryan Mathis <rmathis@unicon.net>
---
 .../preview-dialog.component.spec.ts          | 46 +++++++++
 .../metadata/domain/model/metadata-order.ts   |  3 +
 .../domain/service/provider.service.ts        | 10 ++
 .../component/provider-item.component.html    |  6 +-
 .../component/provider-item.component.ts      |  6 ++
 .../dashboard-providers-list.component.html   |  9 +-
 .../dashboard-providers-list.component.ts     | 28 ++++--
 .../provider/action/collection.action.ts      | 72 +++++++++++++-
 .../provider/effect/collection.effect.ts      | 90 ++++++++++++++++-
 .../reducer/collection.reducer.spec.ts        |  9 +-
 .../provider/reducer/collection.reducer.ts    | 19 ++--
 .../provider/reducer/entity.reducer.spec.ts   | 21 +++-
 .../metadata/provider/reducer/index.spec.ts   | 96 +++++++++++++++++++
 ui/src/app/metadata/provider/reducer/index.ts | 12 +++
 .../shared/switch/switch.component.spec.ts    | 15 +++
 15 files changed, 410 insertions(+), 32 deletions(-)
 create mode 100644 ui/src/app/metadata/domain/component/preview-dialog.component.spec.ts
 create mode 100644 ui/src/app/metadata/domain/model/metadata-order.ts
 create mode 100644 ui/src/app/metadata/provider/reducer/index.spec.ts

diff --git a/ui/src/app/metadata/domain/component/preview-dialog.component.spec.ts b/ui/src/app/metadata/domain/component/preview-dialog.component.spec.ts
new file mode 100644
index 000000000..d08b873ba
--- /dev/null
+++ b/ui/src/app/metadata/domain/component/preview-dialog.component.spec.ts
@@ -0,0 +1,46 @@
+import { TestBed, ComponentFixture } from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ViewChild, Component } from '@angular/core';
+import { Observable, of } from 'rxjs';
+import { PreviewDialogComponent } from './preview-dialog.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { NgbActiveModalStub } from '../../../../testing/modal.stub';
+
+@Component({
+    template: `<preview-dialog></preview-dialog>`
+})
+class TestHostComponent {
+    @ViewChild(PreviewDialogComponent)
+    public formUnderTest: PreviewDialogComponent;
+}
+
+
+describe('Advanced Info Form Component', () => {
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            providers: [
+                { provide: NgbActiveModal, useClass: NgbActiveModalStub }
+            ],
+            imports: [
+                NoopAnimationsModule,
+                ReactiveFormsModule
+            ],
+            declarations: [
+                PreviewDialogComponent,
+                TestHostComponent
+            ],
+        });
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should compile', () => {
+        expect(fixture).toBeDefined();
+    });
+});
diff --git a/ui/src/app/metadata/domain/model/metadata-order.ts b/ui/src/app/metadata/domain/model/metadata-order.ts
new file mode 100644
index 000000000..b365af3b0
--- /dev/null
+++ b/ui/src/app/metadata/domain/model/metadata-order.ts
@@ -0,0 +1,3 @@
+export interface ProviderOrder {
+    resourceIds: string[];
+}
diff --git a/ui/src/app/metadata/domain/service/provider.service.ts b/ui/src/app/metadata/domain/service/provider.service.ts
index 39258be42..3d83d3c55 100644
--- a/ui/src/app/metadata/domain/service/provider.service.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.ts
@@ -4,11 +4,13 @@ import { Observable } from 'rxjs';
 
 import { MetadataProvider } from '../../domain/model';
 import { FileBackedHttpMetadataProvider } from '../model/providers';
+import { ProviderOrder } from '../model/metadata-order';
 
 @Injectable()
 export class MetadataProviderService {
 
     readonly endpoint = '/MetadataResolvers';
+    readonly order = '/MetadataResolversPositionOrder';
     readonly base = '/api';
 
     constructor(
@@ -29,4 +31,12 @@ export class MetadataProviderService {
     save(provider: MetadataProvider): Observable<MetadataProvider> {
         return this.http.post<MetadataProvider>(`${this.base}${this.endpoint}`, provider);
     }
+
+    getOrder(): Observable<ProviderOrder> {
+        return this.http.get<ProviderOrder>(`${this.base}${this.order}`);
+    }
+
+    setOrder(order: ProviderOrder): Observable<ProviderOrder> {
+        return this.http.post<ProviderOrder>(`${this.base}${this.order}`, order);
+    }
 }
diff --git a/ui/src/app/metadata/manager/component/provider-item.component.html b/ui/src/app/metadata/manager/component/provider-item.component.html
index f8441c696..1ca8f575b 100644
--- a/ui/src/app/metadata/manager/component/provider-item.component.html
+++ b/ui/src/app/metadata/manager/component/provider-item.component.html
@@ -2,11 +2,11 @@
     <div class="card-header" (click)="toggle.emit(provider)" (keydown.space)="toggle.emit(provider)" tabindex="0">
         <div class="d-flex">
             <div class="reorder-card">
-                <p class="text-center text-primary font-weight-bold">1</p>
-                <button class="btn btn-link" disabled>
+                <p class="text-center text-primary font-weight-bold">{{ index }}</p>
+                <button class="btn btn-link" (click)="changeOrderDown.emit(provider); $event.stopPropagation();" [disabled]="last">
                     <i class="fa text-info fa-lg fa-chevron-circle-down" aria-hidden="true"></i>
                 </button>
-                <button class="btn btn-link pull-right" disabled>
+                <button class="btn btn-link pull-right" (click)="changeOrderUp.emit(provider); $event.stopPropagation();" [disabled]="first">
                     <i class="fa text-info fa-lg fa-chevron-circle-up" aria-hidden="true"></i>
                 </button>
             </div>
diff --git a/ui/src/app/metadata/manager/component/provider-item.component.ts b/ui/src/app/metadata/manager/component/provider-item.component.ts
index b8f676f40..ad8fa572b 100644
--- a/ui/src/app/metadata/manager/component/provider-item.component.ts
+++ b/ui/src/app/metadata/manager/component/provider-item.component.ts
@@ -12,6 +12,12 @@ import { EntityItemComponent } from './entity-item.component';
 
 export class ProviderItemComponent extends EntityItemComponent {
     @Input() provider: MetadataProvider;
+    @Input() index: number;
+    @Input() first: boolean;
+    @Input() last: boolean;
 
     @Output() viewFilters: EventEmitter<MetadataProvider> = new EventEmitter();
+
+    @Output() changeOrderUp: EventEmitter<MetadataProvider> = new EventEmitter();
+    @Output() changeOrderDown: EventEmitter<MetadataProvider> = new EventEmitter();
 }
diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
index 7d2eab50a..467538039 100644
--- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
+++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
@@ -9,14 +9,19 @@
         </div>
         <div class="p-3">
             <ul class="list-unstyled m-0">
-                <li *ngFor="let provider of providers$ | async; index as i"
+                <li *ngFor="let provider of providers$ | async; index as i; first as isFirst; last as isLast;"
                     [class.mt-2]="i > 0">
                     <provider-item
+                        [index]="i + 1"
+                        [first]="isFirst"
+                        [last]="isLast"
                         [provider]="provider"
                         [isOpen]="(providersOpen$ | async)[provider.resourceId]"
                         (select)="edit(provider)"
                         (viewFilters)="gotoFilters(provider)"
-                        (toggle)="toggleEntity(provider)">
+                        (toggle)="toggleEntity(provider)"
+                        (changeOrderUp)="updateOrderUp($event)"
+                        (changeOrderDown)="updateOrderDown($event)">
                     </provider-item>
                 </li>
             </ul>
diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
index bc2e609c4..1815d4ccf 100644
--- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
+++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
@@ -1,20 +1,21 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { MetadataProvider } from '../../domain/model';
 import { Observable } from '../../../../../node_modules/rxjs';
 import { Store } from '@ngrx/store';
 
-import { ProviderState, getAllProviders } from '../../provider/reducer';
-import * as fromDashboard from '../reducer';
+import { ProviderState, getOrderedProviders } from '../../provider/reducer';
+import { getOpenProviders } from '../reducer';
 import { ToggleEntityDisplay } from '../action/manager.action';
 import { map } from 'rxjs/operators';
+import { ChangeOrderUp, ChangeOrderDown } from '../../provider/action/collection.action';
 
 @Component({
     selector: 'dashboard-providers-list',
     templateUrl: './dashboard-providers-list.component.html'
 })
 
-export class DashboardProvidersListComponent {
+export class DashboardProvidersListComponent implements OnInit {
 
     providers$: Observable<MetadataProvider[]>;
     providersOpen$: Observable<{ [key: string]: boolean }>;
@@ -22,11 +23,12 @@ export class DashboardProvidersListComponent {
     constructor(
         private store: Store<ProviderState>,
         private router: Router
-    ) {
-        this.providers$ = this.store.select(getAllProviders).pipe(
-            map(providers => providers.filter(p => p['@type'] !== 'BaseMetadataResolver'))
-        );
-        this.providersOpen$ = store.select(fromDashboard.getOpenProviders);
+    ) { }
+
+    ngOnInit(): void {
+        this.providers$ = this.store.select(getOrderedProviders);
+        this.providersOpen$ = this.store.select(getOpenProviders);
+        this.providers$.subscribe(p => console.log(p));
     }
 
     view(id: string, page: string): void {
@@ -44,4 +46,12 @@ export class DashboardProvidersListComponent {
     toggleEntity(provider: MetadataProvider): void {
         this.store.dispatch(new ToggleEntityDisplay(provider.resourceId));
     }
+
+    updateOrderUp(provider: MetadataProvider): void {
+        this.store.dispatch(new ChangeOrderUp(provider.resourceId));
+    }
+
+    updateOrderDown(provider: MetadataProvider): void {
+        this.store.dispatch(new ChangeOrderDown(provider.resourceId));
+    }
 }
diff --git a/ui/src/app/metadata/provider/action/collection.action.ts b/ui/src/app/metadata/provider/action/collection.action.ts
index 6746ffad5..637c58115 100644
--- a/ui/src/app/metadata/provider/action/collection.action.ts
+++ b/ui/src/app/metadata/provider/action/collection.action.ts
@@ -1,6 +1,7 @@
 import { Action } from '@ngrx/store';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
 import { Update } from '@ngrx/entity';
+import { ProviderOrder } from '../../domain/model/metadata-order';
 
 export enum ProviderCollectionActionTypes {
     UPDATE_PROVIDER_REQUEST = '[Metadata Provider] Update Request',
@@ -21,7 +22,18 @@ export enum ProviderCollectionActionTypes {
 
     REMOVE_PROVIDER_REQUEST = '[Metadata Provider Collection] Remove Provider Request',
     REMOVE_PROVIDER_SUCCESS = '[Metadata Provider Collection] Remove Provider Success',
-    REMOVE_PROVIDER_FAIL = '[Metadata Provider Collection] Remove Provider Fail'
+    REMOVE_PROVIDER_FAIL = '[Metadata Provider Collection] Remove Provider Fail',
+
+    SET_ORDER_PROVIDER_REQUEST = '[Metadata Provider Collection] Set Order Provider Request',
+    SET_ORDER_PROVIDER_SUCCESS = '[Metadata Provider Collection] Set Order Remove Provider Success',
+    SET_ORDER_PROVIDER_FAIL = '[Metadata Provider Collection] Set Order Remove Provider Fail',
+
+    GET_ORDER_PROVIDER_REQUEST = '[Metadata Provider Collection] Get Order Remove Provider Request',
+    GET_ORDER_PROVIDER_SUCCESS = '[Metadata Provider Collection] Get Order Remove Provider Success',
+    GET_ORDER_PROVIDER_FAIL = '[Metadata Provider Collection] Get Order Remove Provider Fail',
+
+    CHANGE_PROVIDER_ORDER_UP = '[Metadata Provider Collection] Change Order Up',
+    CHANGE_PROVIDER_ORDER_DOWN = '[Metadata Provider Collection] Change Order Down',
 }
 
 export class LoadProviderRequest implements Action {
@@ -114,6 +126,54 @@ export class RemoveProviderFail implements Action {
     constructor(public payload: MetadataProvider) { }
 }
 
+export class SetOrderProviderRequest implements Action {
+    readonly type = ProviderCollectionActionTypes.SET_ORDER_PROVIDER_REQUEST;
+
+    constructor(public payload: ProviderOrder) { }
+}
+
+export class SetOrderProviderSuccess implements Action {
+    readonly type = ProviderCollectionActionTypes.SET_ORDER_PROVIDER_SUCCESS;
+
+    constructor() { }
+}
+
+export class SetOrderProviderFail implements Action {
+    readonly type = ProviderCollectionActionTypes.SET_ORDER_PROVIDER_FAIL;
+
+    constructor(public payload: Error) { }
+}
+
+export class GetOrderProviderRequest implements Action {
+    readonly type = ProviderCollectionActionTypes.GET_ORDER_PROVIDER_REQUEST;
+
+    constructor() { }
+}
+
+export class GetOrderProviderSuccess implements Action {
+    readonly type = ProviderCollectionActionTypes.GET_ORDER_PROVIDER_SUCCESS;
+
+    constructor(public payload: ProviderOrder) { }
+}
+
+export class GetOrderProviderFail implements Action {
+    readonly type = ProviderCollectionActionTypes.GET_ORDER_PROVIDER_FAIL;
+
+    constructor(public payload: Error) { }
+}
+
+export class ChangeOrderUp implements Action {
+    readonly type = ProviderCollectionActionTypes.CHANGE_PROVIDER_ORDER_UP;
+
+    constructor(public payload: string) { }
+}
+
+export class ChangeOrderDown implements Action {
+    readonly type = ProviderCollectionActionTypes.CHANGE_PROVIDER_ORDER_DOWN;
+
+    constructor(public payload: string) { }
+}
+
 export type ProviderCollectionActionsUnion =
     | LoadProviderRequest
     | LoadProviderSuccess
@@ -129,4 +189,12 @@ export type ProviderCollectionActionsUnion =
     | RemoveProviderFail
     | UpdateProviderRequest
     | UpdateProviderSuccess
-    | UpdateProviderFail;
+    | UpdateProviderFail
+    | SetOrderProviderRequest
+    | SetOrderProviderSuccess
+    | SetOrderProviderFail
+    | GetOrderProviderRequest
+    | GetOrderProviderSuccess
+    | GetOrderProviderFail
+    | ChangeOrderUp
+    | ChangeOrderDown;
diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts
index fbf4a6c1e..55528b395 100644
--- a/ui/src/app/metadata/provider/effect/collection.effect.ts
+++ b/ui/src/app/metadata/provider/effect/collection.effect.ts
@@ -19,7 +19,15 @@ import {
     SelectProviderError,
     UpdateProviderRequest,
     UpdateProviderSuccess,
-    UpdateProviderFail
+    UpdateProviderFail,
+    GetOrderProviderRequest,
+    GetOrderProviderSuccess,
+    GetOrderProviderFail,
+    SetOrderProviderRequest,
+    SetOrderProviderSuccess,
+    SetOrderProviderFail,
+    ChangeOrderUp,
+    ChangeOrderDown
 } from '../action/collection.action';
 import { MetadataProviderService } from '../../domain/service/provider.service';
 import * as fromProvider from '../reducer';
@@ -118,6 +126,86 @@ export class CollectionEffects {
         map(provider => new LoadProviderRequest())
     );
 
+    @Effect()
+    getOrderWithLoad$ = this.actions$.pipe(
+        ofType<LoadProviderSuccess>(ProviderCollectionActionTypes.LOAD_PROVIDER_SUCCESS),
+        map(() => new GetOrderProviderRequest())
+    );
+
+    @Effect()
+    getProviderOrder$ = this.actions$.pipe(
+        ofType<GetOrderProviderRequest>(ProviderCollectionActionTypes.GET_ORDER_PROVIDER_REQUEST),
+        switchMap(() =>
+            this.providerService.getOrder().pipe(
+                map(order => new GetOrderProviderSuccess(order)),
+                catchError(err => of(new GetOrderProviderFail(err)))
+            )
+        )
+    );
+
+    @Effect()
+    reloadProviderOrderAfterChange$ = this.actions$.pipe(
+        ofType<SetOrderProviderSuccess>(ProviderCollectionActionTypes.SET_ORDER_PROVIDER_SUCCESS),
+        map(() => new GetOrderProviderRequest())
+    );
+
+    @Effect()
+    setProviderOrder$ = this.actions$.pipe(
+        ofType<SetOrderProviderRequest>(ProviderCollectionActionTypes.SET_ORDER_PROVIDER_REQUEST),
+        map(action => action.payload),
+        switchMap(order =>
+            this.providerService.setOrder(order).pipe(
+                map(() => new SetOrderProviderSuccess()),
+                catchError(err => of(new SetOrderProviderFail(err)))
+            )
+        )
+    );
+
+    @Effect()
+    changeOrderUp$ = this.actions$.pipe(
+        ofType<ChangeOrderUp>(ProviderCollectionActionTypes.CHANGE_PROVIDER_ORDER_UP),
+        map(action => action.payload),
+        withLatestFrom(this.store.select(fromProvider.getProviderOrder)),
+        map(([id, orderSet]) => {
+            const order = orderSet.resourceIds;
+            const index = order.indexOf(id);
+            if (index > 0) {
+                const newOrder = this.array_move(order, index, index - 1);
+                return new SetOrderProviderRequest({ resourceIds: newOrder });
+            } else {
+                return new SetOrderProviderFail(new Error(`could not change order: ${ id }`));
+            }
+        })
+    );
+
+    @Effect()
+    changeOrderDown$ = this.actions$.pipe(
+        ofType<ChangeOrderDown>(ProviderCollectionActionTypes.CHANGE_PROVIDER_ORDER_DOWN),
+        map(action => action.payload),
+        withLatestFrom(this.store.select(fromProvider.getProviderOrder)),
+        map(([id, orderSet]) => {
+            const order = orderSet.resourceIds;
+            const index = order.indexOf(id);
+            if (index < order.length - 1) {
+                const newOrder = this.array_move(order, index, index + 1);
+                return new SetOrderProviderRequest({ resourceIds: newOrder });
+            } else {
+                return new SetOrderProviderFail(new Error(`could not change order: ${id}`));
+            }
+        })
+    );
+
+    array_move(arr, old_index, new_index): any[] {
+        if (new_index >= arr.length) {
+            let k = new_index - arr.length + 1;
+            while (k--) {
+                arr.push(undefined);
+            }
+        }
+        arr.splice(new_index, 0, arr.splice(old_index, 1)[0]);
+        return arr;
+    }
+
     constructor(
         private actions$: Actions,
         private router: Router,
diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts
index 3e716c212..5feb8ed5b 100644
--- a/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts
+++ b/ui/src/app/metadata/provider/reducer/collection.reducer.spec.ts
@@ -1,4 +1,4 @@
-import { reducer } from './collection.reducer';
+import { reducer, initialState as snapshot } from './collection.reducer';
 import * as fromProvider from './collection.reducer';
 import {
     ProviderCollectionActionTypes,
@@ -6,13 +6,6 @@ import {
     UpdateProviderSuccess
 } from '../action/collection.action';
 
-const snapshot: fromProvider.CollectionState = {
-    ids: [],
-    entities: {},
-    selectedProviderId: null,
-    loaded: false
-};
-
 describe('Provider Collection Reducer', () => {
     describe('undefined action', () => {
         it('should return the default state', () => {
diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.ts
index 7d74cb5af..04dfb0297 100644
--- a/ui/src/app/metadata/provider/reducer/collection.reducer.ts
+++ b/ui/src/app/metadata/provider/reducer/collection.reducer.ts
@@ -1,24 +1,22 @@
 import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity';
 import { ProviderCollectionActionTypes, ProviderCollectionActionsUnion } from '../action/collection.action';
 import { MetadataProvider } from '../../domain/model';
+import { ProviderOrder } from '../../domain/model/metadata-order';
 
 export interface CollectionState extends EntityState<MetadataProvider> {
     selectedProviderId: string | null;
     loaded: boolean;
-}
-
-export function sortByDate(a: MetadataProvider, b: MetadataProvider): number {
-    return a.createdDate.localeCompare(b.createdDate);
+    order: ProviderOrder;
 }
 
 export const adapter: EntityAdapter<MetadataProvider> = createEntityAdapter<MetadataProvider>({
-    sortComparer: sortByDate,
     selectId: (model: MetadataProvider) => model.resourceId
 });
 
 export const initialState: CollectionState = adapter.getInitialState({
     selectedProviderId: null,
-    loaded: false
+    loaded: false,
+    order: { resourceIds: [] }
 });
 
 export function reducer(state = initialState, action: ProviderCollectionActionsUnion): CollectionState {
@@ -42,6 +40,13 @@ export function reducer(state = initialState, action: ProviderCollectionActionsU
             return adapter.updateOne(action.payload, state);
         }
 
+        case ProviderCollectionActionTypes.GET_ORDER_PROVIDER_SUCCESS: {
+            return {
+                ...state,
+                order: action.payload
+            };
+        }
+
         default: {
             return state;
         }
@@ -56,3 +61,5 @@ export const {
     selectAll: selectAllProviders,
     selectTotal: selectProviderTotal
 } = adapter.getSelectors();
+
+export const getProviderOrder = (state: CollectionState) => state.order;
diff --git a/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts b/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts
index 3079a99cd..a37687766 100644
--- a/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts
+++ b/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts
@@ -1,5 +1,6 @@
-import { reducer, initialState as snapshot } from './entity.reducer';
+import { reducer, initialState as snapshot, isEntitySaved } from './entity.reducer';
 import { EntityActionTypes, ClearProvider } from '../action/entity.action';
+import { MetadataProvider } from '../../domain/model';
 
 describe('Provider Editor Reducer', () => {
     describe('undefined action', () => {
@@ -15,4 +16,22 @@ describe('Provider Editor Reducer', () => {
             expect(reducer(snapshot, new ClearProvider())).toEqual(snapshot);
         });
     });
+
+    describe(`isEntitySaved method`, () => {
+        it('should return false if there are changes', () => {
+            expect(isEntitySaved({
+                ...snapshot,
+                changes: <MetadataProvider>{
+                    name: 'bar'
+                }
+            })).toBe(false);
+        });
+
+        it('should return true if there are no changes', () => {
+            expect(isEntitySaved({
+                ...snapshot,
+                changes: <MetadataProvider>{}
+            })).toBe(true);
+        });
+    });
 });
diff --git a/ui/src/app/metadata/provider/reducer/index.spec.ts b/ui/src/app/metadata/provider/reducer/index.spec.ts
new file mode 100644
index 000000000..f595dea38
--- /dev/null
+++ b/ui/src/app/metadata/provider/reducer/index.spec.ts
@@ -0,0 +1,96 @@
+import * as fromProvider from './';
+import { MetadataProvider } from '../../domain/model';
+
+describe(`provider reducer/selector functions`, () => {
+
+    describe('getSchemaParseFn', () => {
+        const schema = {
+            properties: {
+                foo: {
+                    type: 'string'
+                }
+            }
+        };
+        const schema2 = {
+            properties: {
+                foo: {
+                    type: 'object',
+                    properties: {
+                        bar: {
+                            type: 'string'
+                        }
+                    }
+                }
+            }
+        };
+        it('should lock all properties', () => {
+            expect(fromProvider.getSchemaParseFn(schema, true)).toEqual({
+                ...schema,
+                properties: {
+                    ...schema.properties,
+                    foo: {
+                        ...schema.properties.foo,
+                        readOnly: true
+                    }
+                }
+            });
+        });
+
+        it('should unlock all properties', () => {
+            expect(fromProvider.getSchemaParseFn(schema, false)).toEqual({
+                ...schema,
+                properties: {
+                    ...schema.properties,
+                    foo: {
+                        type: 'string',
+                        readOnly: false
+                    }
+                }
+            });
+        });
+
+        it('should lock child properties properties', () => {
+            expect(fromProvider.getSchemaParseFn(schema2, true)).toEqual({
+                ...schema,
+                properties: {
+                    ...schema2.properties,
+                    foo: {
+                        ...schema2.properties.foo,
+                        readOnly: true,
+                        properties: {
+                            bar: {
+                                ...schema2.properties.foo.properties.bar,
+                                readOnly: true
+                            }
+                        }
+                    }
+                }
+            });
+        });
+    });
+
+    describe('getSchemaLockedFn', () => {
+        it('should return true if the step is locked', () => {
+            expect(fromProvider.getSchemaLockedFn({ locked: true }, false)).toEqual(false);
+        });
+    });
+
+    describe('mergeProviderOrderFn', () => {
+        const providers = <MetadataProvider[]>[
+            { resourceId: 'foo', name: 'foo', '@type': 'foo', enabled: true, xmlId: 'id', sortKey: 1, metadataFilters: [] },
+            { resourceId: 'bar', name: 'bar', '@type': 'bar', enabled: false, xmlId: 'id2', sortKey: 2, metadataFilters: [] },
+            { resourceId: 'baz', name: 'baz', '@type': 'baz', enabled: false, xmlId: 'id3', sortKey: 3, metadataFilters: [] }
+        ];
+        it('1 should sort the list accordingly', () => {
+            let order = {resourceIds: ['bar', 'foo', 'baz']},
+                ordered = fromProvider.mergeProviderOrderFn([...providers], order);
+            expect(ordered.indexOf(providers[0])).toBe(1);
+        });
+
+        it('2 should sort the list accordingly', () => {
+            let order = { resourceIds: ['foo', 'bar', 'baz'] },
+                ordered = fromProvider.mergeProviderOrderFn(providers, order);
+            expect(ordered.indexOf(providers[0])).toBe(0);
+        });
+    });
+});
diff --git a/ui/src/app/metadata/provider/reducer/index.ts b/ui/src/app/metadata/provider/reducer/index.ts
index d56ba8c0a..1fefd6406 100644
--- a/ui/src/app/metadata/provider/reducer/index.ts
+++ b/ui/src/app/metadata/provider/reducer/index.ts
@@ -9,6 +9,7 @@ import * as fromWizard from '../../../wizard/reducer';
 
 import { MetadataProvider } from '../../domain/model';
 import { WizardStep } from '../../../wizard/model';
+import { ProviderOrder } from '../../domain/model/metadata-order';
 
 export interface ProviderState {
     editor: fromEditor.EditorState;
@@ -87,6 +88,7 @@ export const getUpdatedEntity = createSelector(getEntityState, fromEntity.getUpd
 /*
  *   Select pieces of Provider Collection
 */
+export const getProviderOrder = createSelector(getCollectionState, fromCollection.getProviderOrder);
 export const getAllProviders = createSelector(getCollectionState, fromCollection.selectAllProviders);
 export const getProviderEntities = createSelector(getCollectionState, fromCollection.selectProviderEntities);
 export const getSelectedProviderId = createSelector(getCollectionState, fromCollection.getSelectedProviderId);
@@ -100,3 +102,13 @@ export const getProviderFilters = createSelector(getSelectedProvider, provider =
 
 export const getProviderXmlIds = createSelector(getAllProviders, (providers: MetadataProvider[]) => providers.map(p => p.xmlId));
 
+export const mergeProviderOrderFn = (providers: MetadataProvider[], order: ProviderOrder): MetadataProvider[] => {
+    return [...providers.sort(
+        (a: MetadataProvider, b: MetadataProvider) => {
+            const aIndex = order.resourceIds.indexOf(a.resourceId);
+            const bIndex = order.resourceIds.indexOf(b.resourceId);
+            return aIndex > bIndex ? 1 : bIndex > aIndex ? -1 : 0;
+        }
+    )];
+};
+export const getOrderedProviders = createSelector(getAllProviders, getProviderOrder, mergeProviderOrderFn);
diff --git a/ui/src/app/shared/switch/switch.component.spec.ts b/ui/src/app/shared/switch/switch.component.spec.ts
index 144dd8b71..16933e729 100644
--- a/ui/src/app/shared/switch/switch.component.spec.ts
+++ b/ui/src/app/shared/switch/switch.component.spec.ts
@@ -20,6 +20,7 @@ class TestHostComponent {
 describe('Toggle Switch Component', () => {
     let fixture: ComponentFixture<TestHostComponent>;
     let instance: TestHostComponent;
+    let cmp: ToggleSwitchComponent;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -37,10 +38,24 @@ describe('Toggle Switch Component', () => {
 
         fixture = TestBed.createComponent(TestHostComponent);
         instance = fixture.componentInstance;
+        cmp = instance.instanceUnderTest;
         fixture.detectChanges();
     });
 
     it('should compile', () => {
         expect(fixture).toBeDefined();
     });
+
+    describe('value getter', () => {
+        it('should return the checked value', () => {
+            expect(cmp.value).toBe(false);
+        });
+    });
+
+    describe('setDisabledState', () => {
+        it('should set the disabled property', () => {
+            cmp.setDisabledState(true);
+            expect(cmp.disabled).toBe(true);
+        })
+    });
 });

From ed5fe9f325e74b3076145676a92e99c28f0305dd Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 14 Aug 2018 07:55:23 -0700
Subject: [PATCH 35/39] SHIBUI-331 Implemented unsaved changes modal in
 provider editor

---
 .../domain/service/provider.service.ts        |  6 +++-
 .../dashboard-providers-list.component.ts     |  1 -
 .../component/unsaved-provider.dialog.html    | 16 +++++++++
 .../component/unsaved-provider.dialog.ts      | 28 +++++++++++++++
 .../container/provider-edit.component.ts      | 34 +++++++++++++++++--
 .../app/metadata/provider/provider.module.ts  |  8 +++--
 .../app/metadata/provider/provider.routing.ts |  7 ++--
 .../provider/reducer/entity.reducer.ts        |  2 +-
 .../resolver/container/editor.component.ts    |  1 -
 9 files changed, 92 insertions(+), 11 deletions(-)
 create mode 100644 ui/src/app/metadata/provider/component/unsaved-provider.dialog.html
 create mode 100644 ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts

diff --git a/ui/src/app/metadata/domain/service/provider.service.ts b/ui/src/app/metadata/domain/service/provider.service.ts
index 3d83d3c55..ede4bb172 100644
--- a/ui/src/app/metadata/domain/service/provider.service.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.ts
@@ -1,11 +1,13 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { MetadataProvider } from '../../domain/model';
 import { FileBackedHttpMetadataProvider } from '../model/providers';
 import { ProviderOrder } from '../model/metadata-order';
 
+
 @Injectable()
 export class MetadataProviderService {
 
@@ -17,7 +19,9 @@ export class MetadataProviderService {
         private http: HttpClient
     ) {}
     query(): Observable<MetadataProvider[]> {
-        return this.http.get<MetadataProvider[]>(`${this.base}${this.endpoint}`, {});
+        return this.http.get<MetadataProvider[]>(`${this.base}${this.endpoint}`).pipe(
+            map(providers => providers.filter(p => p['@type'] !== 'BaseMetadataResolver'))
+        );
     }
 
     find(id: string): Observable<MetadataProvider> {
diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
index 1815d4ccf..88ec0b19e 100644
--- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
+++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
@@ -28,7 +28,6 @@ export class DashboardProvidersListComponent implements OnInit {
     ngOnInit(): void {
         this.providers$ = this.store.select(getOrderedProviders);
         this.providersOpen$ = this.store.select(getOpenProviders);
-        this.providers$.subscribe(p => console.log(p));
     }
 
     view(id: string, page: string): void {
diff --git a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.html b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.html
new file mode 100644
index 000000000..f556f49cd
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.html
@@ -0,0 +1,16 @@
+<ng-container>
+    <div aria-label="Save your information? modal" role="region" tabindex="0">
+        <div class="modal-header">
+            <h4 class="modal-title" i18n="@@message--unsaved-dialog-title">Save your information?</h4>
+        </div>
+        <div class="modal-body">
+            <p i18n="@@message--unsaved-editor">You have not saved your changes. If you exit this screen, your changes will be lost.</p>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-primary" (click)="this.close()">
+                <span i18n="@@action--discard-changes" aria-label="Discard changes, go back to dashboard">Discard Changes</span>
+            </button>
+            <button type="button" class="btn btn-secondary" (click)="this.dismiss()" i18n="@@action--cancel" aria-label="Close modal and go back to editing">Cancel</button>
+        </div>
+    </div>
+</ng-container>
\ No newline at end of file
diff --git a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts
new file mode 100644
index 000000000..beafacf87
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts
@@ -0,0 +1,28 @@
+import { Component, Input } from '@angular/core';
+
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { Store, Action } from '@ngrx/store';
+import { Subject } from 'rxjs/Subject';
+
+import * as fromEditor from '../reducer';
+
+@Component({
+    selector: 'unsaved-provider',
+    templateUrl: './unsaved-provider.dialog.html'
+})
+export class UnsavedProviderComponent {
+    readonly subject: Subject<boolean> = new Subject<boolean>();
+
+    constructor(
+        public activeModal: NgbActiveModal,
+        private store: Store<fromEditor.State>
+    ) { }
+
+    close(): void {
+        this.activeModal.close();
+    }
+
+    dismiss(): void {
+        this.activeModal.dismiss();
+    }
+}
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts
index 07a79a7cf..ea7114022 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Router, ActivatedRoute, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Observable, of } from 'rxjs';
 import { skipWhile, map, combineLatest } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import * as fromWizard from '../../../wizard/reducer';
@@ -12,6 +12,9 @@ import { ClearProvider } from '../action/entity.action';
 import { Wizard } from '../../../wizard/model';
 import { UpdateProviderRequest } from '../action/collection.action';
 import { NAV_FORMATS } from '../component/provider-editor-nav.component';
+import { NgbModal } from '../../../../../node_modules/@ng-bootstrap/ng-bootstrap';
+import { UnsavedDialogComponent } from '../../resolver/component/unsaved-dialog.component';
+import { UnsavedProviderComponent } from '../component/unsaved-provider.dialog';
 
 @Component({
     selector: 'provider-edit',
@@ -36,7 +39,8 @@ export class ProviderEditComponent implements OnDestroy {
     constructor(
         private store: Store<fromProvider.ProviderState>,
         private router: Router,
-        private route: ActivatedRoute
+        private route: ActivatedRoute,
+        private modalService: NgbModal
     ) {
         this.provider$ = this.store.select(fromProvider.getSelectedProvider).pipe(skipWhile(d => !d));
         this.definition$ = this.store.select(fromWizard.getWizardDefinition).pipe(skipWhile(d => !d));
@@ -77,6 +81,10 @@ export class ProviderEditComponent implements OnDestroy {
     }
 
     ngOnDestroy() {
+        this.clear();
+    }
+
+    clear(): void {
         this.store.dispatch(new ClearProvider());
         this.store.dispatch(new ClearWizard());
         this.store.dispatch(new ClearEditor());
@@ -87,7 +95,27 @@ export class ProviderEditComponent implements OnDestroy {
     }
 
     cancel(): void {
+        this.clear();
         this.router.navigate(['metadata', 'manager', 'providers']);
     }
+
+    canDeactivate(
+        currentRoute: ActivatedRouteSnapshot,
+        currentState: RouterStateSnapshot,
+        nextState: RouterStateSnapshot
+    ): Observable<boolean> {
+        if (nextState.url.match('edit')) { return of(true); }
+        if (Object.keys({ ...this.latest }).length > 0) {
+            let modal = this.modalService.open(UnsavedProviderComponent);
+            modal.result.then(
+                () => {
+                    this.clear();
+                    this.router.navigate([nextState.url]);
+                },
+                () => console.warn('denied')
+            );
+        }
+        return this.store.select(fromProvider.getEntityIsSaved);
+    }
 }
 
diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts
index dfd95fa8f..95d037256 100644
--- a/ui/src/app/metadata/provider/provider.module.ts
+++ b/ui/src/app/metadata/provider/provider.module.ts
@@ -28,6 +28,7 @@ import { EntityEffects } from './effect/entity.effect';
 import { ProviderFilterListComponent } from './container/provider-filter-list.component';
 
 import { ProviderEditorNavComponent } from './component/provider-editor-nav.component';
+import { UnsavedProviderComponent } from './component/unsaved-provider.dialog';
 
 @NgModule({
     declarations: [
@@ -40,9 +41,12 @@ import { ProviderEditorNavComponent } from './component/provider-editor-nav.comp
         ProviderSelectComponent,
         ProviderFilterListComponent,
         SummaryPropertyComponent,
-        ProviderEditorNavComponent
+        ProviderEditorNavComponent,
+        UnsavedProviderComponent
+    ],
+    entryComponents: [
+        UnsavedProviderComponent
     ],
-    entryComponents: [],
     imports: [
         ReactiveFormsModule,
         CommonModule,
diff --git a/ui/src/app/metadata/provider/provider.routing.ts b/ui/src/app/metadata/provider/provider.routing.ts
index 8e6ecc3f5..7acd52fec 100644
--- a/ui/src/app/metadata/provider/provider.routing.ts
+++ b/ui/src/app/metadata/provider/provider.routing.ts
@@ -10,6 +10,7 @@ import { ProviderFilterListComponent } from './container/provider-filter-list.co
 import { NewFilterComponent } from '../filter/container/new-filter.component';
 import { FilterComponent } from '../filter/container/filter.component';
 import { EditFilterComponent } from '../filter/container/edit-filter.component';
+import { CanDeactivateGuard } from '../../core/service/can-deactivate.guard';
 
 export const ProviderRoutes: Routes = [
     {
@@ -44,6 +45,9 @@ export const ProviderRoutes: Routes = [
                                 path: ':form',
                                 component: ProviderEditStepComponent
                             }
+                        ],
+                        canDeactivate: [
+                            CanDeactivateGuard
                         ]
                     },
                     {
@@ -61,8 +65,7 @@ export const ProviderRoutes: Routes = [
                         children: [
                             {
                                 path: 'edit',
-                                component: EditFilterComponent,
-                                canDeactivate: []
+                                component: EditFilterComponent
                             }
                         ]
                     }
diff --git a/ui/src/app/metadata/provider/reducer/entity.reducer.ts b/ui/src/app/metadata/provider/reducer/entity.reducer.ts
index d5b63eca1..175c769d8 100644
--- a/ui/src/app/metadata/provider/reducer/entity.reducer.ts
+++ b/ui/src/app/metadata/provider/reducer/entity.reducer.ts
@@ -41,7 +41,7 @@ export function reducer(state = initialState, action: EntityActionUnion): Entity
     }
 }
 
-export const isEntitySaved = (state: EntityState) => !Object.keys(state.changes).length && !state.saving;
+export const isEntitySaved = (state: EntityState) => state.changes ? !Object.keys(state.changes).length && !state.saving : true;
 export const getEntityChanges = (state: EntityState) => state.changes;
 export const isEditorSaving = (state: EntityState) => state.saving;
 export const getUpdatedEntity = (state: EntityState) => state.changes;
diff --git a/ui/src/app/metadata/resolver/container/editor.component.ts b/ui/src/app/metadata/resolver/container/editor.component.ts
index 6aa252abe..5d4b6e1c3 100644
--- a/ui/src/app/metadata/resolver/container/editor.component.ts
+++ b/ui/src/app/metadata/resolver/container/editor.component.ts
@@ -76,7 +76,6 @@ export class EditorComponent implements OnInit, OnDestroy {
         );
 
         this.providerName$ = this.resolver$.pipe(map(p => p.serviceProviderName));
-        this.changes$ = this.store.select(fromResolver.getEditorChanges);
         this.editorIndex$ = this.route.params.pipe(map(params => Number(params.index)));
         this.currentPage$ = this.editorIndex$.pipe(map(index => EditorDef.find(r => r.index === index)));
         this.editor = EditorDef;

From ce19055806395aea94ffd911eda65f7b9088c3a3 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 14 Aug 2018 09:27:29 -0700
Subject: [PATCH 36/39] SHIBUI-331 Implemented unsaved changes modal and tests

---
 .../filter/entity-attributes-filter.spec.ts   |  4 ++
 .../component/unsaved-provider.dialog.spec.ts | 46 +++++++++++++
 .../component/unsaved-provider.dialog.ts      |  3 +-
 .../container/provider-edit.component.spec.ts | 50 ++++++++++++++-
 .../container/provider-edit.component.ts      |  3 +-
 .../wizard/component/wizard.component.spec.ts | 64 +++++++++++++++++++
 .../app/wizard/component/wizard.component.ts  |  8 ++-
 7 files changed, 169 insertions(+), 9 deletions(-)
 create mode 100644 ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts

diff --git a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts
index 04d1234be..22eae4cda 100644
--- a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts
+++ b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts
@@ -13,5 +13,9 @@ describe('EntityAttributesFilter Entity', () => {
         expect(entity).toBeDefined();
         expect(entity.resourceId).toBe('foo');
         expect(entity.enabled).toBe(entity.filterEnabled);
+        expect(entity.id).toBe(entity.resourceId);
+        expect(entity.getId()).toBe(entity.entityId);
+        expect(entity.getDisplayId()).toBe(entity.entityId);
+        expect(entity.isDraft()).toBe(false);
     });
 });
diff --git a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts
new file mode 100644
index 000000000..e9f0e4554
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts
@@ -0,0 +1,46 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { SharedModule } from '../../../shared/shared.module';
+import { UnsavedProviderComponent } from './unsaved-provider.dialog';
+import { NgbActiveModalStub } from '../../../../testing/modal.stub';
+
+@Component({
+    template: `
+        <unsaved-provider></unsaved-provider>
+    `
+})
+class TestHostComponent {
+    @ViewChild(UnsavedProviderComponent)
+    public componentUnderTest: UnsavedProviderComponent;
+}
+
+describe('Unsaved Provider Dialog Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let cmp: UnsavedProviderComponent;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [],
+            declarations: [
+                UnsavedProviderComponent,
+                TestHostComponent
+            ],
+            providers: [
+                { provide: NgbActiveModal, useClass: NgbActiveModalStub }
+            ]
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        cmp = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should instantiate the component', async(() => {
+        expect(cmp).toBeTruthy();
+    }));
+});
diff --git a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts
index beafacf87..4b8d12da3 100644
--- a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts
+++ b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts
@@ -14,8 +14,7 @@ export class UnsavedProviderComponent {
     readonly subject: Subject<boolean> = new Subject<boolean>();
 
     constructor(
-        public activeModal: NgbActiveModal,
-        private store: Store<fromEditor.State>
+        public activeModal: NgbActiveModal
     ) { }
 
     close(): void {
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
index a62734833..05cb75832 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
@@ -1,10 +1,10 @@
 import { Component, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, Router, ActivatedRouteSnapshot } from '@angular/router';
 import { APP_BASE_HREF } from '@angular/common';
-import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { TestBed, async, ComponentFixture, fakeAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ProviderEditComponent } from './provider-edit.component';
 import * as fromRoot from '../reducer';
 import * as fromWizard from '../../../wizard/reducer';
@@ -12,6 +12,9 @@ import { SharedModule } from '../../../shared/shared.module';
 import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
 import { FileBackedHttpMetadataProviderEditor } from '../model';
 import { ProviderEditorNavComponent } from '../component/provider-editor-nav.component';
+import { NgbModalStub } from '../../../../testing/modal.stub';
+import { MetadataProvider } from '../../domain/model';
+import { of } from 'rxjs';
 
 @Component({
     template: `
@@ -32,6 +35,7 @@ describe('Provider Edit Component', () => {
     let router: Router;
     let activatedRoute: ActivatedRouteStub = new ActivatedRouteStub();
     let child: ActivatedRouteStub = new ActivatedRouteStub();
+    let modal: NgbModal;
     child.testParamMap = { form: 'common' };
     activatedRoute.firstChild = child;
 
@@ -60,6 +64,7 @@ describe('Provider Edit Component', () => {
                 ProviderEditorNavComponent
             ],
             providers: [
+                { provide: NgbModal, useClass: NgbModalStub },
                 { provide: ActivatedRoute, useValue: activatedRoute },
                 { provide: APP_BASE_HREF, useValue: '/' }
             ]
@@ -67,6 +72,7 @@ describe('Provider Edit Component', () => {
 
         store = TestBed.get(Store);
         router = TestBed.get(Router);
+        modal = TestBed.get(NgbModal);
         spyOn(store, 'dispatch');
 
         fixture = TestBed.createComponent(TestHostComponent);
@@ -104,8 +110,46 @@ describe('Provider Edit Component', () => {
     describe('cancel method', () => {
         it('should route to the metadata manager', () => {
             spyOn(router, 'navigate');
+            spyOn(app, 'clear');
             app.cancel();
             expect(router.navigate).toHaveBeenCalled();
+            expect(app.clear).toHaveBeenCalled();
+        });
+    });
+
+    describe('clear method', () => {
+        it('should dispatch actions to clear the reducer state', () => {
+            app.clear();
+            expect(store.dispatch).toHaveBeenCalled();
+        });
+    });
+
+    describe('canDeactivate method', () => {
+        it('should check if the current route is another edit page', (done) => {
+            let route = new ActivatedRouteStub(),
+                snapshot = route.snapshot;
+            let result = app.canDeactivate(null, { url: 'edit', root: null }, { url: 'edit', root: null });
+            result.subscribe(can => {
+                expect(can).toBe(true);
+                done();
+            });
+            fixture.detectChanges();
+        });
+
+        it('should open a modal', (done) => {
+            app.latest = <MetadataProvider>{ name: 'bar' };
+            spyOn(store, 'select').and.returnValue(of(false));
+            spyOn(modal, 'open').and.returnValue({ result: Promise.resolve('closed') });
+            fixture.detectChanges();
+            let route = new ActivatedRouteStub(),
+                snapshot = route.snapshot;
+            let result = app.canDeactivate(null, { url: 'edit', root: null }, { url: 'foo', root: null });
+            result.subscribe(can => {
+                expect(can).toBe(false);
+                expect(modal.open).toHaveBeenCalled();
+                done();
+            });
+            fixture.detectChanges();
         });
     });
 });
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts
index ea7114022..56616fa8b 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.ts
@@ -15,6 +15,7 @@ import { NAV_FORMATS } from '../component/provider-editor-nav.component';
 import { NgbModal } from '../../../../../node_modules/@ng-bootstrap/ng-bootstrap';
 import { UnsavedDialogComponent } from '../../resolver/component/unsaved-dialog.component';
 import { UnsavedProviderComponent } from '../component/unsaved-provider.dialog';
+import { CanComponentDeactivate } from '../../../core/service/can-deactivate.guard';
 
 @Component({
     selector: 'provider-edit',
@@ -22,7 +23,7 @@ import { UnsavedProviderComponent } from '../component/unsaved-provider.dialog';
     styleUrls: []
 })
 
-export class ProviderEditComponent implements OnDestroy {
+export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate {
 
     provider$: Observable<MetadataProvider>;
     definition$: Observable<Wizard<MetadataProvider>>;
diff --git a/ui/src/app/wizard/component/wizard.component.spec.ts b/ui/src/app/wizard/component/wizard.component.spec.ts
index e69de29bb..ef513015e 100644
--- a/ui/src/app/wizard/component/wizard.component.spec.ts
+++ b/ui/src/app/wizard/component/wizard.component.spec.ts
@@ -0,0 +1,64 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, Store, combineReducers } from '@ngrx/store';
+
+import * as fromWizard from '../reducer';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+import { WizardComponent, ICONS } from './wizard.component';
+
+@Component({
+    template: `
+        <wizard></wizard>
+    `
+})
+class TestHostComponent {
+    @ViewChild(WizardComponent)
+    public componentUnderTest: WizardComponent;
+}
+
+describe('Wizard Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: WizardComponent;
+    let store: Store<fromWizard.State>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule.forRoot(),
+                RouterTestingModule,
+                StoreModule.forRoot({
+                    wizard: combineReducers(fromWizard.reducers)
+                })
+            ],
+            declarations: [
+                WizardComponent,
+                TestHostComponent
+            ],
+        }).compileComponents();
+
+        store = TestBed.get(Store);
+        spyOn(store, 'dispatch');
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should compile without error', () => {
+        expect(app).toBeTruthy();
+    });
+
+    describe('getIcon method', () => {
+        it('should return the check string for the last index', () => {
+            expect(app.getIcon({ index: 'foo' }, { index: 'foo' })).toEqual(ICONS.CHECK);
+        });
+        it('should return the index icon for other indexes', () => {
+            expect(app.getIcon({ index: 'foo' }, { index: 'bar' })).toEqual(ICONS.INDEX);
+            expect(app.getIcon({ index: 'foo' }, null)).toEqual(ICONS.INDEX);
+        });
+    });
+});
diff --git a/ui/src/app/wizard/component/wizard.component.ts b/ui/src/app/wizard/component/wizard.component.ts
index a75a3bb2d..7b4aa8ff4 100644
--- a/ui/src/app/wizard/component/wizard.component.ts
+++ b/ui/src/app/wizard/component/wizard.component.ts
@@ -53,9 +53,11 @@ export class WizardComponent {
 
         this.currentIcon$ = this.current$.pipe(
             withLatestFrom(this.last$),
-            map(([current, last]) => {
-                return (last && current.index === last.index) ? ICONS.CHECK : ICONS.INDEX;
-            })
+            map(([current, last]) => this.getIcon(current, last))
         );
     }
+
+    getIcon(current, last): string {
+        return (last && current.index === last.index) ? ICONS.CHECK : ICONS.INDEX;
+    }
 }

From 10c1241abc53837044b176fec6213d604517ddaa Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 14 Aug 2018 17:11:36 +0000
Subject: [PATCH 37/39] Merged in feature/SHIBUI-331 (pull request #155)

SHIBUI-331 Implemented unsaved changes modal in provider editor

* SHIBUI-331 Implemented unsaved changes modal in provider editor

Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>
Approved-by: Ryan Mathis <rmathis@unicon.net>
---
 .../filter/entity-attributes-filter.spec.ts   |  4 ++
 .../domain/service/provider.service.ts        |  6 +-
 .../dashboard-providers-list.component.ts     |  1 -
 .../component/unsaved-provider.dialog.html    | 16 +++++
 .../component/unsaved-provider.dialog.spec.ts | 46 +++++++++++++
 .../component/unsaved-provider.dialog.ts      | 27 ++++++++
 .../container/provider-edit.component.spec.ts | 50 ++++++++++++++-
 .../container/provider-edit.component.ts      | 37 +++++++++--
 .../app/metadata/provider/provider.module.ts  |  8 ++-
 .../app/metadata/provider/provider.routing.ts |  7 +-
 .../provider/reducer/entity.reducer.ts        |  2 +-
 .../resolver/container/editor.component.ts    |  1 -
 .../wizard/component/wizard.component.spec.ts | 64 +++++++++++++++++++
 .../app/wizard/component/wizard.component.ts  |  8 ++-
 14 files changed, 259 insertions(+), 18 deletions(-)
 create mode 100644 ui/src/app/metadata/provider/component/unsaved-provider.dialog.html
 create mode 100644 ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts
 create mode 100644 ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts

diff --git a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts
index 04d1234be..22eae4cda 100644
--- a/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts
+++ b/ui/src/app/metadata/domain/entity/filter/entity-attributes-filter.spec.ts
@@ -13,5 +13,9 @@ describe('EntityAttributesFilter Entity', () => {
         expect(entity).toBeDefined();
         expect(entity.resourceId).toBe('foo');
         expect(entity.enabled).toBe(entity.filterEnabled);
+        expect(entity.id).toBe(entity.resourceId);
+        expect(entity.getId()).toBe(entity.entityId);
+        expect(entity.getDisplayId()).toBe(entity.entityId);
+        expect(entity.isDraft()).toBe(false);
     });
 });
diff --git a/ui/src/app/metadata/domain/service/provider.service.ts b/ui/src/app/metadata/domain/service/provider.service.ts
index 3d83d3c55..ede4bb172 100644
--- a/ui/src/app/metadata/domain/service/provider.service.ts
+++ b/ui/src/app/metadata/domain/service/provider.service.ts
@@ -1,11 +1,13 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { MetadataProvider } from '../../domain/model';
 import { FileBackedHttpMetadataProvider } from '../model/providers';
 import { ProviderOrder } from '../model/metadata-order';
 
+
 @Injectable()
 export class MetadataProviderService {
 
@@ -17,7 +19,9 @@ export class MetadataProviderService {
         private http: HttpClient
     ) {}
     query(): Observable<MetadataProvider[]> {
-        return this.http.get<MetadataProvider[]>(`${this.base}${this.endpoint}`, {});
+        return this.http.get<MetadataProvider[]>(`${this.base}${this.endpoint}`).pipe(
+            map(providers => providers.filter(p => p['@type'] !== 'BaseMetadataResolver'))
+        );
     }
 
     find(id: string): Observable<MetadataProvider> {
diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
index 1815d4ccf..88ec0b19e 100644
--- a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
+++ b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
@@ -28,7 +28,6 @@ export class DashboardProvidersListComponent implements OnInit {
     ngOnInit(): void {
         this.providers$ = this.store.select(getOrderedProviders);
         this.providersOpen$ = this.store.select(getOpenProviders);
-        this.providers$.subscribe(p => console.log(p));
     }
 
     view(id: string, page: string): void {
diff --git a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.html b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.html
new file mode 100644
index 000000000..f556f49cd
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.html
@@ -0,0 +1,16 @@
+<ng-container>
+    <div aria-label="Save your information? modal" role="region" tabindex="0">
+        <div class="modal-header">
+            <h4 class="modal-title" i18n="@@message--unsaved-dialog-title">Save your information?</h4>
+        </div>
+        <div class="modal-body">
+            <p i18n="@@message--unsaved-editor">You have not saved your changes. If you exit this screen, your changes will be lost.</p>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-primary" (click)="this.close()">
+                <span i18n="@@action--discard-changes" aria-label="Discard changes, go back to dashboard">Discard Changes</span>
+            </button>
+            <button type="button" class="btn btn-secondary" (click)="this.dismiss()" i18n="@@action--cancel" aria-label="Close modal and go back to editing">Cancel</button>
+        </div>
+    </div>
+</ng-container>
\ No newline at end of file
diff --git a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts
new file mode 100644
index 000000000..e9f0e4554
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.spec.ts
@@ -0,0 +1,46 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { SharedModule } from '../../../shared/shared.module';
+import { UnsavedProviderComponent } from './unsaved-provider.dialog';
+import { NgbActiveModalStub } from '../../../../testing/modal.stub';
+
+@Component({
+    template: `
+        <unsaved-provider></unsaved-provider>
+    `
+})
+class TestHostComponent {
+    @ViewChild(UnsavedProviderComponent)
+    public componentUnderTest: UnsavedProviderComponent;
+}
+
+describe('Unsaved Provider Dialog Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let cmp: UnsavedProviderComponent;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [],
+            declarations: [
+                UnsavedProviderComponent,
+                TestHostComponent
+            ],
+            providers: [
+                { provide: NgbActiveModal, useClass: NgbActiveModalStub }
+            ]
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        cmp = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should instantiate the component', async(() => {
+        expect(cmp).toBeTruthy();
+    }));
+});
diff --git a/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts
new file mode 100644
index 000000000..4b8d12da3
--- /dev/null
+++ b/ui/src/app/metadata/provider/component/unsaved-provider.dialog.ts
@@ -0,0 +1,27 @@
+import { Component, Input } from '@angular/core';
+
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { Store, Action } from '@ngrx/store';
+import { Subject } from 'rxjs/Subject';
+
+import * as fromEditor from '../reducer';
+
+@Component({
+    selector: 'unsaved-provider',
+    templateUrl: './unsaved-provider.dialog.html'
+})
+export class UnsavedProviderComponent {
+    readonly subject: Subject<boolean> = new Subject<boolean>();
+
+    constructor(
+        public activeModal: NgbActiveModal
+    ) { }
+
+    close(): void {
+        this.activeModal.close();
+    }
+
+    dismiss(): void {
+        this.activeModal.dismiss();
+    }
+}
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
index a62734833..05cb75832 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.spec.ts
@@ -1,10 +1,10 @@
 import { Component, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, Router, ActivatedRouteSnapshot } from '@angular/router';
 import { APP_BASE_HREF } from '@angular/common';
-import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { TestBed, async, ComponentFixture, fakeAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule, Store, combineReducers } from '@ngrx/store';
-import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ProviderEditComponent } from './provider-edit.component';
 import * as fromRoot from '../reducer';
 import * as fromWizard from '../../../wizard/reducer';
@@ -12,6 +12,9 @@ import { SharedModule } from '../../../shared/shared.module';
 import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
 import { FileBackedHttpMetadataProviderEditor } from '../model';
 import { ProviderEditorNavComponent } from '../component/provider-editor-nav.component';
+import { NgbModalStub } from '../../../../testing/modal.stub';
+import { MetadataProvider } from '../../domain/model';
+import { of } from 'rxjs';
 
 @Component({
     template: `
@@ -32,6 +35,7 @@ describe('Provider Edit Component', () => {
     let router: Router;
     let activatedRoute: ActivatedRouteStub = new ActivatedRouteStub();
     let child: ActivatedRouteStub = new ActivatedRouteStub();
+    let modal: NgbModal;
     child.testParamMap = { form: 'common' };
     activatedRoute.firstChild = child;
 
@@ -60,6 +64,7 @@ describe('Provider Edit Component', () => {
                 ProviderEditorNavComponent
             ],
             providers: [
+                { provide: NgbModal, useClass: NgbModalStub },
                 { provide: ActivatedRoute, useValue: activatedRoute },
                 { provide: APP_BASE_HREF, useValue: '/' }
             ]
@@ -67,6 +72,7 @@ describe('Provider Edit Component', () => {
 
         store = TestBed.get(Store);
         router = TestBed.get(Router);
+        modal = TestBed.get(NgbModal);
         spyOn(store, 'dispatch');
 
         fixture = TestBed.createComponent(TestHostComponent);
@@ -104,8 +110,46 @@ describe('Provider Edit Component', () => {
     describe('cancel method', () => {
         it('should route to the metadata manager', () => {
             spyOn(router, 'navigate');
+            spyOn(app, 'clear');
             app.cancel();
             expect(router.navigate).toHaveBeenCalled();
+            expect(app.clear).toHaveBeenCalled();
+        });
+    });
+
+    describe('clear method', () => {
+        it('should dispatch actions to clear the reducer state', () => {
+            app.clear();
+            expect(store.dispatch).toHaveBeenCalled();
+        });
+    });
+
+    describe('canDeactivate method', () => {
+        it('should check if the current route is another edit page', (done) => {
+            let route = new ActivatedRouteStub(),
+                snapshot = route.snapshot;
+            let result = app.canDeactivate(null, { url: 'edit', root: null }, { url: 'edit', root: null });
+            result.subscribe(can => {
+                expect(can).toBe(true);
+                done();
+            });
+            fixture.detectChanges();
+        });
+
+        it('should open a modal', (done) => {
+            app.latest = <MetadataProvider>{ name: 'bar' };
+            spyOn(store, 'select').and.returnValue(of(false));
+            spyOn(modal, 'open').and.returnValue({ result: Promise.resolve('closed') });
+            fixture.detectChanges();
+            let route = new ActivatedRouteStub(),
+                snapshot = route.snapshot;
+            let result = app.canDeactivate(null, { url: 'edit', root: null }, { url: 'foo', root: null });
+            result.subscribe(can => {
+                expect(can).toBe(false);
+                expect(modal.open).toHaveBeenCalled();
+                done();
+            });
+            fixture.detectChanges();
         });
     });
 });
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts
index 07a79a7cf..56616fa8b 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Router, ActivatedRoute, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Observable, of } from 'rxjs';
 import { skipWhile, map, combineLatest } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import * as fromWizard from '../../../wizard/reducer';
@@ -12,6 +12,10 @@ import { ClearProvider } from '../action/entity.action';
 import { Wizard } from '../../../wizard/model';
 import { UpdateProviderRequest } from '../action/collection.action';
 import { NAV_FORMATS } from '../component/provider-editor-nav.component';
+import { NgbModal } from '../../../../../node_modules/@ng-bootstrap/ng-bootstrap';
+import { UnsavedDialogComponent } from '../../resolver/component/unsaved-dialog.component';
+import { UnsavedProviderComponent } from '../component/unsaved-provider.dialog';
+import { CanComponentDeactivate } from '../../../core/service/can-deactivate.guard';
 
 @Component({
     selector: 'provider-edit',
@@ -19,7 +23,7 @@ import { NAV_FORMATS } from '../component/provider-editor-nav.component';
     styleUrls: []
 })
 
-export class ProviderEditComponent implements OnDestroy {
+export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate {
 
     provider$: Observable<MetadataProvider>;
     definition$: Observable<Wizard<MetadataProvider>>;
@@ -36,7 +40,8 @@ export class ProviderEditComponent implements OnDestroy {
     constructor(
         private store: Store<fromProvider.ProviderState>,
         private router: Router,
-        private route: ActivatedRoute
+        private route: ActivatedRoute,
+        private modalService: NgbModal
     ) {
         this.provider$ = this.store.select(fromProvider.getSelectedProvider).pipe(skipWhile(d => !d));
         this.definition$ = this.store.select(fromWizard.getWizardDefinition).pipe(skipWhile(d => !d));
@@ -77,6 +82,10 @@ export class ProviderEditComponent implements OnDestroy {
     }
 
     ngOnDestroy() {
+        this.clear();
+    }
+
+    clear(): void {
         this.store.dispatch(new ClearProvider());
         this.store.dispatch(new ClearWizard());
         this.store.dispatch(new ClearEditor());
@@ -87,7 +96,27 @@ export class ProviderEditComponent implements OnDestroy {
     }
 
     cancel(): void {
+        this.clear();
         this.router.navigate(['metadata', 'manager', 'providers']);
     }
+
+    canDeactivate(
+        currentRoute: ActivatedRouteSnapshot,
+        currentState: RouterStateSnapshot,
+        nextState: RouterStateSnapshot
+    ): Observable<boolean> {
+        if (nextState.url.match('edit')) { return of(true); }
+        if (Object.keys({ ...this.latest }).length > 0) {
+            let modal = this.modalService.open(UnsavedProviderComponent);
+            modal.result.then(
+                () => {
+                    this.clear();
+                    this.router.navigate([nextState.url]);
+                },
+                () => console.warn('denied')
+            );
+        }
+        return this.store.select(fromProvider.getEntityIsSaved);
+    }
 }
 
diff --git a/ui/src/app/metadata/provider/provider.module.ts b/ui/src/app/metadata/provider/provider.module.ts
index dfd95fa8f..95d037256 100644
--- a/ui/src/app/metadata/provider/provider.module.ts
+++ b/ui/src/app/metadata/provider/provider.module.ts
@@ -28,6 +28,7 @@ import { EntityEffects } from './effect/entity.effect';
 import { ProviderFilterListComponent } from './container/provider-filter-list.component';
 
 import { ProviderEditorNavComponent } from './component/provider-editor-nav.component';
+import { UnsavedProviderComponent } from './component/unsaved-provider.dialog';
 
 @NgModule({
     declarations: [
@@ -40,9 +41,12 @@ import { ProviderEditorNavComponent } from './component/provider-editor-nav.comp
         ProviderSelectComponent,
         ProviderFilterListComponent,
         SummaryPropertyComponent,
-        ProviderEditorNavComponent
+        ProviderEditorNavComponent,
+        UnsavedProviderComponent
+    ],
+    entryComponents: [
+        UnsavedProviderComponent
     ],
-    entryComponents: [],
     imports: [
         ReactiveFormsModule,
         CommonModule,
diff --git a/ui/src/app/metadata/provider/provider.routing.ts b/ui/src/app/metadata/provider/provider.routing.ts
index 8e6ecc3f5..7acd52fec 100644
--- a/ui/src/app/metadata/provider/provider.routing.ts
+++ b/ui/src/app/metadata/provider/provider.routing.ts
@@ -10,6 +10,7 @@ import { ProviderFilterListComponent } from './container/provider-filter-list.co
 import { NewFilterComponent } from '../filter/container/new-filter.component';
 import { FilterComponent } from '../filter/container/filter.component';
 import { EditFilterComponent } from '../filter/container/edit-filter.component';
+import { CanDeactivateGuard } from '../../core/service/can-deactivate.guard';
 
 export const ProviderRoutes: Routes = [
     {
@@ -44,6 +45,9 @@ export const ProviderRoutes: Routes = [
                                 path: ':form',
                                 component: ProviderEditStepComponent
                             }
+                        ],
+                        canDeactivate: [
+                            CanDeactivateGuard
                         ]
                     },
                     {
@@ -61,8 +65,7 @@ export const ProviderRoutes: Routes = [
                         children: [
                             {
                                 path: 'edit',
-                                component: EditFilterComponent,
-                                canDeactivate: []
+                                component: EditFilterComponent
                             }
                         ]
                     }
diff --git a/ui/src/app/metadata/provider/reducer/entity.reducer.ts b/ui/src/app/metadata/provider/reducer/entity.reducer.ts
index d5b63eca1..175c769d8 100644
--- a/ui/src/app/metadata/provider/reducer/entity.reducer.ts
+++ b/ui/src/app/metadata/provider/reducer/entity.reducer.ts
@@ -41,7 +41,7 @@ export function reducer(state = initialState, action: EntityActionUnion): Entity
     }
 }
 
-export const isEntitySaved = (state: EntityState) => !Object.keys(state.changes).length && !state.saving;
+export const isEntitySaved = (state: EntityState) => state.changes ? !Object.keys(state.changes).length && !state.saving : true;
 export const getEntityChanges = (state: EntityState) => state.changes;
 export const isEditorSaving = (state: EntityState) => state.saving;
 export const getUpdatedEntity = (state: EntityState) => state.changes;
diff --git a/ui/src/app/metadata/resolver/container/editor.component.ts b/ui/src/app/metadata/resolver/container/editor.component.ts
index 6aa252abe..5d4b6e1c3 100644
--- a/ui/src/app/metadata/resolver/container/editor.component.ts
+++ b/ui/src/app/metadata/resolver/container/editor.component.ts
@@ -76,7 +76,6 @@ export class EditorComponent implements OnInit, OnDestroy {
         );
 
         this.providerName$ = this.resolver$.pipe(map(p => p.serviceProviderName));
-        this.changes$ = this.store.select(fromResolver.getEditorChanges);
         this.editorIndex$ = this.route.params.pipe(map(params => Number(params.index)));
         this.currentPage$ = this.editorIndex$.pipe(map(index => EditorDef.find(r => r.index === index)));
         this.editor = EditorDef;
diff --git a/ui/src/app/wizard/component/wizard.component.spec.ts b/ui/src/app/wizard/component/wizard.component.spec.ts
index e69de29bb..ef513015e 100644
--- a/ui/src/app/wizard/component/wizard.component.spec.ts
+++ b/ui/src/app/wizard/component/wizard.component.spec.ts
@@ -0,0 +1,64 @@
+import { Component, ViewChild } from '@angular/core';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule, Store, combineReducers } from '@ngrx/store';
+
+import * as fromWizard from '../reducer';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+import { WizardComponent, ICONS } from './wizard.component';
+
+@Component({
+    template: `
+        <wizard></wizard>
+    `
+})
+class TestHostComponent {
+    @ViewChild(WizardComponent)
+    public componentUnderTest: WizardComponent;
+}
+
+describe('Wizard Component', () => {
+
+    let fixture: ComponentFixture<TestHostComponent>;
+    let instance: TestHostComponent;
+    let app: WizardComponent;
+    let store: Store<fromWizard.State>;
+
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NgbDropdownModule.forRoot(),
+                RouterTestingModule,
+                StoreModule.forRoot({
+                    wizard: combineReducers(fromWizard.reducers)
+                })
+            ],
+            declarations: [
+                WizardComponent,
+                TestHostComponent
+            ],
+        }).compileComponents();
+
+        store = TestBed.get(Store);
+        spyOn(store, 'dispatch');
+
+        fixture = TestBed.createComponent(TestHostComponent);
+        instance = fixture.componentInstance;
+        app = instance.componentUnderTest;
+        fixture.detectChanges();
+    }));
+
+    it('should compile without error', () => {
+        expect(app).toBeTruthy();
+    });
+
+    describe('getIcon method', () => {
+        it('should return the check string for the last index', () => {
+            expect(app.getIcon({ index: 'foo' }, { index: 'foo' })).toEqual(ICONS.CHECK);
+        });
+        it('should return the index icon for other indexes', () => {
+            expect(app.getIcon({ index: 'foo' }, { index: 'bar' })).toEqual(ICONS.INDEX);
+            expect(app.getIcon({ index: 'foo' }, null)).toEqual(ICONS.INDEX);
+        });
+    });
+});
diff --git a/ui/src/app/wizard/component/wizard.component.ts b/ui/src/app/wizard/component/wizard.component.ts
index a75a3bb2d..7b4aa8ff4 100644
--- a/ui/src/app/wizard/component/wizard.component.ts
+++ b/ui/src/app/wizard/component/wizard.component.ts
@@ -53,9 +53,11 @@ export class WizardComponent {
 
         this.currentIcon$ = this.current$.pipe(
             withLatestFrom(this.last$),
-            map(([current, last]) => {
-                return (last && current.index === last.index) ? ICONS.CHECK : ICONS.INDEX;
-            })
+            map(([current, last]) => this.getIcon(current, last))
         );
     }
+
+    getIcon(current, last): string {
+        return (last && current.index === last.index) ? ICONS.CHECK : ICONS.INDEX;
+    }
 }

From dcf2d2481b2af10700f30ee3cd61901f06d05848 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 14 Aug 2018 10:33:21 -0700
Subject: [PATCH 38/39] SHIBUI-331 Fixed issue with modal opening up always

---
 .../container/provider-edit.component.ts         | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts
index 56616fa8b..a29949bb5 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.ts
@@ -16,6 +16,7 @@ import { NgbModal } from '../../../../../node_modules/@ng-bootstrap/ng-bootstrap
 import { UnsavedDialogComponent } from '../../resolver/component/unsaved-dialog.component';
 import { UnsavedProviderComponent } from '../component/unsaved-provider.dialog';
 import { CanComponentDeactivate } from '../../../core/service/can-deactivate.guard';
+import { DifferentialService } from '../../../core/service/differential.service';
 
 @Component({
     selector: 'provider-edit',
@@ -34,6 +35,7 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate
     status$: Observable<any>;
 
     latest: MetadataProvider;
+    provider: MetadataProvider;
 
     formats = NAV_FORMATS;
 
@@ -41,7 +43,8 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate
         private store: Store<fromProvider.ProviderState>,
         private router: Router,
         private route: ActivatedRoute,
-        private modalService: NgbModal
+        private modalService: NgbModal,
+        private diffService: DifferentialService
     ) {
         this.provider$ = this.store.select(fromProvider.getSelectedProvider).pipe(skipWhile(d => !d));
         this.definition$ = this.store.select(fromWizard.getWizardDefinition).pipe(skipWhile(d => !d));
@@ -70,6 +73,7 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate
                 }
             });
 
+        this.provider$.subscribe(p => this.provider = p);
         this.store.select(fromProvider.getEntityChanges).subscribe(changes => this.latest = changes);
     }
 
@@ -105,8 +109,11 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate
         currentState: RouterStateSnapshot,
         nextState: RouterStateSnapshot
     ): Observable<boolean> {
-        if (nextState.url.match('edit')) { return of(true); }
-        if (Object.keys({ ...this.latest }).length > 0) {
+        if (nextState.url.match('edit')) {
+            return of(true);
+        }
+        const diff = this.diffService.updatedDiff(this.provider, this.latest);
+        if (diff && Object.keys(diff).length > 0) {
             let modal = this.modalService.open(UnsavedProviderComponent);
             modal.result.then(
                 () => {
@@ -115,8 +122,9 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate
                 },
                 () => console.warn('denied')
             );
+            return this.store.select(fromProvider.getEntityIsSaved);
         }
-        return this.store.select(fromProvider.getEntityIsSaved);
+        return of(true);
     }
 }
 

From cf7f2197a644803ef80de480f038f34897748245 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 14 Aug 2018 17:48:03 +0000
Subject: [PATCH 39/39] Merged in feature/SHIBUI-599 (pull request #156)

SHIBUI-599 Implemented saving loader on provider/source

Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>
Approved-by: Ryan Mathis <rmathis@unicon.net>
---
 .../container/provider-edit.component.html    |  8 +++-
 .../container/provider-edit.component.ts      |  2 +
 .../container/provider-wizard.component.ts    |  1 +
 .../provider/reducer/entity.reducer.spec.ts   | 45 +++++++++++++++++++
 .../provider/reducer/entity.reducer.ts        | 20 ++++++++-
 .../component/wizard-nav.component.html       | 13 +++++-
 .../component/wizard-nav.component.ts         |  2 +
 .../wizard/component/wizard.component.html    | 17 +++++--
 8 files changed, 100 insertions(+), 8 deletions(-)

diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.html b/ui/src/app/metadata/provider/container/provider-edit.component.html
index 6f15638b7..85fc2bfc9 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.html
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.html
@@ -18,10 +18,14 @@
             <div class="col-6 col-lg-3 order-2 text-right">
                 <button class="btn btn-info"
                     (click)="save()"
-                    [disabled]="isInvalid$ | async"
+                    [disabled]="(isInvalid$ | async) || (isSaving$ | async)"
                     aria-label="Save changes to the metadata source. You will return to the dashboard"
                     role="button">
-                    <i class="fa fa-fw fa-save"></i>
+                    <i class="fa fa-fw fa-lg" [ngClass]="{
+                        'fa-save': !(isSaving$ | async),
+                        'fa-spinner': (isSaving$ | async),
+                        'fa-pulse': (isSaving$ | async)
+                    }"></i>
                     <ng-container i18n="@@action--save">Save</ng-container>
                 </button>
                 &nbsp;
diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts
index a29949bb5..a2c2e0b86 100644
--- a/ui/src/app/metadata/provider/container/provider-edit.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit.component.ts
@@ -33,6 +33,7 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate
     valid$: Observable<boolean>;
     isInvalid$: Observable<boolean>;
     status$: Observable<any>;
+    isSaving$: Observable<boolean>;
 
     latest: MetadataProvider;
     provider: MetadataProvider;
@@ -52,6 +53,7 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate
         this.valid$ = this.store.select(fromProvider.getEditorIsValid);
         this.isInvalid$ = this.valid$.pipe(map(v => !v));
         this.status$ = this.store.select(fromProvider.getInvalidEditorForms);
+        this.isSaving$ = this.store.select(fromProvider.getEntityIsSaving);
 
         let startIndex$ = this.route.firstChild ?
             this.route.firstChild.params.pipe(map(p => p.form || 'filters')) :
diff --git a/ui/src/app/metadata/provider/container/provider-wizard.component.ts b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
index f7f958db8..8a4e481f5 100644
--- a/ui/src/app/metadata/provider/container/provider-wizard.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-wizard.component.ts
@@ -86,6 +86,7 @@ export class ProviderWizardComponent implements OnDestroy {
     }
 
     save(): void {
+        this.store.dispatch(new SetDisabled(true));
         this.store.dispatch(new AddProviderRequest(this.provider));
     }
 
diff --git a/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts b/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts
index a37687766..2f1bcff62 100644
--- a/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts
+++ b/ui/src/app/metadata/provider/reducer/entity.reducer.spec.ts
@@ -1,6 +1,15 @@
 import { reducer, initialState as snapshot, isEntitySaved } from './entity.reducer';
 import { EntityActionTypes, ClearProvider } from '../action/entity.action';
 import { MetadataProvider } from '../../domain/model';
+import {
+    ProviderCollectionActionTypes,
+    UpdateProviderRequest,
+    AddProviderRequest,
+    UpdateProviderSuccess,
+    UpdateProviderFail,
+    AddProviderFail,
+    AddProviderSuccess
+} from '../action/collection.action';
 
 describe('Provider Editor Reducer', () => {
     describe('undefined action', () => {
@@ -17,6 +26,42 @@ describe('Provider Editor Reducer', () => {
         });
     });
 
+    describe(`${ProviderCollectionActionTypes.UPDATE_PROVIDER_REQUEST}`, () => {
+        it('should set to `saving`', () => {
+            expect(reducer(snapshot, new UpdateProviderRequest(<MetadataProvider>{})).saving).toBe(true);
+        });
+    });
+
+    describe(`${ProviderCollectionActionTypes.ADD_PROVIDER_REQUEST}`, () => {
+        it('should set to `saving`', () => {
+            expect(reducer(snapshot, new AddProviderRequest(<MetadataProvider>{})).saving).toBe(true);
+        });
+    });
+
+    describe(`${ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS}`, () => {
+        it('should set to not `saving`', () => {
+            expect(reducer(snapshot, new UpdateProviderSuccess({id: 'foo', changes: <MetadataProvider>{} })).saving).toBe(false);
+        });
+    });
+
+    describe(`${ProviderCollectionActionTypes.ADD_PROVIDER_FAIL}`, () => {
+        it('should set to not `saving`', () => {
+            expect(reducer(snapshot, new AddProviderFail(<MetadataProvider>{})).saving).toBe(false);
+        });
+    });
+
+    describe(`${ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS}`, () => {
+        it('should set to not `saving`', () => {
+            expect(reducer(snapshot, new AddProviderSuccess(<MetadataProvider>{})).saving).toBe(false);
+        });
+    });
+
+    describe(`${ProviderCollectionActionTypes.UPDATE_PROVIDER_FAIL}`, () => {
+        it('should set to not `saving`', () => {
+            expect(reducer(snapshot, new UpdateProviderFail(<MetadataProvider>{})).saving).toBe(false);
+        });
+    });
+
     describe(`isEntitySaved method`, () => {
         it('should return false if there are changes', () => {
             expect(isEntitySaved({
diff --git a/ui/src/app/metadata/provider/reducer/entity.reducer.ts b/ui/src/app/metadata/provider/reducer/entity.reducer.ts
index 175c769d8..faa90afd5 100644
--- a/ui/src/app/metadata/provider/reducer/entity.reducer.ts
+++ b/ui/src/app/metadata/provider/reducer/entity.reducer.ts
@@ -1,5 +1,6 @@
 import { MetadataProvider } from '../../domain/model';
 import { EntityActionTypes, EntityActionUnion } from '../action/entity.action';
+import { ProviderCollectionActionsUnion, ProviderCollectionActionTypes } from '../action/collection.action';
 
 export interface EntityState {
     saving: boolean;
@@ -11,8 +12,25 @@ export const initialState: EntityState = {
     changes: null
 };
 
-export function reducer(state = initialState, action: EntityActionUnion): EntityState {
+export function reducer(state = initialState, action: EntityActionUnion | ProviderCollectionActionsUnion): EntityState {
     switch (action.type) {
+        case ProviderCollectionActionTypes.ADD_PROVIDER_REQUEST:
+        case ProviderCollectionActionTypes.UPDATE_PROVIDER_REQUEST: {
+            return {
+                ...state,
+                saving: true
+            };
+        }
+
+        case ProviderCollectionActionTypes.UPDATE_PROVIDER_FAIL:
+        case ProviderCollectionActionTypes.UPDATE_PROVIDER_SUCCESS:
+        case ProviderCollectionActionTypes.ADD_PROVIDER_FAIL:
+        case ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS: {
+            return {
+                ...state,
+                saving: false
+            };
+        }
         case EntityActionTypes.CLEAR_PROVIDER: {
             return {
                 ...initialState
diff --git a/ui/src/app/metadata/resolver/component/wizard-nav.component.html b/ui/src/app/metadata/resolver/component/wizard-nav.component.html
index 02ff3865f..ca6c3cccc 100644
--- a/ui/src/app/metadata/resolver/component/wizard-nav.component.html
+++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.html
@@ -35,10 +35,19 @@ <h3 class="tag tag-primary">
             </button>
         </li>
         <li class="nav-item" *ngIf="isLastPage">
-            <button class="nav-link save btn" (click)="onSave.emit()" aria-label="Save" role="button">
+            <button class="nav-link save btn"
+                (click)="onSave.emit()"
+                [disabled]="wizardIsSaving$ | async"
+                aria-label="Save"
+                role="button">
                 <span class="label pull-left" i18n="@@action--save">Save</span>
                 <span class="direction pull-right">
-                    <i class="fa fa-fw fa-save next d-block fa-2x"></i>
+                    <i class="fa fa-fw fa-lg next d-block fa-2x"
+                        [ngClass]="{
+                            'fa-save': !(wizardIsSaving$ | async),
+                            'fa-spinner': (wizardIsSaving$ | async),
+                            'fa-pulse': (wizardIsSaving$ | async)
+                        }"></i>
                     <ng-container i18n="@@action--save">Save</ng-container>
                 </span>
             </button>
diff --git a/ui/src/app/metadata/resolver/component/wizard-nav.component.ts b/ui/src/app/metadata/resolver/component/wizard-nav.component.ts
index ab9dd677e..c55a30191 100644
--- a/ui/src/app/metadata/resolver/component/wizard-nav.component.ts
+++ b/ui/src/app/metadata/resolver/component/wizard-nav.component.ts
@@ -22,6 +22,7 @@ export class WizardNavComponent implements OnChanges {
     isFirstPage = false;
     wizardIsValid$: Observable<boolean>;
     wizardIsInvalid$: Observable<boolean>;
+    wizardIsSaving$: Observable<boolean>;
 
     wizard: EditorFlowDefinition[] = WizardDef;
 
@@ -38,6 +39,7 @@ export class WizardNavComponent implements OnChanges {
         this.wizard = WizardDef;
 
         this.wizardIsValid$ = this.store.select(fromEditor.getEditorIsValid);
+        this.wizardIsSaving$ = this.store.select(fromEditor.getEditorIsSaving);
         this.wizardIsInvalid$ = this.wizardIsValid$.pipe(map(valid => !valid));
     }
 } /* istanbul ignore next */
diff --git a/ui/src/app/wizard/component/wizard.component.html b/ui/src/app/wizard/component/wizard.component.html
index cf59c451f..ec12ca657 100644
--- a/ui/src/app/wizard/component/wizard.component.html
+++ b/ui/src/app/wizard/component/wizard.component.html
@@ -42,10 +42,21 @@ <h3 class="tag tag-primary">
             </button>
         </li>
         <li class="nav-item" *ngIf="(last$ | async)">
-            <button class="nav-link save btn" aria-label="Save" role="button" (click)="onSave.emit()">
-                <span class="label pull-left" i18n="@@action--save">Save</span>
+            <button class="nav-link save btn"
+                aria-label="Save"
+                role="button"
+                [disabled]="disabled$ | async"
+                (click)="onSave.emit()">
+                <span class="label pull-left" i18n="@@action--save">
+                    Save
+                </span>
                 <span class="direction pull-right">
-                    <i class="fa fa-fw fa-save next d-block fa-2x"></i>
+                    <i class="fa fa-fw fa-lg next d-block fa-2x"
+                        [ngClass]="{
+                            'fa-save': !(disabled$ | async),
+                            'fa-spinner': (disabled$ | async),
+                            'fa-pulse': (disabled$ | async)
+                        }"></i>
                     <ng-container i18n="@@action--save">Save</ng-container>
                 </span>
             </button>