@volter/world-console 3.0.2 → 3.0.4

package/client/console.tsx

@@ -535,10 +535,10 @@ const TABS = ['changes', 'events', 'trace', 'vendors', 'screens', 'canvas', 'bra
 type Tab = (typeof TABS)[number] | 'overview';
 /** A workspace screen of a twin's vendor, as its `GET /twin` lists it (Viewing a World). */
 type Workspace = { id: string; path: string };
-/** Where a twin's vendor screens are shown: its first workspace that names no parameter, at the twin's place in the
- *  World; null when it lists none. */
+/** Where a twin's vendor screens are shown: its root workspace (the vendor's home, as a dashboard's root is), else its
+ *  first that names no parameter, at the twin's place in the World; null when it lists none. */
 const screenUrl = (name: string, t: { twin: string; screens?: Workspace[] } | undefined): string | null => {
-  const shown = t?.screens?.find((w) => !/[{<]/.test(w.path));
+  const shown = t?.screens?.find((w) => w.path.replace(/\/+$/, '') === '') ?? t?.screens?.find((w) => !/[{<]/.test(w.path));
   return t && shown ? `${WORLDS}/${name}/${t.twin}${shown.path.startsWith('/') ? shown.path : `/${shown.path}`}` : null;
 };
 /** What an entry did, in words: the thing's kind and the vendor's verb, the thing's own label where it has one. */
@@ -1095,10 +1095,6 @@ function Workspace({ name, token, view, sub, arg, win, who, snapshot, onReturn,
   const diff = useDoor<Diff>(token, `/-/${name}/diff`, every);
   const sets = useDoor<{ changesets: ChangesetView[] }>(token, `/-/${name}/changesets`, every);
   const rules = useDoor<{ changesets: ChangesetRules }>(token, `/-/${name}/rules`, every);
-  // the sites this World's twins answer, each read at `<hostname>.<this World's origin>` (only on a World's own local origin)
-  const sites = useDoor<{ sites: Array<{ twin: string; host: string }> }>(token, `/-/${name}/sites`, every);
-  const siteAt = (host: string): string | null => (/^[^.]+--[^.]+\.localhost$/.test(window.location.hostname) ? `${window.location.protocol}//${host}.${window.location.host}/` : null);
-  const siteLinks = sites.state === 'ok' ? sites.data.sites.flatMap((x) => { const at = siteAt(x.host); return at ? [{ ...x, at }] : []; }) : [];
   const [picked, setPicked] = useState<string | null>(null);
   const to = (parts: string[]) => (e?: React.MouseEvent): void => { e?.preventDefault(); go([...name.split('/'), '~', ...parts]); };
   const vendors = twins.state === 'ok' ? twins.data.twins.map((t) => t.twin) : [];
@@ -1204,8 +1200,6 @@ function Workspace({ name, token, view, sub, arg, win, who, snapshot, onReturn,
           {place((view === 'events' && !arg) || view === 'trace', <Icon name="activity" size={16} />, 'Events', 'events', to(['events']))}
           <p className="side-group">Records</p>
           {vendors.map((v) => <React.Fragment key={v}>{place(view === 'vendor' && arg === v, <Mark vendor={v} />, vendorName(v), `vendors/${v}`, to(['vendors', v]), held(v) ? String(held(v)) : undefined)}</React.Fragment>)}
-          {siteLinks.length ? <p className="side-group">Sites</p> : null}
-          {siteLinks.map((x) => <a key={x.host} href={x.at} target="_blank" rel="noreferrer" title={`${x.host} as ${vendorName(x.twin)} serves it in this World`}><Icon name="globe" size={16} /><span>{x.host}</span><Icon name="external-link" size={14} /></a>)}
           <p className="side-group">Remote</p>
           {place(false, <Icon name="cloud" size={16} />, there ? 'origin' : 'Name a remote…', 'remote', to(['remote']), waiting ? `↑${waiting}` : undefined)}
         </nav>