#4615 – implement sorting for rna builder components

epam · May 17, 2024 · 1fb50af · 1fb50af
1 parent 25a2b64
commit 1fb50af
Showing 1 changed file with 36 additions and 14 deletions.
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 },