@wildo-ai/saas-frontend-lib 1.1.10 → 1.1.11

package/dist/esm/core/navigation/NavigationContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NavigationContext.d.ts","sourceRoot":"","sources":["../../../../src/core/navigation/NavigationContext.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAA2E,MAAM,OAAO,CAAC;AAIhG,OAAO,EAAwB,kBAAkB,EAAwB,MAAM,uBAAuB,CAAC;AAYvG,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EAEpB,cAAc,EACd,iBAAiB,EAGlB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAgB1E,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,eAAe,CAAC;IAEvB,YAAY,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,mBAAmB,CAAC;IAC5D,YAAY,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,MAAM,CAAC;IAC/C,aAAa,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,iBAAiB,GAAG,SAAS,CAAC;IACvE,WAAW,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,oBAAoB,GAAG,SAAS,CAAC;IACxE,aAAa,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC;IAEjD,yBAAyB,EAAE,MAAM,CAAC;IAClC,sBAAsB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IAErD;;;;OAIG;IACH,WAAW,EAAE,kBAAkB,CAAC;IAChC,cAAc,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAEnD;;;;;;;;;;OAUG;IACH,YAAY,EAAE,CAAC,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAElE;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,cAAc,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C,iBAAiB,EAAE,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,KAAK,IAAI,CAAC;IAE7D;;;;;;;;;;OAUG;IACH,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAEzD;;;;;OAKG;IACH,uBAAuB,EAAE,CAAC,UAAU,EAAE,wBAAwB,EAAE,KAAK,IAAI,CAAC;CAC3E;AAED,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAA+D,CAAC;AAM/I,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,wBAAgB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,EAAE,uBAAuB,GAAG,KAAK,CAAC,YAAY,CA07B5F"}
+{"version":3,"file":"NavigationContext.d.ts","sourceRoot":"","sources":["../../../../../src/core/navigation/NavigationContext.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAA2E,MAAM,OAAO,CAAC;AAKhG,OAAO,EAAwB,kBAAkB,EAAwB,MAAM,uBAAuB,CAAC;AAavG,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EAEpB,cAAc,EACd,iBAAiB,EAGlB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAgB1E,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,eAAe,CAAC;IAEvB,YAAY,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,mBAAmB,CAAC;IAC5D,YAAY,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,MAAM,CAAC;IAC/C,aAAa,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,iBAAiB,GAAG,SAAS,CAAC;IACvE,WAAW,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,oBAAoB,GAAG,SAAS,CAAC;IACxE,aAAa,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC;IAEjD,yBAAyB,EAAE,MAAM,CAAC;IAClC,sBAAsB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IAErD;;;;OAIG;IACH,WAAW,EAAE,kBAAkB,CAAC;IAChC,cAAc,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAEnD;;;;;;;;;;OAUG;IACH,YAAY,EAAE,CAAC,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAElE;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,cAAc,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC1C,iBAAiB,EAAE,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI,KAAK,IAAI,CAAC;IAE7D;;;;;;;;;;OAUG;IACH,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAEzD;;;;;OAKG;IACH,uBAAuB,EAAE,CAAC,UAAU,EAAE,wBAAwB,EAAE,KAAK,IAAI,CAAC;CAC3E;AAED,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAA+D,CAAC;AAM/I,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED,wBAAgB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,EAAE,uBAAuB,GAAG,KAAK,CAAC,YAAY,CAuiC5F"}

package/dist/esm/core/navigation/NavigationContext.js

@@ -15,12 +15,14 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { useEventBus } from '../../core/events/useEventBus.js';
+import { flushHeldNavigationCommit } from './navigation-commit.js';
 import { ResourcePrimaryScope, NavigationZoneName, NavigationTransition } from '@wildo-ai/saas-models';
 import { zoneMutationTargetIndex } from './zone-visible-entry.js';
 import { NavigationUtils } from './navigation.utils.js';
 import { FrontendEvents, } from '../../core/events/events.frontend.schemas.js';
 import { NavigationSource, NavigationZone, NavigationContentType, NAVIGATION_STRUCTURAL_ZONES, } from './navigation.schemas.js';
 import { reconcileCollapsedZones } from './zone-collapse-migration.js';
+import { navigationContentOrganizationId } from './zone-entry-organization.js';
 import { useResourceRegistry } from '../../core/resources/useResourceRegistry.js';
 import { frontendResourceUtils } from '../../core/resources/frontend-resource.utils.js';
 import { useAppScopeSafe } from '../../core/scope/useAppScope.js';
@@ -192,6 +194,42 @@ export function NavigationProvider({ children }) {
             };
         });
     }, []);
