Merge pull request #4643 from epam/4615-sorting-is-absent-for-rna-bui…

…lder-components-sugar-base-phosphates #4615 – Implemented sorting for RNA builder components
epam · May 23, 2024 · 513d3c5 · 513d3c5
2 parents 242004a + 0d62f33
commit 513d3c5
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 14 deletions.
diff --git a/...ry.spec.ts-snapshots/Open-Ketcher-Open-Chem-tab-in-library-1-chromium-linux.png b/...ry.spec.ts-snapshots/Open-Ketcher-Open-Chem-tab-in-library-1-chromium-linux.png
diff --git a/...ke-full-screen-mode-in-micro-mode-and-switch-to-macro-mode-1-chromium-linux.png b/...ke-full-screen-mode-in-micro-mode-and-switch-to-macro-mode-1-chromium-linux.png
diff --git a/....spec.ts-snapshots/Peptide-library-testing-Monomer-library-1-chromium-linux.png b/....spec.ts-snapshots/Peptide-library-testing-Monomer-library-1-chromium-linux.png
diff --git a/...hots/Peptide-library-testing-Placing-betaAlanine-on-canvas-1-chromium-linux.png b/...hots/Peptide-library-testing-Placing-betaAlanine-on-canvas-1-chromium-linux.png
diff --git a/...ts/Peptide-library-testing-Structure-displaying-in-library-1-chromium-linux.png b/...ts/Peptide-library-testing-Structure-displaying-in-library-1-chromium-linux.png
diff --git a/...apshots/Peptide-library-testing-add-molecule-in-favourites-1-chromium-linux.png b/...apshots/Peptide-library-testing-add-molecule-in-favourites-1-chromium-linux.png
diff --git a/...sphate-and-sugar-Open-file-and-connect-phosphate-and-sugar-1-chromium-linux.png b/...sphate-and-sugar-Open-file-and-connect-phosphate-and-sugar-1-chromium-linux.png
diff --git a/...ibrary.spec.ts-snapshots/RNA-Library-Check-Bases-component-1-chromium-linux.png b/...ibrary.spec.ts-snapshots/RNA-Library-Check-Bases-component-1-chromium-linux.png
diff --git a/...y.spec.ts-snapshots/RNA-Library-Check-Phosphates-component-1-chromium-linux.png b/...y.spec.ts-snapshots/RNA-Library-Check-Phosphates-component-1-chromium-linux.png
diff --git a/...brary.spec.ts-snapshots/RNA-Library-Check-Sugars-component-1-chromium-linux.png b/...brary.spec.ts-snapshots/RNA-Library-Check-Sugars-component-1-chromium-linux.png
diff --git a/...hosphate-and-Base-in-Library-once-it-chosen-in-RNA-Builder-1-chromium-linux.png b/...hosphate-and-Base-in-Library-once-it-chosen-in-RNA-Builder-1-chromium-linux.png
diff --git a/...-builde-77b62-as-no-R2-or-R3-it-is-disabled-in-RNA-Builder-1-chromium-linux.png b/...-builde-77b62-as-no-R2-or-R3-it-is-disabled-in-RNA-Builder-1-chromium-linux.png
diff --git a/...edit-in-RNA-Builder-Select-one-nucleotide-and-modify-sugar-3-chromium-linux.png b/...edit-in-RNA-Builder-Select-one-nucleotide-and-modify-sugar-3-chromium-linux.png
diff --git a/...ivates-8b4e6--start-a-new-sequence-or-edit-an-existing-one-1-chromium-linux.png b/...ivates-8b4e6--start-a-new-sequence-or-edit-an-existing-one-1-chromium-linux.png
diff --git a/...mode.spec.ts-snapshots/Sequence-Mode-Select-drop-down-menu-1-chromium-linux.png b/...mode.spec.ts-snapshots/Sequence-Mode-Select-drop-down-menu-1-chromium-linux.png
diff --git a/.../zoom.spec.ts-snapshots/Zoom-Tool-Maximum-browser-zoom-out-1-chromium-linux.png b/.../zoom.spec.ts-snapshots/Zoom-Tool-Maximum-browser-zoom-out-1-chromium-linux.png
diff --git a/packages/ketcher-macromolecules/src/state/library/librarySlice.ts b/packages/ketcher-macromolecules/src/state/library/librarySlice.ts
@@ -179,28 +179,50 @@ export const selectMonomers = (state: RootState) => {
 };
 
 export const selectMonomerGroups = (monomers: MonomerItemType[]) => {
-  const preparedData = monomers.reduce((result, monomerItem) => {
-    // separate monomers by NaturalAnalogCode
-    const code = monomerItem.props.MonomerNaturalAnalogCode;
-    if (!result[code]) {
-      result[code] = [];
-    }
-    result[code].push({
-      ...monomerItem,
-      label: monomerItem.props.MonomerName,
-    });
-    return result;
-  }, {});
+  const preparedData: Record<string, MonomerItemType[]> = monomers.reduce(
+    (result, monomerItem) => {
+      // separate monomers by NaturalAnalogCode
+      const code = monomerItem.props.MonomerNaturalAnalogCode;
+      if (!result[code]) {
+        result[code] = [];
+      }
+      result[code].push({
+        ...monomerItem,
+        label: monomerItem.props.MonomerName,
+      });
+      return result;
+    },
+    {},
+  );
+
+  const sortedPreparedData = Object.entries(preparedData).reduce(
+    (result, [code, monomers]) => {
+      const sortedMonomers = monomers.sort((a, b) =>
+        a.label.localeCompare(b.label),
+      );
+      const baseIndex = sortedMonomers.findIndex(
+        (monomer) => monomer.label === code,
+      );
+      if (baseIndex !== -1) {
+        const base = sortedMonomers.splice(baseIndex, 1);
+        sortedMonomers.unshift(base[0]);
+      }
+      result[code] = sortedMonomers;
+      return result;
+    },
+    {},
+  );
+
   // generate list of monomer groups
   const preparedGroups: Group[] = [];
-  return Object.keys(preparedData)
+  return Object.keys(sortedPreparedData)
     .sort()
     .reduce((result, code) => {
       const group: Group = {
         groupTitle: code,
         groupItems: [],
       };
-      preparedData[code].forEach((item: MonomerItemType) => {
+      sortedPreparedData[code].forEach((item: MonomerItemType) => {
         group.groupItems.push({
           ...item,
           props: { ...item.props },