@datagrok/helm 2.5.10 → 2.7.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,10 +1,10 @@
 {
   "name": "@datagrok/helm",
   "friendlyName": "Helm",
-  "version": "2.5.10",
+  "version": "2.7.0",
   "author": {
-    "name": "Aleksandr Tanas",
-    "email": "atanas@datagrok.ai"
+    "name": "Maria Dolotova",
+    "email": "mdolotova@datagrok.ai"
   },
   "description": "Provides support for HELM notation (importing, detecting, rendering, conversion).",
   "sources-backup": [
@@ -18,9 +18,9 @@
   "dependencies": {
     "@datagrok-libraries/bio": "^5.45.11",
     "@datagrok-libraries/chem-meta": "^1.2.7",
-    "@datagrok-libraries/utils": "^4.3.7",
     "cash-dom": "^8.1.1",
-    "datagrok-api": "^1.21.1",
+    "@datagrok-libraries/utils": "^4.4.0",
+    "datagrok-api": "^1.23.0",
     "dayjs": "^1.10.6",
     "lru-cache": "^10.4.3",
     "rxjs": "^6.5.5",
@@ -29,8 +29,8 @@
   "devDependencies": {
     "@datagrok-libraries/helm-web-editor": "^1.1.13",
     "@datagrok-libraries/js-draw-lite": "^0.0.10",
-    "@datagrok/bio": "^2.16.8",
-    "@datagrok/chem": "^1.12.3",
+    "@datagrok/bio": "latest",
+    "@datagrok/chem": "^1.13.0",
     "@types/node": "17.0.45",
     "@types/webpack-env": "^1.18.5",
     "@types/wu": "^2.1.44",

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/renderers-tests.ts

@@ -55,6 +55,8 @@ category('renderers', () => {
       return $(tv.root).find('.d4-grid canvas').length > 0;
     }, 'Table view canvas not found', 100);
 
+    await grok.data.detectSemanticTypes(df);
+
     expect(helmCol.semType, DG.SEMTYPE.MACROMOLECULE);
     expect(helmCol.meta.units, NOTATION.HELM);
     expect(helmCol.getTag(DG.TAGS.CELL_RENDERER), 'helm');
@@ -78,6 +80,7 @@ RNA1{d(A)p.d(C)p.d(G)p.d(U)p}|PEPTIDE1{I.H.A.N.T.Thr_PO3H2}$$$$,0,1
     const df = DG.DataFrame.fromCsv(helmCoordsCsv);
     df.currentRowIdx = 0;
     const view = grok.shell.addTableView(df);
+    await grok.data.detectSemanticTypes(df);
     const sp: DG.ScatterPlotViewer = df.plot.scatter({x: 'x', y: 'y'});
     view.dockManager.dock(sp, DG.DOCK_TYPE.RIGHT, null);
     await Promise.all([

package/src/global.d.ts

@@ -1,13 +0,0 @@
-import * as grokNamespace from 'datagrok-api/grok';
-import * as uiNamespace from 'datagrok-api/ui';
-import * as DGNamespace from 'datagrok-api/dg';
-import * as rxjsNamespace from 'rxjs';
-import $Namespace from 'cash-dom';
-
-declare global {
-    const grok: typeof grokNamespace;
-    const ui: typeof uiNamespace;
-    const DG: typeof DGNamespace;
-    const rjxs: typeof rxjsNamespace;
-    const $: typeof $Namespace;
-}