Extract shared helpers and import types from generated types.ts

- Use CrudEndpoints.Delete in RemoveHostEndpoint instead of manual implementation
- Extract TenantFeatureHelper for shared override fetching logic (dedup 2 endpoints + 1 view)
- Import Tenant/TenantHost types from generated types.ts instead of redeclaring inline
- Extract statusLabels/statusColors to shared tenantStatus.ts

Author: antosubash

modules/Tenants/src/SimpleModule.Tenants/Endpoints/TenantFeatures/DeleteTenantFeatureEndpoint.cs

@@ -22,9 +22,7 @@ public void Map(IEndpointRouteBuilder app) =>
                         return Results.NotFound();
                     }
 
-                    var tenantIdStr = id.Value.ToString(
-                        System.Globalization.CultureInfo.InvariantCulture
-                    );
+                    var tenantIdStr = id.Value.ToString(System.Globalization.CultureInfo.InvariantCulture);
                     var overrides = await featureFlags.GetOverridesAsync(flagName);
                     var tenantOverride = overrides.FirstOrDefault(o =>
                         o.OverrideType == OverrideType.Tenant

modules/Tenants/src/SimpleModule.Tenants/Endpoints/TenantFeatures/GetTenantFeaturesEndpoint.cs

@@ -23,22 +23,8 @@ public void Map(IEndpointRouteBuilder app) =>
                     }
 
                     var flags = (await featureFlags.GetAllFlagsAsync()).ToList();
-                    var tenantIdStr = id.Value.ToString(
-                        System.Globalization.CultureInfo.InvariantCulture
-                    );
-
-                    var overrideTasks = flags
-                        .Where(f => !f.IsDeprecated)
-                        .Select(f => featureFlags.GetOverridesAsync(f.Name));
-                    var allOverrides = await Task.WhenAll(overrideTasks);
-
-                    var tenantOverrides = allOverrides
-                        .SelectMany(o => o)
-                        .Where(o =>
-                            o.OverrideType == OverrideType.Tenant
-                            && string.Equals(o.OverrideValue, tenantIdStr, StringComparison.Ordinal)
-                        )
-                        .ToList();
+                    var tenantOverrides = await TenantFeatureHelper.GetOverridesForTenantAsync(
+                        featureFlags, flags, id);
 
                     return Results.Ok(new TenantFeaturesResponse(flags, tenantOverrides));
                 }

modules/Tenants/src/SimpleModule.Tenants/Endpoints/TenantFeatures/SetTenantFeatureEndpoint.cs

@@ -22,15 +22,12 @@ public void Map(IEndpointRouteBuilder app) =>
                         return Results.NotFound();
                     }
 
-                    var tenantIdStr = id.Value.ToString(
-                        System.Globalization.CultureInfo.InvariantCulture
-                    );
                     var result = await featureFlags.SetOverrideAsync(
                         flagName,
                         new SetOverrideRequest
                         {
                             OverrideType = OverrideType.Tenant,
-                            OverrideValue = tenantIdStr,
+                            OverrideValue = id.Value.ToString(System.Globalization.CultureInfo.InvariantCulture),
                             IsEnabled = request.IsEnabled,
                         }
                     );

modules/Tenants/src/SimpleModule.Tenants/Endpoints/TenantFeatures/TenantFeatureHelper.cs

@@ -0,0 +1,25 @@
+using SimpleModule.FeatureFlags.Contracts;
+using SimpleModule.Tenants.Contracts;
+
+namespace SimpleModule.Tenants.Endpoints.TenantFeatures;
+
+internal static class TenantFeatureHelper
+{
+    public static async Task<List<FeatureFlagOverride>> GetOverridesForTenantAsync(
+        IFeatureFlagContracts featureFlags,
+        IEnumerable<FeatureFlag> flags,
+        TenantId tenantId)
+    {
+        var tenantIdStr = tenantId.Value.ToString(System.Globalization.CultureInfo.InvariantCulture);
+        var overrideTasks = flags
+            .Where(f => !f.IsDeprecated)
+            .Select(f => featureFlags.GetOverridesAsync(f.Name));
+        var allOverrides = await Task.WhenAll(overrideTasks);
+        return allOverrides
+            .SelectMany(o => o)
+            .Where(o =>
+                o.OverrideType == OverrideType.Tenant
+                && string.Equals(o.OverrideValue, tenantIdStr, StringComparison.Ordinal))
+            .ToList();
+    }
+}

modules/Tenants/src/SimpleModule.Tenants/Endpoints/Tenants/RemoveHostEndpoint.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using SimpleModule.Core;
 using SimpleModule.Core.Authorization;
+using SimpleModule.Core.Endpoints;
 using SimpleModule.Tenants.Contracts;
 
 namespace SimpleModule.Tenants.Endpoints.Tenants;
