1.1 --- a/src/main/kotlin/de/uapcore/lightpit/viewmodel/Projects.kt Mon Oct 30 10:06:22 2023 +0100 1.2 +++ b/src/main/kotlin/de/uapcore/lightpit/viewmodel/Projects.kt Mon Oct 30 14:44:36 2023 +0100 1.3 @@ -25,6 +25,7 @@ 1.4 1.5 package de.uapcore.lightpit.viewmodel 1.6 1.7 +import de.uapcore.lightpit.OptionalPathInfo 1.8 import de.uapcore.lightpit.entities.* 1.9 1.10 class ProjectInfo( 1.11 @@ -45,18 +46,25 @@ 1.12 ) : View() 1.13 1.14 class ProjectDetails( 1.15 - val projectInfo: ProjectInfo, 1.16 + val pathInfos: PathInfos, 1.17 val issues: List<Issue>, 1.18 val filter: IssueFilter, 1.19 - val version: Version? = null, 1.20 - val component: Component? = null 1.21 ) : View() { 1.22 + val projectInfo = pathInfos.projectInfo 1.23 val issueSummary = IssueSummary() 1.24 val versionInfo: VersionInfo? 1.25 + val componentDetails: Component? 1.26 1.27 init { 1.28 issues.forEach(issueSummary::add) 1.29 - versionInfo = version?.let { VersionInfo(it, issues) } 1.30 + versionInfo = when (val vinfo = pathInfos.versionInfo){ 1.31 + is OptionalPathInfo.Specific -> VersionInfo(vinfo.elem, issues) 1.32 + else -> null 1.33 + } 1.34 + componentDetails = when (val cinfo = pathInfos.componentInfo){ 1.35 + is OptionalPathInfo.Specific -> cinfo.elem 1.36 + else -> null 1.37 + } 1.38 } 1.39 } 1.40