Small tidying up; merge fixes to import features and to add assembly

GMOD · Aug 2, 2023 · 2d7e2fb · 2d7e2fb
1 parent 05f5ec1
commit 2d7e2fb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/packages/apollo-collaboration-server/src/features/features.service.ts b/packages/apollo-collaboration-server/src/features/features.service.ts
@@ -303,7 +303,7 @@ export class FeaturesService {
       end: searchDto.end,
     })
   }
-  
+
   async searchFeatures(searchDto: { term: string }) {
     return this.featureModel
       .find({ $text: { $search: searchDto.term } })

diff --git a/packages/jbrowse-plugin-apollo/src/ApolloTextSearchAdapter/ApolloTextSearchAdapter.ts b/packages/jbrowse-plugin-apollo/src/ApolloTextSearchAdapter/ApolloTextSearchAdapter.ts
@@ -41,20 +41,6 @@ export class ApolloTextSearchAdapter
       .catch((err) => err)
   }
 
-  // async fetchFeatureByAttr(attrType: string, attr: string) {
-  //   const url = new URL(`features/${attrType}/${attr}`, this.baseURL)
-  //   const uri = url.toString()
-  //   const location: UriLocation = { locationType: 'UriLocation', uri }
-  //   if (this.internetAccountPreAuthorization) {
-  //     location.internetAccountPreAuthorization =
-  //       this.internetAccountPreAuthorization
-  //   }
-  //   const fetch = getFetcher(location, this.pluginManager)
-  //   return fetch(uri)
-  //     .then((res) => res.json())
-  //     .catch((err) => err)
-  // }
-
   mapBaseResult(
     features: {
       refSeq: any // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -76,15 +62,6 @@ export class ApolloTextSearchAdapter
 
   searchIndex(args: BaseTextSearchArgs): Promise<BaseResult[]> {
     const query = args.queryString
-    // const isId = query.startsWith('id:')
-    // // portion of query after first occurance of ':'
-    // const id = isId ? query.slice(query.indexOf(':') + 1) : null
-
-    // if (isId && id) {
-    //   return this.fetchFeatureByAttr('id', id)
-    //     .then((features) => this.mapBaseResult(features, query))
-    //     .catch((err) => err)
-    // }
     return this.searchFeatures(query)
       .then((features) => this.mapBaseResult(features, query))
       .catch((err) => err)

diff --git a/packages/jbrowse-plugin-apollo/src/components/ImportFeatures.tsx b/packages/jbrowse-plugin-apollo/src/components/ImportFeatures.tsx
@@ -255,14 +255,13 @@ export function ImportFeatures({
             {submitted ? 'Submitting...' : 'Submit'}
           </Button>
           <Button
-            disabled={submitted}
             variant="outlined"
             type="submit"
             onClick={() => {
               handleClose()
             }}
           >
-            Cancel
+            Close
           </Button>
         </DialogActions>
       </form>