From d8d6a23282fa4152a26b8be95e0afba8e67bb875 Mon Sep 17 00:00:00 2001
From: Gertjan van Oosten <gertjan@west.nl>
Date: Wed, 13 Dec 2023 08:51:23 +0100
Subject: [PATCH] AB#994 Add option to render enums as select dropdown

An enum will be a single select, an enumset will be a multiselect.
The number of visible entries in the select can be set with the htmlSize property.
---
 anet-dictionary.yml                  |   8 ++
 client/src/components/FieldHelper.js | 132 ++++++++++++++++++++++++---
 src/main/resources/anet-schema.yml   |   2 +
 3 files changed, 129 insertions(+), 13 deletions(-)

diff --git a/anet-dictionary.yml b/anet-dictionary.yml
index b8a9149c3b..f23779841a 100644
--- a/anet-dictionary.yml
+++ b/anet-dictionary.yml
@@ -643,6 +643,8 @@ fields:
         type: enumset
         label: Choose one or more of the options
         helpText: Help text for choosing multiple values
+        asA: select
+        htmlSize: 4
         choices:
           opt1:
             label: Option 1
@@ -650,6 +652,12 @@ fields:
             label: Option 2
           opt3:
             label: Option 3
+          opt4:
+            label: Option 4
+          opt5:
+            label: Option 5
+          opt6:
+            label: Option 6
       inputFieldName:
         type: text
         label: Text field
diff --git a/client/src/components/FieldHelper.js b/client/src/components/FieldHelper.js
index 31d9eedb84..c9bc480575 100644
--- a/client/src/components/FieldHelper.js
+++ b/client/src/components/FieldHelper.js
@@ -17,6 +17,7 @@ import {
   Form,
   FormControl,
   FormGroup,
+  FormSelect,
   InputGroup,
   ListGroup,
   Row,
@@ -520,30 +521,135 @@ ButtonToggleGroupField.propTypes = {
 export const RadioButtonToggleGroupField = ({
   field, // { name, value, onChange, onBlur }
   form, // also values, setXXXX, handleXXXX, dirty, isValid, status, etc.
+  asA,
+  enableClear,
   ...props
-}) => (
-  <ButtonToggleGroupField field={field} form={form} type="radio" {...props} />
-)
+}) =>
+  (asA === "select" && (
+    <SelectField field={field} form={form} {...props} />
+  )) || (
+    <ButtonToggleGroupField
+      field={field}
+      form={form}
+      type="radio"
+      enableClear={enableClear}
+      {...props}
+    />
+  )
 RadioButtonToggleGroupField.propTypes = {
   field: PropTypes.object,
-  form: PropTypes.object
+  form: PropTypes.object,
+  asA: PropTypes.string,
+  enableClear: PropTypes.bool
 }
 
 export const CheckboxButtonToggleGroupField = ({
   field, // { name, value, onChange, onBlur }
   form, // also values, setXXXX, handleXXXX, dirty, isValid, status, etc.
+  asA,
+  enableClear,
   ...props
-}) => (
-  <ButtonToggleGroupField
-    field={field}
-    form={form}
-    type="checkbox"
-    {...props}
-  />
-)
+}) =>
+  (asA === "select" && (
+    <SelectField field={field} form={form} multiple {...props} />
+  )) || (
+    <ButtonToggleGroupField
+      field={field}
+      form={form}
+      type="checkbox"
+      enableClear={enableClear}
+      {...props}
+    />
+  )
 CheckboxButtonToggleGroupField.propTypes = {
   field: PropTypes.object,
-  form: PropTypes.object
+  form: PropTypes.object,
+  asA: PropTypes.string,
+  enableClear: PropTypes.bool
+}
+
+export const SelectField = ({
+  field, // { name, value, onChange, onBlur }
+  form, // contains, touched, errors, values, setXXXX, handleXXXX, dirty, isValid, status, etc.
+  label,
+  buttons,
+  multiple,
+  onChange,
+  className,
+  children,
+  extraColElem,
+  addon,
+  vertical,
+  extraAddon,
+  ...otherProps
+}) => {
+  const { validationState } = getFormGroupValidationState(field, form)
+  if (validationState) {
+    className = classNames(className, "is-invalid")
+  }
+  const widgetElem = useMemo(
+    () => (
+      <FormSelect
+        {...field}
+        value={field.value ?? ""}
+        multiple={multiple}
+        isInvalid={validationState}
+        className={className}
+        onChange={e => {
+          let newValue
+          if (!multiple) {
+            // First (empty) option must be the empty string (""); replace with null when selected
+            newValue = e.target.value || null
+          } else {
+            newValue = []
+            for (const opt of e.target.options) {
+              if (opt.selected) {
+                newValue.push(opt.value)
+              }
+            }
+          }
+          onChange(newValue)
+        }}
+        {...otherProps}
+      >
+        {!multiple && <option />}
+        {buttons.map(option => (
+          <option key={`${field.name}_${option.value}`} value={option.value}>
+            {option.label}
+          </option>
+        ))}
+      </FormSelect>
+    ),
+    [field, className, otherProps, buttons, multiple, onChange, validationState]
+  )
+  return (
+    <Field
+      field={field}
+      form={form}
+      label={label}
+      widgetElem={widgetElem}
+      extraColElem={extraColElem}
+      addon={addon}
+      vertical={vertical}
+      extraAddon={extraAddon}
+    >
+      {children}
+    </Field>
+  )
+}
+SelectField.propTypes = {
+  field: PropTypes.object,
+  form: PropTypes.object,
+  label: PropTypes.string,
+  buttons: PropTypes.array.isRequired,
+  multiple: PropTypes.bool,
+  onChange: PropTypes.func.isRequired,
+  className: PropTypes.string,
+  children: PropTypes.any,
+  extraColElem: PropTypes.object,
+  addon: PropTypes.object,
+  vertical: PropTypes.bool,
+  extraAddon: PropTypes.object
 }
 
 export default Field
diff --git a/src/main/resources/anet-schema.yml b/src/main/resources/anet-schema.yml
index 5071055439..e3b16b7879 100644
--- a/src/main/resources/anet-schema.yml
+++ b/src/main/resources/anet-schema.yml
@@ -139,6 +139,8 @@ $defs:
         type: string
       asA:
         type: string
+      htmlSize:
+        type: number
       filters:
         type: array
         uniqueItems: true