@datalayer/core 1.1.41 → 1.1.45

package/lib/components/principal/PrincipalSwitcherMenu.js

@@ -4,14 +4,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Distributed under the terms of the Modified BSD License.
  */
 import { useEffect, useMemo, useState } from 'react';
-import { ActionList, ActionMenu, Box, Button, Label, Text } from '@primer/react';
+import { ActionList, ActionMenu, Box, Button, Label, Text, ThemeProvider, } from '@primer/react';
 import { OrganizationIcon, PeopleIcon, PersonIcon, TriangleDownIcon, } from '@primer/octicons-react';
 import { useCache, useAuthorization } from '../../hooks/index.js';
 import { useCoreStore } from '../../state/index.js';
 import { useIAMStore } from '../../state/substates/index.js';
 import { memberships as fetchMemberships } from '../../api/iam/profile.js';
 import { usePrincipalStore } from '../../hooks/usePrincipalStore.js';
-import { useBillableAccountStore } from '../../hooks/useBillableAccountStore.js';
+import { useBillingEntityStore } from '../../hooks/useBillingEntityStore.js';
 import { useSelectedPrincipal } from '../../hooks/useSelectedPrincipal.js';
 import { DisplayHandle, displayHandleText } from '../display/DisplayHandle.js';
 function truncatePrincipalLabel(label, maxChars) {
@@ -26,13 +26,13 @@ function truncatePrincipalLabel(label, maxChars) {
 }
 /**
  * PrincipalSwitcherMenu — the *only* component allowed to write to the
- * principal store and the billable account store. It keeps both stores in
+ * principal store and the billing entity store. It keeps both stores in
  * sync per the rule:
- *   - selecting a user/org principal → billable account = same user/org
- *   - selecting a team principal     → billable account = the team's parent org
+ *   - selecting a user/org principal → billing entity = same user/org
+ *   - selecting a team principal     → billing entity = the team's parent org
  */
 export function PrincipalSwitcherMenu({ maxLabelChars = 48, fullWidth = true, showClosedBorder = true, }) {
-    const { user, token, iamRunUrl } = useIAMStore();
+    const { user, token, iamUrl } = useIAMStore();
     const { configuration } = useCoreStore();
     const { checkIsPlatformAdmin } = useAuthorization();
     const { useUserOrganizations } = useCache();
@@ -45,17 +45,17 @@ export function PrincipalSwitcherMenu({ maxLabelChars = 48, fullWidth = true, sh
     const selectPersonalPrincipal = usePrincipalStore(state => state.selectPersonalPrincipal);
     const selectOrganizationPrincipal = usePrincipalStore(state => state.selectOrganizationPrincipal);
     const selectTeamPrincipal = usePrincipalStore(state => state.selectTeamPrincipal);
-    const setBillableAccount = useBillableAccountStore(state => state.setBillableAccount);
+    const setBillingEntity = useBillingEntityStore(state => state.setBillingEntity);
     const { selectedPrincipalKind, selectedPrincipalUid, selectedPrincipalHandle, selectedTeamParentOrganizationHandle, } = useSelectedPrincipal();
     const personalUid = user?.uid || user?.id || '';
     const personalHandle = user?.handle || '';
     const selectUser = (uid, handle) => {
         selectPersonalPrincipal(uid, handle);
-        setBillableAccount({ kind: 'user', uid, handle });
+        setBillingEntity({ kind: 'user', uid, handle });
     };
     const selectOrganization = (uid, handle) => {
         selectOrganizationPrincipal(uid, handle);
-        setBillableAccount({ kind: 'organization', uid, handle });
+        setBillingEntity({ kind: 'organization', uid, handle });
     };
     const selectTeam = (team, orgHandle) => {
         if (!team.organizationUid) {
@@ -67,7 +67,7 @@ export function PrincipalSwitcherMenu({ maxLabelChars = 48, fullWidth = true, sh
             organizationUid: team.organizationUid,
             organizationHandle: orgHandle,
         });
-        setBillableAccount({
+        setBillingEntity({
             kind: 'organization',
             uid: team.organizationUid,
             handle: orgHandle,
@@ -85,7 +85,7 @@ export function PrincipalSwitcherMenu({ maxLabelChars = 48, fullWidth = true, sh
             }
             setTeamsLoading(true);
             try {
-                const baseUrl = iamRunUrl || configuration.iamRunUrl;
+                const baseUrl = iamUrl || configuration.iamUrl;
                 const response = await fetchMemberships(token, baseUrl);
                 const rawMemberships = Array.isArray(response?.memberships)
                     ? response.memberships
@@ -95,6 +95,8 @@ export function PrincipalSwitcherMenu({ maxLabelChars = 48, fullWidth = true, sh
                     .map((membership) => ({
                     uid: String(membership?.uid || membership?.id || '').trim(),
                     handle: String(membership?.handle || '').trim(),
+                    name: String(membership?.name || '').trim() || undefined,
+                    displayName: String(membership?.display_name || membership?.displayName || '').trim() || undefined,
                     organizationUid: String(membership?.organization_uid || '').trim() || undefined,
                     organizationHandle: String(membership?.organization_handle ||
                         membership?.organization?.handle ||
@@ -120,7 +122,7 @@ export function PrincipalSwitcherMenu({ maxLabelChars = 48, fullWidth = true, sh
         return () => {
             cancelled = true;
         };
-    }, [token, iamRunUrl, configuration.iamRunUrl]);
+    }, [token, iamUrl, configuration.iamUrl]);
     useEffect(() => {
         if (!personalUid || !personalHandle) {
             return;
@@ -132,7 +134,8 @@ export function PrincipalSwitcherMenu({ maxLabelChars = 48, fullWidth = true, sh
         // Keep explicit organization/team selections stable across route transitions,
         // even while memberships/organizations are still loading or temporarily
         // unavailable for a given view.
-        if (selectedPrincipalKind === 'organization' || selectedPrincipalKind === 'team') {
+        if (selectedPrincipalKind === 'organization' ||
+            selectedPrincipalKind === 'team') {
             return;
         }
         if (selectedPrincipalKind === 'personal' &&
@@ -203,122 +206,138 @@ export function PrincipalSwitcherMenu({ maxLabelChars = 48, fullWidth = true, sh
         textTransform: 'lowercase',
         lineHeight: 1.2,
     };
-    return (_jsxs(ActionMenu, { children: [_jsx(ActionMenu.Anchor, { children: showClosedBorder ? (_jsxs(Box, { as: "button", type: "button", "aria-label": "Switch principal", sx: {
-                        width: fullWidth ? '100%' : 'auto',
-                        boxSizing: 'border-box',
-                        px: 2,
-                        py: 2,
-                        fontSize: 0,
-                        display: 'flex',
-                        alignItems: 'center',
-                        justifyContent: 'space-between',
-                        gap: 2,
-                        bg: 'canvas.subtle',
-                        border: '1px solid',
-                        borderColor: 'border.default',
-                        borderRadius: 2,
-                        cursor: 'pointer',
-                        textAlign: 'left',
-                        transition: 'background-color 120ms ease',
-                        ':hover': {
-                            bg: 'canvas.subtle',
-                        },
-                        ':focus-visible': {
-                            bg: 'canvas.subtle',
-                            outline: '2px solid',
-                            outlineColor: 'accent.emphasis',
-                            outlineOffset: '2px',
-                        },
-                    }, children: [_jsx(Box, { sx: {
-                                display: 'inline-flex',
-                                alignItems: 'center',
-                                color: 'fg.muted',
-                                flexShrink: 0,
-                            }, children: selectedPrincipalKind === 'organization' ? (_jsx(OrganizationIcon, { size: 16 })) : selectedPrincipalKind === 'team' ? (_jsx(PeopleIcon, { size: 16 })) : (_jsx(PersonIcon, { size: 16 })) }), _jsx(Box, { sx: { minWidth: 0, flex: 1 }, children: _jsx(Text, { sx: {
-                                    display: 'block',
-                                    color: 'accent.fg',
-                                    fontWeight: 'semibold',
-                                    fontSize: 'inherit',
-                                    whiteSpace: 'nowrap',
-                                    overflow: 'hidden',
-                                    textOverflow: 'ellipsis',
-                                    maxWidth: '100%',
-                                }, children: selectedPrincipalLabelClosed }) }), isPlatformAdmin && isCurrentUserPrincipal ? (_jsx(Box, { sx: {
-                                flexShrink: 0,
-                                display: 'inline-flex',
-                                alignItems: 'center',
-                            }, children: _jsx(Label, { variant: "secondary", size: "small", sx: adminBadgeSx, children: "admin" }) })) : null, _jsx(Box, { sx: {
-                                display: 'inline-flex',
-                                alignItems: 'center',
-                                color: 'fg.muted',
-                                flexShrink: 0,
-                                ml: isPlatformAdmin && isCurrentUserPrincipal ? 1 : 0,
-                            }, children: _jsx(TriangleDownIcon, { size: 12 }) })] })) : (_jsx(Button, { variant: "invisible", size: "small", "aria-label": "Switch principal", trailingVisual: TriangleDownIcon, sx: {
-                        maxWidth: fullWidth ? '100%' : ['200px', '260px', '360px'],
-                        width: fullWidth ? '100%' : 'auto',
-                    }, children: _jsxs(Box, { sx: {
-                            display: 'inline-flex',
+    return (_jsx(ThemeProvider, { children: _jsxs(ActionMenu, { children: [_jsx(ActionMenu.Anchor, { children: showClosedBorder ? (_jsxs(Box, { as: "button", type: "button", "aria-label": "Switch principal", sx: {
+                            width: fullWidth ? '100%' : 'auto',
+                            boxSizing: 'border-box',
+                            px: 2,
+                            py: 2,
+                            fontSize: 0,
+                            display: 'flex',
                             alignItems: 'center',
-                            gap: 1,
-                            minWidth: 0,
+                            justifyContent: 'space-between',
+                            gap: 2,
+                            bg: 'canvas.subtle',
+                            border: '1px solid',
+                            borderColor: 'border.default',
+                            borderRadius: 2,
+                            cursor: 'pointer',
+                            textAlign: 'left',
+                            transition: 'background-color 120ms ease',
+                            ':hover': {
+                                bg: 'canvas.subtle',
+                            },
+                            ':focus-visible': {
+                                bg: 'canvas.subtle',
+                                outline: '2px solid',
+                                outlineColor: 'accent.emphasis',
+                                outlineOffset: '2px',
+                            },
                         }, children: [_jsx(Box, { sx: {
                                     display: 'inline-flex',
                                     alignItems: 'center',
                                     color: 'fg.muted',
                                     flexShrink: 0,
-                                }, children: selectedPrincipalKind === 'organization' ? (_jsx(OrganizationIcon, { size: 16 })) : selectedPrincipalKind === 'team' ? (_jsx(PeopleIcon, { size: 16 })) : (_jsx(PersonIcon, { size: 16 })) }), _jsx(Box, { sx: {
-                                    minWidth: 0,
-                                    overflow: 'hidden',
-                                    textOverflow: 'ellipsis',
-                                    whiteSpace: 'nowrap',
-                                }, children: _jsx(Text, { sx: {
+                                }, children: selectedPrincipalKind === 'organization' ? (_jsx(PeopleIcon, { size: 16 })) : selectedPrincipalKind === 'team' ? (_jsx(OrganizationIcon, { size: 16 })) : (_jsx(PersonIcon, { size: 16 })) }), _jsx(Box, { sx: { minWidth: 0, flex: 1 }, children: _jsx(Text, { sx: {
+                                        display: 'block',
                                         color: 'accent.fg',
                                         fontWeight: 'semibold',
-                                    }, children: selectedPrincipalLabelClosed }) }), isPlatformAdmin && isCurrentUserPrincipal ? (_jsx(Label, { variant: "secondary", size: "small", sx: adminBadgeSx, children: "admin" })) : null] }) })) }), _jsx(ActionMenu.Overlay, { width: "medium", children: _jsxs(ActionList, { children: [_jsxs(ActionList.Group, { children: [_jsx(ActionList.GroupHeading, { children: "Personal" }), _jsxs(ActionList.Item, { disabled: isCurrentUserPrincipal, selected: isCurrentUserPrincipal, sx: isCurrentUserPrincipal ? selectedItemSx : undefined, onSelect: () => {
-                                        if (isCurrentUserPrincipal) {
-                                            return;
-                                        }
-                                        if (personalUid && personalHandle) {
-                                            selectUser(personalUid, personalHandle);
-                                        }
-                                    }, children: [_jsx(ActionList.LeadingVisual, { children: _jsx(PersonIcon, {}) }), _jsx(DisplayHandle, { handle: personalHandle || 'me' }), isPlatformAdmin ? (_jsx(ActionList.TrailingVisual, { children: _jsx(Label, { variant: "secondary", size: "small", sx: adminBadgeSx, children: "admin" }) })) : null] })] }), _jsxs(ActionList.Group, { children: [_jsx(ActionList.GroupHeading, { children: "Organizations" }), organizations.length === 0 ? (_jsx(ActionList.Item, { disabled: true, children: "No organizations" })) : (organizations.map((organization) => {
-                                    const organizationUid = getOrganizationUid(organization);
-                                    const isCurrentOrganizationPrincipal = selectedPrincipalKind === 'organization' &&
-                                        selectedPrincipalUid === organizationUid;
-                                    return (_jsxs(ActionList.Item, { disabled: isCurrentOrganizationPrincipal, selected: isCurrentOrganizationPrincipal, sx: isCurrentOrganizationPrincipal
-                                            ? selectedItemSx
-                                            : undefined, onSelect: () => {
-                                            if (isCurrentOrganizationPrincipal) {
+                                        fontSize: 'inherit',
+                                        whiteSpace: 'nowrap',
+                                        overflow: 'hidden',
+                                        textOverflow: 'ellipsis',
+                                        maxWidth: '100%',
+                                    }, children: selectedPrincipalLabelClosed }) }), isPlatformAdmin && isCurrentUserPrincipal ? (_jsx(Box, { sx: {
+                                    flexShrink: 0,
+                                    display: 'inline-flex',
+                                    alignItems: 'center',
+                                }, children: _jsx(Label, { variant: "secondary", size: "small", sx: adminBadgeSx, children: "admin" }) })) : null, _jsx(Box, { sx: {
+                                    display: 'inline-flex',
+                                    alignItems: 'center',
+                                    color: 'fg.muted',
+                                    flexShrink: 0,
+                                    ml: isPlatformAdmin && isCurrentUserPrincipal ? 1 : 0,
+                                }, children: _jsx(TriangleDownIcon, { size: 12 }) })] })) : (_jsx(Button, { variant: "invisible", size: "small", "aria-label": "Switch principal", trailingVisual: TriangleDownIcon, sx: {
+                            maxWidth: fullWidth ? '100%' : ['200px', '260px', '360px'],
+                            width: fullWidth ? '100%' : 'auto',
+                        }, children: _jsxs(Box, { sx: {
+                                display: 'inline-flex',
+                                alignItems: 'center',
+                                gap: 1,
+                                minWidth: 0,
+                            }, children: [_jsx(Box, { sx: {
+                                        display: 'inline-flex',
+                                        alignItems: 'center',
+                                        color: 'fg.muted',
+                                        flexShrink: 0,
+                                    }, children: selectedPrincipalKind === 'organization' ? (_jsx(PeopleIcon, { size: 16 })) : selectedPrincipalKind === 'team' ? (_jsx(OrganizationIcon, { size: 16 })) : (_jsx(PersonIcon, { size: 16 })) }), _jsx(Box, { sx: {
+                                        minWidth: 0,
+                                        overflow: 'hidden',
+                                        textOverflow: 'ellipsis',
+                                        whiteSpace: 'nowrap',
+                                    }, children: _jsx(Text, { sx: {
+                                            color: 'accent.fg',
+                                            fontWeight: 'semibold',
+                                        }, children: selectedPrincipalLabelClosed }) }), isPlatformAdmin && isCurrentUserPrincipal ? (_jsx(Label, { variant: "secondary", size: "small", sx: adminBadgeSx, children: "admin" })) : null] }) })) }), _jsx(ActionMenu.Overlay, { width: "large", children: _jsxs(ActionList, { children: [_jsxs(ActionList.Group, { children: [_jsx(ActionList.GroupHeading, { children: "Personal" }), _jsxs(ActionList.Item, { disabled: isCurrentUserPrincipal, selected: isCurrentUserPrincipal, sx: isCurrentUserPrincipal ? selectedItemSx : undefined, onSelect: () => {
+                                            if (isCurrentUserPrincipal) {
                                                 return;
                                             }
-                                            if (organizationUid && organization.handle) {
-                                                selectOrganization(organizationUid, organization.handle);
-                                            }
-                                        }, children: [_jsx(ActionList.LeadingVisual, { children: _jsx(OrganizationIcon, {}) }), _jsx(Box, { as: "span", title: displayHandleText(organization.handle), sx: {
-                                                    display: 'block',
-                                                    minWidth: 0,
-                                                    overflow: 'hidden',
-                                                    textOverflow: 'ellipsis',
-                                                    whiteSpace: 'nowrap',
-                                                }, children: _jsx(DisplayHandle, { handle: organization.handle }) })] }, organizationUid));
-                                }))] }), _jsxs(ActionList.Group, { children: [_jsx(ActionList.GroupHeading, { children: "Teams" }), teams.length === 0 ? (_jsx(ActionList.Item, { disabled: true, children: "No teams" })) : (teams.map(team => {
-                                    const isCurrentTeamPrincipal = selectedPrincipalKind === 'team' &&
-                                        selectedPrincipalUid === team.uid;
-                                    const orgHandle = resolveTeamOrganizationHandle(team) ||
-                                        personalHandle ||
-                                        'organization';
-                                    return (_jsxs(ActionList.Item, { disabled: isCurrentTeamPrincipal, selected: isCurrentTeamPrincipal, sx: isCurrentTeamPrincipal ? selectedItemSx : undefined, onSelect: () => {
-                                            if (isCurrentTeamPrincipal) {
-                                                return;
+                                            if (personalUid && personalHandle) {
+                                                selectUser(personalUid, personalHandle);
                                             }
-                                            selectTeam(team, orgHandle);
-                                        }, children: [_jsx(ActionList.LeadingVisual, { children: _jsx(PeopleIcon, {}) }), _jsxs(Box, { as: "span", title: `${displayHandleText(orgHandle)}/${displayHandleText(team.handle, { withAt: false })}`, sx: {
+                                        }, children: [_jsx(ActionList.LeadingVisual, { children: _jsx(PersonIcon, {}) }), _jsxs(Box, { as: "span", sx: {
                                                     display: 'block',
                                                     minWidth: 0,
                                                     overflow: 'hidden',
                                                     textOverflow: 'ellipsis',
                                                     whiteSpace: 'nowrap',
-                                                }, children: [_jsx(DisplayHandle, { handle: orgHandle }), "/", _jsx(DisplayHandle, { handle: team.handle, withAt: false })] })] }, team.uid));
-                                }))] })] }) })] }));
+                                                }, children: [String(user?.friendlyName ||
+                                                        user?.displayName ||
+                                                        personalHandle ||
+                                                        'Me').trim(), _jsxs(Box, { as: "span", sx: { color: 'fg.muted' }, children: [' ', "\u00B7 ", _jsx(DisplayHandle, { handle: personalHandle || 'me' })] })] }), isPlatformAdmin ? (_jsx(ActionList.TrailingVisual, { children: _jsx(Label, { variant: "secondary", size: "small", sx: adminBadgeSx, children: "admin" }) })) : null] })] }), _jsxs(ActionList.Group, { children: [_jsx(ActionList.GroupHeading, { children: "Organizations" }), organizations.length === 0 ? (_jsx(ActionList.Item, { disabled: true, children: "No organizations" })) : (organizations.map((organization) => {
+                                        const organizationUid = getOrganizationUid(organization);
+                                        const isCurrentOrganizationPrincipal = selectedPrincipalKind === 'organization' &&
+                                            selectedPrincipalUid === organizationUid;
+                                        return (_jsxs(ActionList.Item, { disabled: isCurrentOrganizationPrincipal, selected: isCurrentOrganizationPrincipal, sx: isCurrentOrganizationPrincipal
+                                                ? selectedItemSx
+                                                : undefined, onSelect: () => {
+                                                if (isCurrentOrganizationPrincipal) {
+                                                    return;
+                                                }
+                                                if (organizationUid && organization.handle) {
+                                                    selectOrganization(organizationUid, organization.handle);
+                                                }
+                                            }, children: [_jsx(ActionList.LeadingVisual, { children: _jsx(PeopleIcon, {}) }), _jsxs(Box, { as: "span", title: displayHandleText(organization.handle), sx: {
+                                                        display: 'block',
+                                                        minWidth: 0,
+                                                        overflow: 'hidden',
+                                                        textOverflow: 'ellipsis',
+                                                        whiteSpace: 'nowrap',
+                                                    }, children: [String(organization?.display_name ||
+                                                            organization?.displayName ||
+                                                            organization?.name ||
+                                                            organization?.handle ||
+                                                            'Organization').trim(), _jsxs(Box, { as: "span", sx: { color: 'fg.muted' }, children: [' ', "\u00B7 ", _jsx(DisplayHandle, { handle: organization.handle })] })] })] }, organizationUid));
+                                    }))] }), _jsxs(ActionList.Group, { children: [_jsx(ActionList.GroupHeading, { children: "Teams" }), teams.length === 0 ? (_jsx(ActionList.Item, { disabled: true, children: "No teams" })) : (teams.map(team => {
+                                        const isCurrentTeamPrincipal = selectedPrincipalKind === 'team' &&
+                                            selectedPrincipalUid === team.uid;
+                                        const orgHandle = resolveTeamOrganizationHandle(team) ||
+                                            personalHandle ||
+                                            'organization';
+                                        return (_jsxs(ActionList.Item, { disabled: isCurrentTeamPrincipal, selected: isCurrentTeamPrincipal, sx: isCurrentTeamPrincipal ? selectedItemSx : undefined, onSelect: () => {
+                                                if (isCurrentTeamPrincipal) {
+                                                    return;
+                                                }
+                                                selectTeam(team, orgHandle);
+                                            }, children: [_jsx(ActionList.LeadingVisual, { children: _jsx(OrganizationIcon, {}) }), _jsxs(Box, { as: "span", title: `${displayHandleText(orgHandle)}/${displayHandleText(team.handle, { withAt: false })}`, sx: {
+                                                        display: 'block',
+                                                        minWidth: 0,
+                                                        overflow: 'hidden',
+                                                        textOverflow: 'ellipsis',
+                                                        whiteSpace: 'nowrap',
+                                                    }, children: [String(team.displayName ||
+                                                            team.name ||
+                                                            team.handle ||
+                                                            'Team').trim(), _jsxs(Box, { as: "span", sx: { color: 'fg.muted' }, children: [' ', "\u00B7 ", _jsx(DisplayHandle, { handle: orgHandle }), "/", _jsx(DisplayHandle, { handle: team.handle, withAt: false })] })] })] }, team.uid));
+                                    }))] })] }) })] }) }));
 }
 export default PrincipalSwitcherMenu;

package/lib/components/sharing/ShareAccessComponent.js

@@ -433,8 +433,8 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
     ]);
     // ----- Derived -----
     const canRequest = Boolean(requestUrl && token);
-    const canSearchPrincipals = Boolean(configuration?.iamRunUrl && token);
-    const iamRunUrl = configuration?.iamRunUrl;
+    const canSearchPrincipals = Boolean(configuration?.iamUrl && token);
+    const iamUrl = configuration?.iamUrl;
     const principalKindsSet = useMemo(() => new Set(principalKinds), [principalKinds]);
     const principalKindsKey = useMemo(() => [...principalKinds].sort().join('|'), [principalKinds]);
     const aclEntries = useMemo(() => buildAclEntries(access, principalKinds), [access, principalKinds]);
@@ -592,14 +592,14 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
     ]);
     // ----- Fetch shareable principals on open -----
     useEffect(() => {
-        if (!isOpen || !canSearchPrincipals || !iamRunUrl || !token) {
+        if (!isOpen || !canSearchPrincipals || !iamUrl || !token) {
             return;
         }
         let cancelled = false;
         const run = async () => {
             setIsLoadingShareable(true);
             try {
-                const response = await fetch(`${iamRunUrl}/api/iam/v1/principals/shareable`, {
+                const response = await fetch(`${iamUrl}/api/iam/v1/principals/shareable`, {
                     method: 'GET',
                     headers: {
                         'Content-Type': 'application/json',
@@ -671,7 +671,7 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
         return () => {
             cancelled = true;
         };
-    }, [isOpen, canSearchPrincipals, iamRunUrl, token, mergePrincipalCacheEntry]);
+    }, [isOpen, canSearchPrincipals, iamUrl, token, mergePrincipalCacheEntry]);
     // ----- Debounce search query -----
     useEffect(() => {
         const timeout = window.setTimeout(() => {
@@ -683,7 +683,7 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
     }, [searchQuery]);
     // ----- Run search against /principals/search -----
     useEffect(() => {
-        if (!isOpen || !canSearchPrincipals || !iamRunUrl || !token) {
+        if (!isOpen || !canSearchPrincipals || !iamUrl || !token) {
             setSearchResults([]);
             return;
         }
@@ -704,7 +704,7 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
                 let response;
                 let payload;
                 try {
-                    response = await fetch(`${iamRunUrl}/api/iam/v1/principals/search`, {
+                    response = await fetch(`${iamUrl}/api/iam/v1/principals/search`, {
                         method: 'POST',
                         headers: {
                             'Content-Type': 'application/json',
@@ -837,7 +837,7 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
     }, [
         isOpen,
         canSearchPrincipals,
-        iamRunUrl,
+        iamUrl,
         token,
         normalizedDebouncedSearch,
         principalKindsKey,
@@ -847,7 +847,7 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
     ]);
     // ----- Hydrate ACL user uids in bulk -----
     useEffect(() => {
-        if (!isOpen || !canSearchPrincipals || !iamRunUrl || !token) {
+        if (!isOpen || !canSearchPrincipals || !iamUrl || !token) {
             return;
         }
         const userUids = Array.from(new Set([
@@ -881,7 +881,7 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
                 return acc;
             }, {}));
             try {
-                const response = await fetch(`${iamRunUrl}/api/iam/v1/users/bulk`, {
+                const response = await fetch(`${iamUrl}/api/iam/v1/users/bulk`, {
                     method: 'POST',
                     headers: {
                         'Content-Type': 'application/json',
@@ -942,7 +942,7 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
     }, [
         isOpen,
         canSearchPrincipals,
-        iamRunUrl,
+        iamUrl,
         token,
         aclEntries,
         ownerPrincipals,
@@ -951,7 +951,7 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
     ]);
     // ----- Hydrate ACL team uids individually -----
     useEffect(() => {
-        if (!isOpen || !canSearchPrincipals || !iamRunUrl || !token) {
+        if (!isOpen || !canSearchPrincipals || !iamUrl || !token) {
             return;
         }
         const unknownTeams = aclEntries.filter(entry => {
@@ -967,7 +967,7 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
         let cancelled = false;
         void Promise.all(unknownTeams.map(async (entry) => {
             try {
-                const response = await fetch(`${iamRunUrl}/api/iam/v1/teams/${encodeURIComponent(entry.uid)}`, {
+                const response = await fetch(`${iamUrl}/api/iam/v1/teams/${encodeURIComponent(entry.uid)}`, {
                     method: 'GET',
                     headers: {
                         'Content-Type': 'application/json',
@@ -1001,7 +1001,7 @@ export function ShareAccessComponent({ isOpen, requestUrl, resourceLabel, resour
     }, [
         isOpen,
         canSearchPrincipals,
-        iamRunUrl,
+        iamUrl,
         token,
         aclEntries,
         principalCache,

package/lib/config/Configuration.d.ts

@@ -12,7 +12,7 @@ export type IDatalayerCoreConfig = {
      * The base URL for the Datalayer platform API.
      * @example "https://prod1.datalayer.run"
      */
-    runUrl: string;
+    datalayerUrl: string;
     /**
      * Datalayer API authentication token.
      * Used for authenticating requests to the Datalayer platform.
@@ -46,51 +46,51 @@ export type IDatalayerCoreConfig = {
     /**
      * IAM API URL.
      */
-    iamRunUrl: string;
+    iamUrl: string;
     /**
      * Runtimes API URL.
      */
-    runtimesRunUrl: string;
+    runtimesUrl: string;
     /**
      * Spacer API URL.
      */
-    spacerRunUrl: string;
+    spacerUrl: string;
     /**
      * Library API URL.
      */
-    libraryRunUrl: string;
+    libraryUrl: string;
     /**
      * AI Agents API URL.
      */
-    aiagentsRunUrl: string;
+    aiAgentsUrl: string;
     /**
      * AI Inference API URL.
      */
-    aiinferenceRunUrl: string;
+    aiInferenceUrl: string;
     /**
      * MCP Servers API URL.
      */
-    mcpserversRunUrl: string;
+    mcpServersUrl: string;
     /**
      * OTEL (OpenTelemetry) API URL.
      */
-    otelRunUrl: string;
+    otelUrl: string;
     /**
      * Growth API URL.
      */
-    growthRunUrl: string;
+    growthUrl: string;
     /**
      * Inbounds API URL.
      */
-    inboundsRunUrl: string;
+    inboundsUrl: string;
     /**
      * Success API URL.
      */
-    successRunUrl: string;
+    successUrl: string;
     /**
      * Support API URL.
      */
-    supportRunUrl: string;
+    supportUrl: string;
     /**
      * Load configuration from server.
      */

package/lib/config/Configuration.js

@@ -26,7 +26,7 @@ export class DatalayerConfiguration {
  * Default configuration values for Datalayer
  */
 export const DEFAULT_DATALAYER_CONFIG = {
-    runUrl: 'https://oss.datalayer.run',
+    datalayerUrl: 'https://oss.datalayer.run',
     credits: 100,
     cpuEnvironment: 'ai-agents-env',
     gpuEnvironment: 'ai-env',
@@ -37,7 +37,7 @@ export const DEFAULT_DATALAYER_CONFIG = {
 export function isDatalayerConfig(config) {
     return (config &&
         typeof config === 'object' &&
-        typeof config.runUrl === 'string' &&
+        typeof config.datalayerUrl === 'string' &&
         typeof config.token === 'string' &&
         typeof config.credits === 'number' &&
         typeof config.cpuEnvironment === 'string' &&
@@ -51,10 +51,10 @@ export function isDatalayerConfig(config) {
 export function mergeConfigWithDefaults(config) {
     if (!config)
         return undefined;
-    // If we have required fields (token and runUrl), merge with defaults for optional fields
-    if (config.token && config.runUrl) {
+    // If we have required fields (token and datalayerUrl), merge with defaults for optional fields
+    if (config.token && config.datalayerUrl) {
         return {
-            runUrl: config.runUrl,
+            datalayerUrl: config.datalayerUrl,
             token: config.token,
             credits: config.credits ?? DEFAULT_DATALAYER_CONFIG.credits,
             cpuEnvironment: config.cpuEnvironment ?? DEFAULT_DATALAYER_CONFIG.cpuEnvironment,

package/lib/hooks/index.d.ts

@@ -28,8 +28,8 @@ export * from './useProjectStore';
 export * from './useMobile';
 export * from './useUsageRefreshStore';
 export * from './usePrincipalStore';
-export * from './useBillableAccountStore';
+export * from './useBillingEntityStore';
 export * from './useSelectedPrincipal';
-export * from './useSelectedBillableAccount';
+export * from './useSelectedBillingEntity';
 export * from './useVisibilityObserver';
 export * from './useWindowSize';

package/lib/hooks/index.js

@@ -33,8 +33,8 @@ export * from './useProjectStore.js';
 export * from './useMobile.js';
 export * from './useUsageRefreshStore.js';
 export * from './usePrincipalStore.js';
-export * from './useBillableAccountStore.js';
+export * from './useBillingEntityStore.js';
 export * from './useSelectedPrincipal.js';
-export * from './useSelectedBillableAccount.js';
+export * from './useSelectedBillingEntity.js';
 export * from './useVisibilityObserver.js';
 export * from './useWindowSize.js';

package/lib/hooks/useBillingEntityStore.d.ts

@@ -0,0 +1,31 @@
+/**
+ * The kind of billing entity currently in scope.
+ *
+ * An account is the *billing* principal — only users and organizations
+ * are accounts. Teams are NOT accounts; when a team is the selected
+ * principal, the billing entity is the team's parent organization.
+ */
+export type BillingEntityKind = 'user' | 'organization';
+export type BillingEntityState = {
+    billingEntityKind: BillingEntityKind;
+    billingEntityUid?: string;
+    billingEntityHandle?: string;
+    setBillingEntity: (args: {
+        kind: BillingEntityKind;
+        uid: string;
+        handle: string;
+    }) => void;
+    resetBillingEntity: () => void;
+};
+export declare const useBillingEntityStore: import("zustand").UseBoundStore<Omit<import("zustand").StoreApi<BillingEntityState>, "persist"> & {
+    persist: {
+        setOptions: (options: Partial<import("zustand/middleware").PersistOptions<BillingEntityState, unknown>>) => void;
+        clearStorage: () => void;
+        rehydrate: () => Promise<void> | void;
+        hasHydrated: () => boolean;
+        onHydrate: (fn: (state: BillingEntityState) => void) => () => void;
+        onFinishHydration: (fn: (state: BillingEntityState) => void) => () => void;
+        getOptions: () => Partial<import("zustand/middleware").PersistOptions<BillingEntityState, unknown>>;
+    };
+}>;
+export default useBillingEntityStore;