From 717e52a50484475f442c47f249535a66b35a8f5e Mon Sep 17 00:00:00 2001 From: chasegawa Date: Thu, 7 Oct 2021 08:51:18 -0700 Subject: [PATCH 1/5] SHIBUI-2151 Changes per ryan to backend schema --- .../admin/ui/service/JsonSchemaBuilderService.groovy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy index a45448016..e03157b50 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy @@ -64,11 +64,7 @@ class JsonSchemaBuilderService { def definition = [title : it['displayName'], description: it['helpText'], type : 'array'] - if (it['displayType'] == 'set' || it['displayType'] == 'selection_list') { - definition['uniqueItems'] = true - } else if (it['displayType'] == 'list') { - definition['uniqueItems'] = false - } + definition['uniqueItems'] = false def items = [type : 'string', minLength: 1, // TODO: should this be configurable? maxLength: 255] //TODO: or this? From 2ed9b1094555a6ad2e2b03414312408f6d0a2f9c Mon Sep 17 00:00:00 2001 From: chasegawa Date: Thu, 7 Oct 2021 09:08:52 -0700 Subject: [PATCH 2/5] SHIBUI-2151 Changes per ryan to backend schema --- .../shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy index e03157b50..622b91f0a 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy @@ -68,7 +68,7 @@ class JsonSchemaBuilderService { def items = [type : 'string', minLength: 1, // TODO: should this be configurable? maxLength: 255] //TODO: or this? - items.examples = it['examples'] + items.enum = it['examples'] items['default'] = it['defaultValue'] From 1a7a60d88c08f9a3c62d45d1476f20cdb5df54fa Mon Sep 17 00:00:00 2001 From: chasegawa Date: Thu, 7 Oct 2021 11:26:36 -0700 Subject: [PATCH 3/5] SHIBUI-2151 Changes per ryan to backend schema --- .../admin/ui/service/JsonSchemaBuilderService.groovy | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy index 622b91f0a..ee44ce794 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy @@ -64,13 +64,18 @@ class JsonSchemaBuilderService { def definition = [title : it['displayName'], description: it['helpText'], type : 'array'] - definition['uniqueItems'] = false def items = [type : 'string', minLength: 1, // TODO: should this be configurable? maxLength: 255] //TODO: or this? - items.enum = it['examples'] + if (it['displayType'] == 'set' || it['displayType'] == 'selection_list') { + definition['uniqueItems'] = true + items.examples = it['examples'] + } else if (it['displayType'] == 'list') { + definition['uniqueItems'] = false + items.enum = it['examples'] + } + items['default'] = it['defaultValue'] - definition['items'] = items json[(String) it['name']] = definition From 14c16dd5dd8c09b2ce65aee9c6c0f04e5363e2e7 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Thu, 7 Oct 2021 14:00:26 -0700 Subject: [PATCH 4/5] SHIBUI-2151 Changes per ryan to backend schema --- .../admin/ui/service/JsonSchemaBuilderService.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy index ee44ce794..73d02651d 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy @@ -67,10 +67,10 @@ class JsonSchemaBuilderService { def items = [type : 'string', minLength: 1, // TODO: should this be configurable? maxLength: 255] //TODO: or this? - if (it['displayType'] == 'set' || it['displayType'] == 'selection_list') { + if (it['displayType'] == 'set' || it['displayType'] == 'list') { definition['uniqueItems'] = true items.examples = it['examples'] - } else if (it['displayType'] == 'list') { + } else if (it['displayType'] == 'selection_list') { definition['uniqueItems'] = false items.enum = it['examples'] } From dc31ada419de634241c898f9609e555679937f2e Mon Sep 17 00:00:00 2001 From: chasegawa Date: Thu, 7 Oct 2021 14:21:09 -0700 Subject: [PATCH 5/5] SHIBUI-2151 Changes per ryan to backend schema --- .../shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy index 73d02651d..dd8bf8954 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy @@ -74,7 +74,6 @@ class JsonSchemaBuilderService { definition['uniqueItems'] = false items.enum = it['examples'] } - items['default'] = it['defaultValue'] definition['items'] = items