From e92ad5f927a8bb04d35e092666b28212e72327c4 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 28 Jun 2022 13:40:03 -0700 Subject: [PATCH 1/2] Fixed issue with List type CEA --- ui/src/app/metadata/hooks/utility.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/metadata/hooks/utility.js b/ui/src/app/metadata/hooks/utility.js index 0c21d3fe9..e11532ea9 100644 --- a/ui/src/app/metadata/hooks/utility.js +++ b/ui/src/app/metadata/hooks/utility.js @@ -132,7 +132,7 @@ export const assignValueToProperties = (models, properties, definition, schema) ...prop.items, enum: prop.items.enum.map((item, index) => ({ key: item, - label: `${prop?.items?.enumNames[index] || item}`, + label: `${prop?.items?.enumNames ? prop?.items?.enumNames[index] : item}`, differences: models .map((model) => { const value = model[prop.id]; From 422812ba1d0de6518f6b8625fa835b21163b980e Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Tue, 28 Jun 2022 17:19:46 -0400 Subject: [PATCH 2/2] SHIBUI-2309 Added a once broken, now fixed test back in to the mix. --- .../internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy index a9c2666b8..3c73bfbbf 100644 --- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy +++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy @@ -129,7 +129,7 @@ class SeleniumSIDETest extends Specification { 'SHIBUI-1391: Regex Validation' | '/SHIBUI-1391.side' 'SHIBUI-1407: Metadata source comparison highlights' | '/SHIBUI-1407-1.side' 'SHIBUI-1407: Metadata provider comparison highlights' | '/SHIBUI-1407-2.side' -// 'SHIBUI-1503: Non-admin can create metadata source' | '/SHIBUI-1503-1.side' // Broken in this branch until UI fixes in + 'SHIBUI-1503: Non-admin can create metadata source' | '/SHIBUI-1503-1.side' 'SHIBUI-1503: User can be deleted' | '/SHIBUI-1503-2.side' 'SHIBUI-1503: User can be enabled' | '/SHIBUI-1503-3.side' 'SHIBUI-1732: Create, use, and delete CEA String' | '/SHIBUI-1732-1.side'