Updates

Author: cmdcolin

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

@@ -1,8 +1,10 @@
 import {
   MAX_LABEL_LENGTH,
+  addAccountToLocation,
   getAccountLabel,
+  getInitialSourceType,
   shorten,
-} from './SourceTypeSelector.tsx'
+} from './util.ts'
 
 import type { BaseInternetAccountModel } from '../../pluggableElementTypes/index.ts'
 
@@ -69,3 +71,90 @@ describe('getAccountLabel', () => {
     expect(getAccountLabel(account)).toBe('Box')
   })
 })
+
+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/index.ts

@@ -1,7 +1,7 @@
 import { isUriLocation } from '@jbrowse/core/util/index'
 
 import type { BaseInternetAccountModel } from '../../pluggableElementTypes/index.ts'
-import type { FileLocation } from '@jbrowse/core/util/index'
+import type { FileLocation } from '../../util/index.ts'
 
 export const MAX_LABEL_LENGTH = 5
 

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

@@ -7,7 +7,7 @@ export { default as Dialog } from './Dialog.tsx'
 export { default as EditableTypography } from './EditableTypography.tsx'
 export { default as ErrorMessage } from './ErrorMessage.tsx'
 export { default as FatalErrorDialog } from './FatalErrorDialog.tsx'
-export { default as FileSelector } from './FileSelector/index.ts'
+export { default as FileSelector } from './FileSelector/FileSelector.tsx'
 export { default as LoadingEllipses } from './LoadingEllipses.tsx'
 export { default as Menu } from './Menu.tsx'
 export { default as PrerenderedCanvas } from './PrerenderedCanvas.tsx'