lmb-181: make it possible to let the label show the isRequird pill

lblod · Jan 14, 2025 · 0b99724 · 0b99724
1 parent 2b4887e
commit 0b99724
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 14 deletions.
diff --git a/app/components/rdf-input-fields/custom-address-input.hbs b/app/components/rdf-input-fields/custom-address-input.hbs
@@ -1,6 +1,7 @@
 <RdfInputFields::CustomFieldWrapper
   @field={{@field}}
   @form={{@form}}
+  @graphs={{@graphs}}
   @formStore={{@formStore}}
 >
   <div class="au-o-box au-u-background-gray-100 au-u-margin-top-tiny">

diff --git a/app/components/rdf-input-fields/custom-date-input.hbs b/app/components/rdf-input-fields/custom-date-input.hbs
@@ -2,6 +2,7 @@
   @inline={{true}}
   @field={{@field}}
   @form={{@form}}
+  @graphs={{@graphs}}
   @formStore={{@formStore}}
 >
   <RdfInputFields::RdfDateInput

diff --git a/app/components/rdf-input-fields/custom-field-wrapper.hbs b/app/components/rdf-input-fields/custom-field-wrapper.hbs
@@ -2,12 +2,7 @@
   <div class="au-u-flex au-u-flex--between">
     <div class="flex-grow">
       <div class="au-u-flex au-u-flex--row">
-        <AuLabel
-          for={{this.inputId}}
-          @error={{this.hasErrors}}
-          @warning={{this.hasWarnings}}
-          @required={{this.isRequired}}
-        >{{this.title}}</AuLabel>
+        <AuLabel @required={{this.isRequired}}>{{this.title}}</AuLabel>
         <AuButton
           @skin="link-secondary"
           @icon="pencil"
@@ -44,14 +39,6 @@
       </AuButton>
     </div>
   </div>
-
-  {{#each this.errors as |error|}}
-    <AuHelpText @error={{true}}>{{error.resultMessage}}</AuHelpText>
-  {{/each}}
-
-  {{#each this.warnings as |warning|}}
-    <AuHelpText @warning={{true}}>{{warning.resultMessage}}</AuHelpText>
-  {{/each}}
 {{/unless}}
 
 <RdfInputFields::CrudCustomFieldModal

diff --git a/app/components/rdf-input-fields/custom-field-wrapper.js b/app/components/rdf-input-fields/custom-field-wrapper.js
@@ -4,6 +4,7 @@ import { tracked } from '@glimmer/tracking';
 
 import { consume } from 'ember-provide-consume-context';
 import { task } from 'ember-concurrency';
+import { validationsForFieldWithType } from '@lblod/submission-form-helpers';
 
 import { JSON_API_TYPE } from 'frontend-lmb/utils/constants';
 
@@ -37,4 +38,33 @@ export default class RdfInputFieldsCustomFieldWrapperComponent extends Component
       this.onFormUpdate();
     }
   });
+
+  // From ember-submission-form-fields component: input-field.js
+  // We cannot access these properties as they are in the component itself and this is just a wrapper
+  get isRequired() {
+    return (
+      !this.args.show &&
+      this.constraints.some(
+        (constraint) =>
+          constraint.type.value ===
+          'http://lblod.data.gift/vocabularies/forms/RequiredConstraint'
+      )
+    );
+  }
+
+  get constraints() {
+    return validationsForFieldWithType(this.args.field.uri, this.storeOptions);
+  }
+
+  get storeOptions() {
+    return {
+      formGraph: this.args.graphs.formGraph,
+      sourceGraph: this.args.graphs.sourceGraph,
+      metaGraph: this.args.graphs.metaGraph,
+      sourceNode: this.args.sourceNode,
+      store: this.args.formStore,
+      path: this.args.field.rdflibPath,
+      scope: this.args.field.rdflibScope,
+    };
+  }
 }
diff --git a/app/components/rdf-input-fields/custom-number-input.hbs b/app/components/rdf-input-fields/custom-number-input.hbs
@@ -2,6 +2,7 @@
   @inline={{true}}
   @field={{@field}}
   @form={{@form}}
+  @graphs={{@graphs}}
   @formStore={{@formStore}}
 >
   <RdfInputFields::NumericalInput

diff --git a/app/components/rdf-input-fields/custom-string-input.hbs b/app/components/rdf-input-fields/custom-string-input.hbs
@@ -2,6 +2,7 @@
   @inline={{true}}
   @field={{@field}}
   @form={{@form}}
+  @graphs={{@graphs}}
   @formStore={{@formStore}}
 >
   <RdfInputFields::Input

diff --git a/app/components/rdf-input-fields/custom-text-input.hbs b/app/components/rdf-input-fields/custom-text-input.hbs
@@ -2,6 +2,7 @@
   @inline={{true}}
   @field={{@field}}
   @form={{@form}}
+  @graphs={{@graphs}}
   @formStore={{@formStore}}
 >
   <RdfInputFields::TextArea