@the-portland-company/shell 0.76.0 → 0.76.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.76.1
+
+One chrome read per endpoint per page load. `me`, `notifications` and `communications/fuel-status` each fired twice (Surveys F4 measurement).
+
+- `useChromeMode` reuses the provider's boot `me` when its `account` is the active org, else reads through the de-duped cache. New `useNavChromeDedupedFetch`.
+- `FuelAction` / `NotificationsAction` do not read without an org, and `ChromeTopBarActions` passes the org only after the org list settles.
+- Test: `__tests__/chromeFetchDedupe.test.tsx`.
+
 ## 0.76.0
 
 Auth-owned active org, shell phase (Global-Rules v38, UI-Platform v46; plan `specs/docs/auth-owned-active-org-plan.md` §3.2). Opt-in: no change for apps that do not pass `tokenOrg`.

package/dist/app-chrome.cjs

@@ -538,6 +538,9 @@ function useChromeMe() {
   const ctx = react.useContext(NavChromeContext);
   return { me: ctx?.me ?? null, loaded: ctx?.meLoaded ?? false };
 }
+function useNavChromeDedupedFetch() {
+  return react.useContext(NavChromeContext)?.dedupedFetch ?? null;
+}
 function useNavChromeFetcher() {
   return react.useContext(NavChromeContext)?.fetchJson ?? null;
 }
@@ -865,6 +868,10 @@ function FuelAction({ orgId }) {
   const [error, setError] = react.useState(false);
   react.useEffect(() => {
     let cancelled = false;
+    if (!orgId) {
+      setLoading(false);
+      return;
+    }
     setLoading(true);
     setError(false);
     setFuel(null);
@@ -1100,6 +1107,10 @@ function NotificationsAction({ orgId }) {
   }, [orgId]);
   react.useEffect(() => {
     let cancelled = false;
+    if (!orgId) {
+      setLoading(false);
+      return;
+    }
     setLoading(true);
     setError(false);
     setPayload(null);
@@ -5339,6 +5350,7 @@ function PolitogyAppChrome({
 function ChromeTopBarActions() {
   const state = useChromeState();
   if (!state) return null;
+  const settledOrgId = state.orgsLoading ? null : state.orgId;
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     /* @__PURE__ */ jsxRuntime.jsx(
       TopBarWidgetSlot,
@@ -5348,9 +5360,9 @@ function ChromeTopBarActions() {
         children: /* @__PURE__ */ jsxRuntime.jsx(ChromeDevNotesMenu, {})
       }
     ),
-    /* @__PURE__ */ jsxRuntime.jsx(FuelAction, { orgId: state.orgId }),
+    /* @__PURE__ */ jsxRuntime.jsx(FuelAction, { orgId: settledOrgId }),
     /* @__PURE__ */ jsxRuntime.jsx(SpecOverlayAction, { orgId: state.orgId, orgName: state.orgs.find((o) => o.id === state.orgId)?.name ?? null }),
-    /* @__PURE__ */ jsxRuntime.jsx(NotificationsAction, { orgId: state.orgId }),
+    /* @__PURE__ */ jsxRuntime.jsx(NotificationsAction, { orgId: settledOrgId }),
     /* @__PURE__ */ jsxRuntime.jsx(SupportAction, { orgId: state.orgId, orgs: state.orgs.length ? state.orgs : void 0 })
   ] });
 }
@@ -5437,7 +5449,8 @@ var MODE_DEFS = [
 function useChromeMode(arg = {}) {
   const { fallbackModeId = "relationship", pinnedModeId } = typeof arg === "string" ? { fallbackModeId: arg, pinnedModeId: void 0 } : arg;
   const ctx = react.useContext(ChromeStateContext);
-  const nav = useNavChromeFetcher();
+  const dedupedFetch = useNavChromeDedupedFetch();
+  const { me, loaded: meLoaded } = useChromeMe();
   const orgId = ctx?.orgId ?? null;
   const [entitled, setEntitled] = react.useState(null);
   const [selectedModeId, setSelectedModeId] = react.useState(null);
@@ -5449,9 +5462,14 @@ function useChromeMode(arg = {}) {
     }
   }, []);
   react.useEffect(() => {
-    if (!nav || !orgId) return;
+    if (!dedupedFetch || !orgId || !meLoaded) return;
+    const bootMe = me;
+    if (bootMe && bootMe.account === orgId && bootMe.modes !== void 0) {
+      setEntitled(bootMe.modes ?? null);
+      return;
+    }
     let cancelled = false;
-    nav("me", { headers: { "x-contacts-org": orgId } }).then((data) => {
+    dedupedFetch("me", { headers: { "x-contacts-org": orgId } }, { orgId }).then((data) => {
       if (cancelled) return;
       const modes = data?.modes ?? null;
       setEntitled(modes);
@@ -5460,7 +5478,7 @@ function useChromeMode(arg = {}) {
     return () => {
       cancelled = true;
     };
-  }, [nav, orgId]);
+  }, [dedupedFetch, me, meLoaded, orgId]);
   const options = MODE_DEFS.filter((m) => entitled?.[m.id]);
   const pinned = pinnedModeId ? MODE_DEFS.find((m) => m.id === pinnedModeId) ?? null : null;
   const selected = selectedModeId ? options.find((m) => m.id === selectedModeId) ?? null : null;