Bug fixes

hyparam · Jun 6, 2024 · a61cb3d · a61cb3d
1 parent 814c790
commit a61cb3d
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   "scripts": {
     "build": "rollup -c",
     "lint": "eslint src",
-    "serve": "node src/cli.js serve",
+    "serve": "node src/cli.js",
     "test": "vitest run"
   },
   "devDependencies": {

diff --git a/public/HighTable.css b/public/HighTable.css
@@ -104,6 +104,9 @@
   overflow: hidden;
   white-space: nowrap;
 }
+.table td {
+  cursor: pointer;
+}
 
 /* don't hover on mobile */
 @media (hover: hover) {

diff --git a/public/bundle.min.js → public/build/render.min.js b/public/bundle.min.js → public/build/render.min.js
diff --git a/public/build/render.min.js.map b/public/build/render.min.js.map
diff --git a/public/bundle.min.js.map b/public/bundle.min.js.map
diff --git a/public/index.html b/public/index.html
@@ -9,6 +9,6 @@
   </head>
   <body>
     <div id="app"></div>
-    <script type="module" src="/public/bundle.min.js"></script>
+    <script type="module" src="/public/build/render.min.js"></script>
   </body>
 </html>
diff --git a/rollup.config.js b/rollup.config.js
@@ -4,10 +4,11 @@ import replace from '@rollup/plugin-replace'
 import terser from '@rollup/plugin-terser'
 import typescript from '@rollup/plugin-typescript'
 
+
 export default {
   input: 'src/render.js',
   output: {
-    file: 'public/bundle.min.js',
+    file: 'public/build/render.min.js',
     name: 'hyperparam',
     format: 'iife',
     sourcemap: true,

diff --git a/src/Cell.tsx b/src/Cell.tsx
@@ -22,7 +22,7 @@ const editorOptions = {
 /**
  * Cell viewer displays a single cell from a table.
  */
-export default function CellView(): JSX.Element {
+export default function CellView() {
   const [loading, setLoading] = useState<LoadingState>(LoadingState.NotLoaded)
   const [text, setText] = useState<string | undefined>()
   const [error, setError] = useState<Error>()
@@ -61,6 +61,16 @@ export default function CellView(): JSX.Element {
   }, [col, row, loading, setError])
 
   return <Layout error={error} title={key}>
+    <nav className='top-header'>
+      <div className='path'>
+        <a href='/files'>/</a>
+        {key && key.split('/').slice(0, -1).map((sub, depth) =>
+          <a href={`/files/${path.slice(2, depth + 3).join('/')}/`} key={depth}>{sub}/</a>
+        )}
+        <a href={`/files/${key}`}>{path.at(-1)}</a>
+      </div>
+    </nav>
+
     {/* @ts-expect-error MonocoEditor type is wrong? */
       <MonacoEditor
         className='code'

diff --git a/src/File.tsx b/src/File.tsx
@@ -14,6 +14,12 @@ export default function File() {
   const path = location.pathname.split('/')
   const key = decodeURI(path.slice(2).join('/'))
 
+  if (!key.endsWith('.parquet')) {
+    return <Layout error={new Error('Invalid file type')} title={key}>
+      <div className='center'>Invalid file type</div>
+    </Layout>
+  }
+
   // Filename loaded immediately from url, file contents loaded async
   const [loading, setLoading] = useState(false)
 
@@ -33,9 +39,10 @@ export default function File() {
       <nav className='top-header'>
         <div className='path'>
           <a href='/files'>/</a>
-          {key && key.split('/').map((sub, depth) =>
-            <a href={'/files/' + path.slice(2, depth + 3).join('/')} key={depth}>{sub}/</a>
+          {key && key.split('/').slice(0, -1).map((sub, depth) =>
+            <a href={`/files/${path.slice(2, depth + 3).join('/')}/`} key={depth}>{sub}/</a>
           )}
+          <a href={`/files/${key}`}>{path.at(-1)}</a>
         </div>
       </nav>
 

diff --git a/src/Folder.tsx b/src/Folder.tsx
@@ -13,7 +13,7 @@ export default function Folder() {
 
   // Folder path from url
   const path = location.pathname.split('/')
-  const prefix = decodeURI(path.slice(2).join('/'))
+  const prefix = decodeURI(path.slice(2, -1).join('/'))
 
   // Fetch files on component mount
   useEffect(() => {
@@ -35,7 +35,7 @@ export default function Folder() {
         <div className='path'>
           <a href='/files'>/</a>
           {prefix && prefix.split('/').map((sub, depth) =>
-            <a href={'/files/' + path.slice(2, depth + 3).join('/')} key={depth}>{sub}/</a>
+            <a href={`/files/${path.slice(2, depth + 3).join('/')}/`} key={depth}>{sub}/</a>
           )}
         </div>
       </nav>

diff --git a/src/cli.js b/src/cli.js
@@ -2,10 +2,6 @@
 
 if (process.argv[2] === 'chat') {
   import('./chat.js').then(({ chat }) => chat())
-} else if (process.argv[2] === 'serve') {
-  import('./serve.js').then(({ serve }) => serve())
 } else {
-  console.log('usage:')
-  console.log('hyperparam chat')
-  console.log('hyperparam serve')
+  import('./serve.js').then(({ serve }) => serve())
 }
diff --git a/src/tableProvider.ts b/src/tableProvider.ts
@@ -8,7 +8,6 @@ import { readableStreamToArrayBuffer } from './streamConverters.js'
  * Construct a dataframe from a parquet file asynchronously.
  */
 export async function parquetDataFrame(url: string): Promise<DataFrame> {
-  console.log('parquetDataFrame', url)
   const asyncBuffer = await asyncBufferFrom(url)
   // load parquet metadata
   const metadata = await parquetMetadataAsync(asyncBuffer)