@datagrok/helm 2.5.8 → 2.5.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/helm",
   "friendlyName": "Helm",
-  "version": "2.5.8",
+  "version": "2.5.10",
   "author": {
     "name": "Aleksandr Tanas",
     "email": "atanas@datagrok.ai"
@@ -16,7 +16,7 @@
     "css/helm.css"
   ],
   "dependencies": {
-    "@datagrok-libraries/bio": "^5.45.6",
+    "@datagrok-libraries/bio": "^5.45.11",
     "@datagrok-libraries/chem-meta": "^1.2.7",
     "@datagrok-libraries/utils": "^4.3.7",
     "cash-dom": "^8.1.1",

package/src/package.ts

@@ -18,6 +18,7 @@ import {getPropertiesWidget} from './widgets/properties-widget';
 import {HelmGridCellRenderer, HelmGridCellRendererBack} from './utils/helm-grid-cell-renderer';
 import {_getHelmService, HelmPackage} from './package-utils';
 import {HelmHelper} from './helm-helper';
+import {getRdKitModule} from '@datagrok-libraries/bio/src/chem/rdkit-module';
 
 // Do not import anything than types from @datagrok/helm-web-editor/src/types
 import type {JSDraw2Module, OrgHelmModule, ScilModule} from './types';
@@ -51,11 +52,11 @@ async function initHelmInt(): Promise<void> {
   _package.logger.debug(`${logPrefix}, start`);
 
   try {
-    const [_, seqHelper, libHelper] = await Promise.all([
-      _package.initHELMWebEditor(),
-      getSeqHelper(),
-      getMonomerLibHelper(),
-    ]);
+    // order of things is very important
+    await getRdKitModule();
+    const seqHelper = await getSeqHelper();
+    const libHelper = await getMonomerLibHelper();
+    await _package.initHELMWebEditor();
     const helmHelper: IHelmHelper = new HelmHelper(seqHelper, _package.logger);
     _package.completeInit(helmHelper, libHelper);
   } catch (err: any) {

package/src/tests/get-monomer-tests.ts

@@ -32,6 +32,8 @@ declare const JSDraw2: JSDraw2Module;
 
 type TestDataType = { args: { a: any, name?: string }, tgt: any };
 
+const getResultDf = false;
+
 const tests: { [testName: string]: TestDataType } = {
   /* eslint-disable */
   //@formatter:off
@@ -68,7 +70,7 @@ const tests: { [testName: string]: TestDataType } = {
   /* eslint-enable */
 };
 
-category('getMonomer', ()=>{
+category('getMonomer', ()=> {
   let helmHelper: IHelmHelper;
   let monomerLibHelper: IMonomerLibHelper;
   /** Backup actual user's monomer libraries settings */
@@ -95,14 +97,15 @@ category('getMonomer', ()=>{
     const helmHelper: IHelmHelper = await getHelmHelper();
     expect(helmHelper != null, true);
     const getMonomerFunc: GetMonomerFunc = helmHelper.originalMonomersFuncs!.getMonomer!;
-
-    return _testAll('original', getMonomerFunc);
-  }, {isAggregated: true});
+    const res = _testAll('original', getMonomerFunc);
+    return getResultDf ? (res ?? DG.DataFrame.create(0)) : null;
+  }, {isAggregated: getResultDf});
 
   test('monomerLib', async () =>{
     const getMonomerFunc = org.helm.webeditor.Monomers.getMonomer;
-    return _testAll('monomerLib', getMonomerFunc);
-  }, {isAggregated: true});
+    const res = _testAll('monomerLib', getMonomerFunc);
+    return getResultDf ? (res ?? DG.DataFrame.create(0)) : null;
+  }, {isAggregated: getResultDf});
 
   function _testAll(prefix: string, getMonomerFunc: GetMonomerFunc): DG.DataFrame {
     const resDf = DG.DataFrame.fromColumns([
@@ -135,6 +138,7 @@ category('getMonomer', ()=>{
       resDf.set('error', resI, errMsg);
       resDf.set('stack', resI, errStack);
       resDf.set('success', resI, false);
+      throw err;
     }
 
     for (const [[testName, testData], testI] of wu.enumerate(Object.entries(tests))) {
@@ -155,6 +159,7 @@ category('getMonomer', ()=>{
         resDf.set('error', resI, errMsg);
         resDf.set('stack', resI, errStack);
         resDf.set('success', resI, false);
+        throw err;
       }
     }
     return resDf;