diff -r bcf05cccac6f -r 703591e739f4 src/main/kotlin/de/uapcore/lightpit/viewmodel/Projects.kt --- a/src/main/kotlin/de/uapcore/lightpit/viewmodel/Projects.kt Mon Oct 30 10:06:22 2023 +0100 +++ b/src/main/kotlin/de/uapcore/lightpit/viewmodel/Projects.kt Mon Oct 30 14:44:36 2023 +0100 @@ -25,6 +25,7 @@ package de.uapcore.lightpit.viewmodel +import de.uapcore.lightpit.OptionalPathInfo import de.uapcore.lightpit.entities.* class ProjectInfo( @@ -45,18 +46,25 @@ ) : View() class ProjectDetails( - val projectInfo: ProjectInfo, + val pathInfos: PathInfos, val issues: List, val filter: IssueFilter, - val version: Version? = null, - val component: Component? = null ) : View() { + val projectInfo = pathInfos.projectInfo val issueSummary = IssueSummary() val versionInfo: VersionInfo? + val componentDetails: Component? init { issues.forEach(issueSummary::add) - versionInfo = version?.let { VersionInfo(it, issues) } + versionInfo = when (val vinfo = pathInfos.versionInfo){ + is OptionalPathInfo.Specific -> VersionInfo(vinfo.elem, issues) + else -> null + } + componentDetails = when (val cinfo = pathInfos.componentInfo){ + is OptionalPathInfo.Specific -> cinfo.elem + else -> null + } } }