Merge pull request #193 from NFDI4Chem/development

Development

Author: NishaSharma14

README.md

@@ -15,13 +15,14 @@ To further enable integration in other applications developed with modern framew
 
 #### Production:
 
-[https://nmrium.nmrxiv.org](https://nmrium.nmrxiv.org) (currently - [v0.6.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.6.0))
+[https://nmrium.nmrxiv.org](https://nmrium.nmrxiv.org) (currently - [v0.7.0](https://github.com/NFDI4Chem/nmrium-react-wrapper/releases/tag/v0.7.0))
 
 #### Development:
 
 [https://nmriumdev.nmrxiv.org](https://nmriumdev.nmrxiv.org) (latest)
 
 #### For older/specific versions
+[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)
 
 [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)
 
@@ -94,7 +95,7 @@ Raise an issue on GitHub - https://github.com/NFDI4Chem/nmrium-react-wrapper/iss
 
 | NMRium React Wrapper Version | NMRium Version | NMRium Data Schema Version | Migration Script |
 |:----           |:---                          | :----                        | :----            |
-|        [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) |
+|        [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) |
 
 
 ## License

package-lock.json

@@ -12,16 +12,16 @@
     "node": "20.2.0"
   },
   "dependencies": {
-    "@blueprintjs/core": "^5.7.2",
-    "@blueprintjs/icons": "^5.5.0",
-    "@emotion/react": "^11.11.1",
+    "@blueprintjs/core": "^5.9.1",
+    "@blueprintjs/icons": "^5.7.1",
+    "@emotion/react": "^11.11.3",
     "fifo-logger": "^0.6.1",
-    "filelist-utils": "^1.10.2",
-    "nmr-load-save": "^0.23.11",
-    "nmr-processing": "^11.7.0",
-    "nmrium": "^0.46.1",
-    "react-science": "^0.32.2",
-    "vite-plugin-pwa": "^0.17.4"
+    "filelist-utils": "^1.11.0",
+    "nmr-load-save": "^0.26.0",
+    "nmr-processing": "^11.10.1",
+    "nmrium": "^0.49.0",
+    "react-science": "^0.34.0",
+    "vite-plugin-pwa": "^0.18.1"
   },
   "scripts": {
     "start": "vite --host localhost --port 3000  --open",
@@ -42,25 +42,25 @@
     "@babel/plugin-transform-modules-commonjs": "^7.23.3",
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
-    "@playwright/test": "^1.40.1",
+    "@playwright/test": "^1.41.2",
     "@simbathesailor/use-what-changed": "^2.0.0",
-    "@types/jest": "^29.5.11",
-    "@types/node": "^20.10.5",
-    "@types/react": "^18.2.45",
-    "@types/react-dom": "^18.2.18",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.11.17",
+    "@types/react": "^18.2.55",
+    "@types/react-dom": "^18.2.19",
     "@types/react-router-dom": "^5.3.3",
-    "@vitejs/plugin-react-swc": "^3.5.0",
+    "@vitejs/plugin-react-swc": "^3.6.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.56.0",
     "eslint-config-cheminfo-react": "^10.1.0",
     "eslint-config-cheminfo-typescript": "^12.1.0",
     "jest": "^29.7.0",
-    "prettier": "3.1.1",
+    "prettier": "3.2.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.21.0",
+    "react-router-dom": "^6.22.0",
     "serve": "^14.2.1",
     "typescript": "^5.3.3",
-    "vite": "^5.0.10"
+    "vite": "^5.1.1"
   }
-}
+}

package.json

@@ -26,5 +26,6 @@
     "https://schindler-ag.rwth-aachen.de",
     "10.195.9.248",
     "https://dev1.zit.ph.tum.de",
-    "org2619.chemie.uni-leipzig.de"
+    "https://org2619.chemie.uni-leipzig.de",
+    "https://chemotion.ac.chemie.intern.uni-leipzig.de"
 ]

src/allowed-origins.json

@@ -20,10 +20,11 @@ type DeepPartial<T> = {
 
 const logger = new FifoLogger({
   onChange: (log) => {
-    if (log && ['error', 'fatal'].includes(log.levelLabel) && log?.error) {
-      events.trigger('error', log.error);
+    if (log && ['error', 'fatal', 'warn'].includes(log.levelLabel)) {
+      const error = log?.error || new Error(log?.message);
+      events.trigger('error', error);
       // eslint-disable-next-line no-console
-      console.log(log.error);
+      console.log(error);
     }
   },
 });

src/hooks/useLoadSpectra.ts

@@ -1,16 +1,11 @@
 /** @jsxImportSource @emotion/react */
+import { Dialog, DialogBody } from '@blueprintjs/core';
 import { css } from '@emotion/react';
-import { Modal, useOnOff } from 'react-science/ui';
+import { useOnOff } from 'react-science/ui';
 
 import versionInfo from '../versionInfo';
 
 const styles = css`
-  width: 30vw;
-  min-width: 400px;
-  display: flex;
-  flex-direction: column;
-  user-select: none;
-
   button:focus {
     outline: none;
   }
@@ -25,7 +20,7 @@ const styles = css`
   span.title {
     font-weight: bold;
     color: #ea580c;
-    font-size: 2em;
+    font-size: 1.5em;
   }
 
   a {
@@ -36,34 +31,20 @@ const styles = css`
   a:focus {
     color: #00bcd4;
   }
-
-  .header {
-    span {
-      color: #464646;
-      font-size: 15px;
-      flex: 1;
-      user-select: none;
-    }
-  }
 `;
 
 function AboutUsModal() {
   const [isOpenDialog, openDialog, closeDialog] = useOnOff(false);
   return (
     <>
       <InfoButton onClick={openDialog} />
-      <Modal
-        hasCloseButton
+      <Dialog
         isOpen={isOpenDialog}
-        onRequestClose={closeDialog}
-        maxWidth={1000}
+        onClose={closeDialog}
+        style={{ maxWidth: 1000 }}
+        title="About NMRium react wrapper"
       >
-        <div css={styles}>
-          <Modal.Header>
-            <div className="header">
-              <span>About NMRium react wrapper</span>
-            </div>
-          </Modal.Header>
+        <DialogBody css={styles}>
           <div className="container">
             <span className="title"> NMRium react wrapper</span>
             <Separator />
@@ -77,8 +58,8 @@ function AboutUsModal() {
               GitHub ( https://github.com/NFDI4Chem/nmrium-react-wrapper )
             </a>
           </div>
-        </div>
-      </Modal>
+        </DialogBody>
+      </Dialog>
     </>
   );
 }

src/modal/AboutUsModal.tsx

@@ -11,6 +11,7 @@ export function getNmrXivWorkspace(hidePanelOnLoad = false): InnerWorkspace {
       spectraRendering: 'auto',
       loggingLevel: 'info',
       invert: false,
+      popupLoggingLevel: 'error',
     },
     display: {
       general: {