Skip to content

Commit 75208a1

Browse files
NishaSharma14NishaSharma14
authored
Merge pull request #193 from NFDI4Chem/development
Development
2 parents 1e504e5 + df2aa85 commit 75208a1

8 files changed

Lines changed: 796 additions & 580 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ To further enable integration in other applications developed with modern framew
1515

1616
#### Production:
1717

18-
[https://nmrium.nmrxiv.org](https://nmrium.nmrxiv.org) (currently - [v0.6.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.6.0))
18+
[https://nmrium.nmrxiv.org](https://nmrium.nmrxiv.org) (currently - [v0.7.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.7.0))
1919

2020
#### Development:
2121

2222
[https://nmriumdev.nmrxiv.org](https://nmriumdev.nmrxiv.org) (latest)
2323

2424
#### For older/specific versions
25+
[https://nmrium.nmrxiv.org/releases/v0.7.0](https://nmrium.nmrxiv.org/releases/v0.7.0) -> [v0.7.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.7.0)
2526

2627
[https://nmrium.nmrxiv.org/releases/v0.6.0](https://nmrium.nmrxiv.org/releases/v0.6.0) -> [v0.6.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.6.0)
2728

@@ -94,7 +95,7 @@ Raise an issue on GitHub - https://github.com/NFDI4Chem/nmrium-react-wrapper/iss
9495

9596
| NMRium React Wrapper Version | NMRium Version | NMRium Data Schema Version | Migration Script |
9697
|:---- |:--- | :---- | :---- |
97-
| [Latest-stable](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.6.0) | [v0.46.1](https://github.com/cheminfo/nmrium/releases/tag/v0.46.1) | [v4](/public/data/Data%20Schema%20Versions/V4/) | [Migration script](https://github.com/cheminfo/nmr-load-save/blob/master/src/migration/migrateToVersion3.ts) |
98+
| [Latest-stable](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.7.0) | [v0.49.0](https://github.com/cheminfo/nmrium/releases/tag/v0.49.0) | [v4](/public/data/Data%20Schema%20Versions/V4/) | [Migration script](https://github.com/cheminfo/nmr-load-save/blob/master/src/migration/migrateToVersion3.ts) |
9899

99100

100101
## License

‎package-lock.json‎

Lines changed: 423 additions & 283 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
"node": "20.2.0"
1313
},
1414
"dependencies": {
15-
"@blueprintjs/core": "^5.7.2",
16-
"@blueprintjs/icons": "^5.5.0",
17-
"@emotion/react": "^11.11.1",
15+
"@blueprintjs/core": "^5.9.1",
16+
"@blueprintjs/icons": "^5.7.1",
17+
"@emotion/react": "^11.11.3",
1818
"fifo-logger": "^0.6.1",
19-
"filelist-utils": "^1.10.2",
20-
"nmr-load-save": "^0.23.11",
21-
"nmr-processing": "^11.7.0",
22-
"nmrium": "^0.46.1",
23-
"react-science": "^0.32.2",
24-
"vite-plugin-pwa": "^0.17.4"
19+
"filelist-utils": "^1.11.0",
20+
"nmr-load-save": "^0.26.0",
21+
"nmr-processing": "^11.10.1",
22+
"nmrium": "^0.49.0",
23+
"react-science": "^0.34.0",
24+
"vite-plugin-pwa": "^0.18.1"
2525
},
2626
"scripts": {
2727
"start": "vite --host localhost --port 3000 --open",
@@ -42,25 +42,25 @@
4242
"@babel/plugin-transform-modules-commonjs": "^7.23.3",
4343
"@babel/preset-react": "^7.23.3",
4444
"@babel/preset-typescript": "^7.23.3",
45-
"@playwright/test": "^1.40.1",
45+
"@playwright/test": "^1.41.2",
4646
"@simbathesailor/use-what-changed": "^2.0.0",
47-
"@types/jest": "^29.5.11",
48-
"@types/node": "^20.10.5",
49-
"@types/react": "^18.2.45",
50-
"@types/react-dom": "^18.2.18",
47+
"@types/jest": "^29.5.12",
48+
"@types/node": "^20.11.17",
49+
"@types/react": "^18.2.55",
50+
"@types/react-dom": "^18.2.19",
5151
"@types/react-router-dom": "^5.3.3",
52-
"@vitejs/plugin-react-swc": "^3.5.0",
52+
"@vitejs/plugin-react-swc": "^3.6.0",
5353
"cross-env": "^7.0.3",
5454
"eslint": "^8.56.0",
5555
"eslint-config-cheminfo-react": "^10.1.0",
5656
"eslint-config-cheminfo-typescript": "^12.1.0",
5757
"jest": "^29.7.0",
58-
"prettier": "3.1.1",
58+
"prettier": "3.2.5",
5959
"react": "^18.2.0",
6060
"react-dom": "^18.2.0",
61-
"react-router-dom": "^6.21.0",
61+
"react-router-dom": "^6.22.0",
6262
"serve": "^14.2.1",
6363
"typescript": "^5.3.3",
64-
"vite": "^5.0.10"
64+
"vite": "^5.1.1"
6565
}
66-
}
66+
}

‎src/allowed-origins.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
"https://schindler-ag.rwth-aachen.de",
2727
"10.195.9.248",
2828
"https://dev1.zit.ph.tum.de",
29-
"org2619.chemie.uni-leipzig.de"
29+
"https://org2619.chemie.uni-leipzig.de",
30+
"https://chemotion.ac.chemie.intern.uni-leipzig.de"
3031
]

‎src/hooks/useLoadSpectra.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ type DeepPartial<T> = {
2020

2121
const logger = new FifoLogger({
2222
onChange: (log) => {
23-
if (log && ['error', 'fatal'].includes(log.levelLabel) && log?.error) {
24-
events.trigger('error', log.error);
23+
if (log && ['error', 'fatal', 'warn'].includes(log.levelLabel)) {
24+
const error = log?.error || new Error(log?.message);
25+
events.trigger('error', error);
2526
// eslint-disable-next-line no-console
26-
console.log(log.error);
27+
console.log(error);
2728
}
2829
},
2930
});

‎src/modal/AboutUsModal.tsx‎

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
/** @jsxImportSource @emotion/react */
2+
import { Dialog, DialogBody } from '@blueprintjs/core';
23
import { css } from '@emotion/react';
3-
import { Modal, useOnOff } from 'react-science/ui';
4+
import { useOnOff } from 'react-science/ui';
45

56
import versionInfo from '../versionInfo';
67

78
const styles = css`
8-
width: 30vw;
9-
min-width: 400px;
10-
display: flex;
11-
flex-direction: column;
12-
user-select: none;
13-
149
button:focus {
1510
outline: none;
1611
}
@@ -25,7 +20,7 @@ const styles = css`
2520
span.title {
2621
font-weight: bold;
2722
color: #ea580c;
28-
font-size: 2em;
23+
font-size: 1.5em;
2924
}
3025
3126
a {
@@ -36,34 +31,20 @@ const styles = css`
3631
a:focus {
3732
color: #00bcd4;
3833
}
39-
40-
.header {
41-
span {
42-
color: #464646;
43-
font-size: 15px;
44-
flex: 1;
45-
user-select: none;
46-
}
47-
}
4834
`;
4935

5036
function AboutUsModal() {
5137
const [isOpenDialog, openDialog, closeDialog] = useOnOff(false);
5238
return (
5339
<>
5440
<InfoButton onClick={openDialog} />
55-
<Modal
56-
hasCloseButton
41+
<Dialog
5742
isOpen={isOpenDialog}
58-
onRequestClose={closeDialog}
59-
maxWidth={1000}
43+
onClose={closeDialog}
44+
style={{ maxWidth: 1000 }}
45+
title="About NMRium react wrapper"
6046
>
61-
<div css={styles}>
62-
<Modal.Header>
63-
<div className="header">
64-
<span>About NMRium react wrapper</span>
65-
</div>
66-
</Modal.Header>
47+
<DialogBody css={styles}>
6748
<div className="container">
6849
<span className="title"> NMRium react wrapper</span>
6950
<Separator />
@@ -77,8 +58,8 @@ function AboutUsModal() {
7758
GitHub ( https://github.com/NFDI4Chem/nmrium-react-wrapper )
7859
</a>
7960
</div>
80-
</div>
81-
</Modal>
61+
</DialogBody>
62+
</Dialog>
8263
</>
8364
);
8465
}

‎src/workspaces/nmrxiv.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export function getNmrXivWorkspace(hidePanelOnLoad = false): InnerWorkspace {
1111
spectraRendering: 'auto',
1212
loggingLevel: 'info',
1313
invert: false,
14+
popupLoggingLevel: 'error',
1415
},
1516
display: {
1617
general: {

0 commit comments

Comments
 (0)