ensure form field has label and field optional.

typerefinery-ai · Jun 21, 2024 · afac6ef · afac6ef
1 parent 0bf1d82
commit afac6ef
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/...ication/backend/src/main/java/ai/typerefinery/websight/models/components/forms/Field.java b/...ication/backend/src/main/java/ai/typerefinery/websight/models/components/forms/Field.java
@@ -50,9 +50,16 @@ public class Field extends BaseFormComponent {
     @Getter
     protected String labelId = DEFAULT_ID;
 
+    @Getter
+    protected boolean labelHidden = true; //hidden untill we find it as a child
+
     @Getter
     protected String fieldId = DEFAULT_ID;
 
+    @Getter
+    protected boolean fieldHidden = true; //hidden untill we find it as a child
+
+
     // authored flex toggle
     @Inject
     @Getter
@@ -90,9 +97,11 @@ protected void init() {
                     if (name.equals("label")) {
                         String id = child.getValueMap().get("id", "");
                         this.labelId = this.resource.getName() + (StringUtils.isNotEmpty(id) ? "-" + id : "");
+                        this.labelHidden = false;
                     } else if (name.equals("field")) {
                         String id = child.getValueMap().get("id", "");
                         this.fieldId = this.resource.getName() + (StringUtils.isNotEmpty(id) ? "-" + id : "");
+                        this.fieldHidden = false;
                     }
                 });
             }

diff --git a/application/backend/src/main/resources/apps/typerefinery/components/forms/field/variant.html b/application/backend/src/main/resources/apps/typerefinery/components/forms/field/variant.html
@@ -1,6 +1,6 @@
 <template data-sly-template.variant="${ @ model }">
     <field id="${model.id}" class="${model.componentClassNames}">
-        <sly data-sly-resource="${'label' @ selectors=['id', model.labelId, 'for', model.fieldId, 'fid', model.parentFieldId]}"></sly>
-        <sly data-sly-resource="${'field' @ selectors=['id', model.fieldId, 'fid', model.parentFieldId]}"></sly>
+        <sly data-sly-test="${!model.labelHidden}" data-sly-resource="${'label' @ selectors=['id', model.labelId, 'for', model.fieldId, 'fid', model.parentFieldId]}"></sly>
+        <sly data-sly-test="${!model.fieldHidden}" data-sly-resource="${'field' @ selectors=['id', model.fieldId, 'fid', model.parentFieldId]}"></sly>
     </field>
 </template>
diff --git a/...ion/backend/src/main/resources/apps/typerefinery/components/stix/forms/field/variant.html b/...ion/backend/src/main/resources/apps/typerefinery/components/stix/forms/field/variant.html
@@ -1,6 +1,6 @@
 <template data-sly-template.variant="${ @ model }">
     <field id="${model.id}" class="${model.componentClassNames}">
-        <sly data-sly-resource="${'label' @ selectors=['id', model.labelId, 'for', model.fieldId, 'fid', model.parentFieldId]}"></sly>
-        <sly data-sly-resource="${'field' @ selectors=['id', model.fieldId, 'fid', model.parentFieldId]}"></sly>
+        <sly data-sly-test="${!model.labelHidden}" data-sly-resource="${'label' @ selectors=['id', model.labelId, 'for', model.fieldId, 'fid', model.parentFieldId]}"></sly>
+        <sly data-sly-test="${!model.fieldHidden}" data-sly-resource="${'field' @ selectors=['id', model.fieldId, 'fid', model.parentFieldId]}"></sly>
     </field>
 </template>