Merge pull request #45 from NFDI4Chem/development

Development

Author: vcnainala

package-lock.json

@@ -14,9 +14,10 @@
   },
   "dependencies": {
     "@emotion/react": "^11.10.4",
-    "nmr-load-save": "^0.2.1",
-    "nmrium": "^0.31.0",
-    "react-router-dom": "^6.4.1"
+    "filelist-utils": "^0.12.0",
+    "nmr-load-save": "^0.3.0",
+    "nmrium": "^0.32.0",
+    "react-router-dom": "^6.4.2"
   },
   "scripts": {
     "start": "vite --host localhost --port 3000  --open",
@@ -37,32 +38,32 @@
     "@babel/plugin-transform-modules-commonjs": "^7.18.6",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
-    "@playwright/test": "^1.26.0",
+    "@playwright/test": "^1.27.1",
     "@simbathesailor/use-what-changed": "^2.0.0",
-    "@types/jest": "^29.0.3",
-    "@types/node": "^18.7.21",
+    "@types/jest": "^29.1.2",
+    "@types/node": "^18.8.5",
     "@types/react": "^18.0.21",
     "@types/react-dom": "^18.0.6",
     "@types/react-router-dom": "^5.3.3",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
+    "@typescript-eslint/eslint-plugin": "^5.40.0",
+    "@typescript-eslint/parser": "^5.40.0",
     "@vitejs/plugin-react": "^2.1.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.24.0",
+    "eslint": "^8.25.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-typescript": "^3.5.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.6.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.31.8",
+    "eslint-plugin-react": "^7.31.10",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jest": "^29.0.3",
+    "jest": "^29.1.2",
     "prettier": "2.7.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "serve": "^14.0.1",
-    "typescript": "^4.8.3",
-    "vite": "^3.1.3"
+    "typescript": "^4.8.4",
+    "vite": "^3.1.8"
   }
-}
+}

package.json

@@ -1,25 +1,33 @@
 import { EventType, EventData } from './types';
+import { isIPAddress } from '../utilities/isIPAddress';
 
 const ALLOWED_ORIGINS: string[] = [
   'https://nmrxiv.org',
   'http://nmrxiv.org',
   'http://localhost',
   'http://localhost:3000',
+  'http://127.0.0.1:',
+  'http://127.0.0.1:3000',
   'http://test.nmrxiv.org',
   'http://193.196.39.168',
   'http://193.196.39.168:3000',
+  'https://nodejsdev.nmrxiv.org',
 ];
 
 const namespace = 'nmr-wrapper';
 
 function parseOrigin(origin: string) {
+  let url: string | null = '';
   const urlSegments = origin.split('://');
-  const hostSegments = urlSegments[1].split('.');
-  const startIndex = hostSegments.length > 2 ? 1 : 0;
-
-  const url = `${urlSegments[0]}://${hostSegments
-    .slice(hostSegments.length > 1 ? startIndex : 0)
-    .join('.')}`;
+  if (isIPAddress(origin)) {
+    url = origin;
+  } else {
+    const hostSegments = urlSegments[1].split('.');
+    const startIndex = hostSegments.length > 2 ? 1 : 0;
+    url = `${urlSegments[0]}://${hostSegments
+      .slice(hostSegments.length > 1 ? startIndex : 0)
+      .join('.')}`;
+  }
 
   return url;
 }

src/events/event.ts

@@ -1,7 +1,6 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-// import { addBruker, addJcamp, addJDF } from 'nmrium/lib/data/SpectraManager';
 import { useCallback, useMemo, useState } from 'react';
 import { read } from 'nmr-load-save';
+import { fileCollectionFromFiles } from 'filelist-utils';
 import { Spectrum } from 'nmr-load-save/lib/types/Spectra/Spectrum';
 import events from '../events';
 import { isArrayOfString } from '../utilities/isArrayOfString';
@@ -30,7 +29,9 @@ export function useLoadSpectra() {
           inputFiles = options.files;
         }
 
-        const { spectra, molecules } = await read(inputFiles);
+        const fileCollection = await fileCollectionFromFiles(inputFiles);
+
+        const { spectra, molecules } = await read(fileCollection);
         setData({ spectra, molecules });
       } catch (error: any) {
         events.trigger('error', error);

src/hooks/useLoadSpectra.ts

@@ -0,0 +1,3 @@
+export function isIPAddress(ip: string) {
+  return /(?:[0-9]{1,3}\.){3}[0-9]{1,3}/.test(ip);
+}

src/utilities/isIPAddress.ts

@@ -26,10 +26,10 @@ test('should load NMRium from external Urls', async ({ page }) => {
   // if loaded successfully, there should be a 1H and 13C tabs
   await test.step('spectra should be loaded', async () => {
     await expect(
-      nmrium.page.locator('_react=InternalTab[tabid = "1H"]'),
+      nmrium.page.locator('.tab-list-item >> text=1H'),
     ).toBeVisible();
     await expect(
-      nmrium.page.locator('_react=InternalTab[tabid = "13C"]'),
+      nmrium.page.locator('.tab-list-item >> text=13C'),
     ).toBeVisible();
   });
 
@@ -45,7 +45,7 @@ test('should load NMRium from Files', async ({ page }) => {
   // if loaded successfully, there should be a 1H and 13C tabs
   await test.step('spectra should be loaded', async () => {
     await expect(
-      nmrium.page.locator('_react=InternalTab[tabid = "13C"]'),
+      nmrium.page.locator('.tab-list-item >> text=13C'),
     ).toBeVisible();
   });
 
@@ -60,7 +60,5 @@ test('should load NMRium from json', async ({ page }) => {
   await nmrium.page.click('text=Test load from json');
 
   // if loaded successfully, there should be a 1H and 13C tabs
-  await expect(
-    nmrium.page.locator('_react=InternalTab[tabid = "13C"]'),
-  ).toBeVisible();
+  await expect(nmrium.page.locator('.tab-list-item >> text=13C')).toBeVisible();
 });

test-e2e/core.test.ts

@@ -6,7 +6,7 @@ export default () => {
     base: './',
     esbuild: {
       jsx: 'automatic',
-      sourcemap: false,
+      sourcemap: true,
     },
     build: {
       sourcemap: true,