@datagrok/helm 2.0.3 → 2.0.6

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@datagrok/helm",
   "friendlyName": "Helm",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "author": {
     "name": "Oleksandra Serhiienko",
     "email": "oserhiienko@datagrok.ai"
   },
   "description": "",
   "dependencies": {
-    "datagrok-api": "^1.6.0",
+    "@datagrok-libraries/utils": "^1.11.1",
+    "@datagrok-libraries/bio": "^5.5.0",
     "cash-dom": "^8.1.1",
+    "datagrok-api": "^1.7.2",
     "dayjs": "^1.10.6",
-    "@datagrok-libraries/utils": "^1.6.2",
-    "@datagrok-libraries/bio": "^3.1.1"
-
+    "rxjs": "^6.5.5"
   },
   "sources": [
     "css/helm.css",

package/src/__jest__/remote.test.ts

@@ -42,19 +42,20 @@ it('TEST', async () => {
   let r = await page.evaluate((targetPackage):Promise<object> => {
     return new Promise<object>((resolve, reject) => {
       (<any>window).grok.functions.eval(targetPackage + ':test()').then((df: any) => {
-        let cStatus = df.columns.byName('success');
-        let cMessage = df.columns.byName('result');
-        let cCat = df.columns.byName('category');
-        let cName = df.columns.byName('name');
+        const cStatus = df.columns.byName('success');
+        const cMessage = df.columns.byName('result');
+        const cCat = df.columns.byName('category');
+        const cName = df.columns.byName('name');
+        const cTime = df.columns.byName('ms');
         let failed = false;
         let passReport = '';
         let failReport = '';
         for (let i = 0; i < df.rowCount; i++) {
           if (cStatus.get(i)) {
-            passReport += `Test result : Success : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
+            passReport += `Test result : Success : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
           } else {
             failed = true;
-            failReport += `Test result : Failed : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
+            failReport += `Test result : Failed : ${cTime.get(i)} : ${targetPackage}.${cCat.get(i)}.${cName.get(i)} : ${cMessage.get(i)}\n`;
           }
         }
         resolve({failReport, passReport, failed});

package/src/__jest__/test-node.ts

@@ -74,7 +74,7 @@ export async function getBrowserPage(puppeteer: any): Promise<{browser: any, pag
   }, token);
   await page.goto(url);
   try {
-    await page.waitForSelector('.grok-preloader', { timeout: 1800000 });
+//    await page.waitForSelector('.grok-preloader', { timeout: 1800000 });
     await page.waitForFunction(() => document.querySelector('.grok-preloader') == null, {timeout: 3600000});
   } catch (error) {
     throw error;

package/src/helm-web-editor.ts

@@ -0,0 +1,45 @@
+import * as grok from 'datagrok-api/grok';
+import * as ui from 'datagrok-api/ui';
+import * as DG from 'datagrok-api/dg';
+
+export class HelmWebEditor {
+  editorView: any;
+  webEditor: any;
+  host: any;
+  editor: any;
+  w = 200;
+  h = 100;
+  constructor() {
+    this.editorView = ui.div();
+    org.helm.webeditor.MolViewer.molscale = 0.8;
+    this.webEditor = new scil.helm.App(this.editorView, {
+      showabout: false,
+      mexfontsize: '90%',
+      mexrnapinontab: true,
+      topmargin: 20,
+      mexmonomerstab: true,
+      sequenceviewonly: false,
+      mexfavoritefirst: true,
+      mexfilter: true
+    });
+    const sizes = this.webEditor.calculateSizes();
+    this.webEditor.canvas.resize(sizes.rightwidth - 100, sizes.topheight - 210);
+    let s = {width: sizes.rightwidth - 100 + 'px', height: sizes.bottomheight + 'px'};
+    //@ts-ignore
+    scil.apply(this.webEditor.sequence.style, s);
+    //@ts-ignore
+    scil.apply(this.webEditor.notation.style, s);
+    s = {width: sizes.rightwidth + 'px', height: (sizes.bottomheight + this.webEditor.toolbarheight) + 'px'};
+    //@ts-ignore
+    scil.apply(this.webEditor.properties.parent.style, s);
+    this.webEditor.structureview.resize(sizes.rightwidth, sizes.bottomheight + this.webEditor.toolbarheight);
+    this.webEditor.mex.resize(sizes.topheight - 80);
+    this.host = ui.div([], {style: {width: `${this.w}px`, height: `${this.h}px`}});
+    this.editor = new JSDraw2.Editor(this.host, {width: this.w, height: this.h, viewonly: true});
+  }
+
+  resizeEditor(w: number, h: number) {
+    this.editor.setSize(w, h);
+  }
+}
+

package/src/package-test.ts

@@ -1,6 +1,6 @@
 import * as DG from 'datagrok-api/dg';
 import * as grok from 'datagrok-api/grok';
-import {runTests, tests} from '@datagrok-libraries/utils/src/test';
+import {runTests, tests, TestContext} from '@datagrok-libraries/utils/src/test';
 import './tests/helm-tests.ts';
 
 export const _package = new DG.Package();
@@ -10,8 +10,9 @@ export {tests};
 //name: test
 //input: string category {optional: true}
 //input: string test {optional: true}
+//input: object testContext {optional: true}
 //output: dataframe result
-export async function test(category: string, test: string): Promise<DG.DataFrame> {
-  const data = await runTests({category, test});
+export async function test(category: string, test: string, testContext: TestContext): Promise<DG.DataFrame> {
+  const data = await runTests({category, test, testContext});
   return DG.DataFrame.fromObjects(data)!;
 }