+    /**
+     * Remove every entry, from every zone and the overlay, whose content addresses an organization other than
+     * `organizationId` (#2276). Run when the session follows the route into that organization: see the
+     * `PRIMARY_SCOPE_CHANGED` handler below. Entries addressing no organization (an engine page, the settings hub) stay.
+     *
+     * A TABBED zone whose active tab is removed shows the last remaining entry, as a POP does.
+     */
+    const dropEntriesAddressingAnotherOrganization = useCallback((organizationId) => {
+        const addressesAnother = (entry) => {
+            const entryOrganizationId = navigationContentOrganizationId(entry.content);
+            return entryOrganizationId !== null && entryOrganizationId !== organizationId;
+        };
+        setState(prev => {
+            let changed = false;
+            const zones = { ...prev.zones };
+            for (const zone of NAVIGATION_STRUCTURAL_ZONES) {
+                const zoneState = prev.zones[zone];
+                const stack = zoneState.stack.filter(entry => !addressesAnother(entry));
+                if (stack.length === zoneState.stack.length)
+                    continue;
+                changed = true;
+                logDebug('dropEntriesAddressingAnotherOrganization', { zone, dropped: zoneState.stack.length - stack.length, organizationId });
+                const activeTabKept = zoneState.activeTabId === undefined || stack.some(entry => entry.id === zoneState.activeTabId);
+                zones[zone] = {
+                    ...zoneState,
+                    stack,
+                    activeTabId: stack.length === 0 ? undefined : activeTabKept ? zoneState.activeTabId : stack[stack.length - 1].id,
+                    isVisible: stack.length > 0 || zone === NavigationZoneName.PRIMARY,
+                };
+            }
+            const overlay = prev.overlay.filter(entry => !addressesAnother(entry));
+            if (overlay.length !== prev.overlay.length)
+                changed = true;
+            return changed ? { ...prev, zones, overlay } : prev;
+        });
+    }, []);
     // ================================
     // Overlay Stack Helpers
     // ================================
