diff --git a/package-lock.json b/package-lock.json index d49330729..c8e8ce817 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,9 +15,9 @@ "@tanstack/react-form": "^1.33.5", "@tanstack/react-store": "^0.11.1", "@tanstack/react-table": "^9.2.4", - "@zakodium/nmr-types": "^0.5.26", - "@zakodium/nmrium-core": "^0.7.67", - "@zakodium/nmrium-core-plugins": "^0.7.90", + "@zakodium/nmr-types": "^0.5.28", + "@zakodium/nmrium-core": "^0.7.69", + "@zakodium/nmrium-core-plugins": "^0.7.92", "@zakodium/pdnd-esm": "^1.1.1", "@zakodium/utils": "^0.5.1", "@zip.js/zip.js": "^2.11.2", @@ -44,7 +44,7 @@ "ml-signal-processing": "^2.2.2", "ml-spectra-processing": "^14.34.0", "ml-tree-similarity": "^2.2.0", - "nmr-processing": "^22.23.7", + "nmr-processing": "^22.24.1", "numeral": "^2.0.6", "openchemlib": "^9.25.0", "openchemlib-utils": "^8.18.0", @@ -3976,9 +3976,9 @@ } }, "node_modules/@zakodium/nmr-types": { - "version": "0.5.26", - "resolved": "https://registry.npmjs.org/@zakodium/nmr-types/-/nmr-types-0.5.26.tgz", - "integrity": "sha512-Da7K23q8O3EK8gslzyx5Hgd3k4TXq0w8JW+Qt2pDBZNY1M+uyVE97R9vcQKtcZiGVl/O0f57+qJ3kxvqVEnRgQ==", + "version": "0.5.28", + "resolved": "https://registry.npmjs.org/@zakodium/nmr-types/-/nmr-types-0.5.28.tgz", + "integrity": "sha512-bznIvG4DV1IwmT2rdnN1f5OWxuk4j5ZAacKav2dAbzx9oYH6wb/65LNdT1+zjhqpJXF/h4HJnR12k6GZtR+qAQ==", "license": "CC-BY-NC-SA-4.0", "dependencies": { "cheminfo-types": "^1.15.0", @@ -3989,9 +3989,9 @@ } }, "node_modules/@zakodium/nmrium-core": { - "version": "0.7.67", - "resolved": "https://registry.npmjs.org/@zakodium/nmrium-core/-/nmrium-core-0.7.67.tgz", - "integrity": "sha512-I1S0yACJSNw6bQlV/G1xA3sZMJz184WNDUr50NiGqHJ6zLMZkX+v+XZbxoZv5dFHIx2jSl5Ytvyh2P9hDH1zMg==", + "version": "0.7.69", + "resolved": "https://registry.npmjs.org/@zakodium/nmrium-core/-/nmrium-core-0.7.69.tgz", + "integrity": "sha512-5sI0UkC4F6GOkqOAB+sJNITYmdJjJkfgcbO7FGwMFrnqKEAJkOqyw5E89AcoL0XxwnOoo9xqLK/g/2IEEYzCjA==", "license": "CC-BY-NC-SA-4.0", "dependencies": { "@zakodium/utils": "^0.5.1", @@ -4007,13 +4007,13 @@ } }, "node_modules/@zakodium/nmrium-core-plugins": { - "version": "0.7.90", - "resolved": "https://registry.npmjs.org/@zakodium/nmrium-core-plugins/-/nmrium-core-plugins-0.7.90.tgz", - "integrity": "sha512-OKwZjA2ttWRkjCgLi6cAoYOC3K2Njm2qdqt3lfj4GXFFVtpccpwOmbm9liw5QRxayZwi+2wvBd16WpS/zEvM8Q==", + "version": "0.7.92", + "resolved": "https://registry.npmjs.org/@zakodium/nmrium-core-plugins/-/nmrium-core-plugins-0.7.92.tgz", + "integrity": "sha512-lwBnIU6tuzHynUi01iTYE5LY7fQ1YH0BWehgMPobGGC6WGDFAr5StubLiLDbfTPRJlT8fpYrJpiSG3av0UDpJQ==", "license": "CC-BY-NC-SA-4.0", "dependencies": { "@date-fns/utc": "^2.1.1", - "@zakodium/nmrium-core": "^0.7.67", + "@zakodium/nmrium-core": "^0.7.69", "cheminfo-types": "^1.15.0", "convert-to-jcamp": "^7.0.1", "date-fns": "^4.4.0", @@ -4024,7 +4024,7 @@ "linear-sum-assignment": "^1.0.9", "lodash.merge": "^4.6.2", "ml-spectra-processing": "^14.33.0", - "nmr-processing": "^22.23.7", + "nmr-processing": "^22.24.1", "openchemlib": "^9.24.0", "openchemlib-utils": "^8.17.1", "sdf-parser": "^9.0.0", @@ -9655,9 +9655,9 @@ "license": "MIT" }, "node_modules/nmr-processing": { - "version": "22.23.7", - "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-22.23.7.tgz", - "integrity": "sha512-PMbljQJSZgp5ttW03rjemDsLI1Y5GyYXBLdbHReZc6gZp+v+YJfPGCybFI3ChAS+3a0qdB+S/aseKGJWW0vlNg==", + "version": "22.24.1", + "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-22.24.1.tgz", + "integrity": "sha512-a9qWUNpWbgtV2N6XqBn1xsBm7R9O3MUINp8JJ3bA50c15GYRiCMPyhaX9OcLFxeUwVIuJFutpAJbpEfINrQvyQ==", "license": "CC-BY-NC-SA-4.0", "dependencies": { "binary-search": "^1.3.6", diff --git a/package.json b/package.json index 93e550aeb..1b1aa9f4c 100644 --- a/package.json +++ b/package.json @@ -66,9 +66,9 @@ "@tanstack/react-form": "^1.33.5", "@tanstack/react-store": "^0.11.1", "@tanstack/react-table": "^9.2.4", - "@zakodium/nmr-types": "^0.5.26", - "@zakodium/nmrium-core": "^0.7.67", - "@zakodium/nmrium-core-plugins": "^0.7.90", + "@zakodium/nmr-types": "^0.5.28", + "@zakodium/nmrium-core": "^0.7.69", + "@zakodium/nmrium-core-plugins": "^0.7.92", "@zakodium/pdnd-esm": "^1.1.1", "@zakodium/utils": "^0.5.1", "@zip.js/zip.js": "^2.11.2", @@ -95,7 +95,7 @@ "ml-signal-processing": "^2.2.2", "ml-spectra-processing": "^14.34.0", "ml-tree-similarity": "^2.2.0", - "nmr-processing": "^22.23.7", + "nmr-processing": "^22.24.1", "numeral": "^2.0.6", "openchemlib": "^9.25.0", "openchemlib-utils": "^8.18.0", diff --git a/src/component/context/processings_mutations_context.api.ts b/src/component/context/processings_mutations_context.api.ts index feb542a41..21257e20f 100644 --- a/src/component/context/processings_mutations_context.api.ts +++ b/src/component/context/processings_mutations_context.api.ts @@ -257,6 +257,9 @@ export function useProcessingsMutationsAPI() { preProcessedSpectrum.originalInfo = structuredClone( preProcessedSpectrum.info, ); + preProcessedSpectrum.originalProcessingInfo = structuredClone( + preProcessedSpectrum.processingInfo, + ); if (isSpectrum1D(preProcessedSpectrum)) { preProcessedSpectrum.originalData = sliceData1D( preProcessedSpectrum.data, diff --git a/src/data/data1d/Spectrum1D/initiateDatum1D.ts b/src/data/data1d/Spectrum1D/initiateDatum1D.ts index a7d5d37f6..d4e94a5f8 100644 --- a/src/data/data1d/Spectrum1D/initiateDatum1D.ts +++ b/src/data/data1d/Spectrum1D/initiateDatum1D.ts @@ -59,6 +59,9 @@ export function initiateDatum1D( spectrumObj.originalData = sliceData1D(spectrumObj.data); } + spectrumObj.processingInfo ??= {}; + spectrumObj.originalProcessingInfo ??= {}; + spectrumObj.meta = { ...spectrum.meta }; spectrumObj.customInfo = { ...spectrum.customInfo }; diff --git a/src/data/data2d/Spectrum2D/initiateDatum2D.ts b/src/data/data2d/Spectrum2D/initiateDatum2D.ts index 509110cb4..7a29607a5 100644 --- a/src/data/data2d/Spectrum2D/initiateDatum2D.ts +++ b/src/data/data2d/Spectrum2D/initiateDatum2D.ts @@ -65,6 +65,10 @@ export function initiateDatum2D( if (!datum.originalData) { datum.originalData = sliceData2D(datum.data); } + + datum.processingInfo ??= {}; + datum.originalProcessingInfo ??= {}; + datum.filters = initiateFilters(spectrum?.filters); datum.zones = initiateZones(spectrum, datum);