fix: deletion of obsolete links to non-existing signals

cheminfo · Oct 9, 2021 · c173249 · c173249
1 parent 658cbe2
commit c173249
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/utilities/build/buildValues.ts b/src/utilities/build/buildValues.ts
@@ -8,7 +8,7 @@ import { getSignals } from '../signals/getSignals';
 import { addFromData1D } from './addFromData1D';
 import { addFromData2D } from './addFromData2D';
 import { updatePseudoCorrelations } from './pseudo/updatePseudoCorrelations';
-import { removeDeletedAndNotLinkedCorrelations } from './removeDeletedAndNotLinkedCorrelations';
+import { removeObsoleteLinksAndNotLinkedCorrelations } from './removeObsoleteLinksAndNotLinkedCorrelations';
 import { setAttachmentsAndProtonEquivalences } from './setAttachmentsAndProtonEquivalences';
 import { setLabels } from './setLabels';
 import { setMatches } from './setMatches';
@@ -31,8 +31,8 @@ export function buildValues(
   const signals: ExperimentSignals = getSignals(spectra);
 
   let _correlations = values ? values.slice() : [];
-  // remove deleted correlations
-  _correlations = removeDeletedAndNotLinkedCorrelations(
+  // remove obsolete links/correlations
+  _correlations = removeObsoleteLinksAndNotLinkedCorrelations(
     _correlations,
     signals.signals1D,
     signals.signals2D,

diff --git a/.../removeDeletedAndNotLinkedCorrelations.ts → ...eObsoleteLinksAndNotLinkedCorrelations.ts b/.../removeDeletedAndNotLinkedCorrelations.ts → ...eObsoleteLinksAndNotLinkedCorrelations.ts
@@ -1,5 +1,6 @@
 import lodashGet from 'lodash/get';
 
+import { removeLink } from '../..';
 import { Values } from '../../types/correlation/values';
 import { Experiment1DSignals } from '../../types/experiment/experiment1DSignals';
 import { Experiment2DSignals } from '../../types/experiment/experiment2DSignals';
@@ -11,7 +12,7 @@ import { Experiment2DSignals } from '../../types/experiment/experiment2DSignals'
  * @param {Experiment1DSignals} signals1D
  * @param {Experiment2DSignals} signals2D
  */
-export function removeDeletedAndNotLinkedCorrelations(
+export function removeObsoleteLinksAndNotLinkedCorrelations(
   correlations: Values,
   signals1D: Experiment1DSignals,
   signals2D: Experiment2DSignals,
@@ -32,7 +33,6 @@ export function removeDeletedAndNotLinkedCorrelations(
           const index = removeList.indexOf(correlation);
           if (index >= 0) {
             removeList.splice(index, 1);
-            break;
           }
         }
       } else {
@@ -45,7 +45,11 @@ export function removeDeletedAndNotLinkedCorrelations(
           const index = removeList.indexOf(correlation);
           if (index >= 0) {
             removeList.splice(index, 1);
-            break;
+          }
+        } else {
+          if (link.pseudo === false) {
+            // remove obsolete link to not anymore existing signal
+            removeLink(correlation, link.id);
           }
         }
       }