Skip to content

Commit

Permalink
Merge pull request #4209 from epam/4167-migrate-to-Indigo-v1.18.0-in-…
Browse files Browse the repository at this point in the history 
…browser-module

Backmerge: #4167 - Migrate to Indigo v1.18.0 in-browser module
  • Loading branch information
@ilya-asiyuk-epam
ilya-asiyuk-epam authored Mar 7, 2024
2 parents cf09ad5 + d997e00 commit b9a236f
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 26 deletions.
1 change: 1 addition & 0 deletions ketcher-autotests/tests/Templates/Template-Manipulations/Template-manipulations.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ test.describe('Template Manupulations', () => {
await page.getByText('S').first().click({
button: 'right',
});
await takeEditorScreenshot(page);
await page.getByText('Edit...').click();
await page.getByLabel('Label').click();
await page.getByLabel('Label').fill('Br');
Expand Down
Binary file modified ...ots/Template-Manupulations-Templates---Atom-symbol-editing-2-chromium-linux.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ots/Template-Manupulations-Templates---Atom-symbol-editing-3-chromium-linux.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions ketcher-autotests/tests/test-data/Molfiles-V3000/fifty-monomers-v3000-expected.mol
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

-INDIGO-03012408372D
-INDIGO-03072417132D

0 0 0 0 0 0 0 0 0 0 0 V3000
M V30 BEGIN CTAB
Expand Down Expand Up @@ -232,7 +232,7 @@ M V30 000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CL-
M V30 ASS=LGRP
M V30 3 SUP 3 ATOMS=(16 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 17) XBONDS=(1 17-
M V30 ) BRKXYZ=(9 0.650200 0.373850 0.000000 0.000000 0.000000 0.000000 0.00-
M V30 0000 0.000000 0.000000) LABEL=D-2Nal CLASS=AA SAP=(3 2 1 Al) SAP=(3 15-
M V30 0000 0.000000 0.000000) LABEL=D-2Nal CLASS=AA SAP=(3 2 0 Al) SAP=(3 15-
M V30 16 Br) NATREPLACE=AA/A
M V30 END SGROUP
M V30 END CTAB
Expand Down Expand Up @@ -325,7 +325,7 @@ M V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CLAS-
M V30 S=LGRP
M V30 4 SUP 4 ATOMS=(9 1 2 3 4 5 7 9 10 11) XBONDS=(2 6 8) BRKXYZ=(9 -0.5115-
M V30 50 0.295400 0.000000 0.511550 0.295400 0.000000 0.000000 0.000000 0.00-
M V30 0000) LABEL=Ggu CLASS=AA SAP=(3 7 6 Al) SAP=(3 3 1 Br) SAP=(3 10 8 Cx)-
M V30 0000) LABEL=Ggu CLASS=AA SAP=(3 7 6 Al) SAP=(3 3 0 Br) SAP=(3 10 8 Cx)-
M V30 NATREPLACE=AA/E
M V30 END SGROUP
M V30 END CTAB
Expand Down Expand Up @@ -518,7 +518,7 @@ M V30 000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CL-
M V30 ASS=LGRP
M V30 3 SUP 3 ATOMS=(18 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 19) XBONDS-
M V30 =(1 19) BRKXYZ=(9 0.433067 0.250727 0.000000 0.000000 0.000000 0.00000-
M V30 0 0.000000 0.000000 0.000000) LABEL=DHis1B CLASS=AA SAP=(3 2 1 Al) SAP-
M V30 0 0.000000 0.000000 0.000000) LABEL=DHis1B CLASS=AA SAP=(3 2 0 Al) SAP-
M V30 =(3 17 18 Br) NATREPLACE=AA/H
M V30 END SGROUP
M V30 END CTAB
Expand Down Expand Up @@ -659,7 +659,7 @@ M V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CLAS-
M V30 S=LGRP
M V30 3 SUP 3 ATOMS=(18 1 2 3 4 6 7 8 9 10 11 12 13 14 15 16 17 18 19) XBOND-
M V30 S=(1 4) BRKXYZ=(9 0.433039 0.250063 0.000000 0.000000 0.000000 0.00000-
M V30 0 0.000000 0.000000 0.000000) LABEL=Pyl CLASS=AA SAP=(3 2 1 Al) SAP=(3-
M V30 0 0.000000 0.000000 0.000000) LABEL=Pyl CLASS=AA SAP=(3 2 0 Al) SAP=(3-
M V30 4 5 Br) NATREPLACE=AA/K
M V30 END SGROUP
M V30 END CTAB
Expand Down Expand Up @@ -948,7 +948,7 @@ M V30 000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CL-
M V30 ASS=LGRP
M V30 3 SUP 3 ATOMS=(14 1 2 3 4 5 6 7 8 9 10 11 12 13 15) XBONDS=(1 14) BRKX-
M V30 YZ=(9 0.433340 0.249179 0.000000 0.000000 0.000000 0.000000 0.000000 0-
M V30 .000000 0.000000) LABEL=DSerBn CLASS=AA SAP=(3 2 1 Al) SAP=(3 13 14 Br-
M V30 .000000 0.000000) LABEL=DSerBn CLASS=AA SAP=(3 2 0 Al) SAP=(3 13 14 Br-
M V30 ) NATREPLACE=AA/S
M V30 END SGROUP
M V30 END CTAB
Expand Down
14 changes: 7 additions & 7 deletions ketcher-autotests/tests/test-data/Molfiles-V3000/hundred-monomers-v3000-expected.mol
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

