@@ -337,19 +192,6 @@ export function MonitoredSystemLedgerPanel(props: MonitoredSystemLedgerPanelProp
{/* Loaded content */}
-
-
-
-
0}
fallback={{presentation.emptyState}
}
diff --git a/frontend-modern/src/components/Settings/OrganizationBillingPanel.tsx b/frontend-modern/src/components/Settings/OrganizationBillingPanel.tsx
index c9fb07455..48b6009cb 100644
--- a/frontend-modern/src/components/Settings/OrganizationBillingPanel.tsx
+++ b/frontend-modern/src/components/Settings/OrganizationBillingPanel.tsx
@@ -31,7 +31,7 @@ export const OrganizationBillingPanel: Component
}
>
@@ -55,9 +55,9 @@ export const OrganizationBillingPanel: Component
-
+
diff --git a/frontend-modern/src/components/Settings/ProLicensePanel.tsx b/frontend-modern/src/components/Settings/ProLicensePanel.tsx
index c7426f9fd..44f173713 100644
--- a/frontend-modern/src/components/Settings/ProLicensePanel.tsx
+++ b/frontend-modern/src/components/Settings/ProLicensePanel.tsx
@@ -1,13 +1,11 @@
import { Show, type Component } from 'solid-js';
import RefreshCw from 'lucide-solid/icons/refresh-cw';
-import { MonitoredSystemLedgerPanel } from './MonitoredSystemLedgerPanel';
import { CommercialBillingShell, CommercialSection } from './CommercialBillingSections';
import { ProLicensePlanSection } from './ProLicensePlanSection';
import { SelfHostedCommercialRecoverySection } from './SelfHostedCommercialRecoverySection';
import { useProLicensePanelState } from './useProLicensePanelState';
import { SELF_HOSTED_PRO_BILLING_PRESENTATION } from './selfHostedBillingPresentation';
import { Subtabs } from '@/components/shared/Subtabs';
-import { getMonitoredSystemBriefSummary } from '@/utils/monitoredSystemPresentation';
import {
presentationPolicyHidesCommercialSurfaces,
sessionPresentationPolicyResolved,
@@ -15,7 +13,6 @@ import {
import {
SELF_HOSTED_PRO_BILLING_PLAN_SECTION_ID,
SELF_HOSTED_PRO_BILLING_RECOVERY_SECTION_ID,
- SELF_HOSTED_PRO_BILLING_USAGE_SECTION_ID,
} from '@/utils/pricingHandoff';
const ProLicensePolicyLoadingPanel: Component = () => (
@@ -78,14 +75,6 @@ const ProLicensePanelContent: Component = () => {
value: 'plan',
label: SELF_HOSTED_PRO_BILLING_PRESENTATION.planTabLabel,
},
- ...(state.showUsageSection()
- ? [
- {
- value: 'usage',
- label: SELF_HOSTED_PRO_BILLING_PRESENTATION.usageTabLabel,
- },
- ]
- : []),
]}
/>
@@ -106,8 +95,6 @@ const ProLicensePanelContent: Component = () => {
grandfatheredPriceNotice={state.grandfatheredPriceNotice()}
hasLicenseDetails={state.hasLicenseDetails()}
loading={state.loading()}
- monitoredSystemCapacitySection={state.monitoredSystemCapacitySection()}
- monitoredSystemContinuityNotice={state.monitoredSystemContinuityNotice()}
onReload={() => void state.loadPanelData()}
planSelectionPrompt={state.planSelectionPrompt()}
planComparisonSummary={state.planComparisonSummary()}
@@ -131,22 +118,6 @@ const ProLicensePanelContent: Component = () => {
-
-
-
-
-
-
diff --git a/frontend-modern/src/components/Settings/ProLicensePlanSection.tsx b/frontend-modern/src/components/Settings/ProLicensePlanSection.tsx
index 6f0762f50..d371d3fb5 100644
--- a/frontend-modern/src/components/Settings/ProLicensePlanSection.tsx
+++ b/frontend-modern/src/components/Settings/ProLicensePlanSection.tsx
@@ -21,17 +21,6 @@ interface ActionNotice extends Notice {
actionDestination: UpgradeDestination;
}
-interface MonitoredSystemCapacitySection {
- stats: Array<{ label: string; value: string }>;
- statusMessage: string;
- detailMessage?: string;
- explanation?: {
- label: string;
- body: string;
- };
- reviewUsageDestination: UpgradeDestination;
-}
-
interface ProLicensePlanSectionProps {
activationSuccessSummary: {
title: string;
@@ -74,8 +63,6 @@ interface ProLicensePlanSectionProps {
grandfatheredPriceNotice: Notice | null;
hasLicenseDetails: boolean;
loading: boolean;
- monitoredSystemCapacitySection: MonitoredSystemCapacitySection | null;
- monitoredSystemContinuityNotice: Notice | null;
onReload: () => void;
planComparisonSummary: {
cards: Array<{
@@ -314,51 +301,6 @@ export const ProLicensePlanSection: Component = (pro
)}
-
- {(notice) => (
-
-
{notice().title}
-
{notice().body}
-
-
-
Monitored-system policy
-
{section().statusMessage}
-
- {(detail) => {detail()}
}
-
-
-
-
-
-
-
-
- {(explanation) => (
-
-
- {explanation().label}
-
- {explanation().body}
-
- )}
-
-
-
-
- Review monitored systems
-
-
-
Could not load license status
diff --git a/frontend-modern/src/components/Settings/Settings.tsx b/frontend-modern/src/components/Settings/Settings.tsx
index 795c9ae19..b0abc2f54 100644
--- a/frontend-modern/src/components/Settings/Settings.tsx
+++ b/frontend-modern/src/components/Settings/Settings.tsx
@@ -18,10 +18,7 @@ import { useSystemSettingsState } from './useSystemSettingsState';
import { useSettingsNavigation } from './useSettingsNavigation';
import { getSettingsLoadingState } from '@/utils/settingsShellPresentation';
-import {
- getRuntimeLimit,
- loadRuntimeCapabilities,
-} from '@/stores/license';
+import { getRuntimeLimit, loadRuntimeCapabilities } from '@/stores/license';
import { isPro } from '@/stores/licenseCommercial';
interface SettingsProps {
@@ -50,9 +47,7 @@ const Settings: Component
= (props) => {
searchQuery,
setSearchQuery,
} = useSettingsShellState({ activeTab });
- const organizationMonitoredSystemUsage = createMemo(
- () => getRuntimeLimit('max_monitored_systems')?.current ?? 0,
- );
+ const organizationMonitoredSystemUsage = createMemo(() => 0);
const organizationGuestUsage = createMemo(() => getRuntimeLimit('max_guests')?.current ?? 0);
const discoverySettings = useDiscoverySettingsState();
diff --git a/frontend-modern/src/components/Settings/__tests__/MonitoredSystemAdmissionPreview.test.tsx b/frontend-modern/src/components/Settings/__tests__/MonitoredSystemImpactPreview.test.tsx
similarity index 73%
rename from frontend-modern/src/components/Settings/__tests__/MonitoredSystemAdmissionPreview.test.tsx
rename to frontend-modern/src/components/Settings/__tests__/MonitoredSystemImpactPreview.test.tsx
index dd1f602f7..f36fcbb92 100644
--- a/frontend-modern/src/components/Settings/__tests__/MonitoredSystemAdmissionPreview.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/MonitoredSystemImpactPreview.test.tsx
@@ -1,7 +1,7 @@
import { cleanup, render, screen } from '@solidjs/testing-library';
import { afterEach, describe, expect, it } from 'vitest';
-import { MonitoredSystemAdmissionPreview } from '../MonitoredSystemAdmissionPreview';
+import { MonitoredSystemImpactPreview } from '../MonitoredSystemImpactPreview';
import type { MonitoredSystemLedgerPreviewResponse } from '@/api/monitoredSystemLedger';
const buildPreview = (
@@ -10,8 +10,6 @@ const buildPreview = (
current_count: 4,
projected_count: 4,
additional_count: 0,
- limit: 10,
- would_exceed_limit: false,
effect: 'no_change',
current_systems: [],
projected_systems: [],
@@ -20,13 +18,13 @@ const buildPreview = (
...overrides,
});
-describe('MonitoredSystemAdmissionPreview', () => {
+describe('MonitoredSystemImpactPreview', () => {
afterEach(() => {
cleanup();
});
it('describes unchanged usage when a preview has no count impact', () => {
- render(() => );
+ render(() => );
expect(
screen.getByText('This change keeps monitored-system count unchanged'),
@@ -40,7 +38,7 @@ describe('MonitoredSystemAdmissionPreview', () => {
it('describes removed systems when a preview reduces monitored-system usage', () => {
render(() => (
- {
).toBeInTheDocument();
});
- it('describes continuity review failures without slash quota copy', () => {
+ it('describes added systems without capacity review copy', () => {
render(() => (
-
));
- expect(
- screen.getByText('This change needs continuity review before saving'),
- ).toBeInTheDocument();
+ expect(screen.getByText('This change adds monitored systems')).toBeInTheDocument();
expect(
screen.getByText(
- 'Pulse currently counts 9 monitored systems. Saving this change would bring the count to 11 monitored systems (+2), above the current verified baseline of 10 monitored systems.',
+ 'Pulse currently counts 9 monitored systems. Saving this change would bring the count to 11 monitored systems (+2).',
),
).toBeInTheDocument();
});
diff --git a/frontend-modern/src/components/Settings/__tests__/MonitoredSystemLedgerPanel.test.tsx b/frontend-modern/src/components/Settings/__tests__/MonitoredSystemLedgerPanel.test.tsx
index 62d061497..506f5e9f2 100644
--- a/frontend-modern/src/components/Settings/__tests__/MonitoredSystemLedgerPanel.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/MonitoredSystemLedgerPanel.test.tsx
@@ -84,16 +84,7 @@ describe('MonitoredSystemLedgerPanel', () => {
it('hides monitored-system usage in demo mode without requesting the ledger', () => {
presentationPolicyHidesCommercialSurfacesMock.mockReturnValue(true);
- render(() => (
-
- ));
+ render(() => );
expect(explainMock).not.toHaveBeenCalled();
expect(screen.getByText('Monitored-system usage is hidden in demo mode')).toBeInTheDocument();
@@ -168,7 +159,6 @@ describe('MonitoredSystemLedgerPanel', () => {
},
],
total: 1,
- limit: 5,
}),
);
@@ -216,24 +206,13 @@ describe('MonitoredSystemLedgerPanel', () => {
}),
);
- render(() => (
-
- ));
+ render(() => );
await waitFor(() => {
expect(screen.getByText('Verifying monitored-system inventory')).toBeInTheDocument();
});
- expect(screen.getByText('Verifying…')).toBeInTheDocument();
+ expect(screen.getByText('Verifying')).toBeInTheDocument();
expect(
screen.getByText(
'Pulse is still collecting the first provider-owned inventory baseline. The monitored-system ledger will appear after that baseline completes.',
@@ -245,40 +224,6 @@ describe('MonitoredSystemLedgerPanel', () => {
).not.toBeInTheDocument();
});
- it('surfaces monitored-system continuity context from entitlements', async () => {
- explainMock.mockResolvedValue(
- explainResponse({
- systems: [],
- total: 7,
- limit: 12,
- }),
- );
-
- render(() => (
-
- ));
-
- await waitFor(() => {
- expect(screen.getByText('7 monitored systems')).toBeInTheDocument();
- });
-
- expect(screen.getByText('Legacy continuity')).toBeInTheDocument();
- expect(screen.getByText('Plan baseline')).toBeInTheDocument();
- expect(screen.getByText('Current baseline')).toBeInTheDocument();
- expect(screen.getByText('Observed legacy estate')).toBeInTheDocument();
- expect(screen.getByText('Verification')).toBeInTheDocument();
- expect(screen.getByText('5')).toBeInTheDocument();
- expect(screen.getAllByText('12')).toHaveLength(2);
- expect(screen.getByText('Pending')).toBeInTheDocument();
- });
-
it('renders ledger data on successful load', async () => {
explainMock.mockResolvedValue(
explainResponse({
@@ -356,7 +301,6 @@ describe('MonitoredSystemLedgerPanel', () => {
},
],
total: 2,
- limit: 10,
}),
);
@@ -372,7 +316,7 @@ describe('MonitoredSystemLedgerPanel', () => {
expect(screen.getAllByText('server-b (PBS Server via PBS)').length).toBeGreaterThan(0);
expect(
screen.getByText(
- 'Review the top-level monitored systems Pulse has identified for reporting, migration continuity, and support context.',
+ 'Review the top-level monitored systems Pulse has identified for reporting and support context.',
),
).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'View counting rules' })).toBeInTheDocument();
@@ -452,7 +396,6 @@ describe('MonitoredSystemLedgerPanel', () => {
},
],
total: 1,
- limit: 10,
}),
);
@@ -501,7 +444,6 @@ describe('MonitoredSystemLedgerPanel', () => {
},
],
total: 1,
- limit: 10,
}),
);
@@ -542,7 +484,6 @@ describe('MonitoredSystemLedgerPanel', () => {
},
],
total: 1,
- limit: 10,
}),
);
@@ -566,7 +507,6 @@ describe('MonitoredSystemLedgerPanel', () => {
explainResponse({
systems: [],
total: 2,
- limit: 5,
}),
);
diff --git a/frontend-modern/src/components/Settings/__tests__/OrganizationBillingPanel.test.tsx b/frontend-modern/src/components/Settings/__tests__/OrganizationBillingPanel.test.tsx
index 8c1279a95..32dd8b124 100644
--- a/frontend-modern/src/components/Settings/__tests__/OrganizationBillingPanel.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/OrganizationBillingPanel.test.tsx
@@ -79,7 +79,6 @@ describe('OrganizationBillingPanel', () => {
is_lifetime: false,
days_remaining: 30,
features: [],
- max_monitored_systems: 12,
max_guests: 5,
email: 'owner@example.com',
expires_at: '2026-04-01T00:00:00Z',
@@ -92,18 +91,18 @@ describe('OrganizationBillingPanel', () => {
cleanup();
});
- it('renders organization usage from the canonical max_monitored_systems limit only', async () => {
+ it('renders monitored-system usage as not metered', async () => {
render(() => );
await waitFor(() => {
- expect(screen.getByText('5 / 12')).toBeInTheDocument();
+ expect(screen.getByText('5 / Not metered')).toBeInTheDocument();
});
expect(getStatusMock).toHaveBeenCalledTimes(1);
expect(screen.getByText('Plan')).toBeInTheDocument();
- expect(screen.getByText('Usage')).toBeInTheDocument();
+ expect(screen.getAllByText('Usage')).toHaveLength(2);
expect(screen.getByText('Cloud')).toBeInTheDocument();
- expect(screen.getByText('5 / 12')).toBeInTheDocument();
+ expect(screen.getByText('5 / Not metered')).toBeInTheDocument();
expect(screen.getByText('2 / 5')).toBeInTheDocument();
expect(errorMock).not.toHaveBeenCalled();
});
diff --git a/frontend-modern/src/components/Settings/__tests__/ProLicensePanel.test.tsx b/frontend-modern/src/components/Settings/__tests__/ProLicensePanel.test.tsx
index 54e8242f7..8d167fc1e 100644
--- a/frontend-modern/src/components/Settings/__tests__/ProLicensePanel.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/ProLicensePanel.test.tsx
@@ -268,7 +268,6 @@ describe('ProLicensePanel', () => {
expect(screen.queryByText(/trial/i)).not.toBeInTheDocument();
expect(screen.queryByText(/monitoring room/i)).not.toBeInTheDocument();
expect(screen.queryByText(/monitoring capacity/i)).not.toBeInTheDocument();
- expect(screen.queryByText(/monitored-system capacity/i)).not.toBeInTheDocument();
});
it('does not surface a trial-ended banner for retired self-hosted trial state', async () => {
@@ -327,24 +326,6 @@ describe('ProLicensePanel', () => {
licensed_email: 'owner@example.com',
is_lifetime: false,
trial_eligible: false,
- monitored_system_continuity: {
- plan_limit: 12,
- grandfathered_floor: 23,
- effective_limit: 23,
- capture_pending: false,
- },
- monitored_system_capacity: {
- mode: 'at_limit_blocking_new',
- urgency: 'enforced',
- current: 23,
- limit: 23,
- current_available: true,
- available_slots: 0,
- overage: 0,
- reason: 'limit_reached',
- blocks_new_systems: true,
- existing_monitoring_continues: true,
- },
};
renderPanel();
@@ -579,8 +560,6 @@ describe('ProLicensePanel', () => {
key: 'max_monitored_systems',
limit: 10,
current: 0,
- current_available: false,
- current_unavailable_reason: 'supplemental_inventory_unsettled',
state: 'ok',
},
],
@@ -590,24 +569,6 @@ describe('ProLicensePanel', () => {
plan_version: 'legacy_migration_fallback',
licensed_email: 'owner@example.com',
trial_eligible: false,
- monitored_system_continuity: {
- plan_limit: 10,
- effective_limit: 10,
- capture_pending: true,
- },
- monitored_system_capacity: {
- mode: 'usage_unavailable',
- urgency: 'ok',
- current: 0,
- limit: 10,
- current_available: false,
- current_unavailable_reason: 'supplemental_inventory_unsettled',
- available_slots: 0,
- overage: 0,
- reason: 'legacy_migration_capture_pending',
- blocks_new_systems: false,
- existing_monitoring_continues: false,
- },
};
renderPanel();
@@ -641,7 +602,6 @@ describe('ProLicensePanel', () => {
key: 'max_monitored_systems',
limit: 10,
current: 23,
- current_available: true,
state: 'enforced',
},
],
@@ -651,23 +611,6 @@ describe('ProLicensePanel', () => {
plan_version: 'legacy_migration_fallback',
licensed_email: 'owner@example.com',
trial_eligible: false,
- monitored_system_continuity: {
- plan_limit: 10,
- effective_limit: 10,
- capture_pending: true,
- },
- monitored_system_capacity: {
- mode: 'over_limit_frozen',
- urgency: 'enforced',
- current: 23,
- limit: 10,
- current_available: true,
- available_slots: 0,
- overage: 13,
- reason: 'legacy_migration_capture_pending',
- blocks_new_systems: true,
- existing_monitoring_continues: true,
- },
};
renderPanel();
@@ -702,7 +645,6 @@ describe('ProLicensePanel', () => {
key: 'max_monitored_systems',
limit: 23,
current: 23,
- current_available: true,
state: 'enforced',
},
],
@@ -712,25 +654,6 @@ describe('ProLicensePanel', () => {
plan_version: 'legacy_migration_fallback',
licensed_email: 'owner@example.com',
trial_eligible: false,
- monitored_system_continuity: {
- plan_limit: 10,
- grandfathered_floor: 23,
- effective_limit: 23,
- capture_pending: false,
- captured_at: 1_768_000_000,
- },
- monitored_system_capacity: {
- mode: 'at_limit_blocking_new',
- urgency: 'enforced',
- current: 23,
- limit: 23,
- current_available: true,
- available_slots: 0,
- overage: 0,
- reason: 'limit_reached',
- blocks_new_systems: true,
- existing_monitoring_continues: true,
- },
};
renderPanel();
@@ -1177,7 +1100,7 @@ describe('ProLicensePanel', () => {
expect(proLicensePanelStateSource).toContain('useLocation');
expect(proLicensePanelStateSource).toContain('resolveSelfHostedBillingSection');
expect(proLicensePanelStateSource).toContain('getSelfHostedBillingPlanIntent');
- expect(proLicensePanelStateSource).toContain('getSelfHostedBillingUsageDetail');
+ expect(proLicensePanelStateSource).not.toContain('getSelfHostedBillingUsageDetail');
expect(proLicensePanelStateSource).toContain('const setActiveSection = (section: string) => {');
expect(proLicensePanelStateSource).toContain('loadLicenseEntitlements(true)');
expect(proLicensePanelStateSource).toContain('loadCommercialPosture(true)');
@@ -1229,6 +1152,6 @@ describe('ProLicensePanel', () => {
expect(selfHostedCommercialRecoverySectionSource).not.toContain('Start 14-day Pro Trial');
expect(selfHostedCommercialRecoverySectionSource).not.toContain('Legacy v5 license detected');
expect(proLicensePanelSource).toContain('id={SELF_HOSTED_PRO_BILLING_PLAN_SECTION_ID}');
- expect(proLicensePanelSource).toContain('id={SELF_HOSTED_PRO_BILLING_USAGE_SECTION_ID}');
+ expect(proLicensePanelSource).not.toContain('SELF_HOSTED_PRO_BILLING_USAGE_SECTION_ID');
});
});
diff --git a/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts b/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts
index 95f2259df..3c689bd70 100644
--- a/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts
+++ b/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts
@@ -35,7 +35,7 @@ import infrastructureSourcePickerSource from '../InfrastructureSourcePicker.tsx?
import infrastructureWorkspaceModelSource from '../infrastructureWorkspaceModel.ts?raw';
import agentProfileSettingsSource from '../agentProfileSettings.ts?raw';
import connectionsTableSource from '../ConnectionsTable.tsx?raw';
-import monitoredSystemAdmissionPreviewSource from '../MonitoredSystemAdmissionPreview.tsx?raw';
+import monitoredSystemImpactPreviewSource from '../MonitoredSystemImpactPreview.tsx?raw';
import connectionEditorSource from '../ConnectionEditor/ConnectionEditor.tsx?raw';
import addressProbeStepSource from '../ConnectionEditor/AddressProbeStep.tsx?raw';
import connectionEditorStateSource from '../ConnectionEditor/useConnectionEditor.ts?raw';
@@ -66,7 +66,6 @@ import infrastructureOnboardingPresentationSource from '../../../utils/infrastru
import selfHostedBillingPresentationSource from '../selfHostedBillingPresentation.ts?raw';
import systemSettingsPresentationSource from '../../../utils/systemSettingsPresentation.ts?raw';
import auditLogPresentationSource from '../../../utils/auditLogPresentation.ts?raw';
-import monitoredSystemLimitWarningBannerSource from '../../shared/MonitoredSystemLimitWarningBanner.tsx?raw';
const settingsRuntimeSources = import.meta.glob(['../*.tsx', '../ConnectionEditor/**/*.tsx'], {
query: '?raw',
@@ -224,7 +223,6 @@ describe('settings architecture guardrails', () => {
auditLogStateSource,
auditWebhookPanelSource,
auditWebhookStateSource,
- monitoredSystemLimitWarningBannerSource,
rbacFeatureGateSectionSource,
rbacFeatureGateStateSource,
reportingPanelSource,
@@ -246,9 +244,6 @@ describe('settings architecture guardrails', () => {
expect(rbacFeatureGateSectionSource).not.toContain('Custom Roles (Pro)');
expect(rbacFeatureGateSectionSource).not.toContain('Centralized Access Control (Pro)');
expect(ssoProvidersPanelSource).not.toContain('Add SAML (Pro)');
- expect(monitoredSystemLimitWarningBannerSource).not.toContain(
- 'Unlimited self-hosted monitoring',
- );
});
it('keeps SAML SSO available without a self-hosted Pro upsell boundary', () => {
@@ -446,18 +441,18 @@ describe('settings architecture guardrails', () => {
expect(infrastructureSourceManagerSource).toContain('Infrastructure systems');
expect(infrastructureSourceManagerSource).toContain('Run discovery');
expect(infrastructureSourceManagerSource).toContain('Discovery settings');
- expect(monitoredSystemAdmissionPreviewSource).toContain(
- 'getMonitoredSystemAdmissionPreviewTitle',
+ expect(monitoredSystemImpactPreviewSource).toContain(
+ 'getMonitoredSystemImpactPreviewTitle',
);
- expect(monitoredSystemAdmissionPreviewSource).toContain(
- 'formatMonitoredSystemAdmissionPreviewSummary',
+ expect(monitoredSystemImpactPreviewSource).toContain(
+ 'formatMonitoredSystemImpactPreviewSummary',
);
- expect(monitoredSystemAdmissionPreviewSource).not.toContain('Current usage');
- expect(monitoredSystemAdmissionPreviewSource).not.toContain(' / ');
- expect(monitoredSystemAdmissionPreviewSource).not.toContain(
- 'reuses your current monitored-system capacity',
+ expect(monitoredSystemImpactPreviewSource).not.toContain('Current usage');
+ expect(monitoredSystemImpactPreviewSource).not.toContain(' / ');
+ expect(monitoredSystemImpactPreviewSource).not.toContain(
+ 'reuses your current monitored-system allowance',
);
- expect(monitoredSystemAdmissionPreviewSource).not.toContain('frees monitored-system capacity');
+ expect(monitoredSystemImpactPreviewSource).not.toContain('frees monitored-system allowance');
expect(infrastructureSourceManagerSource).toContain(
"Add, discover, and verify the platform APIs plus Pulse Agent telemetry that make up Pulse's infrastructure model.",
);
diff --git a/frontend-modern/src/components/Settings/__tests__/useTrueNASSettingsPanelState.test.tsx b/frontend-modern/src/components/Settings/__tests__/useTrueNASSettingsPanelState.test.tsx
index 457ba3f07..54a3a2260 100644
--- a/frontend-modern/src/components/Settings/__tests__/useTrueNASSettingsPanelState.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/useTrueNASSettingsPanelState.test.tsx
@@ -36,8 +36,6 @@ const safeTrueNASPreview = () => ({
current_count: 1,
projected_count: 1,
additional_count: 0,
- limit: 10,
- would_exceed_limit: false,
effect: 'attaches_existing',
current_systems: [],
projected_systems: [
@@ -227,8 +225,11 @@ describe('useTrueNASSettingsPanelState', () => {
expect(notificationStore.success).toHaveBeenCalledWith('TrueNAS connection successful');
});
- it('requires a successful monitored-system preview before saving', async () => {
- vi.mocked(TrueNASAPI.listConnections).mockResolvedValueOnce([] as never);
+ it('saves a connection without requiring a monitored-system preview', async () => {
+ vi.mocked(TrueNASAPI.listConnections)
+ .mockResolvedValueOnce([] as never)
+ .mockResolvedValueOnce([] as never);
+ vi.mocked(TrueNASAPI.createConnection).mockResolvedValueOnce({} as never);
const { result } = renderHook(() => useTrueNASSettingsPanelState());
await waitFor(() => expect(result.loading()).toBe(false));
@@ -239,13 +240,15 @@ describe('useTrueNASSettingsPanelState', () => {
apiKey: 'secret',
});
- expect(result.monitoredSystemAdmissionSaveBlocked()).toBe(true);
await result.saveCurrentForm();
- expect(TrueNASAPI.createConnection).not.toHaveBeenCalled();
- expect(notificationStore.error).toHaveBeenCalledWith(
- 'Pulse must preview the monitored-system impact for this platform connection before it can be saved.',
+ expect(TrueNASAPI.createConnection).toHaveBeenCalledWith(
+ expect.objectContaining({
+ host: 'tower.local',
+ apiKey: 'secret',
+ }),
);
+ expect(notificationStore.success).toHaveBeenCalledWith('TrueNAS connection added');
});
it('previews monitored-system impact through the canonical TrueNAS preview path', async () => {
@@ -254,8 +257,6 @@ describe('useTrueNASSettingsPanelState', () => {
current_count: 4,
projected_count: 4,
additional_count: 0,
- limit: 10,
- would_exceed_limit: false,
effect: 'attaches_existing',
current_systems: [
{
@@ -303,10 +304,13 @@ describe('useTrueNASSettingsPanelState', () => {
expect(result.monitoredSystemPreview()?.effect).toBe('attaches_existing');
});
- it('blocks save when monitored-system usage is temporarily unavailable during preview', async () => {
- vi.mocked(TrueNASAPI.listConnections).mockResolvedValueOnce([] as never);
+ it('allows save when monitored-system impact preview is temporarily unavailable', async () => {
+ vi.mocked(TrueNASAPI.listConnections)
+ .mockResolvedValueOnce([] as never)
+ .mockResolvedValueOnce([] as never);
+ vi.mocked(TrueNASAPI.createConnection).mockResolvedValueOnce({} as never);
vi.mocked(TrueNASAPI.previewConnection).mockRejectedValueOnce(
- Object.assign(new Error('Unable to verify monitored-system capacity right now'), {
+ Object.assign(new Error('Unable to verify monitored-system grouping right now'), {
status: 503,
code: 'monitored_system_usage_unavailable',
details: {
@@ -328,48 +332,25 @@ describe('useTrueNASSettingsPanelState', () => {
expect(preview).toBeNull();
expect(result.monitoredSystemPreview()).toBeNull();
- expect(result.monitoredSystemAdmissionSaveBlocked()).toBe(true);
expect(result.monitoredSystemPreviewErrorTitle()).toBe(
'Monitored-system verification is temporarily unavailable',
);
expect(result.monitoredSystemPreviewError()).toBe(
- 'Pulse is still settling provider-owned inventory for this platform connection, so the monitored-system check is not safe yet. Retry preview after the first baseline finishes.',
+ 'Pulse is still settling provider-owned inventory for this platform connection. You can still save the connection and review the impact after the first baseline finishes.',
);
await result.saveCurrentForm();
- expect(TrueNASAPI.createConnection).not.toHaveBeenCalled();
- expect(notificationStore.error).toHaveBeenLastCalledWith(
- 'Pulse is still settling provider-owned inventory for this platform connection, so the monitored-system check is not safe yet. Retry preview after the first baseline finishes.',
- );
+ expect(TrueNASAPI.createConnection).toHaveBeenCalled();
+ expect(notificationStore.success).toHaveBeenCalledWith('TrueNAS connection added');
});
- it('reuses the canonical monitored-system preview when a save is denied by the backend', async () => {
+ it('surfaces backend save errors without reopening retired cap-preview handling', async () => {
vi.mocked(TrueNASAPI.listConnections).mockResolvedValueOnce([] as never);
vi.mocked(TrueNASAPI.previewConnection).mockResolvedValueOnce(safeTrueNASPreview() as never);
vi.mocked(TrueNASAPI.createConnection).mockRejectedValueOnce(
- Object.assign(new Error('Monitored-system capacity reached (10/9)'), {
- status: 402,
- feature: 'max_monitored_systems',
- monitored_system_preview: {
- current_count: 9,
- projected_count: 10,
- additional_count: 1,
- limit: 9,
- would_exceed_limit: true,
- effect: 'creates_new',
- current_systems: [],
- projected_systems: [
- {
- name: 'tower',
- type: 'truenas-system',
- status: 'online',
- source: 'truenas',
- },
- ],
- current_system: null,
- projected_system: null,
- },
+ Object.assign(new Error('TrueNAS connection save failed'), {
+ status: 500,
}),
);
@@ -384,20 +365,19 @@ describe('useTrueNASSettingsPanelState', () => {
await result.previewCurrentForm();
await result.saveCurrentForm();
- expect(notificationStore.error).toHaveBeenCalledWith('Monitored-system capacity reached (10/9)');
+ expect(notificationStore.error).toHaveBeenCalledWith('TrueNAS connection save failed');
expect(result.monitoredSystemPreview()).toMatchObject({
- would_exceed_limit: true,
- projected_count: 10,
- effect: 'creates_new',
+ projected_count: 1,
+ effect: 'attaches_existing',
});
expect(result.dialogOpen()).toBe(true);
});
- it('surfaces monitored-system usage unavailability when save races a stale preview', async () => {
+ it('treats save-time monitored-system usage unavailability as an ordinary save error', async () => {
vi.mocked(TrueNASAPI.listConnections).mockResolvedValueOnce([] as never);
vi.mocked(TrueNASAPI.previewConnection).mockResolvedValueOnce(safeTrueNASPreview() as never);
vi.mocked(TrueNASAPI.createConnection).mockRejectedValueOnce(
- Object.assign(new Error('Unable to verify monitored-system capacity right now'), {
+ Object.assign(new Error('Unable to verify monitored-system grouping right now'), {
status: 503,
code: 'monitored_system_usage_unavailable',
details: {
@@ -417,13 +397,13 @@ describe('useTrueNASSettingsPanelState', () => {
await result.previewCurrentForm();
await result.saveCurrentForm();
- expect(result.monitoredSystemPreview()).toBeNull();
- expect(result.monitoredSystemAdmissionSaveBlocked()).toBe(true);
- expect(result.monitoredSystemPreviewError()).toBe(
- 'Pulse has settled provider-owned inventory and is rebuilding the canonical monitored-system view, so this connection cannot be saved yet. Retry preview in a moment.',
- );
+ expect(result.monitoredSystemPreview()).toMatchObject({
+ projected_count: 1,
+ effect: 'attaches_existing',
+ });
+ expect(result.monitoredSystemPreviewError()).toBeNull();
expect(notificationStore.error).toHaveBeenCalledWith(
- 'Pulse has settled provider-owned inventory and is rebuilding the canonical monitored-system view, so this connection cannot be saved yet. Retry preview in a moment.',
+ 'Unable to verify monitored-system grouping right now',
);
});
});
diff --git a/frontend-modern/src/components/Settings/__tests__/useVMwareSettingsPanelState.test.tsx b/frontend-modern/src/components/Settings/__tests__/useVMwareSettingsPanelState.test.tsx
index f8d3f9da3..f32934b94 100644
--- a/frontend-modern/src/components/Settings/__tests__/useVMwareSettingsPanelState.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/useVMwareSettingsPanelState.test.tsx
@@ -35,8 +35,6 @@ const safeVMwarePreview = () => ({
current_count: 1,
projected_count: 1,
additional_count: 0,
- limit: 10,
- would_exceed_limit: false,
effect: 'attaches_existing',
current_systems: [],
projected_systems: [
@@ -224,8 +222,11 @@ describe('useVMwareSettingsPanelState', () => {
expect(notificationStore.success).toHaveBeenCalledWith('VMware connection successful');
});
- it('requires a successful monitored-system preview before saving', async () => {
- vi.mocked(VMwareAPI.listConnections).mockResolvedValueOnce([] as never);
+ it('saves a connection without requiring a monitored-system preview', async () => {
+ vi.mocked(VMwareAPI.listConnections)
+ .mockResolvedValueOnce([] as never)
+ .mockResolvedValueOnce([] as never);
+ vi.mocked(VMwareAPI.createConnection).mockResolvedValueOnce({} as never);
const { result } = renderHook(() => useVMwareSettingsPanelState());
await waitFor(() => expect(result.loading()).toBe(false));
@@ -237,13 +238,16 @@ describe('useVMwareSettingsPanelState', () => {
password: 'secret',
});
- expect(result.monitoredSystemAdmissionSaveBlocked()).toBe(true);
await result.saveCurrentForm();
- expect(VMwareAPI.createConnection).not.toHaveBeenCalled();
- expect(notificationStore.error).toHaveBeenCalledWith(
- 'Pulse must preview the monitored-system impact for this platform connection before it can be saved.',
+ expect(VMwareAPI.createConnection).toHaveBeenCalledWith(
+ expect.objectContaining({
+ host: 'vcsa.lab.local',
+ username: 'administrator@vsphere.local',
+ password: 'secret',
+ }),
);
+ expect(notificationStore.success).toHaveBeenCalledWith('VMware connection added');
});
it('surfaces categorized draft test guidance from structured backend failures', async () => {
@@ -420,8 +424,6 @@ describe('useVMwareSettingsPanelState', () => {
current_count: 1,
projected_count: 3,
additional_count: 2,
- limit: 5,
- would_exceed_limit: false,
effect: 'creates_multiple',
current_systems: [],
projected_systems: [
@@ -461,10 +463,13 @@ describe('useVMwareSettingsPanelState', () => {
expect(result.monitoredSystemPreview()?.projected_count).toBe(3);
});
- it('blocks save when monitored-system usage is temporarily unavailable during preview', async () => {
- vi.mocked(VMwareAPI.listConnections).mockResolvedValueOnce([] as never);
+ it('allows save when monitored-system impact preview is temporarily unavailable', async () => {
+ vi.mocked(VMwareAPI.listConnections)
+ .mockResolvedValueOnce([] as never)
+ .mockResolvedValueOnce([] as never);
+ vi.mocked(VMwareAPI.createConnection).mockResolvedValueOnce({} as never);
vi.mocked(VMwareAPI.previewConnection).mockRejectedValueOnce(
- Object.assign(new Error('Unable to verify monitored-system capacity right now'), {
+ Object.assign(new Error('Unable to verify monitored-system grouping right now'), {
status: 503,
code: 'monitored_system_usage_unavailable',
details: {
@@ -488,61 +493,25 @@ describe('useVMwareSettingsPanelState', () => {
expect(preview).toBeNull();
expect(result.connectionFailure()).toBeNull();
expect(result.monitoredSystemPreview()).toBeNull();
- expect(result.monitoredSystemAdmissionSaveBlocked()).toBe(true);
expect(result.monitoredSystemPreviewErrorTitle()).toBe(
'Monitored-system verification is temporarily unavailable',
);
expect(result.monitoredSystemPreviewError()).toBe(
- 'Pulse is still settling provider-owned inventory for this platform connection, so the monitored-system check is not safe yet. Retry preview after the first baseline finishes.',
+ 'Pulse is still settling provider-owned inventory for this platform connection. You can still save the connection and review the impact after the first baseline finishes.',
);
await result.saveCurrentForm();
- expect(VMwareAPI.createConnection).not.toHaveBeenCalled();
- expect(notificationStore.error).toHaveBeenLastCalledWith(
- 'Pulse is still settling provider-owned inventory for this platform connection, so the monitored-system check is not safe yet. Retry preview after the first baseline finishes.',
- );
+ expect(VMwareAPI.createConnection).toHaveBeenCalled();
+ expect(notificationStore.success).toHaveBeenCalledWith('VMware connection added');
});
- it('reuses the canonical monitored-system preview when a save is denied by the backend', async () => {
+ it('surfaces backend save errors without reopening retired cap-preview handling', async () => {
vi.mocked(VMwareAPI.listConnections).mockResolvedValueOnce([] as never);
vi.mocked(VMwareAPI.previewConnection).mockResolvedValueOnce(safeVMwarePreview() as never);
vi.mocked(VMwareAPI.createConnection).mockRejectedValueOnce(
- Object.assign(new Error('Monitored-system capacity reached (7/6)'), {
- status: 402,
- feature: 'max_monitored_systems',
- monitored_system_preview: {
- current_count: 5,
- projected_count: 7,
- additional_count: 2,
- limit: 6,
- would_exceed_limit: true,
- effect: 'mixed_existing_and_new',
- current_systems: [
- {
- name: 'esxi-01',
- type: 'agent',
- status: 'online',
- source: 'agent',
- },
- ],
- projected_systems: [
- {
- name: 'esxi-01',
- type: 'agent',
- status: 'online',
- source: 'vmware',
- },
- {
- name: 'esxi-02',
- type: 'agent',
- status: 'online',
- source: 'vmware',
- },
- ],
- current_system: null,
- projected_system: null,
- },
+ Object.assign(new Error('VMware connection save failed'), {
+ status: 500,
}),
);
@@ -558,20 +527,19 @@ describe('useVMwareSettingsPanelState', () => {
await result.previewCurrentForm();
await result.saveCurrentForm();
- expect(notificationStore.error).toHaveBeenCalledWith('Monitored-system capacity reached (7/6)');
+ expect(notificationStore.error).toHaveBeenCalledWith('VMware connection save failed');
expect(result.monitoredSystemPreview()).toMatchObject({
- would_exceed_limit: true,
- projected_count: 7,
- effect: 'mixed_existing_and_new',
+ projected_count: 1,
+ effect: 'attaches_existing',
});
expect(result.dialogOpen()).toBe(true);
});
- it('surfaces monitored-system usage unavailability when save races a stale preview', async () => {
+ it('treats save-time monitored-system usage unavailability as an ordinary save error', async () => {
vi.mocked(VMwareAPI.listConnections).mockResolvedValueOnce([] as never);
vi.mocked(VMwareAPI.previewConnection).mockResolvedValueOnce(safeVMwarePreview() as never);
vi.mocked(VMwareAPI.createConnection).mockRejectedValueOnce(
- Object.assign(new Error('Unable to verify monitored-system capacity right now'), {
+ Object.assign(new Error('Unable to verify monitored-system grouping right now'), {
status: 503,
code: 'monitored_system_usage_unavailable',
details: {
@@ -593,13 +561,13 @@ describe('useVMwareSettingsPanelState', () => {
await result.saveCurrentForm();
expect(result.connectionFailure()).toBeNull();
- expect(result.monitoredSystemPreview()).toBeNull();
- expect(result.monitoredSystemAdmissionSaveBlocked()).toBe(true);
- expect(result.monitoredSystemPreviewError()).toBe(
- 'Pulse has settled provider-owned inventory and is rebuilding the canonical monitored-system view, so this connection cannot be saved yet. Retry preview in a moment.',
- );
+ expect(result.monitoredSystemPreview()).toMatchObject({
+ projected_count: 1,
+ effect: 'attaches_existing',
+ });
+ expect(result.monitoredSystemPreviewError()).toBeNull();
expect(notificationStore.error).toHaveBeenCalledWith(
- 'Pulse has settled provider-owned inventory and is rebuilding the canonical monitored-system view, so this connection cannot be saved yet. Retry preview in a moment.',
+ 'Unable to verify monitored-system grouping right now',
);
});
});
diff --git a/frontend-modern/src/components/Settings/useProLicensePanelState.ts b/frontend-modern/src/components/Settings/useProLicensePanelState.ts
index cb31b5b82..928c9c785 100644
--- a/frontend-modern/src/components/Settings/useProLicensePanelState.ts
+++ b/frontend-modern/src/components/Settings/useProLicensePanelState.ts
@@ -18,12 +18,10 @@ import {
getSelfHostedPlanComparisonPresentation,
getSelfHostedCurrentPlanPresentation,
getLicenseFeatureLabel,
- getMonitoredSystemContinuityNotice,
getPurchaseActivationNotice,
getSelfHostedCurrentPlanStatusPresentation,
getLicenseSubscriptionStatusPresentation,
getLicenseTierLabel,
- getDisplayableMonitoredSystemContinuity,
isDisplayableLicenseFeature,
} from '@/utils/licensePresentation';
import {
@@ -31,10 +29,8 @@ import {
getSelfHostedBillingPlanDetail,
getSelfHostedBillingPlanIntent,
getSelfHostedBillingPurchaseArrival,
- getSelfHostedBillingUsageDetail,
resolveSelfHostedBillingSection,
resolveSelfHostedPurchaseStartDestination,
- SELF_HOSTED_PRO_BILLING_COUNTING_RULES_DETAIL,
SELF_HOSTED_PRO_BILLING_PLAN_SELECTION_INTENT,
SELF_HOSTED_PRO_BILLING_RECOVERY_DETAIL,
SELF_HOSTED_PRO_BILLING_PURCHASE_ACTIVATED,
@@ -47,23 +43,14 @@ import {
SELF_HOSTED_PRO_BILLING_PLAN_INTENT_QUERY_PARAM,
SELF_HOSTED_PRO_BILLING_PLAN_ROUTE,
SELF_HOSTED_PRO_BILLING_PURCHASE_QUERY_PARAM,
- SELF_HOSTED_PRO_BILLING_USAGE_HREF,
- SELF_HOSTED_PRO_BILLING_USAGE_ROUTE,
type SelfHostedBillingPlanIntent,
type SelfHostedBillingSection,
} from '@/utils/pricingHandoff';
import {
buildSelfHostedCommercialPlanModel,
LIFETIME_DAYS_REMAINING_LABEL,
- SELF_HOSTED_NOT_METERED_LABEL,
} from '@/utils/commercialBillingModel';
import { getSelfHostedPlanDefinitionForBillingTier } from '@/utils/selfHostedPlans';
-import {
- buildMonitoredSystemCapacitySectionModel,
- getMonitoredSystemLimitCapacityStatusSummary,
- getMonitoredSystemLimitUsageSummary,
- resolveMonitoredSystemCapacityStatus,
-} from '@/utils/monitoredSystemPresentation';
import { resolveUpgradeDestination, type UpgradeDestination } from '@/utils/upgradeNavigation';
import { SELF_HOSTED_PRO_BILLING_PRESENTATION } from './selfHostedBillingPresentation';
@@ -148,104 +135,30 @@ export function useProLicensePanelState() {
resolveSelfHostedBillingSection(location.pathname, location.search, location.hash),
);
- const limitStatus = (key: string) => entitlements()?.limits?.find((entry) => entry.key === key);
- const monitoredSystemContinuity = createMemo(() => entitlements()?.monitored_system_continuity);
const selfHostedPlanDefinition = createMemo(() =>
getSelfHostedPlanDefinitionForBillingTier(entitlements()?.tier),
);
- const usesCanonicalSelfHostedPlan = createMemo(() => Boolean(selfHostedPlanDefinition()));
- const monitoredSystemLimitStatus = createMemo(() =>
- usesCanonicalSelfHostedPlan() ? undefined : limitStatus('max_monitored_systems'),
- );
- const monitoredSystemCapacity = createMemo(() =>
- usesCanonicalSelfHostedPlan() ? undefined : entitlements()?.monitored_system_capacity,
- );
- const displayableMonitoredSystemContinuity = createMemo(() => {
- if (usesCanonicalSelfHostedPlan()) {
- return null;
- }
- return getDisplayableMonitoredSystemContinuity({
- continuity: monitoredSystemContinuity(),
- planVersion: entitlements()?.plan_version,
- isLifetime: entitlements()?.is_lifetime,
- subscriptionState: entitlements()?.subscription_state,
- });
- });
-
- const showUsageSection = createMemo(() => {
- if (!panelDataSettled()) {
- return true;
- }
- if (usesCanonicalSelfHostedPlan()) {
- return false;
- }
-
- const continuity = displayableMonitoredSystemContinuity();
- if (continuity) {
- if (continuity.capture_pending) {
- return true;
- }
- if (typeof continuity.plan_limit === 'number' && continuity.plan_limit > 0) {
- return true;
- }
- if (typeof continuity.effective_limit === 'number' && continuity.effective_limit > 0) {
- return true;
- }
- if (
- typeof continuity.grandfathered_floor === 'number' &&
- continuity.grandfathered_floor > 0
- ) {
- return true;
- }
- }
-
- const resolved = resolveMonitoredSystemCapacityStatus(
- monitoredSystemCapacity(),
- monitoredSystemLimitStatus(),
- );
- return Boolean(resolved && resolved.limit > 0);
- });
const activeSection = createMemo(() => {
- if (!panelDataSettled()) {
- return requestedSection();
- }
- if (requestedSection() === 'usage' && !showUsageSection()) {
- return 'plan';
- }
- return requestedSection();
+ return requestedSection() === 'usage' ? 'plan' : requestedSection();
});
createEffect(() => {
if (!panelDataSettled()) {
return;
}
- if (requestedSection() !== 'usage' || showUsageSection()) {
+ if (requestedSection() !== 'usage') {
return;
}
navigate(SELF_HOSTED_PRO_BILLING_PLAN_ROUTE, { replace: true, scroll: false });
});
const setActiveSection = (section: string) => {
- if (section !== 'plan' && section !== 'usage') {
+ if (section !== 'plan') {
return;
}
- if (section === 'usage' && panelDataSettled() && !showUsageSection()) {
- navigate(SELF_HOSTED_PRO_BILLING_PLAN_ROUTE, { replace: false, scroll: false });
- return;
- }
- const nextPath =
- section === 'usage'
- ? SELF_HOSTED_PRO_BILLING_USAGE_ROUTE
- : SELF_HOSTED_PRO_BILLING_PLAN_ROUTE;
- navigate(nextPath, { replace: false, scroll: false });
+ navigate(SELF_HOSTED_PRO_BILLING_PLAN_ROUTE, { replace: false, scroll: false });
};
- const showCountingRulesByDefault = createMemo(
- () =>
- activeSection() === 'usage' &&
- getSelfHostedBillingUsageDetail(location.search) ===
- SELF_HOSTED_PRO_BILLING_COUNTING_RULES_DETAIL,
- );
const showRecoveryByDefault = createMemo(
() =>
activeSection() === 'plan' &&
@@ -336,58 +249,7 @@ export function useProLicensePanelState() {
return segments.length === 3 && segments.every((segment) => segment.length > 0);
});
- const monitoredSystemUsageSummary = createMemo(() => {
- const limit = monitoredSystemLimitStatus();
- const capacity = monitoredSystemCapacity();
- if (!limit && !capacity && usesCanonicalSelfHostedPlan()) {
- return SELF_HOSTED_NOT_METERED_LABEL;
- }
- return getMonitoredSystemLimitUsageSummary(limit, capacity);
- });
- const monitoredSystemCapacityStatusSummary = createMemo(() => {
- const limit = monitoredSystemLimitStatus();
- const capacity = monitoredSystemCapacity();
- if (!limit && !capacity && usesCanonicalSelfHostedPlan()) {
- return SELF_HOSTED_NOT_METERED_LABEL;
- }
- return getMonitoredSystemLimitCapacityStatusSummary(limit, capacity);
- });
const currentRetailPlanDefinition = createMemo(() => selfHostedPlanDefinition());
- const monitoredSystemContinuityNotice = createMemo(() => {
- const continuity = displayableMonitoredSystemContinuity();
- if (!continuity) {
- return null;
- }
- return getMonitoredSystemContinuityNotice(
- continuity,
- monitoredSystemLimitStatus(),
- monitoredSystemCapacity(),
- {
- planVersion: entitlements()?.plan_version,
- isLifetime: entitlements()?.is_lifetime,
- subscriptionState: entitlements()?.subscription_state,
- },
- );
- });
- const monitoredSystemCapacitySection = createMemo(() => {
- const section = buildMonitoredSystemCapacitySectionModel(
- monitoredSystemLimitStatus(),
- monitoredSystemCapacity(),
- );
- if (!section) {
- return null;
- }
- return {
- ...section,
- reviewUsageDestination: resolveUpgradeDestination(SELF_HOSTED_PRO_BILLING_USAGE_HREF),
- };
- });
- const continuityCapturedAt = createMemo(() => {
- const capturedAt = displayableMonitoredSystemContinuity()?.captured_at;
- return typeof capturedAt === 'number' && capturedAt > 0
- ? formatUnixDate(capturedAt)
- : undefined;
- });
const purchaseActivationNotice = createMemo(() => {
if (purchaseActivationResult().trim().toLowerCase() === 'activated') {
@@ -466,16 +328,7 @@ export function useProLicensePanelState() {
planTerms: formattedPlanTerms() || undefined,
expires: displayedExpiry(),
daysRemaining: displayedDaysRemaining() ?? 'Unknown',
- monitoredSystemsSummary: monitoredSystemUsageSummary(),
- capacityStatusSummary: monitoredSystemCapacityStatusSummary(),
- maxMonitoredSystems:
- typeof monitoredSystemLimitStatus()?.limit === 'number' &&
- monitoredSystemLimitStatus()!.limit > 0
- ? monitoredSystemLimitStatus()!.limit
- : SELF_HOSTED_NOT_METERED_LABEL,
retailPlanDefinition: currentRetailPlanDefinition(),
- monitoredSystemContinuity: displayableMonitoredSystemContinuity() ?? null,
- continuityCapturedAt: continuityCapturedAt(),
}),
);
const currentPlanSummary = createMemo(() => {
@@ -573,11 +426,6 @@ export function useProLicensePanelState() {
commercialPlanModel,
currentPlanSummary,
planComparisonSummary,
- monitoredSystemCapacity,
- monitoredSystemLimitStatus,
- displayableMonitoredSystemContinuity,
- monitoredSystemCapacitySection,
- monitoredSystemContinuityNotice,
entitlements,
formattedFeatures,
grandfatheredPriceNotice,
@@ -593,8 +441,6 @@ export function useProLicensePanelState() {
purchaseActivationAction,
setActiveSection,
setLicenseKey,
- showUsageSection,
- showCountingRulesByDefault,
showRecoveryByDefault,
statusPresentation,
};
diff --git a/frontend-modern/src/components/Settings/useTrueNASSettingsPanelState.ts b/frontend-modern/src/components/Settings/useTrueNASSettingsPanelState.ts
index f39973527..1cf791ee2 100644
--- a/frontend-modern/src/components/Settings/useTrueNASSettingsPanelState.ts
+++ b/frontend-modern/src/components/Settings/useTrueNASSettingsPanelState.ts
@@ -5,7 +5,6 @@ import type { MonitoredSystemLedgerPreviewResponse } from '@/api/monitoredSystem
import {
apiErrorCode,
apiErrorDetailField,
- apiErrorMonitoredSystemPreview,
apiErrorStatus,
} from '@/api/responseUtils';
import {
@@ -15,9 +14,8 @@ import {
type TrueNASConnectionInput,
} from '@/api/truenas';
import {
- buildMonitoredSystemAdmissionPreviewUnavailableState,
- getMonitoredSystemAdmissionPreviewSaveBlockedMessage,
- type MonitoredSystemAdmissionPreviewUnavailableState,
+ buildMonitoredSystemImpactPreviewUnavailableState,
+ type MonitoredSystemImpactPreviewUnavailableState,
} from '@/utils/monitoredSystemPresentation';
type TrueNASAuthMode = 'apiKey' | 'userpass';
@@ -131,8 +129,8 @@ const getErrorMessage = (error: unknown, fallback: string): string => {
return fallback;
};
-const monitoredSystemAdmissionPreviewUnavailableStateFromError = (error: unknown) => {
- return buildMonitoredSystemAdmissionPreviewUnavailableState({
+const monitoredSystemImpactPreviewUnavailableStateFromError = (error: unknown) => {
+ return buildMonitoredSystemImpactPreviewUnavailableState({
code: apiErrorCode(error),
reason: apiErrorDetailField(error, 'reason'),
});
@@ -191,7 +189,7 @@ export function useTrueNASSettingsPanelState() {
const [monitoredSystemPreview, setMonitoredSystemPreview] =
createSignal(null);
const [monitoredSystemPreviewUnavailableState, setMonitoredSystemPreviewUnavailableState] =
- createSignal(null);
+ createSignal(null);
const [monitoredSystemPreviewGenericError, setMonitoredSystemPreviewGenericError] = createSignal<
string | null
>(null);
@@ -201,18 +199,6 @@ export function useTrueNASSettingsPanelState() {
const monitoredSystemPreviewError = createMemo(
() => monitoredSystemPreviewUnavailableState()?.message ?? monitoredSystemPreviewGenericError(),
);
- const monitoredSystemAdmissionSaveBlockedMessage = createMemo(() =>
- getMonitoredSystemAdmissionPreviewSaveBlockedMessage({
- preview: monitoredSystemPreview(),
- unavailableState: monitoredSystemPreviewUnavailableState(),
- error: monitoredSystemPreviewGenericError(),
- loading: previewing(),
- }),
- );
- const monitoredSystemAdmissionSaveBlocked = createMemo(
- () => monitoredSystemAdmissionSaveBlockedMessage() !== null,
- );
-
const editingConnection = createMemo(
() => connections().find((connection) => connection.id === editingConnectionId()) ?? null,
);
@@ -352,7 +338,7 @@ export function useTrueNASSettingsPanelState() {
setMonitoredSystemPreviewGenericError(null);
return preview;
} catch (error) {
- const unavailableState = monitoredSystemAdmissionPreviewUnavailableStateFromError(error);
+ const unavailableState = monitoredSystemImpactPreviewUnavailableStateFromError(error);
setMonitoredSystemPreview(null);
if (unavailableState) {
setMonitoredSystemPreviewUnavailableState(unavailableState);
@@ -371,11 +357,6 @@ export function useTrueNASSettingsPanelState() {
};
const saveCurrentForm = async () => {
- const blockedMessage = monitoredSystemAdmissionSaveBlockedMessage();
- if (blockedMessage) {
- notificationStore.error(blockedMessage);
- return;
- }
setSaving(true);
try {
const payload = buildConnectionInput(form());
@@ -389,22 +370,8 @@ export function useTrueNASSettingsPanelState() {
resetDialogState();
await loadConnections();
} catch (error) {
- const unavailableState = monitoredSystemAdmissionPreviewUnavailableStateFromError(error);
- const preview = apiErrorMonitoredSystemPreview(error);
- if (preview) {
- setMonitoredSystemPreview(preview);
- setMonitoredSystemPreviewUnavailableState(null);
- setMonitoredSystemPreviewGenericError(null);
- } else if (unavailableState) {
- setMonitoredSystemPreview(null);
- setMonitoredSystemPreviewUnavailableState(unavailableState);
- setMonitoredSystemPreviewGenericError(null);
- } else {
- setMonitoredSystemPreviewUnavailableState(null);
- }
- const message = unavailableState
- ? unavailableState.message
- : getErrorMessage(error, 'Failed to save TrueNAS connection');
+ setMonitoredSystemPreviewUnavailableState(null);
+ const message = getErrorMessage(error, 'Failed to save TrueNAS connection');
notificationStore.error(message);
logger.error('[TrueNAS Settings] Save failed', error);
} finally {
@@ -450,7 +417,6 @@ export function useTrueNASSettingsPanelState() {
openEditDialog,
pendingDeleteConnection,
previewCurrentForm,
- monitoredSystemAdmissionSaveBlocked,
monitoredSystemPreview,
monitoredSystemPreviewError,
monitoredSystemPreviewErrorTitle,
diff --git a/frontend-modern/src/components/Settings/useVMwareSettingsPanelState.ts b/frontend-modern/src/components/Settings/useVMwareSettingsPanelState.ts
index 94c9ce175..a7fff097b 100644
--- a/frontend-modern/src/components/Settings/useVMwareSettingsPanelState.ts
+++ b/frontend-modern/src/components/Settings/useVMwareSettingsPanelState.ts
@@ -9,15 +9,13 @@ import {
import {
apiErrorCode,
apiErrorDetailField,
- apiErrorMonitoredSystemPreview,
apiErrorStatus,
} from '@/api/responseUtils';
import { notificationStore } from '@/stores/notifications';
import { logger } from '@/utils/logger';
import {
- buildMonitoredSystemAdmissionPreviewUnavailableState,
- getMonitoredSystemAdmissionPreviewSaveBlockedMessage,
- type MonitoredSystemAdmissionPreviewUnavailableState,
+ buildMonitoredSystemImpactPreviewUnavailableState,
+ type MonitoredSystemImpactPreviewUnavailableState,
} from '@/utils/monitoredSystemPresentation';
import {
buildVMwareConnectionFailurePresentation,
@@ -99,8 +97,8 @@ const getErrorMessage = (error: unknown, fallback: string): string => {
const getVMwareErrorMessage = (error: unknown, fallback: string): string =>
apiErrorDetailField(error, 'error') ?? getErrorMessage(error, fallback);
-const monitoredSystemAdmissionPreviewUnavailableStateFromError = (error: unknown) => {
- return buildMonitoredSystemAdmissionPreviewUnavailableState({
+const monitoredSystemImpactPreviewUnavailableStateFromError = (error: unknown) => {
+ return buildMonitoredSystemImpactPreviewUnavailableState({
code: apiErrorCode(error),
reason: apiErrorDetailField(error, 'reason'),
});
@@ -147,7 +145,7 @@ export function useVMwareSettingsPanelState() {
const [monitoredSystemPreview, setMonitoredSystemPreview] =
createSignal(null);
const [monitoredSystemPreviewUnavailableState, setMonitoredSystemPreviewUnavailableState] =
- createSignal(null);
+ createSignal(null);
const [monitoredSystemPreviewGenericError, setMonitoredSystemPreviewGenericError] = createSignal<
string | null
>(null);
@@ -157,18 +155,6 @@ export function useVMwareSettingsPanelState() {
const monitoredSystemPreviewError = createMemo(
() => monitoredSystemPreviewUnavailableState()?.message ?? monitoredSystemPreviewGenericError(),
);
- const monitoredSystemAdmissionSaveBlockedMessage = createMemo(() =>
- getMonitoredSystemAdmissionPreviewSaveBlockedMessage({
- preview: monitoredSystemPreview(),
- unavailableState: monitoredSystemPreviewUnavailableState(),
- error: monitoredSystemPreviewGenericError(),
- loading: previewing(),
- }),
- );
- const monitoredSystemAdmissionSaveBlocked = createMemo(
- () => monitoredSystemAdmissionSaveBlockedMessage() !== null,
- );
-
const editingConnection = createMemo(
() => connections().find((connection) => connection.id === editingConnectionId()) ?? null,
);
@@ -328,7 +314,7 @@ export function useVMwareSettingsPanelState() {
setMonitoredSystemPreviewGenericError(null);
return preview;
} catch (error) {
- const unavailableState = monitoredSystemAdmissionPreviewUnavailableStateFromError(error);
+ const unavailableState = monitoredSystemImpactPreviewUnavailableStateFromError(error);
if (unavailableState) {
setMonitoredSystemPreview(null);
setMonitoredSystemPreviewUnavailableState(unavailableState);
@@ -359,11 +345,6 @@ export function useVMwareSettingsPanelState() {
};
const saveCurrentForm = async () => {
- const blockedMessage = monitoredSystemAdmissionSaveBlockedMessage();
- if (blockedMessage) {
- notificationStore.error(blockedMessage);
- return;
- }
setSaving(true);
try {
const payload = buildConnectionInput(form());
@@ -377,22 +358,8 @@ export function useVMwareSettingsPanelState() {
resetDialogState();
await loadConnections();
} catch (error) {
- const unavailableState = monitoredSystemAdmissionPreviewUnavailableStateFromError(error);
- const preview = apiErrorMonitoredSystemPreview(error);
- if (preview) {
- setMonitoredSystemPreview(preview);
- setMonitoredSystemPreviewUnavailableState(null);
- setMonitoredSystemPreviewGenericError(null);
- } else if (unavailableState) {
- setMonitoredSystemPreview(null);
- setMonitoredSystemPreviewUnavailableState(unavailableState);
- setMonitoredSystemPreviewGenericError(null);
- } else {
- setMonitoredSystemPreviewUnavailableState(null);
- }
- const message = unavailableState
- ? unavailableState.message
- : getErrorMessage(error, 'Failed to save VMware connection');
+ setMonitoredSystemPreviewUnavailableState(null);
+ const message = getErrorMessage(error, 'Failed to save VMware connection');
notificationStore.error(message);
logger.error('[VMware Settings] Save failed', error);
} finally {
@@ -439,7 +406,6 @@ export function useVMwareSettingsPanelState() {
openEditDialog,
pendingDeleteConnection,
previewCurrentForm,
- monitoredSystemAdmissionSaveBlocked,
monitoredSystemPreview,
monitoredSystemPreviewError,
monitoredSystemPreviewErrorTitle,
diff --git a/frontend-modern/src/components/shared/MonitoredSystemLimitWarningBanner.tsx b/frontend-modern/src/components/shared/MonitoredSystemLimitWarningBanner.tsx
deleted file mode 100644
index 66f5f57f7..000000000
--- a/frontend-modern/src/components/shared/MonitoredSystemLimitWarningBanner.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Component, Show } from 'solid-js';
-import {
- MONITORED_SYSTEM_LIMIT_INSTALL_COLLECTORS_LABEL,
- MONITORED_SYSTEM_LIMIT_REVIEW_POLICY_LABEL,
-} from './monitoredSystemLimitWarningBannerModel';
-import { UpgradeLink } from './UpgradeLink';
-import { useMonitoredSystemLimitWarningBannerState } from './useMonitoredSystemLimitWarningBannerState';
-
-export const MonitoredSystemLimitWarningBanner: Component = () => {
- const state = useMonitoredSystemLimitWarningBannerState();
-
- return (
-
-
-
- {state.monitoredSystemSummary()}
-
- {MONITORED_SYSTEM_LIMIT_REVIEW_POLICY_LABEL}
-
-
-
- {MONITORED_SYSTEM_LIMIT_INSTALL_COLLECTORS_LABEL}
-
-
-
-