Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Bind organization overview and billing to their selected read

pulse-triage[bot]21687d251a54
diff --git a/docs/release-control/v6/internal/subsystems/api-contracts.md b/docs/release-control/v6/internal/subsystems/api-contracts.md
index d0b235aaba..71fcd28268 100644
--- a/docs/release-control/v6/internal/subsystems/api-contracts.md
+++ b/docs/release-control/v6/internal/subsystems/api-contracts.md
@@ -21,6 +21,22 @@
## Purpose
+### Selected organization detail and billing request lifetimes
+
+The existing organization `update` client optionally accepts the same
+`expectedOrgID`, `AbortSignal` and `retry: false` binding as access and sharing.
+It preserves the exact encoded organization path, session preference, body and
+no-implicit-context behaviour. The common API client validates that binding
+again after CSRF preparation and must not dispatch a stale-selection rename.
+License `getStatus` likewise optionally accepts an expected organization,
+cancellation signal, explicit no-retry policy and session preference for the
+existing Billing panel. Unbound callers retain their previous status transport;
+no endpoint, response shape, scope or backend authority changes. Registered
+`orgs.test.ts`, `license.test.ts` and the common transport access tests verify
+the forwarding and pre-dispatch boundaries, with consuming Overview/Billing
+read-generation and adverse-response proof in OrganizationReadLifetimes.
+
+
### Dashboard sockets do not retain withdrawn token authority
The existing `/ws` route keeps its initial authentication, monitoring-read,
diff --git a/docs/release-control/v6/internal/subsystems/cloud-paid.md b/docs/release-control/v6/internal/subsystems/cloud-paid.md
index 90dc67133c..6110786061 100644
--- a/docs/release-control/v6/internal/subsystems/cloud-paid.md
+++ b/docs/release-control/v6/internal/subsystems/cloud-paid.md
@@ -15,6 +15,28 @@
## Purpose
+### Organization billing reads are a selected snapshot, not fallback plan data
+
+The existing Billing & Usage panel displays plan and member figures only after
+all three reads for its current organization succeed. Selection, capability,
+presentation withdrawal and disposal invalidate the generation and abort its
+reads; an older response cannot overwrite the new selection or finish its
+spinner. License status prefers the browser session just as the organization
+reads do, carries the expected organization and cancellation signal, and disables
+automatic retries for this selected read without changing other status callers.
+
+An incomplete or malformed read clears the former snapshot and renders a fixed,
+inline unavailable notice with a deliberate reload of the same selection. It
+must not fabricate a Free plan, zero members, unconfigured email or unlimited
+usage from failed input. Accepted empty member lists still mean zero members.
+Organization-change events refresh the saved snapshot; no purchase, entitlement,
+pricing, plan or hosted-mode authority changes. Normal-suite Billing panel and
+OrganizationReadLifetimes tests cover failed/obsolete reads, A/B/A races,
+withdrawal, disposal and recovery. Desktop/narrow proof consumes actual source
+through the real API client with safe fixtures; it is not installed billing or
+commercial delivery acceptance.
+
+
### Manual licence recovery feedback
The existing Plan page keeps the latest deliberate apply/clear-key result in
diff --git a/docs/release-control/v6/internal/subsystems/organization-settings.md b/docs/release-control/v6/internal/subsystems/organization-settings.md
index 762cc38bc5..47a89e2adf 100644
--- a/docs/release-control/v6/internal/subsystems/organization-settings.md
+++ b/docs/release-control/v6/internal/subsystems/organization-settings.md
@@ -15,6 +15,29 @@
## Purpose
+### Overview reads and name changes belong to the selected organization
+
+Overview clears its accepted metadata, member list and unsaved name when a
+selection, current user, presentation gate or lifetime changes. All reads carry
+one cancellation signal and the expected organization through the existing
+session-preferred API client, with automatic retries disabled. Only the current
+read generation may publish a matching organization and a complete member list;
+a late success, failure or completion cannot replace a newer selection or end
+its loading state. A failed read is an inline unavailable state, never an empty
+member list, and offers an explicit read-only reload.
+
+Renaming requires the current accepted snapshot, owner/admin authority and a
+non-read-only session. Dispatch binds the exact organization even across a CSRF
+wait and permits only one current write, without automatic write retries. A
+withdrawn or disposed completion cannot change data or notify a later selection.
+An unconfirmed write clears the editable snapshot and requires a saved read;
+reload does not repeat the rename. Successful writes notify the existing
+organization-change bus and refresh the saved snapshot. Normal-suite Overview,
+OrganizationReadLifetimes and organization-client tests cover those boundaries;
+desktop/narrow browser proof exercises the actual panels and API client with
+safe HTTP fixtures, not an installed tenant or SSO recovery claim.
+
+
### Saved permissions belong to one open user-access dialog
User Access displays only an admitted saved-permissions read for the principal
diff --git a/frontend-modern/src/api/__tests__/license.test.ts b/frontend-modern/src/api/__tests__/license.test.ts
index 070112a0b2..bb8b1cb967 100644
--- a/frontend-modern/src/api/__tests__/license.test.ts
+++ b/frontend-modern/src/api/__tests__/license.test.ts
@@ -11,6 +11,23 @@ describe('LicenseAPI', () => {
vi.clearAllMocks();
});
+ it('binds a billing status read to the selected session and cancellation signal', async () => {
+ const controller = new AbortController();
+ const options = {
+ expectedOrgID: 'org-a',
+ signal: controller.signal,
+ retry: false as const,
+ preferSessionAuth: true as const,
+ };
+ await LicenseAPI.getStatus(options);
+ expect(apiFetchJSON).toHaveBeenCalledWith('/api/license/status', options);
+ });
+
+ it('keeps unbound status reads unchanged for existing callers', async () => {
+ await LicenseAPI.getStatus();
+ expect(apiFetchJSON).toHaveBeenCalledWith('/api/license/status');
+ });
+
it('reads runtime capabilities from the canonical runtime endpoint', async () => {
vi.mocked(apiFetchJSON).mockResolvedValueOnce({
capabilities: ['relay'],
diff --git a/frontend-modern/src/api/__tests__/orgs.test.ts b/frontend-modern/src/api/__tests__/orgs.test.ts
index a12fd23a65..c8d2963e24 100644
--- a/frontend-modern/src/api/__tests__/orgs.test.ts
+++ b/frontend-modern/src/api/__tests__/orgs.test.ts
@@ -79,6 +79,20 @@ describe('OrgsAPI', () => {
});
});
+ it('binds a name change to its accepted selection with no automatic retry', async () => {
+ const controller = new AbortController();
+ const options = { expectedOrgID: 'org/one', signal: controller.signal, retry: false as const };
+ vi.mocked(apiFetchJSON).mockResolvedValueOnce({ id: 'org/one', displayName: 'Renamed' });
+ await OrgsAPI.update('org/one', { displayName: 'Renamed' }, options);
+ expect(apiFetchJSON).toHaveBeenCalledWith('/api/orgs/org%2Fone', {
+ ...options,
+ method: 'PUT',
+ body: JSON.stringify({ displayName: 'Renamed' }),
+ preferSessionAuth: true,
+ skipOrgContext: true,
+ });
+ });
+
describe('remove', () => {
it('deletes an organization', async () => {
vi.mocked(apiFetchJSON).mockResolvedValueOnce(undefined);
diff --git a/frontend-modern/src/api/license.ts b/frontend-modern/src/api/license.ts
index fb1fd22dda..b2a60ced79 100644
--- a/frontend-modern/src/api/license.ts
+++ b/frontend-modern/src/api/license.ts
@@ -142,8 +142,17 @@ function normalizeRuntimeCapabilities(payload: unknown): LicenseRuntimeCapabilit
export class LicenseAPI {
private static baseUrl = '/api/license';
- static async getStatus(): Promise<LicenseStatus> {
- return apiFetchJSON(`${this.baseUrl}/status`) as Promise<LicenseStatus>;
+ static async getStatus(options?: {
+ expectedOrgID: string;
+ signal: AbortSignal;
+ retry: false;
+ preferSessionAuth: true;
+ }): Promise<LicenseStatus> {
+ return (
+ options
+ ? apiFetchJSON(`${this.baseUrl}/status`, options)
+ : apiFetchJSON(`${this.baseUrl}/status`)
+ ) as Promise<LicenseStatus>;
}
static async getRuntimeCapabilities(): Promise<LicenseRuntimeCapabilities> {
diff --git a/frontend-modern/src/api/orgs.ts b/frontend-modern/src/api/orgs.ts
index b2153608ad..8a1f2f781d 100644
--- a/frontend-modern/src/api/orgs.ts
+++ b/frontend-modern/src/api/orgs.ts
@@ -93,12 +93,17 @@ export const OrgsAPI = {
...options,
}),
- update: (id: string, payload: { displayName: string }) =>
+ update: (
+ id: string,
+ payload: { displayName: string },
+ options?: OrganizationAccessRequestOptions,
+ ) =>
apiFetchJSON<Organization>(`/api/orgs/${encodeURIComponent(id)}`, {
method: 'PUT',
body: JSON.stringify(payload),
preferSessionAuth: true,
skipOrgContext: true,
+ ...options,
}),
remove: (id: string) =>
diff --git a/frontend-modern/src/components/Settings/OrganizationBillingPanel.tsx b/frontend-modern/src/components/Settings/OrganizationBillingPanel.tsx
index 3d84a4443e..83dece444d 100644
--- a/frontend-modern/src/components/Settings/OrganizationBillingPanel.tsx
+++ b/frontend-modern/src/components/Settings/OrganizationBillingPanel.tsx
@@ -1,4 +1,6 @@
import { Component, For, Show } from 'solid-js';
+import { Button } from '@/components/shared/Button';
+import { Card } from '@/components/shared/Card';
import {
ORGANIZATION_SETTINGS_UNAVAILABLE_CLASS,
ORGANIZATION_SETTINGS_UNAVAILABLE_MESSAGE,
@@ -16,8 +18,15 @@ import {
} from './useOrganizationBillingPanelState';
export const OrganizationBillingPanel: Component<OrganizationBillingPanelProps> = (props) => {
- const { commercialPlanModel, commercialUsageModel, isBillingAvailable, loading } =
- useOrganizationBillingPanelState(props);
+ const {
+ commercialPlanModel,
+ commercialUsageModel,
+ isBillingAvailable,
+ loading,
+ loadError,
+ reloadBillingData,
+ selectedOrgID,
+ } = useOrganizationBillingPanelState(props);
return (
<Show
@@ -34,30 +43,46 @@ export const OrganizationBillingPanel: Component<OrganizationBillingPanelProps>
loading={loading()}
loadingFallback={<OrganizationBillingLoadingState />}
>
- <CommercialSection
- title="Plan"
- description="Review the active organization plan, subscription state, and tenant footprint tied to this billing record."
- >
- <CommercialStatGrid columns="four" items={commercialPlanModel().summary} />
+ <Show when={loadError()}>
+ <Card tone="warning" padding="md">
+ <div role="alert" class="space-y-3 text-sm">
+ <p class="font-semibold">Organization billing unavailable</p>
+ <p>{loadError()}</p>
+ <p class="break-words">
+ Reload checks billing and plan details for {selectedOrgID()}.
+ </p>
+ <Button onClick={reloadBillingData} class="w-full sm:w-auto">
+ Reload billing
+ </Button>
+ </div>
+ </Card>
+ </Show>
+ <Show when={!loadError()}>
+ <CommercialSection
+ title="Plan"
+ description="Review the active organization plan, subscription state, and tenant footprint tied to this billing record."
+ >
+ <CommercialStatGrid columns="four" items={commercialPlanModel().summary} />
- <div class="grid gap-3 sm:grid-cols-2">
- <For each={commercialPlanModel().details}>
- {(item) => (
- <div class="rounded-md border border-border p-3">
- <p class="text-xs uppercase tracking-wide text-muted">{item.label}</p>
- <p class="mt-1 text-sm font-medium text-base-content">{item.value}</p>
- </div>
- )}
- </For>
- </div>
- </CommercialSection>
+ <div class="grid gap-3 sm:grid-cols-2">
+ <For each={commercialPlanModel().details}>
+ {(item) => (
+ <div class="rounded-md border border-border p-3">
+ <p class="text-xs uppercase tracking-wide text-muted">{item.label}</p>
+ <p class="mt-1 text-sm font-medium text-base-content">{item.value}</p>
+ </div>
+ )}
+ </For>
+ </div>
+ </CommercialSection>
- <CommercialSection
- title="Usage"
- description="Review current organization usage for billing and support context."
- >
- <CommercialUsageMeters title="Usage" items={commercialUsageModel().meters} />
- </CommercialSection>
+ <CommercialSection
+ title="Usage"
+ description="Review current organization usage for billing and support context."
+ >
+ <CommercialUsageMeters title="Usage" items={commercialUsageModel().meters} />
+ </CommercialSection>
+ </Show>
</CommercialBillingShell>
</div>
</Show>
diff --git a/frontend-modern/src/components/Settings/OrganizationOverviewPanel.tsx b/frontend-modern/src/components/Settings/OrganizationOverviewPanel.tsx
index 54d7d3ec38..a50b00c3f4 100644
--- a/frontend-modern/src/components/Settings/OrganizationOverviewPanel.tsx
+++ b/frontend-modern/src/components/Settings/OrganizationOverviewPanel.tsx
@@ -1,4 +1,6 @@
import { Component, Show } from 'solid-js';
+import { Button } from '@/components/shared/Button';
+import { Card } from '@/components/shared/Card';
import SettingsPanel from '@/components/shared/SettingsPanel';
import { isMultiTenantEnabled } from '@/stores/license';
import { presentationPolicyHidesOrganizationSurfaces } from '@/stores/sessionPresentationPolicy';
@@ -32,7 +34,24 @@ export const OrganizationOverviewPanel: Component<OrganizationOverviewPanelProps
<div class="space-y-6">
<SettingsPanel title="Organization Overview" noPadding bodyClass="divide-y divide-border">
<Show when={!state.loading()} fallback={<OrganizationOverviewLoadingState />}>
- <Show when={state.org()}>
+ <Show when={state.loadError()}>
+ <div class="p-4 sm:p-6">
+ <Card tone="warning" padding="md">
+ <div role="alert" class="space-y-3 text-sm">
+ <p class="font-semibold">Organization details unavailable</p>
+ <p>{state.loadError()}</p>
+ <p class="break-words">
+ Reload checks saved details for {state.selectedOrgID()}. It does not repeat a
+ name change.
+ </p>
+ <Button onClick={state.reloadOrganization} class="w-full sm:w-auto">
+ Reload organization
+ </Button>
+ </div>
+ </Card>
+ </div>
+ </Show>
+ <Show when={!state.loadError() && state.org()}>
<OrganizationOverviewDetailsSection state={state} />
<OrganizationOverviewMembersSection state={state} />
</Show>
diff --git a/frontend-modern/src/components/Settings/__tests__/OrganizationBillingPanel.test.tsx b/frontend-modern/src/components/Settings/__tests__/OrganizationBillingPanel.test.tsx
index 6e5a1743f0..2e31327028 100644
--- a/frontend-modern/src/components/Settings/__tests__/OrganizationBillingPanel.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/OrganizationBillingPanel.test.tsx
@@ -123,6 +123,19 @@ describe('OrganizationBillingPanel', () => {
expect(listMembersMock).toHaveBeenCalledTimes(2);
});
+ it('keeps failed billing reads distinct from an empty or free plan', async () => {
+ getStatusMock.mockRejectedValueOnce(new Error('private upstream detail'));
+ render(() => <OrganizationBillingPanel nodeUsage={5} guestUsage={2} />);
+ expect(await screen.findByRole('alert')).toHaveTextContent(
+ 'Unable to load billing and plan details.',
+ );
+ expect(screen.getByRole('button', { name: 'Reload billing' })).toBeInTheDocument();
+ expect(screen.queryByText('Plan Tier')).not.toBeInTheDocument();
+ expect(screen.queryByText('Not configured')).not.toBeInTheDocument();
+ expect(screen.queryByText('private upstream detail')).not.toBeInTheDocument();
+ expect(errorMock).not.toHaveBeenCalled();
+ });
+
it('keeps organization billing runtime split into dedicated state and loading owners', () => {
expect(organizationBillingPanelSource).toContain('./useOrganizationBillingPanelState');
expect(organizationBillingPanelSource).toContain('./OrganizationBillingLoadingState');
diff --git a/frontend-modern/src/components/Settings/__tests__/OrganizationOverviewPanel.test.tsx b/frontend-modern/src/components/Settings/__tests__/OrganizationOverviewPanel.test.tsx
index 99b907b5b5..34a446b5d5 100644
--- a/frontend-modern/src/components/Settings/__tests__/OrganizationOverviewPanel.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/OrganizationOverviewPanel.test.tsx
@@ -27,6 +27,7 @@ vi.mock('@/stores/license', () => ({
}));
vi.mock('@/stores/sessionPresentationPolicy', () => ({
+ presentationPolicyIsReadOnly: () => false,
presentationPolicyHidesOrganizationSurfaces: (...args: unknown[]) =>
presentationPolicyHidesOrganizationSurfacesMock(...args),
}));
diff --git a/frontend-modern/src/components/Settings/__tests__/OrganizationReadLifetimes.test.tsx b/frontend-modern/src/components/Settings/__tests__/OrganizationReadLifetimes.test.tsx
new file mode 100644
index 0000000000..1a864ffcc2
--- /dev/null
+++ b/frontend-modern/src/components/Settings/__tests__/OrganizationReadLifetimes.test.tsx
@@ -0,0 +1,414 @@
+import { createSignal } from 'solid-js';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { cleanup, fireEvent, render, screen, waitFor } from '@solidjs/testing-library';
+import { OrganizationBillingPanel } from '../OrganizationBillingPanel';
+import { OrganizationOverviewPanel } from '../OrganizationOverviewPanel';
+import { eventBus } from '@/stores/events';
+
+const mocks = vi.hoisted(() => ({
+ status: vi.fn(),
+ list: vi.fn(),
+ members: vi.fn(),
+ get: vi.fn(),
+ update: vi.fn(),
+ success: vi.fn(),
+ error: vi.fn(),
+ log: vi.fn(),
+ enabled: vi.fn(),
+ hidden: vi.fn(),
+ readOnly: vi.fn(),
+ orgID: vi.fn(),
+}));
+vi.mock('@/api/license', () => ({ LicenseAPI: { getStatus: mocks.status } }));
+vi.mock('@/api/orgs', () => ({
+ OrgsAPI: {
+ list: mocks.list,
+ listMembers: mocks.members,
+ get: mocks.get,
+ update: mocks.update,
+ },
+}));
+vi.mock('@/utils/apiClient', () => ({ getOrgID: mocks.orgID }));
+vi.mock('@/stores/license', () => ({ isMultiTenantEnabled: mocks.enabled }));
+vi.mock('@/stores/sessionPresentationPolicy', () => ({
+ presentationPolicyHidesOrganizationSurfaces: mocks.hidden,
+ presentationPolicyIsReadOnly: mocks.readOnly,
+}));
+vi.mock('@/stores/notifications', () => ({
+ notificationStore: { success: mocks.success, error: mocks.error },
+}));
+vi.mock('@/utils/logger', () => ({ logger: { error: mocks.log } }));
+
+const deferred = <T,>() => {
+ let resolve!: (value: T) => void;
+ let reject!: (error?: unknown) => void;
+ const promise = new Promise<T>((yes, no) => {
+ resolve = yes;
+ reject = no;
+ });
+ return { promise, resolve, reject };
+};
+const org = (id: string) => ({ id, displayName: `Organization ${id}`, ownerUserId: 'owner' });
+const members = (id: string) => [{ userId: `${id}-member`, role: 'viewer', addedAt: '' }];
+const status = (id: string) => ({
+ valid: true,
+ tier: 'cloud',
+ is_lifetime: false,
+ days_remaining: 30,
+ features: [],
+ email: `${id}@example.test`,
+});
+let selected = 'org-a';
+let setEnabled!: (value: boolean) => void;
+let setHidden!: (value: boolean) => void;
+let setReadOnly!: (value: boolean) => void;
+const switchOrg = (id: string) => {
+ selected = id;
+ eventBus.emit('org_switched', id);
+};
+const renderBilling = () => render(() => <OrganizationBillingPanel nodeUsage={5} guestUsage={2} />);
+const renderOverview = () => render(() => <OrganizationOverviewPanel currentUser="owner" />);
+const settle = async () => {
+ await new Promise((resolve) => setTimeout(resolve, 0));
+};
+
+beforeEach(() => {
+ Object.values(mocks).forEach((mock) => mock.mockReset());
+ const [enabled, updateEnabled] = createSignal(true);
+ const [hidden, updateHidden] = createSignal(false);
+ const [readOnly, updateReadOnly] = createSignal(false);
+ setEnabled = updateEnabled;
+ setHidden = updateHidden;
+ setReadOnly = updateReadOnly;
+ mocks.enabled.mockImplementation(enabled);
+ mocks.hidden.mockImplementation(hidden);
+ mocks.readOnly.mockImplementation(readOnly);
+ selected = 'org-a';
+ mocks.orgID.mockImplementation(() => selected);
+ mocks.status.mockImplementation(() => Promise.resolve(status(selected)));
+ mocks.list.mockResolvedValue([org('org-a'), org('org-b')]);
+ mocks.members.mockImplementation((id) => Promise.resolve(members(id)));
+ mocks.get.mockImplementation((id) => Promise.resolve(org(id)));
+ mocks.update.mockImplementation((id, payload) => Promise.resolve({ ...org(id), ...payload }));
+});
+afterEach(cleanup);
+
+describe('billing read lifetime', () => {
+ it('binds all three reads to one abortable selection and session preference', async () => {
+ renderBilling();
+ await screen.findByText('[email protected]');
+ const options = mocks.status.mock.calls[0][0];
+ expect(options).toEqual({
+ expectedOrgID: 'org-a',
+ signal: expect.any(AbortSignal),
+ retry: false,
+ preferSessionAuth: true,
+ });
+ expect(mocks.list).toHaveBeenCalledWith(options);
+ expect(mocks.members).toHaveBeenCalledWith('org-a', options);
+ });
+
+ it.each(['status', 'list', 'members'] as const)(
+ 'shows unread, not free/zero, if %s fails',
+ async (key) => {
+ mocks[key].mockRejectedValueOnce(new Error('private upstream credential'));
+ renderBilling();
+ expect(await screen.findByRole('alert')).toHaveTextContent(
+ 'Unable to load billing and plan details.',
+ );
+ expect(screen.queryByText('Plan Tier')).not.toBeInTheDocument();
+ expect(screen.queryByText('Not configured')).not.toBeInTheDocument();
+ expect(screen.queryByText(/private upstream/)).not.toBeInTheDocument();
+ expect(mocks.status.mock.calls[0][0].signal.aborted).toBe(true);
+ },
+ );
+
+ it.each([null, {}, { valid: true }])('rejects malformed status %j', async (payload) => {
+ mocks.status.mockResolvedValueOnce(payload);
+ renderBilling();
+ await screen.findByRole('alert');
+ expect(screen.queryByText('Plan Tier')).not.toBeInTheDocument();
+ });
+
+ it('cannot finish a newer spinner or overwrite B with a late A success', async () => {
+ const a = deferred<ReturnType<typeof status>>();
+ const b = deferred<ReturnType<typeof status>>();
+ mocks.status.mockReturnValueOnce(a.promise).mockReturnValueOnce(b.promise);
+ const { container } = renderBilling();
+ const signalA = mocks.status.mock.calls[0][0].signal;
+ switchOrg('org-b');
+ expect(signalA.aborted).toBe(true);
+ a.resolve(status('org-a'));
+ await settle();
+ expect(
+ container.querySelector('[aria-label="Loading organization billing"]'),
+ ).toBeInTheDocument();
+ expect(screen.queryByText('[email protected]')).not.toBeInTheDocument();
+ b.resolve(status('org-b'));
+ await screen.findByText('[email protected]');
+ });
+
+ it('ignores A failure after B has loaded', async () => {
+ const a = deferred<ReturnType<typeof status>>();
+ mocks.status.mockReturnValueOnce(a.promise);
+ renderBilling();
+ switchOrg('org-b');
+ await screen.findByText('[email protected]');
+ a.reject(new Error('old failure'));
+ await settle();
+ expect(screen.getByText('[email protected]')).toBeInTheDocument();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ expect(mocks.log).not.toHaveBeenCalled();
+ });
+
+ it('rejects first A even after selecting A again', async () => {
+ const first = deferred<ReturnType<typeof status>>();
+ mocks.status.mockReturnValueOnce(first.promise);
+ renderBilling();
+ switchOrg('org-b');
+ switchOrg('org-a');
+ await screen.findByText('[email protected]');
+ first.resolve(status('obsolete'));
+ await settle();
+ expect(screen.queryByText('[email protected]')).not.toBeInTheDocument();
+ expect(screen.getByText('[email protected]')).toBeInTheDocument();
+ });
+
+ it('clears old billing on failed refresh and explicitly reloads accepted empty counts', async () => {
+ renderBilling();
+ await screen.findByText('[email protected]');
+ mocks.members.mockRejectedValueOnce(new Error('denied'));
+ eventBus.emit('organizations_changed');
+ await screen.findByRole('alert');
+ expect(screen.queryByText('[email protected]')).not.toBeInTheDocument();
+ const next = deferred<unknown[]>();
+ mocks.members.mockReturnValueOnce(next.promise);
+ const retry = screen.getByRole('button', { name: 'Reload billing' });
+ fireEvent.click(retry);
+ fireEvent.click(retry);
+ expect(mocks.members).toHaveBeenCalledTimes(3);
+ next.resolve([]);
+ await screen.findByText('[email protected]');
+ const label = screen.getByText('Members (Current Org)');
+ expect(label.parentElement).toHaveTextContent('0');
+ });
+
+ it.each(['capability', 'demo'] as const)(
+ 'invalidates pending data on %s withdrawal and reads afresh on return',
+ async (kind) => {
+ const old = deferred<ReturnType<typeof status>>();
+ mocks.status.mockReturnValueOnce(old.promise);
+ renderBilling();
+ const signal = mocks.status.mock.calls[0][0].signal;
+ if (kind === 'capability') setEnabled(false);
+ else setHidden(true);
+ await screen.findByText('Organization settings are not available on this server.');
+ expect(signal.aborted).toBe(true);
+ old.resolve(status('obsolete'));
+ await settle();
+ if (kind === 'capability') setEnabled(true);
+ else setHidden(false);
+ await screen.findByText('[email protected]');
+ expect(screen.queryByText('[email protected]')).not.toBeInTheDocument();
+ expect(mocks.status).toHaveBeenCalledTimes(2);
+ },
+ );
+
+ it('aborts and detaches listeners on disposal without late feedback', async () => {
+ const old = deferred<ReturnType<typeof status>>();
+ mocks.status.mockReturnValueOnce(old.promise);
+ const view = renderBilling();
+ const signal = mocks.status.mock.calls[0][0].signal;
+ view.unmount();
+ expect(signal.aborted).toBe(true);
+ eventBus.emit('organizations_changed');
+ switchOrg('org-b');
+ old.reject(new Error('late failure'));
+ await settle();
+ expect(mocks.status).toHaveBeenCalledTimes(1);
+ expect(mocks.log).not.toHaveBeenCalled();
+ });
+});
+
+describe('overview read and rename lifetime', () => {
+ it('binds both reads and renders only the matching organization', async () => {
+ renderOverview();
+ await screen.findByLabelText('Display Name');
+ const options = mocks.get.mock.calls[0][1];
+ expect(options).toEqual({
+ expectedOrgID: 'org-a',
+ signal: expect.any(AbortSignal),
+ retry: false,
+ });
+ expect(mocks.members).toHaveBeenCalledWith('org-a', options);
+ });
+
+ it.each(['get', 'members'] as const)(
+ 'shows an explicit error and no retained members when %s fails',
+ async (key) => {
+ renderOverview();
+ await screen.findByText('org-a-member');
+ mocks[key].mockRejectedValueOnce(new Error('private credential'));
+ eventBus.emit('organizations_changed');
+ expect(await screen.findByRole('alert')).toHaveTextContent(
+ 'Unable to load organization details.',
+ );
+ expect(screen.queryByText('org-a-member')).not.toBeInTheDocument();
+ expect(screen.queryByText('No members found.')).not.toBeInTheDocument();
+ expect(screen.queryByLabelText('Display Name')).not.toBeInTheDocument();
+ expect(screen.queryByText(/private credential/)).not.toBeInTheDocument();
+ },
+ );
+
+ it('rejects another organization and malformed member lists', async () => {
+ mocks.get.mockResolvedValueOnce(org('org-b'));
+ renderOverview();
+ await screen.findByRole('alert');
+ mocks.members.mockResolvedValueOnce(null);
+ fireEvent.click(screen.getByRole('button', { name: 'Reload organization' }));
+ await screen.findByRole('alert');
+ expect(screen.queryByLabelText('Display Name')).not.toBeInTheDocument();
+ fireEvent.click(screen.getByRole('button', { name: 'Reload organization' }));
+ await screen.findByLabelText('Display Name');
+ });
+
+ it('cannot finish B loading with late A data', async () => {
+ const a = deferred<ReturnType<typeof org>>();
+ const b = deferred<ReturnType<typeof org>>();
+ mocks.get.mockReturnValueOnce(a.promise).mockReturnValueOnce(b.promise);
+ const { container } = renderOverview();
+ const signal = mocks.get.mock.calls[0][1].signal;
+ switchOrg('org-b');
+ a.resolve(org('org-a'));
+ await settle();
+ expect(signal.aborted).toBe(true);
+ expect(
+ container.querySelector('[aria-label="Loading organization overview"]'),
+ ).toBeInTheDocument();
+ expect(screen.queryByLabelText('Display Name')).not.toBeInTheDocument();
+ b.resolve(org('org-b'));
+ await screen.findByText('org-b-member');
+ expect(screen.getByLabelText('Display Name')).toHaveValue('Organization org-b');
+ });
+
+ it('ignores a late failure and rejects first A after A/B/A', async () => {
+ const first = deferred<ReturnType<typeof org>>();
+ mocks.get.mockReturnValueOnce(first.promise);
+ renderOverview();
+ switchOrg('org-b');
+ switchOrg('org-a');
+ await screen.findByText('org-a-member');
+ first.reject(new Error('obsolete'));
+ await settle();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ expect(mocks.log).not.toHaveBeenCalled();
+ });
+
+ it('clears data and draft when the current user changes', async () => {
+ const [user, setUser] = createSignal('owner');
+ render(() => <OrganizationOverviewPanel currentUser={user()} />);
+ await screen.findByLabelText('Display Name');
+ fireEvent.input(screen.getByLabelText('Display Name'), { target: { value: 'Unsaved' } });
+ const next = deferred<ReturnType<typeof org>>();
+ mocks.get.mockReturnValueOnce(next.promise);
+ setUser('viewer');
+ await settle();
+ expect(screen.queryByLabelText('Display Name')).not.toBeInTheDocument();
+ next.resolve(org('org-a'));
+ await screen.findByLabelText('Display Name');
+ expect(screen.getByLabelText('Display Name')).toBeDisabled();
+ expect(screen.getByLabelText('Display Name')).toHaveValue('Organization org-a');
+ });
+
+ it('keeps read-only sessions from renaming', async () => {
+ setReadOnly(true);
+ renderOverview();
+ await screen.findByLabelText('Display Name');
+ expect(screen.getByRole('button', { name: 'Save' })).toBeDisabled();
+ fireEvent.click(screen.getByRole('button', { name: 'Save' }));
+ expect(mocks.update).not.toHaveBeenCalled();
+ });
+
+ it('dispatches one exact rename, then refreshes saved details', async () => {
+ const pending = deferred<ReturnType<typeof org>>();
+ mocks.update.mockReturnValueOnce(pending.promise);
+ renderOverview();
+ await screen.findByLabelText('Display Name');
+ fireEvent.input(screen.getByLabelText('Display Name'), { target: { value: ' Renamed A ' } });
+ const save = screen.getByRole('button', { name: 'Save' });
+ fireEvent.click(save);
+ fireEvent.click(save);
+ expect(mocks.update).toHaveBeenCalledTimes(1);
+ expect(mocks.update).toHaveBeenCalledWith(
+ 'org-a',
+ { displayName: 'Renamed A' },
+ {
+ expectedOrgID: 'org-a',
+ signal: expect.any(AbortSignal),
+ retry: false,
+ },
+ );
+ mocks.get.mockResolvedValueOnce({ ...org('org-a'), displayName: 'Renamed A' });
+ pending.resolve({ ...org('org-a'), displayName: 'Renamed A' });
+ await waitFor(() => expect(screen.getByLabelText('Display Name')).toHaveValue('Renamed A'));
+ expect(mocks.get).toHaveBeenCalledTimes(2);
+ expect(mocks.success).toHaveBeenCalledTimes(1);
+ });
+
+ it('requires a saved read after an unconfirmed write, not an automatic write retry', async () => {
+ mocks.update.mockRejectedValueOnce(new Error('private upstream failure'));
+ renderOverview();
+ await screen.findByLabelText('Display Name');
+ fireEvent.input(screen.getByLabelText('Display Name'), { target: { value: 'Renamed' } });
+ fireEvent.click(screen.getByRole('button', { name: 'Save' }));
+ expect(await screen.findByRole('alert')).toHaveTextContent(
+ 'The last name change could not be confirmed.',
+ );
+ expect(screen.queryByLabelText('Display Name')).not.toBeInTheDocument();
+ expect(mocks.error).toHaveBeenCalledWith('Unable to update the organization name.');
+ fireEvent.click(screen.getByRole('button', { name: 'Reload organization' }));
+ await screen.findByLabelText('Display Name');
+ expect(mocks.update).toHaveBeenCalledTimes(1);
+ expect(mocks.get).toHaveBeenCalledTimes(2);
+ });
+
+ it.each(['success', 'failure'] as const)(
+ 'ignores late rename %s after a switch',
+ async (result) => {
+ const pending = deferred<ReturnType<typeof org>>();
+ mocks.update.mockReturnValueOnce(pending.promise);
+ renderOverview();
+ await screen.findByLabelText('Display Name');
+ fireEvent.input(screen.getByLabelText('Display Name'), { target: { value: 'Renamed A' } });
+ fireEvent.click(screen.getByRole('button', { name: 'Save' }));
+ const signal = mocks.update.mock.calls[0][2].signal;
+ switchOrg('org-b');
+ await screen.findByText('org-b-member');
+ expect(signal.aborted).toBe(true);
+ if (result === 'success') pending.resolve({ ...org('org-a'), displayName: 'Renamed A' });
+ else pending.reject(new Error('old write failure'));
+ await settle();
+ expect(screen.getByLabelText('Display Name')).toHaveValue('Organization org-b');
+ expect(mocks.success).not.toHaveBeenCalled();
+ expect(mocks.error).not.toHaveBeenCalled();
+ expect(mocks.get).toHaveBeenCalledTimes(2);
+ },
+ );
+
+ it('aborts pending reads on withdrawal and disposal, detaching refreshes', async () => {
+ const pending = deferred<ReturnType<typeof org>>();
+ mocks.get.mockReturnValueOnce(pending.promise);
+ const view = renderOverview();
+ const signal = mocks.get.mock.calls[0][1].signal;
+ setEnabled(false);
+ await screen.findByText('Organization settings are not available on this server.');
+ expect(signal.aborted).toBe(true);
+ pending.resolve(org('org-a'));
+ await settle();
+ setEnabled(true);
+ await screen.findByLabelText('Display Name');
+ view.unmount();
+ eventBus.emit('organizations_changed');
+ expect(mocks.get).toHaveBeenCalledTimes(2);
+ });
+});
diff --git a/frontend-modern/src/components/Settings/useOrganizationBillingPanelState.ts b/frontend-modern/src/components/Settings/useOrganizationBillingPanelState.ts
index aac175c591..58bfc2d1c3 100644
--- a/frontend-modern/src/components/Settings/useOrganizationBillingPanelState.ts
+++ b/frontend-modern/src/components/Settings/useOrganizationBillingPanelState.ts
@@ -1,11 +1,10 @@
-import { createMemo, createSignal, onCleanup, onMount } from 'solid-js';
+import { batch, createEffect, createMemo, createSignal, on, onCleanup } from 'solid-js';
import { LicenseAPI, type LicenseStatus } from '@/api/license';
import { OrgsAPI } from '@/api/orgs';
import { getOrgID } from '@/utils/apiClient';
import { normalizeOrgScope } from '@/utils/orgScope';
import { isMultiTenantEnabled } from '@/stores/license';
import { eventBus } from '@/stores/events';
-import { notificationStore } from '@/stores/notifications';
import { presentationPolicyHidesOrganizationSurfaces } from '@/stores/sessionPresentationPolicy';
import { logger } from '@/utils/logger';
import {
@@ -32,14 +31,22 @@ const formatBillingDate = (value?: string | null) => {
export function useOrganizationBillingPanelState(props: OrganizationBillingPanelProps) {
const [loading, setLoading] = createSignal(true);
+ const [loadError, setLoadError] = createSignal<string | null>(null);
const [status, setStatus] = createSignal<LicenseStatus | null>(null);
const [orgCount, setOrgCount] = createSignal(0);
const [memberCount, setMemberCount] = createSignal(0);
const activeOrgID = () => normalizeOrgScope(getOrgID());
+ const [selectedOrgID, setSelectedOrgID] = createSignal(activeOrgID());
+ let generation = 0;
+ let disposed = false;
+ let readController: AbortController | undefined;
const isBillingAvailable = () =>
isMultiTenantEnabled() && !presentationPolicyHidesOrganizationSurfaces();
+ const selectionIsCurrent = () =>
+ !disposed && isBillingAvailable() && selectedOrgID() === activeOrgID();
+
const commercialPlanModel = createMemo(() =>
buildHostedCommercialPlanModel({
status: status(),
@@ -71,37 +78,78 @@ export function useOrganizationBillingPanelState(props: OrganizationBillingPanel
);
const loadBillingData = async () => {
- setLoading(true);
+ if (disposed) return;
+ const request = ++generation;
+ readController?.abort();
+ readController = undefined;
+ const orgId = activeOrgID();
+ const isCurrent = () => request === generation && selectionIsCurrent();
+ batch(() => {
+ setSelectedOrgID(orgId);
+ setStatus(null);
+ setOrgCount(0);
+ setMemberCount(0);
+ setLoadError(null);
+ setLoading(isBillingAvailable());
+ });
+ if (!isBillingAvailable()) return;
+
+ const controller = new AbortController();
+ readController = controller;
+ const options = {
+ expectedOrgID: orgId,
+ signal: controller.signal,
+ retry: false as const,
+ preferSessionAuth: true as const,
+ };
try {
const [licenseStatus, orgs, members] = await Promise.all([
- LicenseAPI.getStatus(),
- OrgsAPI.list(),
- OrgsAPI.listMembers(activeOrgID()),
+ LicenseAPI.getStatus(options),
+ OrgsAPI.list(options),
+ OrgsAPI.listMembers(orgId, options),
]);
- setStatus(licenseStatus);
- setOrgCount(orgs.length);
- setMemberCount(members.length);
+ if (!isCurrent()) return;
+ if (
+ !licenseStatus ||
+ typeof licenseStatus.valid !== 'boolean' ||
+ typeof licenseStatus.tier !== 'string' ||
+ !Array.isArray(orgs) ||
+ !Array.isArray(members)
+ ) {
+ throw new Error('Organization billing returned invalid data');
+ }
+ batch(() => {
+ setStatus(licenseStatus);
+ setOrgCount(orgs.length);
+ setMemberCount(members.length);
+ });
} catch (error) {
+ if (!isCurrent()) return;
logger.error('Failed to load billing data', error);
- const message = error instanceof Error ? error.message : '';
- notificationStore.error(getOrganizationSettingsLoadErrorMessage(message, 'billing'));
+ setLoadError(getOrganizationSettingsLoadErrorMessage('', 'billing'));
} finally {
- setLoading(false);
+ if (!disposed && request === generation) {
+ // Stop sibling reads too when just one Promise.all member failed.
+ controller.abort();
+ readController = undefined;
+ setLoading(false);
+ if (!selectionIsCurrent()) void loadBillingData();
+ }
}
};
- onMount(() => {
- if (!isBillingAvailable()) {
- setLoading(false);
- return;
- }
-
- void loadBillingData();
-
- const unsubscribe = eventBus.on('org_switched', () => {
- void loadBillingData();
- });
- onCleanup(unsubscribe);
+ const reloadBillingData = () => {
+ if (!loading()) void loadBillingData();
+ };
+ const unsubscribeOrg = eventBus.on('org_switched', () => void loadBillingData());
+ const unsubscribeChanged = eventBus.on('organizations_changed', () => void loadBillingData());
+ createEffect(on(isBillingAvailable, () => void loadBillingData()));
+ onCleanup(() => {
+ disposed = true;
+ generation += 1;
+ readController?.abort();
+ unsubscribeOrg();
+ unsubscribeChanged();
});
return {
@@ -109,5 +157,8 @@ export function useOrganizationBillingPanelState(props: OrganizationBillingPanel
commercialUsageModel,
isBillingAvailable,
loading,
+ loadError,
+ reloadBillingData,
+ selectedOrgID,
};
}
diff --git a/frontend-modern/src/components/Settings/useOrganizationOverviewPanelState.ts b/frontend-modern/src/components/Settings/useOrganizationOverviewPanelState.ts
index 8bec777f11..9ff6ea1073 100644
--- a/frontend-modern/src/components/Settings/useOrganizationOverviewPanelState.ts
+++ b/frontend-modern/src/components/Settings/useOrganizationOverviewPanelState.ts
@@ -1,13 +1,17 @@
-import { createMemo, createSignal, onCleanup, onMount } from 'solid-js';
+import { batch, createEffect, createMemo, createSignal, on, onCleanup } from 'solid-js';
import { OrgsAPI, type Organization, type OrganizationMember } from '@/api/orgs';
import { eventBus } from '@/stores/events';
import { isMultiTenantEnabled } from '@/stores/license';
import { notificationStore } from '@/stores/notifications';
-import { presentationPolicyHidesOrganizationSurfaces } from '@/stores/sessionPresentationPolicy';
+import {
+ presentationPolicyHidesOrganizationSurfaces,
+ presentationPolicyIsReadOnly,
+} from '@/stores/sessionPresentationPolicy';
import { getOrgID } from '@/utils/apiClient';
import { logger } from '@/utils/logger';
import { normalizeOrgScope } from '@/utils/orgScope';
import {
+ ORGANIZATION_OVERVIEW_UNCONFIRMED_CHANGE_MESSAGE,
getOrganizationDisplayNameRequiredMessage,
getOrganizationDisplayNameUpdateErrorMessage,
getOrganizationDisplayNameUpdatedMessage,
@@ -21,37 +25,98 @@ interface OrganizationOverviewPanelProps {
export function useOrganizationOverviewPanelState(props: OrganizationOverviewPanelProps) {
const [loading, setLoading] = createSignal(true);
+ const [loadError, setLoadError] = createSignal<string | null>(null);
const [saving, setSaving] = createSignal(false);
const [org, setOrg] = createSignal<Organization | null>(null);
const [members, setMembers] = createSignal<OrganizationMember[]>([]);
const [displayNameDraft, setDisplayNameDraft] = createSignal('');
const activeOrgId = () => normalizeOrgScope(getOrgID());
- const canManageCurrentOrg = createMemo(() => canManageOrg(org(), props.currentUser));
+ const [selectedOrgID, setSelectedOrgID] = createSignal(activeOrgId());
+ const [selectedUser, setSelectedUser] = createSignal(props.currentUser);
+ let generation = 0;
+ let disposed = false;
+ let readController: AbortController | undefined;
+ let mutationController: AbortController | undefined;
+ const surfaceEnabled = () =>
+ isMultiTenantEnabled() && !presentationPolicyHidesOrganizationSurfaces();
+ const selectionIsCurrent = () =>
+ !disposed &&
+ surfaceEnabled() &&
+ selectedOrgID() === activeOrgId() &&
+ selectedUser() === props.currentUser;
+ const canManageCurrentOrg = createMemo(
+ () =>
+ selectionIsCurrent() &&
+ !loading() &&
+ !loadError() &&
+ !presentationPolicyIsReadOnly() &&
+ org()?.id === activeOrgId() &&
+ canManageOrg(org(), props.currentUser),
+ );
+ const clearOrganization = () => {
+ setOrg(null);
+ setMembers([]);
+ setDisplayNameDraft('');
+ };
+ const invalidateRequests = () => {
+ generation += 1;
+ readController?.abort();
+ readController = undefined;
+ mutationController?.abort();
+ mutationController = undefined;
+ setSaving(false);
+ };
const loadOrganization = async () => {
- setLoading(true);
+ if (disposed) return;
+ invalidateRequests();
+ const request = generation;
+ const orgId = activeOrgId();
+ const isCurrent = () => request === generation && selectionIsCurrent();
+ batch(() => {
+ setSelectedOrgID(orgId);
+ setSelectedUser(props.currentUser);
+ clearOrganization();
+ setLoadError(null);
+ setLoading(surfaceEnabled());
+ });
+ if (!surfaceEnabled()) return;
+
+ const controller = new AbortController();
+ readController = controller;
+ const options = { expectedOrgID: orgId, signal: controller.signal, retry: false as const };
try {
- const orgId = activeOrgId();
const [orgData, memberData] = await Promise.all([
- OrgsAPI.get(orgId),
- OrgsAPI.listMembers(orgId),
+ OrgsAPI.get(orgId, options),
+ OrgsAPI.listMembers(orgId, options),
]);
- setOrg(orgData);
- setMembers(memberData);
- setDisplayNameDraft(orgData.displayName || '');
+ if (!isCurrent()) return;
+ if (!orgData || orgData.id !== orgId || !Array.isArray(memberData)) {
+ throw new Error('Organization overview returned invalid data for the selection');
+ }
+ batch(() => {
+ setOrg(orgData);
+ setMembers(memberData);
+ setDisplayNameDraft(orgData.displayName || '');
+ });
} catch (error) {
+ if (!isCurrent()) return;
logger.error('Failed to load organization overview', error);
- const message = error instanceof Error ? error.message : '';
- notificationStore.error(getOrganizationSettingsLoadErrorMessage(message, 'overview'));
+ setLoadError(getOrganizationSettingsLoadErrorMessage('', 'overview'));
} finally {
- setLoading(false);
+ if (!disposed && request === generation) {
+ controller.abort();
+ readController = undefined;
+ setLoading(false);
+ if (!selectionIsCurrent()) void loadOrganization();
+ }
}
};
const saveDisplayName = async () => {
- const currentOrg = org();
- if (!currentOrg) return;
+ if (!canManageCurrentOrg() || saving()) return;
+ const currentOrg = org()!;
const nextName = displayNameDraft().trim();
if (!nextName) {
notificationStore.error(getOrganizationDisplayNameRequiredMessage());
@@ -59,41 +124,71 @@ export function useOrganizationOverviewPanelState(props: OrganizationOverviewPan
}
if (nextName === currentOrg.displayName) return;
+ const request = generation;
+ const controller = new AbortController();
+ mutationController = controller;
+ const isCurrent = () => request === generation && selectionIsCurrent();
setSaving(true);
try {
- const updated = await OrgsAPI.update(currentOrg.id, { displayName: nextName });
- setOrg(updated);
- setDisplayNameDraft(updated.displayName || '');
+ const updated = await OrgsAPI.update(
+ currentOrg.id,
+ { displayName: nextName },
+ {
+ expectedOrgID: selectedOrgID(),
+ signal: controller.signal,
+ retry: false,
+ },
+ );
+ if (!isCurrent()) return;
+ if (!updated || updated.id !== currentOrg.id) {
+ throw new Error('Organization rename returned a different selection');
+ }
notificationStore.success(getOrganizationDisplayNameUpdatedMessage());
+ mutationController = undefined;
+ setSaving(false);
+ // The same single subscription refreshes the saved snapshot, never a write.
+ eventBus.emit('organizations_changed');
} catch (error) {
+ if (!isCurrent()) return;
logger.error('Failed to update organization display name', error);
- notificationStore.error(
- getOrganizationDisplayNameUpdateErrorMessage(
- error instanceof Error ? error.message : undefined,
- ),
- );
+ notificationStore.error(getOrganizationDisplayNameUpdateErrorMessage());
+ batch(() => {
+ clearOrganization();
+ setLoadError(ORGANIZATION_OVERVIEW_UNCONFIRMED_CHANGE_MESSAGE);
+ });
} finally {
- setSaving(false);
+ if (mutationController === controller) {
+ mutationController = undefined;
+ setSaving(false);
+ if (!disposed && !selectionIsCurrent()) void loadOrganization();
+ }
}
};
- onMount(() => {
- if (!isMultiTenantEnabled() || presentationPolicyHidesOrganizationSurfaces()) {
- setLoading(false);
- return;
- }
- void loadOrganization();
-
- const unsubscribe = eventBus.on('org_switched', () => {
+ const reloadOrganization = () => {
+ if (!loading() && !saving()) void loadOrganization();
+ };
+ const unsubscribeOrg = eventBus.on('org_switched', () => void loadOrganization());
+ const unsubscribeChanged = eventBus.on('organizations_changed', () => void loadOrganization());
+ createEffect(
+ on([surfaceEnabled, () => props.currentUser, presentationPolicyIsReadOnly], () => {
void loadOrganization();
- });
- onCleanup(unsubscribe);
+ }),
+ );
+ onCleanup(() => {
+ disposed = true;
+ invalidateRequests();
+ unsubscribeOrg();
+ unsubscribeChanged();
});
return {
canManageCurrentOrg,
displayNameDraft,
loading,
+ loadError,
+ reloadOrganization,
+ selectedOrgID,
members,
org,
saveDisplayName,
diff --git a/frontend-modern/src/utils/organizationSettingsPresentation.ts b/frontend-modern/src/utils/organizationSettingsPresentation.ts
index d1cd6737ac..03b28936a1 100644
--- a/frontend-modern/src/utils/organizationSettingsPresentation.ts
+++ b/frontend-modern/src/utils/organizationSettingsPresentation.ts
@@ -20,6 +20,9 @@ export function getOrganizationSharingReloadMessage(orgId: string): string {
return `Reload checks saved incoming and outgoing shares for ${orgId}. It does not repeat a sharing change.`;
}
+export const ORGANIZATION_OVERVIEW_UNCONFIRMED_CHANGE_MESSAGE =
+ 'The last name change could not be confirmed. Reload saved organization details before making another change.';
+
export type OrganizationSettingsLoadContext =
'access' | 'overview' | 'sharing' | 'billing' | 'billing-admin';