diff --git a/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-helm.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-helm.spec.ts index c75e149888..8ce3a05bbe 100644 --- a/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-helm.spec.ts +++ b/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-helm.spec.ts @@ -689,10 +689,11 @@ const incorrectHELMStrings: IHELMString[] = [ helmDescription: '43. Negative probability (CHEM)', HELMString: 'CHEM1{([A6OH]:-10,[Az]:20)}$$$$V2.0', }, - { - helmDescription: '44. Probability is greater than 100 (CHEM)', - HELMString: 'CHEM1{([A6OH]:10,[Az]:1000)}$$$$V2.0', - }, + // { + // helmDescription: '44. Probability is greater than 100 (CHEM)', + // HELMString: 'CHEM1{([A6OH]:10,[Az]:1000)}$$$$V2.0', + // }, + // It is not a bug because of Aleksandr Savelev suggestion { helmDescription: '45. Missing probability token (RNA)', HELMString: 'RNA1{R(A:,C:90)P}$$$$V2.0', diff --git a/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-helm.spec.ts-snapshots/Import-incorrect-HELM-sequence-44-Probability-is-greater-than-100-CHEM-1-chromium-linux.png b/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-helm.spec.ts-snapshots/Import-incorrect-HELM-sequence-44-Probability-is-greater-than-100-CHEM-1-chromium-linux.png index abe577bfea..3862e870ef 100644 Binary files a/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-helm.spec.ts-snapshots/Import-incorrect-HELM-sequence-44-Probability-is-greater-than-100-CHEM-1-chromium-linux.png and b/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-helm.spec.ts-snapshots/Import-incorrect-HELM-sequence-44-Probability-is-greater-than-100-CHEM-1-chromium-linux.png differ diff --git a/packages/ketcher-core/src/application/render/renderers/AmbiguousMonomerRenderer.ts b/packages/ketcher-core/src/application/render/renderers/AmbiguousMonomerRenderer.ts index 57b8ab48f2..70ff61b4de 100644 --- a/packages/ketcher-core/src/application/render/renderers/AmbiguousMonomerRenderer.ts +++ b/packages/ketcher-core/src/application/render/renderers/AmbiguousMonomerRenderer.ts @@ -119,7 +119,9 @@ export class AmbiguousMonomerRenderer extends BaseMonomerRenderer { public show(theme) { super.show(theme); this.appendNumberOfMonomers(); - this.appendEnumeration(); + if (this.enumerationElementPosition) { + this.appendEnumeration(); + } if (this.CHAIN_BEGINNING) { this.appendChainBeginning(); } diff --git a/packages/ketcher-core/src/application/render/renderers/constants.ts b/packages/ketcher-core/src/application/render/renderers/constants.ts index 8a2a98a935..21175d9d88 100644 --- a/packages/ketcher-core/src/application/render/renderers/constants.ts +++ b/packages/ketcher-core/src/application/render/renderers/constants.ts @@ -15,6 +15,7 @@ export const MONOMER_SYMBOLS_IDS = { hover: '#sugar-selection', selected: '#sugar-selection', body: '#sugar', + variant: '#sugar-variant', }, [KetMonomerClass.Base]: { hover: '#rna-base-selection', @@ -26,6 +27,7 @@ export const MONOMER_SYMBOLS_IDS = { hover: '#phosphate-selection', selected: '#phosphate-selection', body: '#phosphate', + variant: '#phosphate-variant', }, [KetMonomerClass.RNA]: { hover: '#nucleotide-hover', diff --git a/packages/ketcher-macromolecules/src/components/shared/monomerOnCanvas/Phosphate.tsx b/packages/ketcher-macromolecules/src/components/shared/monomerOnCanvas/Phosphate.tsx index 88aa249fe6..05b9ebbc5b 100644 --- a/packages/ketcher-macromolecules/src/components/shared/monomerOnCanvas/Phosphate.tsx +++ b/packages/ketcher-macromolecules/src/components/shared/monomerOnCanvas/Phosphate.tsx @@ -41,5 +41,19 @@ export const PhosphateAvatar = () => ( strokeWidth="1.5" /> + + + ); diff --git a/packages/ketcher-macromolecules/src/components/shared/monomerOnCanvas/Sugar.tsx b/packages/ketcher-macromolecules/src/components/shared/monomerOnCanvas/Sugar.tsx index f6ebbe844c..2798e3e261 100644 --- a/packages/ketcher-macromolecules/src/components/shared/monomerOnCanvas/Sugar.tsx +++ b/packages/ketcher-macromolecules/src/components/shared/monomerOnCanvas/Sugar.tsx @@ -36,5 +36,19 @@ export const SugarAvatar = () => ( strokeWidth="2.5" /> + + + );