From 42672011b3ee148fdb0096d2126c4837b4182152 Mon Sep 17 00:00:00 2001
From: chavda-bhavik <bhavikvchavda@gmail.com>
Date: Tue, 16 Jul 2024 11:09:59 +0530
Subject: [PATCH] feat: Showed delimiter on multi-select dropdown only

---
 .../components/imports/forms/ColumnForm.tsx   | 50 ++++++++++++-------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/apps/web/components/imports/forms/ColumnForm.tsx b/apps/web/components/imports/forms/ColumnForm.tsx
index 52c8cb234..ac36d2044 100644
--- a/apps/web/components/imports/forms/ColumnForm.tsx
+++ b/apps/web/components/imports/forms/ColumnForm.tsx
@@ -1,7 +1,18 @@
 import Link from 'next/link';
 import { modals } from '@mantine/modals';
 import { Controller, useForm } from 'react-hook-form';
-import { Stack, TextInput as Input, Text, Divider, SimpleGrid, Title, Group, CloseButton, Select } from '@mantine/core';
+import {
+  Stack,
+  TextInput as Input,
+  Text,
+  Divider,
+  SimpleGrid,
+  Title,
+  Group,
+  CloseButton,
+  Select,
+  useMantineColorScheme,
+} from '@mantine/core';
 
 import { ColumnTypesEnum, DEFAULT_VALUES, IColumn } from '@impler/shared';
 import { colors, COLUMN_TYPES, DELIMITERS, MODAL_KEYS, MODAL_TITLES } from '@config';
@@ -19,6 +30,7 @@ interface ColumnFormProps {
 }
 
 export function ColumnForm({ onSubmit, data, isLoading }: ColumnFormProps) {
+  const { colorScheme } = useMantineColorScheme();
   const {
     watch,
     control,
@@ -29,6 +41,7 @@ export function ColumnForm({ onSubmit, data, isLoading }: ColumnFormProps) {
     defaultValues: data,
   });
   const typeValue = watch('type');
+  const multiSelectValue = watch('allowMultiSelect');
 
   const onClose = () => {
     modals.close(MODAL_KEYS.COLUMN_UPDATE);
@@ -129,21 +142,6 @@ export function ColumnForm({ onSubmit, data, isLoading }: ColumnFormProps) {
                       />
                     )}
                   />
-                  <Controller
-                    name="delimiter"
-                    control={control}
-                    render={({ field: { value, onChange } }) => (
-                      <Select
-                        label="Delimiter"
-                        data={DELIMITERS}
-                        placeholder="Comma (,)"
-                        value={value}
-                        data-autofocus
-                        onChange={onChange}
-                        description="Delimiter used to separate multiple select values"
-                      />
-                    )}
-                  />
                 </>
               ) : null}
               {typeValue === ColumnTypesEnum.DATE ? (
@@ -199,7 +197,7 @@ export function ColumnForm({ onSubmit, data, isLoading }: ColumnFormProps) {
                 )}
               />
             </Stack>
-            <Stack spacing="sm" p="xs" bg={colors.BGSecondaryDark}>
+            <Stack spacing="sm" p="xs" bg={colorScheme === 'dark' ? colors.BGSecondaryDark : colors.BGSecondaryLight}>
               <Title order={5}>Column Validations</Title>
               <Checkbox
                 label="Required Values"
@@ -237,6 +235,24 @@ export function ColumnForm({ onSubmit, data, isLoading }: ColumnFormProps) {
                   description="Users will be required to resolve any duplicated values inside of this column prior to import."
                 />
               )}
+              {multiSelectValue && typeValue === ColumnTypesEnum.SELECT ? (
+                <Controller
+                  name="delimiter"
+                  control={control}
+                  render={({ field: { value, onChange } }) => (
+                    <Select
+                      label="Delimiter"
+                      data={DELIMITERS}
+                      placeholder="Comma (,)"
+                      value={value}
+                      data-autofocus
+                      defaultValue=","
+                      onChange={onChange}
+                      description="Delimiter used to separate multiple select values"
+                    />
+                  )}
+                />
+              ) : null}
               <Checkbox
                 label="Freeze Column"
                 register={register('isFrozen')}