@datagrok/helm 2.1.22 → 2.1.24

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/helm",
   "friendlyName": "Helm",
-  "version": "2.1.22",
+  "version": "2.1.24",
   "author": {
     "name": "Oleksandra Serhiienko",
     "email": "oserhiienko@datagrok.ai"
@@ -15,7 +15,7 @@
     "helm/JSDraw/Pistoia.HELM-uncompressed.js"
   ],
   "dependencies": {
-    "@datagrok-libraries/bio": "^5.39.6",
+    "@datagrok-libraries/bio": "^5.39.18",
     "@datagrok-libraries/chem-meta": "^1.2.1",
     "@datagrok-libraries/utils": "^4.0.17",
     "cash-dom": "^8.1.1",
@@ -39,7 +39,7 @@
     "@datagrok/bio": "^2.11.8"
   },
   "scripts": {
-    "link-all": "npm link datagrok-api @datagrok-libraries/utils @datagrok-libraries/bio",
+    "link-all": "npm link @datagrok-libraries/chem-meta datagrok-api @datagrok-libraries/utils @datagrok-libraries/bio",
     "debug-helm": "webpack && grok publish",
     "release-helm": "webpack && grok publish --release",
     "build-helm": "webpack",
@@ -55,7 +55,7 @@
     "test": "grok test",
     "test-dev": "grok test --host dev",
     "test-local": "grok test --host localhost",
-    "build-all": "npm --prefix ./../../js-api run build && npm --prefix ./../../libraries/utils run build && npm --prefix ./../../libraries/bio run build && npm run build"
+    "build-all": "npm --prefix ./../../libraries/chem-meta run build && npm --prefix ./../../js-api run build && npm --prefix ./../../libraries/utils run build && npm --prefix ./../../libraries/bio run build && npm run build"
   },
   "canEdit": [
     "Developers"

package/src/cell-renderer.ts

@@ -288,6 +288,11 @@ export class HelmCellRenderer extends DG.GridCellRenderer {
           {style: {width: `${w - 2}px`, height: `${h - 2}px`, margin: `${1}px`, backgroundColor: '#FFE0E0'}});
         host.setAttribute('dataformat', 'helm');
         host.setAttribute('data', seq /* gaps skipped */);
+        // if grid has neighbour to the left, then shift host to the left
+        if (host.parentElement && (gridCell.grid?.canvas?.offsetLeft ?? 0) > 0) {
+          host.parentElement.style.left =
+            `${(gridCell.grid?.canvas?.offsetLeft ?? 0) + host.parentElement.offsetLeft}px`;
+        }
 
         // Recreate editor to avoid hanging in window.dojox.gfx.svg.Text.prototype.getTextWidth
         const editor = new JSDraw2.Editor(host, {width: w, height: h, skin: 'w8', viewonly: true}) as IEditor;

package/src/helm-web-editor.ts

@@ -2,7 +2,9 @@ import * as grok from 'datagrok-api/grok';
 import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
 
-export class HelmWebEditor {
+import {IHelmWebEditor} from '@datagrok-libraries/bio/src/types/editor';
+
+export class HelmWebEditor implements IHelmWebEditor {
   host: any;
   editor: any;
   w = 200;
@@ -44,7 +46,7 @@ export class HelmWebEditor {
     scil.apply(webEditor.properties.parent.style, s);
     webEditor.structureview.resize(sizes.rightwidth, sizes.bottomheight + webEditor.toolbarheight);
     webEditor.mex.resize(sizes.topheight - 80);
-    setTimeout(function() {
+    setTimeout(() => {
       webEditor.canvas.helm.setSequence(value, 'HELM');
     }, 200);
     return {editorDiv: editorView, webEditor: webEditor};

package/src/tests/get-molfiles.ts

@@ -10,6 +10,10 @@ import {getMonomerLibHelper, IMonomerLibHelper} from '@datagrok-libraries/bio/sr
 import {MolfileHandler} from '@datagrok-libraries/chem-meta/src/parsing-utils/molfile-handler';
 import {MolfileHandlerBase} from '@datagrok-libraries/chem-meta/src/parsing-utils/molfile-handler-base';
 
+import {awaitGrid} from './utils';
+
+import {_package} from '../package-test';
+
 category('getMolfiles', () => {
   let monomerLibHelper: IMonomerLibHelper;
   let userLibSettings: LibSettings;
@@ -35,15 +39,19 @@ PEPTIDE1{Lys_Boc.hHis.Aca.Cys_SEt.T.dK.Thr_PO3H2.Aca.Tyr_PO3H2}$$$$,9,8`;
     const df = DG.DataFrame.fromCsv(csv);
     const helmCol = df.getCol('Helm');
     const view = grok.shell.addTableView(df);
-    const resCol: DG.Column<string> = await grok.functions.call('Helm:getMolfiles', {col: helmCol});
 
-    await delay(100);
-    await testEvent(view.grid.onAfterDrawContent, () => {}, () => {
-      view.grid.invalidate();
-    });
+    _package.logger.debug('Helm/getMolfiles/linear1, grid awaiting 1');
+    await awaitGrid(view.grid, 5000);
+    _package.logger.debug('Helm/getMolfiles/linear1, grid awaited 1');
+
+    const resCol: DG.Column<string> = await grok.functions.call('Helm:getMolfiles', {col: helmCol});
     expect(resCol.length, helmCol.length);
     const resMolfileList: MolfileHandlerBase[] = resCol.toList().map((molfile) => MolfileHandler.getInstance(molfile));
     expectArray(resMolfileList.map((mf) => mf.atomCount), df.getCol('atoms').toList());
     expectArray(resMolfileList.map((mf) => mf.bondCount), df.getCol('bonds').toList());
+
+    _package.logger.debug('Helm/getMolfiles/linear1, grid awaiting 2');
+    await awaitGrid(view.grid, 5000);
+    _package.logger.debug('Helm/getMolfiles/linear1, grid awaited 2');
   });
 });

package/src/tests/utils.ts

@@ -0,0 +1,11 @@
+import * as grok from 'datagrok-api/grok';
+import * as ui from 'datagrok-api/ui';
+import * as DG from 'datagrok-api/dg';
+
+import {delay, testEvent} from '@datagrok-libraries/utils/src/test';
+
+export async function awaitGrid(grid: DG.Grid, timeout: number = 5000): Promise<void> {
+  await delay(100);
+  await testEvent(grid.onAfterDrawContent, () => {},
+    () => { grid.invalidate(); }, timeout);
+}