Merge branch 'guacsec:main' into scan_sbom_feature

Author: mrrajan

client/openapi/trustd.yaml

@@ -4852,6 +4852,9 @@ components:
           source:
             type: string
             description: The name of the quay registry, e.g. quay.io
+          unencrypted:
+            type: boolean
+            description: Whether the scheme used is 'http' [true] or 'https' [false]
     RecommendEntry:
       type: object
       required:

client/src/app/pages/sbom-scan/components/UploadFileForAnalysis.tsx

@@ -15,10 +15,10 @@ import {
   ModalHeader,
   MultipleFileUpload,
   MultipleFileUploadMain,
+  Spinner,
 } from "@patternfly/react-core";
 
 import ExclamationCircleIcon from "@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon";
-import InProgressIcon from "@patternfly/react-icons/dist/esm/icons/in-progress-icon";
 import TimesIcon from "@patternfly/react-icons/dist/esm/icons/times-icon";
 import UploadIcon from "@patternfly/react-icons/dist/esm/icons/upload-icon";
 
@@ -143,7 +143,7 @@ export const UploadFileForAnalysis: React.FC<IUploadFileForAnalysisProps> = ({
               key={`${file.name}-${index}-progress`}
               headingLevel="h4"
               titleText={"Analyzing SBOM"}
-              icon={InProgressIcon}
+              icon={Spinner}
               variant={EmptyStateVariant.sm}
             >
               <EmptyStateBody>

client/src/app/pages/sbom-scan/components/VulnerabilityTable.tsx

@@ -142,7 +142,7 @@ export const VulnerabilityTable: React.FC<IVulnerabilityTableProps> = ({
         placeholderText: "Severity",
         type: FilterType.multiselect,
         selectOptions: [
-          { value: "null", label: "Unknown" },
+          { value: "unknown", label: "Unknown" },
           { value: "none", label: "None" },
           { value: "low", label: "Low" },
           { value: "medium", label: "Medium" },
@@ -295,6 +295,18 @@ export const VulnerabilityTable: React.FC<IVulnerabilityTableProps> = ({
                               ) !== -1
                             );
                           })
+                          .sort(
+                            (
+                              [_advisoryKeyA, advisoryValueA],
+                              [_advisoryKeyB, advisoryValueB],
+                            ) => {
+                              const scoreA =
+                                advisoryValueA.opinionatedScore?.value ?? 0;
+                              const scoreB =
+                                advisoryValueB.opinionatedScore?.value ?? 0;
+                              return scoreB - scoreA;
+                            },
+                          )
                           .map(([advisoryKey, advisoryValue]) => (
                             <Flex key={advisoryKey}>
                               <FlexItem spacer={{ default: "spacerNone" }}>

client/src/app/pages/sbom-scan/sbom-scan.tsx

@@ -22,6 +22,7 @@ import {
   ModalFooter,
   ModalHeader,
   PageSection,
+  Spinner,
   Split,
   SplitItem,
   type MenuToggleElement,
@@ -30,7 +31,6 @@ import {
 import CheckCircleIcon from "@patternfly/react-icons/dist/esm/icons/check-circle-icon";
 import DownloadIcon from "@patternfly/react-icons/dist/esm/icons/download-icon";
 import ExclamationCircleIcon from "@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon";
-import InProgressIcon from "@patternfly/react-icons/dist/esm/icons/in-progress-icon";
 import TimesIcon from "@patternfly/react-icons/dist/esm/icons/times-icon";
 
 import type { ExtractResult } from "@app/client";
@@ -198,7 +198,7 @@ export const SbomScan: React.FC = () => {
           <EmptyState
             titleText="Generating vulnerability report"
             headingLevel="h4"
-            icon={InProgressIcon}
+            icon={Spinner}
           >
             <EmptyStateBody>
               Analyzing your SBOM for security vulnerabilities and package