fix: In "Export As" data included even when "include data" unchecked

close #1087
cheminfo · May 17, 2021 · 5aa068a · 5aa068a
1 parent 969b05c
commit 5aa068a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/component/modal/SaveAsModal.jsx b/src/component/modal/SaveAsModal.jsx
@@ -32,7 +32,7 @@ const INITIAL_VALUE = {
   name: '',
   compressed: false,
   pretty: false,
-  includeData: false,
+  includeData: true,
 };
 
 function SaveAsModal({ onClose, onSave, name }) {

diff --git a/src/data/data1d/Datum1D.ts b/src/data/data1d/Datum1D.ts
@@ -215,12 +215,14 @@ export function toJSON(datum1D: Datum1D, forceIncludeData = false) {
       jcampURL: datum1D.source.jcampURL,
     },
     display: datum1D.display,
-    ...(!datum1D.source.jcampURL || forceIncludeData
-      ? {
-          data: datum1D.originalData,
-          info: datum1D.originalInfo,
-          meta: datum1D.meta,
-        }
+    ...(forceIncludeData
+      ? datum1D.source.jcampURL
+        ? {
+            data: datum1D.originalData,
+            info: datum1D.originalInfo,
+            meta: datum1D.meta,
+          }
+        : {}
       : {}),
     peaks: datum1D.peaks,
     integrals: datum1D.integrals,

diff --git a/src/data/data2d/Datum2D.ts b/src/data/data2d/Datum2D.ts
@@ -207,12 +207,14 @@ export function toJSON(datum: Datum2D, forceIncludeData = false) {
     source: {
       jcampURL: datum.source.jcampURL,
     },
-    ...(!datum.source.jcampURL || forceIncludeData
-      ? {
-          data: datum.originalData,
-          info: datum.originalInfo,
-          meta: datum.meta,
-        }
+    ...(forceIncludeData
+      ? !datum.source.jcampURL
+        ? {
+            data: datum.originalData,
+            info: datum.originalInfo,
+            meta: datum.meta,
+          }
+        : {}
       : {}),
     zones: datum.zones,
     filters: datum.filters,