From 2f8b0f278661a925cfd5410cc43b85808c4f32cd Mon Sep 17 00:00:00 2001 From: Jose Alejandro Bolanos Arroyave Date: Wed, 11 Sep 2024 09:55:59 -0500 Subject: [PATCH] chore: fix localeDate for jeol format (#3215) * chore: fix localeDate for jeol format * chore: fix workspace spectraColors default values --------- Co-authored-by: hamed musallam Co-authored-by: hamed-musallam <35760236+hamed-musallam@users.noreply.github.com> --- package-lock.json | 10 +++++----- package.json | 2 +- src/component/reducer/actions/LoadActions.ts | 6 +++++- src/component/workspaces/workspaceDefaultProperties.ts | 1 + 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 88809e16f..0856b61a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "ml-tree-similarity": "^2.2.0", "multiplet-analysis": "^2.1.2", "nmr-correlation": "^2.3.3", - "nmr-load-save": "^0.37.1", + "nmr-load-save": "^0.38.0", "nmr-processing": "^12.12.1", "nmredata": "^0.9.11", "numeral": "^2.0.6", @@ -10612,16 +10612,16 @@ } }, "node_modules/nmr-load-save": { - "version": "0.37.2", - "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.37.2.tgz", - "integrity": "sha512-0xxMhh4MG95G7jVLmVPlT7l/yfv+pKfPvpdh7rzP5c0ZOTJeUX6jvTu1rVkc7IQi/sZFlveF2rTvAWCaBakk/Q==", + "version": "0.38.0", + "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.38.0.tgz", + "integrity": "sha512-HLxGsXx6XXXvmYwxNTTJ3JgEeFrLsllZW2Mk9zuBxTD+bi1JVIwKfab5eyEOwu13v11rSMsaKy01u42Ba+olnQ==", "license": "MIT", "dependencies": { "@lukeed/uuid": "^2.0.1", "@types/lodash.merge": "^4.6.9", "brukerconverter": "^7.0.0", "cheminfo-types": "^1.7.3", - "convert-to-jcamp": "^5.4.10", + "convert-to-jcamp": "^5.4.11", "filelist-utils": "^1.11.0", "gyromagnetic-ratio": "^1.2.0", "is-any-array": "^2.0.1", diff --git a/package.json b/package.json index 9711493f6..d47ea4546 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "ml-tree-similarity": "^2.2.0", "multiplet-analysis": "^2.1.2", "nmr-correlation": "^2.3.3", - "nmr-load-save": "^0.37.1", + "nmr-load-save": "^0.38.0", "nmr-processing": "^12.12.1", "nmredata": "^0.9.11", "numeral": "^2.0.6", diff --git a/src/component/reducer/actions/LoadActions.ts b/src/component/reducer/actions/LoadActions.ts index 7a7c38933..0e1c87d48 100644 --- a/src/component/reducer/actions/LoadActions.ts +++ b/src/component/reducer/actions/LoadActions.ts @@ -85,7 +85,11 @@ function setData(draft: Draft, input: InputProps) { const { nmriumState: { data, view }, parseMetaFileResult = null, - spectraColors = { oneDimension: [], twoDimensions: [] }, + spectraColors = { + oneDimension: [], + twoDimensions: [], + highlightColor: '#ffd700', + }, } = input || { nmriumState: { data: { spectra: [], molecules: [], correlations: {} } }, multipleAnalysis: {}, diff --git a/src/component/workspaces/workspaceDefaultProperties.ts b/src/component/workspaces/workspaceDefaultProperties.ts index 3b5dce30c..9b216400f 100644 --- a/src/component/workspaces/workspaceDefaultProperties.ts +++ b/src/component/workspaces/workspaceDefaultProperties.ts @@ -201,6 +201,7 @@ export const workspaceDefaultProperties: Required = { }, }, spectraColors: { + highlightColor: '#ffd700', oneDimension: [], twoDimensions: [ {