From 88ee75fd9176e6b0758814a5724bff0017f01001 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Tue, 4 Jan 2022 12:25:00 -0700
Subject: [PATCH] Fixed attribute release display name

---
 ui/src/app/form/component/widgets/AttributeReleaseWidget.js | 2 +-
 ui/src/app/metadata/hooks/utility.js                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/form/component/widgets/AttributeReleaseWidget.js b/ui/src/app/form/component/widgets/AttributeReleaseWidget.js
index e8f5956aa..ad13dbcff 100644
--- a/ui/src/app/form/component/widgets/AttributeReleaseWidget.js
+++ b/ui/src/app/form/component/widgets/AttributeReleaseWidget.js
@@ -140,7 +140,7 @@ const AttributeReleaseWidget = ({
                             enumDisabled && (enumDisabled).indexOf(option.value) !== -1;
                         return (
                             <tr key={index} className={`${bundle?.indexOf(option.value) > -1 ? 'text-light bg-info' : ''}`}>
-                                <td className="align-middle"><Translate value={`label.attribute-${option.label}`}>{option.label}</Translate></td>
+                                <td className="align-middle"><Translate value={`${option.label}`}>{option.label}</Translate></td>
                                 <td className="">
                                     <fieldset className="d-flex justify-content-end">
                                         <div className="custom-control custom-checkbox bordered-custom-checkbox">
diff --git a/ui/src/app/metadata/hooks/utility.js b/ui/src/app/metadata/hooks/utility.js
index 05546fd8a..0c21d3fe9 100644
--- a/ui/src/app/metadata/hooks/utility.js
+++ b/ui/src/app/metadata/hooks/utility.js
@@ -130,9 +130,9 @@ export const assignValueToProperties = (models, properties, definition, schema)
 
         const items = prop.type === 'array' && prop.items?.enum ? ({
             ...prop.items,
-            enum: prop.items.enum.map(item => ({
+            enum: prop.items.enum.map((item, index) => ({
                 key: item,
-                label: `label.attribute-${item}`,
+                label: `${prop?.items?.enumNames[index] || item}`,
                 differences: models
                     .map((model) => {
                         const value = model[prop.id];