@datagrok/helm 2.5.9 → 2.6.0

package/helm/dojo/package.ts

@@ -32,7 +32,7 @@ async function loadModules(): Promise<void> {
   // window.dojo$.ctx = require.context('../../vendor/dojo-1.10.10', true, /\.js\.uncompressed\.js$/);
 
   window.dojo$.uncompressed = unc;
-  window.dojo$.ctx(`./dojo/dojo.js${unc}`);
+  await window.dojo$.ctx(`./dojo/dojo.js${unc}`);
 }
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@datagrok/helm",
   "friendlyName": "Helm",
-  "version": "2.5.9",
+  "version": "2.6.0",
   "author": {
     "name": "Aleksandr Tanas",
     "email": "atanas@datagrok.ai"
@@ -16,7 +16,7 @@
     "css/helm.css"
   ],
   "dependencies": {
-    "@datagrok-libraries/bio": "^5.45.7",
+    "@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-utils.ts

@@ -56,8 +56,10 @@ export async function initHelmLoadAndPatchDojo(): Promise<void> {
   // patch window.dojox.gfx.svg.Text.prototype.getTextWidth hangs
   /** get the text width in pixels */
   const pi = DG.TaskBarProgressIndicator.create('Loading Helm Web Editor ...');
+  const requireBackup = window.require;
+  //@ts-ignore
+  const defineBackup = window['define'];
   try {
-    const requireBackup = window.require;
 
     // Dojo modules required by JDraw2 and HELMWebEditor
     // 'dojo.window','dojo.io.script','dojo.io.iframe','dojo.dom',
@@ -88,7 +90,7 @@ export async function initHelmLoadAndPatchDojo(): Promise<void> {
 
     try {
       // Preliminary loading BiostructureViewer package because of NGL and dojo interference
-      await initNgl();
+      //await initNgl();
 
       await timeout(async () => {
         await new Promise<void>((resolve, reject) => {
@@ -112,7 +114,7 @@ export async function initHelmLoadAndPatchDojo(): Promise<void> {
               },
             },
           };
-          // Load dojo without package/sources section for the settings dojoConfig to take effect
+          // Load dojo without package/sources section for the settings dojoConfig to take effect, calleback will be called and promise resolved
           DG.Utils.loadJsCss([
             // 'https://ajax.googleapis.com/ajax/libs/dojo/1.10.4/dojo/dojo.js.uncompressed.js',
             // `${_package.webRoot}/vendor/dojo-1.10.10/dojo/dojo.js.uncompressed.js`,
@@ -141,6 +143,8 @@ export async function initHelmLoadAndPatchDojo(): Promise<void> {
             _package.logger.debug(`${logPrefix}, window.require( ${JSON.stringify(args)} )`);
             dojoRequire(...args);
           };
+
+          
         }
 
         /** List of dojo modules not ready yet */ let dojoNotReadyList: string[];
@@ -190,6 +194,9 @@ export async function initHelmLoadAndPatchDojo(): Promise<void> {
     };
     _package.logger.debug(`${logPrefix}, end`);
   } finally {
+    window.require = requireBackup;
+    // @ts-ignore
+    window['define'] = defineBackup;
     pi.close();
   }
 }

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;