@@ -12,11 +12,8 @@ public class RemoveHostEndpoint : IEndpoint
     public void Map(IEndpointRouteBuilder app) =>
         app.MapDelete(
                 "/{id}/hosts/{hostId}",
-                async (TenantId id, TenantHostId hostId, ITenantContracts contracts) =>
-                {
-                    await contracts.RemoveHostAsync(id, hostId);
-                    return TypedResults.NoContent();
-                }
+                (TenantId id, TenantHostId hostId, ITenantContracts contracts) =>
+                    CrudEndpoints.Delete(() => contracts.RemoveHostAsync(id, hostId))
             )
             .RequirePermission(TenantsPermissions.ManageHosts);
 }

modules/Tenants/src/SimpleModule.Tenants/Views/Browse.tsx

@@ -1,4 +1,5 @@
 import { Card, CardContent, PageShell } from '@simplemodule/ui';
+import { statusColors, statusLabels } from './tenantStatus';
 
 interface BrowseTenant {
   id: number;
@@ -8,13 +9,6 @@ interface BrowseTenant {
   hostCount: number;
 }
 
-const statusLabels: Record<number, string> = { 0: 'Active', 1: 'Suspended', 2: 'Inactive' };
-const statusColors: Record<number, string> = {
-  0: 'text-green-600',
-  1: 'text-yellow-600',
-  2: 'text-red-600',
-};
-
 export default function Browse({ tenants }: { tenants: BrowseTenant[] }) {
   return (
     <PageShell title="Tenants" description="Browse all tenants.">

modules/Tenants/src/SimpleModule.Tenants/Views/Edit.tsx

@@ -22,27 +22,8 @@ import {
   TableRow,
 } from '@simplemodule/ui';
 import { useState } from 'react';
-
-interface TenantHost {
-  id: number;
-  tenantId: number;
-  hostName: string;
-  isActive: boolean;
-}
-
-interface Tenant {
-  id: number;
-  name: string;
-  slug: string;
-  status: number;
-  adminEmail: string | null;
-  editionName: string | null;
-  connectionString: string | null;
-  validUpTo: string | null;
-  hosts: TenantHost[];
-}
-
-const statusLabels: Record<number, string> = { 0: 'Active', 1: 'Suspended', 2: 'Inactive' };
+import type { Tenant } from '../types';
+import { statusLabels } from './tenantStatus';
 
 export default function Edit({ tenant }: { tenant: Tenant }) {
   const [newHost, setNewHost] = useState('');

modules/Tenants/src/SimpleModule.Tenants/Views/FeaturesEndpoint.cs

@@ -7,6 +7,7 @@
 using SimpleModule.Core.Inertia;
 using SimpleModule.FeatureFlags.Contracts;
 using SimpleModule.Tenants.Contracts;
+using SimpleModule.Tenants.Endpoints.TenantFeatures;
 
 namespace SimpleModule.Tenants.Views;
 
@@ -35,22 +36,8 @@ public void Map(IEndpointRouteBuilder app)
                     }
 
                     var flags = (await featureFlags.GetAllFlagsAsync()).ToList();
-                    var tenantIdStr = id.Value.ToString(
-                        System.Globalization.CultureInfo.InvariantCulture
-                    );
-
-                    var overrideTasks = flags
-                        .Where(f => !f.IsDeprecated)
-                        .Select(f => featureFlags.GetOverridesAsync(f.Name));
-                    var allOverrides = await Task.WhenAll(overrideTasks);
-
-                    var tenantOverrides = allOverrides
-                        .SelectMany(o => o)
-                        .Where(o =>
-                            o.OverrideType == OverrideType.Tenant
-                            && string.Equals(o.OverrideValue, tenantIdStr, StringComparison.Ordinal)
-                        )
-                        .ToList();
+                    var tenantOverrides = await TenantFeatureHelper.GetOverridesForTenantAsync(
+                        featureFlags, flags, id);
 
                     return Inertia.Render(
                         "Tenants/Features",

modules/Tenants/src/SimpleModule.Tenants/Views/Manage.tsx

@@ -16,23 +16,8 @@ import {
   TableRow,
 } from '@simplemodule/ui';
 import { useState } from 'react';
-
-interface Tenant {
-  id: number;
-  name: string;
-  slug: string;
-  status: number;
-  adminEmail: string | null;
-  editionName: string | null;
-  hosts: { id: number; hostName: string; isActive: boolean }[];
-}
-
-const statusLabels: Record<number, string> = { 0: 'Active', 1: 'Suspended', 2: 'Inactive' };
-const statusColors: Record<number, string> = {
-  0: 'text-green-600',
-  1: 'text-yellow-600',
-  2: 'text-red-600',
-};
+import type { Tenant } from '../types';
+import { statusColors, statusLabels } from './tenantStatus';
 
 export default function Manage({ tenants }: { tenants: Tenant[] }) {
   const [deleteTarget, setDeleteTarget] = useState<{ id: number; name: string } | null>(null);

modules/Tenants/src/SimpleModule.Tenants/Views/tenantStatus.ts

@@ -0,0 +1,11 @@
+export const statusLabels: Record<number, string> = {
+  0: 'Active',
+  1: 'Suspended',
+  2: 'Inactive',
+};
+
+export const statusColors: Record<number, string> = {
+  0: 'text-green-600',
+  1: 'text-yellow-600',
+  2: 'text-red-600',
+};