@datagrok/bio 2.10.8 → 2.10.9

package/package.json

@@ -5,7 +5,7 @@
     "name": "Leonid Stolbov",
     "email": "lstolbov@datagrok.ai"
   },
-  "version": "2.10.8",
+  "version": "2.10.9",
   "description": "Bioinformatics support (import/export of sequences, conversion, visualization, analysis). [See more](https://github.com/datagrok-ai/public/blob/master/packages/Bio/README.md) for details.",
   "repository": {
     "type": "git",

package/src/widgets/bio-substructure-filter.ts

@@ -17,7 +17,7 @@ import {delay} from '@datagrok-libraries/utils/src/test';
 import {debounceTime} from 'rxjs/operators';
 
 export class BioSubstructureFilter extends DG.Filter {
-  bioFilter: FastaFilter | SeparatorFilter | HelmFilter | null = null;
+  bioFilter: BioFilterBase | null = null;
   bitset: DG.BitSet | null = null;
   loader: HTMLDivElement = ui.loader();
   onBioFilterChangedSubs?: Subscription;
@@ -75,6 +75,10 @@ export class BioSubstructureFilter extends DG.Filter {
     let onChangedEvent: any = this.bioFilter.onChanged;
     onChangedEvent = onChangedEvent.pipe(debounceTime(this._debounceTime));
     this.onBioFilterChangedSubs = onChangedEvent.subscribe(async (_: any) => await this._onInputChanged());
+
+    this.subs.push(grok.events.onResetFilterRequest.subscribe((_value: any) => {
+      this.bioFilter?.resetFilter();
+    }));
   }
 
   detach() {
@@ -123,7 +127,7 @@ export class BioSubstructureFilter extends DG.Filter {
     } else {
       this.calculating = true;
       try {
-        this.bitset = await this.bioFilter?.substrucrureSearch(this.column!)!;
+        this.bitset = await this.bioFilter?.substructureSearch(this.column!)!;
         this.calculating = false;
         this.dataFrame?.rows.requestFilter();
       } finally {
@@ -147,9 +151,11 @@ abstract class BioFilterBase {
   set substructure(s: string) {
   }
 
-  async substrucrureSearch(_column: DG.Column): Promise<DG.BitSet | null> {
+  async substructureSearch(_column: DG.Column): Promise<DG.BitSet | null> {
     return null;
   }
+
+  abstract resetFilter(): void;
 }
 
 class FastaFilter extends BioFilterBase {
@@ -175,8 +181,12 @@ class FastaFilter extends BioFilterBase {
     this.substructureInput.value = s;
   }
 
-  async substrucrureSearch(column: DG.Column): Promise<DG.BitSet | null> {
-    return await linearSubstructureSearch(this.substructure, column);
+  async substructureSearch(column: DG.Column): Promise<DG.BitSet | null> {
+    return linearSubstructureSearch(this.substructure, column);
+  }
+
+  resetFilter(): void {
+    this.substructureInput.value = '';
   }
 }
 
@@ -211,8 +221,8 @@ export class SeparatorFilter extends FastaFilter {
     this.substructureInput.value = s;
   }
 
-  async substrucrureSearch(column: DG.Column): Promise<DG.BitSet | null> {
-    return await linearSubstructureSearch(this.substructure, column, this.colSeparator);
+  async substructureSearch(column: DG.Column): Promise<DG.BitSet | null> {
+    return linearSubstructureSearch(this.substructure, column, this.colSeparator);
   }
 }
 
@@ -276,11 +286,17 @@ export class HelmFilter extends BioFilterBase {
     }
   }
 
-  async substrucrureSearch(column: DG.Column): Promise<DG.BitSet | null> {
+  async substructureSearch(column: DG.Column): Promise<DG.BitSet | null> {
     ui.setUpdateIndicator(this._filterPanel, true);
     await delay(10);
     const res = await helmSubstructureSearch(this.substructure, column);
     ui.setUpdateIndicator(this._filterPanel, false);
     return res;
   }
+
+  resetFilter(): void {
+    console.debug('Bio: HelmFilter.resetFilter()');
+    this.helmSubstructure = '';
+    this.updateFilterPanel(this.substructure);
+  }
 }