From cfcb8ab4b72292ad0a0b03933c96958dc13cbdd4 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 14 Jun 2021 10:13:31 -0700
Subject: [PATCH] Added custom entity attribute fields

---
 .../main/resources/i18n/messages.properties   |  7 +++++
 .../schema/attribute/attribute.schema.json    | 26 ++++++++++++++++++-
 .../attribute/CustomAttributeDefinition.js    |  3 +++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 50049f5cb..802f36372 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -140,11 +140,18 @@ label.entity-attribute-default=Default Value
 tooltip.entity-attribute-default=Default Value
 label.entity-attribute-list-options=List options
 tooltip.entity-attribute-list-options=List options
+label.entity-attribute-friendly-name=Friendly name
+tooltip.entity-attribute-friendly-name=Friendly name
+label.entity-attribute-attr-name=Attribute name
+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-attributes=Entity Attributes
 label.custom-entity-attributes=Custom Entity Attributes
 label.help-text=Help text
 label.default-value=Default Value
+label.new-attribute=New Custom Entity Attribute
 
 label.metadata-source=Metadata Source
 label.metadata-sources=Metadata Sources
diff --git a/ui/public/assets/schema/attribute/attribute.schema.json b/ui/public/assets/schema/attribute/attribute.schema.json
index cc99dc3a6..b821ed7bb 100644
--- a/ui/public/assets/schema/attribute/attribute.schema.json
+++ b/ui/public/assets/schema/attribute/attribute.schema.json
@@ -2,7 +2,10 @@
     "type": "object",
     "required": [
         "name",
-        "attributeType"
+        "attributeType",
+        "attributeFriendlyName",
+        "attributeName",
+        "displayName"
     ],
     "properties": {
         "name": {
@@ -27,6 +30,27 @@
                 "value.list"
             ]
         },
+        "attributeFriendlyName": {
+            "type": "string",
+            "title": "label.entity-attribute-friendly-name",
+            "description": "tooltip.entity-attribute-friendly-name",
+            "minLength": 1,
+            "maxLength": 255
+        },
+        "attributeName": {
+            "type": "string",
+            "title": "label.entity-attribute-attr-name",
+            "description": "tooltip.entity-attribute-attr-name",
+            "minLength": 1,
+            "maxLength": 255
+        },
+        "displayName": {
+            "type": "string",
+            "title": "label.entity-attribute-display-name",
+            "description": "tooltip.entity-attribute-display-name",
+            "minLength": 1,
+            "maxLength": 255
+        },
         "helpText": {
             "title": "label.entity-attribute-help",
             "description": "tooltip.entity-attribute-help",
diff --git a/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js b/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
index d04cfab6e..a5ea258c6 100644
--- a/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
+++ b/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
@@ -15,6 +15,9 @@ export const CustomAttributeDefinition = {
                     fields: [
                         'name',
                         'attributeType',
+                        'attributeName',
+                        'attributeFriendlyName',
+                        'displayName',
                         'helpText'
                     ]
                 },