Editing view preparations: propagating of edit flag to children components

api-gateway/src/main/resources/application.yml

@@ -117,3 +117,8 @@ spring:
             scope:
               - user_info
 ---
+# logout timeout
+server:
+  servlet:
+    session:
+      timeout: 15m

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

@@ -186,7 +186,6 @@ class VulnerabilityController(
     )
     @ApiResponse(responseCode = "200", description = "Successfully updated vulnerability")
     @RequiresAuthorizationSourceHeader
-    @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')")
     fun update(
         @RequestBody vulnerabilityDto: VulnerabilityDto,
         authentication: Authentication,

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

@@ -296,16 +296,17 @@ class VulnerabilityService(
 
         val vulnerability = vulnerabilityRepository.findByIdentifier(vulnerabilityDto.identifier).orNotFound()
 
-        if (!authentication.hasRole(Role.SUPER_ADMIN) && (userId != vulnerability.userId || vulnerability.status == VulnerabilityStatus.APPROVED)) {
+        // only Super Users and owners of unapproved vuln. can edit it
+        if (authentication.hasRole(Role.SUPER_ADMIN) || (userId == vulnerability.userId && vulnerability.status != VulnerabilityStatus.APPROVED)) {
+            val vulnerabilityUpdate = vulnerability.apply {
+                progress = vulnerabilityDto.progress
+                description = vulnerabilityDto.description.orEmpty()
+                status = vulnerabilityDto.status
+            }
+            vulnerabilityRepository.save(vulnerabilityUpdate)
+        } else {
             throw ResponseStatusException(HttpStatus.FORBIDDEN)
         }
-
-        val vulnerabilityUpdate = vulnerability.apply {
-            progress = vulnerabilityDto.progress
-            description = vulnerabilityDto.description.orEmpty()
-            status = vulnerabilityDto.status
-        }
-        vulnerabilityRepository.save(vulnerabilityUpdate)
     }
 
     /**

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

@@ -40,6 +40,11 @@ enum class VulnerabilityDateType(val value: String) {
      */
     PUBLISHED("Published"),
 
+    /**
+     * Date when the vuln was submitted to our archive, our platform specific
+     */
+    SUBMITTED("Submitted"),
+
     /**
      * Date from [com.saveourtool.osv4k.OsvSchema.withdrawn] in COSV schema
      */

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

@@ -20,6 +20,8 @@ import react.router.useNavigate
 import web.cssom.ClassName
 import web.html.ButtonType
 
+import kotlinx.browser.window
+
 /**
  * Loader animation
  */
@@ -102,7 +104,8 @@ val requestModalHandler: FC<RequestModalProps> = FC { props ->
                 onClick = {
                     if (response?.status == 401.toShort()) {
                         // if 401 - change current URL to the main page (with login screen)
-                        navigate("/")
+                        navigate(to = "/")
+                        window.location.reload()
                     }
                     setResponse(null)
                     setModalState(modalState.copy(isErrorModalOpen = false))

save-frontend/src/main/kotlin/com/saveourtool/save/frontend/components/basic/TimelineComponent.kt

@@ -2,6 +2,8 @@
 
 package com.saveourtool.save.frontend.components.basic
 
+import com.saveourtool.save.entities.vulnerability.VulnerabilityDateType
+import com.saveourtool.save.entities.vulnerability.VulnerabilityDto
 import com.saveourtool.save.frontend.utils.buttonBuilder
 import react.*
 import react.dom.html.ReactHTML.div
@@ -28,45 +30,50 @@ val timelineComponent: FC<TimelineComponentProps> = FC { props ->
                 label = "Add date",
                 style = "secondary",
                 isOutline = true,
-                classes = "btn btn-primary"
+                classes = "btn btn-sm btn-primary"
             ) {
                 onClickCallback()
             }
         }
 
-        if (props.dates.isNotEmpty()) {
+        div {
+            className = ClassName("p-0 timeline-container")
             div {
-                className = ClassName("p-0 timeline-container")
+                className = ClassName("steps-container")
                 div {
-                    className = ClassName("steps-container")
-                    div {
-                        className = ClassName("line")
-                    }
-                    props.dates.toList()
-                        .sortedBy { it.second }
-                        .forEach { (label, dateTime) ->
-                            div {
-                                className = ClassName("step $hoverable")
+                    className = ClassName("line")
+                }
+                props.dates
+                    .plus(
+                        VulnerabilityDateType.SUBMITTED.value to
+                                (props.vulnerability.creationDateTime ?: LocalDateTime(0, 1, 1, 0, 0, 0, 0))
+                    )
+                    .toList()
+                    .sortedBy { it.second }
+                    .forEach { (label, dateTime) ->
+                        div {
+                            className =
+                                    ClassName(if (!label.isSubmittedType()) "step $hoverable" else "step-non-editable")
+                            if (!label.isSubmittedType()) {
                                 props.onNodeClick?.let { onClickCallback ->
                                     onClick = { onClickCallback(dateTime, label) }
                                 }
-
-                                div {
-                                    className = ClassName("text-label")
-                                    +label
-                                }
-                                div {
-                                    className = ClassName("date-label")
-                                    +dateTime.date.toString()
-                                }
                             }
                             div {
-                                className = ClassName("line")
+                                className = ClassName("text-label")
+                                +label
+                            }
+                            div {
+                                className = ClassName("date-label")
+                                +dateTime.date.toString()
                             }
                         }
-                    div {
-                        className = ClassName("line-end")
+                        div {
+                            className = ClassName("line")
+                        }
                     }
+                div {
+                    className = ClassName("line-end")
                 }
             }
         }
@@ -97,4 +104,11 @@ external interface TimelineComponentProps : Props {
      */
     @Suppress("TYPE_ALIAS")
     var onNodeClick: ((LocalDateTime, String) -> Unit)?
+
+    /**
+     * Vulnerability dto of vulnerability
+     */
+    var vulnerability: VulnerabilityDto
 }
+
+private fun String.isSubmittedType() = this == VulnerabilityDateType.SUBMITTED.value

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

@@ -27,6 +27,7 @@ import web.cssom.*
 import web.html.ButtonType
 import web.html.InputType
 
+import kotlinx.browser.window
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
@@ -54,6 +55,7 @@ val userSettingsView: FC<SettingsProps> = FC { props ->
                 type = ButtonType.button
                 onClick = {
                     useNavigate(to = "/")
+                    window.location.reload()
                 }
                 +"Proceed to login page"
             }

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

@@ -1,6 +1,7 @@
 package com.saveourtool.save.frontend.components.views.vuln
 
 import com.saveourtool.save.entities.vulnerability.VulnerabilityDto
+import com.saveourtool.save.entities.vulnerability.VulnerabilityStatus
 import com.saveourtool.save.frontend.components.basic.renderAvatar
 import com.saveourtool.save.frontend.components.basic.renderUserAvatarWithName
 import com.saveourtool.save.frontend.components.basic.userBoard
@@ -9,14 +10,17 @@ import com.saveourtool.save.frontend.utils.*
 import com.saveourtool.save.info.UserInfo
 import com.saveourtool.save.utils.toUnixCalendarFormat
 
+import js.core.jso
 import react.*
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.h6
 import react.dom.html.ReactHTML.hr
 import react.dom.html.ReactHTML.label
+import react.dom.html.ReactHTML.p
 import react.dom.html.ReactHTML.textarea
 import react.router.dom.Link
 import web.cssom.ClassName
+import web.cssom.TextDecoration.Companion.underline
 import web.cssom.rem
 
 import kotlinx.datetime.TimeZone
@@ -28,14 +32,12 @@ import kotlinx.serialization.json.Json
  */
 @Suppress("EMPTY_BLOCK_STRUCTURE_ERROR", "MAGIC_NUMBER")
 val vulnerabilityGeneralInfo: FC<VulnerabilityGeneralInfo> = FC { props ->
-    val (vulnerability, setVulnerability) = useStateFromProps(props.vulnerability)
-
     val enrollRequest = useDeferredRequest {
         post(
             "$apiUrl/vulnerabilities/update",
             jsonHeaders,
-            Json.encodeToString(vulnerability),
-            loadingHandler = ::noopLoadingHandler,
+            Json.encodeToString(props.vulnerability),
+            loadingHandler = ::loadingHandler,
         )
     }
 
@@ -55,13 +57,21 @@ val vulnerabilityGeneralInfo: FC<VulnerabilityGeneralInfo> = FC { props ->
                         }
                     }
                     if (props.isEditDisabled) {
-                        if (props.userInfo?.isSuperAdmin() == true || props.userInfo?.name == userInfo.name) {
+                        // only Super Users and owners of unapproved vuln. can edit it
+                        if (props.userInfo?.isSuperAdmin() == true ||
+                                (props.userInfo?.name == userInfo.name && props.vulnerability.status != VulnerabilityStatus.APPROVED)) {
                             buttonBuilder(
                                 labelBuilder = {
-                                    +"Edit "
-                                    fontAwesomeIcon(icon = faEdit)
+                                    p {
+                                        className = ClassName("mb-0")
+                                        style = jso {
+                                            textDecoration = underline
+                                        }
+                                        +"Edit "
+                                        fontAwesomeIcon(icon = faEdit)
+                                    }
                                 },
-                                "link", isOutline = true, classes = "text-xs text-muted text-left ml-auto"
+                                isOutline = true, classes = "text-xs text-left ml-auto"
                             ) {
                                 props.setIsEditDisabled(false)
                             }
@@ -72,33 +82,36 @@ val vulnerabilityGeneralInfo: FC<VulnerabilityGeneralInfo> = FC { props ->
                             props.setIsEditDisabled(true)
                         }
                         buttonBuilder(faTimesCircle, null, isOutline = true) {
-                            setVulnerability(props.vulnerability)
+                            props.setVulnerability(props.vulnerability)
                             props.setIsEditDisabled(true)
                         }
                     }
                 }
                 textarea {
-                    className = ClassName("auto_height form-control-plaintext pt-0 pb-0 text-gray-900")
+                    className = ClassName("auto_height form-control-plaintext px-2 pt-0 pb-0 text-gray-900")
                     value = shortDescription
+                    disabled = props.isEditDisabled
                     rows = 2
+                    if (!props.isEditDisabled) {
+                        style = borderEditStyle()
+                    }
+                    onChange = { event ->
+                        props.setVulnerability { vulnerability ->
+                            vulnerability.copy(
+                                shortDescription = event.target.value
+                            )
+                        }
+                    }
                 }
                 hr { }
                 div {
                     className = ClassName("d-flex justify-content-between align-items-center")
-                    label {
-                        className = ClassName("m-0")
-                        +"Creation time:"
-                    }
-                    label {
-                        className = ClassName("m-0")
-                        +creationDateTime?.toUnixCalendarFormat(TimeZone.currentSystemDefault())
-                    }
                 }
                 div {
                     className = ClassName("d-flex justify-content-between align-items-center")
                     label {
                         className = ClassName("m-0")
-                        +"Last updated time:"
+                        +"Last update time:"
                     }
                     label {
                         className = ClassName("m-0")
@@ -111,12 +124,15 @@ val vulnerabilityGeneralInfo: FC<VulnerabilityGeneralInfo> = FC { props ->
                     +"Description"
                 }
                 textarea {
-                    className = ClassName("auto_height form-control-plaintext pt-0 pb-0 text-gray-900")
+                    className = ClassName("auto_height form-control-plaintext px-2 pt-0 pb-0 text-gray-900")
                     value = description
                     disabled = props.isEditDisabled
                     rows = 8
+                    if (!props.isEditDisabled) {
+                        style = borderEditStyle()
+                    }
                     onChange = { event ->
-                        setVulnerability { vulnerability ->
+                        props.setVulnerability { vulnerability ->
                             vulnerability.copy(
                                 description = event.target.value
                             )
@@ -136,6 +152,7 @@ val vulnerabilityGeneralInfo: FC<VulnerabilityGeneralInfo> = FC { props ->
                             this.vulnerability = props.vulnerability
                             fetchVulnerability = props.fetchVulnerability
                             canEditVulnerability = props.canEditVulnerability
+                            isEditDisabled = props.isEditDisabled
                         }
                     }
                 }
@@ -202,6 +219,11 @@ external interface VulnerabilityGeneralInfo : Props {
      */
     var vulnerability: VulnerabilityDto
 
+    /**
+     * Vulnerabilities setter
+     */
+    var setVulnerability: StateSetter<VulnerabilityDto>
+
     /**
      * Callback to fetch updated vulnerability
      */