diff --git a/.dockerignore b/.dockerignore index d3efc04..373ab56 100644 --- a/.dockerignore +++ b/.dockerignore @@ -11,6 +11,7 @@ **/*.user **/*.dbmdl **/*.jfm +**/*.db **/secrets.dev.yaml **/values.dev.yaml **/Tiltfile diff --git a/Dockerfile b/Dockerfile index b367782..90029eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,9 +21,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libcurl4 \ && rm -rf /var/lib/apt/lists/* +# Run as non-root +RUN addgroup --system appgroup && adduser --system --ingroup appgroup appuser +RUN mkdir -p /app/Data && chown appuser:appgroup /app/Data + COPY --from=build /app/publish . +RUN chown -R appuser:appgroup /app + +USER appuser ENV ASPNETCORE_URLS=http://+:8080 +ENV ASPNETCORE_ENVIRONMENT=Production + +# SQLite database lives here — mount a persistent volume at /app/Data +VOLUME ["/app/Data"] + EXPOSE 8080 ENTRYPOINT ["dotnet", "EntKube.Web.dll"] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..efcf487 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,59 @@ +services: + postgres: + image: postgres:17 + environment: + POSTGRES_DB: entkube + POSTGRES_USER: entkube + POSTGRES_PASSWORD: "${POSTGRES_PASSWORD:-changeme}" + volumes: + - postgres-data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U entkube -d entkube"] + interval: 5s + timeout: 5s + retries: 10 + start_period: 10s + restart: unless-stopped + + entkube: + build: + context: . + dockerfile: Dockerfile + image: entkube:latest + ports: + - "8080:8080" + volumes: + - entkube-data:/app/Data + depends_on: + postgres: + condition: service_healthy + environment: + # --- Database --- + DatabaseProvider: Postgres + ConnectionStrings__DefaultConnection: "Host=postgres;Port=5432;Database=entkube;Username=entkube;Password=${POSTGRES_PASSWORD:-changeme}" + + # --- Vault encryption --- + # Required. Generate with: openssl rand -base64 32 + Vault__RootKey: "REPLACE_WITH_BASE64_32_BYTE_KEY" + + # --- Auth --- + # Set to false after the first admin account is created. + Auth__AllowRegistration: "true" + + # --- Bootstrap --- + # Optional. If set, this user is granted the Admin role on every startup + # (no-op if already admin). Useful for recovering access. + # Seed__AdminEmail: "admin@example.com" + + # --- Email / SMTP (optional) --- + # Smtp__Host: "smtp.example.com" + # Smtp__Username: "user" + # Smtp__Password: "password" + # Smtp__FromAddress: "alerts@entkube.io" + restart: unless-stopped + +volumes: + # Named volumes are NOT removed by "docker compose down". + # Data is only deleted if you explicitly run "docker compose down -v". + postgres-data: + entkube-data: diff --git a/src/EntKube.Web/Components/Account/Pages/Register.razor b/src/EntKube.Web/Components/Account/Pages/Register.razor index f7612cf..db3a472 100644 --- a/src/EntKube.Web/Components/Account/Pages/Register.razor +++ b/src/EntKube.Web/Components/Account/Pages/Register.razor @@ -14,48 +14,58 @@ @inject ILogger Logger @inject NavigationManager NavigationManager @inject IdentityRedirectManager RedirectManager +@inject IConfiguration Configuration Register -

Register

+@if (!allowRegistration) +{ +

Registration Closed

+

Self-registration is currently disabled. Please contact an administrator to get access.

+} +else +{ +

Register

-
-
- - - -

Create a new account.

-
- -
- - - -
-
- - - -
-
- - - -
- - +
+
+ + + +

Create a new account.

+
+ +
+ + + +
+
+ + + +
+
+ + + +
+ + +
+
+
+

Use another service to register.

+
+ +
+
-
-
-

Use another service to register.

-
- -
-
-
+} @code { private IEnumerable? identityErrors; + private bool allowRegistration = true; [SupplyParameterFromForm] private InputModel Input { get; set; } = default!; @@ -68,10 +78,17 @@ protected override void OnInitialized() { Input ??= new(); + allowRegistration = Configuration.GetValue("Auth:AllowRegistration", true); } public async Task RegisterUser(EditContext editContext) { + if (!allowRegistration) + { + RedirectManager.RedirectTo("Account/Register"); + return; + } + var user = CreateUser(); await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None); diff --git a/src/EntKube.Web/Components/Layout/NavMenu.razor b/src/EntKube.Web/Components/Layout/NavMenu.razor index 3bea427..67d2823 100644 --- a/src/EntKube.Web/Components/Layout/NavMenu.razor +++ b/src/EntKube.Web/Components/Layout/NavMenu.razor @@ -3,6 +3,7 @@ @inject NavigationManager NavigationManager @inject AuthenticationStateProvider AuthStateProvider @inject EntKube.Web.Services.UserAccessService UserAccessService +@inject IConfiguration Configuration
@@ -43,6 +44,16 @@ +
+ + Users + +
+
+ + Roles + +
Backup @@ -69,11 +80,14 @@
-
- - Register - -
+ @if (allowRegistration) + { +
+ + Register + +
+ }
Login @@ -87,12 +101,15 @@ @code { private string? currentUrl; private bool showTenantsLink; + private bool allowRegistration = true; protected override async Task OnInitializedAsync() { currentUrl = NavigationManager.ToBaseRelativePath(NavigationManager.Uri); NavigationManager.LocationChanged += OnLocationChanged; + allowRegistration = Configuration.GetValue("Auth:AllowRegistration", true); + AuthenticationState authState = await AuthStateProvider.GetAuthenticationStateAsync(); System.Security.Claims.ClaimsPrincipal user = authState.User; diff --git a/src/EntKube.Web/Components/Pages/Admin/AdminRoles.razor b/src/EntKube.Web/Components/Pages/Admin/AdminRoles.razor new file mode 100644 index 0000000..6f00577 --- /dev/null +++ b/src/EntKube.Web/Components/Pages/Admin/AdminRoles.razor @@ -0,0 +1,365 @@ +@page "/admin/roles" +@using Microsoft.AspNetCore.Authorization +@using EntKube.Web.Data +@using EntKube.Web.Services +@rendermode InteractiveServer +@attribute [Authorize(Roles = "Admin")] + +@inject TenantRoleService RoleService +@inject TenantService TenantService + +Role Management + +
+
+

Role Management

+

Define roles and their feature permissions per tenant.

+
+
+ +@* ── Tenant selector ── *@ +
+
+
+ + +
+
+
+ +@if (selectedTenantId != Guid.Empty) +{ + @* ── Create role ── *@ +
+
+
+ + + +
+
+
+ + @if (!string.IsNullOrEmpty(errorMessage)) + { +
+ @errorMessage + +
+ } + + + @if (roles is not null && roles.Count == 0) + { + + } + else if (roles is not null) + { +
+ @foreach (TenantRole role in roles) + { + bool isExpanded = expandedRoleId == role.Id; + Dictionary perms = TenantRoleService.DecodePermissions(role.PermissionsJson); + +
+ @* ── Role header ── *@ +
+
+ + @if (editingNameId == role.Id) + { + + + + } + else + { + @role.Name + + @role.Memberships.Count members + + } +
+
+ + @if (confirmDeleteId == role.Id) + { + Delete? + + + } + else + { + + } +
+
+ + @* ── Permission matrix ── *@ + @if (isExpanded) + { + Dictionary draft = GetDraft(role.Id, perms); + bool isDirty = savedMessages.ContainsKey(role.Id) || IsDirty(role.Id, perms); + +
+
+ + + + + + + + + + + + @foreach ((TenantFeature feature, string label, string icon) in TenantRoleService.Features) + { + AccessLevel current = TenantRoleService.GetPermission(draft, feature); + + + @foreach (AccessLevel level in Enum.GetValues()) + { + + } + + } + +
FeatureNoneViewEditManage
+ @label + + +
+
+ +
+ + + @if (savedMessages.TryGetValue(role.Id, out string? msg)) + { + @msg + } +
+
+ } +
+ } +
+ } + +} + +@code { + private List allTenants = []; + private Guid selectedTenantId; + private List? roles; + private string newRoleName = ""; + private string? errorMessage; + + // Expand/collapse + private Guid? expandedRoleId; + + // Inline rename + private Guid? editingNameId; + private string editingName = ""; + + // Delete confirm + private Guid? confirmDeleteId; + + // Permission drafts: roleId → working copy of permissions + private Dictionary> drafts = []; + + // Save confirmation messages + private Dictionary savedMessages = []; + + protected override async Task OnInitializedAsync() + { + allTenants = await TenantService.GetAllTenantsAsync(); + } + + private async Task OnTenantChanged(ChangeEventArgs e) + { + selectedTenantId = Guid.TryParse(e.Value?.ToString(), out Guid id) ? id : Guid.Empty; + roles = null; + drafts.Clear(); + savedMessages.Clear(); + expandedRoleId = null; + errorMessage = null; + + if (selectedTenantId != Guid.Empty) + await LoadRoles(); + } + + private async Task LoadRoles() + { + roles = await RoleService.GetRolesAsync(selectedTenantId); + // Prune drafts for roles that no longer exist. + HashSet ids = roles.Select(r => r.Id).ToHashSet(); + foreach (Guid gone in drafts.Keys.Except(ids).ToList()) + drafts.Remove(gone); + } + + private async Task CreateRole() + { + if (string.IsNullOrWhiteSpace(newRoleName)) return; + errorMessage = null; + + try + { + TenantRole created = await RoleService.CreateRoleAsync(selectedTenantId, newRoleName.Trim()); + newRoleName = ""; + await LoadRoles(); + expandedRoleId = created.Id; + } + catch (Exception ex) + { + errorMessage = $"Could not create role: {ex.Message}"; + } + } + + private async Task DeleteRole(Guid roleId) + { + confirmDeleteId = null; + errorMessage = null; + + bool ok = await RoleService.DeleteRoleAsync(roleId); + if (!ok) errorMessage = "Role not found."; + + drafts.Remove(roleId); + savedMessages.Remove(roleId); + if (expandedRoleId == roleId) expandedRoleId = null; + + await LoadRoles(); + } + + private void ToggleExpand(Guid roleId) + { + expandedRoleId = expandedRoleId == roleId ? null : roleId; + } + + // ── Rename ── + + private void StartRename(Guid roleId, string currentName) + { + editingNameId = roleId; + editingName = currentName; + } + + private void CancelRename() + { + editingNameId = null; + editingName = ""; + } + + private async Task SaveRename(Guid roleId) + { + if (string.IsNullOrWhiteSpace(editingName)) return; + errorMessage = null; + + try + { + await RoleService.RenameRoleAsync(roleId, editingName.Trim()); + CancelRename(); + await LoadRoles(); + } + catch (Exception ex) + { + errorMessage = $"Could not rename role: {ex.Message}"; + } + } + + // ── Permission draft management ── + + private Dictionary GetDraft(Guid roleId, Dictionary saved) + { + if (!drafts.TryGetValue(roleId, out Dictionary? draft)) + { + draft = new Dictionary(saved); + drafts[roleId] = draft; + } + return draft; + } + + private void SetDraft(Guid roleId, TenantFeature feature, AccessLevel level) + { + if (!drafts.TryGetValue(roleId, out Dictionary? draft)) + { + draft = []; + drafts[roleId] = draft; + } + draft[feature] = level; + savedMessages.Remove(roleId); + } + + private void ResetDraft(Guid roleId, Dictionary saved) + { + drafts[roleId] = new Dictionary(saved); + savedMessages.Remove(roleId); + } + + private bool IsDirty(Guid roleId, Dictionary saved) + { + if (!drafts.TryGetValue(roleId, out Dictionary? draft)) return false; + foreach (TenantFeature f in Enum.GetValues()) + { + AccessLevel savedLevel = TenantRoleService.GetPermission(saved, f); + AccessLevel draftLevel = TenantRoleService.GetPermission(draft, f); + if (savedLevel != draftLevel) return true; + } + return false; + } + + private async Task SavePermissions(Guid roleId) + { + if (!drafts.TryGetValue(roleId, out Dictionary? draft)) return; + errorMessage = null; + + await RoleService.SavePermissionsAsync(roleId, draft); + + savedMessages[roleId] = "Saved"; + await LoadRoles(); + + // Clear the saved message after 3 seconds. + _ = Task.Delay(3000).ContinueWith(_ => + { + savedMessages.Remove(roleId); + InvokeAsync(StateHasChanged); + }); + } +} diff --git a/src/EntKube.Web/Components/Pages/Admin/AdminUserDetail.razor b/src/EntKube.Web/Components/Pages/Admin/AdminUserDetail.razor new file mode 100644 index 0000000..5d27dd3 --- /dev/null +++ b/src/EntKube.Web/Components/Pages/Admin/AdminUserDetail.razor @@ -0,0 +1,462 @@ +@page "/admin/users/{UserId}" +@using Microsoft.AspNetCore.Authorization +@using Microsoft.AspNetCore.Identity +@using EntKube.Web.Data +@using EntKube.Web.Services +@rendermode InteractiveServer +@attribute [Authorize(Roles = "Admin")] + +@inject UserManagementService UserManagement +@inject NavigationManager NavigationManager + +@(user?.Email ?? "User") + +@if (user is null && loaded) +{ +
User not found.
+} +else if (user is not null) +{ +
+ + Users + +

@user.Email

+ @if (user.EmailConfirmed) + { + Confirmed + } + else + { + Unconfirmed + } +
+

ID: @user.Id

+ + @if (!string.IsNullOrEmpty(errorMessage)) + { + + } + +
+ + @* ── Global Roles ── *@ +
+
+
+
Global Roles
+ @if (allRoles.Count == 0) + { +

No global roles defined.

+ } + else + { +
+ @foreach (IdentityRole role in allRoles) + { + bool hasRole = userRoles.Contains(role.Name ?? ""); +
+ + +
+ } +
+ } +
+
+
+ + @* ── Tenant Memberships ── *@ +
+
+
+
Tenant Memberships
+ + @if (tenantMemberships.Count > 0) + { +
+ + + + + + + + + + + @foreach (TenantMembership m in tenantMemberships) + { + + + + + + + } + +
TenantRoleJoined
@m.Tenant.Name + @m.Role.Name + @m.JoinedAt.ToString("MMM d, yyyy") + @if (confirmRemoveTenantId == m.TenantId) + { + Remove? + + + } + else + { + + } +
+
+ } + + @* Add tenant form *@ + @if (availableTenants.Count > 0) + { +
+
+ + +
+
+ + @if (addTenantId != Guid.Empty && !rolesForSelectedTenant.Any()) + { +
+ No roles defined for this tenant. + Create roles first. +
+ } + else + { + + } +
+ +
+ } + else if (tenantMemberships.Count == 0) + { +

No tenants available to assign.

+ } +
+
+
+ + @* ── Group Memberships ── *@ +
+
+
+
Group Memberships
+ + @if (groupMemberships.Count > 0) + { +
+ + + + + + + + + + + @foreach (GroupMembership gm in groupMemberships) + { + + + + + + + } + +
GroupTenantJoined
@gm.Group.Name@gm.Group.Tenant.Name@gm.JoinedAt.ToString("MMM d, yyyy") + @if (confirmRemoveGroupId == gm.GroupId) + { + Remove? + + + } + else + { + + } +
+
+ } + + @* Add group form — only tenants this user is a member of have groups *@ + @if (tenantMemberships.Count > 0) + { +
+
+ + +
+
+ + +
+ +
+ } + else if (groupMemberships.Count == 0) + { +

Add the user to a tenant first, then assign groups.

+ } +
+
+
+ + @* ── Danger Zone ── *@ +
+
+
+
Danger Zone
+

Permanently delete this user account. All tenant and group memberships are removed. This cannot be undone.

+ @if (confirmDelete) + { +
+ Are you sure? This will permanently delete @user.Email. +
+ + + } + else + { + + } +
+
+
+ +
+} + +@code { + [Parameter] public string UserId { get; set; } = null!; + + private ApplicationUser? user; + private bool loaded; + private string? errorMessage; + + private List allRoles = []; + private IList userRoles = []; + + private List tenantMemberships = []; + private List allTenants = []; + private List availableTenants = []; + + // Add-tenant form state + private Guid _addTenantId; + private Guid addTenantId + { + get => _addTenantId; + set + { + _addTenantId = value; + addTenantRoleId = Guid.Empty; + } + } + private Guid addTenantRoleId; + private IEnumerable rolesForSelectedTenant => + allTenants.FirstOrDefault(t => t.Id == addTenantId)?.Roles ?? []; + + private List groupMemberships = []; + + // Add-group form state + private Guid _addGroupTenantId; + private Guid addGroupTenantId + { + get => _addGroupTenantId; + set + { + _addGroupTenantId = value; + addGroupId = Guid.Empty; + _ = LoadGroupsForSelectedTenant(); + } + } + private Guid addGroupId; + private List availableGroupsForTenant = []; + + private Guid? confirmRemoveTenantId; + private Guid? confirmRemoveGroupId; + private bool confirmDelete; + + protected override async Task OnInitializedAsync() + { + await Load(); + } + + private async Task Load() + { + user = await UserManagement.GetUserByIdAsync(UserId); + loaded = true; + if (user is null) return; + + // UserManager and RoleManager share the scoped DbContext — run sequentially. + // The IDbContextFactory-based calls each create their own instance and are safe. + allRoles = await UserManagement.GetAllRolesAsync(); + userRoles = await UserManagement.GetUserRolesAsync(UserId); + tenantMemberships = await UserManagement.GetUserTenantMembershipsAsync(UserId); + groupMemberships = await UserManagement.GetUserGroupMembershipsAsync(UserId); + allTenants = await UserManagement.GetAllTenantsAsync(); + + RefreshAvailableTenants(); + } + + private void RefreshAvailableTenants() + { + HashSet joined = tenantMemberships.Select(m => m.TenantId).ToHashSet(); + availableTenants = allTenants.Where(t => !joined.Contains(t.Id)).ToList(); + if (!availableTenants.Any(t => t.Id == addTenantId)) + { + addTenantId = Guid.Empty; + addTenantRoleId = Guid.Empty; + } + } + + private async Task LoadGroupsForSelectedTenant() + { + if (_addGroupTenantId == Guid.Empty) + { + availableGroupsForTenant = []; + return; + } + List all = await UserManagement.GetGroupsForTenantAsync(_addGroupTenantId); + HashSet joined = groupMemberships.Select(gm => gm.GroupId).ToHashSet(); + availableGroupsForTenant = all.Where(g => !joined.Contains(g.Id)).ToList(); + StateHasChanged(); + } + + private async Task ToggleRole(string role, bool grant) + { + errorMessage = null; + IdentityResult result = grant + ? await UserManagement.AddToRoleAsync(UserId, role) + : await UserManagement.RemoveFromRoleAsync(UserId, role); + + if (!result.Succeeded) + { + errorMessage = string.Join(" ", result.Errors.Select(e => e.Description)); + return; + } + + userRoles = await UserManagement.GetUserRolesAsync(UserId); + } + + private async Task AddTenantMembership() + { + if (addTenantId == Guid.Empty || addTenantRoleId == Guid.Empty) return; + errorMessage = null; + + try + { + await UserManagement.AddTenantMembershipAsync(UserId, addTenantId, addTenantRoleId); + addTenantId = Guid.Empty; + tenantMemberships = await UserManagement.GetUserTenantMembershipsAsync(UserId); + RefreshAvailableTenants(); + } + catch (Exception ex) + { + errorMessage = $"Failed to add tenant membership: {ex.Message}"; + } + } + + private async Task RemoveTenantMembership(Guid tenantId) + { + confirmRemoveTenantId = null; + errorMessage = null; + + await UserManagement.RemoveTenantMembershipAsync(UserId, tenantId); + tenantMemberships = await UserManagement.GetUserTenantMembershipsAsync(UserId); + RefreshAvailableTenants(); + } + + private async Task AddGroupMembership() + { + if (addGroupId == Guid.Empty) return; + errorMessage = null; + + try + { + await UserManagement.AddGroupMembershipAsync(UserId, addGroupId); + groupMemberships = await UserManagement.GetUserGroupMembershipsAsync(UserId); + await LoadGroupsForSelectedTenant(); + } + catch (Exception ex) + { + errorMessage = $"Failed to add group membership: {ex.Message}"; + } + } + + private async Task RemoveGroupMembership(Guid groupId) + { + confirmRemoveGroupId = null; + errorMessage = null; + + await UserManagement.RemoveGroupMembershipAsync(UserId, groupId); + groupMemberships = await UserManagement.GetUserGroupMembershipsAsync(UserId); + await LoadGroupsForSelectedTenant(); + } + + private async Task DeleteUser() + { + IdentityResult result = await UserManagement.DeleteUserAsync(UserId); + if (!result.Succeeded) + { + errorMessage = string.Join(" ", result.Errors.Select(e => e.Description)); + confirmDelete = false; + return; + } + NavigationManager.NavigateTo("/admin/users"); + } +} diff --git a/src/EntKube.Web/Components/Pages/Admin/AdminUsers.razor b/src/EntKube.Web/Components/Pages/Admin/AdminUsers.razor new file mode 100644 index 0000000..ff67f8c --- /dev/null +++ b/src/EntKube.Web/Components/Pages/Admin/AdminUsers.razor @@ -0,0 +1,153 @@ +@page "/admin/users" +@using Microsoft.AspNetCore.Authorization +@using Microsoft.AspNetCore.Identity +@using EntKube.Web.Data +@using EntKube.Web.Services +@rendermode InteractiveServer +@attribute [Authorize(Roles = "Admin")] + +@inject UserManagementService UserManagement +@inject NavigationManager NavigationManager + +User Management + +
+
+

Users

+

Manage system users, roles, and tenant access.

+
+ +
+ +@if (showAddForm) +{ +
+
+
New User
+ @if (!string.IsNullOrEmpty(addError)) + { +
+ @addError +
+ } +
+
+ +
+
+ +
+
+ +
+
+ The account will be created with email pre-confirmed — no email verification needed. +
+
+} + + + @if (users is not null && users.Count == 0) + { + + } + else if (users is not null) + { +
+
+ + + + + + + + + + @foreach (ApplicationUser user in users) + { + + + + + + } + +
EmailStatus
+ @user.Email + + @if (user.EmailConfirmed) + { + Confirmed + } + else + { + Unconfirmed + } + + +
+
+
+ } + + +@code { + private List? users; + private bool showAddForm; + private bool creating; + private string newEmail = ""; + private string newPassword = ""; + private string? addError; + + protected override async Task OnInitializedAsync() + { + await Load(); + } + + private async Task Load() + { + users = await UserManagement.GetAllUsersAsync(); + } + + private async Task CreateUser() + { + addError = null; + creating = true; + + try + { + IdentityResult result = await UserManagement.CreateUserAsync(newEmail.Trim(), newPassword); + if (!result.Succeeded) + { + addError = string.Join(" ", result.Errors.Select(e => e.Description)); + return; + } + + newEmail = ""; + newPassword = ""; + showAddForm = false; + await Load(); + } + finally + { + creating = false; + } + } +} diff --git a/src/EntKube.Web/Components/Pages/Portal/CustomerPortal.razor b/src/EntKube.Web/Components/Pages/Portal/CustomerPortal.razor index 2b145e8..9cc0884 100644 --- a/src/EntKube.Web/Components/Pages/Portal/CustomerPortal.razor +++ b/src/EntKube.Web/Components/Pages/Portal/CustomerPortal.razor @@ -282,6 +282,11 @@ else New Deployment } +
} -
  • - -
  • - + @if (!IsGitManaged) + { + + }
    • - @if (showAddManifest) + @if (showAddManifest && !IsGitManaged) {
    @@ -467,9 +469,7 @@
    - +
    - @if (AccessRole >= CustomerAccessRole.Admin) + @if (AccessRole >= CustomerAccessRole.Admin && !IsGitManaged) {
    @if (editingManifestId == manifest.Id) @@ -526,12 +526,11 @@
    @if (editingManifestId == manifest.Id) { - + } else { - 
    @manifest.YamlContent
    + }
    @@ -567,10 +566,7 @@ {
    @valuesError
    } - + @if (AccessRole >= CustomerAccessRole.Admin) {
    @@ -625,7 +621,9 @@ Resources="@resourceTree" Namespace="@Deployment.Namespace" DeploymentId="@Deployment.Id" - AccessRole="@AccessRole" /> + AccessRole="@AccessRole" + OnRefresh="LoadResources" + LastRefreshed="@_resourcesRefreshedAt" /> } @* ══════════════════════════════════════════════════════════════ @@ -995,6 +993,7 @@
    } + @code { [Parameter] public required AppDeployment Deployment { get; set; } [Parameter] public CustomerAccessRole AccessRole { get; set; } @@ -1008,6 +1007,9 @@ [Parameter] public EventCallback OnBack { get; set; } [Parameter] public EventCallback OnDeleted { get; set; } + private bool IsGitManaged => Deployment.Type is + DeploymentType.GitYaml or DeploymentType.GitHelm or DeploymentType.GitAppOfApps; + private string activeTab = "pods"; // Git tab @@ -1194,9 +1196,6 @@ private bool? yamlApplySuccess; private string? yamlApplyOutput; - // JS module for reading live textarea values - private IJSObjectReference? jsModule; - // Edit deployment private bool showEditDeployment; private bool savingEdit; @@ -1213,6 +1212,7 @@ // Resources private List? resourceTree; private string? resourcesError; + private DateTime? _resourcesRefreshedAt; // Metrics private DeploymentMetricsSummary? metrics; @@ -1236,20 +1236,7 @@ await LoadPodsInternal(); } - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - { - jsModule = await JS.InvokeAsync( - "import", "./Components/Pages/Portal/PortalDeploymentDetail.razor.js"); - } - } - - public async ValueTask DisposeAsync() - { - if (jsModule is not null) - await jsModule.DisposeAsync(); - } + public ValueTask DisposeAsync() => ValueTask.CompletedTask; // ──────── Pod operations ──────── @@ -1482,9 +1469,6 @@ private async Task AddManifest() { - if (jsModule is not null) - newManifestYaml = await jsModule.InvokeAsync("getElementValue", "new-manifest-yaml"); - savingManifest = true; try { @@ -1506,9 +1490,6 @@ private async Task SaveManifest(Guid manifestId) { - if (jsModule is not null) - editManifestYaml = await jsModule.InvokeAsync("getElementValue", $"edit-manifest-yaml-{manifestId}"); - savingManifest = true; try { @@ -1577,11 +1558,6 @@ private async Task SaveHelmValues() { - // Read the live DOM value so we always have what the user actually typed, - // regardless of whether @bind's onchange fired before this click. - if (jsModule is not null) - helmValuesYaml = await jsModule.InvokeAsync("getElementValue", "helm-values-editor"); - savingValues = true; valuesSaved = false; valuesError = null; @@ -1610,6 +1586,7 @@ if (result.IsSuccess) { resourceTree = result.Data ?? []; + _resourcesRefreshedAt = DateTime.UtcNow; // Persist the live status so the header badges are accurate. (SyncStatus sync, HealthStatus health) = @@ -1747,4 +1724,6 @@ _ => @Unknown }; + + } diff --git a/src/EntKube.Web/Components/Pages/Portal/PortalSecretsDetail.razor b/src/EntKube.Web/Components/Pages/Portal/PortalSecretsDetail.razor index 9fe5784..7b511b5 100644 --- a/src/EntKube.Web/Components/Pages/Portal/PortalSecretsDetail.razor +++ b/src/EntKube.Web/Components/Pages/Portal/PortalSecretsDetail.razor @@ -2,25 +2,34 @@ @using EntKube.Web.Services @inject VaultService VaultService @inject TenantService TenantService +@inject DeploymentService DeploymentService +@inject CnpgService CnpgService +@inject MongoService MongoService +@inject RabbitMQService RabbitMQService +@inject RedisService RedisService @using EntKube.Web.Components.Pages.Shared @* ═══════════════════════════════════════════════════════════════════ - App Secrets — customer portal view for managing vault secrets - scoped to a single app. + App Secrets — customer portal view for managing vault secrets and + connected infrastructure credentials scoped to a single app. + + Tabs: + App Secrets — vault secrets tied directly to the app + Databases — CNPG / MongoDB / Registered Postgres bindings + Messaging — RabbitMQ bindings (vhost / queue / exchange) + Cache — Redis bindings + Registries — Docker pull secrets Access rules: - Viewer+ — list secret names, reveal values on demand - Admin — add / update / delete secrets, configure K8s sync + Viewer+ — list and reveal values + Admin — add / update / delete secrets, trigger syncs ═══════════════════════════════════════════════════════════════════ *@
    Secrets — @App.Name
    - - Application secrets stored with AES-256-GCM envelope encryption. - Values are never transmitted in plain text. - + Application secrets and connected infrastructure credentials.
    @@ -33,253 +42,635 @@ } else { - @* ── Add Secret form (Admin only) ── *@ - @if (AccessRole >= CustomerAccessRole.Admin) + @* ── Tab navigation ── *@ +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    + + @* ════════════════════════════════════════════════════════════════ + Tab: App Secrets + ════════════════════════════════════════════════════════════════ *@ + @if (scope == "app") { -
    -
    - Add / Update Secret + @* ── Add Secret form (Admin only) ── *@ + @if (AccessRole >= CustomerAccessRole.Admin) + { +
    +
    + Add / Update Secret +
    +
    +
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    + If a secret with this name already exists it will be updated in place. +
    + @if (errorMessage is not null) + { +
    + @errorMessage +
    + } + @if (successMessage is not null) + { +
    + @successMessage +
    + } +
    -
    -
    -
    - - -
    -
    - - -
    -
    - -
    + } + + @* ── Secrets list ── *@ +
    +
    +
    + + Stored Secrets + @if (secrets is not null) + { + @secrets.Count + }
    -
    - If a secret with this name already exists it will be updated in place. -
    - @if (errorMessage is not null) + @if (AccessRole >= CustomerAccessRole.Admin && secrets?.Any(s => s.SyncToKubernetes) == true) { -
    - @errorMessage + + } +
    +
    + + @if (secrets is not null && secrets.Count == 0) + { + + } + else if (secrets is not null) + { +
    + + + + + + + + + + + + + @foreach (VaultSecret secret in secrets) + { + + + + + + + + + + @if (revealedSecretId == secret.Id) + { + + + + } + + @if (editSecretId == secret.Id) + { + + + + } + + @if (syncConfigSecretId == secret.Id) + { + + + + } + } + +
    NameK8s SyncK8s SecretNamespaceUpdatedActions
    @secret.Name + @if (secret.SyncToKubernetes) + { + Enabled + } + else + { + Off + } + @(secret.KubernetesSecretName ?? "—")@(secret.KubernetesNamespace ?? "—")@secret.UpdatedAt.ToString("MMM d, HH:mm") + + + @if (AccessRole >= CustomerAccessRole.Admin) + { + + + + } +
    +
    + Value: + @if (revealLoading) + { + + } + else + { + @revealedValue + } +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + @if (clusters is not null) + { +
    + +
    + } +
    + +
    +
    + +
    +
    + + +
    +
    +
    } - @if (successMessage is not null) +     + @if (syncOutput is not null) { -
    - @successMessage -
    +
    @syncOutput
    }
    } - @* ── Secrets list ── *@ -
    -
    -
    - - Stored Secrets - @if (secrets is not null) + @* ════════════════════════════════════════════════════════════════ + Tab: Databases + ════════════════════════════════════════════════════════════════ *@ + else if (scope == "database") + { + + @if (dbLoaded) + { + bool anyDbBindings = dbBindingsByDeployment.Values.Any(b => b.Count > 0); + + @if (!anyDbBindings) + { + + } + else + { + @foreach (AppDeployment deployment in deployments!) { - @secrets.Count + List bindings = dbBindingsByDeployment.GetValueOrDefault(deployment.Id, []); + if (bindings.Count == 0) continue; + +
    +
    +
    + + @deployment.Name + + @deployment.Cluster?.Name + @deployment.Namespace + +
    +
    +
    +
    + + + + + + + + @if (AccessRole >= CustomerAccessRole.Admin) + { + + } + + + + @foreach (DatabaseBinding binding in bindings) + { + + + + + + @if (AccessRole >= CustomerAccessRole.Admin) + { + + } + + } + +
    TypeDatabaseK8s SecretLast SyncedActions
    @DbTypeBadge(binding) + @DbDisplayName(binding) + @if (binding.CnpgDatabase?.CnpgCluster is not null) + { +
    @binding.CnpgDatabase.CnpgCluster.Name + } + else if (binding.MongoDatabase?.MongoCluster is not null) + { +
    @binding.MongoDatabase.MongoCluster.Name + } +     		+ @binding.KubernetesSecretName +
    + @deployment.Namespace +     		+ @if (binding.LastSyncedAt is not null) + { + @binding.LastSyncedAt.Value.ToString("MMM d, HH:mm") + } + else + { + Never synced + } + + @if (binding.CnpgDatabaseId.HasValue || binding.MongoDatabaseId.HasValue) + { + + } + @if (bindingSyncErrors.TryGetValue(binding.Id, out string? dbErr) && dbErr is not null) + { +
    @dbErr
    + } +
    +
    +
    +
    } -
    - @if (AccessRole >= CustomerAccessRole.Admin && secrets?.Any(s => s.SyncToKubernetes) == true) - { - } -
    -
    - - @if (secrets is not null && secrets.Count == 0) + } + + } + + @* ════════════════════════════════════════════════════════════════ + Tab: Messaging (RabbitMQ) + ════════════════════════════════════════════════════════════════ *@ + else if (scope == "messaging") + { + + @if (msgLoaded) + { + bool anyMsgBindings = msgBindingsByDeployment.Values.Any(b => b.Count > 0); + + @if (!anyMsgBindings) { - + } - else if (secrets is not null) + else { -
    - - - - - - - - - - - - - @foreach (VaultSecret secret in secrets) - { - - - + } + +
    NameK8s SyncK8s SecretNamespaceUpdatedActions
    @secret.Name - @if (secret.SyncToKubernetes) + @foreach (AppDeployment deployment in deployments!) + { + List bindings = msgBindingsByDeployment.GetValueOrDefault(deployment.Id, []); + if (bindings.Count == 0) continue; + +
    +
    +
    + + @deployment.Name + + @deployment.Cluster?.Name + @deployment.Namespace + +
    +
    +
    +
    + + + + + + + + + @if (AccessRole >= CustomerAccessRole.Admin) + { + + } + + + + @foreach (MessagingBinding binding in bindings) { - Enabled - } - else - { - Off - } - - - - - - - - @* ── Reveal value row ── *@ - @if (revealedSecretId == secret.Id) - { - - + + + + + + @if (AccessRole >= CustomerAccessRole.Admin) { - - } - else - { - @revealedValue - } - - - - } - - @* ── Edit value row ── *@ - @if (editSecretId == secret.Id) - { - - - - } - - @* ── K8s sync config row ── *@ - @if (syncConfigSecretId == secret.Id) - { - - } -
    - -
    -
    - -
    -
    - - -
    - - - - } - } - -
    ClusterVhostQueue / ExchangeK8s SecretLast SyncedActions
    @(secret.KubernetesSecretName ?? "—")@(secret.KubernetesNamespace ?? "—")@secret.UpdatedAt.ToString("MMM d, HH:mm") - @* Reveal — available to all roles *@ - - - @* Admin-only: edit, K8s sync, delete *@ - @if (AccessRole >= CustomerAccessRole.Admin) - { - - - - } -
    -
    - Value: - @if (revealLoading) +
    @binding.Cluster?.Name@binding.Vhost + @if (binding.QueueName is not null) + { + + Queue + + @binding.QueueName + } + @if (binding.ExchangeName is not null) + { + + Exchange + + @binding.ExchangeName + } + @if (binding.QueueName is null && binding.ExchangeName is null) + { + vhost only + } + + @binding.KubernetesSecretName +
    + @deployment.Namespace +     		+ @if (binding.LastSyncedAt is not null) + { + @binding.LastSyncedAt.Value.ToString("MMM d, HH:mm") + } + else + { + Never synced + } +
    -
    -
    - -
    -
    - - -
    -
    -
    -
    - @if (clusters is not null) - { -
    -
    		+ + @if (bindingSyncErrors.TryGetValue(binding.Id, out string? msgErr) && msgErr is not null) + { +
    @msgErr
    + } +
    -
    +
    +
    +
    +
    + } } - - @if (syncOutput is not null) - { -
    @syncOutput
    - } -
    -
    + } + + } - @* ── Docker Registry Credentials ── *@ -
    -
    - -
    Docker Registry Credentials
    - Pull secrets for private container registries -
    + @* ════════════════════════════════════════════════════════════════ + Tab: Cache (Redis) + ════════════════════════════════════════════════════════════════ *@ + else if (scope == "cache") + { + + @if (cacheLoaded) + { + bool anyCacheBindings = cacheBindingsByDeployment.Values.Any(b => b.Count > 0); + + @if (!anyCacheBindings) + { + + } + else + { + @foreach (AppDeployment deployment in deployments!) + { + List bindings = cacheBindingsByDeployment.GetValueOrDefault(deployment.Id, []); + if (bindings.Count == 0) continue; + +
    +
    +
    + + @deployment.Name + + @deployment.Cluster?.Name + @deployment.Namespace + +
    +
    +
    +
    + + + + + + + @if (AccessRole >= CustomerAccessRole.Admin) + { + + } + + + + @foreach (CacheBinding binding in bindings) + { + + + + + @if (AccessRole >= CustomerAccessRole.Admin) + { + + } + + } + +
    Redis ClusterK8s SecretLast SyncedActions
    + + @binding.RedisCluster.Name + @if (binding.RedisCluster.KubernetesCluster is not null) + { +
    @binding.RedisCluster.KubernetesCluster.Name + } +     		+ @binding.KubernetesSecretName +
    + @deployment.Namespace +     		+ @if (binding.LastSyncedAt is not null) + { + @binding.LastSyncedAt.Value.ToString("MMM d, HH:mm") + } + else + { + Never synced + } + + + @if (bindingSyncErrors.TryGetValue(binding.Id, out string? cacheErr) && cacheErr is not null) + { +
    @cacheErr
    + } +
    +
    +
    +
    + } + } + } +     + } + + @* ════════════════════════════════════════════════════════════════ + Tab: Docker Registries + ════════════════════════════════════════════════════════════════ *@ + else if (scope == "docker") + { -
    + } } @code { @@ -288,35 +679,50 @@ else [Parameter] public CustomerAccessRole AccessRole { get; set; } private bool vaultInitialized; + private string scope = "app"; + + // ── App Secrets ────────────────────────────────────────────────── private List? secrets; private List? clusters; - // Add form private string newSecretName = ""; private string newSecretValue = ""; private bool saving; private string? errorMessage; private string? successMessage; - // Reveal private Guid? revealedSecretId; private string? revealedValue; private bool revealLoading; - // Edit private Guid? editSecretId; private string editSecretValue = ""; - // K8s sync config private Guid? syncConfigSecretId; private string syncSecretName = ""; private string syncNamespace = ""; private Guid syncClusterId; - // Sync-to-K8s state private bool syncingSecrets; private string? syncOutput; + // ── Shared binding state ───────────────────────────────────────── + private List? deployments; + private HashSet syncingBindingIds = []; + private Dictionary bindingSyncErrors = new(); + + // ── Databases ──────────────────────────────────────────────────── + private Dictionary> dbBindingsByDeployment = new(); + private bool dbLoaded; + + // ── Messaging ──────────────────────────────────────────────────── + private Dictionary> msgBindingsByDeployment = new(); + private bool msgLoaded; + + // ── Cache ──────────────────────────────────────────────────────── + private Dictionary> cacheBindingsByDeployment = new(); + private bool cacheLoaded; + protected override async Task OnInitializedAsync() { SecretVault? vault = await VaultService.GetVaultAsync(TenantId); @@ -327,17 +733,80 @@ else await LoadSecrets(); } - // Load clusters for the K8s sync config dropdown. clusters = await TenantService.GetClustersAsync(TenantId); } + // ── Scope switching ────────────────────────────────────────────── + + private async Task SetScope(string newScope) + { + scope = newScope; + errorMessage = null; + successMessage = null; + + if (newScope == "database" && !dbLoaded) + await LoadDatabaseBindings(); + else if (newScope == "messaging" && !msgLoaded) + await LoadMessagingBindings(); + else if (newScope == "cache" && !cacheLoaded) + await LoadCacheBindings(); + } + + private async Task EnsureDeployments() + { + if (deployments is null) + deployments = await DeploymentService.GetDeploymentsAsync(App.Id); + } + + private async Task LoadDatabaseBindings() + { + await EnsureDeployments(); + dbBindingsByDeployment.Clear(); + + foreach (AppDeployment deployment in deployments!) + { + List bindings = await CnpgService.GetDatabaseBindingsAsync(deployment.Id); + dbBindingsByDeployment[deployment.Id] = bindings; + } + + dbLoaded = true; + } + + private async Task LoadMessagingBindings() + { + await EnsureDeployments(); + msgBindingsByDeployment.Clear(); + + foreach (AppDeployment deployment in deployments!) + { + List bindings = await RabbitMQService.GetMessagingBindingsForDeploymentAsync(deployment.Id); + msgBindingsByDeployment[deployment.Id] = bindings; + } + + msgLoaded = true; + } + + private async Task LoadCacheBindings() + { + await EnsureDeployments(); + cacheBindingsByDeployment.Clear(); + + foreach (AppDeployment deployment in deployments!) + { + List bindings = await RedisService.GetCacheBindingsForDeploymentAsync(deployment.Id); + cacheBindingsByDeployment[deployment.Id] = bindings; + } + + cacheLoaded = true; + } + + // ── App Secrets: Add ───────────────────────────────────────────── + private async Task LoadSecrets() { secrets = await VaultService.GetAppSecretsAsync(TenantId, App.Id); } - // ──────── Add ──────── - private async Task AddSecret() { errorMessage = null; @@ -359,7 +828,7 @@ else finally { saving = false; } } - // ──────── Reveal ──────── + // ── App Secrets: Reveal ────────────────────────────────────────── private async Task RevealSecret(VaultSecret secret) { @@ -377,7 +846,7 @@ else revealLoading = false; } - // ──────── Edit ──────── + // ── App Secrets: Edit ──────────────────────────────────────────── private void StartEdit(VaultSecret secret) { @@ -413,7 +882,7 @@ else await LoadSecrets(); } - // ──────── Delete ──────── + // ── App Secrets: Delete ────────────────────────────────────────── private async Task DeleteSecret(Guid secretId) { @@ -432,7 +901,7 @@ else await LoadSecrets(); } - // ──────── K8s Sync ──────── + // ── App Secrets: K8s sync ──────────────────────────────────────── private void ToggleSync(VaultSecret secret) { @@ -487,4 +956,111 @@ else syncingSecrets = false; } } + + // ── Database binding sync ──────────────────────────────────────── + + private async Task SyncDatabaseBinding(DatabaseBinding binding) + { + syncingBindingIds.Add(binding.Id); + bindingSyncErrors.Remove(binding.Id); + + try + { + if (binding.CnpgDatabaseId.HasValue && binding.CnpgDatabase is not null) + { + await CnpgService.SyncDatabaseCredentialsToK8sAsync( + TenantId, binding.CnpgDatabase.CnpgClusterId, binding.CnpgDatabase.Id); + } + else if (binding.MongoDatabaseId.HasValue && binding.MongoDatabase is not null) + { + await MongoService.SyncDatabaseCredentialsToK8sAsync( + TenantId, binding.MongoDatabase.MongoClusterId, binding.MongoDatabase.Id); + } + + // Refresh to show updated LastSyncedAt. + await LoadDatabaseBindings(); + } + catch (Exception ex) + { + bindingSyncErrors[binding.Id] = ex.Message; + } + finally + { + syncingBindingIds.Remove(binding.Id); + } + } + + // ── Messaging binding sync ─────────────────────────────────────── + + private async Task SyncMessagingBinding(MessagingBinding binding) + { + syncingBindingIds.Add(binding.Id); + bindingSyncErrors.Remove(binding.Id); + + try + { + await RabbitMQService.SyncMessagingBindingAsync(TenantId, binding.Id); + await LoadMessagingBindings(); + } + catch (Exception ex) + { + bindingSyncErrors[binding.Id] = ex.Message; + } + finally + { + syncingBindingIds.Remove(binding.Id); + } + } + + // ── Cache binding sync ─────────────────────────────────────────── + + private async Task SyncCacheBinding(CacheBinding binding) + { + syncingBindingIds.Add(binding.Id); + bindingSyncErrors.Remove(binding.Id); + + try + { + await RedisService.SyncCacheBindingAsync(TenantId, binding.Id); + await LoadCacheBindings(); + } + catch (Exception ex) + { + bindingSyncErrors[binding.Id] = ex.Message; + } + finally + { + syncingBindingIds.Remove(binding.Id); + } + } + + // ── Display helpers ────────────────────────────────────────────── + + private RenderFragment DbTypeBadge(DatabaseBinding binding) + { + if (binding.CnpgDatabaseId.HasValue) + return @ + PostgreSQL + ; + + if (binding.MongoDatabaseId.HasValue) + return @ + MongoDB + ; + + if (binding.RegisteredPostgresDatabaseId.HasValue) + return @ + Postgres (registered) + ; + + return @Unknown; + } + + private static string DbDisplayName(DatabaseBinding binding) + { + if (binding.CnpgDatabase is not null) return binding.CnpgDatabase.Name; + if (binding.MongoDatabase is not null) return binding.MongoDatabase.Name; + if (binding.RegisteredPostgresDatabase is not null) return binding.RegisteredPostgresDatabase.Name; + return "—"; + } } diff --git a/src/EntKube.Web/Components/Pages/Shared/ResourceTreePanel.razor b/src/EntKube.Web/Components/Pages/Shared/ResourceTreePanel.razor index d896a3d..6b83531 100644 --- a/src/EntKube.Web/Components/Pages/Shared/ResourceTreePanel.razor +++ b/src/EntKube.Web/Components/Pages/Shared/ResourceTreePanel.razor @@ -19,11 +19,28 @@ .rg-outer { overflow-x: auto; overflow-y: auto; - max-height: 640px; + max-height: 75vh; background: #f6f8fa; border-radius: 8px; border: 1px solid #e9ecef; } + + .rg-fs { + position: fixed; + inset: 0; + z-index: 1055; + background: white; + display: flex; + flex-direction: column; + padding: 12px 16px; + box-shadow: 0 0 0 100vmax rgba(0,0,0,.4); + } + + .rg-fs .rg-outer { + flex: 1; + min-height: 0; + max-height: none; + } .rg-canvas { position: relative; /* width/height set inline from C# layout */ @@ -153,11 +170,43 @@ } +
    +
    + @if (!string.IsNullOrEmpty(Namespace)) + { + + @Namespace + + } + @if (!Loading && Resources is not null) + { + @CountAllResources(Resources) resources + } + @if (LastRefreshed.HasValue && !Loading) + { + + @LastRefreshed.Value.ToLocalTime().ToString("HH:mm:ss") + + } + @if (OnRefresh.HasDelegate) + { + + } + +
    + @if (!Loading && Error is null && (Resources is null || Resources.Count == 0)) { + Message="@($"No resources tracked for this deployment in namespace {Namespace}.")" /> } else if (!Loading && Error is null && Resources is not null && Resources.Count > 0) { @@ -262,6 +311,7 @@ else if (!Loading && Error is null && Resources is not null && Resources.Count >
    } +
    @code { [Parameter] public bool Loading { get; set; } @@ -270,6 +320,20 @@ else if (!Loading && Error is null && Resources is not null && Resources.Count > [Parameter] public string? Namespace { get; set; } [Parameter] public Guid DeploymentId { get; set; } [Parameter] public CustomerAccessRole? AccessRole { get; set; } + [Parameter] public EventCallback OnRefresh { get; set; } + [Parameter] public DateTime? LastRefreshed { get; set; } + + private static int CountAllResources(IEnumerable? list) + { + if (list is null) return 0; + int n = 0; + foreach (DeploymentResource r in list) + { + n++; + n += CountAllResources(r.ChildResources); + } + return n; + } // ── Access gates ──────────────────────────────────────────────────────── @@ -314,6 +378,7 @@ else if (!Loading && Error is null && Resources is not null && Resources.Count > private string? _feedback; private bool _feedbackOk; + private bool _fullscreen; // ── Lifecycle ──────────────────────────────────────────────────────────── @@ -493,6 +558,8 @@ else if (!Loading && Error is null && Resources is not null && Resources.Count > _feedbackOk = ok; _feedback = msg; StateHasChanged(); } + private void ToggleFullscreen() => _fullscreen = !_fullscreen; + // ── Floating panel renderer ────────────────────────────────────────────── private RenderFragment RenderPanel(DeploymentResource node, double px, double py) => __builder => diff --git a/src/EntKube.Web/Components/Pages/Shared/YamlEditor.razor b/src/EntKube.Web/Components/Pages/Shared/YamlEditor.razor new file mode 100644 index 0000000..a6e542c --- /dev/null +++ b/src/EntKube.Web/Components/Pages/Shared/YamlEditor.razor @@ -0,0 +1,108 @@ +@implements IAsyncDisposable +@inject IJSRuntime JS + +
    + @if (_fullscreen) + { +
    + + @Language.ToUpper() + + +
    + } +
    +
    + @if (Expandable && !_fullscreen) + { + + } +
    +
    + +@code { + [Parameter] public string Value { get; set; } = ""; + [Parameter] public EventCallback ValueChanged { get; set; } + [Parameter] public string Language { get; set; } = "yaml"; + [Parameter] public bool ReadOnly { get; set; } = false; + [Parameter] public bool Borderless { get; set; } = false; + [Parameter] public bool AutoHeight { get; set; } = true; + [Parameter] public string MaxHeight { get; set; } = "600px"; + [Parameter] public bool Expandable { get; set; } = true; + + private string _borderClass => Borderless ? "" : "border border-secondary-subtle rounded"; + + private bool _fullscreen = false; + private bool _pendingLayoutUpdate = false; + private ElementReference _container; + private IJSObjectReference? _jsModule; + private IJSObjectReference? _editor; + private DotNetObjectReference? _dotNetRef; + private string _lastKnownValue = ""; + + private int MaxHeightPx => int.TryParse(MaxHeight?.Replace("px", "").Trim(), out var px) ? px : 0; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + _dotNetRef = DotNetObjectReference.Create(this); + _jsModule = await JS.InvokeAsync( + "import", "./Components/Pages/Shared/YamlEditor.razor.js"); + _editor = await _jsModule.InvokeAsync( + "createEditor", _container, Value ?? "", Language, ReadOnly, _dotNetRef, AutoHeight, MaxHeightPx); + _lastKnownValue = Value ?? ""; + } + + if (_pendingLayoutUpdate && _editor is not null && _jsModule is not null) + { + _pendingLayoutUpdate = false; + await _jsModule.InvokeVoidAsync("relayoutEditor", _editor, _container, _fullscreen); + } + } + + protected override async Task OnParametersSetAsync() + { + if (_editor is not null && _jsModule is not null && Value != _lastKnownValue) + { + await _jsModule.InvokeVoidAsync("setEditorValue", _editor, Value ?? ""); + _lastKnownValue = Value ?? ""; + } + } + + [JSInvokable] + public async Task OnValueChanged(string value) + { + _lastKnownValue = value; + Value = value; + await ValueChanged.InvokeAsync(value); + } + + private void EnterFullscreen() + { + _fullscreen = true; + _pendingLayoutUpdate = true; + } + + private void ExitFullscreen() + { + _fullscreen = false; + _pendingLayoutUpdate = true; + } + + public async ValueTask DisposeAsync() + { + if (_editor is not null && _jsModule is not null) + { + try { await _jsModule.InvokeVoidAsync("disposeEditor", _editor); } catch { } + await _editor.DisposeAsync(); + } + if (_jsModule is not null) + await _jsModule.DisposeAsync(); + _dotNetRef?.Dispose(); + } +} diff --git a/src/EntKube.Web/Components/Pages/Shared/YamlEditor.razor.css b/src/EntKube.Web/Components/Pages/Shared/YamlEditor.razor.css new file mode 100644 index 0000000..7ee0db4 --- /dev/null +++ b/src/EntKube.Web/Components/Pages/Shared/YamlEditor.razor.css @@ -0,0 +1,43 @@ +.yaml-editor-outer { + display: block; +} + +.yaml-editor-fullscreen { + position: fixed; + inset: 0; + z-index: 1055; + display: flex; + flex-direction: column; + background: white; + box-shadow: 0 0 0 100vmax rgba(0, 0, 0, 0.45); +} + +.yaml-editor-fullscreen .yaml-editor-inner { + flex: 1; + min-height: 0; + overflow: hidden; +} + +.yaml-editor-fullscreen .yaml-editor-container { + height: 100%; +} + +.yaml-expand-btn { + position: absolute; + top: 6px; + right: 6px; + z-index: 5; + padding: 2px 7px; + font-size: 0.7rem; + line-height: 1.4; + opacity: 0; + transition: opacity 0.15s; +} + +.yaml-editor-outer:hover .yaml-expand-btn { + opacity: 0.7; +} + +.yaml-expand-btn:hover { + opacity: 1 !important; +} diff --git a/src/EntKube.Web/Components/Pages/Shared/YamlEditor.razor.js b/src/EntKube.Web/Components/Pages/Shared/YamlEditor.razor.js new file mode 100644 index 0000000..88a7784 --- /dev/null +++ b/src/EntKube.Web/Components/Pages/Shared/YamlEditor.razor.js @@ -0,0 +1,100 @@ +const MONACO_VERSION = '0.52.0'; +const MONACO_BASE = `https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/${MONACO_VERSION}/min/vs`; + +let _monacoPromise = null; + +function loadMonaco() { + if (_monacoPromise) return _monacoPromise; + + _monacoPromise = new Promise((resolve, reject) => { + if (window.monaco) { + resolve(window.monaco); + return; + } + + const script = document.createElement('script'); + script.src = `${MONACO_BASE}/loader.js`; + script.onload = () => { + window.require.config({ paths: { vs: MONACO_BASE } }); + window.require(['vs/editor/editor.main'], () => resolve(window.monaco)); + }; + script.onerror = () => reject(new Error('Failed to load Monaco editor')); + document.head.appendChild(script); + }); + + return _monacoPromise; +} + +export async function createEditor(container, value, language, readOnly, dotNetRef, autoHeight, maxHeightPx) { + const monaco = await loadMonaco(); + + const editor = monaco.editor.create(container, { + value: value ?? '', + language: language ?? 'yaml', + theme: 'vs', + readOnly: readOnly, + minimap: { enabled: false }, + scrollBeyondLastLine: false, + automaticLayout: true, + fontSize: 13, + fontFamily: "ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', monospace", + tabSize: 2, + lineNumbers: 'on', + wordWrap: 'off', + fixedOverflowWidgets: true, + overviewRulerLanes: 0, + padding: { top: 8, bottom: 8 }, + scrollbar: { + vertical: 'auto', + horizontal: 'auto', + useShadows: false, + verticalScrollbarSize: 8, + horizontalScrollbarSize: 8, + }, + renderLineHighlight: 'line', + smoothScrolling: true, + }); + + editor.onDidChangeModelContent(() => { + dotNetRef.invokeMethodAsync('OnValueChanged', editor.getValue()); + }); + + if (autoHeight) { + function updateAutoHeight() { + const contentHeight = editor.getContentHeight(); + const h = maxHeightPx > 0 ? Math.min(contentHeight, maxHeightPx) : contentHeight; + container.style.height = Math.max(100, h) + 'px'; + editor.layout(); + } + editor._updateAutoHeight = updateAutoHeight; + editor.onDidContentSizeChange(updateAutoHeight); + updateAutoHeight(); + } + + return editor; +} + +export function relayoutEditor(editor, container, isFullscreen) { + if (isFullscreen) { + container.style.height = '100%'; + } else if (editor._updateAutoHeight) { + editor._updateAutoHeight(); + return; + } + requestAnimationFrame(() => editor.layout()); +} + +export function setEditorValue(editor, value) { + if (editor.getValue() !== value) { + const model = editor.getModel(); + model.pushEditOperations( + [], + [{ range: model.getFullModelRange(), text: value }], + () => null + ); + } +} + +export function disposeEditor(editor) { + editor.dispose(); +} diff --git a/src/EntKube.Web/Components/Pages/Tenants/AppDetail.razor b/src/EntKube.Web/Components/Pages/Tenants/AppDetail.razor index a2f804c..8c3b360 100644 --- a/src/EntKube.Web/Components/Pages/Tenants/AppDetail.razor +++ b/src/EntKube.Web/Components/Pages/Tenants/AppDetail.razor @@ -13,7 +13,6 @@ @inject GitRepositoryService GitRepoService @inject GitSyncService GitSyncService @inject IDbContextFactory DbFactory -@inject IJSRuntime JS @* ═══════════════════════════════════════════════════════════════════ App Detail — a full-page view for a single application. @@ -394,13 +393,16 @@ Apply to Cluster } - + @if (!IsGitManaged) + { + + }
    - @if (showAddManifest) + @if (showAddManifest && !IsGitManaged) {
    @@ -421,9 +423,7 @@
    - +
    -
    - @if (editingManifestId == manifest.Id) - { - - - } - else if (confirmDeleteManifestId == manifest.Id) - { - - - } - else - { - - - } -
    + @if (!IsGitManaged) + { +
    + @if (editingManifestId == manifest.Id) + { + + + } + else if (confirmDeleteManifestId == manifest.Id) + { + + + } + else + { + + + } +
    + }
    @if (editingManifestId == manifest.Id) {
    - +
    } else { -
    - 
    @manifest.YamlContent
    +
    +
    }
    @@ -534,9 +536,7 @@ {
    @helmValuesError
    } - +
    } @@ -1249,6 +1251,8 @@ private List? clusters; private AppDeployment? selectedDeployment; private string deploymentSection = "manifests"; + private bool IsGitManaged => selectedDeployment?.Type is + DeploymentType.GitYaml or DeploymentType.GitHelm or DeploymentType.GitAppOfApps; private bool confirmDeleteDeployment; // Create deployment form @@ -1311,12 +1315,10 @@ private bool? yamlApplySuccess; private string? yamlApplyOutput; - // JS module for reading live textarea values - private IJSObjectReference? jsModule; - // Resource tree private List? resourceTree; private string? resourcesError; + private DateTime? resourceTreeRefreshedAt; // Metrics private DeploymentMetricsSummary? deploymentMetrics; @@ -1359,20 +1361,7 @@ await LoadEnvironments(); } - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - { - jsModule = await JS.InvokeAsync( - "import", "./Components/Pages/Tenants/AppDetail.razor.js"); - } - } - - public async ValueTask DisposeAsync() - { - if (jsModule is not null) - await jsModule.DisposeAsync(); - } + public ValueTask DisposeAsync() => ValueTask.CompletedTask; // ──────── App ──────── @@ -1609,9 +1598,6 @@ { if (selectedDeployment is null) return; - if (jsModule is not null) - newManifestYaml = await jsModule.InvokeAsync("getElementValue", "new-manifest-yaml"); - savingManifest = true; try { @@ -1635,9 +1621,6 @@ private async Task SaveManifest(Guid manifestId) { - if (jsModule is not null) - editManifestYaml = await jsModule.InvokeAsync("getElementValue", $"edit-manifest-yaml-{manifestId}"); - savingManifest = true; try { @@ -1701,11 +1684,6 @@ private async Task SaveHelmValues() { - // Read the live DOM value so we always have what the user actually typed, - // regardless of whether @bind's onchange fired before this click. - if (jsModule is not null) - helmValuesYaml = await jsModule.InvokeAsync("getElementValue", "helm-values-editor"); - savingHelmValues = true; helmValuesSaved = false; helmValuesError = null; @@ -1738,6 +1716,7 @@ if (result.IsSuccess) { resourceTree = result.Data ?? []; + resourceTreeRefreshedAt = DateTime.UtcNow; // Derive live status from the resource tree and persist it so // the header badges (and the deployment list card) show real values. diff --git a/src/EntKube.Web/Components/Pages/Tenants/AppResourcesPanel.razor b/src/EntKube.Web/Components/Pages/Tenants/AppResourcesPanel.razor index 506a12d..ebb28a0 100644 --- a/src/EntKube.Web/Components/Pages/Tenants/AppResourcesPanel.razor +++ b/src/EntKube.Web/Components/Pages/Tenants/AppResourcesPanel.razor @@ -159,7 +159,9 @@ else Resources="@tree" Namespace="@selectedDeployment.Namespace" DeploymentId="@selectedDeployment.Id" - AccessRole="@null" /> + AccessRole="@null" + OnRefresh="RefreshSelected" + LastRefreshed="@_lastRefreshed" /> } @code { @@ -172,6 +174,7 @@ else private bool treeLoading; private string? treeError; private List? tree; + private DateTime? _lastRefreshed; protected override async Task OnInitializedAsync() { @@ -181,23 +184,36 @@ else private async Task SelectDeployment(AppDeployment d) { selectedDeployment = d; + await LoadTreeForSelected(); + } + + private async Task RefreshSelected() + { + await LoadTreeForSelected(); + } + + private async Task LoadTreeForSelected() + { + if (selectedDeployment is null) return; + treeLoading = true; treeError = null; tree = null; StateHasChanged(); KubernetesOperationResult> result = - await K8sOps.GetLiveResourcesAsync(d.Id); + await K8sOps.GetLiveResourcesAsync(selectedDeployment.Id); treeLoading = false; + _lastRefreshed = DateTime.UtcNow; if (result.IsSuccess && result.Data is not null) { tree = result.Data; (SyncStatus sync, HealthStatus health) = KubernetesOperationsService.ComputeStatusFromResources(result.Data); - d.SyncStatus = sync; - d.HealthStatus = health; + selectedDeployment.SyncStatus = sync; + selectedDeployment.HealthStatus = health; } else { @@ -210,6 +226,7 @@ else selectedDeployment = null; tree = null; treeError = null; + _lastRefreshed = null; } // ── Visual helpers ──────────────────────────────────────────────────────── diff --git a/src/EntKube.Web/Components/Pages/Tenants/ClusterDetail.razor b/src/EntKube.Web/Components/Pages/Tenants/ClusterDetail.razor index 3aa0c62..51a4325 100644 --- a/src/EntKube.Web/Components/Pages/Tenants/ClusterDetail.razor +++ b/src/EntKube.Web/Components/Pages/Tenants/ClusterDetail.razor @@ -227,9 +227,7 @@ else if (section == "components")
    - +
    @@ -779,6 +776,15 @@ else if (section == "components") Configure +
  • + +
    • - @* Advanced YAML editor *@ -
    -
    -

    - -

    - @if (showAdvancedYaml) - { -
    - -
    - } -
    -
    - - @* Action bar *@ -
    - - @if (comp.Status == ComponentStatus.NotInstalled || comp.Status == ComponentStatus.Failed) - { - - } - else if (comp.Status == ComponentStatus.Installed) - { - - } -
    + } + else if (compDetailTab == "values") + { + } else if (compDetailTab == "secrets") { @@ -1325,6 +1294,27 @@ else if (section == "components") }
    } + + @if (compDetailTab is "config" or "values") + { +
    + + @if (comp.Status == ComponentStatus.NotInstalled || comp.Status == ComponentStatus.Failed) + { + + } + else if (comp.Status == ComponentStatus.Installed) + { + + } +
    + } } diff --git a/src/EntKube.Web/Components/Pages/Tenants/EnvironmentTab.razor b/src/EntKube.Web/Components/Pages/Tenants/EnvironmentTab.razor index 2e3bc5a..9258270 100644 --- a/src/EntKube.Web/Components/Pages/Tenants/EnvironmentTab.razor +++ b/src/EntKube.Web/Components/Pages/Tenants/EnvironmentTab.razor @@ -52,9 +52,7 @@ else if (selectedEnv is not null) {

    Paste your kubeconfig YAML or upload a file to auto-detect clusters and API server URLs.

    - +