feat(#4): Add versioning of application form
This commit is contained in:
@@ -275,6 +275,111 @@ paths:
|
|||||||
"503":
|
"503":
|
||||||
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/ServiceUnavailable"
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/ServiceUnavailable"
|
||||||
|
|
||||||
|
/application-forms/{id}/versions:
|
||||||
|
parameters:
|
||||||
|
- name: id
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
get:
|
||||||
|
summary: Get all versions of an application form
|
||||||
|
operationId: getApplicationFormVersions
|
||||||
|
tags:
|
||||||
|
- application-form-version
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: List of versions
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/ApplicationFormVersionListItemDto"
|
||||||
|
"400":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/BadRequest"
|
||||||
|
"401":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/Unauthorized"
|
||||||
|
"404":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/NotFound"
|
||||||
|
"500":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/ServerError"
|
||||||
|
"503":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/ServiceUnavailable"
|
||||||
|
|
||||||
|
/application-forms/{id}/versions/{versionNumber}:
|
||||||
|
parameters:
|
||||||
|
- name: id
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
- name: versionNumber
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
get:
|
||||||
|
summary: Get specific version with full snapshot
|
||||||
|
operationId: getApplicationFormVersion
|
||||||
|
tags:
|
||||||
|
- application-form-version
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: Version details with snapshot
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApplicationFormVersionDto"
|
||||||
|
"400":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/BadRequest"
|
||||||
|
"401":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/Unauthorized"
|
||||||
|
"404":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/NotFound"
|
||||||
|
"500":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/ServerError"
|
||||||
|
"503":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/ServiceUnavailable"
|
||||||
|
|
||||||
|
/application-forms/{id}/versions/{versionNumber}/restore:
|
||||||
|
parameters:
|
||||||
|
- name: id
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
- name: versionNumber
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
post:
|
||||||
|
summary: Restore a specific version
|
||||||
|
operationId: restoreApplicationFormVersion
|
||||||
|
tags:
|
||||||
|
- application-form-version
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: Restored application form
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/ApplicationFormDto"
|
||||||
|
"400":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/BadRequest"
|
||||||
|
"401":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/Unauthorized"
|
||||||
|
"404":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/NotFound"
|
||||||
|
"500":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/ServerError"
|
||||||
|
"503":
|
||||||
|
$ref: "https://api.swaggerhub.com/domains/smartbear-public/ProblemDetails/1.0.0#/components/responses/ServiceUnavailable"
|
||||||
|
|
||||||
####### Application Form Templates #######
|
####### Application Form Templates #######
|
||||||
/application-form-templates:
|
/application-form-templates:
|
||||||
get:
|
get:
|
||||||
@@ -1017,6 +1122,92 @@ components:
|
|||||||
items:
|
items:
|
||||||
$ref: "#/components/schemas/ApplicationFormDto"
|
$ref: "#/components/schemas/ApplicationFormDto"
|
||||||
|
|
||||||
|
ApplicationFormSnapshotDto:
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- name
|
||||||
|
- status
|
||||||
|
- organizationId
|
||||||
|
- sections
|
||||||
|
properties:
|
||||||
|
name:
|
||||||
|
type: string
|
||||||
|
status:
|
||||||
|
$ref: "#/components/schemas/ApplicationFormStatus"
|
||||||
|
organizationId:
|
||||||
|
type: string
|
||||||
|
sections:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/FormElementSectionSnapshotDto"
|
||||||
|
|
||||||
|
####### ApplicationFormVersion #######
|
||||||
|
ApplicationFormVersionDto:
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- id
|
||||||
|
- applicationFormId
|
||||||
|
- versionNumber
|
||||||
|
- name
|
||||||
|
- status
|
||||||
|
- organizationId
|
||||||
|
- snapshot
|
||||||
|
- createdBy
|
||||||
|
- createdAt
|
||||||
|
properties:
|
||||||
|
id:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
applicationFormId:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
versionNumber:
|
||||||
|
type: integer
|
||||||
|
name:
|
||||||
|
type: string
|
||||||
|
status:
|
||||||
|
$ref: "#/components/schemas/ApplicationFormStatus"
|
||||||
|
organizationId:
|
||||||
|
type: string
|
||||||
|
snapshot:
|
||||||
|
$ref: "#/components/schemas/ApplicationFormSnapshotDto"
|
||||||
|
createdBy:
|
||||||
|
$ref: "#/components/schemas/UserDto"
|
||||||
|
createdAt:
|
||||||
|
type: string
|
||||||
|
format: date-time
|
||||||
|
|
||||||
|
ApplicationFormVersionListItemDto:
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- id
|
||||||
|
- applicationFormId
|
||||||
|
- versionNumber
|
||||||
|
- name
|
||||||
|
- status
|
||||||
|
- organizationId
|
||||||
|
- createdBy
|
||||||
|
- createdAt
|
||||||
|
properties:
|
||||||
|
id:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
applicationFormId:
|
||||||
|
type: string
|
||||||
|
format: uuid
|
||||||
|
versionNumber:
|
||||||
|
type: integer
|
||||||
|
name:
|
||||||
|
type: string
|
||||||
|
status:
|
||||||
|
$ref: "#/components/schemas/ApplicationFormStatus"
|
||||||
|
organizationId:
|
||||||
|
type: string
|
||||||
|
createdBy:
|
||||||
|
$ref: "#/components/schemas/UserDto"
|
||||||
|
createdAt:
|
||||||
|
type: string
|
||||||
|
format: date-time
|
||||||
|
|
||||||
####### Form #######
|
####### Form #######
|
||||||
FormElementSectionDto:
|
FormElementSectionDto:
|
||||||
@@ -1044,6 +1235,23 @@ components:
|
|||||||
type: string
|
type: string
|
||||||
format: uuid
|
format: uuid
|
||||||
|
|
||||||
|
FormElementSectionSnapshotDto:
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- title
|
||||||
|
- elements
|
||||||
|
properties:
|
||||||
|
title:
|
||||||
|
type: string
|
||||||
|
shortTitle:
|
||||||
|
type: string
|
||||||
|
description:
|
||||||
|
type: string
|
||||||
|
elements:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/FormElementSnapshotDto"
|
||||||
|
|
||||||
CreateFormElementSectionDto:
|
CreateFormElementSectionDto:
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
@@ -1089,6 +1297,23 @@ components:
|
|||||||
type: string
|
type: string
|
||||||
format: uuid
|
format: uuid
|
||||||
|
|
||||||
|
FormElementSnapshotDto:
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- type
|
||||||
|
- options
|
||||||
|
properties:
|
||||||
|
title:
|
||||||
|
type: string
|
||||||
|
description:
|
||||||
|
type: string
|
||||||
|
type:
|
||||||
|
$ref: "#/components/schemas/FormElementType"
|
||||||
|
options:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/FormOptionDto"
|
||||||
|
|
||||||
CreateFormElementDto:
|
CreateFormElementDto:
|
||||||
type: object
|
type: object
|
||||||
required:
|
required:
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.betriebsratkanzlei.legalconsenthub.application_form
|
package com.betriebsratkanzlei.legalconsenthub.application_form
|
||||||
|
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.application_form_version.ApplicationFormVersionService
|
||||||
import com.betriebsratkanzlei.legalconsenthub.error.ApplicationFormInvalidStateException
|
import com.betriebsratkanzlei.legalconsenthub.error.ApplicationFormInvalidStateException
|
||||||
import com.betriebsratkanzlei.legalconsenthub.error.ApplicationFormNotCreatedException
|
import com.betriebsratkanzlei.legalconsenthub.error.ApplicationFormNotCreatedException
|
||||||
import com.betriebsratkanzlei.legalconsenthub.error.ApplicationFormNotDeletedException
|
import com.betriebsratkanzlei.legalconsenthub.error.ApplicationFormNotDeletedException
|
||||||
@@ -8,6 +9,7 @@ import com.betriebsratkanzlei.legalconsenthub.error.ApplicationFormNotUpdatedExc
|
|||||||
import com.betriebsratkanzlei.legalconsenthub.error.FormElementSectionNotFoundException
|
import com.betriebsratkanzlei.legalconsenthub.error.FormElementSectionNotFoundException
|
||||||
import com.betriebsratkanzlei.legalconsenthub.form_element.FormElementMapper
|
import com.betriebsratkanzlei.legalconsenthub.form_element.FormElementMapper
|
||||||
import com.betriebsratkanzlei.legalconsenthub.notification.NotificationService
|
import com.betriebsratkanzlei.legalconsenthub.notification.NotificationService
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.user.UserService
|
||||||
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormDto
|
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormDto
|
||||||
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormStatus
|
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormStatus
|
||||||
import com.betriebsratkanzlei.legalconsenthub_api.model.CreateApplicationFormDto
|
import com.betriebsratkanzlei.legalconsenthub_api.model.CreateApplicationFormDto
|
||||||
@@ -25,6 +27,8 @@ class ApplicationFormService(
|
|||||||
private val applicationFormMapper: ApplicationFormMapper,
|
private val applicationFormMapper: ApplicationFormMapper,
|
||||||
private val formElementMapper: FormElementMapper,
|
private val formElementMapper: FormElementMapper,
|
||||||
private val notificationService: NotificationService,
|
private val notificationService: NotificationService,
|
||||||
|
private val versionService: ApplicationFormVersionService,
|
||||||
|
private val userService: UserService,
|
||||||
) {
|
) {
|
||||||
fun createApplicationForm(createApplicationFormDto: CreateApplicationFormDto): ApplicationForm {
|
fun createApplicationForm(createApplicationFormDto: CreateApplicationFormDto): ApplicationForm {
|
||||||
val applicationForm = applicationFormMapper.toApplicationForm(createApplicationFormDto)
|
val applicationForm = applicationFormMapper.toApplicationForm(createApplicationFormDto)
|
||||||
@@ -35,6 +39,9 @@ class ApplicationFormService(
|
|||||||
throw ApplicationFormNotCreatedException(e)
|
throw ApplicationFormNotCreatedException(e)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val currentUser = userService.getCurrentUser()
|
||||||
|
versionService.createVersion(savedApplicationForm, currentUser)
|
||||||
|
|
||||||
return savedApplicationForm
|
return savedApplicationForm
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,6 +65,9 @@ class ApplicationFormService(
|
|||||||
throw ApplicationFormNotUpdatedException(e, applicationFormDto.id)
|
throw ApplicationFormNotUpdatedException(e, applicationFormDto.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val currentUser = userService.getCurrentUser()
|
||||||
|
versionService.createVersion(updatedApplicationForm, currentUser)
|
||||||
|
|
||||||
return updatedApplicationForm
|
return updatedApplicationForm
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,6 +100,9 @@ class ApplicationFormService(
|
|||||||
throw ApplicationFormNotUpdatedException(e, id)
|
throw ApplicationFormNotUpdatedException(e, id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val currentUser = userService.getCurrentUser()
|
||||||
|
versionService.createVersion(savedApplicationForm, currentUser)
|
||||||
|
|
||||||
createNotificationForOrganization(savedApplicationForm)
|
createNotificationForOrganization(savedApplicationForm)
|
||||||
|
|
||||||
return savedApplicationForm
|
return savedApplicationForm
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package com.betriebsratkanzlei.legalconsenthub.application_form_version
|
||||||
|
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.application_form.ApplicationForm
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.user.User
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormStatus
|
||||||
|
import jakarta.persistence.Column
|
||||||
|
import jakarta.persistence.Entity
|
||||||
|
import jakarta.persistence.EntityListeners
|
||||||
|
import jakarta.persistence.EnumType
|
||||||
|
import jakarta.persistence.Enumerated
|
||||||
|
import jakarta.persistence.GeneratedValue
|
||||||
|
import jakarta.persistence.Id
|
||||||
|
import jakarta.persistence.JoinColumn
|
||||||
|
import jakarta.persistence.ManyToOne
|
||||||
|
import org.springframework.data.annotation.CreatedDate
|
||||||
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener
|
||||||
|
import java.time.LocalDateTime
|
||||||
|
import java.util.UUID
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@EntityListeners(AuditingEntityListener::class)
|
||||||
|
class ApplicationFormVersion(
|
||||||
|
@Id
|
||||||
|
@GeneratedValue
|
||||||
|
var id: UUID? = null,
|
||||||
|
@ManyToOne
|
||||||
|
@JoinColumn(name = "application_form_id", nullable = false)
|
||||||
|
var applicationForm: ApplicationForm,
|
||||||
|
@Column(nullable = false)
|
||||||
|
var versionNumber: Int,
|
||||||
|
@Column(nullable = false)
|
||||||
|
var name: String,
|
||||||
|
@Enumerated(EnumType.STRING)
|
||||||
|
@Column(nullable = false)
|
||||||
|
var status: ApplicationFormStatus,
|
||||||
|
@Column(nullable = false)
|
||||||
|
var organizationId: String,
|
||||||
|
@Column(nullable = false, columnDefinition = "TEXT")
|
||||||
|
var snapshotData: String,
|
||||||
|
@ManyToOne
|
||||||
|
@JoinColumn(name = "created_by_id", nullable = false)
|
||||||
|
var createdBy: User,
|
||||||
|
@CreatedDate
|
||||||
|
@Column(nullable = false)
|
||||||
|
var createdAt: LocalDateTime? = null,
|
||||||
|
)
|
||||||
|
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
package com.betriebsratkanzlei.legalconsenthub.application_form_version
|
||||||
|
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.application_form.ApplicationFormMapper
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.user.UserService
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.api.ApplicationFormVersionApi
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormDto
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormVersionDto
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormVersionListItemDto
|
||||||
|
import org.springframework.http.ResponseEntity
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize
|
||||||
|
import org.springframework.web.bind.annotation.RestController
|
||||||
|
import java.util.UUID
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
class ApplicationFormVersionController(
|
||||||
|
private val versionService: ApplicationFormVersionService,
|
||||||
|
private val versionMapper: ApplicationFormVersionMapper,
|
||||||
|
private val applicationFormMapper: ApplicationFormMapper,
|
||||||
|
private val userService: UserService,
|
||||||
|
) : ApplicationFormVersionApi {
|
||||||
|
@PreAuthorize(
|
||||||
|
"hasAnyRole('CHIEF_EXECUTIVE_OFFICER', 'BUSINESS_DEPARTMENT', 'IT_DEPARTMENT', 'HUMAN_RESOURCES', 'HEAD_OF_WORKS_COUNCIL', 'WORKS_COUNCIL', 'EMPLOYEE')",
|
||||||
|
)
|
||||||
|
override fun getApplicationFormVersions(id: UUID): ResponseEntity<List<ApplicationFormVersionListItemDto>> {
|
||||||
|
val versions = versionService.getVersionsByApplicationFormId(id)
|
||||||
|
return ResponseEntity.ok(versions.map { versionMapper.toApplicationFormVersionListItemDto(it) })
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize(
|
||||||
|
"hasAnyRole('CHIEF_EXECUTIVE_OFFICER', 'BUSINESS_DEPARTMENT', 'IT_DEPARTMENT', 'HUMAN_RESOURCES', 'HEAD_OF_WORKS_COUNCIL', 'WORKS_COUNCIL', 'EMPLOYEE')",
|
||||||
|
)
|
||||||
|
override fun getApplicationFormVersion(
|
||||||
|
id: UUID,
|
||||||
|
versionNumber: Int,
|
||||||
|
): ResponseEntity<ApplicationFormVersionDto> {
|
||||||
|
val version = versionService.getVersion(id, versionNumber)
|
||||||
|
return ResponseEntity.ok(versionMapper.toApplicationFormVersionDto(version))
|
||||||
|
}
|
||||||
|
|
||||||
|
@PreAuthorize(
|
||||||
|
"hasAnyRole('CHIEF_EXECUTIVE_OFFICER', 'BUSINESS_DEPARTMENT', 'IT_DEPARTMENT', 'HUMAN_RESOURCES', 'HEAD_OF_WORKS_COUNCIL', 'WORKS_COUNCIL')",
|
||||||
|
)
|
||||||
|
override fun restoreApplicationFormVersion(
|
||||||
|
id: UUID,
|
||||||
|
versionNumber: Int,
|
||||||
|
): ResponseEntity<ApplicationFormDto> {
|
||||||
|
val currentUser = userService.getCurrentUser()
|
||||||
|
val restoredForm = versionService.restoreVersion(id, versionNumber, currentUser)
|
||||||
|
return ResponseEntity.ok(applicationFormMapper.toApplicationFormDto(restoredForm))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package com.betriebsratkanzlei.legalconsenthub.application_form_version
|
||||||
|
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.user.UserMapper
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormSnapshotDto
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormVersionDto
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormVersionListItemDto
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper
|
||||||
|
import org.springframework.stereotype.Component
|
||||||
|
|
||||||
|
@Component
|
||||||
|
class ApplicationFormVersionMapper(
|
||||||
|
private val userMapper: UserMapper,
|
||||||
|
private val objectMapper: ObjectMapper,
|
||||||
|
) {
|
||||||
|
fun toApplicationFormVersionDto(version: ApplicationFormVersion): ApplicationFormVersionDto {
|
||||||
|
val snapshot = objectMapper.readValue(version.snapshotData, ApplicationFormSnapshotDto::class.java)
|
||||||
|
|
||||||
|
return ApplicationFormVersionDto(
|
||||||
|
id = version.id ?: throw IllegalStateException("ApplicationFormVersion ID must not be null!"),
|
||||||
|
applicationFormId =
|
||||||
|
version.applicationForm.id
|
||||||
|
?: throw IllegalStateException("ApplicationForm ID must not be null!"),
|
||||||
|
versionNumber = version.versionNumber,
|
||||||
|
name = version.name,
|
||||||
|
status = version.status,
|
||||||
|
organizationId = version.organizationId,
|
||||||
|
snapshot = snapshot,
|
||||||
|
createdBy = userMapper.toUserDto(version.createdBy),
|
||||||
|
createdAt =
|
||||||
|
version.createdAt
|
||||||
|
?: throw IllegalStateException("ApplicationFormVersion createdAt must not be null!"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun toApplicationFormVersionListItemDto(version: ApplicationFormVersion): ApplicationFormVersionListItemDto =
|
||||||
|
ApplicationFormVersionListItemDto(
|
||||||
|
id = version.id ?: throw IllegalStateException("ApplicationFormVersion ID must not be null!"),
|
||||||
|
applicationFormId =
|
||||||
|
version.applicationForm.id
|
||||||
|
?: throw IllegalStateException("ApplicationForm ID must not be null!"),
|
||||||
|
versionNumber = version.versionNumber,
|
||||||
|
name = version.name,
|
||||||
|
status = version.status,
|
||||||
|
organizationId = version.organizationId,
|
||||||
|
createdBy = userMapper.toUserDto(version.createdBy),
|
||||||
|
createdAt =
|
||||||
|
version.createdAt
|
||||||
|
?: throw IllegalStateException("ApplicationFormVersion createdAt must not be null!"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package com.betriebsratkanzlei.legalconsenthub.application_form_version
|
||||||
|
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository
|
||||||
|
import org.springframework.stereotype.Repository
|
||||||
|
import java.util.Optional
|
||||||
|
import java.util.UUID
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
interface ApplicationFormVersionRepository : JpaRepository<ApplicationFormVersion, UUID> {
|
||||||
|
fun findByApplicationFormIdOrderByVersionNumberDesc(applicationFormId: UUID): List<ApplicationFormVersion>
|
||||||
|
|
||||||
|
fun findByApplicationFormIdAndVersionNumber(
|
||||||
|
applicationFormId: UUID,
|
||||||
|
versionNumber: Int,
|
||||||
|
): Optional<ApplicationFormVersion>
|
||||||
|
|
||||||
|
fun countByApplicationFormId(applicationFormId: UUID): Int
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
package com.betriebsratkanzlei.legalconsenthub.application_form_version
|
||||||
|
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.application_form.ApplicationForm
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.application_form.ApplicationFormRepository
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.error.ApplicationFormNotFoundException
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.error.ApplicationFormVersionNotFoundException
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.form_element.FormElement
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.form_element.FormElementSection
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.form_element.FormOption
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub.user.User
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.ApplicationFormSnapshotDto
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.FormElementSnapshotDto
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.FormElementSectionSnapshotDto
|
||||||
|
import com.betriebsratkanzlei.legalconsenthub_api.model.FormOptionDto
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper
|
||||||
|
import org.springframework.stereotype.Service
|
||||||
|
import org.springframework.transaction.annotation.Transactional
|
||||||
|
import java.util.UUID
|
||||||
|
|
||||||
|
@Service
|
||||||
|
class ApplicationFormVersionService(
|
||||||
|
private val versionRepository: ApplicationFormVersionRepository,
|
||||||
|
private val applicationFormRepository: ApplicationFormRepository,
|
||||||
|
private val objectMapper: ObjectMapper,
|
||||||
|
) {
|
||||||
|
@Transactional
|
||||||
|
fun createVersion(
|
||||||
|
applicationForm: ApplicationForm,
|
||||||
|
user: User,
|
||||||
|
): ApplicationFormVersion {
|
||||||
|
val nextVersionNumber = versionRepository.countByApplicationFormId(applicationForm.id!!) + 1
|
||||||
|
|
||||||
|
val snapshot = createSnapshot(applicationForm)
|
||||||
|
val snapshotJson = objectMapper.writeValueAsString(snapshot)
|
||||||
|
|
||||||
|
val version =
|
||||||
|
ApplicationFormVersion(
|
||||||
|
applicationForm = applicationForm,
|
||||||
|
versionNumber = nextVersionNumber,
|
||||||
|
name = applicationForm.name,
|
||||||
|
status = applicationForm.status,
|
||||||
|
organizationId = applicationForm.organizationId,
|
||||||
|
snapshotData = snapshotJson,
|
||||||
|
createdBy = user,
|
||||||
|
)
|
||||||
|
|
||||||
|
return versionRepository.save(version)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getVersionsByApplicationFormId(applicationFormId: UUID): List<ApplicationFormVersion> =
|
||||||
|
versionRepository.findByApplicationFormIdOrderByVersionNumberDesc(applicationFormId)
|
||||||
|
|
||||||
|
fun getVersion(
|
||||||
|
applicationFormId: UUID,
|
||||||
|
versionNumber: Int,
|
||||||
|
): ApplicationFormVersion =
|
||||||
|
versionRepository
|
||||||
|
.findByApplicationFormIdAndVersionNumber(applicationFormId, versionNumber)
|
||||||
|
.orElseThrow { ApplicationFormVersionNotFoundException(applicationFormId, versionNumber) }
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
fun restoreVersion(
|
||||||
|
applicationFormId: UUID,
|
||||||
|
versionNumber: Int,
|
||||||
|
user: User,
|
||||||
|
): ApplicationForm {
|
||||||
|
val version = getVersion(applicationFormId, versionNumber)
|
||||||
|
val applicationForm =
|
||||||
|
applicationFormRepository
|
||||||
|
.findById(applicationFormId)
|
||||||
|
.orElseThrow { ApplicationFormNotFoundException(applicationFormId) }
|
||||||
|
|
||||||
|
val snapshot = objectMapper.readValue(version.snapshotData, ApplicationFormSnapshotDto::class.java)
|
||||||
|
|
||||||
|
applicationForm.name = snapshot.name
|
||||||
|
applicationForm.status = snapshot.status
|
||||||
|
applicationForm.organizationId = snapshot.organizationId
|
||||||
|
applicationForm.lastModifiedBy = user
|
||||||
|
|
||||||
|
applicationForm.formElementSections.clear()
|
||||||
|
snapshot.sections.forEach { sectionSnapshot ->
|
||||||
|
val section = createSectionFromSnapshot(sectionSnapshot, applicationForm)
|
||||||
|
applicationForm.formElementSections.add(section)
|
||||||
|
}
|
||||||
|
|
||||||
|
val restoredForm = applicationFormRepository.save(applicationForm)
|
||||||
|
|
||||||
|
createVersion(restoredForm, user)
|
||||||
|
|
||||||
|
return restoredForm
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun createSnapshot(applicationForm: ApplicationForm): ApplicationFormSnapshotDto =
|
||||||
|
ApplicationFormSnapshotDto(
|
||||||
|
name = applicationForm.name,
|
||||||
|
status = applicationForm.status,
|
||||||
|
organizationId = applicationForm.organizationId,
|
||||||
|
sections =
|
||||||
|
applicationForm.formElementSections.map { section ->
|
||||||
|
FormElementSectionSnapshotDto(
|
||||||
|
title = section.title,
|
||||||
|
shortTitle = section.shortTitle,
|
||||||
|
description = section.description,
|
||||||
|
elements =
|
||||||
|
section.formElements.map { element ->
|
||||||
|
FormElementSnapshotDto(
|
||||||
|
title = element.title,
|
||||||
|
description = element.description,
|
||||||
|
type = element.type,
|
||||||
|
options =
|
||||||
|
element.options.map { option ->
|
||||||
|
FormOptionDto(
|
||||||
|
value = option.value,
|
||||||
|
label = option.label,
|
||||||
|
processingPurpose = option.processingPurpose,
|
||||||
|
employeeDataCategory = option.employeeDataCategory,
|
||||||
|
)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun createSectionFromSnapshot(
|
||||||
|
sectionSnapshot: FormElementSectionSnapshotDto,
|
||||||
|
applicationForm: ApplicationForm,
|
||||||
|
): FormElementSection {
|
||||||
|
val section =
|
||||||
|
FormElementSection(
|
||||||
|
title = sectionSnapshot.title,
|
||||||
|
shortTitle = sectionSnapshot.shortTitle,
|
||||||
|
description = sectionSnapshot.description,
|
||||||
|
applicationForm = applicationForm,
|
||||||
|
)
|
||||||
|
|
||||||
|
sectionSnapshot.elements.forEach { elementSnapshot ->
|
||||||
|
val element =
|
||||||
|
FormElement(
|
||||||
|
title = elementSnapshot.title,
|
||||||
|
description = elementSnapshot.description,
|
||||||
|
type = elementSnapshot.type,
|
||||||
|
formElementSection = section,
|
||||||
|
options =
|
||||||
|
elementSnapshot.options.map { optionDto ->
|
||||||
|
FormOption(
|
||||||
|
value = optionDto.value,
|
||||||
|
label = optionDto.label,
|
||||||
|
processingPurpose = optionDto.processingPurpose,
|
||||||
|
employeeDataCategory = optionDto.employeeDataCategory,
|
||||||
|
)
|
||||||
|
}.toMutableList(),
|
||||||
|
)
|
||||||
|
section.formElements.add(element)
|
||||||
|
}
|
||||||
|
|
||||||
|
return section
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package com.betriebsratkanzlei.legalconsenthub.error
|
||||||
|
|
||||||
|
import java.util.UUID
|
||||||
|
|
||||||
|
class ApplicationFormVersionNotFoundException(
|
||||||
|
applicationFormId: UUID,
|
||||||
|
versionNumber: Int,
|
||||||
|
) : RuntimeException("Application form version $versionNumber for application form $applicationFormId not found")
|
||||||
|
|
||||||
103
legalconsenthub/app/components/TheForm.vue
Normal file
103
legalconsenthub/app/components/TheForm.vue
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
<template>
|
||||||
|
<div class="flex flex-col w-full lg:max-w-4xl mx-auto">
|
||||||
|
<UStepper ref="stepper" v-model="activeStepperItemIndex" :items="stepperItems" class="w-full" />
|
||||||
|
<h1 v-if="currentFormElementSection?.title" class="text-xl text-pretty font-bold text-highlighted">
|
||||||
|
{{ currentFormElementSection.title }}
|
||||||
|
</h1>
|
||||||
|
<UCard variant="subtle">
|
||||||
|
<FormEngine
|
||||||
|
v-if="applicationForm && currentFormElementSection?.formElements"
|
||||||
|
v-model="currentFormElementSection.formElements"
|
||||||
|
:application-form-id="applicationForm.id"
|
||||||
|
:disabled="isReadOnly"
|
||||||
|
@add:input-form="handleAddInputForm"
|
||||||
|
/>
|
||||||
|
<div class="flex gap-2 justify-between mt-4">
|
||||||
|
<UButton leading-icon="i-lucide-arrow-left" :disabled="!stepper?.hasPrev" @click="navigateStepper('backward')">
|
||||||
|
Prev
|
||||||
|
</UButton>
|
||||||
|
|
||||||
|
<UButton
|
||||||
|
v-if="stepper?.hasNext"
|
||||||
|
trailing-icon="i-lucide-arrow-right"
|
||||||
|
:disabled="!stepper?.hasNext"
|
||||||
|
@click="navigateStepper('forward')"
|
||||||
|
>
|
||||||
|
Next
|
||||||
|
</UButton>
|
||||||
|
|
||||||
|
<div v-if="!stepper?.hasNext" class="flex flex-wrap items-center gap-1.5">
|
||||||
|
<UButton trailing-icon="i-lucide-save" :disabled="isReadOnly" variant="outline" @click="onSave">
|
||||||
|
Save
|
||||||
|
</UButton>
|
||||||
|
<UButton trailing-icon="i-lucide-send-horizontal" :disabled="isReadOnly" @click="onSubmit"> Submit </UButton>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</UCard>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import type { ApplicationFormDto } from '~~/.api-client'
|
||||||
|
import { useUserStore } from '~~/stores/useUserStore'
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
applicationForm: ApplicationFormDto
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(e: 'update:applicationForm', updatedForm: ApplicationFormDto): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const { updateApplicationForm, submitApplicationForm } = useApplicationForm()
|
||||||
|
const route = useRoute()
|
||||||
|
const userStore = useUserStore()
|
||||||
|
const { user } = storeToRefs(userStore)
|
||||||
|
|
||||||
|
const toast = useToast()
|
||||||
|
|
||||||
|
const isReadOnly = computed(() => {
|
||||||
|
return props.applicationForm?.createdBy.keycloakId !== user.value?.keycloakId
|
||||||
|
})
|
||||||
|
|
||||||
|
const { stepper, activeStepperItemIndex, stepperItems, currentFormElementSection, navigateStepper } = useFormStepper(
|
||||||
|
computed(() => props.applicationForm?.formElementSections),
|
||||||
|
{
|
||||||
|
onNavigate: async () => {
|
||||||
|
await navigateTo(`/application-forms/${route.params.id}/${activeStepperItemIndex.value}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const { addInputFormToApplicationForm } = useFormElementManagement(currentFormElementSection, props.applicationForm?.id)
|
||||||
|
|
||||||
|
async function handleAddInputForm(position: number) {
|
||||||
|
const updatedForm = await addInputFormToApplicationForm(position)
|
||||||
|
if (updatedForm) {
|
||||||
|
emit('update:applicationForm', updatedForm)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
const sectionIndexParam = route.params.sectionIndex
|
||||||
|
if (sectionIndexParam) {
|
||||||
|
const sectionIndex = parseInt(Array.isArray(sectionIndexParam) ? sectionIndexParam[0]! : sectionIndexParam)
|
||||||
|
activeStepperItemIndex.value = !isNaN(sectionIndex) ? sectionIndex : 0
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
async function onSave() {
|
||||||
|
if (props.applicationForm) {
|
||||||
|
await updateApplicationForm(props.applicationForm.id, props.applicationForm)
|
||||||
|
toast.add({ title: 'Success', description: 'Application form saved', color: 'success' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onSubmit() {
|
||||||
|
if (props.applicationForm) {
|
||||||
|
await submitApplicationForm(props.applicationForm.id)
|
||||||
|
await navigateTo('/')
|
||||||
|
toast.add({ title: 'Success', description: 'Application form submitted', color: 'success' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
183
legalconsenthub/app/components/VersionHistory.vue
Normal file
183
legalconsenthub/app/components/VersionHistory.vue
Normal file
@@ -0,0 +1,183 @@
|
|||||||
|
<template>
|
||||||
|
<div class="space-y-4">
|
||||||
|
<div v-if="loading" class="flex justify-center py-8">
|
||||||
|
<UIcon name="i-lucide-loader-circle" class="animate-spin h-8 w-8" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else-if="error" class="text-red-500">
|
||||||
|
Fehler beim Laden der Versionen: {{ error }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else-if="versions.length === 0" class="text-center py-8 text-gray-500">
|
||||||
|
Keine Versionen verfügbar
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else class="space-y-3">
|
||||||
|
<UCard v-for="version in versions" :key="version.id" class="hover:shadow-md transition-shadow">
|
||||||
|
<div class="flex items-center justify-between">
|
||||||
|
<div class="flex items-center gap-4">
|
||||||
|
<UBadge variant="subtle" color="primary" class="font-semibold">
|
||||||
|
v{{ version.versionNumber }}
|
||||||
|
</UBadge>
|
||||||
|
<div>
|
||||||
|
<div class="font-medium">{{ version.name }}</div>
|
||||||
|
<div class="text-sm text-gray-500">
|
||||||
|
{{ formatDate(new Date(version.createdAt)) }} · {{ version.createdBy.name }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-3">
|
||||||
|
<UBadge :color="getStatusColor(version.status)">
|
||||||
|
{{ getStatusLabel(version.status) }}
|
||||||
|
</UBadge>
|
||||||
|
<UButton
|
||||||
|
icon="i-lucide-undo-2"
|
||||||
|
size="sm"
|
||||||
|
color="neutral"
|
||||||
|
variant="outline"
|
||||||
|
label="Wiederherstellen"
|
||||||
|
@click="openRestoreModal(version)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</UCard>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<UModal
|
||||||
|
:open="isRestoreModalOpen"
|
||||||
|
title="Version wiederherstellen"
|
||||||
|
@update:open="isRestoreModalOpen = $event"
|
||||||
|
>
|
||||||
|
<template #body>
|
||||||
|
<div class="space-y-2">
|
||||||
|
<p>
|
||||||
|
Möchten Sie Version <strong>v{{ selectedVersion?.versionNumber }}</strong> wirklich
|
||||||
|
wiederherstellen?
|
||||||
|
</p>
|
||||||
|
<p class="text-sm text-gray-600">
|
||||||
|
Dies erstellt eine neue Version mit dem Inhalt der ausgewählten Version. Die aktuelle
|
||||||
|
Version und alle Änderungen bleiben in der Historie erhalten.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<template #footer>
|
||||||
|
<UButton
|
||||||
|
label="Abbrechen"
|
||||||
|
color="neutral"
|
||||||
|
variant="outline"
|
||||||
|
@click="isRestoreModalOpen = false"
|
||||||
|
/>
|
||||||
|
<UButton label="Wiederherstellen" color="primary" :loading="restoring" @click="handleRestore" />
|
||||||
|
</template>
|
||||||
|
</UModal>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import type { ApplicationFormVersionListItemDto, ApplicationFormStatus } from '~~/.api-client'
|
||||||
|
import { formatDate } from '~/utils/date'
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
applicationFormId: string
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(e: 'restored'): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const { getVersions, restoreVersion } = useApplicationFormVersion()
|
||||||
|
const toast = useToast()
|
||||||
|
|
||||||
|
const versions = ref<ApplicationFormVersionListItemDto[]>([])
|
||||||
|
const loading = ref(false)
|
||||||
|
const error = ref<string | null>(null)
|
||||||
|
const isRestoreModalOpen = ref(false)
|
||||||
|
const selectedVersion = ref<ApplicationFormVersionListItemDto | null>(null)
|
||||||
|
const restoring = ref(false)
|
||||||
|
|
||||||
|
async function loadVersions() {
|
||||||
|
loading.value = true
|
||||||
|
error.value = null
|
||||||
|
try {
|
||||||
|
versions.value = await getVersions(props.applicationFormId)
|
||||||
|
} catch (e: unknown) {
|
||||||
|
error.value = e instanceof Error ? e.message : 'Unbekannter Fehler'
|
||||||
|
toast.add({
|
||||||
|
title: 'Fehler',
|
||||||
|
description: 'Versionen konnten nicht geladen werden',
|
||||||
|
color: 'error'
|
||||||
|
})
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function openRestoreModal(version: ApplicationFormVersionListItemDto) {
|
||||||
|
selectedVersion.value = version
|
||||||
|
isRestoreModalOpen.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleRestore() {
|
||||||
|
if (!selectedVersion.value) return
|
||||||
|
|
||||||
|
restoring.value = true
|
||||||
|
try {
|
||||||
|
await restoreVersion(props.applicationFormId, selectedVersion.value.versionNumber)
|
||||||
|
toast.add({
|
||||||
|
title: 'Erfolg',
|
||||||
|
description: `Version v${selectedVersion.value.versionNumber} wurde wiederhergestellt`,
|
||||||
|
color: 'success'
|
||||||
|
})
|
||||||
|
isRestoreModalOpen.value = false
|
||||||
|
await loadVersions()
|
||||||
|
emit('restored')
|
||||||
|
} catch (e: unknown) {
|
||||||
|
toast.add({
|
||||||
|
title: 'Fehler',
|
||||||
|
description: 'Version konnte nicht wiederhergestellt werden',
|
||||||
|
color: 'error'
|
||||||
|
})
|
||||||
|
} finally {
|
||||||
|
restoring.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getStatusColor(status: ApplicationFormStatus): string {
|
||||||
|
switch (status) {
|
||||||
|
case 'DRAFT':
|
||||||
|
return 'gray'
|
||||||
|
case 'SUBMITTED':
|
||||||
|
return 'blue'
|
||||||
|
case 'IN_REVIEW':
|
||||||
|
return 'yellow'
|
||||||
|
case 'APPROVED':
|
||||||
|
return 'green'
|
||||||
|
case 'REJECTED':
|
||||||
|
return 'red'
|
||||||
|
default:
|
||||||
|
return 'gray'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getStatusLabel(status: ApplicationFormStatus): string {
|
||||||
|
switch (status) {
|
||||||
|
case 'DRAFT':
|
||||||
|
return 'Entwurf'
|
||||||
|
case 'SUBMITTED':
|
||||||
|
return 'Eingereicht'
|
||||||
|
case 'IN_REVIEW':
|
||||||
|
return 'In Prüfung'
|
||||||
|
case 'APPROVED':
|
||||||
|
return 'Genehmigt'
|
||||||
|
case 'REJECTED':
|
||||||
|
return 'Abgelehnt'
|
||||||
|
default:
|
||||||
|
return status
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
loadVersions()
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
import type { ApplicationFormVersionDto, ApplicationFormVersionListItemDto, ApplicationFormDto } from '~~/.api-client'
|
||||||
|
import { useApplicationFormVersionApi } from '~/composables'
|
||||||
|
|
||||||
|
export function useApplicationFormVersion() {
|
||||||
|
const versionApi = useApplicationFormVersionApi()
|
||||||
|
|
||||||
|
async function getVersions(applicationFormId: string): Promise<ApplicationFormVersionListItemDto[]> {
|
||||||
|
try {
|
||||||
|
return await versionApi.getVersions(applicationFormId)
|
||||||
|
} catch (e: unknown) {
|
||||||
|
console.error(`Failed retrieving versions for application form ${applicationFormId}:`, e)
|
||||||
|
return Promise.reject(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getVersion(applicationFormId: string, versionNumber: number): Promise<ApplicationFormVersionDto> {
|
||||||
|
try {
|
||||||
|
return await versionApi.getVersion(applicationFormId, versionNumber)
|
||||||
|
} catch (e: unknown) {
|
||||||
|
console.error(`Failed retrieving version ${versionNumber} for application form ${applicationFormId}:`, e)
|
||||||
|
return Promise.reject(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function restoreVersion(applicationFormId: string, versionNumber: number): Promise<ApplicationFormDto> {
|
||||||
|
if (!applicationFormId) {
|
||||||
|
return Promise.reject(new Error('Application form ID missing'))
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
return await versionApi.restoreVersion(applicationFormId, versionNumber)
|
||||||
|
} catch (e: unknown) {
|
||||||
|
console.error(`Failed restoring version ${versionNumber} for application form ${applicationFormId}:`, e)
|
||||||
|
return Promise.reject(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
getVersions,
|
||||||
|
getVersion,
|
||||||
|
restoreVersion
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import {
|
||||||
|
ApplicationFormVersionApi,
|
||||||
|
Configuration,
|
||||||
|
type ApplicationFormVersionDto,
|
||||||
|
type ApplicationFormVersionListItemDto,
|
||||||
|
type ApplicationFormDto
|
||||||
|
} from '~~/.api-client'
|
||||||
|
import { cleanDoubleSlashes, withoutTrailingSlash } from 'ufo'
|
||||||
|
import { wrappedFetchWrap } from '~/utils/wrappedFetch'
|
||||||
|
|
||||||
|
export function useApplicationFormVersionApi() {
|
||||||
|
const appBaseUrl = useRuntimeConfig().app.baseURL
|
||||||
|
const { serverApiBasePath, clientProxyBasePath } = useRuntimeConfig().public
|
||||||
|
|
||||||
|
const basePath = withoutTrailingSlash(
|
||||||
|
cleanDoubleSlashes(
|
||||||
|
import.meta.client
|
||||||
|
? appBaseUrl + clientProxyBasePath
|
||||||
|
: useRequestURL().origin + clientProxyBasePath + serverApiBasePath
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
const versionApiClient = new ApplicationFormVersionApi(
|
||||||
|
new Configuration({ basePath, fetchApi: wrappedFetchWrap(useRequestFetch()) })
|
||||||
|
)
|
||||||
|
|
||||||
|
async function getVersions(applicationFormId: string): Promise<ApplicationFormVersionListItemDto[]> {
|
||||||
|
return versionApiClient.getApplicationFormVersions({ id: applicationFormId })
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getVersion(applicationFormId: string, versionNumber: number): Promise<ApplicationFormVersionDto> {
|
||||||
|
return versionApiClient.getApplicationFormVersion({
|
||||||
|
id: applicationFormId,
|
||||||
|
versionNumber
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async function restoreVersion(applicationFormId: string, versionNumber: number): Promise<ApplicationFormDto> {
|
||||||
|
return versionApiClient.restoreApplicationFormVersion({
|
||||||
|
id: applicationFormId,
|
||||||
|
versionNumber
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
getVersions,
|
||||||
|
getVersion,
|
||||||
|
restoreVersion
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
export { useApplicationFormTemplate } from './applicationFormTemplate/useApplicationFormTemplate'
|
export { useApplicationFormTemplate } from './applicationFormTemplate/useApplicationFormTemplate'
|
||||||
export { useApplicationForm } from './applicationForm/useApplicationForm'
|
export { useApplicationForm } from './applicationForm/useApplicationForm'
|
||||||
|
export { useApplicationFormVersion } from './applicationFormVersion/useApplicationFormVersion'
|
||||||
|
export { useApplicationFormVersionApi } from './applicationFormVersion/useApplicationFormVersionApi'
|
||||||
|
export { useApplicationFormNavigation } from './useApplicationFormNavigation'
|
||||||
export { useNotification } from './notification/useNotification'
|
export { useNotification } from './notification/useNotification'
|
||||||
export { useNotificationApi } from './notification/useNotificationApi'
|
export { useNotificationApi } from './notification/useNotificationApi'
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
import type { ApplicationFormDto } from '~~/.api-client'
|
||||||
|
|
||||||
|
export async function useApplicationFormNavigation(applicationFormId: string) {
|
||||||
|
const { getApplicationFormById } = useApplicationForm()
|
||||||
|
|
||||||
|
const { data, error, refresh } = await useAsyncData<ApplicationFormDto>(
|
||||||
|
`application-form-${applicationFormId}`,
|
||||||
|
async () => await getApplicationFormById(applicationFormId)
|
||||||
|
)
|
||||||
|
|
||||||
|
if (error.value) {
|
||||||
|
throw createError({ statusText: error.value.message })
|
||||||
|
}
|
||||||
|
|
||||||
|
const applicationForm = computed<ApplicationFormDto>(() => data?.value as ApplicationFormDto)
|
||||||
|
|
||||||
|
const navigationLinks = computed(() => [
|
||||||
|
[
|
||||||
|
{
|
||||||
|
label: 'Formular',
|
||||||
|
icon: 'i-lucide-file',
|
||||||
|
to: `/application-forms/${applicationForm.value.id}/0`,
|
||||||
|
exact: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Versionen',
|
||||||
|
icon: 'i-lucide-file-clock',
|
||||||
|
to: `/application-forms/${applicationForm.value.id}/versions`,
|
||||||
|
exact: true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
[
|
||||||
|
{
|
||||||
|
label: 'PDF-Vorschau',
|
||||||
|
icon: 'i-lucide-file-text',
|
||||||
|
to: `/api/application-forms/${applicationForm.value.id}/pdf`,
|
||||||
|
target: '_blank'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
])
|
||||||
|
|
||||||
|
const dropdownItems = [
|
||||||
|
[
|
||||||
|
{
|
||||||
|
label: 'Neuer Mitbestimmungsantrag',
|
||||||
|
icon: 'i-lucide-send',
|
||||||
|
to: '/create'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
]
|
||||||
|
|
||||||
|
function updateApplicationForm(updatedForm: ApplicationFormDto) {
|
||||||
|
data.value = updatedForm
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
applicationForm,
|
||||||
|
navigationLinks,
|
||||||
|
dropdownItems,
|
||||||
|
refresh,
|
||||||
|
updateApplicationForm,
|
||||||
|
error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -36,7 +36,24 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
const links = [[], []]
|
const links = [
|
||||||
|
[
|
||||||
|
{
|
||||||
|
label: 'General',
|
||||||
|
icon: 'i-lucide-user',
|
||||||
|
to: '/settings',
|
||||||
|
exact: true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
[
|
||||||
|
{
|
||||||
|
label: 'General2',
|
||||||
|
icon: 'i-lucide-user',
|
||||||
|
to: '/settings',
|
||||||
|
exact: true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
]
|
||||||
const open = ref(false)
|
const open = ref(false)
|
||||||
|
|
||||||
const isNotificationsSlideoverOpen = ref(false)
|
const isNotificationsSlideoverOpen = ref(false)
|
||||||
|
|||||||
@@ -14,143 +14,29 @@
|
|||||||
</UDashboardNavbar>
|
</UDashboardNavbar>
|
||||||
|
|
||||||
<UDashboardToolbar>
|
<UDashboardToolbar>
|
||||||
<template #right>
|
<UNavigationMenu :items="links" highlight class="-mx-1 flex-1" />
|
||||||
<UButton
|
|
||||||
icon="i-lucide-file-text"
|
|
||||||
size="md"
|
|
||||||
color="primary"
|
|
||||||
variant="solid"
|
|
||||||
target="_blank"
|
|
||||||
:to="`/api/application-forms/${applicationForm.id}/pdf`"
|
|
||||||
>PDF Vorschau</UButton
|
|
||||||
>
|
|
||||||
</template>
|
|
||||||
</UDashboardToolbar>
|
</UDashboardToolbar>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template #body>
|
<template #body>
|
||||||
<div class="flex flex-col w-full lg:max-w-4xl mx-auto">
|
<TheForm :application-form="applicationForm" @update:application-form="updateApplicationForm" />
|
||||||
<UStepper ref="stepper" v-model="activeStepperItemIndex" :items="stepperItems" class="w-full" />
|
|
||||||
<h1 v-if="currentFormElementSection?.title" class="text-xl text-pretty font-bold text-highlighted">
|
|
||||||
{{ currentFormElementSection.title }}
|
|
||||||
</h1>
|
|
||||||
<UCard variant="subtle">
|
|
||||||
<FormEngine
|
|
||||||
v-if="applicationForm && currentFormElementSection?.formElements"
|
|
||||||
v-model="currentFormElementSection.formElements"
|
|
||||||
:application-form-id="applicationForm.id"
|
|
||||||
:disabled="isReadOnly"
|
|
||||||
@add:input-form="handleAddInputForm"
|
|
||||||
/>
|
|
||||||
<div class="flex gap-2 justify-between mt-4">
|
|
||||||
<UButton
|
|
||||||
leading-icon="i-lucide-arrow-left"
|
|
||||||
:disabled="!stepper?.hasPrev"
|
|
||||||
@click="navigateStepper('backward')"
|
|
||||||
>
|
|
||||||
Prev
|
|
||||||
</UButton>
|
|
||||||
|
|
||||||
<UButton
|
|
||||||
v-if="stepper?.hasNext"
|
|
||||||
trailing-icon="i-lucide-arrow-right"
|
|
||||||
:disabled="!stepper?.hasNext"
|
|
||||||
@click="navigateStepper('forward')"
|
|
||||||
>
|
|
||||||
Next
|
|
||||||
</UButton>
|
|
||||||
|
|
||||||
<div v-if="!stepper?.hasNext" class="flex flex-wrap items-center gap-1.5">
|
|
||||||
<UButton trailing-icon="i-lucide-save" :disabled="isReadOnly" variant="outline" @click="onSave">
|
|
||||||
Save
|
|
||||||
</UButton>
|
|
||||||
<UButton trailing-icon="i-lucide-send-horizontal" :disabled="isReadOnly" @click="onSubmit">
|
|
||||||
Submit
|
|
||||||
</UButton>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</UCard>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
</UDashboardPanel>
|
</UDashboardPanel>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type { ApplicationFormDto } from '~~/.api-client'
|
|
||||||
import { useUserStore } from '~~/stores/useUserStore'
|
|
||||||
|
|
||||||
const { getApplicationFormById, updateApplicationForm, submitApplicationForm } = useApplicationForm()
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const userStore = useUserStore()
|
|
||||||
const { user } = storeToRefs(userStore)
|
|
||||||
|
|
||||||
const toast = useToast()
|
|
||||||
|
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
// Prevent whole page from re-rendering when navigating between sections to keep state
|
// Prevent whole page from re-rendering when navigating between sections to keep state
|
||||||
key: (route) => `${route.params.id}`
|
key: (route) => `${route.params.id}`
|
||||||
})
|
})
|
||||||
|
|
||||||
const items = [
|
const applicationFormId = Array.isArray(route.params.id) ? route.params.id[0] : route.params.id
|
||||||
[
|
const {
|
||||||
{
|
applicationForm,
|
||||||
label: 'Neuer Mitbestimmungsantrag',
|
navigationLinks: links,
|
||||||
icon: 'i-lucide-send',
|
dropdownItems: items,
|
||||||
to: '/create'
|
updateApplicationForm
|
||||||
}
|
} = await useApplicationFormNavigation(applicationFormId!)
|
||||||
]
|
|
||||||
]
|
|
||||||
|
|
||||||
const { data, error } = await useAsyncData<ApplicationFormDto>(`application-form-${route.params.id}`, async () => {
|
|
||||||
console.log('Fetching application form with ID:', route.params.id)
|
|
||||||
return await getApplicationFormById(Array.isArray(route.params.id) ? route.params.id[0] : route.params.id)
|
|
||||||
})
|
|
||||||
|
|
||||||
if (error.value) {
|
|
||||||
throw createError({ statusText: error.value.message })
|
|
||||||
}
|
|
||||||
|
|
||||||
const applicationForm = computed<ApplicationFormDto>(() => data?.value as ApplicationFormDto)
|
|
||||||
|
|
||||||
const isReadOnly = computed(() => {
|
|
||||||
return applicationForm.value?.createdBy.keycloakId !== user.value?.keycloakId
|
|
||||||
})
|
|
||||||
|
|
||||||
const { stepper, activeStepperItemIndex, stepperItems, currentFormElementSection, navigateStepper } = useFormStepper(
|
|
||||||
computed(() => applicationForm.value?.formElementSections),
|
|
||||||
{
|
|
||||||
onNavigate: async () => {
|
|
||||||
await navigateTo(`/application-forms/${route.params.id}/${activeStepperItemIndex.value}`)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
const { addInputFormToApplicationForm } = useFormElementManagement(currentFormElementSection, applicationForm.value?.id)
|
|
||||||
|
|
||||||
async function handleAddInputForm(position: number) {
|
|
||||||
const updatedForm = await addInputFormToApplicationForm(position)
|
|
||||||
if (updatedForm) {
|
|
||||||
data.value = updatedForm
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
const sectionIndex = parseInt(route.params.sectionIndex[0])
|
|
||||||
activeStepperItemIndex.value = !isNaN(sectionIndex) ? sectionIndex : 0
|
|
||||||
})
|
|
||||||
|
|
||||||
async function onSave() {
|
|
||||||
if (data?.value) {
|
|
||||||
await updateApplicationForm(data.value.id, data.value)
|
|
||||||
toast.add({ title: 'Success', description: 'Application form saved', color: 'success' })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function onSubmit() {
|
|
||||||
if (data?.value) {
|
|
||||||
await submitApplicationForm(data.value.id)
|
|
||||||
await navigateTo('/')
|
|
||||||
toast.add({ title: 'Success', description: 'Application form submitted', color: 'success' })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
<!-- eslint-disable vue/multi-word-component-names -->
|
||||||
|
<template>
|
||||||
|
<UDashboardPanel id="versions">
|
||||||
|
<template #header>
|
||||||
|
<UDashboardNavbar :title="`Versionen: ${applicationForm?.name}`">
|
||||||
|
<template #leading>
|
||||||
|
<UDashboardSidebarCollapse />
|
||||||
|
</template>
|
||||||
|
</UDashboardNavbar>
|
||||||
|
|
||||||
|
<UDashboardToolbar>
|
||||||
|
<UNavigationMenu :items="links" highlight class="-mx-1 flex-1" />
|
||||||
|
</UDashboardToolbar>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template #body>
|
||||||
|
<div class="p-6">
|
||||||
|
<VersionHistory v-if="applicationForm" :application-form-id="applicationForm.id" @restored="handleRestored" />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</UDashboardPanel>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
const route = useRoute()
|
||||||
|
const router = useRouter()
|
||||||
|
const toast = useToast()
|
||||||
|
|
||||||
|
definePageMeta({
|
||||||
|
key: (route) => `${route.params.id}-versions`
|
||||||
|
})
|
||||||
|
|
||||||
|
const applicationFormId = Array.isArray(route.params.id) ? route.params.id[0] : route.params.id
|
||||||
|
const { applicationForm, navigationLinks: links, refresh } = await useApplicationFormNavigation(applicationFormId!)
|
||||||
|
|
||||||
|
async function handleRestored() {
|
||||||
|
await refresh()
|
||||||
|
toast.add({
|
||||||
|
title: 'Version wiederhergestellt',
|
||||||
|
description: 'Das Formular wurde auf die ausgewählte Version zurückgesetzt.',
|
||||||
|
color: 'success'
|
||||||
|
})
|
||||||
|
router.push(`/application-forms/${applicationForm.value.id}/0`)
|
||||||
|
}
|
||||||
|
</script>
|
||||||
Reference in New Issue
Block a user