From af6e4486a4358e343b4723a86576a7322cf69297 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 30 Jun 2021 11:50:53 -0700
Subject: [PATCH] Fixed schema definition

---
 .../attribute/CustomAttributeDefinition.js    | 55 ++++++++-----------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js b/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
index 0ec36e44b..a9f329794 100644
--- a/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
+++ b/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
@@ -61,7 +61,7 @@ export const CustomAttributeDefinition = {
             return data;
         }
         const { attributeType } = data;
-        let { defaultValueBoolean, defaultValueString, ...parsed } = data;
+        let { defaultValueBoolean, ...parsed } = data;
         if (attributeType === 'SELECTION_LIST') {
             parsed = {
                 ...parsed,
@@ -77,13 +77,6 @@ export const CustomAttributeDefinition = {
             }
         }
 
-        if (attributeType === 'STRING') {
-            parsed = {
-                ...parsed,
-                defaultValue: defaultValueString
-            }
-        }
-
         return parsed;
     },
 
@@ -94,30 +87,28 @@ export const CustomAttributeDefinition = {
         let { defaultValue, ...formatted } = changes;
         const { attributeType } = changes;
 
-        if (attributeType === 'SELECTION_LIST') {
-            formatted = {
-                ...formatted,
-                customAttrListDefinitions: formatted.customAttrListDefinitions.map(d => ({
-                    value: d,
-                    default: d === defaultValue
-                }))
-            }
-        }
-
-        if (attributeType === 'BOOLEAN') {
-            formatted = {
-                ...formatted,
-                defaultValueBoolean: formatted.defaultValue === 'true' ? true : false,
-                invert: formatted.invert === 'true' ? true : false
-//                defaultValueBoolean: defaultValue === 'true' ? true : false
-            }
-        }
-
-        if (attributeType === 'STRING') {
-            formatted = {
-                ...formatted,
-                defaultValueString: defaultValue
-            }
+        switch (attributeType) {
+            case 'SELECTION_LIST':
+                formatted = {
+                    ...formatted,
+                    customAttrListDefinitions: formatted.customAttrListDefinitions.map(d => ({
+                        value: d,
+                        default: d === defaultValue
+                    }))
+                }
+                break;
+            case 'BOOLEAN':
+                formatted = {
+                    ...formatted,
+                    defaultValueBoolean: formatted.defaultValue === 'true' ? true : false,
+                    invert: formatted.invert === 'true' ? true : false
+                }
+                break;
+            default:
+                formatted = {
+                    ...formatted,
+                    defaultValue
+                }
         }
 
         return formatted;