@datagrok/helm 2.2.1 → 2.3.1

package/src/package.ts

@@ -3,90 +3,133 @@ import * as grok from 'datagrok-api/grok';
 import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
 
-// import '@datagrok-libraries/bio/src/types/dojo';
-// import * as dojo from 'DOJO';
-import '@datagrok-libraries/bio/src/types/helm';
-import '@datagrok-libraries/bio/src/types/jsdraw2';
-import * as scil from 'scil';
-import * as org from 'org';
-import * as JSDraw2 from 'JSDraw2';
-
 import $ from 'cash-dom';
 
+import {testEvent} from '@datagrok-libraries/utils/src/test';
 import {errorToConsole} from '@datagrok-libraries/utils/src/to-console';
+import {errInfo} from '@datagrok-libraries/bio/src/utils/err-info';
 import {NOTATION} from '@datagrok-libraries/bio/src/utils/macromolecule';
-import {GapOriginals, SeqHandler} from '@datagrok-libraries/bio/src/utils/seq-handler';
-import {IMonomerLib, Monomer} from '@datagrok-libraries/bio/src/types';
+import {SeqHandler} from '@datagrok-libraries/bio/src/utils/seq-handler';
+import {IMonomerLib} from '@datagrok-libraries/bio/src/types';
+import {App, HweWindow} from '@datagrok-libraries/bio/src/helm/types';
 import {IHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {HelmServiceBase} from '@datagrok-libraries/bio/src/viewers/helm-service';
+import {getMonomerLibHelper} from '@datagrok-libraries/bio/src/monomer-works/monomer-utils';
 
 import {HelmCellRenderer} from './cell-renderer';
 import {HelmHelper} from './helm-helper';
 import {getPropertiesWidget} from './widgets/properties-widget';
 import {HelmGridCellRenderer, HelmGridCellRendererBack} from './utils/helm-grid-cell-renderer';
-import {_getHelmService, HelmPackage, initHelmPatchDojo} from './package-utils';
+import {_getHelmService, HelmPackage, initHelmLoadAndPatchDojo} from './package-utils';
+import {RGROUP_CAP_GROUP_NAME, RGROUP_LABEL, SMILES} from './constants';
+import {getRS} from './utils/get-monomer-dummy';
 
-let monomerLib: IMonomerLib | null = null;
+// Do not import anything than types from @datagrok/helm-web-editor/src/types
+import {buildWebEditorApp} from './helm-web-editor';
+import {JSDraw2HelmModule, OrgHelmModule, ScilModule} from './types';
 
 export const _package = new HelmPackage();
 
+let monomerLib: IMonomerLib | null = null;
+
+/*
+  Loading modules:
+  Through Helm/package.json/sources section
+    dojo from ajax.googleapis.com
+    HELMWebEditor
+      JSDraw.Lite is embedded into HELMWebEditor bundle (dist/package.js)
+ */
+
+declare const window: Window & HweWindow;
+declare const scil: ScilModule;
+declare const JSDraw2: JSDraw2HelmModule;
+declare const org: OrgHelmModule;
+
 //tags: init
 export async function initHelm(): Promise<void> {
-  const logPrefix: string = 'Helm: initHelm()';
+  const logPrefix: string = 'Helm: _package.initHelm()';
   _package.logger.debug(`${logPrefix}, start`);
-  org.helm.webeditor.kCaseSensitive = true; // GROK-13880
-
-  await Promise.all([
-    new Promise((resolve, reject) => {
-      // @ts-ignore
-      dojo.ready(function() { resolve(null); });
-    }).then(() => {
-      initHelmPatchDojo();
-    }),
-    (async () => {
-      const libHelper = await getMonomerLibHelper();
-      return libHelper.getBioLib();
-    })()
-  ])
-    .then(([_, lib]: [unknown, IMonomerLib]) => {
-      _package.logger.debug(`${logPrefix}, then(), lib loaded`);
-      monomerLib = lib;
-      rewriteLibraries(); // initHelm()
-      _package.initHelmPatchPistoia(monomerLib, _package.logger);
-
-      monomerLib.onChanged.subscribe((_) => {
-        try {
-          const libSummary = monomerLib!.getSummary();
-          const isLibEmpty = Object.keys(libSummary).length == 0;
-          const libSummaryLog = isLibEmpty ? 'empty' : Object.entries(libSummary)
-            .map(([pt, count]) => `${pt}: ${count}`)
-            .join(', ');
-          const logPrefixInt = `${logPrefix} monomerLib.onChanged()`;
-          _package.logger.debug(`${logPrefixInt}, start, lib: { ${libSummaryLog} }`);
-
-          const libSummaryHtml = isLibEmpty ? 'empty' : Object.entries(libSummary)
-            .map(([pt, count]) => `${pt} ${count}`)
-            .join('<br />');
-          const libMsg: string = `Monomer lib updated:<br /> ${libSummaryHtml}`;
-          grok.shell.info(libMsg);
-
-          _package.logger.debug(`${logPrefixInt}, org,helm.webeditor.Monomers updating ...`);
-          rewriteLibraries(); // initHelm()
-          _package.logger.debug(`${logPrefixInt}, end, org.helm.webeditor.Monomers completed`);
-        } catch (err: any) {
-          const errMsg = errorToConsole(err);
-          console.error('Helm: initHelm monomerLib.onChanged() error:\n' + errMsg);
-          // throw err; // Prevent disabling event handler
-        }
-      });
-    })
-    .catch((err: any) => {
-      const errMsg: string = err instanceof Error ? err.message : !!err ? err.toString() : 'Exception \'undefined\'';
-      grok.shell.error(`Package \'Helm\' init initHelm() error: ${errMsg}`);
-      const errRes = new Error(errMsg);
-      errRes.stack = err.stack;
-      throw errRes;
+
+  try {
+    const [_, lib]: [void, IMonomerLib] = await Promise.all([
+      Promise.all([
+        new Promise<void>((resolve, reject) => {
+          // @ts-ignore
+          // try { dojo.ready(function() { resolve(null); }); } catch (err: any) { reject(err); }
+          resolve();
+        }),
+        (async () => {
+          _package.logger.debug(`${logPrefix}, dependence loading …`);
+          const t1: number = performance.now();
+
+          _package.logger.debug(`${logPrefix}, dojox loading and patching …`);
+          await initHelmLoadAndPatchDojo();
+          _package.logger.debug(`${logPrefix}, dojox loaded and patched`);
+
+          // Alternatively load old bundles by package.json/sources
+          _package.logger.debug(`${logPrefix}, HelmWebEditor awaiting …`);
+          require('vendor/helm-web-editor'); // through webpack.config.ts/alias
+          await window.helmWebEditor$.initPromise;
+          _package.logger.debug(`${logPrefix}, HelmWebEditor loaded`);
+
+          org.helm.webeditor.kCaseSensitive = true; // GROK-13880
+
+          _package.logger.debug(`${logPrefix}, scil.Utils.alert patch`);
+          _package.initHelmPatchScilAlert(); // patch immediately
+
+          const t2: number = performance.now();
+          _package.logger.debug(`${logPrefix}, dependence loaded, ET: ${(t2 - t1)} ms`);
+        })()
+      ]).then(() => {
+
+        // settings
+      }),
+      (async () => {
+        const libHelper = await getMonomerLibHelper();
+        return libHelper.getBioLib();
+      })()
+    ]);
+
+    _package.logger.debug(`${logPrefix}, then(), lib loaded`);
+    monomerLib = lib;
+    // rewriteLibraries(); // initHelm()
+    await _package.initHelmPatchPistoia(monomerLib);
+
+    monomerLib.onChanged.subscribe((_) => {
+      const logPrefixInt = `${logPrefix} monomerLib.onChanged()`;
+      try {
+        const libSummary = monomerLib!.getSummaryObj();
+        const isLibEmpty = Object.keys(libSummary).length == 0;
+        const libSummaryLog = isLibEmpty ? 'empty' : Object.entries(libSummary)
+          .map(([pt, count]) => `${pt}: ${count}`)
+          .join(', ');
+        _package.logger.debug(`${logPrefixInt}, start, lib: { ${libSummaryLog} }`);
+
+        const libSummaryHtml = isLibEmpty ? 'empty' : Object.entries(libSummary)
+          .map(([pt, count]) => `${pt} ${count}`)
+          .join('<br />');
+        const libMsg: string = `Monomer lib updated:<br /> ${libSummaryHtml}`;
+        grok.shell.info(libMsg);
+
+        // _package.logger.debug(`${logPrefixInt}, org,helm.webeditor.Monomers updating ...`);
+        // rewriteLibraries(); // initHelm() monomerLib.onChanged()
+        // _package.logger.debug(`${logPrefixInt}, end, org.helm.webeditor.Monomers completed`);
+      } catch (err: any) {
+        const errMsg = errorToConsole(err);
+        console.error(`${logPrefixInt} error:\n` + errMsg);
+        // throw err; // Prevent disabling event handler
+      }
     });
+  } catch (err: any) {
+    const [errMsg, errStack] = errInfo(err);
+    // const errMsg: string = err instanceof Error ? err.message : !!err ? err.toString() : 'Exception \'undefined\'';
+    grok.shell.error(`Package \'Helm\' init error:\n${errMsg}`);
+    const errRes = new Error(`${logPrefix} error:\n  ${errMsg}\n${errStack}`);
+    errRes.stack = errStack;
+    throw errRes;
+  } finally {
+    _package.logger.debug(`${logPrefix}, finally`);
+  }
   _package.logger.debug(`${logPrefix}, end`);
 }
 
@@ -94,51 +137,6 @@ export function getMonomerLib(): IMonomerLib | null {
   return monomerLib;
 }
 
-/** Fills org.helm.webeditor.Monomers dictionary for WebEditor */
-function rewriteLibraries() {
-  org.helm.webeditor.Monomers.clear();
-  monomerLib!.getPolymerTypes().forEach((polymerType) => {
-    const monomerSymbols = monomerLib!.getMonomerSymbolsByType(polymerType);
-    monomerSymbols.forEach((monomerSymbol) => {
-      let isBroken = false;
-      const monomer: Monomer = monomerLib!.getMonomer(polymerType, monomerSymbol)!;
-      const webEditorMonomer: org.helm.WebEditorMonomer = {
-        id: monomerSymbol,
-        m: monomer.molfile,
-        n: monomer.name,
-        na: monomer.naturalAnalog,
-        rs: monomer.rgroups.length,
-        type: monomer.polymerType,
-        mt: monomer.monomerType,
-        at: {}
-      };
-
-      if (monomer.rgroups.length > 0) {
-        // @ts-ignore
-        webEditorMonomer.rs = monomer.rgroups.length;
-        const at: { [prop: string]: any } = {};
-        monomer.rgroups.forEach((it) => {
-          at[it[RGROUP_LABEL]] = it[RGROUP_CAP_GROUP_NAME];
-        });
-        webEditorMonomer.at = at;
-      } else if (monomer[SMILES] != null) {
-        // @ts-ignore
-        webEditorMonomer.rs = Object.keys(getRS(monomer[SMILES].toString())).length;
-        webEditorMonomer.at = getRS(monomer[SMILES].toString());
-      } else
-        isBroken = true;
-
-      if (!isBroken) {
-        org.helm.webeditor.Monomers.addOneMonomer(webEditorMonomer);
-      }
-    });
-  });
-
-  // Obsolete
-  const grid: DG.Grid = grok.shell.tv?.grid;
-  if (grid) grid.invalidate();
-}
-
 //name: getHelmService
 //output: object result
 export function getHelmService(): HelmServiceBase {
@@ -151,6 +149,8 @@ export function getHelmService(): HelmServiceBase {
 //meta.columnTags: quality=Macromolecule, units=helm
 //output: grid_cell_renderer result
 export function helmCellRenderer(): HelmCellRenderer {
+  const logPrefix = `Helm: _package.getHelmCellRenderer()`;
+  _package.logger.debug(`${logPrefix}, start`);
   // return new HelmCellRenderer(); // old
   return new HelmGridCellRenderer(); // new
 }
@@ -198,34 +198,16 @@ function openWebEditor(cell: DG.Cell, value?: string, units?: string) {
   const col = cell.column as DG.Column<string>;
   const sh = SeqHandler.forColumn(col);
   const rowIdx = cell.rowIndex;
-  org.helm.webeditor.MolViewer.molscale = 0.8;
-  const app = new org.helm.webeditor.App(view, {
-    showabout: false,
-    mexfontsize: '90%',
-    mexrnapinontab: true,
-    topmargin: 20,
-    mexmonomerstab: true,
-    sequenceviewonly: false,
-    mexfavoritefirst: true,
-    mexfilter: true
-  });
-  const sizes = app.calculateSizes();
-  app.canvas.resize(sizes.rightwidth - 100, sizes.topheight - 210);
-  let s = {width: sizes.rightwidth - 100 + 'px', height: sizes.bottomheight + 'px'};
-  scil.apply(app.sequence.style, s);
-  scil.apply(app.notation.style, s);
-  s = {width: sizes.rightwidth + 'px', height: (sizes.bottomheight + app.toolbarheight) + 'px'};
-  scil.apply(app.properties.parent.style, s);
-  app.structureview.resize(sizes.rightwidth, sizes.bottomheight + app.toolbarheight);
-  app.mex.resize(sizes.topheight - 80);
-  setTimeout(() => {
+  let app: App;
+  setTimeout(async () => {
+    app = await buildWebEditorApp(view);
     if (!!cell && units === undefined)
       app.canvas.helm.setSequence(cell.value, 'HELM');
     else
       app.canvas.helm.setSequence(value!, 'HELM');
-  }, 200);
-  ui.dialog({showHeader: false, showFooter: true})
-    .add(view)
+  }, 20);
+  const dlg = ui.dialog({showHeader: false, showFooter: true});
+  dlg.add(view)
     .onOK(() => {
       const helmValue: string = app.canvas.getHelm(true).replace(/<\/span>/g, '')
         .replace(/<span style='background:#bbf;'>/g, '');
@@ -238,6 +220,10 @@ function openWebEditor(cell: DG.Cell, value?: string, units?: string) {
         }
       }
     }).show({modal: true, fullScreen: true});
+
+  // Quick fix for full screen dialog
+  const dlgCntDiv = $(dlg.root).find('div').get()[0] as HTMLDivElement;
+  dlgCntDiv.className = dlgCntDiv.className.replace('dlg- ui-form', 'dlg-ui-form');
 }
 
 //name: getMolfiles
@@ -267,15 +253,9 @@ export function getMolfiles(col: DG.Column): DG.Column {
 //name: getHelmHelper
 //output: object result
 export async function getHelmHelper(): Promise<IHelmHelper> {
-  return HelmHelper.getInstance();
+  return _package.hh;
 }
 
-import {testEvent} from '@datagrok-libraries/utils/src/test';
-import {CellRendererBackAsyncBase} from '@datagrok-libraries/bio/src/utils/cell-renderer-async-base';
-import {RGROUP_CAP_GROUP_NAME, RGROUP_LABEL, SMILES} from './constants';
-import {getRS} from './utils/dummy-monomer';
-import {getMonomerLibHelper} from '@datagrok-libraries/bio/src/monomer-works/monomer-utils';
-
 //name: measureCellRenderer
 export async function measureCellRenderer(): Promise<void> {
   const grid = grok.shell.tv.grid;

package/src/tests/findMonomers-tests.ts

@@ -10,6 +10,7 @@ import {
 } from '@datagrok-libraries/bio/src/monomer-works/lib-settings';
 
 import {findMonomers, parseHelm} from '../utils';
+import {initHelmMainPackage} from './utils';
 
 
 /** Tests with default monomer library */
@@ -19,6 +20,7 @@ category('findMonomers', () => {
   let userLibSettings: UserLibSettings;
 
   before(async () => {
+    await initHelmMainPackage();
     monomerLibHelper = await getMonomerLibHelper();
     userLibSettings = await getUserLibSettings();
 

package/src/tests/get-all-parts-tests.ts

@@ -5,6 +5,7 @@ import * as DG from 'datagrok-api/dg';
 import {after, before, category, delay, expect, test, expectArray} from '@datagrok-libraries/utils/src/test';
 
 import {getAllParts} from '../helm-monomer-placer';
+import {initHelmMainPackage} from './utils';
 
 category('getAllParts', () => {
   /** All parts of Helm string are required for fallback rendering. */
@@ -21,6 +22,10 @@ category('getAllParts', () => {
     }
   };
 
+  before(async () => {
+    await initHelmMainPackage();
+  });
+
   for (const [testName, testData] of Object.entries(tests)) {
     test(`${testName}`, async () => {
       await _testAllParts(testData.seq, testData.tgt);

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

@@ -3,6 +3,7 @@ import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
 
 import {after, before, category, delay, expect, test, expectArray, testEvent} from '@datagrok-libraries/utils/src/test';
+import {getHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {
   getUserLibSettings, setUserLibSettings, setUserLibSettingsForTests
 } from '@datagrok-libraries/bio/src/monomer-works/lib-settings';
@@ -11,7 +12,7 @@ import {getMonomerLibHelper, IMonomerLibHelper} from '@datagrok-libraries/bio/sr
 import {MolfileHandler} from '@datagrok-libraries/chem-meta/src/parsing-utils/molfile-handler';
 import {MolfileHandlerBase} from '@datagrok-libraries/chem-meta/src/parsing-utils/molfile-handler-base';
 
-import {awaitGrid} from './utils';
+import {awaitGrid, initHelmMainPackage} from './utils';
 
 import {_package} from '../package-test';
 
@@ -20,6 +21,7 @@ category('getMolfiles', () => {
   let userLibSettings: UserLibSettings;
 
   before(async () => {
+    await initHelmMainPackage();
     monomerLibHelper = await getMonomerLibHelper();
     userLibSettings = await getUserLibSettings();
     await setUserLibSettingsForTests();

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

@@ -3,17 +3,15 @@ import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
 
 import wu from 'wu';
-import * as org from 'org';
-import * as JSDraw2 from 'JSDraw2';
-import Atom = JSDraw2.Atom;
-import JsAtom = JSDraw2.JsAtom;
 
 import {
-  after, before, category, delay, expect, test, expectArray, testEvent, expectFloat
+  after, before, category, delay, expect, test, expectArray, testEvent, expectFloat, timeout
 } from '@datagrok-libraries/utils/src/test';
+import {getHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {errInfo} from '@datagrok-libraries/bio/src/utils/err-info';
-import {HelmType, MonomerLibSummaryType} from '@datagrok-libraries/bio/src/types';
-import {IHelmHelper, getHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
+import {Atom, HelmType, IJsAtom, IWebEditorMonomer, GetMonomerFunc} from '@datagrok-libraries/bio/src/helm/types';
+import {IMonomerLib, Monomer, MonomerLibSummaryType} from '@datagrok-libraries/bio/src/types';
+import {IHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {getMonomerLibHelper, IMonomerLibHelper} from '@datagrok-libraries/bio/src/monomer-works/monomer-utils';
 import {UserLibSettings} from '@datagrok-libraries/bio/src/monomer-works/types';
 import {
@@ -21,10 +19,19 @@ import {
 } from '@datagrok-libraries/bio/src/monomer-works/lib-settings';
 import {defaultMonomerLibSummary, expectMonomerLib} from '@datagrok-libraries/bio/src/tests/monomer-lib-tests';
 
-import {GetMonomerFunc, getMonomerHandleArgs} from '../utils/get-monomer';
+import {getMonomerHandleArgs} from '../utils/get-monomer';
+import {JSDraw2HelmModule, OrgHelmModule} from '../types';
+
+import {HelmHelper} from '../helm-helper';
+import {RGROUP_CAP_GROUP_NAME, RGROUP_LABEL, SMILES} from '../constants';
+import {getRS} from '../utils/get-monomer-dummy';
+import {initHelmMainPackage} from './utils';
 
 import {_package} from '../package-test';
 
+declare const org: OrgHelmModule;
+declare const JSDraw2: JSDraw2HelmModule;
+
 type TestDataType = { args: { a: any, name?: string }, tgt: any };
 
 const tests: { [testName: string]: TestDataType } = {
@@ -64,18 +71,30 @@ const tests: { [testName: string]: TestDataType } = {
 };
 
 category('getMonomer', ()=>{
+  let libHelper: IMonomerLibHelper;
+  let helmHelper: IHelmHelper;
+
   let monomerLibHelper: IMonomerLibHelper;
   /** Backup actual user's monomer libraries settings */
   let userLibSettings: UserLibSettings;
 
   before(async ()=>{
-    monomerLibHelper = await getMonomerLibHelper();
-    userLibSettings = await getUserLibSettings();
+    await initHelmMainPackage();
+
+    [libHelper, helmHelper] = await Promise.all([getMonomerLibHelper(), getHelmHelper()]);
+
+    await timeout(async () => { monomerLibHelper = await getMonomerLibHelper(); }, 5000,
+      'get monomerLibHelper');
+    await timeout(async () => { userLibSettings = await getUserLibSettings(); }, 5000,
+      'get user lib settings for backup');
 
     // Tests 'findMonomers' requires default monomer library loaded
-    await setUserLibSettingsForTests();
-    await monomerLibHelper.awaitLoaded();
-    await monomerLibHelper.loadLibraries(true); // load default libraries for tests
+    await timeout(async () => { await setUserLibSettingsForTests(); }, 5000,
+      'set user lib settings for tests');
+    await timeout(async ()=> { await monomerLibHelper.awaitLoaded(); }, 5000,
+      'await monomerLib to be loaded');
+    await timeout(async () => { await monomerLibHelper.loadLibraries(true); }, 5000,
+      'reload monomerLib with settings for tests'); // load default libraries for tests
   });
 
   after(async ()=>{
@@ -84,13 +103,20 @@ category('getMonomer', ()=>{
   });
 
   test('original', async () =>{
+    const monomerLib = libHelper.getBioLib();
+    rewriteLibraries(monomerLib);
+
+    // const overriddenGetMonomer = helmHelper.revertOriginalGetMonomer();
+    // try {
     const helmHelper: IHelmHelper = await getHelmHelper();
     expect(helmHelper != null, true);
     // @ts-ignore
-    const mainPkg: HelmPackage = helm._package;
-    const getMonomerFunc = mainPkg.getMonomerOriginal;
+    const getMonomerFunc = helmHelper.originalGetMonomer!;
 
     return _testAll('original', getMonomerFunc);
+    // } finally {
+    //   helmHelper.overrideGetMonomer(overriddenGetMonomer);
+    // }
   }, {isAggregated: true});
 
   test('monomerLib', async () =>{
@@ -163,7 +189,6 @@ category('getMonomer', ()=>{
     /* Tests getMonomer function adding missing monomers. */
     const helmStr = 'PEPTIDE1{[mis1].R.[mis2].T.C.F}$$$$;';
 
-
     expectMonomerLib(monomerLibHelper.getBioLib());
     const editor = new JSDraw2.Editor(ui.div(), {viewonly: true});
     editor.setHelm(helmStr);
@@ -174,11 +199,11 @@ category('getMonomer', ()=>{
   });
 });
 
-function getAtomFromJson(argA: JsAtom<HelmType> | HelmType): Atom<HelmType> | HelmType {
+function getAtomFromJson(argA: IJsAtom<HelmType> | HelmType): Atom<HelmType> | HelmType {
   let res: Atom<HelmType> | HelmType;
-  const a = argA as JsAtom<HelmType>;
+  const a = argA as IJsAtom<HelmType>;
   if (a.T === 'ATOM')
-    res = new JSDraw2.Atom<HelmType>(a.p, a.elem, a.bio);
+    res = new JSDraw2.Atom(a.p, a.elem, a.bio);
   else
     res = argA as HelmType;
   return res;
@@ -208,3 +233,47 @@ export function expectObjectWithNull(actual: { [key: string]: any }, expected: {
     }
   }
 }
+
+/** Fills org.helm.webeditor.Monomers dictionary for WebEditor */
+function rewriteLibraries(monomerLib: IMonomerLib): void {
+  org.helm.webeditor.Monomers.clear();
+  monomerLib!.getPolymerTypes().forEach((polymerType) => {
+    const monomerSymbols = monomerLib!.getMonomerSymbolsByType(polymerType);
+    monomerSymbols.forEach((monomerSymbol) => {
+      let isBroken = false;
+      const monomer: Monomer = monomerLib!.getMonomer(polymerType, monomerSymbol)!;
+      const webEditorMonomer: IWebEditorMonomer = {
+        id: monomerSymbol,
+        m: monomer.molfile,
+        n: monomer.name,
+        na: monomer.naturalAnalog,
+        rs: monomer.rgroups.length,
+        type: monomer.polymerType,
+        mt: monomer.monomerType,
+        at: {},
+      };
+
+      if (monomer.rgroups.length > 0) {
+        // @ts-ignore
+        webEditorMonomer.rs = monomer.rgroups.length;
+        const at: { [prop: string]: any } = {};
+        monomer.rgroups.forEach((it) => {
+          at[it[RGROUP_LABEL]] = it[RGROUP_CAP_GROUP_NAME];
+        });
+        webEditorMonomer.at = at;
+      } else if (monomer[SMILES] != null) {
+        // @ts-ignore
+        webEditorMonomer.rs = Object.keys(getRS(monomer[SMILES].toString())).length;
+        webEditorMonomer.at = getRS(monomer[SMILES].toString());
+      } else
+        isBroken = true;
+
+      if (!isBroken)
+        org.helm.webeditor.Monomers.addOneMonomer(webEditorMonomer);
+    });
+  });
+
+  // Obsolete
+  const grid: DG.Grid = grok.shell.tv?.grid;
+  if (grid) grid.invalidate();
+}

package/src/tests/helm-service-tests.ts

@@ -7,6 +7,7 @@ import {Subject} from 'rxjs';
 import {
   category, expect, test, awaitCheck, delay, testEvent, before, after
 } from '@datagrok-libraries/utils/src/test';
+import {getHelmHelper} from '@datagrok-libraries/bio/src/helm/helm-helper';
 import {
   getHelmService, HelmServiceBase, HelmAux, HelmProps
 } from '@datagrok-libraries/bio/src/viewers/helm-service';
@@ -18,6 +19,8 @@ import {
   getUserLibSettings, setUserLibSettings, setUserLibSettingsForTests
 } from '@datagrok-libraries/bio/src/monomer-works/lib-settings';
 
+import {initHelmMainPackage} from './utils';
+
 import {_package} from '../package-test';
 
 category('HelmService', () => {
@@ -30,6 +33,7 @@ category('HelmService', () => {
   before(async () => {
     const logPrefix = `Helm: tests: HelmService: before`;
     _package.logger.debug(`${logPrefix}, start`);
+    await initHelmMainPackage();
     try {
       monomerLibHelper = await getMonomerLibHelper();
       userLibSettings = await getUserLibSettings();

package/src/tests/helm-tests.ts

@@ -3,8 +3,10 @@ import * as ui from 'datagrok-api/ui';
 import * as DG from 'datagrok-api/dg';
 
 import {after, before, category, delay, expect, test, expectArray} from '@datagrok-libraries/utils/src/test';
+
 //import {findMonomers, helmToFasta, helmToPeptide, helmToRNA, initHelm} from '../package';
 import {parseHelm} from '../utils';
+import {initHelmMainPackage} from './utils';
 
 import {_package} from '../package-test';
 
@@ -51,7 +53,7 @@ category('Helm', () => {
   // });
 
   const complexMonomers = [
-    // tests parsing of complex monomemer in square brackets like [L-hArg(Et,Et)]
+    // tests parsing of complex monomer in square brackets like [L-hArg(Et,Et)]
     'PEPTIDE1{[L-hArg(Et,Et)].E.F.G}|PEPTIDE2{C.E}$PEPTIDE1,PEPTIDE2,2:R3-1:R1$$$V2.0',
     // tests parsing of complex monomer and one as a side chain as well
     'PEPTIDE1{[L-hArg(Et,Et)]([L-hArg(Et,Et)]).E.F.G}$$$$',
@@ -76,6 +78,10 @@ category('Helm', () => {
     'complex-side-chain', 'complex+side-chain+linker'
   ];
 
+  before(async () => {
+    await initHelmMainPackage();
+  });
+
   test('parseHelm', async () => {
     const expectedResults = [
       ['meI', 'hHis', 'Aca', 'N', 'T', 'dK', 'Thr_PO3H2', 'D-Tyr_Et', 'Aze', 'dV', 'E', 'Phe_4Me'],