#236-update-url

Author: joepio

data-browser/src/components/SideBar/DriveSwitcher.tsx

@@ -1,4 +1,10 @@
-import { classes, Resource, urls, useResources } from '@tomic/react';
+import {
+  classes,
+  Resource,
+  truncateUrl,
+  urls,
+  useResources,
+} from '@tomic/react';
 import React, { useMemo } from 'react';
 import {
   FaCog,
@@ -21,7 +27,8 @@ const Trigger = buildDefaultTrigger(<FaHdd />, 'Open Drive Settings');
 
 function getTitle(resource: Resource): string {
   return (
-    (resource.get(urls.properties.name) as string) ?? resource.getSubject()
+    (resource.get(urls.properties.name) as string) ??
+    truncateUrl(resource.getSubject(), 20)
   );
 }
 

data-browser/src/hooks/useSavedDrives.ts

@@ -4,9 +4,9 @@ import { isDev } from '../config';
 import { useSettings } from '../helpers/AppSettings';
 
 const rootDrives = [
-  window.location.origin,
-  'https://atomicdata.dev',
-  ...(isDev() ? ['http://localhost:9883'] : []),
+  window.location.origin + '/',
+  'https://atomicdata.dev/',
+  ...(isDev() ? ['http://localhost:9883/'] : []),
 ];
 
 const arrayOpts = {

data-browser/src/routes/Routes.tsx

@@ -18,7 +18,8 @@ import ResourcePage from '../views/ResourcePage';
 import { ShareRoute } from './ShareRoute';
 import { Sandbox } from './Sandbox';
 
-const homeURL = window.location.origin;
+/** Server URLs should have a `/` at the end */
+const homeURL = window.location.origin + '/';
 
 const isDev = import.meta.env.MODE === 'development';
 

data-browser/src/routes/SearchRoute.tsx

@@ -81,8 +81,9 @@ export function Search(): JSX.Element {
 
   return (
     <ContainerNarrow ref={htmlElRef}>
-      {error && <ErrorLook>{error.message}</ErrorLook>}
-      {query?.length !== 0 && results.length !== 0 ? (
+      {error ? (
+        <ErrorLook>{error.message}</ErrorLook>
+      ) : query?.length !== 0 && results.length !== 0 ? (
         <>
           <Heading>
             <FaSearch />

lib/src/authentication.ts

@@ -53,6 +53,7 @@ export async function signRequest(
   agent: Agent,
   headers: HeadersObject | Headers,
 ): Promise<HeadersObject> {
+  console.log('sign request', subject);
   const timestamp = getTimestampNow();
 
   if (agent?.subject && !localTryingExternal(subject, agent)) {