@datagrok/sequence-translator 1.5.1 → 1.5.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/sequence-translator",
   "friendlyName": "Sequence Translator",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "author": {
     "name": "Leonid Stolbov",
     "email": "lstolbov@datagrok.ai"

package/src/polytool/conversion/pt-rules.ts

@@ -31,7 +31,9 @@ export class RuleInputs extends ActiveFiles {
     const editIcon = ui.icons.edit(async () => {
       const rulesManager = await RulesManager.getInstance(available);
       //await rulesManager.show();
-      grok.shell.addView(await rulesManager.getView());
+      // close the dialogs, its easier if we just close it from active dialogs with filtering
+      DG.Dialog.getOpenDialogs()?.filter((d) => d.root.contains(editIcon)).forEach((d) => d.close());
+      await rulesManager.getAndAddView();
     }, 'Edit rules');
 
     res.addOptions(editIcon);
@@ -153,10 +155,13 @@ export class Rules {
 
 
     for (let i = 0; i < length; i++) {
+      const fSplit = firstMonomerCol.get(i).split(',');
+      const sSplit = secondMonomerCol.get(i).split(',');
+
       const rule = {
         code: codeCol.get(i),
-        firstMonomers: firstMonomerCol.get(i).split(','),
-        secondMonomers: secondMonomerCol.get(i).split(','),
+        firstMonomers: fSplit[0] !== '' ? fSplit : [],
+        secondMonomers: sSplit[0] !== '' ? sSplit : [],
         firstLinkingGroup: firstLink.get(i),
         secondLinkingGroup: secondLink.get(i)
       };
@@ -180,11 +185,13 @@ export class Rules {
 
     for (let i = 0; i < length; i++) {
       const smartsReaction = `${firstReactant.get(i)}.${secondReactant.get(i)}>>${product.get(i)}`;
+      const fSplit = firstMonomerCol.get(i).split(',');
+      const sSplit = secondMonomerCol.get(i).split(',');
 
       const rule = {
         code: codeCol.get(i),
-        firstMonomers: firstMonomerCol.get(i).split(','),
-        secondMonomers: secondMonomerCol.get(i).split(','),
+        firstMonomers: fSplit[0] !== '' ? fSplit : [],
+        secondMonomers: sSplit[0] !== '' ? sSplit : [],
         reaction: smartsReaction,
         name: name.get(i)
       };

package/src/polytool/conversion/rule-manager.ts

@@ -11,14 +11,15 @@ export class RulesManager {
   linkRuleDataFrame: DG.DataFrame;
   synthRuleDataFrame: DG.DataFrame;
   fileName: string;
-  v: DG.View | null = null;
+  private v: DG.ViewBase | null = null;
 
   homoDimerInput: DG.InputBase;
   heteroDimerInput: DG.InputBase;
 
   currentTab = '';
 
-  private static instance: RulesManager;
+  // every rule set will have its editor instance
+  private static instances: Record<string, RulesManager> = {};
 
   protected constructor(rules: Rules, fileName: string) {
     this.rules = rules;
@@ -34,22 +35,43 @@ export class RulesManager {
     );
   }
 
-  async getView(): Promise<DG.ViewBase> {
+  async getAndAddView(): Promise<DG.ViewBase> {
+    if (this.v) {
+      try {
+        //find active view; name is unique due to file names in name
+        const activeView = Array.from(grok.shell.views).find((v) => v.name === this.v!.name);
+        if (!activeView) {
+          this.v.detach();
+          this.v.close();
+          throw new Error('View is closed, making it null in catch statement');
+        }
+        // switch to existing view
+        grok.shell.v = activeView;
+      } catch (_) {
+        //here we only come if some error is caused due to double detaching, so no handling needed
+        this.v = null;
+      }
+    }
+
     if (!this.v) {
       this.v = DG.View.create();
-      this.v.name = 'Manage Polytool Rules';
+      this.v.name = `Manage Polytool Rules - ${this.fileName}`;
       this.v.append(await this.getForm());
+      this.v = grok.shell.addView(this.v);
+      grok.shell.v = this.v!; // just in any case, to make sure it switches
+      return this.v;
     }
 
     return this.v;
   }
 
   public static async getInstance(name: string): Promise<RulesManager> {
-    if (!this.instance) {
+    // every rull will have its own instance
+    if (!this.instances[name]) {
       const rules = await getRules([name]);
-      this.instance = new RulesManager(rules, name);
+      this.instances[name] = new RulesManager(rules, name);
     }
-    return this.instance;
+    return this.instances[name]!;
   }
 
   save(): void {
@@ -84,7 +106,7 @@ export class RulesManager {
       const code = this.rules.linkRules[i].code;
       const [firstMonomers, secondMonomers] = getMonomerPairs(this.rules.linkRules[i]);
       for (let j = 0; j < firstMonomers.length; j++) {
-        const seq = `${firstMonomers[j]}(${code})-A-A-A-A-${secondMonomers[j]}(${code})-A`;
+        const seq = `${firstMonomers[j]}(${code})-A-A-A-A-${secondMonomers[j]}(${code})`;
         seqs.push(seq);
       }
     }