feat(editor): ♿️ Show Google Sheets detail

baptisteArno · Apr 11, 2022 · 4a2c662 · 4a2c662 · vercel · Apr 11, 2022
1 parent 1820686
commit 4a2c662
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 53 deletions.
diff --git a/apps/builder/components/shared/CredentialsDropdown.tsx b/apps/builder/components/shared/CredentialsDropdown.tsx
@@ -43,8 +43,6 @@ export const CredentialsDropdown = ({
   })
   const { credentials, mutate } = useCredentials({
     userId: user?.id,
-    onError: (error) =>
-      toast({ title: error.name, description: error.message }),
   })
   const [isDeleting, setIsDeleting] = useState<string>()
 

diff --git a/apps/builder/components/shared/DropdownList.tsx b/apps/builder/components/shared/DropdownList.tsx
@@ -1,5 +1,6 @@
 import {
   Button,
+  chakra,
   Menu,
   MenuButton,
   MenuButtonProps,
@@ -29,38 +30,37 @@ export const DropdownList = <T,>({
     onItemSelect(operator)
   }
   return (
-    <>
-      <Menu isLazy placement="bottom-end" matchWidth>
-        <MenuButton
-          as={Button}
-          rightIcon={<ChevronLeftIcon transform={'rotate(-90deg)'} />}
-          colorScheme="gray"
-          isTruncated
-          justifyContent="space-between"
-          textAlign="left"
-          {...props}
-        >
+    <Menu isLazy placement="bottom-end" matchWidth>
+      <MenuButton
+        as={Button}
+        rightIcon={<ChevronLeftIcon transform={'rotate(-90deg)'} />}
+        colorScheme="gray"
+        justifyContent="space-between"
+        textAlign="left"
+        {...props}
+      >
+        <chakra.span isTruncated display="block">
           {currentItem ?? placeholder}
-        </MenuButton>
-        <Portal>
-          <MenuList maxW="500px" zIndex={1500}>
-            <Stack maxH={'35vh'} overflowY="scroll" spacing="0">
-              {items.map((item) => (
-                <MenuItem
-                  key={item as unknown as string}
-                  maxW="500px"
-                  overflow="hidden"
-                  whiteSpace="nowrap"
-                  textOverflow="ellipsis"
-                  onClick={handleMenuItemClick(item)}
-                >
-                  {item}
-                </MenuItem>
-              ))}
-            </Stack>
-          </MenuList>
-        </Portal>
-      </Menu>
-    </>
+        </chakra.span>
+      </MenuButton>
+      <Portal>
+        <MenuList maxW="500px" zIndex={1500}>
+          <Stack maxH={'35vh'} overflowY="scroll" spacing="0">
+            {items.map((item) => (
+              <MenuItem
+                key={item as unknown as string}
+                maxW="500px"
+                overflow="hidden"
+                whiteSpace="nowrap"
+                textOverflow="ellipsis"
+                onClick={handleMenuItemClick(item)}
+              >
+                {item}
+              </MenuItem>
+            ))}
+          </Stack>
+        </MenuList>
+      </Portal>
+    </Menu>
   )
 }
diff --git a/...es/StepNode/SettingsPopoverContent/bodies/GoogleSheetsSettingsBody/CellWithValueStack.tsx b/...es/StepNode/SettingsPopoverContent/bodies/GoogleSheetsSettingsBody/CellWithValueStack.tsx
@@ -18,7 +18,7 @@ export const CellWithValueStack = ({
     onItemChange({ ...item, value })
   }
   return (
-    <Stack p="4" rounded="md" flex="1" borderWidth="1px">
+    <Stack p="4" rounded="md" flex="1" borderWidth="1px" w="full">
       <DropdownList<string>
         currentItem={item.column}
         onItemSelect={handleColumnSelect}

diff --git a/...pNode/SettingsPopoverContent/bodies/GoogleSheetsSettingsBody/GoogleSheetsSettingsBody.tsx b/...pNode/SettingsPopoverContent/bodies/GoogleSheetsSettingsBody/GoogleSheetsSettingsBody.tsx
@@ -125,7 +125,7 @@ export const GoogleSheetsSettingsBody = ({
             />
           </>
         )}
-      {sheet && 'action' in options && (
+      {'action' in options && (
         <ActionOptions
           options={options}
           sheet={sheet}
@@ -145,7 +145,7 @@ const ActionOptions = ({
     | GoogleSheetsGetOptions
     | GoogleSheetsInsertRowOptions
     | GoogleSheetsUpdateRowOptions
-  sheet: Sheet
+  sheet?: Sheet
   onOptionsChange: (options: GoogleSheetsOptions) => void
 }) => {
   const handleInsertColumnsChange = (cellsToInsert: Cell[]) =>
@@ -162,14 +162,14 @@ const ActionOptions = ({
 
   const UpdatingCellItem = useMemo(
     () => (props: TableListItemProps<Cell>) =>
-      <CellWithValueStack {...props} columns={sheet.columns} />,
-    [sheet.columns]
+      <CellWithValueStack {...props} columns={sheet?.columns ?? []} />,
+    [sheet?.columns]
   )
 
   const ExtractingCellItem = useMemo(
     () => (props: TableListItemProps<ExtractingCell>) =>
-      <CellWithVariableIdStack {...props} columns={sheet.columns} />,
-    [sheet.columns]
+      <CellWithVariableIdStack {...props} columns={sheet?.columns ?? []} />,
+    [sheet?.columns]
   )
 
   switch (options.action) {
@@ -187,7 +187,7 @@ const ActionOptions = ({
         <Stack>
           <Text>Row to select</Text>
           <CellWithValueStack
-            columns={sheet.columns}
+            columns={sheet?.columns ?? []}
             item={options.referenceCell ?? { id: 'reference' }}
             onItemChange={handleReferenceCellChange}
           />
@@ -205,7 +205,7 @@ const ActionOptions = ({
         <Stack>
           <Text>Row to select</Text>
           <CellWithValueStack
-            columns={sheet.columns}
+            columns={sheet?.columns ?? []}
             item={options.referenceCell ?? { id: 'reference' }}
             onItemChange={handleReferenceCellChange}
           />

diff --git a/...s/StepNode/SettingsPopoverContent/bodies/GoogleSheetsSettingsBody/SpreadsheetDropdown.tsx b/...s/StepNode/SettingsPopoverContent/bodies/GoogleSheetsSettingsBody/SpreadsheetDropdown.tsx
@@ -1,4 +1,4 @@
-import { Input, Tooltip, useToast } from '@chakra-ui/react'
+import { Input, Tooltip } from '@chakra-ui/react'
 import { SearchableDropdown } from 'components/shared/SearchableDropdown'
 import { useMemo } from 'react'
 import { useSpreadsheets } from 'services/integrations'
@@ -14,15 +14,8 @@ export const SpreadsheetsDropdown = ({
   spreadsheetId,
   onSelectSpreadsheetId,
 }: Props) => {
-  const toast = useToast({
-    position: 'top-right',
-    status: 'error',
-  })
   const { spreadsheets, isLoading } = useSpreadsheets({
     credentialsId,
-    onError: (e) =>
-      !toast.isActive('spreadsheets') &&
-      toast({ id: 'spreadsheets', title: e.name, description: e.message }),
   })
   const currentSpreadsheet = useMemo(
     () => spreadsheets?.find((s) => s.id === spreadsheetId),

diff --git a/apps/builder/services/user/credentials.ts b/apps/builder/services/user/credentials.ts
@@ -8,13 +8,13 @@ export const useCredentials = ({
   onError,
 }: {
   userId?: string
-  onError: (error: Error) => void
+  onError?: (error: Error) => void
 }) => {
   const { data, error, mutate } = useSWR<{ credentials: Credentials[] }, Error>(
     userId ? `/api/users/${userId}/credentials` : null,
     fetcher
   )
-  if (error) onError(error)
+  if (error && onError) onError(error)
   return {
     credentials: data?.credentials ?? [],
     isLoading: !error && !data,