Improve premium search enforcement and Svelte upgrade guidance

src/Exceptionless.Web/ClientApp/src/lib/features/events/premium-filter.test.ts

@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest';
+
+import { filterUsesPremiumFeatures } from './premium-filter';
+
+describe('filterUsesPremiumFeatures', () => {
+    it.each([undefined, null, '', 'status:open', '(status:open OR status:regressed)', 'reference:ABC123'])('allows free event filters: %s', (filter) => {
+        expect(filterUsesPremiumFeatures(filter, 'event')).toBe(false);
+    });
+
+    it.each(['tags:important', 'data.user.identity:blake', 'message:"out of memory"'])('detects premium event filters: %s', (filter) => {
+        expect(filterUsesPremiumFeatures(filter, 'event')).toBe(true);
+    });
+
+    it.each(['first_occurrence:[now-1d TO now]', 'last:now', 'occurrences_are_critical:true', 'critical:false', 'project:ABC123'])(
+        'allows free stack filters: %s',
+        (filter) => {
+            expect(filterUsesPremiumFeatures(filter, 'stack')).toBe(false);
+        }
+    );
+
+    it.each(['title:"out of memory"', 'reference:ABC123', 'stack:ABC123', 'tags:important'])('detects premium stack filters: %s', (filter) => {
+        expect(filterUsesPremiumFeatures(filter, 'stack')).toBe(true);
+    });
+
+    it('detects a premium field after a free field', () => {
+        expect(filterUsesPremiumFeatures('status:open AND tags:important', 'event')).toBe(true);
+    });
+});

src/Exceptionless.Web/ClientApp/src/lib/features/events/premium-filter.ts

@@ -1,33 +1,36 @@
-/**
- * Free query fields that don't require a premium plan.
- * Any field referenced in a filter that is NOT in this set requires premium features.
- * Must be kept in sync with PersistentEventQueryValidator._freeQueryFields on the backend.
- */
-const FREE_QUERY_FIELDS = new Set([
-    'date',
-    'organization',
-    'organization_id',
-    'project',
-    'project_id',
-    'reference',
-    'reference_id',
-    'stack',
-    'stack_id',
-    'status',
-    'type'
-]);
+export type SearchResource = 'event' | 'stack';
+
+// These mirror the backend query validators so the upgrade notification is shown
+// before a restricted request fails. The API remains the enforcement boundary.
+const FREE_QUERY_FIELDS: Record<SearchResource, ReadonlySet<string>> = {
+    event: new Set(['date', 'organization', 'organization_id', 'project', 'project_id', 'reference', 'reference_id', 'stack', 'stack_id', 'status', 'type']),
+    stack: new Set([
+        'critical',
+        'first',
+        'first_occurrence',
+        'last',
+        'last_occurrence',
+        'occurrences_are_critical',
+        'organization',
+        'organization_id',
+        'project',
+        'project_id',
+        'status',
+        'type'
+    ])
+};
 
 /**
  * Returns true if the filter string references fields that require a premium plan.
  * Uses client-side field detection to avoid an extra API call.
  */
