Lint

Author: cmdcolin

packages/core/src/pluggableElementTypes/RpcMethodType.ts

@@ -1,13 +1,7 @@
 import PluggableElementBase from './PluggableElementBase.ts'
 import mapObject from '../util/map-obj/index.ts'
 import { isRpcResult } from '../util/rpc.ts'
-import {
-  getBlobMap,
-  getFileFromCache,
-  getFileHandleCache,
-  setBlobMap,
-  setFileHandleCache,
-} from '../util/tracks.ts'
+import { getBlobMap, getFileFromCache, setBlobMap } from '../util/tracks.ts'
 import {
   RetryError,
   isAppRootModel,

packages/core/src/ui/FileSelector/FileSelector.test.ts

@@ -0,0 +1,90 @@
+import { getInitialSourceType, addAccountToLocation } from './FileSelector.tsx'
+
+import type { BaseInternetAccountModel } from '../../pluggableElementTypes/index.ts'
+
+describe('getInitialSourceType', () => {
+  test('returns internetAccountId when location has one', () => {
+    const location = {
+      locationType: 'UriLocation' as const,
+      uri: 'https://example.com/file.bam',
+      internetAccountId: 'google-drive-account',
+    }
+    expect(getInitialSourceType(location)).toBe('google-drive-account')
+  })
+
+  test('returns "url" for UriLocation without internetAccountId', () => {
+    const location = {
+      locationType: 'UriLocation' as const,
+      uri: 'https://example.com/file.bam',
+    }
+    expect(getInitialSourceType(location)).toBe('url')
+  })
+
+  test('returns "url" for undefined location', () => {
+    expect(getInitialSourceType(undefined)).toBe('url')
+  })
+
+  test('returns "file" for BlobLocation', () => {
+    const location = {
+      locationType: 'BlobLocation' as const,
+      blobId: 'b123',
+      name: 'test.bam',
+    }
+    expect(getInitialSourceType(location)).toBe('file')
+  })
+
+  test('returns "file" for FileHandleLocation', () => {
+    const location = {
+      locationType: 'FileHandleLocation' as const,
+      handleId: 'fh123',
+      name: 'test.bam',
+    }
+    expect(getInitialSourceType(location)).toBe('file')
+  })
+
+  test('returns "file" for LocalPathLocation', () => {
+    const location = {
+      locationType: 'LocalPathLocation' as const,
+      localPath: '/path/to/file.bam',
+    }
+    expect(getInitialSourceType(location)).toBe('file')
+  })
+})
+
+describe('addAccountToLocation', () => {
+  const mockAccount = {
+    internetAccountId: 'test-account-id',
+  } as BaseInternetAccountModel
+
+  test('adds internetAccountId to UriLocation', () => {
+    const location = {
+      locationType: 'UriLocation' as const,
+      uri: 'https://example.com/file.bam',
+    }
+    const result = addAccountToLocation(location, mockAccount)
+    expect(result).toEqual({
+      locationType: 'UriLocation',
+      uri: 'https://example.com/file.bam',
+      internetAccountId: 'test-account-id',
+    })
+  })
+
+  test('returns location unchanged when no account provided', () => {
+    const location = {
+      locationType: 'UriLocation' as const,
+      uri: 'https://example.com/file.bam',
+    }
+    const result = addAccountToLocation(location, undefined)
+    expect(result).toEqual(location)
+  })
+
+  test('returns non-UriLocation unchanged even with account', () => {
+    const location = {
+      locationType: 'BlobLocation' as const,
+      blobId: 'b123',
+      name: 'test.bam',
+    }
+    const result = addAccountToLocation(location, mockAccount)
+    expect(result).toEqual(location)
+  })
+})

packages/core/src/ui/FileSelector/FileSelector.tsx

@@ -9,9 +9,10 @@ import useInternetAccounts from './useInternetAccounts.ts'
 import { notEmpty } from '../../util/index.ts'
 import { isUriLocation } from '../../util/types/index.ts'
 
+import type { BaseInternetAccountModel } from '../../pluggableElementTypes/index.ts'
 import type { AbstractRootModel, FileLocation } from '../../util/types/index.ts'
 
-function getInitialToggleValue(location?: FileLocation) {
+export function getInitialSourceType(location?: FileLocation) {
   if (
     location &&
     'internetAccountId' in location &&
@@ -22,6 +23,16 @@ function getInitialToggleValue(location?: FileLocation) {
   return !location || isUriLocation(location) ? 'url' : 'file'
 }
 
+export function addAccountToLocation(
+  location: FileLocation,
+  account?: BaseInternetAccountModel,
+): FileLocation {
+  if (account && isUriLocation(location)) {
+    return { ...location, internetAccountId: account.internetAccountId }
+  }
+  return location
+}
+
 const FileSelector = observer(function FileSelector({
   inline,
   location,
@@ -36,10 +47,9 @@ const FileSelector = observer(function FileSelector({
   inline?: boolean
   rootModel?: AbstractRootModel
   setLocation: (param: FileLocation) => void
-  setName?: (str: string) => void
 }) {
-  const [toggleButtonValue, setToggleButtonValue] = useState(() =>
-    getInitialToggleValue(location),
+  const [sourceType, setSourceType] = useState(() =>
+    getInitialSourceType(location),
   )
 
   const {
@@ -50,43 +60,39 @@ const FileSelector = observer(function FileSelector({
     setRecentlyUsed,
   } = useInternetAccounts(rootModel)
 
-  const selectedAccount = accountMap[toggleButtonValue]
+  const selectedAccount = accountMap[sourceType]
 
-  const setLocationWithAccount = useCallback(
+  const handleLocationChange = useCallback(
     (loc: FileLocation) => {
-      setLocation({
-        ...loc,
-        ...(selectedAccount && isUriLocation(loc)
-          ? { internetAccountId: selectedAccount.internetAccountId }
-          : {}),
-      })
+      setLocation(addAccountToLocation(loc, selectedAccount))
     },
     [setLocation, selectedAccount],
   )
 
+  // Sync account ID to location when account selection changes
   useEffect(() => {
     if (
       selectedAccount &&
       isUriLocation(location) &&
       location.internetAccountId !== selectedAccount.internetAccountId
     ) {
-      setLocationWithAccount(location)
+      handleLocationChange(location)
     }
-  }, [location, selectedAccount, setLocationWithAccount])
+  }, [location, selectedAccount, handleLocationChange])
 
-  const selectSourceType = useCallback(
+  const handleSourceTypeChange = useCallback(
     (newValue: string | null) => {
-      setRecentlyUsed([
-        ...new Set([newValue, ...recentlyUsed].filter(notEmpty)),
-      ])
       if (newValue) {
-        setToggleButtonValue(newValue)
-      }
-      if (isUriLocation(location)) {
-        setLocationWithAccount(location)
+        setRecentlyUsed([
+          ...new Set([newValue, ...recentlyUsed].filter(notEmpty)),
+        ])
+        setSourceType(newValue)
+        if (isUriLocation(location)) {
+          handleLocationChange(location)
+        }
       }
     },
-    [location, recentlyUsed, setRecentlyUsed, setLocationWithAccount],
+    [location, recentlyUsed, setRecentlyUsed, handleLocationChange],
   )
 
   return (
@@ -97,21 +103,21 @@ const FileSelector = observer(function FileSelector({
       <FormGroup>
         <Box display="flex" flexDirection={inline ? 'row' : 'column'} gap={0.5}>
           <SourceTypeSelector
-            value={toggleButtonValue}
+            value={sourceType}
             shownAccountIds={shownAccountIds}
             hiddenAccountIds={hiddenAccountIds}
             accountMap={accountMap}
             onChange={(_event, newValue) => {
-              selectSourceType(newValue)
+              handleSourceTypeChange(newValue)
             }}
-            onHiddenAccountSelect={selectSourceType}
+            onHiddenAccountSelect={handleSourceTypeChange}
           />
           <LocationInput
-            toggleButtonValue={toggleButtonValue}
+            toggleButtonValue={sourceType}
             selectedAccount={selectedAccount}
             location={location}
             inline={inline}
-            setLocation={setLocationWithAccount}
+            setLocation={handleLocationChange}
           />
         </Box>
       </FormGroup>