@@ -223,8 +261,19 @@ export function NavigationProvider({ children }) {
     // ================================
     // Event Handlers
     // ================================
+    /**
+     * Subscribes a handler that CHANGES the zone state. Before it applies anything, a navigation commit a shell layout is
+     * still holding (a view transition between the screens, `navigation-commit.ts`) lands first — so a later change of
+     * any origin (a clean break, a dismiss, a back, the router reconciling a URL) is never undone by an earlier commit
+     * landing after it. Every zone-state handler below subscribes through this, which is what makes the order hold
+     * whichever emitter the change came from.
+     */
+    const onZoneStateEvent = useCallback((event, handler) => on(event, (payload) => {
+        flushHeldNavigationCommit();
+        handler(payload);
+    }), [on]);
     useEffect(() => {
-        return on(FrontendEvents.NAVIGATION_PUSH, (payload) => {
+        return onZoneStateEvent(FrontendEvents.NAVIGATION_PUSH, (payload) => {
             logDebug('NAVIGATION_PUSH received', { zone: payload.zone, contentType: payload.content.contentType, urlPath: payload.urlPath, transition: payload.transition });
             const entry = {
                 id: payload.stackEntryId,
@@ -249,9 +298,9 @@ export function NavigationProvider({ children }) {
                 pushEntry(payload.zone, entry);
             }
         });
-    }, [on, pushEntry, pushOverlay]);
+    }, [onZoneStateEvent, pushEntry, pushOverlay]);
     useEffect(() => {
-        return on(FrontendEvents.NAVIGATION_REPLACE, (payload) => {
+        return onZoneStateEvent(FrontendEvents.NAVIGATION_REPLACE, (payload) => {
             logDebug('NAVIGATION_REPLACE received', { zone: payload.zone, contentType: payload.content.contentType, urlPath: payload.urlPath, transition: payload.transition });
             const entry = {
                 id: payload.stackEntryId,
@@ -281,9 +330,9 @@ export function NavigationProvider({ children }) {
                 replaceEntry(payload.zone, entry);
             }
         });
-    }, [on, replaceEntry]);
+    }, [onZoneStateEvent, replaceEntry]);
     useEffect(() => {
-        return on(FrontendEvents.NAVIGATION_POP, (payload) => {
+        return onZoneStateEvent(FrontendEvents.NAVIGATION_POP, (payload) => {
             logDebug('NAVIGATION_POP received', { zone: payload.zone, toStackEntryId: payload.toStackEntryId });
             if (payload.zone === NavigationZone.OVERLAY) {
                 popOverlay(payload.toStackEntryId);
@@ -292,9 +341,9 @@ export function NavigationProvider({ children }) {
                 popEntry(payload.zone, payload.toStackEntryId);
             }
         });
-    }, [on, popEntry, popOverlay]);
+    }, [onZoneStateEvent, popEntry, popOverlay]);
     useEffect(() => {
-        return on(FrontendEvents.NAVIGATION_CLOSE, (payload) => {
+        return onZoneStateEvent(FrontendEvents.NAVIGATION_CLOSE, (payload) => {
             logDebug('NAVIGATION_CLOSE received', { zone: payload.zone, stackEntryId: payload.stackEntryId });
             if (payload.zone === NavigationZone.OVERLAY) {
                 if (payload.stackEntryId) {
@@ -316,13 +365,13 @@ export function NavigationProvider({ children }) {
              * Clearing a structural zone is `NAVIGATION_CLEAR_ZONE`, just below.
              */
         });
-    }, [on, popOverlay, clearOverlay]);
+    }, [onZoneStateEvent, popOverlay, clearOverlay]);
     useEffect(() => {
-        return on(FrontendEvents.NAVIGATION_CLEAR_ZONE, (payload) => {
+        return onZoneStateEvent(FrontendEvents.NAVIGATION_CLEAR_ZONE, (payload) => {
             logDebug('NAVIGATION_CLEAR_ZONE received', { zone: payload.zone, preservePersistent: payload.preservePersistent });
             clearZoneEntries(payload.zone, payload.preservePersistent === true);
         });
-    }, [on, clearZoneEntries]);
+    }, [onZoneStateEvent, clearZoneEntries]);
     /*
      * A URL refresh keeps the entry — id, content, depth — and moves only `urlPath`. It is the
      * reconciler's answer to a VIEW-STATE query change (`?section=` on a board): the destination on
@@ -330,7 +379,7 @@ export function NavigationProvider({ children }) {
      * dependency cleanup (which watches the primary TOP ENTRY, not its URL) stays quiet.
      */
     useEffect(() => {
-        return on(FrontendEvents.NAVIGATION_URL_PATH_UPDATED, (payload) => {
+        return onZoneStateEvent(FrontendEvents.NAVIGATION_URL_PATH_UPDATED, (payload) => {
             logDebug('NAVIGATION_URL_PATH_UPDATED received', { zone: payload.zone, stackEntryId: payload.stackEntryId, urlPath: payload.urlPath });
             setState(prev => {
                 const zoneState = prev.zones[payload.zone];
@@ -347,7 +396,7 @@ export function NavigationProvider({ children }) {
                 };
             });
         });
-    }, [on]);
+    }, [onZoneStateEvent]);
     // ================================
     // Emit NAVIGATION_ZONE_CHANGED after any state mutation
     // ================================
@@ -381,9 +430,16 @@ export function NavigationProvider({ children }) {
     // Zone Dependency Cleanup
     // ================================
     //
-    // When PRIMARY zone content changes (different resource type or operation),
-    // evaluate SECONDARY and COMPANION zones for relevance. If their content no longer
-    // relates to the new PRIMARY content, clear them.
+    // When PRIMARY's top entry changes, evaluate SECONDARY and COMPANION zones for relevance. It runs on
+    // any change except the early returns below: an empty primary, the same entry refreshed, a top that
+    // went home from a collapse, the same record (same type and id), or a scope-addressed operation (any
+    // collection verb, a list or a CREATE among them) of the same type with the same scope. A record replaced by a scope-addressed
+    // operation, or the reverse, always runs it. A PERSISTENT pane is exempt throughout.
+    // - SECONDARY is cleared when it no longer relates to the new PRIMARY content, and a
+    //   non-persistent COMPANION is cleared with it, without a check of its own.
+    // - Otherwise COMPANION is kept when it relates to PRIMARY's content or to the SECONDARY content
+    //   beside it (a record it belongs to, or a collection of its own type with the same parents), and
+    //   cleared when it relates to neither.
     //
     // This ensures dependent zones don't show stale content from a previous context.
     // For example: User views Projects LIST (PRIMARY) → Project Alpha READ (SECONDARY).
@@ -404,7 +460,10 @@ export function NavigationProvider({ children }) {
             return;
         const currTopEntry = currPrimary.stack[currPrimary.stack.length - 1];
         const prevTopEntry = prevPrimary.stack[prevPrimary.stack.length - 1];
-        // If PRIMARY is now empty → clear all dependent zones (handled by org-switch/home click)
+        // An empty PRIMARY gives the panes nothing to be measured against, so this effect leaves them. The
+        // paths that empty primary on purpose clear the dependent zones themselves: the home click through
+        // `navigation-clean-break.frontend.utils.ts`, an organization switch in this provider's
+        // PRIMARY_SCOPE_CHANGED handler below.
         if (!currTopEntry)
             return;
         // The SAME entry — a `urlPath` refresh after a view-state query change — is not a change of
@@ -422,19 +481,31 @@ export function NavigationProvider({ children }) {
         if (prevTopEntry?.collapsedFromZone !== undefined && !currPrimary.stack.some(entry => entry.id === prevTopEntry.id)) {
             return;
         }
-        // If PRIMARY still points at the exact same resource instance, dependency cleanup
-        // can be skipped. Resource type alone is not enough once duplicate edges and
-        // same-type parent chains are in play.
+        // If PRIMARY still points at the same target, dependency cleanup can be skipped. Resource type alone
+        // is not enough once duplicate edges and same-type parent chains are in play.
+        //
+        // A RECORD is the same target when its id is. A SCOPE-addressed operation — any collection verb, a list
+        // or a CREATE among them — has no id of its own: its type slot holds at most ambient scope, so two of them
+        // are the same only when their whole scope is — the todos of one list are not the todos of another (#2115
+        // review), while a CREATE pushed over its own list is that list. And a record is never the same target as
+        // a scope-addressed operation, even when that scope names the record's id: from a unit to the list of its
+        // children is a change. `NavigationUtils.isSameResourceTarget` decides it.
+        //
+        // The scope comparison is by KEY SHAPE, not by meaning: the same list keyed by type (`todoLists`) and by
+        // foreign key (`todoListId`, the cascade's sibling list) compares as different, so the cleanup runs. That
+        // errs safe — running it is a relevance check, and a pane that belongs beside the new primary is kept by
+        // `isContentRelevantToParent`, which reads both shapes. Skipping it wrongly is what leaves stale panes.
         if (prevTopEntry &&
             currTopEntry.content.contentType === NavigationContentType.RESOURCE_OPERATION &&
             prevTopEntry.content.contentType === NavigationContentType.RESOURCE_OPERATION &&
-            currTopEntry.content.resourceContext.resourceType === prevTopEntry.content.resourceContext.resourceType &&
-            frontendResourceUtils.getPrimaryResourceIdentifier(currTopEntry.content.resourceContext) ===
-                frontendResourceUtils.getPrimaryResourceIdentifier(prevTopEntry.content.resourceContext)) {
+            NavigationUtils.isSameResourceTarget(currTopEntry.content.resourceContext, prevTopEntry.content.resourceContext)) {
             return;
         }
         const secondaryState = state.zones[NavigationZoneName.SECONDARY];
         let companionHandled = false;
+        // Whether THIS run cleared SECONDARY: `secondaryState` is the snapshot from before the clear, so the
+        // companion check below must not measure a companion against a pane that is already gone.
+        let secondaryCleared = false;
         if (secondaryState.stack.length > 0) {
             const secondaryTop = secondaryState.stack[secondaryState.stack.length - 1];
             if (secondaryTop) {
@@ -461,6 +532,7 @@ export function NavigationProvider({ children }) {
                             : currTopEntry.content.contentType,
                     });
                     clearZoneEntries(NavigationZoneName.SECONDARY);
+                    secondaryCleared = true;
                     const companionStack = state.zones[NavigationZoneName.COMPANION].stack;
                     const companionTopEntry = companionStack[companionStack.length - 1];
                     if (companionStack.length > 0 && !companionTopEntry?.persistent) {
@@ -474,7 +546,20 @@ export function NavigationProvider({ children }) {
         if (!companionHandled && companionState.stack.length > 0) {
             const companionTop = companionState.stack[companionState.stack.length - 1];
             if (companionTop) {
-                const isRelevant = NavigationUtils.isContentRelevantToParent(companionTop.content, currTopEntry.content);
+                /*
+                 * The companion is the detail of the pane BESIDE it as much as of primary: in a three-pane chain
+                 * (a folder, a thread, a message) it belongs to SECONDARY's record. Measuring it against PRIMARY
+                 * alone cleared a companion whose parent sits in SECONDARY whenever primary held a collection
+                 * rather than the root record — measured on a reloaded depth-2 URL whose root parent had no page
+                 * (#2115). So it is kept when it belongs to either. This only ADDS keeps, and only against a
+                 * SECONDARY this run kept against the new primary (or that is persistent): a SECONDARY cleared just
+                 * above is excluded, so a companion is never kept for a pane that is gone. (A companion reaching
+                 * here after that clear is a PERSISTENT one, which the branch below keeps anyway.)
+                 */
+                const secondaryTop = secondaryCleared ? undefined : secondaryState.stack[secondaryState.stack.length - 1];
+                const isRelevant = NavigationUtils.isContentRelevantToParent(companionTop.content, currTopEntry.content) || (!!secondaryTop
+                    && secondaryTop.content.contentType === NavigationContentType.RESOURCE_OPERATION
+                    && NavigationUtils.isContentRelevantToParent(companionTop.content, secondaryTop.content));
                 /*
                  * ─── A PERSISTENT pane is exempt from the DEPENDENCY cleanup ────────────────────────────
                  *
@@ -742,6 +827,14 @@ export function NavigationProvider({ children }) {
             if (!payload.previousValue) {
                 return;
             }
+            // Skip the session FOLLOWING the route (#2247). The person opened a link into another organization, so
+            // the route is the page they asked for and the session moved to match it, not the other way round.
+            // Resetting here would send them home from the very page that moved the organization. What the previous
+            // organization left in the zones is dropped instead, in the follow's own commit:
+            // `NAVIGATION_ORGANIZATION_FOLLOWED`, below (#2276).
+            if (payload.initiator === ScopeChangeInitiator.ROUTER) {
+                return;
+            }
             // Begin transaction — useRouterSync will skip sync while active.
             // Auto-commits after the current event loop iteration (setTimeout(0)).
             NavigationUtils.beginTransaction('org_switch');
@@ -758,6 +851,20 @@ export function NavigationProvider({ children }) {
         });
     }, [on, clearZoneEntries, clearOverlay, routerNavigate]);
     // ================================
+    // Route organization followed → drop what the previous organization left (#2276)
+    // ================================
+    //
+    // A followed change keeps the page the person opened (no reset to home, see above), but a pane, an overlay or a
+    // backstack entry of the organization they left would now be judged by the new organization's roles and features.
+    // `useRouteOrganizationFollow` emits this in the same effect that commits the organization, so the drop and the
+    // move land in ONE render. A PRIMARY left empty renders the route outlet, which rebuilds the page from the URL.
+    useEffect(() => {
+        return onZoneStateEvent(FrontendEvents.NAVIGATION_ORGANIZATION_FOLLOWED, (payload) => {
+            logDebug('NAVIGATION_ORGANIZATION_FOLLOWED received', { organizationId: payload.organizationId });
+            dropEntriesAddressingAnotherOrganization(payload.organizationId);
+        });
+    }, [onZoneStateEvent, dropEntriesAddressingAnotherOrganization]);
+    // ================================
     // INSPECT Auto-Close (D26)
     // ================================
     //