Merge pull request #17 from BlackBeltTechnology/feature/JNG-4446-visu…

…alize-mandatory-attributes JNG-4446 Visualize mandatory attributes in React clients
BlackBeltTechnology · Mar 6, 2023 · 796b51a · 796b51a
2 parents bf43063 + 8996b9b
commit 796b51a
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 2 deletions.
diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/binarytypeinput.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/binarytypeinput.hbs
@@ -3,6 +3,7 @@
     { editMode
         ? (
             <TextField
+                {{# if child.attributeType.isRequired }} required {{/ if }}
                 name="{{ child.attributeType.name }}"
                 id="{{ getXMIID child }}"
                 label={ t('{{ idToTranslationKey child.fQName application }}', { defaultValue: '{{ child.label }}' }) as string }

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/dateinput.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/dateinput.hbs
@@ -3,6 +3,7 @@
     <DatePicker
         renderInput={ (props: any) => (
             <TextField
+                {{# if child.attributeType.isRequired }} required {{/ if }}
                 {...props}
                 error={!!validation.get('{{ child.attributeType.name }}')}
                 helperText={validation.get('{{ child.attributeType.name }}')}

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/datetimeinput.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/datetimeinput.hbs
@@ -3,6 +3,7 @@
     <DateTimePicker
         renderInput={ (props: any) => (
             <TextField
+                {{# if child.attributeType.isRequired }} required {{/ if }}
                 {...props}
                 error={!!validation.get('{{ child.attributeType.name }}')}
                 helperText={validation.get('{{ child.attributeType.name }}')}

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/enumerationcombo.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/enumerationcombo.hbs
@@ -1,6 +1,7 @@
 {{# if child.hiddenBy }} { !data.{{ child.hiddenBy.name }} && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     <TextField
+        {{# if child.attributeType.isRequired }} required {{/ if }}
         name="{{ child.attributeType.name }}"
         id="{{ getXMIID child }}"
         label={ t('{{ idToTranslationKey child.fQName application }}', { defaultValue: '{{ child.label }}' }) as string }

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/link.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/link.hbs
@@ -3,7 +3,7 @@
     <AggregationInput
         name="{{ child.dataElement.name }}"
         id="{{ getXMIID child }}"
-        label={ t('{{ idToTranslationKey child.fQName application }}', { defaultValue: '{{ child.label }}' }) as string }
+        label={ t('{{ idToTranslationKey child.fQName application }}', { defaultValue: '{{ child.label }}' }) as string {{# if child.attributeType.isRequired }} + " *" {{/ if }} }
         labelList={[
             {{# each child.parts as |part| }}
                 data.{{ child.dataElement.name }}?.{{ part.attributeType.name }}?.toString() ?? '',

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/numericinput.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/numericinput.hbs
@@ -1,6 +1,7 @@
 {{# if child.hiddenBy }} { !data.{{ child.hiddenBy.name }} && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     <TextField
+        {{# if child.attributeType.isRequired }} required {{/ if }}
         name="{{ child.attributeType.name }}"
         id="{{ getXMIID child }}"
         label={ t('{{ idToTranslationKey child.fQName application }}', { defaultValue: '{{ child.label }}' }) as string }

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/switch.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/switch.hbs
@@ -1,6 +1,7 @@
 {{# if child.hiddenBy }} { !data.{{ child.hiddenBy.name }} && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     <TextField
+        {{# if child.attributeType.isRequired }} required {{/ if }}
         name="{{ child.attributeType.name }}"
         id="{{ getXMIID child }}"
         label={ t('{{ idToTranslationKey child.fQName application }}', { defaultValue: '{{ child.label }}' }) as string }

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/textarea.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/textarea.hbs
@@ -1,6 +1,7 @@
 {{# if child.hiddenBy }} { !data.{{ child.hiddenBy.name }} && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     <TextField
+        {{# if child.attributeType.isRequired }} required {{/ if }}
         name="{{ child.attributeType.name }}"
         id="{{ getXMIID child }}"
         label={ t('{{ idToTranslationKey child.fQName application }}', { defaultValue: '{{ child.label }}' }) as string }

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/textinput.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/textinput.hbs
@@ -1,6 +1,7 @@
 {{# if child.hiddenBy }} { !data.{{ child.hiddenBy.name }} && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     <TextField
+        {{# if child.attributeType.isRequired }} required {{/ if }}
         name="{{ child.attributeType.name }}"
         id="{{ getXMIID child }}"
         label={ t('{{ idToTranslationKey child.fQName application }}', { defaultValue: '{{ child.label }}' }) as string }

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/timeinput.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/timeinput.hbs
@@ -3,6 +3,7 @@
     <TimePicker
         renderInput={ (props: any) => (
             <TextField
+                {{# if child.attributeType.isRequired }} required {{/ if }}
                 {...props}
                 error={!!validation.get('{{ child.attributeType.name }}')}
                 helperText={validation.get('{{ child.attributeType.name }}')}

diff --git a/judo-ui-react/src/main/resources/actor/src/pages/widgets/trinarylogiccombo.hbs b/judo-ui-react/src/main/resources/actor/src/pages/widgets/trinarylogiccombo.hbs
@@ -3,7 +3,7 @@
     <TrinaryLogicCombobox
         name="{{ child.attributeType.name }}"
         id="{{ getXMIID child }}"
-        label={ t('{{ idToTranslationKey child.fQName application }}', { defaultValue: '{{ child.label }}' }) as string }
+        label={ t('{{ idToTranslationKey child.fQName application }}', { defaultValue: '{{ child.label }}' }) as string {{# if child.attributeType.isRequired }} + " *" {{/ if }} }
         value={ data?.{{ child.attributeType.name }} }
         error={ !!validation.get('{{ child.attributeType.name }}') }
         helperText={ validation.get('{{ child.attributeType.name }}') }