From 3a968af73eb6704e1863f97cb380642b302b8bc9 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 23 Jun 2021 14:14:45 -0700
Subject: [PATCH] fixing attribute form

---
 .../assets/schema/attribute/attribute.schema.json  | 14 +++-----------
 .../app/form/component/widgets/CheckboxWidget.js   |  2 +-
 ui/src/app/form/component/widgets/RadioWidget.js   |  2 +-
 .../domain/attribute/CustomAttributeDefinition.js  | 13 +++++++++----
 .../app/metadata/editor/MetadataAttributeEditor.js |  1 -
 ui/src/app/metadata/view/MetadataAttributeEdit.js  |  2 +-
 ui/src/app/metadata/view/MetadataAttributeList.js  |  4 ++--
 7 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/ui/public/assets/schema/attribute/attribute.schema.json b/ui/public/assets/schema/attribute/attribute.schema.json
index 2410125c4..d723d8d2a 100644
--- a/ui/public/assets/schema/attribute/attribute.schema.json
+++ b/ui/public/assets/schema/attribute/attribute.schema.json
@@ -93,19 +93,11 @@
                                 "BOOLEAN"
                             ]
                         },
-                        "defaultValue": {
+                        "defaultValueBoolean": {
                             "title": "label.entity-attribute-default",
                             "description": "tooltip.entity-attribute-default",
-                            "type": "string",
-                            "default": "true",
-                            "enum": [
-                                "true",
-                                "false"
-                            ],
-                            "enumNames": [
-                                "True",
-                                "False"
-                            ]
+                            "type": "boolean",
+                            "default": true
                         },
                         "persistValue": {
                             "type": "string",
diff --git a/ui/src/app/form/component/widgets/CheckboxWidget.js b/ui/src/app/form/component/widgets/CheckboxWidget.js
index b1833159c..c95d7e921 100644
--- a/ui/src/app/form/component/widgets/CheckboxWidget.js
+++ b/ui/src/app/form/component/widgets/CheckboxWidget.js
@@ -41,7 +41,7 @@ const CheckboxWidget = (props) => {
                     </span>
                     {schema.description && <InfoIcon value={schema.description} className="ml-2" />}
                 </span>}
-                checked={typeof value === "undefined" ? false : value}
+                checked={typeof value === "undefined" ? false : typeof value === 'boolean' ? value : value === 'true' ? true : false}
                 required={required}
                 disabled={disabled || readonly}
                 autoFocus={autofocus}
diff --git a/ui/src/app/form/component/widgets/RadioWidget.js b/ui/src/app/form/component/widgets/RadioWidget.js
index c92d63e95..2ce07349d 100644
--- a/ui/src/app/form/component/widgets/RadioWidget.js
+++ b/ui/src/app/form/component/widgets/RadioWidget.js
@@ -46,7 +46,7 @@ const RadioWidget = ({
                 const itemDisabled =
                     Array.isArray(enumDisabled) &&
                     enumDisabled.indexOf(option.value) !== -1;
-                const checked = option.value === value;
+                const checked = option.value.toString() === value.toString();
 
                 const radio = (
                     <Form.Check
diff --git a/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js b/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
index 4add96ea5..5d67d3857 100644
--- a/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
+++ b/ui/src/app/metadata/domain/attribute/CustomAttributeDefinition.js
@@ -18,8 +18,6 @@ export const CustomAttributeDefinition = {
                         'attributeName',
                         'attributeFriendlyName',
                         'displayName',
-                        'persistValue',
-                        'persistType',
                         'helpText'
                     ]
                 },
@@ -30,7 +28,10 @@ export const CustomAttributeDefinition = {
                         'defaultValue',
                         'defaultValueBoolean',
                         'defaultValueString',
-                        'customAttrListDefinitions'
+                        'customAttrListDefinitions',
+                        'persistValue',
+                        'persistType',
+                        'invert'
                     ]
                 }
             ]
@@ -38,6 +39,9 @@ export const CustomAttributeDefinition = {
         defaultValueBoolean: {
             'ui:widget': 'radio'
         },
+        persistType: {
+            'ui:widget': 'hidden'
+        },
         customAttrListDefinitions: {
             'ui:field': 'StringListWithDefaultField',
             'ui:title': 'label.entity-attribute-list-options',
@@ -100,7 +104,8 @@ export const CustomAttributeDefinition = {
         if (attributeType === 'BOOLEAN') {
             formatted = {
                 ...formatted,
-                defaultValueBoolean: formatted.defaultValue === 'true' ? true : false
+                defaultValueBoolean: formatted.defaultValue === 'true' ? true : false,
+                invert: formatted.invert === 'true' ? true : false
             }
         }
 
diff --git a/ui/src/app/metadata/editor/MetadataAttributeEditor.js b/ui/src/app/metadata/editor/MetadataAttributeEditor.js
index 915ca2bc4..126444729 100644
--- a/ui/src/app/metadata/editor/MetadataAttributeEditor.js
+++ b/ui/src/app/metadata/editor/MetadataAttributeEditor.js
@@ -51,7 +51,6 @@ export function MetadataAttributeEditor({ children }) {
                     </Form>
                 </div>
             </div>
-            <pre>{JSON.stringify(errors, null, 4)}</pre>
         </div>
     );
 }
\ No newline at end of file
diff --git a/ui/src/app/metadata/view/MetadataAttributeEdit.js b/ui/src/app/metadata/view/MetadataAttributeEdit.js
index d0c04f287..ea81c975e 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(``, definition.parser(metadata));
+        const resp = await put(`/${id}`, definition.parser(metadata));
         if (response.ok) {
             gotoDetail({ refresh: true });
         } else {
diff --git a/ui/src/app/metadata/view/MetadataAttributeList.js b/ui/src/app/metadata/view/MetadataAttributeList.js
index b72c3c0e7..f585f805f 100644
--- a/ui/src/app/metadata/view/MetadataAttributeList.js
+++ b/ui/src/app/metadata/view/MetadataAttributeList.js
@@ -63,13 +63,13 @@ export function MetadataAttributeList ({entities, onDelete}) {
                                                 <td>{attr.helpText}</td>
                                                 <td>{attr.defaultValue?.toString()}</td>
                                                 <td className="text-right">
-                                                    <Link to={`../attributes/${attr.name}/edit`} className="btn btn-link text-primary">
+                                                    <Link to={`../attributes/${attr.resourceId}/edit`} className="btn btn-link text-primary">
                                                         <FontAwesomeIcon icon={faEdit} size="lg" />
                                                         <span className="sr-only">
                                                             <Translate value="action.edit">Edit</Translate>
                                                         </span>
                                                     </Link>
-                                                    <Button variant="link" className="text-danger" onClick={() => block(() => remove(attr.name))}>
+                                                    <Button variant="link" className="text-danger" onClick={() => block(() => remove(attr.resourceId))}>
                                                         <FontAwesomeIcon icon={faTrash} size="lg" />
                                                         <span className="sr-only">
                                                             <Translate value="action.delete">Delete</Translate>