-INDIGO-03012408372D
-INDIGO-03072417132D

0 0 0 0 0 0 0 0 0 0 0 V3000
M V30 BEGIN CTAB
Expand Down Expand Up @@ -344,7 +344,7 @@ M V30 000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CL-
M V30 ASS=LGRP
M V30 3 SUP 3 ATOMS=(16 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 17) XBONDS=(1 17-
M V30 ) BRKXYZ=(9 0.650200 0.373850 0.000000 0.000000 0.000000 0.000000 0.00-
M V30 0000 0.000000 0.000000) LABEL=D-2Nal CLASS=AA SAP=(3 2 1 Al) SAP=(3 15-
M V30 0000 0.000000 0.000000) LABEL=D-2Nal CLASS=AA SAP=(3 2 0 Al) SAP=(3 15-
M V30 16 Br) NATREPLACE=AA/A
M V30 END SGROUP
M V30 END CTAB
Expand Down Expand Up @@ -437,7 +437,7 @@ M V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CLAS-
M V30 S=LGRP
M V30 4 SUP 4 ATOMS=(9 1 2 3 4 5 7 9 10 11) XBONDS=(2 6 8) BRKXYZ=(9 -0.5115-
M V30 50 0.295400 0.000000 0.511550 0.295400 0.000000 0.000000 0.000000 0.00-
M V30 0000) LABEL=Ggu CLASS=AA SAP=(3 7 6 Al) SAP=(3 3 1 Br) SAP=(3 10 8 Cx)-
M V30 0000) LABEL=Ggu CLASS=AA SAP=(3 7 6 Al) SAP=(3 3 0 Br) SAP=(3 10 8 Cx)-
M V30 NATREPLACE=AA/E
M V30 END SGROUP
M V30 END CTAB
Expand Down Expand Up @@ -630,7 +630,7 @@ M V30 000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CL-
M V30 ASS=LGRP
M V30 3 SUP 3 ATOMS=(18 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 19) XBONDS-
M V30 =(1 19) BRKXYZ=(9 0.433067 0.250727 0.000000 0.000000 0.000000 0.00000-
M V30 0 0.000000 0.000000 0.000000) LABEL=DHis1B CLASS=AA SAP=(3 2 1 Al) SAP-
M V30 0 0.000000 0.000000 0.000000) LABEL=DHis1B CLASS=AA SAP=(3 2 0 Al) SAP-
M V30 =(3 17 18 Br) NATREPLACE=AA/H
M V30 END SGROUP
M V30 END CTAB
Expand Down Expand Up @@ -771,7 +771,7 @@ M V30 0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CLAS-
M V30 S=LGRP
M V30 3 SUP 3 ATOMS=(18 1 2 3 4 6 7 8 9 10 11 12 13 14 15 16 17 18 19) XBOND-
M V30 S=(1 4) BRKXYZ=(9 0.433039 0.250063 0.000000 0.000000 0.000000 0.00000-
M V30 0 0.000000 0.000000 0.000000) LABEL=Pyl CLASS=AA SAP=(3 2 1 Al) SAP=(3-
M V30 0 0.000000 0.000000 0.000000) LABEL=Pyl CLASS=AA SAP=(3 2 0 Al) SAP=(3-
M V30 4 5 Br) NATREPLACE=AA/K
M V30 END SGROUP
M V30 END CTAB
Expand Down Expand Up @@ -1060,7 +1060,7 @@ M V30 000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CL-
M V30 ASS=LGRP
M V30 3 SUP 3 ATOMS=(14 1 2 3 4 5 6 7 8 9 10 11 12 13 15) XBONDS=(1 14) BRKX-
M V30 YZ=(9 0.433340 0.249179 0.000000 0.000000 0.000000 0.000000 0.000000 0-
M V30 .000000 0.000000) LABEL=DSerBn CLASS=AA SAP=(3 2 1 Al) SAP=(3 13 14 Br-
M V30 .000000 0.000000) LABEL=DSerBn CLASS=AA SAP=(3 2 0 Al) SAP=(3 13 14 Br-
M V30 ) NATREPLACE=AA/S
M V30 END SGROUP
M V30 END CTAB
Expand Down Expand Up @@ -1709,7 +1709,7 @@ M V30 000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000) LABEL=OH CL-
M V30 ASS=LGRP
M V30 3 SUP 3 ATOMS=(14 1 2 3 4 5 6 7 8 9 10 11 12 13 15) XBONDS=(1 14) BRKX-
M V30 YZ=(9 0.650150 0.373850 0.000000 0.000000 0.000000 0.000000 0.000000 0-
M V30 .000000 0.000000) LABEL=Cys_Bn CLASS=AA SAP=(3 2 1 Al) SAP=(3 13 14 Br-
M V30 .000000 0.000000) LABEL=Cys_Bn CLASS=AA SAP=(3 2 0 Al) SAP=(3 13 14 Br-
M V30 ) NATREPLACE=AA/C
M V30 END SGROUP
M V30 END CTAB
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/ketcher-core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ketcher-core",
"version": "2.19.0-rc.1",
"version": "2.19.0-rc.2",
"description": "Web-based molecule sketcher",
"license": "Apache-2.0",
"homepage": "http://lifescience.opensource.epam.com/ketcher",
Expand Down
2 changes: 1 addition & 1 deletion packages/ketcher-macromolecules/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ketcher-macromolecules",
"version": "2.19.0-rc.1",
"version": "2.19.0-rc.2",
"description": "Web-based molecule sketcher",
"license": "Apache-2.0",
"homepage": "http://lifescience.opensource.epam.com/ketcher",
Expand Down
2 changes: 1 addition & 1 deletion packages/ketcher-react/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ketcher-react",
"version": "2.19.0-rc.1",
"version": "2.19.0-rc.2",
"description": "Web-based molecule sketcher",
"license": "Apache-2.0",
"homepage": "http://lifescience.opensource.epam.com/ketcher",
Expand Down
4 changes: 2 additions & 2 deletions packages/ketcher-standalone/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ketcher-standalone",
"version": "2.19.0-rc.1",
"version": "2.19.0-rc.2",
"description": "Web-based molecule sketcher",
"license": "Apache-2.0",
"homepage": "http://lifescience.opensource.epam.com/ketcher",
Expand Down Expand Up @@ -42,7 +42,7 @@
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"indigo-ketcher": "1.18.0-rc.8",
"indigo-ketcher": "1.18.0",
"ketcher-core": "*"
},
"devDependencies": {
Expand Down

0 comments on commit b9a236f

Please sign in to comment.