Improve opening links in web browser

massalabs · Dec 21, 2023 · a1a3cf0 · a1a3cf0
1 parent 447d339
commit a1a3cf0
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/web/massastation/src/components/SidePanels/Upload/Upload.tsx b/web/massastation/src/components/SidePanels/Upload/Upload.tsx
@@ -7,7 +7,6 @@ import { routeFor } from '../../../utils/utils';
 import { parseForm } from '../../../utils/ParseForm';
 import { useAccountStore } from '../../../store/store';
 import { AccountObject } from '../../../models/AccountModel';
-import { BrowserOpenURL } from '../../../../wailsjs/runtime';
 
 import { URL } from '../../../const/url/url';
 
@@ -31,6 +30,7 @@ import {
 } from '../../../validation/upload';
 import { MASSA_WALLET } from '../../../const/const';
 import { MassaPluginModel } from '@/models';
+import { openInWebBrowser } from '@/custom/openInWebBrowser';
 
 interface IFormError {
   websiteName?: string;
@@ -244,10 +244,7 @@ export default function Upload() {
               ) : (
                 <Button
                   onClick={() =>
-                    // eslint-disable-next-line new-cap
-                    BrowserOpenURL(
-                      'http://station.massa/plugin/massa-labs/massa-wallet/web-app/',
-                    )
+                    openInWebBrowser('/plugin/massa-labs/massa-wallet/web-app/')
                   }
                 >
                   {Intl.t('search.buttons.create-account')}

diff --git a/web/massastation/src/custom/openInWebBrowser.ts b/web/massastation/src/custom/openInWebBrowser.ts
@@ -0,0 +1,16 @@
+import { BrowserOpenURL } from '../../wailsjs/runtime';
+
+// Opens the URL in the default web browser
+// If the URL does not contain the protocol and host parts, we prepend VITE_BASE_API
+export const openInWebBrowser = (url: string) => {
+  if (!url.includes('://')) {
+    if (url.startsWith('/')) {
+      url = `${import.meta.env.VITE_BASE_API}${url}`;
+    } else {
+      url = `${import.meta.env.VITE_BASE_API}/${url}`;
+    }
+  }
+
+  // eslint-disable-next-line new-cap
+  BrowserOpenURL(url);
+};
diff --git a/web/massastation/src/pages/Index/Index.tsx b/web/massastation/src/pages/Index/Index.tsx
@@ -25,7 +25,7 @@ import { useConfigStore } from '@/store/store';
 import { usePost, useResource } from '../../custom/api';
 import { UseQueryResult } from '@tanstack/react-query';
 import { MASSA_WALLET } from '@/const';
-import { BrowserOpenURL } from '../../../wailsjs/runtime/runtime';
+import { openInWebBrowser } from '@/custom/openInWebBrowser';
 
 export function Index() {
   const plugins = useResource<MassaPluginModel[]>('plugin-manager');
@@ -157,9 +157,8 @@ function NestedIndex({
                   iconActive={<WalletActive />}
                   iconInactive={<WalletInactive />}
                   onClickActive={() =>
-                    // eslint-disable-next-line new-cap
-                    BrowserOpenURL(
-                      'http://station.massa/plugin/massa-labs/massa-wallet/web-app/index',
+                    openInWebBrowser(
+                      '/plugin/massa-labs/massa-wallet/web-app/index',
                     )
                   }
                   onClickInactive={() =>

diff --git a/web/massastation/src/pages/Search/DomainModelItem/DomainModelItem.tsx b/web/massastation/src/pages/Search/DomainModelItem/DomainModelItem.tsx
@@ -4,7 +4,7 @@ import { Description } from '@massalabs/react-ui-kit';
 import { HttpStatusCode } from 'axios';
 import { useEffect, useState } from 'react';
 import { FiGlobe } from 'react-icons/fi';
-import { BrowserOpenURL } from '../../../../wailsjs/runtime/runtime';
+import { openInWebBrowser } from '@/custom/openInWebBrowser';
 
 interface DomainModelItemProps {
   website: DomainModel;
@@ -52,8 +52,7 @@ export default function DomainModelItem(props: DomainModelItemProps) {
       title={website.name}
       website={website.name + '.massa'}
       description={website.description}
-      // eslint-disable-next-line new-cap
-      onClick={() => BrowserOpenURL(url)}
+      onClick={() => openInWebBrowser(url)}
     />
   );
 }
diff --git a/web/massastation/src/pages/Store/StationSection/StationPlugin.tsx b/web/massastation/src/pages/Store/StationSection/StationPlugin.tsx
@@ -1,6 +1,5 @@
 import { SyntheticEvent, useEffect } from 'react';
 import { useDelete, usePost } from '@/custom/api';
-import { BrowserOpenURL } from '../../../../wailsjs/runtime';
 
 import {
   Button,
@@ -27,6 +26,7 @@ import {
 import Intl from '@/i18n/i18n';
 
 import { MassaPluginModel, PluginStatus } from '@/models';
+import { openInWebBrowser } from '@/custom/openInWebBrowser';
 
 interface PluginExecuteRequest {
   command: string;
@@ -167,8 +167,7 @@ export function StationPlugin({
           <Button variant="icon">
             <FiArrowUpRight
               onClick={() => {
-                /* Using 'http://station.massa' probably isn't the cleanest thing to do */
-                BrowserOpenURL(`http://station.massa${home}`); // eslint-disable-line new-cap
+                openInWebBrowser(home);
               }}
             />
           </Button>,