Order updates and deployments by version, update routes, and improve UploadUpdate layout styling

Author: MatejMa2ur

SecureSoftwareDevelopment-Solution.sln.DotSettings.user

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditForm_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FSourcesCache_003F3ac434135f167e39477dbad579a1e0d0343b31cc852a11c1610b03a5ed318_003FEditForm_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=c8d2e202_002Dc47f_002D441a_002Dba12_002D3e25f498d0ad/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
   &lt;Solution /&gt;
 &lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>

src/Admin.Api/Infrastructure/Repositories/DeploymentRepository.cs

@@ -30,7 +30,7 @@ public async Task<List<Deployment>> GetAllAsync(CancellationToken cancellationTo
             .Include(d => d.Release)
                 .ThenInclude(r => r.Update)
             .Include(d => d.Device)
-            .OrderByDescending(d => d.CreatedAt)
+            .OrderByDescending(d => d.Release!.Update!.Version)
             .ToListAsync(cancellationToken);
     }
 

src/Admin.Api/Infrastructure/Repositories/UpdateRepository.cs

@@ -37,7 +37,7 @@ public async Task<List<Update>> GetAllAsync(bool includeInactive = false, Cancel
         }
 
         return await query
-            .OrderByDescending(u => u.CreatedAt)
+            .OrderByDescending(u => u.Version)
             .ToListAsync(cancellationToken);
     }
 

src/Admin.Web/Pages/Updates/UploadUpdate.razor

@@ -3,6 +3,9 @@
 @using Admin.Shared.Enums
 @using Microsoft.AspNetCore.Components.Forms
 @using System.Text.Json
+@using Microsoft.FluentUI.AspNetCore.Components
+@using ButtonType = Microsoft.FluentUI.AspNetCore.Components.ButtonType
+@using Orientation = Microsoft.FluentUI.AspNetCore.Components.Orientation
 @inject HttpClient Http
 @inject IConfiguration Config
 @inject NavigationManager Navigation
@@ -13,30 +16,30 @@
 <FluentStack Orientation="Orientation.Vertical" Width="100%">
     <h2>Upload New Update</h2>
 
-    <EditForm Model="@model" OnValidSubmit="@HandleSubmit">
+    <EditForm Model="@model" OnValidSubmit="@HandleSubmit" class="w-100">
         <FluentCard Style="max-width: 800px;">
             <FluentStack Orientation="Orientation.Vertical">
-                <div class="form-group">
+                <div class="form-group w-100">
                     <label>Version *</label>
                     <input type="text" class="form-control" @bind="model.Version" placeholder="1.0.0" required />
                 </div>
 
-                <div class="form-group">
+                <div class="form-group w-100">
                     <label>Title *</label>
                     <input type="text" class="form-control" @bind="model.Title" placeholder="Security Patch" required />
                 </div>
 
-                <div class="form-group">
+                <div class="form-group w-100">
                     <label>Description</label>
                     <textarea class="form-control" @bind="model.Description" placeholder="Brief description of the update..." rows="3"></textarea>
                 </div>
 
-                <div class="form-group">
+                <div class="form-group w-100">
                     <label>Change Log</label>
                     <textarea class="form-control" @bind="model.ChangeLog" placeholder="- Fixed bug XYZ&#10;- Added feature ABC" rows="5"></textarea>
                 </div>
 
-                <div class="form-group">
+                <div class="form-group w-100">
                     <label>Update Type</label>
                     <select class="form-control" @bind="model.UpdateType">
                         <option value="@UpdateType.Security">Security</option>
@@ -46,7 +49,7 @@
                     </select>
                 </div>
 
-                <div class="form-group">
+                <div class="form-group w-100">
                     <label>Severity</label>
                     <select class="form-control" @bind="model.Severity">
                         <option value="@UpdateSeverity.Critical">Critical</option>
@@ -56,18 +59,21 @@
                     </select>
                 </div>
 
-                <div class="form-check">
+                <div class="form-check w-100">
                     <input type="checkbox" class="form-check-input" @bind="model.IsSecurityUpdate" id="securityCheck" />
                     <label class="form-check-label" for="securityCheck">Is Security Update</label>
                 </div>
 
-                <div class="form-group">
-                    <label>Security Fixes (one per line, e.g., CVE-2024-1234)</label>
-                    <textarea class="form-control" @bind="securityFixesInput" placeholder="CVE-2024-1234&#10;CVE-2024-5678" rows="3"></textarea>
-                    <small class="form-text text-muted">Enter CVE IDs or vulnerability descriptions, one per line</small>
-                </div>
+                @if (model.IsSecurityUpdate)
+                { 
+                    <div class="form-group w-100">
+                        <label>Security Fixes (one per line, e.g., CVE-2024-1234)</label>
+                        <textarea class="form-control" @bind="securityFixesInput" placeholder="CVE-2024-1234&#10;CVE-2024-5678" rows="3"></textarea>
+                        <small class="form-text text-muted">Enter CVE IDs or vulnerability descriptions, one per line</small>
+                    </div>
+                }
 
-                <div class="form-group">
+                <div class="form-group w-100 d-none">
                     <label>Target Device Types (one per line)</label>
                     <textarea class="form-control" @bind="targetDeviceTypesInput" placeholder="PackagingMachine&#10;QualityControlStation" rows="3"></textarea>
                     <small class="form-text text-muted">Enter device type names, one per line</small>

src/Admin.Web/Shared/Layout/MainLayout.razor

@@ -17,7 +17,7 @@
                     <FluentNavLink Href="/" Icon="@(new Icons.Regular.Size20.Home())" Match="NavLinkMatch.All">
                         Home
                     </FluentNavLink>
-                    <FluentNavLink Href="/upload-update" Icon="@(new Icons.Regular.Size20.CloudArrowUp())">
+                    <FluentNavLink Href="/updates/upload" Icon="@(new Icons.Regular.Size20.CloudArrowUp())">
                         Upload Updates
                     </FluentNavLink>
                     <FluentNavLink Href="/manage-releases" Icon="@(new Icons.Regular.Size20.Document())">

src/ClientPortal.Web/Pages/Updates/AvailableUpdates.razor

@@ -1,4 +1,4 @@
-Oka@page "/updates"
+@page "/updates"
 @using Admin.Shared.Dto
 @using Admin.Shared.Enums
 @using ClientPortal.Web.Application.Services

src/ClientPortal.Web/wwwroot/index.html

@@ -8,7 +8,7 @@
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
     <link href="_content/Microsoft.FluentUI.AspNetCore.Components/css/reboot.css" rel="stylesheet" />
     <link href="_content/Blazored.Toast/blazored-toast.min.css" rel="stylesheet" />
-    <link href="Vendor.Client.Web.styles.css" rel="stylesheet" />
+    <link href="ClientPortal.Web.styles.css" rel="stylesheet" />
 </head>
 
 <body style="background-color: var(--neutral-layer-1);">