From d0dca5d18cfe7267794905951f28376fbd9276f4 Mon Sep 17 00:00:00 2001 From: Roman Rodionov Date: Mon, 8 Jul 2024 21:31:31 +0200 Subject: [PATCH] Backmerge: #5030 - Preview: Unable to save mix of unresolved nucleotides and nucleotides to Sequence (and FASTA) (#5038) - added classHELM: RNA for unsplit nucleotides - fixed unsplit nucleotides filtering from bases in library --- .../src/application/editor/data/monomers.ket | 7 +++++++ .../RnaBuilder/RnaAccordion/RnaAccordion.tsx | 21 +++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/packages/ketcher-core/src/application/editor/data/monomers.ket b/packages/ketcher-core/src/application/editor/data/monomers.ket index 6ee73a306f..1860d96ade 100644 --- a/packages/ketcher-core/src/application/editor/data/monomers.ket +++ b/packages/ketcher-core/src/application/editor/data/monomers.ket @@ -169978,6 +169978,7 @@ "alias": "2-Amino-dA", "naturalAnalogShort": "A", "class": "RNA", + "classHELM": "RNA", "idtAliases": { "base": "AmdA", "modifications": { @@ -170398,6 +170399,7 @@ "alias": "5HydMe-dC", "naturalAnalogShort": "C", "class": "RNA", + "classHELM": "RNA", "idtAliases": { "base": "5HydMe-dC" }, @@ -170791,6 +170793,7 @@ "alias": "Super G", "naturalAnalogShort": "G", "class": "RNA", + "classHELM": "RNA", "idtAliases": { "base": "Super-dG" }, @@ -171206,6 +171209,7 @@ "alias": "Super T", "naturalAnalogShort": "T", "class": "RNA", + "classHELM": "RNA", "idtAliases": { "base": "Super-dT" }, @@ -171644,6 +171648,7 @@ "alias": "5-Bromo dU", "naturalAnalogShort": "U", "class": "RNA", + "classHELM": "RNA", "idtAliases": { "base": "5Br-dU", "modifications": { @@ -172026,6 +172031,7 @@ "alias": "5NitInd", "naturalAnalogShort": "X", "class": "RNA", + "classHELM": "RNA", "idtAliases": { "base": "5NitInd" }, @@ -172458,6 +172464,7 @@ "alias": "AmMC6T", "naturalAnalogShort": "T", "class": "RNA", + "classHELM": "RNA", "idtAliases": { "base": "AmMC6T" }, diff --git a/packages/ketcher-macromolecules/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.tsx b/packages/ketcher-macromolecules/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.tsx index f955560196..52bfed51ef 100644 --- a/packages/ketcher-macromolecules/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.tsx +++ b/packages/ketcher-macromolecules/src/components/monomerLibrary/RnaBuilder/RnaAccordion/RnaAccordion.tsx @@ -58,7 +58,7 @@ import { } from 'state/rna-builder'; import { useDispatch } from 'react-redux'; import { IRnaPreset } from '../types'; -import { MonomerItemType } from 'ketcher-core'; +import { KetMonomerClass, MonomerItemType } from 'ketcher-core'; import { selectEditor, selectIsSequenceEditInRNABuilderMode, @@ -130,11 +130,20 @@ export const RnaAccordion = ({ libraryName, duplicatePreset, editPreset }) => { { groupName: MonomerGroups.BASES, iconName: 'base', - groups: groups.filter( - (group) => - MonomerCodeToGroup[group.groupTitle as MonomerGroupCodes] === - MonomerGroups.BASES, - ), + groups: groups + .filter( + (group) => + MonomerCodeToGroup[group.groupTitle as MonomerGroupCodes] === + MonomerGroups.BASES, + ) + .map((group) => { + return { + ...group, + groupItems: group.groupItems.filter( + (item) => item.props?.MonomerClass !== KetMonomerClass.RNA, + ), + }; + }), }, { groupName: MonomerGroups.PHOSPHATES,