From bb392c2550fe6ff8e722db6d173a3a2cd0711449 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Wed, 23 Jun 2021 14:26:54 -0700 Subject: [PATCH] Fixed attribute schema --- .../main/resources/i18n/messages.properties | 2 ++ .../schema/attribute/attribute.schema.json | 19 +++++++++++++++++-- .../metadata/view/MetadataAttributeEdit.js | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index a530bc7c0..537fca217 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -159,6 +159,8 @@ label.entity-attribute-persist-value=Persist Value label.entity-attribute-persist-type=Persist Type tooltip.entity-attribute-persist-value=Persist Value tooltip.entity-attribute-persist-type=Persist Type +label.entity-attribute-invert=Invert +tooltip.entity-attribute-invert=Invert label.entity-attributes=Entity Attributes label.custom-entity-attributes=Custom Entity Attributes diff --git a/ui/public/assets/schema/attribute/attribute.schema.json b/ui/public/assets/schema/attribute/attribute.schema.json index d723d8d2a..4722a2e77 100644 --- a/ui/public/assets/schema/attribute/attribute.schema.json +++ b/ui/public/assets/schema/attribute/attribute.schema.json @@ -5,8 +5,6 @@ "attributeType", "attributeFriendlyName", "attributeName", - "persistValue", - "persistType", "displayName" ], "properties": { @@ -87,6 +85,23 @@ } }, { + "properties": { + "attributeType": { + "enum": [ + "SPRING_BEAN_ID" + ] + }, + "defaultValue": { + "title": "label.entity-attribute-default", + "description": "tooltip.entity-attribute-default", + "type": "string" + } + } + }, + { + "required": [ + "persistValue" + ], "properties": { "attributeType": { "enum": [ diff --git a/ui/src/app/metadata/view/MetadataAttributeEdit.js b/ui/src/app/metadata/view/MetadataAttributeEdit.js index ea81c975e..d0c04f287 100644 --- a/ui/src/app/metadata/view/MetadataAttributeEdit.js +++ b/ui/src/app/metadata/view/MetadataAttributeEdit.js @@ -35,7 +35,7 @@ export function MetadataAttributeEdit() { } async function save(metadata) { - const resp = await put(`/${id}`, definition.parser(metadata)); + const resp = await put(``, definition.parser(metadata)); if (response.ok) { gotoDetail({ refresh: true }); } else {