@datagrok/helm 2.4.6 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "name": "@datagrok/helm",
3
3
  "friendlyName": "Helm",
4
- "version": "2.4.6",
4
+ "version": "2.5.0",
5
5
  "author": {
6
- "name": "Oleksandra Serhiienko",
7
- "email": "oserhiienko@datagrok.ai"
6
+ "name": "Aleksandr Tanas",
7
+ "email": "atanas@datagrok.ai"
8
8
  },
9
9
  "description": "Provides support for HELM notation (importing, detecting, rendering, conversion).",
10
10
  "sources-backup": [
@@ -16,11 +16,11 @@
16
16
  "css/helm.css"
17
17
  ],
18
18
  "dependencies": {
19
- "@datagrok-libraries/bio": "^5.42.11",
19
+ "@datagrok-libraries/bio": "^5.42.15",
20
20
  "@datagrok-libraries/chem-meta": "^1.2.5",
21
- "@datagrok-libraries/utils": "^4.2.29",
21
+ "@datagrok-libraries/utils": "^4.3.0",
22
22
  "cash-dom": "^8.1.1",
23
- "datagrok-api": "^1.20.0",
23
+ "datagrok-api": "^1.21.1",
24
24
  "dayjs": "^1.10.6",
25
25
  "rxjs": "^6.5.5",
26
26
  "wu": "latest"
@@ -28,8 +28,8 @@
28
28
  "devDependencies": {
29
29
  "@datagrok-libraries/helm-web-editor": "^1.1.11",
30
30
  "@datagrok-libraries/js-draw-lite": "^0.0.8",
31
- "@datagrok/bio": "^2.14.1",
32
- "@datagrok/chem": "^1.9.2",
31
+ "@datagrok/bio": "^2.15.1",
32
+ "@datagrok/chem": "^1.12.0",
33
33
  "@types/node": "17.0.45",
34
34
  "@types/wu": "latest",
35
35
  "@typescript-eslint/eslint-plugin": "^7.16.0",
@@ -79,8 +79,10 @@ export async function initHelmLoadAndPatchDojo(): Promise<void> {
79
79
  };
80
80
 
81
81
  try {
82
- await timeout(async () => {
82
+ // Preliminary loading BiostructureViewer package because of NGL and dojo interference
83
+ await initNgl();
83
84
 
85
+ await timeout(async () => {
84
86
  await new Promise<void>((resolve, reject) => {
85
87
  window.dojoConfig = {
86
88
  callback: () => { resolve(); },
@@ -323,3 +325,9 @@ export class HelmPackage extends DG.Package {
323
325
  }
324
326
  }
325
327
  }
328
+
329
+ async function initNgl(): Promise<void> {
330
+ const funcList = DG.Func.find({package: 'BiostructureViewer', name: 'getNglGlService'});
331
+ if (funcList.length === 0) return; // Not mandatory if the BiostructureViewer package is not installed
332
+ await funcList[0].prepare().call();
333
+ }