Merge branch 'react-support' of bitbucket.org:unicon/shib-idp-ui into…

… react
TIER · May 21, 2021 · f4275ca · f4275ca
2 parents a63a562 + e374407
commit f4275ca
Show file tree

Hide file tree

Showing 11 changed files with 289 additions and 1,031 deletions.
diff --git a/.../tier/shibboleth/admin/ui/controller/EntityAttributesFiltersUiDefinitionController.groovy b/.../tier/shibboleth/admin/ui/controller/EntityAttributesFiltersUiDefinitionController.groovy
@@ -41,7 +41,7 @@ class EntityAttributesFiltersUiDefinitionController {
     ResponseEntity<?> getUiDefinitionJsonSchema() {
         try {
             def parsedJson = jacksonObjectMapper.readValue(this.jsonSchemaLocation.url, Map)
-            jsonSchemaBuilderService.addReleaseAttributesToJson(parsedJson['properties']['attributeRelease']['widget'])
+            jsonSchemaBuilderService.addReleaseAttributesToJson(parsedJson['properties']['attributeRelease']['items'])
             jsonSchemaBuilderService.addRelyingPartyOverridesToJson(parsedJson['properties']['relyingPartyOverrides'])
             jsonSchemaBuilderService.addRelyingPartyOverridesCollectionDefinitionsToJson(parsedJson["definitions"])
             return ResponseEntity.ok(parsedJson)

diff --git a/...nternet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy b/...nternet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy
@@ -46,7 +46,7 @@ class MetadataSourcesUiDefinitionController {
         try {
             def parsedJson = jacksonObjectMapper.readValue(this.jsonSchemaLocation.url, Map)
             jsonSchemaBuilderService.hideServiceEnabledFromNonAdmins(parsedJson)
-            jsonSchemaBuilderService.addReleaseAttributesToJson(parsedJson['properties']['attributeRelease']['widget'])
+            jsonSchemaBuilderService.addReleaseAttributesToJson(parsedJson['properties']['attributeRelease']['items'])
             jsonSchemaBuilderService.addRelyingPartyOverridesToJson(parsedJson['properties']['relyingPartyOverrides'])
             jsonSchemaBuilderService.addRelyingPartyOverridesCollectionDefinitionsToJson(parsedJson["definitions"])
             return ResponseEntity.ok(parsedJson)

diff --git a/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy
@@ -20,8 +20,8 @@ class JsonSchemaBuilderService {
     }
 
     void addReleaseAttributesToJson(Object json) {
-        json['data'] = customPropertiesConfiguration.getAttributes().collect {
-            [key: it['name'], label: it['displayName']]
+        json['enum'] = customPropertiesConfiguration.getAttributes().collect {
+            it['name']
         }
     }
 
@@ -64,7 +64,7 @@ class JsonSchemaBuilderService {
             def items = [type     : 'string',
                          minLength: 1, // TODO: should this be configurable?
                          maxLength: 255] //TODO: or this?
-            items.widget = [id: 'datalist', data: it['defaultValues']]
+            items.examples = it['defaultValues']
 
             definition['items'] = items
             json[(String) it['name']] = definition
@@ -76,7 +76,7 @@ class JsonSchemaBuilderService {
         if (currentUser != null && currentUser.role != 'ROLE_ADMIN') {
             // user isn't an admin, so hide 'ServiceEnabled'
             Map<String, String> serviceEnabled = (HashMap) json['properties']['serviceEnabled']
-            serviceEnabled['widget'] = 'hidden'
+            serviceEnabled['readOnly'] = true
             serviceEnabled.remove('title')
             serviceEnabled.remove('description')
         }