Improve csv import

twentyhq · Jun 5, 2024 · e902b27 · e902b27
1 parent 1bbfc0b
commit e902b27
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 21 deletions.
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx
@@ -3,35 +3,40 @@ import styled from '@emotion/styled';
 import { CircularProgressBar } from '@/ui/feedback/progress-bar/components/CircularProgressBar';
 import { MainButton } from '@/ui/input/button/components/MainButton';
 import { Modal } from '@/ui/layout/modal/components/Modal';
+import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 const StyledFooter = styled(Modal.Footer)`
-  height: 60px;
-  justify-content: center;
-  padding: 0px;
-  padding-left: ${({ theme }) => theme.spacing(30)};
-  padding-right: ${({ theme }) => theme.spacing(30)};
-`;
-
-const StyledButton = styled(MainButton)`
-  width: 200px;
+  gap: ${({ theme }) => theme.spacing(2)};
+  justify-content: space-between;
 `;
 
 type StepNavigationButtonProps = {
   onClick: () => void;
   title: string;
   isLoading?: boolean;
+  onBack?: () => void;
 };
 
 export const StepNavigationButton = ({
   onClick,
   title,
   isLoading,
+  onBack,
 }: StepNavigationButtonProps) => (
   <StyledFooter>
-    <StyledButton
+    {!isUndefinedOrNull(onBack) && (
+      <MainButton
+        Icon={isLoading ? CircularProgressBar : undefined}
+        title="Back"
+        onClick={!isLoading ? onBack : undefined}
+        variant="secondary"
+      />
+    )}
+    <MainButton
       Icon={isLoading ? CircularProgressBar : undefined}
       title={title}
       onClick={!isLoading ? onClick : undefined}
+      variant="primary"
     />
   </StyledFooter>
 );
diff --git a/...ont/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx b/...ont/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx
@@ -287,11 +287,11 @@ export const MatchColumnsStep = <T extends string>({
         />
       </StyledContent>
       <StepNavigationButton
+        onBack={onBack}
         onClick={handleOnContinue}
         isLoading={isLoading}
-        title="Next"
+        title="Continue"
       />
-      <StepNavigationButton onClick={onBack} title="Back" />
     </>
   );
 };
diff --git a/...ont/src/modules/spreadsheet-import/steps/components/SelectHeaderStep/SelectHeaderStep.tsx b/...ont/src/modules/spreadsheet-import/steps/components/SelectHeaderStep/SelectHeaderStep.tsx
@@ -57,10 +57,10 @@ export const SelectHeaderStep = ({
       </Modal.Content>
       <StepNavigationButton
         onClick={handleContinue}
-        title="Next"
+        onBack={onBack}
+        title="Continue"
         isLoading={isLoading}
       />
-      <StepNavigationButton onClick={onBack} title="Back" />
     </>
   );
 };
diff --git a/...front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx b/...front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx
@@ -54,18 +54,19 @@ export const SelectSheetStep = ({
         <StyledHeading title="Select the sheet to use" />
         <StyledRadioContainer>
           <RadioGroup onValueChange={(value) => setValue(value)} value={value}>
+            {JSON.stringify(sheetNames)}
             {sheetNames.map((sheetName) => (
-              <Radio value={sheetName} key={sheetName} />
+              <Radio value={sheetName} key={sheetName} label={sheetName} />
             ))}
           </RadioGroup>
         </StyledRadioContainer>
       </StyledContent>
       <StepNavigationButton
         onClick={() => handleOnContinue(value)}
+        onBack={onBack}
         isLoading={isLoading}
-        title="Next"
+        title="Continue"
       />
-      <StepNavigationButton onClick={onBack} title="Back" />
     </>
   );
 };
diff --git a/...y-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx b/...y-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx
@@ -240,8 +240,11 @@ export const ValidationStep = <T extends string>({
           />
         </StyledScrollContainer>
       </StyledContent>
-      <StepNavigationButton onClick={onContinue} title="Confirm" />
-      <StepNavigationButton onClick={onBack} title="Back" />
+      <StepNavigationButton
+        onClick={onContinue}
+        onBack={onBack}
+        title="Confirm"
+      />
     </>
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/input/button/components/MainButton.tsx b/packages/twenty-front/src/modules/ui/input/button/components/MainButton.tsx
@@ -3,13 +3,13 @@ import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { IconComponent } from 'twenty-ui';
 
-type Variant = 'primary' | 'secondary';
+export type MainButtonVariant = 'primary' | 'secondary';
 
 type Props = {
   title: string;
   fullWidth?: boolean;
   width?: number;
-  variant?: Variant;
+  variant?: MainButtonVariant;
   soon?: boolean;
 } & React.ComponentProps<'button'>;