From d064f0acac055f82a5a18b2904f53922085e968b Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 21 Jun 2021 13:31:29 -0700
Subject: [PATCH] Updated attributes definition

---
 backend/src/main/resources/i18n/messages.properties | 13 +++++++++++++
 .../assets/schema/attribute/attribute.schema.json   |  8 ++++----
 .../domain/attribute/CustomAttributeDefinition.js   |  2 ++
 .../app/metadata/editor/MetadataAttributeEditor.js  |  4 +++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 802f36372..5ed4a9874 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -104,9 +104,17 @@ value.template=Template
 value.string=String
 value.boolean=Boolean
 value.list=List
+value.long=Long
+value.double=Double
+value.duration=Duration
+value.spring-bean-id=Spring Bean ID
 value.BOOLEAN=Boolean
 value.SELECTION_LIST=List
 value.STRING=String
+value.LONG=Long
+value.DOUBLE=Double
+value.DURATION=Duration
+value.SPRING_BEAN_ID=Spring Bean ID
 
 brand.header.title=Source Management
 brand.logo-link-label=Shibboleth
@@ -147,6 +155,11 @@ tooltip.entity-attribute-attr-name=This is normally a uri or urn
 label.entity-attribute-display-name=Display name
 tooltip.entity-attribute-display-name=Display name
 
+label.entity-attribute-persist-friendly-name=Persist Friendly Name
+label.entity-attribute-persist-type=Persist Type
+tooltip.entity-attribute-persist-friendly-name=Persist Friendly Name
+tooltip.entity-attribute-persist-type=Persist Type
+
 label.entity-attributes=Entity Attributes
 label.custom-entity-attributes=Custom Entity Attributes
 label.help-text=Help text
diff --git a/ui/public/assets/schema/attribute/attribute.schema.json b/ui/public/assets/schema/attribute/attribute.schema.json
index 97bf5c4f0..bb731f20b 100644
--- a/ui/public/assets/schema/attribute/attribute.schema.json
+++ b/ui/public/assets/schema/attribute/attribute.schema.json
@@ -54,15 +54,15 @@
         },
         "persistFriendlyName": {
             "type": "string",
-            "title": "label.entity-attribute-friendly-name",
-            "description": "tooltip.entity-attribute-friendly-name",
+            "title": "label.entity-attribute-persist-friendly-name",
+            "description": "tooltip.entity-attribute-persist-friendly-name",
             "minLength": 1,
             "maxLength": 255
         },
         "persistType": {
             "type": "string",
-            "title": "label.entity-attribute-attr-name",
-            "description": "tooltip.entity-attribute-attr-name",
+            "title": "label.entity-attribute-persist-type",
+            "description": "tooltip.entity-attribute-persist-type",
             "minLength": 1,
             "maxLength": 255,
             "enum": [
diff --git a/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js b/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
index a5ea258c6..833a3962d 100644
--- a/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
+++ b/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
@@ -18,6 +18,8 @@ export const CustomAttributeDefinition = {
                         'attributeName',
                         'attributeFriendlyName',
                         'displayName',
+                        'persistFriendlyName',
+                        'persistType',
                         'helpText'
                     ]
                 },
diff --git a/ui/src/app/metadata/editor/MetadataAttributeEditor.js b/ui/src/app/metadata/editor/MetadataAttributeEditor.js
index 9c13e2a5f..126444729 100644
--- a/ui/src/app/metadata/editor/MetadataAttributeEditor.js
+++ b/ui/src/app/metadata/editor/MetadataAttributeEditor.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { MetadataFormContext, setFormDataAction, setFormErrorAction } from '../hoc/MetadataFormContext';
 import { MetadataDefinitionContext, MetadataSchemaContext } from '../hoc/MetadataSchema';
+import { transformErrors } from '../domain/transform';
 
 import Form from '@rjsf/bootstrap-4';
 
@@ -44,7 +45,8 @@ export function MetadataAttributeEditor({ children }) {
                         fields={fields}
                         widgets={widgets}
                         liveValidate={true}
-                        ErrorList={ErrorListTemplate}>
+                        ErrorList={ErrorListTemplate}
+                        transformErrors={transformErrors}>
                         <></>
                     </Form>
                 </div>