@the-portland-company/shell 0.99.0 → 0.99.1

package/dist/app-chrome.d.cts

@@ -412,6 +412,13 @@ type ChromeState = {
      * new org's key.
      */
     orgPending: boolean;
+    /**
+     * The un-mapped membership role in the ACTIVE org (e.g. "account_manager"),
+     * for the user card's role label. Apps collapse roles to their own
+     * permission pair, so their `session.role` cannot tell an Account Manager
+     * from a Member. Null when unknown.
+     */
+    activeRawRole?: string | null;
     navDisplay: NavDisplayMode;
     setNavDisplay: (m: NavDisplayMode) => void;
 };

package/dist/app-chrome.d.ts

@@ -412,6 +412,13 @@ type ChromeState = {
      * new org's key.
      */
     orgPending: boolean;
+    /**
+     * The un-mapped membership role in the ACTIVE org (e.g. "account_manager"),
+     * for the user card's role label. Apps collapse roles to their own
+     * permission pair, so their `session.role` cannot tell an Account Manager
+     * from a Member. Null when unknown.
+     */
+    activeRawRole?: string | null;
     navDisplay: NavDisplayMode;
     setNavDisplay: (m: NavDisplayMode) => void;
 };

package/dist/app-chrome.js

@@ -472,6 +472,34 @@ function LoadingScreen({
     }
   );
 }
+
+// src/lib/roleLabel.ts
+var ADMIN_ROLES = /* @__PURE__ */ new Set(["owner", "admin", "account_admin"]);
+var STAFF_ROLES = /* @__PURE__ */ new Set(["super_admin", "super administrator", "politogy_admin"]);
+var MANAGER_ROLES = /* @__PURE__ */ new Set(["account_manager", "account manager", "manager", "campaign_manager"]);
+var FIELD_ROLES = /* @__PURE__ */ new Set([
+  "member",
+  "field_user",
+  "field user",
+  "field",
+  "volunteer",
+  "canvasser",
+  "caller",
+  "staff"
+]);
+var VIEWER_ROLES = /* @__PURE__ */ new Set(["viewer"]);
+function roleLabel(raw) {
+  const role = (raw ?? "").trim().toLowerCase();
+  if (!role) return null;
+  if (ADMIN_ROLES.has(role) || STAFF_ROLES.has(role)) return "Admin";
+  if (MANAGER_ROLES.has(role)) return "Account Manager";
+  if (FIELD_ROLES.has(role)) return "Member";
+  if (VIEWER_ROLES.has(role)) return "Viewer";
+  return null;
+}
+function userCardRole(activeRawRole, appRole) {
+  return roleLabel(activeRawRole) ?? roleLabel(appRole) ?? (appRole?.trim() || null);
+}
 var CORE_APP = "vrm";
 var DEFAULT_SIGN_OUT_URL = "/auth/signout";
 var POLITOGY_APPS = {
@@ -856,7 +884,9 @@ function FrameBody({
             // The chrome API's avatar wins; the app may supply a fallback chain
             // (e.g. a stored memoji) for users with no uploaded photo.
             avatarUrl: identity.avatarUrl ?? data?.fallbackAvatarUrl ?? null,
-            role: session.role
+            // The active org's RAW role wins over the app's collapsed one, so an
+            // Account Manager is not shown as "Member" (Organization-Settings §8.4).
+            role: userCardRole(chrome?.activeRawRole ?? activeCoreOrg?.rawRole, session.role)
           },
           userMenu,
           onSignOut: handleSignOut,
@@ -1044,10 +1074,13 @@ function TokenChromeStateProvider({
       orgs,
       orgsLoading: !tokenOrg.orgs && orgsFetching && !orgsError && !fetchedOrgs,
       orgPending: pendingOrg !== null,
+      // The list's raw role, else the token's `org_role` claim — only while the
+      // token is still for the active org (not mid-switch).
+      activeRawRole: orgs.find((o) => o.id === orgId)?.rawRole ?? (orgId && tokenOrg.orgId === orgId ? tokenOrg.orgRole ?? null : null),
       navDisplay,
       setNavDisplay
     }),
-    [orgId, setOrgId, orgs, tokenOrg.orgs, orgsFetching, orgsError, fetchedOrgs, pendingOrg, navDisplay, setNavDisplay]
+    [orgId, setOrgId, orgs, tokenOrg.orgs, tokenOrg.orgId, tokenOrg.orgRole, orgsFetching, orgsError, fetchedOrgs, pendingOrg, navDisplay, setNavDisplay]
   );
   return /* @__PURE__ */ jsx(ChromeStateContext.Provider, { value, children });
 }
@@ -1201,6 +1234,9 @@ function ChromeStateProvider({
         })),
         orgsLoading: false,
         orgPending: false,
+        // The app's list collapses roles (Contacts: admin | member); the
+        // chrome API's list carries the raw one.
+        activeRawRole: controlledOrg.orgs?.find((o) => o.id === controlledOrg.orgId)?.rawRole ?? orgs?.find((o) => o.id === controlledOrg.orgId)?.rawRole ?? null,
         navDisplay,
         setNavDisplay
       };
@@ -1221,6 +1257,7 @@ function ChromeStateProvider({
       // falls back to the app label rather than shimmering forever.
       orgsLoading: orgsFetching && !orgsError && !orgs,
       orgPending: false,
+      activeRawRole: orgs?.find((o) => o.id === orgId)?.rawRole ?? null,
       navDisplay,
       setNavDisplay
     };