Merge pull request #93 from NFDI4Chem/development

fix: load URLs that do not include an extension

Author: vcnainala

src/allowed-origins.json

@@ -16,4 +16,3 @@
     "https://chemotion-01.zdv.uni-mainz.de",
     "https://chemotion.biblio.etc.tu-bs.de"
 ]
-

src/demo/NMRiumWrapperDemo.tsx

@@ -55,6 +55,20 @@ export default function NMRiumWrapperDemo() {
         >
           Test Load from URLS
         </Button.Done>
+
+        <Button.Done
+          style={{ marginRight: '10px' }}
+          onClick={() => {
+            events.trigger('load', {
+              data: [
+                'https://cheminfo.github.io/bruker-data-test/data/zipped/aspirin-1h',
+              ],
+              type: 'url',
+            });
+          }}
+        >
+          Test Load URL without extension
+        </Button.Done>
         <Button.Done
           onClick={async () => {
             const files = await loadFilesFromURLs(['../data/13c.zip']);

src/hooks/useLoadSpectra.ts

@@ -23,12 +23,13 @@ async function loadSpectraFromFiles(files: File[]) {
 async function loadSpectraFromURLs(urls: string[]) {
   const entries = urls.map((url) => {
     const refURL = new URL(url);
-    let name = getFileNameFromURL(url);
+    const name = getFileNameFromURL(url);
+    let path = refURL.pathname;
     const hasExtension = name && name.indexOf('.') !== -1;
     if (!hasExtension) {
-      name = `${name}.zip`;
+      path = `${path}.zip`;
     }
-    return { relativePath: refURL.pathname, baseURL: refURL.origin };
+    return { relativePath: path, baseURL: refURL.origin };
   }, []);
 
   const { data } = await readFromWebSource({ entries });

test-e2e/core.test.ts

@@ -64,3 +64,13 @@ test('should load NMRium from json', async ({ page }) => {
   // if loaded successfully, there should be a 1H and 13C tabs
   await expect(nmrium.page.locator('.tab-list-item >> text=13C')).toBeVisible();
 });
+test('should load NMRium from URL without .zip extension in the path', async ({
+  page,
+}) => {
+  const nmrium = await NmriumWrapperPage.create(page);
+
+  await nmrium.page.click('text=Test Load URL without extension');
+
+  // if loaded successfully, there should be a 1H
+  await expect(nmrium.page.locator('.tab-list-item >> text=1H')).toBeVisible();
+});