-export function filterUsesPremiumFeatures(filter: null | string | undefined): boolean {
+export function filterUsesPremiumFeatures(filter: null | string | undefined, resource: SearchResource): boolean {
     if (!filter) {
         return false;
     }
 
     const fields = extractFilterFields(filter);
-    return fields.some((field) => !FREE_QUERY_FIELDS.has(field.toLowerCase()));
+    return fields.some((field) => !FREE_QUERY_FIELDS[resource].has(field.toLowerCase()));
 }
 
 /**

src/Exceptionless.Web/ClientApp/src/routes/(app)/+layout.svelte

@@ -11,7 +11,6 @@
     import { accessToken, gotoLogin } from '$features/auth/index.svelte';
     import { UpgradeRequiredDialog } from '$features/billing';
     import { invalidatePersistentEventQueries } from '$features/events/api.svelte';
-    import { filterUsesPremiumFeatures } from '$features/events/premium-filter';
     import { buildIntercomBootOptions, IntercomShell } from '$features/intercom';
     import { shouldLoadIntercomOrganization } from '$features/intercom/config';
     import Notifications from '$features/notifications/components/notifications.svelte';
@@ -51,7 +50,7 @@
 
     let { children }: Props = $props();
     let isAuthenticated = $derived(!!accessToken.current);
-    let requiresPremium = $derived(premiumPage.requiresPremium || filterUsesPremiumFeatures(page.url.searchParams.get('filter')));
+    let requiresPremium = $derived(premiumPage.requiresPremium);
     const sidebar = useSidebar();
     let isCommandOpen = $state(false);
     let commandResetKey = $state(0);

src/Exceptionless.Web/ClientApp/src/routes/(app)/event/+page.svelte

@@ -43,7 +43,9 @@
     import EventsBulkActionsDropdownMenu from '$features/events/components/table/events-bulk-actions-dropdown-menu.svelte';
     import EventsDataTable from '$features/events/components/table/events-data-table.svelte';
     import { defaultEventColumnVisibility, getColumns } from '$features/events/components/table/options.svelte';
+    import { filterUsesPremiumFeatures } from '$features/events/premium-filter';
     import { organization } from '$features/organizations/context.svelte';
+    import { premiumPage } from '$features/organizations/premium-page.svelte';
     import SavedViewPicker from '$features/saved-views/components/saved-view-picker.svelte';
     import { useSavedViews } from '$features/saved-views/use-saved-views.svelte';
     import * as agg from '$features/shared/api/aggregations';
@@ -642,6 +644,10 @@
         }
     });
 
+    $effect(() => {
+        premiumPage.current = filterUsesPremiumFeatures(eventsQueryParameters.filter, 'event') ? 'search' : undefined;
+    });
+
     const client = useFetchClient();
     const clientStatus = useFetchClientStatus(client);
     let clientResponse = $state<FetchClientResponse<EventSummaryModel<SummaryTemplateKeys>[]>>();

src/Exceptionless.Web/ClientApp/src/routes/(app)/stack/+page.svelte

@@ -39,7 +39,9 @@
     import OrganizationDefaultsFacetedFilterBuilder from '$features/events/components/filters/organization-defaults-faceted-filter-builder.svelte';
     import EventsDataTable from '$features/events/components/table/events-data-table.svelte';
     import { getColumns } from '$features/events/components/table/options.svelte';
+    import { filterUsesPremiumFeatures } from '$features/events/premium-filter';
     import { organization } from '$features/organizations/context.svelte';
+    import { premiumPage } from '$features/organizations/premium-page.svelte';
     import SavedViewPicker from '$features/saved-views/components/saved-view-picker.svelte';
     import { useSavedViews } from '$features/saved-views/use-saved-views.svelte';
     import * as agg from '$features/shared/api/aggregations';
@@ -610,6 +612,10 @@
         }
     });
 
+    $effect(() => {
+        premiumPage.current = filterUsesPremiumFeatures(eventsQueryParameters.filter, 'stack') ? 'search' : undefined;
+    });
+
     const client = useFetchClient();
     const clientStatus = useFetchClientStatus(client);
     let clientResponse = $state<FetchClientResponse<EventSummaryModel<SummaryTemplateKeys>[]>>();

src/Exceptionless.Web/Controllers/Base/ExceptionlessApiController.cs

@@ -229,6 +229,11 @@ protected ObjectResult PlanLimitReached(string message)
         return Problem(statusCode: StatusCodes.Status426UpgradeRequired, title: message);
     }
 
+    protected bool IsPremiumFeatureQueryBlocked(AppFilter filter)
+    {
+        return filter.UsesPremiumFeatures && filter.Organizations.Any(o => !o.HasPremiumFeatures);
+    }
+
     protected ObjectResult TooManyRequests(string message)
     {
         return Problem(statusCode: StatusCodes.Status429TooManyRequests, title: message);

src/Exceptionless.Web/Controllers/EventController.cs

@@ -246,6 +246,8 @@ private async Task<ActionResult<CountResult>> CountInternalAsync(AppFilter sf, T
             return BadRequest(far.Message);
 
         sf.UsesPremiumFeatures = pr.UsesPremiumFeatures || far.UsesPremiumFeatures;
+        if (IsPremiumFeatureQueryBlocked(sf))
+            return PlanLimitReached("Please upgrade your plan to use premium search features.");
 
         if (mode == "stack_new")
             filter = AddFirstOccurrenceFilter(ti.Range, filter);
@@ -302,6 +304,8 @@ private async Task<ActionResult<ICollection<PersistentEvent>>> GetInternalAsync(
             return BadRequest(pr.Message);
 
         sf.UsesPremiumFeatures = pr.UsesPremiumFeatures || usesPremiumFeatures;
+        if (IsPremiumFeatureQueryBlocked(sf))
+            return PlanLimitReached("Please upgrade your plan to use premium search features.");
 
         try
         {

src/Exceptionless.Web/Controllers/StackController.cs

@@ -490,6 +490,8 @@ private async Task<ActionResult<IReadOnlyCollection<Stack>>> GetInternalAsync(Ap
             return BadRequest(pr.Message);
 
         sf.UsesPremiumFeatures = pr.UsesPremiumFeatures;
+        if (IsPremiumFeatureQueryBlocked(sf))
+            return PlanLimitReached("Please upgrade your plan to use premium search features.");
 
         try
         {

tests/Exceptionless.Tests/Controllers/EventControllerTests.cs

@@ -720,6 +720,36 @@ public async Task CanGetFreeProjectLevelMostFrequentStackMode()
         Assert.Equal(2, results.Count);
     }
 
+    [Fact]
+    public async Task GetCountByProjectAsync_WithPremiumFilterOnFreeOrganization_ReturnsUpgradeRequired()
+    {
+        // Arrange
+        await CreateDataAsync(d => d.Event().FreeProject().Tag("premium-tag"));
+
+        // Act & Assert
+        await SendRequestAsync(r => r
+            .AsFreeOrganizationUser()
+            .AppendPaths("projects", SampleDataService.FREE_PROJECT_ID, "events", "count")
+            .QueryString("filter", "tags:premium-tag")
+            .StatusCodeShouldBeUpgradeRequired()
+        );
+    }
+
+    [Fact]
+    public async Task GetByProjectAsync_WithPremiumFilterOnFreeOrganization_ReturnsUpgradeRequired()
+    {
+        // Arrange
+        await CreateDataAsync(d => d.Event().FreeProject().Tag("premium-tag"));
+
+        // Act & Assert
+        await SendRequestAsync(r => r
+            .AsFreeOrganizationUser()
+            .AppendPaths("projects", SampleDataService.FREE_PROJECT_ID, "events")
+            .QueryString("filter", "tags:premium-tag")
+            .StatusCodeShouldBeUpgradeRequired()
+        );
+    }
+
     [Fact]
     public async Task CanGetNewStackMode()
     {

tests/Exceptionless.Tests/Controllers/StackControllerTests.cs

@@ -61,6 +61,21 @@ public async Task CanSearchByNonPremiumFields()
         Assert.Single(result);
     }
 
+    [Fact]
+    public async Task GetByProjectAsync_WithPremiumFilterOnFreeOrganization_ReturnsUpgradeRequired()
+    {
+        // Arrange
+        await CreateDataAsync(d => d.Event().FreeProject().Message("Premium restricted stack"));
+
+        // Act & Assert
+        await SendRequestAsync(r => r
+            .AsFreeOrganizationUser()
+            .AppendPaths("projects", SampleDataService.FREE_PROJECT_ID, "stacks")
+            .QueryString("filter", "title:\"Premium restricted stack\"")
+            .StatusCodeShouldBeUpgradeRequired()
+        );
+    }
+
     [Theory]
     [InlineData(null)]
     [InlineData("1.0.0")]