Updated filtering for vulnerabilities table (#2848)

### What's done:
- removed useless filter `isOwner` in `VulnerabilityFilter`.
- added filtering by `Summary` to field for `Identifier` filtering, field renamed to `Identifier or Summary`.
- added field for filtering by `Status`.
- for better understanding, the displayed status description changed for `AUTO_APPROVED` to `Approved` (as for `APPROVED`) to display `AUTO_APPROVED` and `APPROVED` statuses together, and for `PENDING_REVIEW` to `Edited`.

Author: DrAlexD

save-backend/src/main/kotlin/com/saveourtool/save/backend/controllers/vulnerability/VulnerabilityController.kt

@@ -64,7 +64,7 @@ class VulnerabilityController(
         authentication: Authentication?,
     ): Mono<VulnerabilityMetadataDtoList> = blockingToMono {
         checkPermission(filter, authentication)
-        vulnerabilityService.getFilteredWithUserInfos(filter, authentication, page, size)
+        vulnerabilityService.getFilteredWithUserInfos(filter, page, size)
     }
 
     @PostMapping("/count/by-filter")
@@ -79,7 +79,7 @@ class VulnerabilityController(
         authentication: Authentication?,
     ): Mono<Long> = blockingToMono {
         checkPermission(filter, authentication)
-        vulnerabilityService.getCountVulnerabilitiesByFilter(filter, authentication)
+        vulnerabilityService.getCountVulnerabilitiesByFilter(filter)
     }
 
     private fun checkPermission(

save-backend/src/main/kotlin/com/saveourtool/save/backend/service/vulnerability/VulnerabilityService.kt

@@ -84,7 +84,6 @@ class VulnerabilityService(
 
     /**
      * @param filter filters for vulnerability
-     * @param authentication [Authentication] describing an authenticated request
      * @param page
      * @param size
      * @return list of vulnerabilities with that match [filter]
@@ -96,12 +95,11 @@ class VulnerabilityService(
     )
     fun getFilteredWithUserInfos(
         filter: VulnerabilityFilter,
-        authentication: Authentication?,
         page: Int,
         size: Int,
     ): List<VulnerabilityMetadataDto> {
         val metadataList = vulnerabilityMetadataRepository.kFindAll(PageRequest.of(page, size)) { root, cq, cb ->
-            getFilterPredicate(root, cq, cb, filter, authentication)
+            getFilterPredicate(root, cq, cb, filter)
         }
 
         val tagMap = metadataList.content.toTagMap()
@@ -115,39 +113,26 @@ class VulnerabilityService(
 
     /**
      * @param filter
-     * @param authentication
      * @return count of vulnerability
      */
     fun getCountVulnerabilitiesByFilter(
         filter: VulnerabilityFilter,
-        authentication: Authentication?,
-    ) = vulnerabilityMetadataRepository.count { root, cq, cb -> getFilterPredicate(root, cq, cb, filter, authentication) }
+    ) = vulnerabilityMetadataRepository.count { root, cq, cb -> getFilterPredicate(root, cq, cb, filter) }
 
     private fun getFilterPredicate(
         root: Root<VulnerabilityMetadata>,
         cq: CriteriaQuery<*>,
         cb: CriteriaBuilder,
         filter: VulnerabilityFilter,
-        authentication: Authentication?,
     ): Predicate {
         with(filter) {
-            val namePredicate = if (identifierPrefix.isBlank()) {
-                cb.and()
+            val namePredicate = if (freeText.isNotBlank()) {
+                cb.or(cb.like(root.get("identifier"), "%$freeText%"), cb.like(root.get("summary"), "%$freeText%"))
             } else {
-                cb.like(root.get("identifier"), "%$identifierPrefix%")
+                cb.and()
             }
 
-            val ownerPredicate = authentication?.let {
-                val userId = authentication.userId()
-
-                if (isOwner) {
-                    cb.equal(root.get<User>("user").get<Long>("id"), userId)
-                } else {
-                    cb.and()
-                }
-            } ?: cb.and()
-
-            val statusPredicate = statuses?.let { statuses ->
+            val statusesPredicate = statuses?.let { statuses ->
                 cb.and(root.get<VulnerabilityStatus>("status").`in`(statuses))
             } ?: cb.and()
 
@@ -158,6 +143,10 @@ class VulnerabilityService(
                 cb.equal(root.get<VulnerabilityLanguage>("language"), language)
             } ?: cb.and()
 
+            val chosenStatusesPredicate = chosenStatuses?.let { statuses ->
+                cb.and(root.get<VulnerabilityStatus>("status").`in`(statuses))
+            } ?: cb.and()
+
             val organizationPredicate = organizationName?.let { organization ->
                 cb.equal(root.get<Organization>("organization").get<String>("name"), organization)
             } ?: cb.and()
@@ -168,10 +157,10 @@ class VulnerabilityService(
 
             return cb.and(
                 namePredicate,
-                ownerPredicate,
-                statusPredicate,
+                statusesPredicate,
                 criticalityPredicate,
                 languagePredicate,
+                chosenStatusesPredicate,
                 authorPredicate,
                 organizationPredicate,
                 getPredicateForTags(root, cq, cb, tags),

save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/entities/vulnerability/VulnerabilityStatus.kt

@@ -20,7 +20,7 @@ enum class VulnerabilityStatus(val value: String) {
     /**
      * Automatically approved by batch-upload
      */
-    AUTO_APPROVED("Auto-approved"),
+    AUTO_APPROVED("Approved"),
 
     /**
      * Created status
@@ -30,7 +30,7 @@ enum class VulnerabilityStatus(val value: String) {
     /**
      * Review status
      */
-    PENDING_REVIEW("Pending review"),
+    PENDING_REVIEW("Edited"),
 
     /**
      * Reject status

save-cloud-common/src/commonMain/kotlin/com/saveourtool/save/filters/VulnerabilityFilter.kt

@@ -5,25 +5,25 @@ import com.saveourtool.save.entities.vulnerability.VulnerabilityStatus
 import kotlinx.serialization.Serializable
 
 /**
- * @property identifierPrefix
+ * @property freeText
  * @property statuses
- * @property isOwner
  * @property tags
  * @property minCriticality
  * @property maxCriticality
  * @property language
+ * @property chosenStatuses
  * @property authorName
  * @property organizationName
  */
 @Serializable
 data class VulnerabilityFilter(
-    val identifierPrefix: String = "",
+    val freeText: String = "",
     val statuses: List<VulnerabilityStatus>? = null,
-    val isOwner: Boolean = false,
     val tags: Set<String> = emptySet(),
     val minCriticality: Float = 0.0f,
     val maxCriticality: Float = 10.0f,
     val language: VulnerabilityLanguage? = null,
+    val chosenStatuses: List<VulnerabilityStatus>? = null,
     val authorName: String? = null,
     val organizationName: String? = null,
 ) {

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/table/filters/VulnerabilitiesFiltersRow.kt

@@ -4,6 +4,7 @@ package com.saveourtool.save.frontend.components.basic.table.filters
 
 import com.saveourtool.save.entities.OrganizationDto
 import com.saveourtool.save.entities.vulnerability.VulnerabilityLanguage
+import com.saveourtool.save.entities.vulnerability.VulnerabilityStatus
 import com.saveourtool.save.filters.VulnerabilityFilter
 import com.saveourtool.save.frontend.components.inputform.*
 import com.saveourtool.save.frontend.components.inputform.renderUserWithAvatar
@@ -36,6 +37,7 @@ val vulnerabilitiesFiltersRow: FC<VulnerabilitiesFiltersProps> = FC { props ->
     val (filter, setFilter) = useStateFromProps(props.filter)
 
     val languagePlaceholder = "Language".t()
+    val statusPlaceholder = "Status".t()
     div {
         className = ClassName("px-0 container-fluid")
         div {
@@ -59,12 +61,12 @@ val vulnerabilitiesFiltersRow: FC<VulnerabilitiesFiltersProps> = FC { props ->
                                 input {
                                     type = InputType.text
                                     className = ClassName("form-control")
-                                    value = filter.identifierPrefix
-                                    placeholder = "${"Identifier".t()}..."
+                                    value = filter.freeText
+                                    placeholder = "${"Identifier or Summary".t()}..."
                                     required = false
                                     onChange = { event ->
                                         setFilter { oldFilter ->
-                                            oldFilter.copy(identifierPrefix = event.target.value)
+                                            oldFilter.copy(freeText = event.target.value)
                                         }
                                     }
                                 }
@@ -161,17 +163,35 @@ val vulnerabilitiesFiltersRow: FC<VulnerabilitiesFiltersProps> = FC { props ->
                             }
 
                             div {
-                                className = ClassName("col-4 px-1")
+                                className = ClassName("col-${if (props.isNeedToFilterStatus) "2" else "4"} px-1")
                                 selectorBuilder(
                                     filter.language?.value ?: languagePlaceholder,
-                                    VulnerabilityLanguage.values().map { it.value }.plus(languagePlaceholder),
+                                    listOf(languagePlaceholder).plus(VulnerabilityLanguage.values().map { it.value }),
                                     "form-control custom-select",
                                 ) { event ->
                                     val newLanguage = VulnerabilityLanguage.values().find { it.value == event.target.value }
                                     setFilter { oldFilter -> oldFilter.copy(language = newLanguage) }
                                 }
                             }
 
+                            if (props.isNeedToFilterStatus) {
+                                div {
+                                    className = ClassName("col-2 px-1")
+                                    selectorBuilder(
+                                        filter.chosenStatuses?.firstOrNull()?.value ?: statusPlaceholder,
+                                        listOf(statusPlaceholder).plus(
+                                            (filter.statuses ?: VulnerabilityStatus.values().toList())
+                                                .map { it.value }
+                                                .distinct()
+                                        ),
+                                        "form-control custom-select",
+                                    ) { event ->
+                                        val newStatuses = VulnerabilityStatus.values().filter { it.value == event.target.value }.takeIf { it.isNotEmpty() }
+                                        setFilter { oldFilter -> oldFilter.copy(chosenStatuses = newStatuses) }
+                                    }
+                                }
+                            }
+
                             div {
                                 className = ClassName("col-4 px-1")
                                 inputWithDebounceForOrganizationDto {
@@ -236,6 +256,11 @@ external interface VulnerabilitiesFiltersProps : Props {
      */
     var filter: VulnerabilityFilter
 
+    /**
+     * Flag that defines is it needed to add status filtering
+     */
+    var isNeedToFilterStatus: Boolean
+
     /**
      * [StateSetter] for [VulnerabilityFilter]
      */

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/OrganizationView.kt

@@ -575,7 +575,7 @@ class OrganizationView : AbstractView<OrganizationProps, OrganizationViewState>(
 
                 nav {
                     className = ClassName("nav nav-tabs")
-                    OrganizationMenuBar.entries
+                    OrganizationMenuBar.values()
                         .filter {
                             it != OrganizationMenuBar.SETTINGS || state.selfRole.isHigherOrEqualThan(Role.ADMIN)
                         }

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/views/vuln/VulnerabilityTableComponent.kt

@@ -143,9 +143,9 @@ val vulnerabilityTableComponent: FC<VulnerabilityTableComponentProps> = FC { pro
                             td {
                                 val severityNum = cellContext.row.original.severityNum
                                 val severityNumColor = when (severityNum) {
-                                    in 0.0f..4.9f -> "text-success"
-                                    in 5.0f..7.5f -> "text-warning"
-                                    in 7.6f..10.0f -> "text-danger"
+                                    in 0.0f..3.9f -> "text-success"
+                                    in 3.9f..6.9f -> "text-warning"
+                                    in 6.9f..10.0f -> "text-danger"
                                     else -> ""
                                 }
                                 className = ClassName("align-middle $severityNumColor text-center")
@@ -198,7 +198,7 @@ val vulnerabilityTableComponent: FC<VulnerabilityTableComponentProps> = FC { pro
                                     val status = cellContext.row.original.status.value
                                     val statusColor = when (status) {
                                         "Approved" -> "text-success"
-                                        "Created", "Pending review" -> "text-warning"
+                                        "Created", "Edited" -> "text-warning"
                                         "Rejected" -> "text-danger"
                                         else -> ""
                                     }
@@ -224,9 +224,9 @@ val vulnerabilityTableComponent: FC<VulnerabilityTableComponentProps> = FC { pro
     if (isVulnerabilityCollectionPage) {
         props.currentUserInfo?.globalRole?.let { role ->
             val tabList = if (role.isSuperAdmin()) {
-                VulnerabilityListTab.entries.map { it.name }
+                VulnerabilityListTab.values().map { it.name }
             } else {
-                VulnerabilityListTab.entries.filter { it != VulnerabilityListTab.ADMIN }
+                VulnerabilityListTab.values().filter { it != VulnerabilityListTab.ADMIN }
                     .map { it.name }
             }
             tab(selectedMenu.name, tabList, "nav nav-tabs mt-3") { value ->
@@ -265,6 +265,7 @@ val vulnerabilityTableComponent: FC<VulnerabilityTableComponentProps> = FC { pro
                         colSpan = tableInstance.visibleColumnsCount()
                         vulnerabilitiesFiltersRow {
                             filter = vulnerabilityFilter
+                            isNeedToFilterStatus = isNeedToShowStatus
                             onChangeFilter = { filterValue ->
                                 filterValue?.let {
                                     setVulnerabilityFilter(filterValue)
@@ -366,7 +367,7 @@ private fun getFiltersByTab(
 ) = when (selectedMenu) {
     VulnerabilityListTab.PUBLIC -> VulnerabilityFilter.approved
     VulnerabilityListTab.ADMIN -> VulnerabilityFilter.pendingApproval
-    VulnerabilityListTab.OWNER -> VulnerabilityFilter(isOwner = true, authorName = currentUserInfo?.name)  // TODO: delete isOwner?
+    VulnerabilityListTab.OWNER -> VulnerabilityFilter(authorName = currentUserInfo?.name)
 }
 
 /**