Sorting order Fix (#1089)

* Sorting

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Feedback Addressed

* Feedback addressed

* Update ReportTemplate.html

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: merill <merill@users.noreply.github.com>

Author: 3 people

src/powershell/assets/ReportTemplate.html

@@ -81,8 +81,7 @@ function Get-ZtAssessmentResults {
 
 	$mgContext = Get-MgContext
 	$org = Get-Organization
-	# Sort by risk then by status
-	$tests = $script:__ZtSession.TestResultDetail.Value.values | Sort-Object -Property @{Expression = { $_.TestRisk } }, @{Expression = { $_.TestStatus } }
+	$tests = $script:__ZtSession.TestResultDetail.Value.values
 
 	$ztTestResults = [PSCustomObject][ordered]@{
 		ExecutedAt        = Get-Date

src/powershell/private/core/Get-ZtAssessmentResults.ps1

@@ -5,6 +5,9 @@ import { Button } from "../ui/button"
 import { impacts } from "./data-icons"
 import { StatusIcon } from "../status-icon"
 
+const RISK_ORDER: Record<string, number> = { High: 0, Medium: 1, Low: 2 }
+const STATUS_ORDER: Record<string, number> = { Failed: 0, Passed: 1, Skipped: 2, Planned: 3 }
+
 export const columns: ColumnDef<Test>[] = [
     {
         accessorKey: "TestId",
@@ -190,6 +193,11 @@ export const columns: ColumnDef<Test>[] = [
     {
         accessorKey: "TestRisk",
         meta: { label: "Risk" },
+        sortingFn: (rowA, rowB, columnId) => {
+            const a = RISK_ORDER[rowA.getValue(columnId) as string] ?? 3
+            const b = RISK_ORDER[rowB.getValue(columnId) as string] ?? 3
+            return a - b
+        },
         header: ({ column }) => {
             return (
                 <Button variant="ghost" onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}>
@@ -220,6 +228,11 @@ export const columns: ColumnDef<Test>[] = [
     {
         accessorKey: "TestStatus",
         meta: { label: "Status" },
+        sortingFn: (rowA, rowB, columnId) => {
+            const a = STATUS_ORDER[rowA.getValue(columnId) as string] ?? 3
+            const b = STATUS_ORDER[rowB.getValue(columnId) as string] ?? 3
+            return a - b
+        },
         header: ({ column }) => {
             return (
                 <Button variant="ghost" onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}>

src/report/src/components/test-table/columns.tsx

@@ -55,15 +55,10 @@ export function DataTable<TData extends Test, TValue>({
     data,
     pillar,
 }: DataTableProps<TData, TValue>) {
-    const [sorting, setSorting] = React.useState<SortingState>(
-        pillar === "Devices"
-            ? [
-                { id: "TestCategory", desc: false },
-                { id: "TestStatus", desc: false },
-                { id: "TestTitle", desc: false }
-              ]
-            : []
-    )
+    const [sorting, setSorting] = React.useState<SortingState>([
+        { id: "TestRisk", desc: false },
+        { id: "TestStatus", desc: false },
+    ])
     const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>([])
     const [globalFilter, setGlobalFilter] = React.useState("");
     const [selectedSfiPillars, setSelectedSfiPillars] = React.useState<string[]>([]);