diff --git a/package-lock.json b/package-lock.json index 5dbc8b887..2b7550d90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,8 +17,8 @@ "@tanstack/react-form": "^1.32.0", "@tanstack/react-table": "^8.21.3", "@zakodium/nmr-types": "^0.5.12", - "@zakodium/nmrium-core": "^0.7.20", - "@zakodium/nmrium-core-plugins": "^0.7.28", + "@zakodium/nmrium-core": "^0.7.21", + "@zakodium/nmrium-core-plugins": "^0.7.29", "@zakodium/pdnd-esm": "^1.0.2", "@zip.js/zip.js": "^2.8.26", "cheminfo-font": "^1.27.0", @@ -3911,9 +3911,9 @@ } }, "node_modules/@zakodium/nmrium-core": { - "version": "0.7.20", - "resolved": "https://registry.npmjs.org/@zakodium/nmrium-core/-/nmrium-core-0.7.20.tgz", - "integrity": "sha512-umDAYzLO79Zt5bRbsXTGCTcAyCVLJxdGBf4Bol9KFmLDs9sskIMQ/7vopmy8w5i9z1lWUjB9hqJFagRui4oR+Q==", + "version": "0.7.21", + "resolved": "https://registry.npmjs.org/@zakodium/nmrium-core/-/nmrium-core-0.7.21.tgz", + "integrity": "sha512-NTzom3Ruw4e9grUJfOY33IFUTIzrSFICkMXEAtgAPkgXuTc2CMM4NkAOLhDCQqPjQYw3rXhUGktJQpZCGdLCjw==", "license": "CC-BY-NC-SA-4.0", "dependencies": { "cheminfo-types": "^1.15.0", @@ -3926,13 +3926,13 @@ } }, "node_modules/@zakodium/nmrium-core-plugins": { - "version": "0.7.28", - "resolved": "https://registry.npmjs.org/@zakodium/nmrium-core-plugins/-/nmrium-core-plugins-0.7.28.tgz", - "integrity": "sha512-h94aD8LDqfVaKMR0KPSFGOKnnf3GmBy45UqXVmAVpfSSArInH3K9CMxbujmK6J6a11NmiBuPq6Cyg3ZwKps+Ew==", + "version": "0.7.29", + "resolved": "https://registry.npmjs.org/@zakodium/nmrium-core-plugins/-/nmrium-core-plugins-0.7.29.tgz", + "integrity": "sha512-q3quupGnfmc8KYVvC//DjcaL7nH0riqmumyMcrX9zUBf+cpuO2H5POAI4PFakpyYIuKyyBZetdy4qY7hGZ8ssQ==", "license": "CC-BY-NC-SA-4.0", "dependencies": { "@date-fns/utc": "^2.1.1", - "@zakodium/nmrium-core": "^0.7.20", + "@zakodium/nmrium-core": "^0.7.21", "cheminfo-types": "^1.15.0", "convert-to-jcamp": "^7.0.0", "date-fns": "^4.1.0", diff --git a/package.json b/package.json index 964d99517..9d31062c9 100644 --- a/package.json +++ b/package.json @@ -71,8 +71,8 @@ "@tanstack/react-form": "^1.32.0", "@tanstack/react-table": "^8.21.3", "@zakodium/nmr-types": "^0.5.12", - "@zakodium/nmrium-core": "^0.7.20", - "@zakodium/nmrium-core-plugins": "^0.7.28", + "@zakodium/nmrium-core": "^0.7.21", + "@zakodium/nmrium-core-plugins": "^0.7.29", "@zakodium/pdnd-esm": "^1.0.2", "@zip.js/zip.js": "^2.8.26", "cheminfo-font": "^1.27.0", diff --git a/src/data/SpectraManager.ts b/src/data/SpectraManager.ts index d88d8e754..a2a5c83ed 100644 --- a/src/data/SpectraManager.ts +++ b/src/data/SpectraManager.ts @@ -171,13 +171,11 @@ export function exportAsJcamp( spectrum: Spectrum, dataExportStage: DataExportStage, ) { - let jcamp: string | null = null; if (!isSpectrum1D(spectrum)) { throw new Error('convert 2D spectrum to JCAMP is not supported'); } - const { originalData, originalInfo, ...otherSpectrum } = spectrum; - - const exportedSpectrum: Spectrum = { ...otherSpectrum }; + const { originalData, originalInfo, info } = spectrum; + const exportedSpectrum = { ...spectrum }; if (!['processedReal', 'processedRealImaginary'].includes(dataExportStage)) { if (!originalData || !originalInfo) { @@ -192,16 +190,14 @@ export function exportAsJcamp( const onlyReal = dataExportStage === 'processedReal' || dataExportStage === 'originalFtReal'; - jcamp = spectrum1DToJCAMPDX(exportedSpectrum, { - onlyReal, - }); + const jcamp = spectrum1DToJCAMPDX({ ...exportedSpectrum }, { onlyReal }); if (!jcamp) { throw new Error('convert spectrum to JCAMP failed'); } const blob = new Blob([jcamp], { type: 'text/plain' }); - const name = spectrum.info.name || 'experiment'; + const name = info.name || 'experiment'; saveAs({ blob, name, extension: '.jdx' }); }