@datagrok/bio 2.4.40 → 2.4.42

package/package.json

@@ -5,7 +5,7 @@
     "name": "Leonid Stolbov",
     "email": "lstolbov@datagrok.ai"
   },
-  "version": "2.4.40",
+  "version": "2.4.42",
   "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",
@@ -14,9 +14,9 @@
   },
   "dependencies": {
     "@biowasm/aioli": "^3.1.0",
-    "@datagrok-libraries/bio": "^5.32.1",
+    "@datagrok-libraries/bio": "^5.32.2",
     "@datagrok-libraries/chem-meta": "^1.0.1",
-    "@datagrok-libraries/ml": "^6.3.37",
+    "@datagrok-libraries/ml": "^6.3.39",
     "@datagrok-libraries/tutorials": "^1.3.2",
     "@datagrok-libraries/utils": "^4.0.11",
     "cash-dom": "^8.0.0",

package/src/utils/convert.ts

@@ -17,13 +17,12 @@ let convertDialogSubs: Subscription[] = [];
  * @param {DG.column} col Column with 'Macromolecule' semantic type
  */
 export function convert(col?: DG.Column): void {
-
   let tgtCol = col ?? grok.shell.t.columns.bySemType('Macromolecule')!;
   if (!tgtCol)
     throw new Error('No column with Macromolecule semantic type found');
   let converter = new NotationConverter(tgtCol);
   let currentNotation: NOTATION = converter.notation;
-  const dialogHeader =  ui.divText(
+  const dialogHeader = ui.divText(
     'Current notation: ' + currentNotation,
     {
       style: {
@@ -48,9 +47,11 @@ export function convert(col?: DG.Column): void {
     tgtCol = newCol;
     converter = new NotationConverter(tgtCol);
     currentNotation = converter.notation;
+    if (currentNotation === NOTATION.HELM)
+      separatorInput.value = '/'; // helm monomers can have - in the name like D-aThr;
     dialogHeader.textContent = 'Current notation: ' + currentNotation;
     filteredNotations = notations.filter((e) => e !== currentNotation);
-    targetNotationInput = ui.choiceInput('Convert to', filteredNotations[0], filteredNotations);
+    targetNotationInput = ui.choiceInput('Convert to', filteredNotations[0], filteredNotations, toggleSeparator);
     toggleSeparator();
     convertDialog?.clear();
     convertDialog?.add(ui.div([
@@ -58,14 +59,13 @@ export function convert(col?: DG.Column): void {
       targetColumnInput.root,
       targetNotationInput.root,
       separatorInput.root
-    ]))
+    ]));
   };
 
   const targetColumnInput = ui.columnInput('Column', grok.shell.t, tgtCol, toggleColumn);
 
   const separatorArray = ['-', '.', '/'];
   let filteredNotations = notations.filter((e) => e !== currentNotation);
-  let targetNotationInput = ui.choiceInput('Convert to', filteredNotations[0], filteredNotations);
 
   const separatorInput = ui.choiceInput('Separator', separatorArray[0], separatorArray);
 
@@ -76,6 +76,7 @@ export function convert(col?: DG.Column): void {
     else
       $(separatorInput.root).show();
   };
+  let targetNotationInput = ui.choiceInput('Convert to', filteredNotations[0], filteredNotations, toggleSeparator);
 
   // set correct visibility on init
   toggleSeparator();