@the-portland-company/shell 0.76.7 → 0.76.9

package/dist/app-chrome.cjs

@@ -89,6 +89,132 @@ function normalize(s) {
   return s.normalize("NFD").replace(/[̀-ͯ]/g, "").toLowerCase().trim();
 }
 
+// src/active-org.ts
+var ACTIVE_ORG_COOKIE = "politogy_active_org";
+var ACTIVE_ORG_QUERY_PARAM = "org";
+var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function isOrgId(v) {
+  return typeof v === "string" && UUID_RE.test(v.trim());
+}
+function readActiveOrgCookie() {
+  if (typeof document === "undefined") return null;
+  try {
+    const m = document.cookie.match(
+      new RegExp(`(?:^|;\\s*)${ACTIVE_ORG_COOKIE}=([^;]+)`)
+    );
+    const v = m ? decodeURIComponent(m[1]) : null;
+    return isOrgId(v) ? v : null;
+  } catch {
+    return null;
+  }
+}
+function writeActiveOrgCookie(orgId) {
+  if (typeof document === "undefined" || typeof window === "undefined") return;
+  if (!isOrgId(orgId)) return;
+  const host = window.location.hostname;
+  const domainAttr = /(^|\.)politogyvrm\.com$/i.test(host) ? "; Domain=.politogyvrm.com" : "";
+  const secure = window.location.protocol === "https:" ? "; Secure" : "";
+  document.cookie = `${ACTIVE_ORG_COOKIE}=${encodeURIComponent(
+    orgId
+  )}; Path=/; Max-Age=31536000; SameSite=Lax${domainAttr}${secure}`;
+}
+function readActiveOrgFromUrl(search) {
+  if (!search) return null;
+  try {
+    const qs = search.includes("?") ? search.slice(search.indexOf("?") + 1) : search;
+    const v = new URLSearchParams(qs).get(ACTIVE_ORG_QUERY_PARAM);
+    return isOrgId(v) ? v : null;
+  } catch {
+    return null;
+  }
+}
+function resolveActiveOrg(search) {
+  const fromUrl = readActiveOrgFromUrl(
+    (typeof window !== "undefined" ? window.location.search : null)
+  );
+  if (fromUrl) return fromUrl;
+  return readActiveOrgCookie();
+}
+var ORG_ID_QUERY_PARAM = "org_id";
+var ORG_ID_TAIL_LENGTH = 7;
+var LEGACY_ORG_TAIL_LENGTH = 6;
+var TAIL_RE = /^[0-9a-f]{6,7}$/i;
+var AUTH_BASE_URL = "https://auth.politogyvrm.com";
+var AUTH_BASE_URL_STAGING = "https://auth-staging.politogyvrm.com";
+function orgIdTail(orgId) {
+  return isOrgId(orgId) ? orgId.trim().toLowerCase().slice(-ORG_ID_TAIL_LENGTH) : null;
+}
+function isOrgSelector(v) {
+  return typeof v === "string" && (UUID_RE.test(v.trim()) || TAIL_RE.test(v.trim()));
+}
+function matchOrgSelector(selector, orgs) {
+  if (!isOrgSelector(selector)) return null;
+  const sel = selector.trim().toLowerCase();
+  if (UUID_RE.test(sel)) return orgs.find((o) => o.id.toLowerCase() === sel) ?? null;
+  if (sel.length !== ORG_ID_TAIL_LENGTH && sel.length !== LEGACY_ORG_TAIL_LENGTH) return null;
+  const hits = orgs.filter((o) => o.id.toLowerCase().endsWith(sel));
+  return hits.length === 1 ? hits[0] : null;
+}
+function readOrgSelectorFromUrl(search) {
+  if (!search) return null;
+  try {
+    const qs = search.includes("?") ? search.slice(search.indexOf("?") + 1) : search;
+    const params = new URLSearchParams(qs);
+    for (const key of [ORG_ID_QUERY_PARAM, ACTIVE_ORG_QUERY_PARAM]) {
+      const v = params.get(key);
+      if (isOrgSelector(v)) return v.trim().toLowerCase();
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+function orgClaimsFrom(claims) {
+  if (!claims || typeof claims !== "object") return null;
+  const c = claims;
+  if (!isOrgId(c.org_id)) return null;
+  return {
+    orgId: c.org_id.trim().toLowerCase(),
+    orgRole: typeof c.org_role === "string" ? c.org_role : null
+  };
+}
+function authBaseUrl() {
+  if (typeof window !== "undefined" && window.location.hostname.toLowerCase().includes("staging")) {
+    return AUTH_BASE_URL_STAGING;
+  }
+  return AUTH_BASE_URL;
+}
+var ActiveOrgSwitchError = class extends Error {
+  constructor(status, message) {
+    super(message);
+    this.status = status;
+    this.name = "ActiveOrgSwitchError";
+  }
+};
+async function switchActiveOrg(orgId, opts = {}) {
+  if (!isOrgId(orgId)) throw new ActiveOrgSwitchError(400, "org_id must be a full uuid");
+  const doFetch = opts.fetch ?? fetch;
+  const res = await doFetch(`${opts.authBaseUrl ?? authBaseUrl()}/api/active-org`, {
+    method: "POST",
+    credentials: "include",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ org_id: orgId })
+  });
+  if (!res.ok) {
+    let msg = `active-org switch failed (${res.status})`;
+    try {
+      const body = await res.json();
+      if (body?.error) msg = body.error;
+    } catch {
+    }
+    throw new ActiveOrgSwitchError(res.status, msg);
+  }
+  const claims = orgClaimsFrom(await res.json().catch(() => null));
+  if (!claims) throw new ActiveOrgSwitchError(502, "active-org switch returned no org_id");
+  writeActiveOrgCookie(claims.orgId);
+  return claims;
+}
+
 // src/nav-preference.ts
 var NAV_DISPLAY_STORAGE_KEY = "politogy_nav_display";
 var NAV_DISPLAY_COOKIE = "politogy_nav_display";
@@ -2456,6 +2582,11 @@ function useRailCollapse() {
   const collapsible = react.useContext(RailCollapsibleContext);
   return (cls) => collapsible ? cls : "";
 }
+function orgPillLabel(org) {
+  if (org.name) return org.name;
+  if (org.id) return orgIdTail(org.id) ?? "Organization";
+  return "No organizations";
+}
 function OrgIconMark({ org, logoSrc }) {
   const rc = useRailCollapse();
   const src = resolveOrgLogoUrl(org.iconUrl) ?? logoSrc;
@@ -2697,7 +2828,7 @@ function NavSidebar({
                             {
                               title: org.name ?? void 0,
                               className: "truncate text-[12px] font-semibold leading-[1.2]",
-                              children: org.name ?? "No organizations"
+                              children: orgPillLabel(org)
                             }
                           ),
                           org.id && !org.loading ? /* @__PURE__ */ jsxRuntime.jsx(OrgIdCopyButton, { id: org.id }) : null
@@ -2799,7 +2930,7 @@ function NavSidebar({
                           {
                             title: org.name ?? void 0,
                             className: "truncate text-[12px] font-semibold leading-[1.2]",
-                            children: org.name ?? "No organizations"
+                            children: orgPillLabel(org)
                           }
                         ),
                         org.id && !org.loading ? /* @__PURE__ */ jsxRuntime.jsx(OrgIdCopyButton, { id: org.id }) : null
@@ -3850,132 +3981,6 @@ function NavAppShell({
   );
 }
 
-// src/active-org.ts
-var ACTIVE_ORG_COOKIE = "politogy_active_org";
-var ACTIVE_ORG_QUERY_PARAM = "org";
-var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-function isOrgId(v) {
-  return typeof v === "string" && UUID_RE.test(v.trim());
-}
-function readActiveOrgCookie() {
-  if (typeof document === "undefined") return null;
-  try {
-    const m = document.cookie.match(
-      new RegExp(`(?:^|;\\s*)${ACTIVE_ORG_COOKIE}=([^;]+)`)
-    );
-    const v = m ? decodeURIComponent(m[1]) : null;
-    return isOrgId(v) ? v : null;
-  } catch {
-    return null;
-  }
-}
-function writeActiveOrgCookie(orgId) {
-  if (typeof document === "undefined" || typeof window === "undefined") return;
-  if (!isOrgId(orgId)) return;
-  const host = window.location.hostname;
-  const domainAttr = /(^|\.)politogyvrm\.com$/i.test(host) ? "; Domain=.politogyvrm.com" : "";
-  const secure = window.location.protocol === "https:" ? "; Secure" : "";
-  document.cookie = `${ACTIVE_ORG_COOKIE}=${encodeURIComponent(
-    orgId
-  )}; Path=/; Max-Age=31536000; SameSite=Lax${domainAttr}${secure}`;
-}
-function readActiveOrgFromUrl(search) {
-  if (!search) return null;
-  try {
-    const qs = search.includes("?") ? search.slice(search.indexOf("?") + 1) : search;
-    const v = new URLSearchParams(qs).get(ACTIVE_ORG_QUERY_PARAM);
-    return isOrgId(v) ? v : null;
-  } catch {
-    return null;
-  }
-}
-function resolveActiveOrg(search) {
-  const fromUrl = readActiveOrgFromUrl(
-    (typeof window !== "undefined" ? window.location.search : null)
-  );
-  if (fromUrl) return fromUrl;
-  return readActiveOrgCookie();
-}
-var ORG_ID_QUERY_PARAM = "org_id";
-var ORG_ID_TAIL_LENGTH = 7;
-var LEGACY_ORG_TAIL_LENGTH = 6;
-var TAIL_RE = /^[0-9a-f]{6,7}$/i;
-var AUTH_BASE_URL = "https://auth.politogyvrm.com";
-var AUTH_BASE_URL_STAGING = "https://auth-staging.politogyvrm.com";
-function orgIdTail(orgId) {
-  return isOrgId(orgId) ? orgId.trim().toLowerCase().slice(-ORG_ID_TAIL_LENGTH) : null;
-}
-function isOrgSelector(v) {
-  return typeof v === "string" && (UUID_RE.test(v.trim()) || TAIL_RE.test(v.trim()));
-}
-function matchOrgSelector(selector, orgs) {
-  if (!isOrgSelector(selector)) return null;
-  const sel = selector.trim().toLowerCase();
-  if (UUID_RE.test(sel)) return orgs.find((o) => o.id.toLowerCase() === sel) ?? null;
-  if (sel.length !== ORG_ID_TAIL_LENGTH && sel.length !== LEGACY_ORG_TAIL_LENGTH) return null;
-  const hits = orgs.filter((o) => o.id.toLowerCase().endsWith(sel));
-  return hits.length === 1 ? hits[0] : null;
-}
-function readOrgSelectorFromUrl(search) {
-  if (!search) return null;
-  try {
-    const qs = search.includes("?") ? search.slice(search.indexOf("?") + 1) : search;
-    const params = new URLSearchParams(qs);
-    for (const key of [ORG_ID_QUERY_PARAM, ACTIVE_ORG_QUERY_PARAM]) {
-      const v = params.get(key);
-      if (isOrgSelector(v)) return v.trim().toLowerCase();
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-function orgClaimsFrom(claims) {
-  if (!claims || typeof claims !== "object") return null;
-  const c = claims;
-  if (!isOrgId(c.org_id)) return null;
-  return {
-    orgId: c.org_id.trim().toLowerCase(),
-    orgRole: typeof c.org_role === "string" ? c.org_role : null
-  };
-}
-function authBaseUrl() {
-  if (typeof window !== "undefined" && window.location.hostname.toLowerCase().includes("staging")) {
-    return AUTH_BASE_URL_STAGING;
-  }
-  return AUTH_BASE_URL;
-}
-var ActiveOrgSwitchError = class extends Error {
-  constructor(status, message) {
-    super(message);
-    this.status = status;
-    this.name = "ActiveOrgSwitchError";
-  }
-};
-async function switchActiveOrg(orgId, opts = {}) {
-  if (!isOrgId(orgId)) throw new ActiveOrgSwitchError(400, "org_id must be a full uuid");
-  const doFetch = opts.fetch ?? fetch;
-  const res = await doFetch(`${opts.authBaseUrl ?? authBaseUrl()}/api/active-org`, {
-    method: "POST",
-    credentials: "include",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ org_id: orgId })
-  });
-  if (!res.ok) {
-    let msg = `active-org switch failed (${res.status})`;
-    try {
-      const body = await res.json();
-      if (body?.error) msg = body.error;
-    } catch {
-    }
-    throw new ActiveOrgSwitchError(res.status, msg);
-  }
-  const claims = orgClaimsFrom(await res.json().catch(() => null));
-  if (!claims) throw new ActiveOrgSwitchError(502, "active-org switch returned no org_id");
-  writeActiveOrgCookie(claims.orgId);
-  return claims;
-}
-
 // src/lib/breadcrumbs.ts
 function deriveBreadcrumbs(items, pathname, opts) {
   const search = opts?.search ?? (typeof window !== "undefined" ? window.location.search : "");
@@ -4959,9 +4964,15 @@ function TokenChromeStateProvider({
     })),
     [tokenOrg.orgs, fetchedOrgs]
   );
-  const [urlSelector] = react.useState(
+  const [urlSelector, setUrlSelector] = react.useState(
     () => typeof window === "undefined" ? null : readOrgSelectorFromUrl(window.location.search)
   );
+  react.useEffect(() => {
+    if (typeof window === "undefined") return;
+    const onLocationChange = () => setUrlSelector(readOrgSelectorFromUrl(window.location.search));
+    window.addEventListener("popstate", onLocationChange);
+    return () => window.removeEventListener("popstate", onLocationChange);
+  }, []);
   const overrideOrg = react.useMemo(
     () => urlSelector ? matchOrgSelector(urlSelector, orgs)?.id ?? null : null,
     [urlSelector, orgs]
@@ -4987,6 +4998,7 @@ function TokenChromeStateProvider({
     void (async () => {
       try {
         const claims = await switchActiveOrg(id, { authBaseUrl: current.authBaseUrl });
+        setUrlSelector(null);
         try {
           const url = new URL(window.location.href);
           url.searchParams.delete(ACTIVE_ORG_QUERY_PARAM);