Merge pull request #189 from jetstreamapp/feat/46

Set GDrive as default if selected #46
jetstreamapp · Mar 4, 2023 · 7301a64 · 7301a64
2 parents fff9ea0 + 05db4e3
commit 7301a64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/apps/jetstream/src/app/components/load-records/steps/SelectObjectAndFile.tsx b/apps/jetstream/src/app/components/load-records/steps/SelectObjectAndFile.tsx
@@ -128,6 +128,7 @@ export const LoadRecordsSelectObjectAndFile: FunctionComponent<LoadRecordsSelect
               <GridCol>
                 <FileOrGoogleSelector
                   omitGoogle={!hasGoogleInputConfigured}
+                  initialSelectedTab={hasGoogleInputConfigured && inputFileType === 'google' && inputFilename ? 'google' : 'local'}
                   fileSelectorProps={{
                     id: 'load-record-file',
                     label: 'File to Load',

diff --git a/libs/ui/src/lib/form/file-selector/FileOrGoogleSelector.tsx b/libs/ui/src/lib/form/file-selector/FileOrGoogleSelector.tsx
@@ -7,12 +7,14 @@ export interface FileOrGoogleSelectorProps {
   fileSelectorProps: FileSelectorProps;
   googleSelectorProps: GoogleFileSelectorProps;
   omitGoogle?: boolean;
+  initialSelectedTab?: 'local' | 'google';
 }
 
 export const FileOrGoogleSelector: FunctionComponent<FileOrGoogleSelectorProps> = ({
   fileSelectorProps,
   googleSelectorProps,
   omitGoogle,
+  initialSelectedTab = 'local',
 }) => {
   return (
     // eslint-disable-next-line react/jsx-no-useless-fragment
@@ -21,7 +23,7 @@ export const FileOrGoogleSelector: FunctionComponent<FileOrGoogleSelectorProps>
         <FileSelector {...fileSelectorProps}></FileSelector>
       ) : (
         <Tabs
-          initialActiveId="local"
+          initialActiveId={initialSelectedTab}
           tabs={[
             {
               id: 'local',