cleanup from rebase

GMOD · May 9, 2023 · 2513982 · 2513982
1 parent d9fdec2
commit 2513982
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 323 deletions.
diff --git a/packages/core/BaseFeatureWidget/SequenceFeatureDetails.tsx b/packages/core/BaseFeatureWidget/SequenceFeatureDetails.tsx
diff --git a/packages/core/BaseFeatureWidget/SequenceFeatureDetails/hooks.ts b/packages/core/BaseFeatureWidget/SequenceFeatureDetails/hooks.ts
@@ -2,7 +2,6 @@ import { useEffect, useState } from 'react'
 
 import { SeqState, ErrorState } from '../util'
 import { Feature, SimpleFeatureSerialized, getSession } from '../../util'
-import { getConf } from '../../configuration'
 
 const BPLIMIT = 500_000
 
@@ -34,7 +33,7 @@ export function useFeatureSequence(
       }
       const sessionId = 'getSequence'
       const feats = await rpcManager.call(sessionId, 'CoreGetFeatures', {
-        adapterConfig: getConf(assembly, ['sequence', 'adapter']),
+        adapterConfig: assembly.getConf(['sequence', 'adapter']),
         sessionId,
         regions: [
           {

diff --git a/packages/core/assemblyManager/assemblyManager.ts b/packages/core/assemblyManager/assemblyManager.ts
@@ -1,7 +1,7 @@
 import { addDisposer, cast, getParent, types, Instance } from 'mobx-state-tree'
 import { when } from '../util'
 import { reaction } from 'mobx'
-import { readConfObject, AnyConfigurationModel } from '../configuration'
+import { readConfObject } from '../configuration'
 import assemblyFactory, { Assembly } from './assembly'
 import PluginManager from '../PluginManager'
 import RpcManager from '../rpc/RpcManager'

diff --git a/yarn.lock b/yarn.lock
@@ -1733,10 +1733,9 @@
     generic-filehandle "^3.0.0"
     long "^4.0.0"
 
-"@gmod/ucsc-hub@^0.1.6":
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/@gmod/ucsc-hub/-/ucsc-hub-0.1.7.tgz#ea8d0c1978fc8bbd1ab63061e8105beb3d1509f1"
-  integrity sha512-FHCgRLOYn5wjCGVDkGnW0wda7UAIFqVrKE5+0lh1EpUOu/UM1kfaidsJnha4Jc9V0+KCevSl4haVv0ZaMWqw2w==
+"@gmod/ucsc-hub@link:../ucsc-hub-js":
+  version "0.0.0"
+  uid ""
 
 "@gmod/vcf@^5.0.9":
   version "5.0.10"