Merge branch 'feature/shibui-1788' of bitbucket.org:unicon/shib-idp-u…

…i into feature/shibui-1788

backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy

@@ -1,6 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.service
 
 import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomPropertiesConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.domain.IRelyingPartyOverrideProperty
 import edu.internet2.tier.shibboleth.admin.ui.security.model.User
 import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService
 import org.springframework.beans.factory.annotation.Autowired
@@ -35,7 +36,7 @@ class JsonSchemaBuilderService {
                 property =
                         [title       : it['displayName'],
                          description : it['helpText'],
-                         type        : it['displayType'],
+                         type        : ((IRelyingPartyOverrideProperty)it).getTypeForUI(),
                          default     : it['displayType'] == 'boolean' ? Boolean.getBoolean(it['defaultValue']) : it['defaultValue'],
                          examples    : it['examples']]
             }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java

@@ -98,6 +98,18 @@ public Boolean getFromConfigFile() {
         return Boolean.FALSE;
     }
 
+    public String getTypeForUI() {
+        switch (attributeType) {
+        case BOOLEAN:
+        case INTEGER:
+            return getDisplayType();
+        case SELECTION_LIST:
+            return "list";
+        default: // DOUBLE, DURATION, LONG, SPRING_BEAN_ID, STRING
+            return "string";            
+        }
+    }
+
     @Override
     public void setDefaultValues(Set<String> defaultValues) {
         // This is here to comply with the interface only and should not be used to change the set of values in this implementation

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/IRelyingPartyOverrideProperty.java

@@ -32,6 +32,13 @@ public interface IRelyingPartyOverrideProperty {
     public String getPersistType();
 
     public String getPersistValue();
+
+    /**
+     * When the override actually is used in the UI, the "type" list is fairly limited, so each implementing class
+     * should adjust the real value so the UI gets a value it expects. For actual file configured overrides, this 
+     * means doing nothing, but UI defined attributes have to do some work.
+     */
+    public String getTypeForUI();
 
     public void setAttributeFriendlyName(String attributeFriendlyName);
 

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java

@@ -42,6 +42,10 @@ public CustomAttributeType getAttributeType() {
         }
     }
 
+    public String getTypeForUI() {
+        return getDisplayType();
+    }
+
     public void setDefaultValues(Set<String> defaults) {
         defaultValues = defaults;
         examples = defaults;