Add netlify redirects

visdesignlab · Sep 1, 2023 · 05a454c · 05a454c
1 parent c029d82
commit 05a454c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/netlify.toml b/netlify.toml
@@ -16,4 +16,12 @@ VUE_APP_OAUTH_CLIENT_ID = "FKSbPC4GNN31E3a6s6f4Uo96gfNfKcGGcEH3K4vq"
 VITE_MULTINET_HOST = "https://api.multinet.app"
 VITE_OAUTH_API_ROOT = "https://api.multinet.app/oauth/"
 VITE_OAUTH_CLIENT_ID = "FKSbPC4GNN31E3a6s6f4Uo96gfNfKcGGcEH3K4vq"
-VITE_UPLOAD_URL = "https://multinet.app/#/workspaces/Upset%20Examples/"
+VITE_UPLOAD_URL = "https://multinet.app/#/workspaces/Upset%20Examples/"
+
+[[redirects]]
+
+from = "/*"
+
+to = "/index.html"
+
+status = 200
diff --git a/packages/app/src/atoms/queryParamAtom.ts b/packages/app/src/atoms/queryParamAtom.ts
@@ -15,6 +15,10 @@ export const queryParamAtom = selector({
   },
 });
 
+export function getQueryParam() {
+  return window.localStorage.getItem(QUERY_PARAM_KEY);
+}
+
 export function saveQueryParam() {
   const { search } = window.location;
 

diff --git a/packages/app/src/components/Body.tsx b/packages/app/src/components/Body.tsx
@@ -2,7 +2,7 @@ import { Upset } from '@visdesignlab/upset2-react';
 import { UpsetConfig } from '@visdesignlab/upset2-core';
 import { useRecoilValue, useRecoilState } from 'recoil';
 import { encodedDataAtom } from '../atoms/dataAtom';
-import { doesHaveSavedQueryParam, queryParamAtom } from '../atoms/queryParamAtom';
+import { doesHaveSavedQueryParam, queryParamAtom, saveQueryParam } from '../atoms/queryParamAtom';
 import { ErrorModal } from './ErrorModal';
 import { ProvenanceContext } from './Root';
 import { useContext, useEffect } from 'react';
@@ -47,6 +47,10 @@ export const Body = ({ yOffset, data, config }: Props) => {
     return <div>Please click Load Data button to go to data interface.</div>;
   }
 
+  if (data.setColumns.length > 0) {
+    saveQueryParam();
+  }
+
   return (
     <div>
       { data.setColumns.length === 0 ?

diff --git a/packages/app/src/components/Header/index.tsx b/packages/app/src/components/Header/index.tsx
@@ -10,7 +10,7 @@ import { AppBar, Avatar, Box, Button, ButtonGroup, IconButton, Menu, MenuItem, T
 import { useRecoilValue, useRecoilState } from 'recoil';
 import React, { useContext, useEffect, useState } from 'react';
 import { getMultinetDataUrl, oAuth } from '../../atoms/authAtoms';
-import { queryParamAtom } from '../../atoms/queryParamAtom';
+import { getQueryParam, queryParamAtom, saveQueryParam } from '../../atoms/queryParamAtom';
 import { provenanceVisAtom } from '../../atoms/provenanceVisAtom';
 import { elementSidebarAtom } from '../../atoms/elementSidebarAtom';
 import { ProvenanceContext } from '../Root';
@@ -87,6 +87,7 @@ const Header = ({ data }: { data: any }) => {
     localStorage.setItem('rows', JSON.stringify(getAccessibleData(getRows(data, provenance.getState()), true)));
     localStorage.setItem('visibleSets', JSON.stringify(visibleSets));
     localStorage.setItem('hiddenSets', JSON.stringify(hiddenSets));
+    saveQueryParam();
   };
 
   const [ userInfo, setUserInfo ] = useState<UserSpec | null>(null);
@@ -140,7 +141,7 @@ const Header = ({ data }: { data: any }) => {
         <Box sx={{display:'flex', alignItems: 'center', margin: 0, padding: 0}}>
           {data !== null &&
             <>
-              <Link to="/datatable" target="_blank" rel="noreferrer" onClick={dispatchState} style={{textDecoration: "none", color: "inherit"}} aria-label='Open raw and computed data as tables in a new tab'>
+              <Link to={`/datatable${getQueryParam()}`} target="_blank" rel="noreferrer" onClick={dispatchState} style={{textDecoration: "none", color: "inherit"}} aria-label='Open raw and computed data as tables in a new tab'>
                 <Button
                   color="inherit"
                 >