fix: remove duplicate dropdown custom renderer

opengovsg · Jul 18, 2024 · 3457c9c · 3457c9c
1 parent 549ceae
commit 3457c9c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/...s/editing-experience/components/form-builder/renderers/controls/JsonFormsAnyOfControl.tsx b/...s/editing-experience/components/form-builder/renderers/controls/JsonFormsAnyOfControl.tsx
@@ -35,25 +35,31 @@ export function JsonFormsAnyOfControl({
     uischemas,
   )
 
-  const variants = anyOfRenderInfos.map((anyOfRenderInfo) => ({
-    label: anyOfRenderInfo.label,
-    value: anyOfRenderInfo.label,
-  }))
+  const variants = anyOfRenderInfos.map((anyOfRenderInfo) => {
+    const option = String(anyOfRenderInfo.schema.const || anyOfRenderInfo.label)
+
+    return {
+      label: option.charAt(0).toUpperCase() + option.slice(1),
+      value: option,
+    }
+  })
 
   const [variant, setVariant] = useState(anyOfRenderInfos[0]?.label || "")
 
   return (
-    <Box py={2}>
-      <FormControl isRequired>
-        <FormLabel>Variant</FormLabel>
-        <SingleSelect
-          value={variant}
-          name={label}
-          items={variants}
-          isClearable={false}
-          onChange={setVariant}
-        />
-      </FormControl>
+    <>
+      <Box py={2}>
+        <FormControl isRequired>
+          <FormLabel>{label || "Variant"}</FormLabel>
+          <SingleSelect
+            value={variant}
+            name={label}
+            items={variants}
+            isClearable={false}
+            onChange={setVariant}
+          />
+        </FormControl>
+      </Box>
 
       {anyOfRenderInfos.map(
         (anyOfRenderInfo) =>
@@ -68,7 +74,7 @@ export function JsonFormsAnyOfControl({
             />
           ),
       )}
-    </Box>
+    </>
   )
 }
 

diff --git a/...diting-experience/components/form-builder/renderers/controls/JsonFormsDropdownControl.tsx b/...diting-experience/components/form-builder/renderers/controls/JsonFormsDropdownControl.tsx
@@ -28,7 +28,7 @@ export function JsonFormsDropdownControl({
 }: ControlProps & OwnPropsOfEnum) {
   const [dropdownValue, setDropdownValue] = useState(data || "")
 
-  if (!options || (options.length === 1 && !!schema.default)) {
+  if (!options || (options.length === 1 && !!schema.const)) {
     return null
   }