@volter/world-console 3.0.1 → 3.0.3

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. */
@@ -611,6 +611,10 @@ function WorldView({ name, token, twin, tab, arg, sub, admin, snapshot, parentTo
 
   const current: Tab = (TABS as readonly string[]).includes(tab) ? (tab as Tab) : 'overview';
   const vendors = twins.state === 'ok' ? twins.data.twins.map((t) => t.twin) : [];
+  // an address naming no vendor of this World (mistyped, or guessed) says so, never shows as a vendor that stores nothing
+  if (twin && twins.state === 'ok' && !vendors.includes(twin)) {
+    return <main className="center"><Empty title={`${name} has no ${twin}`} action={<a href={`${BASE}/${name}`} onClick={(e) => { e.preventDefault(); go(name.split('/')); }}>Open {name}</a>}><p>No vendor of this World is called {twin}. Its changesets are under Changes › History.</p></Empty></main>;
+  }
   const chosen = current === 'vendors' && arg ? arg : undefined;
   const retry = (): void => { setScope('pending'); setAttempt((a) => a + 1); };
   // ALL SCREENS is a canvas app's own page: the whole window, the World's pages a click away (Figma's, tldraw's)
@@ -1791,12 +1795,19 @@ const changesetChanges = (c: ChangesetView): Array<{ twin: string; entry: Entry
  *  here), or a push receipt `confirmed` (the remote performed it). Every action performed is Deployed, some is Partly
  *  deployed; a refused or failed one is said as a failure; otherwise the push decides: every change replayed at the remote
  *  is Pushed (the remote World, never a vendor), else Not sent. */
-function sentOf(c: ChangesetView): { label: string; tone: 'done' | 'good' | 'warn' | 'bad' | 'plain'; performed: number; failed: number; total: number } {
-  const total = c.actions.length;
+/** Whether an action is the World's own (a door, a screen, the gap, the clock or a seed made it): no deploy offers it to
+ *  the vendor (the kernel's settlingEntries), so it is never counted as waiting to be performed. */
+const worldOwn = (a: ChangesetView['actions'][number]): boolean => {
+  const input = ((a.action as { input?: Record<string, unknown> }).input ?? {});
+  return !(typeof input.operationId === 'string' || (input.graphql !== undefined && input.graphql !== null));
+};
+function sentOf(c: ChangesetView): { label: string; tone: 'done' | 'good' | 'warn' | 'bad' | 'plain'; performed: number; failed: number; total: number; own: number } {
+  const own = c.actions.filter(worldOwn).length;
+  const total = c.actions.length - own;
   const pushed = c.applied?.receipts ?? []; const deployed = c.deployed ?? [];
   const performed = new Set([...deployed.filter((r) => r.status === 'deployed'), ...pushed.filter((r) => r.status === 'confirmed')].map((r) => r.actionId)).size;
   const failed = new Set([...deployed.filter((r) => r.status === 'refused' || r.status === 'failed'), ...pushed.filter((r) => r.status === 'failed')].map((r) => r.actionId)).size;
-  const n = { performed, failed, total };
+  const n = { performed, failed, total, own };
   if (total > 0 && performed >= total) return { label: 'Deployed', tone: 'done', ...n };
   if (performed > 0) return { label: `Partly deployed: ${performed} of ${total}`, tone: 'warn', ...n };
   if (failed > 0) return { label: `${failed} refused or failed`, tone: 'bad', ...n };
@@ -1899,7 +1910,7 @@ function ChangesetPage({ name, token, signsAs, c, canWrite, rooted, refused, onC
       <h4>Where it went</h4>
       <div className="block where">
         {sent.performed > 0 ? (
-          <p className="pad">{sent.performed >= sent.total ? 'Deployed' : 'Partly deployed'}: {sent.performed} of {sent.total} change{sent.total === 1 ? '' : 's'} performed at {listed([...new Set([...here.map((r) => r.service), ...receipts.filter((r) => r.status === 'confirmed').map((r) => r.service)].map(vendorName))])}{here.length ? ` (${here.length} from here` : ' ('}{here.length && byRemote ? ', ' : ''}{byRemote ? `${byRemote} by the remote` : ''}).</p>
+          <p className="pad">{sent.performed >= sent.total ? 'Deployed' : 'Partly deployed'}: {sent.performed} of {sent.total} change{sent.total === 1 ? '' : 's'}{sent.own ? ` (and ${sent.own} of the World's own, which stay in it)` : ''} performed at {listed([...new Set([...here.map((r) => r.service), ...receipts.filter((r) => r.status === 'confirmed').map((r) => r.service)].map(vendorName))])}{here.length ? ` (${here.length} from here` : ' ('}{here.length && byRemote ? ', ' : ''}{byRemote ? `${byRemote} by the remote` : ''}).</p>
         ) : sent.label === 'Pushed' ? (
           <p className="pad">Pushed to the remote{there ? <> <code>{there}</code></> : null}{c.applied ? <> · <At iso={c.applied.at} /></> : null}: every change was replayed there. No vendor has performed any of it.</p>
         ) : sent.failed === 0 ? (
@@ -2123,7 +2134,9 @@ function usePushPull(name: string, token: string, tick: number, refused: (r: Res
   };
   const there = origin.state === 'ok' && origin.data.origin ? originAddress(origin.data.origin) : null;
   const changes = diff.state === 'ok' ? diff.data.changes.length : null;
-  const waiting = sets.state === 'ok' ? unpushed(sets.data.changesets).sort((a, b) => a.createdAt.localeCompare(b.createdAt)) : [];
+  // what waits to be pushed: this World's own changesets, and only when it has a remote to push them to (a shared World
+  // holds what others pushed, which is theirs)
+  const waiting = sets.state === 'ok' && there ? unpushed(sets.data.changesets.filter((c) => !c.pushedBy)).sort((a, b) => a.createdAt.localeCompare(b.createdAt)) : [];
   const push = async (): Promise<void> => {
     const b = await send<{ pushed: Array<{ changeset: string; outcome: string; receipts?: Array<{ status: string }>; refusal?: string[] }> }>('Push', 'origin/push', { method: 'POST' });
     if (!b) return;