@datagrok/helm 2.0.2 → 2.0.4

package/helm/JSDraw/test.html

@@ -15,6 +15,9 @@
 <script type="text/javascript">
   dojo.ready(function () {
     var jsd = new JSDraw("Div2", { width: 800, height: 400, skin: "w8", viewonly: true });
+    var mol = jsd.getMolfile();
+    var m = new JSDraw2.Mol();
+    console.log(JSDraw2.FormulaParser.getAtomStats(m.setMolfile(mol)));
   });
 </script>
 </body>

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@datagrok/helm",
-  "beta": false,
   "friendlyName": "Helm",
-  "version": "2.0.2",
+  "version": "2.0.4",
+  "author": {
+    "name": "Oleksandra Serhiienko",
+    "email": "oserhiienko@datagrok.ai"
+  },
   "description": "",
   "dependencies": {
-    "datagrok-api": "^1.5.0",
-    "cash-dom": "latest",
-    "dayjs": "latest",
-    "@datagrok-libraries/utils": "^1.4.0",
-    "@datagrok-libraries/bio": "^3.0.1",
-    "ts-loader": "^9.2.5",
-    "typescript": "^4.4.2"
+    "datagrok-api": "^1.6.0",
+    "cash-dom": "^8.1.1",
+    "dayjs": "^1.10.6",
+    "@datagrok-libraries/utils": "^1.6.2",
+    "@datagrok-libraries/bio": "^5.1.0"
   },
   "sources": [
     "css/helm.css",
@@ -21,21 +22,24 @@
     "helm/JSDraw/Pistoia.HELM-uncompressed.js"
   ],
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "latest",
-    "@typescript-eslint/parser": "latest",
-    "eslint": "latest",
-    "eslint-config-google": "latest",
-    "ts-loader": "latest",
-    "typescript": "latest",
-    "webpack": "latest",
-    "webpack-cli": "latest",
     "@types/jest": "^27.0.0",
     "jest": "^27.0.0",
-    "jest-html-reporter": "^3.5.0",
+    "jest-html-reporter": "^3.6.0",
+    "path": "^0.12.7",
     "puppeteer": "^13.7.0",
     "ts-jest": "^27.0.0",
+    "ts-loader": "^9.2.6",
+    "typescript": "^4.4.4",
+    "webpack": "^5.59.1",
+    "webpack-cli": "^4.9.1",
+    "@typescript-eslint/eslint-plugin": "^5.11.0",
+    "@typescript-eslint/parser": "^5.11.0",
+    "eslint": "^8.18.0",
+    "eslint-config-google": "^0.14.0",
     "@types/js-yaml": "^4.0.5",
-    "@types/node-fetch": "^2.6.1"
+    "js-yaml": "^4.1.0",
+    "@types/node-fetch": "^2.6.2",
+    "node-fetch": "^2.6.7"
   },
   "scripts": {
     "link-all": "npm link datagrok-api  @datagrok-libraries/utils @datagrok-libraries/bio",
@@ -51,7 +55,7 @@
     "release-helm-public": "grok publish public --release",
     "lint": "eslint \"./src/**/*.ts\"",
     "lint-fix": "eslint \"./src/**/*.ts\" --fix",
-    "test": "set HOST=dev && jest",
+    "test": "jest",
     "test-dev": "set HOST=dev && jest",
     "test-local": "set HOST=localhost && jest"
   },

package/src/__jest__/remote.test.ts

@@ -5,7 +5,7 @@
 import * as utils from './test-node';
 import puppeteer from 'puppeteer';
 
-const P_START_TIMEOUT: number = 100000;
+const P_START_TIMEOUT: number = 3600000;
 let browser: puppeteer.Browser;
 let page: puppeteer.Page;
 
@@ -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 : ${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 : ${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});
@@ -65,4 +66,4 @@ it('TEST', async () => {
   console.log(r.passReport);
   // @ts-ignore
   expect(r.failed).checkOutput(false, r.failReport);
-}, 100000);
+}, 3600000);

package/src/__jest__/test-node.ts

@@ -66,6 +66,7 @@ export async function getBrowserPage(puppeteer: any): Promise<{browser: any, pag
   });
 
   let page = await browser.newPage();
+  await page.setDefaultNavigationTimeout(0);
   await page.goto(`${url}/oauth/`);
   await page.setCookie({name: 'auth', value: token});
   await page.evaluate((token: any) => {
@@ -73,8 +74,8 @@ export async function getBrowserPage(puppeteer: any): Promise<{browser: any, pag
   }, token);
   await page.goto(url);
   try {
-    await page.waitForSelector('.grok-preloader');
-    await page.waitForFunction(() => document.querySelector('.grok-preloader') == null, {timeout: 100000});
+//    await page.waitForSelector('.grok-preloader', { timeout: 1800000 });
+    await page.waitForFunction(() => document.querySelector('.grok-preloader') == null, {timeout: 3600000});
   } catch (error) {
     throw error;
   }

package/src/package-test.ts

@@ -11,7 +11,6 @@ export {tests};
 //input: string category {optional: true}
 //input: string test {optional: true}
 //output: dataframe result
-//top-menu: Tools | Dev | JS API Tests
 export async function test(category: string, test: string): Promise<DG.DataFrame> {
   const data = await runTests({category, test});
   return DG.DataFrame.fromObjects(data)!;