Apache Solr open-source search software
SOLR-17924: Introduce Configset create and import flows (#4166)
Christos Malliaridisb4cb0e05a5de
diff --git a/changelog/unreleased/SOLR-17924-configset-creation-new-ui.yml b/changelog/unreleased/SOLR-17924-configset-creation-new-ui.ymlnew file mode 100644index 00000000000..b586b35ab14--- /dev/null+++ b/changelog/unreleased/SOLR-17924-configset-creation-new-ui.yml@@ -0,0 +1,10 @@+title: SOLR 17845 - Implement Configset Creation and Importing in New UI+type: added+authors:+ - name: Christos Malliaridis+ nick: malliaridis+links:+ - name: SOLR-17924+ url: https://issues.apache.org/jira/browse/SOLR-17924+ - name: PR#4166+ url: https://github.com/apache/solr/pull/4166diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex e6c402e8d9b..7018c17a31e 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -15,6 +15,9 @@[versions]adobe-testing-s3mock = "3.12.0"amazon-awssdk = "2.42.34"+androidx-adaptive = "1.3.0-alpha07"+androidx-lifecycle = "2.10.0"+androidx-navigation3 = "1.1.0"# @keep Antora version used in ref-guideantora = "3.1.12"# @keep Most recent commit as of 2025-08-03, this repo does not have tags@@ -236,6 +239,12 @@ amazon-awssdk-retries-spi = { module = "software.amazon.awssdk:retries-spi", veramazon-awssdk-s3 = { module = "software.amazon.awssdk:s3", version.ref = "amazon-awssdk" }amazon-awssdk-sdkcore = { module = "software.amazon.awssdk:sdk-core", version.ref = "amazon-awssdk" }amazon-awssdk-sts = { module = "software.amazon.awssdk:sts", version.ref = "amazon-awssdk" }+androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }+androidx-lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }+androidx-lifecycle-viewModelNav3 = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "androidx-lifecycle" }+androidx-material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version.ref = "androidx-adaptive" }+androidx-material3-adaptive-nav3 = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation3", version.ref = "androidx-adaptive" }+androidx-navigation3-ui = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "androidx-navigation3" }apache-calcite-avatica-core = { module = "org.apache.calcite.avatica:avatica-core", version.ref = "apache-calcite-avatica" }apache-calcite-core = { module = "org.apache.calcite:calcite-core", version.ref = "apache-calcite" }apache-calcite-linq4j = { module = "org.apache.calcite:calcite-linq4j", version.ref = "apache-calcite" }diff --git a/solr/ui/build.gradle.kts b/solr/ui/build.gradle.ktsindex 080a7643a0f..ca6a4889866 100644--- a/solr/ui/build.gradle.kts+++ b/solr/ui/build.gradle.kts@@ -67,49 +67,51 @@ kotlin {sourceSets {// Shared multiplatform dependencies- val commonMain by getting {- dependencies {- implementation(project.dependencies.platform(project(":platform")))- implementation(libs.compose.runtime)- implementation(libs.compose.foundation)- implementation(libs.compose.material3)- implementation(libs.compose.ui)- implementation(libs.compose.components.resources)- implementation(libs.compose.uiToolingPreview)-- implementation(libs.kotlinx.serialization.core)- implementation(libs.kotlinx.serialization.json)- implementation(libs.kotlinx.coroutines.core)- implementation(libs.kotlinx.datetime)-- implementation(libs.decompose.decompose)- implementation(libs.essenty.lifecycle)- implementation(libs.decompose.extensions.compose)- implementation(libs.mvikotlin.extensions.coroutines)- implementation(libs.mvikotlin.mvikotlin)- implementation(libs.mvikotlin.main)- implementation(libs.mvikotlin.logging)-- implementation(project.dependencies.platform(libs.ktor.bom))- implementation(libs.ktor.client.auth)- implementation(libs.ktor.client.core)- implementation(libs.ktor.client.cio)- implementation(libs.ktor.client.contentNegotiation)- implementation(libs.ktor.client.serialization.json)- implementation(libs.squareup.okio)-- implementation(libs.oshai.logging)- implementation(libs.slf4j.api)- }+ commonMain.dependencies {+ implementation(project.dependencies.platform(project(":platform")))+ implementation(libs.compose.runtime)+ implementation(libs.compose.foundation)+ implementation(libs.compose.material3)+ implementation(libs.compose.ui)+ implementation(libs.compose.components.resources)+ implementation(libs.compose.uiToolingPreview)+ implementation(libs.androidx.lifecycle.viewmodelCompose)+ implementation(libs.androidx.lifecycle.runtimeCompose)+ implementation(libs.androidx.lifecycle.viewModelNav3)+ implementation(libs.androidx.navigation3.ui)+ implementation(libs.androidx.material3.adaptive.asProvider())+ implementation(libs.androidx.material3.adaptive.nav3)++ implementation(libs.kotlinx.serialization.core)+ implementation(libs.kotlinx.serialization.json)+ implementation(libs.kotlinx.coroutines.core)+ implementation(libs.kotlinx.datetime)++ implementation(libs.decompose.decompose)+ implementation(libs.essenty.lifecycle)+ implementation(libs.decompose.extensions.compose)+ implementation(libs.mvikotlin.extensions.coroutines)+ implementation(libs.mvikotlin.mvikotlin)+ implementation(libs.mvikotlin.main)+ implementation(libs.mvikotlin.logging)++ implementation(project.dependencies.platform(libs.ktor.bom))+ implementation(libs.ktor.client.auth)+ implementation(libs.ktor.client.core)+ implementation(libs.ktor.client.cio)+ implementation(libs.ktor.client.contentNegotiation)+ implementation(libs.ktor.client.serialization.json)+ implementation(libs.squareup.okio)++ implementation(libs.oshai.logging)+ implementation(libs.slf4j.api)}- val commonTest by getting {- dependencies {- implementation(kotlin("test"))- implementation(libs.kotlinx.coroutines.test)- implementation(libs.compose.uiTest)- implementation(libs.ktor.client.mock)- }+ commonTest.dependencies {+ implementation(kotlin("test"))+ implementation(libs.kotlinx.coroutines.test)+ implementation(libs.compose.uiTest)+ implementation(libs.ktor.client.mock)}val desktopMain by getting {@@ -122,6 +124,10 @@ kotlin {}}}++ compilerOptions {+ freeCompilerArgs.add("-Xexplicit-backing-fields")+ }}configurations {diff --git a/solr/ui/gradle.lockfile b/solr/ui/gradle.lockfileindex f9381b46e27..521d5efe58d 100644--- a/solr/ui/gradle.lockfile+++ b/solr/ui/gradle.lockfile@@ -4,10 +4,10 @@androidx.annotation:annotation-jvm:1.9.1=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathandroidx.annotation:annotation-wasm-js:1.9.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspathandroidx.annotation:annotation:1.9.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata-androidx.arch.core:core-common:2.2.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsTestResolvableDependenciesMetadata,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata-androidx.collection:collection-jvm:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath-androidx.collection:collection-wasm-js:1.5.0=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath-androidx.collection:collection:1.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+androidx.arch.core:core-common:2.2.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+androidx.collection:collection-jvm:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+androidx.collection:collection-wasm-js:1.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.collection:collection:1.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadDevTools,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataandroidx.compose.runtime:runtime-annotation-jvm:1.10.5=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathandroidx.compose.runtime:runtime-annotation-jvm:1.9.0=composeHotReloadDevToolsandroidx.compose.runtime:runtime-annotation-wasm-js:1.10.5=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath@@ -27,40 +27,46 @@ androidx.compose.runtime:runtime:1.9.0=composeHotReloadDevToolsandroidx.graphics:graphics-shapes-desktop:1.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathandroidx.graphics:graphics-shapes-wasm-js:1.1.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspathandroidx.graphics:graphics-shapes:1.1.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+androidx.lifecycle:lifecycle-common-jvm:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathandroidx.lifecycle:lifecycle-common-jvm:2.9.2=composeHotReloadDevTools-androidx.lifecycle:lifecycle-common-jvm:2.9.4=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath-androidx.lifecycle:lifecycle-common-wasm-js:2.9.4=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.lifecycle:lifecycle-common-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.lifecycle:lifecycle-common:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataandroidx.lifecycle:lifecycle-common:2.9.2=composeHotReloadDevTools-androidx.lifecycle:lifecycle-common:2.9.4=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata-androidx.lifecycle:lifecycle-runtime-compose-desktop:2.9.4=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath-androidx.lifecycle:lifecycle-runtime-compose-wasm-js:2.9.4=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath-androidx.lifecycle:lifecycle-runtime-compose:2.9.4=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+androidx.lifecycle:lifecycle-runtime-compose-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+androidx.lifecycle:lifecycle-runtime-compose-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.lifecycle:lifecycle-runtime-compose:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+androidx.lifecycle:lifecycle-runtime-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathandroidx.lifecycle:lifecycle-runtime-desktop:2.9.2=composeHotReloadDevTools-androidx.lifecycle:lifecycle-runtime-desktop:2.9.4=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath-androidx.lifecycle:lifecycle-runtime-wasm-js:2.9.4=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.lifecycle:lifecycle-runtime-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.lifecycle:lifecycle-runtime:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataandroidx.lifecycle:lifecycle-runtime:2.9.2=composeHotReloadDevTools-androidx.lifecycle:lifecycle-runtime:2.9.4=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+androidx.lifecycle:lifecycle-viewmodel-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathandroidx.lifecycle:lifecycle-viewmodel-desktop:2.9.2=composeHotReloadDevTools-androidx.lifecycle:lifecycle-viewmodel-desktop:2.9.4=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath+androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathandroidx.lifecycle:lifecycle-viewmodel-savedstate-desktop:2.9.2=composeHotReloadDevTools-androidx.lifecycle:lifecycle-viewmodel-savedstate-desktop:2.9.4=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath-androidx.lifecycle:lifecycle-viewmodel-savedstate-wasm-js:2.9.4=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.lifecycle:lifecycle-viewmodel-savedstate-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataandroidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.2=composeHotReloadDevTools-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata-androidx.lifecycle:lifecycle-viewmodel-wasm-js:2.9.4=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.lifecycle:lifecycle-viewmodel-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.lifecycle:lifecycle-viewmodel:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataandroidx.lifecycle:lifecycle-viewmodel:2.9.2=composeHotReloadDevTools-androidx.lifecycle:lifecycle-viewmodel:2.9.4=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata-androidx.navigationevent:navigationevent-desktop:1.0.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath-androidx.navigationevent:navigationevent-wasm-js:1.0.2=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath-androidx.navigationevent:navigationevent:1.0.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata-androidx.savedstate:savedstate-compose-desktop:1.3.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath-androidx.savedstate:savedstate-compose-wasm-js:1.3.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath-androidx.savedstate:savedstate-compose:1.3.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+androidx.navigation3:navigation3-runtime-desktop:1.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+androidx.navigation3:navigation3-runtime-wasm-js:1.1.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.navigation3:navigation3-runtime:1.1.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+androidx.navigationevent:navigationevent-desktop:1.0.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+androidx.navigationevent:navigationevent-wasm-js:1.0.2=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.navigationevent:navigationevent:1.0.2=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+androidx.savedstate:savedstate-compose-desktop:1.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+androidx.savedstate:savedstate-compose-wasm-js:1.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.savedstate:savedstate-compose:1.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataandroidx.savedstate:savedstate-desktop:1.3.1=composeHotReloadDevTools-androidx.savedstate:savedstate-desktop:1.3.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath-androidx.savedstate:savedstate-wasm-js:1.3.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.savedstate:savedstate-desktop:1.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+androidx.savedstate:savedstate-wasm-js:1.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspathandroidx.savedstate:savedstate:1.3.1=composeHotReloadDevTools-androidx.savedstate:savedstate:1.3.3=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+androidx.savedstate:savedstate:1.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+androidx.window:window-core-jvm:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+androidx.window:window-core-wasm-js:1.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+androidx.window:window-core:1.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadatacom.arkivanov.decompose:decompose-jvm:3.4.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathcom.arkivanov.decompose:decompose-wasm-js:3.4.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspathcom.arkivanov.decompose:decompose:3.4.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata@@ -180,23 +186,35 @@ org.checkerframework:checker-compat-qual:2.5.5=composeHotReloadDevDesktopTestRunorg.fusesource.jansi:jansi:2.4.2=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspathorg.hamcrest:hamcrest-core:1.3=composeHotReloadDevDesktopTestRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathorg.javassist:javassist:3.30.2-GA=composeHotReloadAgent-org.jetbrains.androidx.lifecycle:lifecycle-common-wasm-js:2.9.6=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-common-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-common:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataorg.jetbrains.androidx.lifecycle:lifecycle-common:2.9.4=composeHotReloadDevTools-org.jetbrains.androidx.lifecycle:lifecycle-common:2.9.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathorg.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop:2.9.4=composeHotReloadDevTools-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-desktop:2.9.6=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevRuntimeClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestRuntimeClasspath-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-wasm-js:2.9.6=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataorg.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.4=composeHotReloadDevTools-org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata-org.jetbrains.androidx.lifecycle:lifecycle-runtime-wasm-js:2.9.6=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-runtime-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataorg.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.4=composeHotReloadDevTools-org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.9.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate-wasm-js:2.9.6=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3-desktop:2.10.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataorg.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4=composeHotReloadDevTools-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-wasm-js:2.9.6=wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-wasm-js:2.10.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.10.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataorg.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.4=composeHotReloadDevTools-org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+org.jetbrains.androidx.navigation3:navigation3-ui-desktop:1.1.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+org.jetbrains.androidx.navigation3:navigation3-ui-wasm-js:1.1.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.navigation3:navigation3-ui:1.1.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+org.jetbrains.androidx.navigationevent:navigationevent-compose-desktop:1.0.1=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+org.jetbrains.androidx.navigationevent:navigationevent-compose-wasm-js:1.0.1=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.1=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataorg.jetbrains.androidx.savedstate:savedstate-compose-desktop:1.3.4=composeHotReloadDevToolsorg.jetbrains.androidx.savedstate:savedstate-compose-desktop:1.3.6=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathorg.jetbrains.androidx.savedstate:savedstate-compose-wasm-js:1.3.6=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath@@ -205,6 +223,9 @@ org.jetbrains.androidx.savedstate:savedstate-compose:1.3.6=allDevSourceSetsCompiorg.jetbrains.androidx.savedstate:savedstate-wasm-js:1.3.6=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspathorg.jetbrains.androidx.savedstate:savedstate:1.3.4=composeHotReloadDevToolsorg.jetbrains.androidx.savedstate:savedstate:1.3.6=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+org.jetbrains.androidx.window:window-core-desktop:1.5.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+org.jetbrains.androidx.window:window-core-wasm-js:1.5.0=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.androidx.window:window-core:1.5.0=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataorg.jetbrains.compose.animation:animation-core-desktop:1.10.3=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathorg.jetbrains.compose.animation:animation-core-desktop:1.9.0=composeHotReloadDevToolsorg.jetbrains.compose.animation:animation-core-wasm-js:1.10.3=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath@@ -251,6 +272,18 @@ org.jetbrains.compose.hot-reload:hot-reload-orchestration:1.0.0=composeHotReloadorg.jetbrains.compose.hot-reload:hot-reload-runtime-api-jvm:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevTools,desktopDevCompileClasspath,desktopDevRuntimeClasspathorg.jetbrains.compose.hot-reload:hot-reload-runtime-api:1.0.0=allDevSourceSetsCompileDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevTools,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspathorg.jetbrains.compose.hot-reload:hot-reload-runtime-jvm:1.0.0=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,composeHotReloadRuntime+org.jetbrains.compose.material3.adaptive:adaptive-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+org.jetbrains.compose.material3.adaptive:adaptive-layout-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+org.jetbrains.compose.material3.adaptive:adaptive-layout-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.compose.material3.adaptive:adaptive-layout:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+org.jetbrains.compose.material3.adaptive:adaptive-navigation-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+org.jetbrains.compose.material3.adaptive:adaptive-navigation-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.compose.material3.adaptive:adaptive-navigation3-desktop:1.3.0-alpha07=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspath+org.jetbrains.compose.material3.adaptive:adaptive-navigation3-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.compose.material3.adaptive:adaptive-navigation3:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+org.jetbrains.compose.material3.adaptive:adaptive-navigation:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadata+org.jetbrains.compose.material3.adaptive:adaptive-wasm-js:1.3.0-alpha07=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspath+org.jetbrains.compose.material3.adaptive:adaptive:1.3.0-alpha07=allDevSourceSetsCompileDependenciesMetadata,allSourceSetsCompileDependenciesMetadata,allTestSourceSetsCompileDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestResolvableDependenciesMetadata,composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevResolvableDependenciesMetadata,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainResolvableDependenciesMetadata,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestResolvableDependenciesMetadata,desktopTestRuntimeClasspath,metadataCommonMainCompileClasspath,metadataCompileClasspath,wasmJsCompileClasspath,wasmJsMainResolvableDependenciesMetadata,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestResolvableDependenciesMetadata,wasmJsTestRuntimeClasspath,webMainResolvableDependenciesMetadata,webTestResolvableDependenciesMetadataorg.jetbrains.compose.material3:material3-desktop:1.10.0-alpha05=composeHotReloadDevDesktopDevRuntimeClasspath,composeHotReloadDevDesktopRuntimeClasspath,composeHotReloadDevDesktopTestRuntimeClasspath,desktopCompileClasspath,desktopDevCompileClasspath,desktopDevRuntimeClasspath,desktopMainCompileClasspath,desktopMainRuntimeClasspath,desktopRuntimeClasspath,desktopTestCompileClasspath,desktopTestRuntimeClasspathorg.jetbrains.compose.material3:material3-desktop:1.8.2=composeHotReloadDevToolsorg.jetbrains.compose.material3:material3-wasm-js:1.10.0-alpha05=wasmJsCompileClasspath,wasmJsNpmAggregated,wasmJsRuntimeClasspath,wasmJsTestCompileClasspath,wasmJsTestNpmAggregated,wasmJsTestRuntimeClasspathdiff --git a/solr/ui/src/commonMain/composeResources/values/strings.xml b/solr/ui/src/commonMain/composeResources/values/strings.xmlindex b3efd3119bb..57c9927b34e 100644--- a/solr/ui/src/commonMain/composeResources/values/strings.xml+++ b/solr/ui/src/commonMain/composeResources/values/strings.xml@@ -18,8 +18,12 @@<resources><!-- Actions (action) -->+ <string name="action_cancel">Cancel</string><string name="action_connect">Connect</string>+ <string name="action_create_configset">Create Configset</string>+ <string name="action_edit_solrconfig">Edit solrconfig.xml</string><string name="action_go_back">Go Back</string>+ <string name="action_import_configset">Import Configset</string><string name="action_logout">Logout</string><string name="action_sign_in_with_credentials">Sign In with Credentials</string><string name="action_sign_in_with_realm">Sign In with %1$s</string>@@ -67,8 +71,10 @@<string name="ph_solr_url">http://127.0.0.1:8983/</string><!-- Titles (title) -->- <string name="title_welcome_to_solr">Welcome to Solr Admin UI</string>+ <string name="title_create_configset">Create Configset</string>+ <string name="title_import_configset">Import Configset</string><string name="title_sign_in_to_solr">Sign In to Solr</string>+ <string name="title_welcome_to_solr">Welcome to Solr Admin UI</string><!-- General Text --><string name="authenticating">Authenticating...</string>@@ -89,8 +95,10 @@<string name="zookeeper">Zookeeper</string><!-- Input Labels -->- <string name="label_username">Username</string>+ <string name="label_configset_name">Configset Name</string><string name="label_password">Password</string>+ <string name="label_select_configset_file">Select Configset File</string>+ <string name="label_username">Username</string><!-- Uncategorized --></resources>diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/cluster/integration/DefaultClusterComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/cluster/integration/DefaultClusterComponent.ktindex 4058cafb560..02f230f5901 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/cluster/integration/DefaultClusterComponent.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/cluster/integration/DefaultClusterComponent.kt@@ -17,35 +17,41 @@package org.apache.solr.ui.components.cluster.integration+import com.arkivanov.decompose.router.slot.ChildSlot+import com.arkivanov.decompose.router.slot.SlotNavigation+import com.arkivanov.decompose.router.slot.activate+import com.arkivanov.decompose.router.slot.childSlot+import com.arkivanov.decompose.value.Valueimport org.apache.solr.ui.components.cluster.ClusterComponentimport org.apache.solr.ui.components.cluster.ClusterComponent.Childimport org.apache.solr.ui.components.cluster.ClusterComponent.ClusterTabimport org.apache.solr.ui.components.navigation.TabNavigationComponent-import org.apache.solr.ui.components.navigation.integration.DefaultTabNavigationComponentimport org.apache.solr.ui.utils.AppComponentContextclass DefaultClusterComponent(componentContext: AppComponentContext,- tabNavigation: TabNavigationComponent<ClusterTab, Child>,) : ClusterComponent,AppComponentContext by componentContext,- TabNavigationComponent<ClusterTab, Child> by tabNavigation {+ TabNavigationComponent<ClusterTab, Child> {- constructor(- componentContext: AppComponentContext,- ) : this(- componentContext = componentContext,- tabNavigation = DefaultTabNavigationComponent<ClusterTab, Child>(- componentContext = componentContext,- initialTab = ClusterTab.Zookeeper,- tabSerializer = ClusterTab.serializer(),- childFactory = { configuration, childContext ->- when (configuration.tab) {- ClusterTab.Zookeeper -> Child.Zookeeper- ClusterTab.Nodes -> Child.Nodes- ClusterTab.Cores -> Child.Cores- }- },- ),+ private val navigation = SlotNavigation<ClusterTab>()++ override val tabSlot: Value<ChildSlot<ClusterTab, Child>> = childSlot(+ source = navigation,+ serializer = ClusterTab.serializer(),+ handleBackButton = true,+ childFactory = { configuration, childContext ->+ when (configuration) {+ ClusterTab.Zookeeper -> Child.Zookeeper+ ClusterTab.Nodes -> Child.Nodes+ ClusterTab.Cores -> Child.Cores+ }+ },)++ init {+ navigation.activate(configuration = ClusterTab.Zookeeper)+ }++ override fun onNavigate(tab: ClusterTab) = navigation.activate(configuration = tab)}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/ConfigsetsComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/ConfigsetsComponent.ktdeleted file mode 100644index 19580da5567..00000000000--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/ConfigsetsComponent.kt+++ /dev/null@@ -1,61 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.ui.components.configsets--import kotlinx.coroutines.flow.StateFlow-import org.apache.solr.ui.components.configsets.ConfigsetsComponent.Child-import org.apache.solr.ui.components.configsets.overview.ConfigsetsOverviewComponent-import org.apache.solr.ui.components.navigation.TabNavigationComponent-import org.apache.solr.ui.domain.Configset-import org.apache.solr.ui.views.navigation.configsets.ConfigsetsTab--/**- * The configsets component provides the main entry point for managing Solr's configets.- */-interface ConfigsetsComponent : TabNavigationComponent<ConfigsetsTab, Child> {-- /**- * All possible navigation targets (children) within the Configsets section.- */- sealed interface Child {- data class Overview(val component: ConfigsetsOverviewComponent) : Child-- /**- * TODO Remove once other sections are added- */- data class Placeholder(val tabName: String) : Child- }-- /**- * Model that holds the data of the [ConfigsetsComponent].- *- * @property configsets The configsets names available.- * @property selectedConfigset The current configset name to display. Leave empty if no- * selection is made.- */- data class Model(- val configsets: List<Configset> = emptyList(),- val selectedConfigset: String = "",- )-- /** Hot, observable stream of [Model] for Compose/UI. */- val model: StateFlow<Model>-- /** Select the active configset by name. */- fun onSelectConfigset(name: String)-}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/configsets/ConfigsetsTab.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/data/CreateConfigset.ktsimilarity index 81%rename from solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/configsets/ConfigsetsTab.ktrename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/data/CreateConfigset.ktindex 3a68a7cd8df..a7b06bf5a3e 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/configsets/ConfigsetsTab.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/data/CreateConfigset.kt@@ -14,17 +14,13 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.ui.views.navigation.configsets++package org.apache.solr.ui.components.configsets.dataimport kotlinx.serialization.Serializable@Serializable-enum class ConfigsetsTab {- Overview,- Files,- Schema,- UpdateConfig,- IndexQuery,- Handlers,- SearchComponents,-}+data class CreateConfigset(+ val name: String,+ val baseConfigSet: String? = null,+)diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/data/HttpConfigsetsRepository.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/data/HttpConfigsetsRepository.ktnew file mode 100644index 00000000000..24f7933aef8--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/data/HttpConfigsetsRepository.kt@@ -0,0 +1,76 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.data++import io.ktor.client.HttpClient+import io.ktor.client.call.body+import io.ktor.client.request.get+import io.ktor.client.request.post+import io.ktor.client.request.put+import io.ktor.client.request.setBody+import io.ktor.http.ContentType+import io.ktor.http.contentType+import io.ktor.http.isSuccess+import org.apache.solr.ui.components.configsets.repository.ConfigsetsRepository+import org.apache.solr.ui.domain.Configset+import org.apache.solr.ui.domain.PickedFile++class HttpConfigsetsRepository(private val httpClient: HttpClient) : ConfigsetsRepository {+ override suspend fun createConfigset(name: String, baseConfigset: String?): Result<Configset> {+ val response = httpClient.post("api/configsets") {+ setBody(+ CreateConfigset(+ name = name,+ baseConfigSet = baseConfigset,+ ),+ )+ }+ return when {+ response.status.isSuccess() ->+ // Success result will not contain any information,+ // therefore, create the configset from input+ Result.success(Configset(name))++ else -> Result.failure(Exception("Unknown Error"))+ }+ }++ override suspend fun importConfigset(name: String, file: PickedFile): Result<Configset> {+ val response = httpClient.put("api/configsets/$name") {+ contentType(ContentType.parse("application/zip"))+ setBody(file.bytes)+ }+ return when {+ response.status.isSuccess() -> Result.success(Configset(name = name))+ else -> Result.failure(Exception("Unknown Error"))+ }+ }++ override suspend fun loadConfigsets(): Result<List<Configset>> {+ val response = httpClient.get("api/configsets")+ return when {+ response.status.isSuccess() -> {+ val data = response.body<ListConfigsets>()+ Result.success(data.configSets.map { Configset(name = it) })+ }++ else -> Result.failure(Exception("Unknown Error"))+ // TODO Add proper error handling+ }+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/ConfigsetsComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/ConfigsetsComponent.ktnew file mode 100644index 00000000000..a7d2c7bec22--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/ConfigsetsComponent.kt@@ -0,0 +1,58 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.di++import org.apache.solr.ui.components.configsets.domain.CreateConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.ImportConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.LoadConfigsetsUseCase+import org.apache.solr.ui.components.configsets.repository.ConfigsetsRepository+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsOverviewViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsRouteViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsViewModel+import org.apache.solr.ui.components.configsets.viewmodel.CreateConfigsetViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ImportConfigsetViewModel+import org.apache.solr.ui.components.files.domain.SelectFileUseCase++/**+ * The configsets component keeps record of the currently available configsets, and a selected+ * configset that may be used for additional operations.+ */+interface ConfigsetsComponent {++ /**+ * Dependencies provided by the application.+ */+ val configsetsRepository: ConfigsetsRepository++ /**+ * Use case responsible for loading the available configsets.+ */+ val loadConfigsetsUseCase: LoadConfigsetsUseCase++ /**+ * Factory method to create a [ConfigsetsRouteViewModel] instance.+ */+ fun createConfigsetsRouteViewModel(): ConfigsetsRouteViewModel++ /**+ * Factory method to create a [ConfigsetsViewModel] instance.+ */+ fun createConfigsetsViewModel(): ConfigsetsViewModel++ fun createConfigsetsOverviewComponent(): ConfigsetsOverviewComponent+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/ConfigsetsOverviewComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/ConfigsetsOverviewComponent.ktnew file mode 100644index 00000000000..876045310ba--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/ConfigsetsOverviewComponent.kt@@ -0,0 +1,81 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.di++import org.apache.solr.ui.components.configsets.domain.CreateConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.ImportConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.LoadConfigsetsUseCase+import org.apache.solr.ui.components.configsets.repository.ConfigsetsRepository+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsOverviewViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsRouteViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsViewModel+import org.apache.solr.ui.components.configsets.viewmodel.CreateConfigsetViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ImportConfigsetViewModel+import org.apache.solr.ui.components.files.domain.SelectFileUseCase++/**+ * The configsets component keeps record of the currently available configsets, and a selected+ * configset that may be used for additional operations.+ */+interface ConfigsetsOverviewComponent {++ /**+ * Dependencies provided by the application.+ */+ val configsetsRepository: ConfigsetsRepository++ /**+ * Use case responsible for creating a new configset.+ */+ val createConfigsetUseCase: CreateConfigsetUseCase++ /**+ * Use case responsible for importing a configset from a file.+ */+ val importConfigsetUseCase: ImportConfigsetUseCase++ /**+ * Use case responsible for loading the available configsets.+ */+ val loadConfigsetsUseCase: LoadConfigsetsUseCase++ /**+ * Use case responsible for selecting a configset file.+ */+ val selectFileUseCase: SelectFileUseCase++ /**+ * Factory method to create a [ConfigsetsViewModel] instance.+ */+ fun createConfigsetsViewModel(): ConfigsetsViewModel++ /**+ * Factory method to create a [CreateConfigsetViewModel] instance.+ */+ fun createCreateConfigsetViewModel(): CreateConfigsetViewModel++ /**+ * Factory method to create a [ImportConfigsetViewModel] instance.+ */+ fun createImportConfigsetViewModel(): ImportConfigsetViewModel++ /**+ * Factory method to create a [ConfigsetsOverviewViewModel] instance.+ */+ fun createConfigsetsOverviewViewModel(): ConfigsetsOverviewViewModel+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/DefaultConfigsetsComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/DefaultConfigsetsComponent.ktnew file mode 100644index 00000000000..f7382ec4e78--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/DefaultConfigsetsComponent.kt@@ -0,0 +1,55 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.di++import io.ktor.client.HttpClient+import org.apache.solr.ui.components.configsets.data.HttpConfigsetsRepository+import org.apache.solr.ui.components.configsets.domain.DefaultLoadConfigsetsUseCase+import org.apache.solr.ui.components.configsets.domain.LoadConfigsetsUseCase+import org.apache.solr.ui.components.configsets.repository.ConfigsetsRepository+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsRouteViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsViewModel+import org.apache.solr.ui.utils.AppDispatchers+import org.apache.solr.ui.utils.platformDispatchers++/**+ * Default implementation of [ConfigsetsComponent].+ *+ * This implementation is using HTTP for configsets operations.+ *+ * @param httpClient The pre-configured HTTP client to use for user registration operations.+ */+class DefaultConfigsetsComponent(+ httpClient: HttpClient,+ private val dispatchers: AppDispatchers = platformDispatchers(),+) : ConfigsetsComponent {++ override val configsetsRepository: ConfigsetsRepository by lazy {+ HttpConfigsetsRepository(httpClient)+ }++ override val loadConfigsetsUseCase: LoadConfigsetsUseCase by lazy {+ DefaultLoadConfigsetsUseCase(configsetsRepository)+ }++ override fun createConfigsetsRouteViewModel(): ConfigsetsRouteViewModel = ConfigsetsRouteViewModel()++ override fun createConfigsetsViewModel(): ConfigsetsViewModel = ConfigsetsViewModel(loadConfigsetsUseCase, dispatchers)++ override fun createConfigsetsOverviewComponent(): ConfigsetsOverviewComponent = DefaultConfigsetsOverviewComponent(configsetsRepository)+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/DefaultConfigsetsOverviewComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/DefaultConfigsetsOverviewComponent.ktnew file mode 100644index 00000000000..dd269723325--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/di/DefaultConfigsetsOverviewComponent.kt@@ -0,0 +1,66 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.di++import org.apache.solr.ui.components.configsets.domain.CreateConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.DefaultCreateConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.DefaultImportConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.DefaultLoadConfigsetsUseCase+import org.apache.solr.ui.components.configsets.domain.ImportConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.LoadConfigsetsUseCase+import org.apache.solr.ui.components.configsets.repository.ConfigsetsRepository+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsOverviewViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsViewModel+import org.apache.solr.ui.components.configsets.viewmodel.CreateConfigsetViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ImportConfigsetViewModel+import org.apache.solr.ui.components.files.domain.DefaultSelectFileUseCase+import org.apache.solr.ui.components.files.domain.SelectFileUseCase+import org.apache.solr.ui.utils.AppDispatchers+import org.apache.solr.ui.utils.platformDispatchers++/**+ * Default implementation of [ConfigsetsOverviewComponent].+ */+class DefaultConfigsetsOverviewComponent(+ override val configsetsRepository: ConfigsetsRepository,+ private val dispatchers: AppDispatchers = platformDispatchers(),+) : ConfigsetsOverviewComponent {++ override val createConfigsetUseCase: CreateConfigsetUseCase by lazy {+ DefaultCreateConfigsetUseCase(configsetsRepository)+ }++ override val importConfigsetUseCase: ImportConfigsetUseCase by lazy {+ DefaultImportConfigsetUseCase(configsetsRepository)+ }++ // TODO Consider implementing special SelectFileUseCase for configsets import cases+ override val selectFileUseCase: SelectFileUseCase by lazy { DefaultSelectFileUseCase() }++ override val loadConfigsetsUseCase: LoadConfigsetsUseCase by lazy {+ DefaultLoadConfigsetsUseCase(configsetsRepository)+ }++ override fun createConfigsetsViewModel(): ConfigsetsViewModel = ConfigsetsViewModel(loadConfigsetsUseCase, dispatchers)++ override fun createCreateConfigsetViewModel(): CreateConfigsetViewModel = CreateConfigsetViewModel(createConfigsetUseCase, loadConfigsetsUseCase, dispatchers)++ override fun createImportConfigsetViewModel(): ImportConfigsetViewModel = ImportConfigsetViewModel(importConfigsetUseCase, selectFileUseCase, dispatchers)++ override fun createConfigsetsOverviewViewModel(): ConfigsetsOverviewViewModel = ConfigsetsOverviewViewModel()+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/CreateConfigsetEvent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/CreateConfigsetEvent.ktnew file mode 100644index 00000000000..02b56f69b8c--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/CreateConfigsetEvent.kt@@ -0,0 +1,51 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.domain++import org.apache.solr.ui.domain.Configset++sealed interface CreateConfigsetEvent {++ /**+ * Event that is omitted when a configset was successfully created.+ *+ * @property configset The configset that has been created.+ */+ data class ConfigsetCreated(val configset: Configset) : CreateConfigsetEvent++ /**+ * Event that is omitted when the creation process failed with an error.+ *+ * @property error The error that was thrown during the creation process.+ */+ data class ConfigsetCreationFailed(val error: Exception) : CreateConfigsetEvent++ /**+ * Event that is omitted when the creation process is aborted.+ */+ data object ConfigsetCreationAborted : CreateConfigsetEvent++ /**+ * Event that is omitted when the creation process input form is toggled. It can be either+ * text input or file input.+ *+ * @property useFileInput Whether the file input form is used (true) or the text field form+ * instead (false).+ */+ data class ConfigsetCreateToggleInputForm(val useFileInput: Boolean) : CreateConfigsetEvent+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/CreateConfigsetUseCase.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/CreateConfigsetUseCase.ktnew file mode 100644index 00000000000..2c04c6161fe--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/CreateConfigsetUseCase.kt@@ -0,0 +1,64 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.domain++import org.apache.solr.ui.domain.Configset++/**+ * Use case for creating a new configset.+ */+interface CreateConfigsetUseCase {+ /**+ * Default invocation for creating a new configset with user inputs.+ *+ * @param configsetName The configset name to use.+ * @param baseConfigset The configset to use as base for the new configset.+ *+ * @return A Result containing the Configset of the newly created configset or an error if+ * creation failed.+ */+ suspend operator fun invoke(+ configsetName: String,+ baseConfigset: String? = null,+ ): CreateConfigsetResult+}++sealed interface CreateConfigsetResult {+ data class Success(val configset: Configset) : CreateConfigsetResult++ data class ValidationFailure(val error: Error) : CreateConfigsetResult++ data class UnexpectedFailure(val cause: Throwable) : CreateConfigsetResult++ enum class Error {+ /**+ * Error for indicating that the configset name contains invalid characters.+ */+ ConfigsetNameContainsInvalidCharacters,++ /**+ * Error for indicating that the configset name is too long.+ */+ ConfigsetNameTooLong,++ /**+ * Error for indicating that the configset with the given name already exists.+ */+ DuplicateConfigset,+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/DefaultCreateConfigsetUseCase.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/DefaultCreateConfigsetUseCase.ktnew file mode 100644index 00000000000..472996f2fbf--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/DefaultCreateConfigsetUseCase.kt@@ -0,0 +1,52 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.domain++import org.apache.solr.ui.components.configsets.repository.ConfigsetsRepository+import org.apache.solr.ui.utils.MAX_CONFIGSET_NAME_LENGTH+import org.apache.solr.ui.utils.configsetNameRegex++internal class DefaultCreateConfigsetUseCase(+ private val repository: ConfigsetsRepository,+) : CreateConfigsetUseCase {+ override suspend fun invoke(+ configsetName: String,+ baseConfigset: String?,+ ): CreateConfigsetResult {+ if (!configsetName.matches(configsetNameRegex)) {+ return CreateConfigsetResult.ValidationFailure(+ error = CreateConfigsetResult.Error.ConfigsetNameContainsInvalidCharacters,+ )+ }++ if (configsetName.length > MAX_CONFIGSET_NAME_LENGTH) {+ return CreateConfigsetResult.ValidationFailure(+ error = CreateConfigsetResult.Error.ConfigsetNameTooLong,+ )+ }++ // TODO v2 API requires baseConfigSet to be set,+ // remove fallback to _default once it is truly optional+ repository.createConfigset(configsetName, baseConfigset ?: "_default")+ .onSuccess {+ return CreateConfigsetResult.Success(configset = it)+ }+ .onFailure { return CreateConfigsetResult.UnexpectedFailure(cause = it) }+ return CreateConfigsetResult.UnexpectedFailure(cause = Error("Unknown error"))+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/DefaultImportConfigsetUseCase.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/DefaultImportConfigsetUseCase.ktnew file mode 100644index 00000000000..82745c4d098--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/DefaultImportConfigsetUseCase.kt@@ -0,0 +1,37 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.domain++import org.apache.solr.ui.components.configsets.repository.ConfigsetsRepository+import org.apache.solr.ui.domain.Configset+import org.apache.solr.ui.domain.PickedFile++internal class DefaultImportConfigsetUseCase(+ private val repository: ConfigsetsRepository,+) : ImportConfigsetUseCase {+ override suspend fun invoke(configsetName: String, file: PickedFile): ImportConfigsetResult {+ // TODO Validate input data+ repository.importConfigset(configsetName, file).onSuccess {+ return ImportConfigsetResult.Success(configset = it)+ }.onFailure {+ // TODO Handle failure correctly+ return ImportConfigsetResult.UnexpectedFailure(cause = it)+ }+ return ImportConfigsetResult.UnexpectedFailure(Error("Unknown error"))+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/integration/Mappers.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/DefaultLoadConfigsetsUseCase.ktsimilarity index 63%rename from solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/integration/Mappers.ktrename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/DefaultLoadConfigsetsUseCase.ktindex 00a428faa32..cabac8319a5 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/integration/Mappers.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/DefaultLoadConfigsetsUseCase.kt@@ -15,16 +15,13 @@* limitations under the License.*/-package org.apache.solr.ui.components.configsets.integration+package org.apache.solr.ui.components.configsets.domain-import org.apache.solr.ui.components.configsets.ConfigsetsComponent-import org.apache.solr.ui.components.configsets.store.ConfigsetsStore+import org.apache.solr.ui.components.configsets.repository.ConfigsetsRepositoryimport org.apache.solr.ui.domain.Configset-internal val configsetsStateToModel: (ConfigsetsStore.State) -> ConfigsetsComponent.Model = {- ConfigsetsComponent.Model(- configsets = it.configSets.configSets.sorted()- .map { s -> Configset(s) },- selectedConfigset = it.selectedConfigset ?: "",- )+internal class DefaultLoadConfigsetsUseCase(+ private val repository: ConfigsetsRepository,+) : LoadConfigsetsUseCase {+ override suspend fun invoke(): Result<List<Configset>> = repository.loadConfigsets()}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/ImportConfigsetUseCase.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/ImportConfigsetUseCase.ktnew file mode 100644index 00000000000..1e10e675ca4--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/ImportConfigsetUseCase.kt@@ -0,0 +1,57 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.domain++import org.apache.solr.ui.domain.Configset+import org.apache.solr.ui.domain.PickedFile++/**+ * Use case for importing a configset from a file.+ */+interface ImportConfigsetUseCase {+ /**+ * Default invocation for importing a configset from a simple zip file.+ *+ * @param configsetName The name of the configset to use.+ * @param file The configset file to import.+ *+ * @return A Result containing the Configset of the created configset or an error if the import+ * failed.+ */+ suspend operator fun invoke(configsetName: String, file: PickedFile): ImportConfigsetResult+}++sealed interface ImportConfigsetResult {+ data class Success(val configset: Configset) : ImportConfigsetResult++ data class ValidationFailure(val error: Error) : ImportConfigsetResult++ data class UnexpectedFailure(val cause: Throwable) : ImportConfigsetResult++ enum class Error {+ /**+ * Error for indicating an invalid configset name.+ */+ InvalidConfigsetName,++ /**+ * Error for indicating that the configset with the given name already exists.+ */+ DuplicateConfigset,+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/overview/integration/DefaultConfigsetsOverviewComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/LoadConfigsetsUseCase.ktsimilarity index 60%rename from solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/overview/integration/DefaultConfigsetsOverviewComponent.ktrename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/LoadConfigsetsUseCase.ktindex 240b394815b..a45efa476f5 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/overview/integration/DefaultConfigsetsOverviewComponent.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/domain/LoadConfigsetsUseCase.kt@@ -14,16 +14,20 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.ui.components.configsets.overview.integration-import com.arkivanov.mvikotlin.core.store.StoreFactory-import io.ktor.client.HttpClient-import org.apache.solr.ui.components.configsets.overview.ConfigsetsOverviewComponent-import org.apache.solr.ui.utils.AppComponentContext+package org.apache.solr.ui.components.configsets.domain-class DefaultConfigsetsOverviewComponent(- componentContext: AppComponentContext,- storeFactory: StoreFactory,- httpClient: HttpClient,-) : ConfigsetsOverviewComponent,- AppComponentContext by componentContext+import org.apache.solr.ui.domain.Configset+import org.apache.solr.ui.domain.PickedFile++/**+ * Use case for loading the available configsets.+ */+interface LoadConfigsetsUseCase {+ /**+ * Default invocation for loading the available configsets.+ *+ * @return A Result containing the list of available Configsets.+ */+ suspend operator fun invoke(): Result<List<Configset>>+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/integration/DefaultConfigsetsComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/integration/DefaultConfigsetsComponent.ktdeleted file mode 100644index b3ff89b435f..00000000000--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/integration/DefaultConfigsetsComponent.kt+++ /dev/null@@ -1,107 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.ui.components.configsets.integration--import com.arkivanov.decompose.childContext-import com.arkivanov.mvikotlin.core.instancekeeper.getStore-import com.arkivanov.mvikotlin.core.store.StoreFactory-import com.arkivanov.mvikotlin.extensions.coroutines.stateFlow-import io.ktor.client.HttpClient-import kotlinx.coroutines.ExperimentalCoroutinesApi-import kotlinx.coroutines.SupervisorJob-import org.apache.solr.ui.components.configsets.ConfigsetsComponent-import org.apache.solr.ui.components.configsets.ConfigsetsComponent.Child-import org.apache.solr.ui.components.configsets.ConfigsetsComponent.Child.Overview-import org.apache.solr.ui.components.configsets.ConfigsetsComponent.Child.Placeholder-import org.apache.solr.ui.components.configsets.overview.integration.DefaultConfigsetsOverviewComponent-import org.apache.solr.ui.components.configsets.store.ConfigsetsStore.Intent-import org.apache.solr.ui.components.configsets.store.ConfigsetsStoreProvider-import org.apache.solr.ui.components.navigation.TabNavigationComponent-import org.apache.solr.ui.components.navigation.TabNavigationComponent.Configuration-import org.apache.solr.ui.components.navigation.integration.DefaultTabNavigationComponent-import org.apache.solr.ui.utils.AppComponentContext-import org.apache.solr.ui.utils.coroutineScope-import org.apache.solr.ui.utils.map-import org.apache.solr.ui.views.navigation.configsets.ConfigsetsTab--/**- * Default implementation of the [ConfigsetsComponent].- */-class DefaultConfigsetsComponent internal constructor(- componentContext: AppComponentContext,- tabNavigation: TabNavigationComponent<ConfigsetsTab, Child>,- storeFactory: StoreFactory,- httpClient: HttpClient,-) : ConfigsetsComponent,- AppComponentContext by componentContext,- TabNavigationComponent<ConfigsetsTab, Child> by tabNavigation {-- constructor(- componentContext: AppComponentContext,- storeFactory: StoreFactory,- httpClient: HttpClient,- ) : this (- componentContext = componentContext,- storeFactory = storeFactory,- httpClient = httpClient,- tabNavigation = DefaultTabNavigationComponent<ConfigsetsTab, Child>(- componentContext = componentContext.childContext("ConfigsetsTabs"),- initialTab = ConfigsetsTab.Overview,- tabSerializer = ConfigsetsTab.serializer(),- childFactory = { configuration, childContext ->- configsetsChildFactory(storeFactory, httpClient, configuration, childContext)- },- ),- )-- private val mainScope = coroutineScope(SupervisorJob() + mainContext)- private val ioScope = coroutineScope(SupervisorJob() + ioContext)-- private val store = instanceKeeper.getStore {- ConfigsetsStoreProvider(- storeFactory = storeFactory,- client = HttpConfigsetsStoreClient(httpClient),- mainContext = mainScope.coroutineContext,- ioContext = ioScope.coroutineContext,- ).provide()- }-- @OptIn(ExperimentalCoroutinesApi::class)- override val model = store.stateFlow.map(mainScope, configsetsStateToModel)-- override fun onSelectConfigset(name: String) {- store.accept(Intent.SelectConfigSet(configSetName = name))- }-}--fun configsetsChildFactory(- storeFactory: StoreFactory,- httpClient: HttpClient,- configuration: Configuration<ConfigsetsTab>,- childContext: AppComponentContext,-): Child = when (configuration.tab) {- ConfigsetsTab.Overview -> Overview(- DefaultConfigsetsOverviewComponent(- componentContext = childContext,- storeFactory = storeFactory,- httpClient = httpClient,- ),- )-- else -> Placeholder(tabName = configuration.tab.name)-}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/integration/HttpConfigsetsStoreClient.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/integration/HttpConfigsetsStoreClient.ktdeleted file mode 100644index cd8a7eaa726..00000000000--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/integration/HttpConfigsetsStoreClient.kt+++ /dev/null@@ -1,47 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.ui.components.configsets.integration--import io.ktor.client.HttpClient-import io.ktor.client.call.body-import io.ktor.client.request.get-import io.ktor.http.isSuccess-import org.apache.solr.ui.components.configsets.data.ListConfigsets-import org.apache.solr.ui.components.configsets.store.ConfigsetsStoreProvider--/**- * Client implementation of the [ConfigsetsStoreProvider.Client] that makes use- * of a preconfigured HTTP client for accessing the Solr API.- *- * @property httpClient HTTP client to use for accessing the API. The client has to be- * configured with a default request that includes the host, port and schema. The client- * should also include the necessary authentication data if authentication / authorization- * is enabled.- */-class HttpConfigsetsStoreClient(- private val httpClient: HttpClient,-) : ConfigsetsStoreProvider.Client {- override suspend fun fetchConfigSets(): Result<ListConfigsets> {- val response = httpClient.get("api/configsets")- return when {- response.status.isSuccess() -> Result.success(response.body())- else -> Result.failure(Exception("Unknown Error"))- // TODO Add proper error handling- }- }-}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/repository/ConfigsetsRepository.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/repository/ConfigsetsRepository.ktnew file mode 100644index 00000000000..f1b89627dd2--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/repository/ConfigsetsRepository.kt@@ -0,0 +1,47 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.repository++import org.apache.solr.ui.components.configsets.data.CreateConfigset+import org.apache.solr.ui.domain.Configset+import org.apache.solr.ui.domain.PickedFile++interface ConfigsetsRepository {+ /**+ * Create a new configset.+ *+ * @param name The name to use for the new configset.+ * @param baseConfigset The configset to use as base.+ * @result Result with the created configset.+ */+ suspend fun createConfigset(name: String, baseConfigset: String? = null): Result<Configset>++ /**+ * Import a configset from a zip file.+ *+ * @param name The name to use for the configset that is being imported.+ * @param file The file to upload for the import.+ * @result Result with the created configset.+ */+ suspend fun importConfigset(name: String, file: PickedFile): Result<Configset>++ /**+ * Load the available configsets.+ */+ suspend fun loadConfigsets(): Result<List<Configset>>+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/store/ConfigsetsStore.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/store/ConfigsetsStore.ktdeleted file mode 100644index 7dbbb9f69dd..00000000000--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/store/ConfigsetsStore.kt+++ /dev/null@@ -1,38 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */-package org.apache.solr.ui.components.configsets.store--import com.arkivanov.mvikotlin.core.store.Store-import org.apache.solr.ui.components.configsets.data.ListConfigsets-import org.apache.solr.ui.components.configsets.store.ConfigsetsStore.Intent-import org.apache.solr.ui.components.configsets.store.ConfigsetsStore.State-import org.apache.solr.ui.views.navigation.configsets.ConfigsetsTab--internal interface ConfigsetsStore : Store<Intent, State, Nothing> {-- sealed interface Intent {- /**- * Intent for selecting configset.- */- data class SelectConfigSet(val configSetName: String) : Intent- }-- data class State(- val selectedConfigset: String? = null,- val configSets: ListConfigsets = ListConfigsets(),- )-}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/store/ConfigsetsStoreProvider.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/store/ConfigsetsStoreProvider.ktdeleted file mode 100644index e3c73e4bcfd..00000000000--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/store/ConfigsetsStoreProvider.kt+++ /dev/null@@ -1,108 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.ui.components.configsets.store--import com.arkivanov.mvikotlin.core.store.Reducer-import com.arkivanov.mvikotlin.core.store.SimpleBootstrapper-import com.arkivanov.mvikotlin.core.store.Store-import com.arkivanov.mvikotlin.core.store.StoreFactory-import com.arkivanov.mvikotlin.extensions.coroutines.CoroutineExecutor-import kotlin.coroutines.CoroutineContext-import kotlinx.coroutines.launch-import kotlinx.coroutines.withContext-import org.apache.solr.ui.components.configsets.data.ListConfigsets-import org.apache.solr.ui.components.configsets.store.ConfigsetsStore.Intent-import org.apache.solr.ui.components.configsets.store.ConfigsetsStore.State-import org.apache.solr.ui.views.navigation.configsets.ConfigsetsTab--/**- * Store provider that [provide]s instances of [ConfigsetsStore].- *- * @property storeFactory Store factory to use for creating the store.- * @property client Client implementation to use for resolving [Intent]s and [Action]s.- * @property ioContext Coroutine context used for IO activity.- */-internal class ConfigsetsStoreProvider(- private val storeFactory: StoreFactory,- private val client: Client,- private val mainContext: CoroutineContext,- private val ioContext: CoroutineContext,-) {-- fun provide(): ConfigsetsStore = object :- ConfigsetsStore,- Store<Intent, State, Nothing> by storeFactory.create(- name = "ConfigsetsStore",- initialState = State(),- bootstrapper = SimpleBootstrapper(Action.FetchInitialConfigsets),- executorFactory = ::ExecutorImpl,- reducer = ReducerImpl,- ) {}-- private sealed interface Action {- /**- * Action used for initiating the initial fetch of configsets data.- */- data object FetchInitialConfigsets : Action- }-- private sealed interface Message {- data class ConfigSetsUpdated(val configsets: ListConfigsets) : Message- data class SelectedConfigSetChanged(val configsetName: String) : Message- }-- private inner class ExecutorImpl : CoroutineExecutor<Intent, Action, State, Message, Nothing>(mainContext) {- override fun executeAction(action: Action) = when (action) {- Action.FetchInitialConfigsets -> {- fetchConfigSets()- }- }-- override fun executeIntent(intent: Intent) = when (intent) {- is Intent.SelectConfigSet -> dispatch(Message.SelectedConfigSetChanged(intent.configSetName))- }-- private fun fetchConfigSets() {- scope.launch {- withContext(ioContext) {- client.fetchConfigSets()- }.onSuccess { sets ->- dispatch(Message.ConfigSetsUpdated(sets))- }- }- }- }-- /**- * Reducer implementation that consumes [Message]s and updates the store's [State].- */- private object ReducerImpl : Reducer<State, Message> {- override fun State.reduce(msg: Message): State = when (msg) {- is Message.ConfigSetsUpdated -> copy(configSets = msg.configsets)- is Message.SelectedConfigSetChanged -> copy(selectedConfigset = msg.configsetName)- }- }-- /**- * Client interface for fetching configsets information.- */- interface Client {- /** To fetch a list of configsets. */- suspend fun fetchConfigSets(): Result<ListConfigsets>- }-}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsOverviewViewModel.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsOverviewViewModel.ktnew file mode 100644index 00000000000..e0bf9a8884d--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsOverviewViewModel.kt@@ -0,0 +1,83 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.viewmodel++import androidx.compose.runtime.mutableStateListOf+import androidx.compose.runtime.snapshots.SnapshotStateList+import androidx.lifecycle.ViewModel+import androidx.navigation3.runtime.NavKey+import kotlinx.serialization.Serializable+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsOverviewEntry.ConfigsetsOverviewDialog.CreateConfigsetDialog+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsOverviewEntry.ConfigsetsOverviewDialog.ImportConfigsetDialog++class ConfigsetsOverviewViewModel : ViewModel() {++ val backStack: SnapshotStateList<ConfigsetsOverviewEntry> =+ mutableStateListOf(ConfigsetsOverviewEntry.Main)++ /**+ * Initiates the creation of a new configset.+ */+ fun openCreateConfigsetDialog() = backStack.apply {+ clearDialogs()+ add(CreateConfigsetDialog)+ }++ /**+ * Initiates the import of a configset.+ */+ fun openImportConfigsetDialog() = backStack.apply {+ clearDialogs()+ add(ImportConfigsetDialog)+ }++ /**+ * Closes any opened dialog.+ */+ fun closeDialog() {+ backStack.clearDialogs()+ }++ /**+ * Edit solrconfig.xml for the configset with the given [name].+ *+ * @param name the name of the configset to edit.+ */+ fun editSolrConfig(name: String) {+ TODO()+ }++ private fun SnapshotStateList<ConfigsetsOverviewEntry>.clearDialogs() = removeAll { entry -> entry is ConfigsetsOverviewEntry.ConfigsetsOverviewDialog }+}++@Serializable+sealed interface ConfigsetsOverviewEntry : NavKey {++ @Serializable+ data object Main : ConfigsetsOverviewEntry++ @Serializable+ sealed interface ConfigsetsOverviewDialog : ConfigsetsOverviewEntry {++ @Serializable+ data object CreateConfigsetDialog : ConfigsetsOverviewDialog++ @Serializable+ data object ImportConfigsetDialog : ConfigsetsOverviewDialog+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsRouteViewModel.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsRouteViewModel.ktnew file mode 100644index 00000000000..2d0cf9ea177--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsRouteViewModel.kt@@ -0,0 +1,104 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.viewmodel++import androidx.compose.runtime.mutableStateListOf+import androidx.compose.runtime.snapshots.SnapshotStateList+import androidx.lifecycle.SavedStateHandle+import androidx.lifecycle.ViewModel+import androidx.navigation3.runtime.NavKey+import kotlinx.coroutines.flow.MutableStateFlow+import kotlinx.coroutines.flow.StateFlow+import kotlinx.coroutines.flow.update+import kotlinx.serialization.Serializable++// TODO Make savedStateHandle mandatory+class ConfigsetsRouteViewModel(+ savedStateHandle: SavedStateHandle? = null,+) : ViewModel() {++ private val initialTab = savedStateHandle+ ?.get<String>("tab")+ ?.let { ConfigsetsTab.valueOf(it) }+ ?: ConfigsetsTab.Overview++ val backStack: SnapshotStateList<ConfigsetsScene> = mutableStateListOf(+ when (initialTab) {+ ConfigsetsTab.Overview -> ConfigsetsScene.Overview+ ConfigsetsTab.Files -> ConfigsetsScene.Files+ ConfigsetsTab.Schema -> ConfigsetsScene.Schema+ ConfigsetsTab.UpdateConfig -> ConfigsetsScene.UpdateConfig+ ConfigsetsTab.IndexQuery -> ConfigsetsScene.IndexQuery+ ConfigsetsTab.Handlers -> ConfigsetsScene.Handlers+ ConfigsetsTab.SearchComponents -> ConfigsetsScene.SearchComponents+ },+ )++ /**+ * The dialog that is currently open, if any.+ */+ val uiState: StateFlow<ConfigsetsSceneUiState>+ field = MutableStateFlow(ConfigsetsSceneUiState(selectedTab = initialTab))++ /**+ * Switches to the configset [tab] that was provided.+ *+ * @param tab The tab to select.+ */+ fun selectTab(tab: ConfigsetsTab) = uiState.update { it.copy(selectedTab = tab) }+}++data class ConfigsetsSceneUiState(+ val selectedTab: ConfigsetsTab = ConfigsetsTab.Overview,+)++@Serializable+sealed interface ConfigsetsScene : NavKey {++ @Serializable+ data object Overview : ConfigsetsScene++ @Serializable+ data object Files : ConfigsetsScene++ @Serializable+ data object Schema : ConfigsetsScene++ @Serializable+ data object UpdateConfig : ConfigsetsScene++ @Serializable+ data object IndexQuery : ConfigsetsScene++ @Serializable+ data object Handlers : ConfigsetsScene++ @Serializable+ data object SearchComponents : ConfigsetsScene+}++@Serializable+enum class ConfigsetsTab {+ Overview,+ Files,+ Schema,+ UpdateConfig,+ IndexQuery,+ Handlers,+ SearchComponents,+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsStateHolder.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsStateHolder.ktnew file mode 100644index 00000000000..0f17f5b26d4--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsStateHolder.kt@@ -0,0 +1,93 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.viewmodel++import kotlinx.coroutines.CoroutineScope+import kotlinx.coroutines.flow.MutableStateFlow+import kotlinx.coroutines.flow.StateFlow+import kotlinx.coroutines.flow.update+import kotlinx.coroutines.launch+import kotlinx.coroutines.withContext+import org.apache.solr.ui.components.configsets.domain.LoadConfigsetsUseCase+import org.apache.solr.ui.domain.Configset+import org.apache.solr.ui.utils.AppDispatchers++class ConfigsetsStateHolder(+ private val scope: CoroutineScope,+ private val loadConfigsetsUseCase: LoadConfigsetsUseCase,+ private val dispatchers: AppDispatchers,+) {++ /**+ * State of the configset create form.+ */+ val uiState: StateFlow<ConfigsetsUiState>+ field = MutableStateFlow(ConfigsetsUiState())++ init {+ loadConfigsets()+ }++ /**+ * Selects the given [configset].+ *+ * @param configset The configset to select.+ */+ fun selectConfigset(configset: String) = uiState.update {+ it.copy(selectedConfigset = configset)+ }++ /**+ * Clears the currently selected configset, if any.+ */+ fun clearSelectedConfigset() = uiState.update { it.copy(selectedConfigset = null) }++ /**+ * Reloads the configsets.+ */+ fun reloadConfigsets() {+ loadConfigsets(clearOnFailure = true)+ }++ private fun loadConfigsets(clearOnFailure: Boolean = false) = scope.launch {+ withContext(dispatchers.io) {+ loadConfigsetsUseCase()+ }.onSuccess { configsets ->+ uiState.update { it.copy(configsets = configsets.sortedBy(Configset::name)) }+ if (configsets.none { it.name == uiState.value.selectedConfigset }) {+ // Unselect current configset+ clearSelectedConfigset()+ }+ }.onFailure {+ // TODO Notify user about loading issue+ if (clearOnFailure) {+ uiState.update {+ it.copy(+ configsets = emptyList(),+ selectedConfigset = null,+ )+ }+ }+ }+ }+}++data class ConfigsetsUiState(+ val configsets: List<Configset> = emptyList(),+ val selectedConfigset: String? = null,+)diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsViewModel.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsViewModel.ktnew file mode 100644index 00000000000..0bb1b9cbd8c--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsViewModel.kt@@ -0,0 +1,57 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.viewmodel++import androidx.lifecycle.ViewModel+import androidx.lifecycle.viewModelScope+import org.apache.solr.ui.components.configsets.domain.LoadConfigsetsUseCase+import org.apache.solr.ui.utils.AppDispatchers++class ConfigsetsViewModel(+ loadConfigsetsUseCase: LoadConfigsetsUseCase,+ dispatchers: AppDispatchers,+) : ViewModel() {++ private val configsetsState = ConfigsetsStateHolder(+ scope = viewModelScope,+ loadConfigsetsUseCase = loadConfigsetsUseCase,+ dispatchers = dispatchers,+ )++ /**+ * UI State of the configsets.+ */+ val uiState = configsetsState.uiState++ /**+ * Selects the given [configset].+ *+ * @param configset The configset to select.+ */+ fun selectConfigset(configset: String) = configsetsState.selectConfigset(configset)++ /**+ * Clears the currently selected configset, if any.+ */+ fun clearSelectedConfigset() = configsetsState.clearSelectedConfigset()++ /**+ * Reloads the configsets.+ */+ fun reloadConfigsets() = configsetsState.reloadConfigsets()+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/CreateConfigsetViewModel.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/CreateConfigsetViewModel.ktnew file mode 100644index 00000000000..e2a6fcdff69--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/CreateConfigsetViewModel.kt@@ -0,0 +1,109 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.viewmodel++import androidx.lifecycle.ViewModel+import androidx.lifecycle.viewModelScope+import kotlinx.coroutines.flow.MutableSharedFlow+import kotlinx.coroutines.flow.MutableStateFlow+import kotlinx.coroutines.flow.SharedFlow+import kotlinx.coroutines.flow.StateFlow+import kotlinx.coroutines.flow.update+import kotlinx.coroutines.launch+import kotlinx.coroutines.withContext+import org.apache.solr.ui.components.configsets.domain.CreateConfigsetEvent+import org.apache.solr.ui.components.configsets.domain.CreateConfigsetResult+import org.apache.solr.ui.components.configsets.domain.CreateConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.LoadConfigsetsUseCase+import org.apache.solr.ui.utils.AppDispatchers++class CreateConfigsetViewModel(+ private val createConfigsetUseCase: CreateConfigsetUseCase,+ loadConfigsetsUseCase: LoadConfigsetsUseCase,+ private val dispatchers: AppDispatchers,+) : ViewModel() {++ private val configsetsState = ConfigsetsStateHolder(+ scope = viewModelScope,+ loadConfigsetsUseCase = loadConfigsetsUseCase,+ dispatchers = dispatchers,+ )++ /**+ * State of the configset create form.+ */+ val uiState: StateFlow<CreateConfigsetFormUiState>+ field = MutableStateFlow(CreateConfigsetFormUiState())++ /**+ * Configset state that holds the currently selected base configset.+ */+ val configsetsUiState = configsetsState.uiState++ /**+ * Events emitted by the viewmodel.+ */+ val events: SharedFlow<CreateConfigsetEvent>+ field = MutableSharedFlow<CreateConfigsetEvent>(extraBufferCapacity = 1)++ fun changeConfigsetName(configsetName: String) = uiState.update {+ it.copy(configsetName = configsetName)+ }++ fun changeBaseConfigset(baseConfigset: String) = configsetsState.selectConfigset(baseConfigset)++ fun createConfigset() {+ uiState.update { it.copy(isLoading = true) }+ // TODO Validate input data or let use case validate data++ viewModelScope.launch {+ val result = withContext(context = dispatchers.io) {+ createConfigsetUseCase(+ configsetName = uiState.value.configsetName,+ baseConfigset = configsetsState.uiState.value.selectedConfigset,+ )+ }++ when (result) {+ is CreateConfigsetResult.Success ->+ events.emit(CreateConfigsetEvent.ConfigsetCreated(result.configset))++ is CreateConfigsetResult.ValidationFailure ->+ uiState.update { it.copy(configsetNameError = result.error) }++ is CreateConfigsetResult.UnexpectedFailure -> TODO()+ }+ }+ }++ fun clearBaseConfigset() = configsetsState.clearSelectedConfigset()++ fun toggleInput() = viewModelScope.launch {+ events.emit(CreateConfigsetEvent.ConfigsetCreateToggleInputForm(useFileInput = true))+ }++ fun abortCreation() = viewModelScope.launch {+ events.emit(CreateConfigsetEvent.ConfigsetCreationAborted)+ }+}++data class CreateConfigsetFormUiState(+ val configsetName: String = "",+ val configsetNameError: CreateConfigsetResult.Error? = null,+ val isLoading: Boolean = false,+)diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ImportConfigsetViewModel.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ImportConfigsetViewModel.ktnew file mode 100644index 00000000000..63cd8f9c24d--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ImportConfigsetViewModel.kt@@ -0,0 +1,151 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.viewmodel++import androidx.lifecycle.ViewModel+import androidx.lifecycle.viewModelScope+import kotlinx.coroutines.flow.MutableSharedFlow+import kotlinx.coroutines.flow.MutableStateFlow+import kotlinx.coroutines.flow.SharedFlow+import kotlinx.coroutines.flow.StateFlow+import kotlinx.coroutines.flow.update+import kotlinx.coroutines.launch+import kotlinx.coroutines.withContext+import org.apache.solr.ui.components.configsets.domain.CreateConfigsetEvent+import org.apache.solr.ui.components.configsets.domain.ImportConfigsetResult+import org.apache.solr.ui.components.configsets.domain.ImportConfigsetUseCase+import org.apache.solr.ui.components.files.domain.FileSelectorEvent+import org.apache.solr.ui.components.files.domain.SelectFileUseCase+import org.apache.solr.ui.components.files.viewmodel.FileSelectorStateHolder+import org.apache.solr.ui.domain.PickedFile+import org.apache.solr.ui.utils.AppDispatchers++class ImportConfigsetViewModel(+ private val importConfigsetUseCase: ImportConfigsetUseCase,+ selectFileUseCase: SelectFileUseCase,+ private val dispatchers: AppDispatchers,+) : ViewModel() {++ private val fileSelectorState = FileSelectorStateHolder(+ scope = viewModelScope,+ selectFileUseCase = selectFileUseCase,+ )++ /**+ * State of the configset import form.+ */+ val uiState: StateFlow<ImportConfigsetUiState>+ field = MutableStateFlow(ImportConfigsetUiState())++ /**+ * State of the file selector.+ */+ val fileSelectorUiState = fileSelectorState.uiState++ /**+ * Events emitted by the viewmodel. This events flow uses the same events as+ * [CreateConfigsetViewModel] for simplicity.+ */+ val events: SharedFlow<CreateConfigsetEvent>+ field = MutableSharedFlow<CreateConfigsetEvent>(extraBufferCapacity = 1)++ init {+ viewModelScope.launch {+ fileSelectorState.events.collect { event ->+ when (event) {+ is FileSelectorEvent.FileSelected -> if (!uiState.value.configsetNameChanged) {+ setFileNameAsConfigset(event.file)+ }+ }+ }+ }+ }++ fun changeConfigsetName(name: String) = uiState.update {+ it.copy(configsetName = name, configsetNameChanged = true)+ }++ fun selectFile() = fileSelectorState.selectFile(SUPPORTED_CONFIGSET_IMPORT_FILE_EXTENSIONS)++ fun clearFile() = fileSelectorState.clearFile()++ fun importConfigset() {+ val file = fileSelectorState.validateAndGetFile() ?: return++ uiState.update { it.copy(isLoading = true) }+ // TODO Validate input data or let use case validate data++ viewModelScope.launch {+ val result = withContext(context = dispatchers.io) {+ importConfigsetUseCase(uiState.value.configsetName, file)+ }++ when (result) {+ is ImportConfigsetResult.Success ->+ events.emit(CreateConfigsetEvent.ConfigsetCreated(result.configset))++ is ImportConfigsetResult.ValidationFailure -> uiState.update {+ it.copy(+ configsetNameError = when (val error = result.error) {+ ImportConfigsetResult.Error.InvalidConfigsetName,+ ImportConfigsetResult.Error.DuplicateConfigset,+ -> error+ },+ )+ }++ is ImportConfigsetResult.UnexpectedFailure -> TODO()+ }+ }+ }++ fun toggleInput() = viewModelScope.launch {+ events.emit(CreateConfigsetEvent.ConfigsetCreateToggleInputForm(useFileInput = false))+ }++ fun abortImport() = viewModelScope.launch {+ events.emit(CreateConfigsetEvent.ConfigsetCreationAborted)+ }++ /**+ * Update the configset name to use the file name as configset name, removing the+ */+ private fun setFileNameAsConfigset(file: PickedFile) {+ uiState.update {+ it.copy(+ configsetName = file.name+ .removeSuffix(".${file.extension ?: "zip"}")+ .removeSuffix("_configset"),+ )+ }+ }+}++/**+ * A list of the supported file extensions for configsets that can be imported.+ *+ * Currently only zip files are supported.+ */+private val SUPPORTED_CONFIGSET_IMPORT_FILE_EXTENSIONS = listOf("zip")++data class ImportConfigsetUiState(+ val configsetName: String = "",+ val configsetNameError: ImportConfigsetResult.Error? = null,+ val configsetNameChanged: Boolean = false,+ val isLoading: Boolean = false,+)diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/domain/DefaultSelectFileUseCase.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/domain/DefaultSelectFileUseCase.ktnew file mode 100644index 00000000000..8f6d19a48c7--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/domain/DefaultSelectFileUseCase.kt@@ -0,0 +1,37 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.files.domain++import org.apache.solr.ui.utils.pickFile++internal class DefaultSelectFileUseCase : SelectFileUseCase {+ override suspend fun invoke(+ extensions: List<String>,+ maxSize: Int?,+ ): SelectFileResult {+ // Launch in main scope as it is tightly coupled with user-interaction+ val pickedFile = pickFile(extensions = extensions)+ // TODO Add additional validation+ return pickedFile?.let {+ if (maxSize != null && it.bytes.size > maxSize) {+ SelectFileResult.ValidationFailure(SelectFileResult.Error.FileTooLarge)+ }+ SelectFileResult.Success(it)+ } ?: SelectFileResult.Aborted+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/domain/FileSelectorEvent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/domain/FileSelectorEvent.ktnew file mode 100644index 00000000000..bf85256f10e--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/domain/FileSelectorEvent.kt@@ -0,0 +1,27 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.files.domain++import org.apache.solr.ui.domain.PickedFile++sealed interface FileSelectorEvent {+ /**+ * Event that is emitted whenever a file is selected.+ */+ data class FileSelected(val file: PickedFile) : FileSelectorEvent+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/domain/SelectFileUseCase.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/domain/SelectFileUseCase.ktnew file mode 100644index 00000000000..6d3e6f3d4f7--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/domain/SelectFileUseCase.kt@@ -0,0 +1,54 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.files.domain++import org.apache.solr.ui.domain.PickedFile++interface SelectFileUseCase {+ /**+ * Default invocation for selecting a file.+ *+ * @param extensions The allowed file extensions to filter.+ *+ * @return A Result containing the file that was selected.+ */+ suspend operator fun invoke(+ extensions: List<String>,+ maxSize: Int? = null,+ ): SelectFileResult+}++sealed interface SelectFileResult {+ data class Success(val file: PickedFile) : SelectFileResult++ data object Aborted : SelectFileResult++ data class ValidationFailure(val error: Error) : SelectFileResult++ data class UnexpectedFailure(val cause: Throwable) : SelectFileResult++ enum class Error {++ /**+ * Error for indicating that no file has been selected.+ */+ FileNotSelected,+ FileTooLarge,+ UnsupportedFormat,+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/viewmodel/FileSelectorStateHolder.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/viewmodel/FileSelectorStateHolder.ktnew file mode 100644index 00000000000..ec9aef8cfd9--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/files/viewmodel/FileSelectorStateHolder.kt@@ -0,0 +1,91 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.files.viewmodel++import kotlinx.coroutines.CoroutineScope+import kotlinx.coroutines.flow.MutableSharedFlow+import kotlinx.coroutines.flow.MutableStateFlow+import kotlinx.coroutines.flow.SharedFlow+import kotlinx.coroutines.flow.StateFlow+import kotlinx.coroutines.flow.update+import kotlinx.coroutines.launch+import org.apache.solr.ui.components.files.domain.FileSelectorEvent+import org.apache.solr.ui.components.files.domain.SelectFileResult+import org.apache.solr.ui.components.files.domain.SelectFileUseCase+import org.apache.solr.ui.domain.PickedFile++class FileSelectorStateHolder(+ private val scope: CoroutineScope,+ private val selectFileUseCase: SelectFileUseCase,+) {++ /**+ * State of the configset create form.+ */+ val uiState: StateFlow<FileSelectorUiState>+ field = MutableStateFlow(FileSelectorUiState())++ /**+ * Events emitted by the state holer.+ */+ val events: SharedFlow<FileSelectorEvent>+ field = MutableSharedFlow<FileSelectorEvent>(extraBufferCapacity = 1)++ fun selectFile(extensions: List<String>) {+ uiState.update { it.copy(fileError = null) }+ scope.launch {+ when (val result = selectFileUseCase(extensions)) {+ is SelectFileResult.Aborted -> Unit++ // Ignore+ is SelectFileResult.Success -> {+ uiState.update {+ it.copy(file = result.file, fileError = null)+ }+ events.emit(FileSelectorEvent.FileSelected(result.file))+ }++ is SelectFileResult.ValidationFailure ->+ uiState.update { it.copy(fileError = result.error) }++ is SelectFileResult.UnexpectedFailure -> {+ // TODO Handle general error+ }+ }+ }+ }++ fun clearFile() {+ uiState.update { it.copy(file = null) }+ }++ fun validateAndGetFile(): PickedFile? {+ var isValid = true+ if (uiState.value.file == null) {+ uiState.update { it.copy(fileError = SelectFileResult.Error.FileNotSelected) }+ isValid = false+ }+ if (isValid) return uiState.value.file+ return null+ }+}++data class FileSelectorUiState(+ val file: PickedFile? = null,+ val fileError: SelectFileResult.Error? = null,+)diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/MainComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/MainComponent.ktindex 56e1ad29284..de40d86b586 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/MainComponent.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/MainComponent.kt@@ -20,13 +20,11 @@ package org.apache.solr.ui.components.mainimport com.arkivanov.decompose.router.stack.ChildStackimport com.arkivanov.decompose.value.Valueimport org.apache.solr.ui.components.cluster.ClusterComponent-import org.apache.solr.ui.components.configsets.ConfigsetsComponent+import org.apache.solr.ui.components.configsets.di.ConfigsetsComponentimport org.apache.solr.ui.components.environment.EnvironmentComponentimport org.apache.solr.ui.components.logging.LoggingComponentimport org.apache.solr.ui.components.navigation.NavigationComponent-import org.apache.solr.ui.components.navigation.TabNavigationComponentimport org.apache.solr.ui.views.navigation.MainMenu-import org.apache.solr.ui.views.navigation.configsets.ConfigsetsTab/*** Main component of the application that is used as base for users with access.diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.ktindex 4de94a395e5..1a354267c43 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.kt@@ -27,8 +27,8 @@ import io.ktor.client.HttpClientimport kotlinx.serialization.Serializableimport org.apache.solr.ui.components.cluster.ClusterComponentimport org.apache.solr.ui.components.cluster.integration.DefaultClusterComponent-import org.apache.solr.ui.components.configsets.ConfigsetsComponent-import org.apache.solr.ui.components.configsets.integration.DefaultConfigsetsComponent+import org.apache.solr.ui.components.configsets.di.ConfigsetsComponent+import org.apache.solr.ui.components.configsets.di.DefaultConfigsetsComponentimport org.apache.solr.ui.components.environment.EnvironmentComponentimport org.apache.solr.ui.components.environment.integration.DefaultEnvironmentComponentimport org.apache.solr.ui.components.logging.LoggingComponent@@ -44,7 +44,7 @@ class DefaultMainComponent internal constructor(storeFactory: StoreFactory,destination: String? = null,private val clusterComponent: (AppComponentContext) -> ClusterComponent,- private val configsetsComponent: (AppComponentContext) -> ConfigsetsComponent,+ private val configsetsComponent: () -> ConfigsetsComponent,private val environmentComponent: (AppComponentContext) -> EnvironmentComponent,private val loggingComponent: (AppComponentContext) -> LoggingComponent,private val output: (Output) -> Unit,@@ -77,13 +77,7 @@ class DefaultMainComponent internal constructor(componentContext = childContext,)},- configsetsComponent = { childContext ->- DefaultConfigsetsComponent(- componentContext = childContext,- storeFactory = storeFactory,- httpClient = httpClient,- )- },+ configsetsComponent = { DefaultConfigsetsComponent(httpClient = httpClient) },environmentComponent = { childContext ->DefaultEnvironmentComponent(componentContext = childContext,@@ -116,7 +110,7 @@ class DefaultMainComponent internal constructor("configsets" -> Configuration.Configsets"environment" -> Configuration.Environment"logging" -> Configuration.Logging- else -> Configuration.Environment+ else -> Configuration.Configsets},)@@ -138,7 +132,7 @@ class DefaultMainComponent internal constructor(// Configuration.Security ->// NavigationComponent.Child.Security(securityComponent(componentContext))- Configuration.Configsets -> Child.Configsets(configsetsComponent(componentContext))+ Configuration.Configsets -> Child.Configsets(configsetsComponent())// TODO Uncomment once Collections available// Configuration.Collections ->diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/navigation/TabNavigationComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/navigation/TabNavigationComponent.ktindex 9b07b5295eb..7c5b7d4f57b 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/navigation/TabNavigationComponent.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/navigation/TabNavigationComponent.kt@@ -21,12 +21,9 @@ import com.arkivanov.decompose.router.slot.ChildSlotimport com.arkivanov.decompose.value.Valueimport kotlinx.serialization.Serializable-interface TabNavigationComponent<T : Enum<T>, C : Any> {+interface TabNavigationComponent<T : Any, C : Any> {- val tabSlot: Value<ChildSlot<Configuration<T>, C>>+ val tabSlot: Value<ChildSlot<T, C>>fun onNavigate(tab: T)-- @Serializable- data class Configuration<T : Enum<T>>(val tab: T)}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/navigation/integration/DefaultTabNavigationComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/navigation/integration/DefaultTabNavigationComponent.ktdeleted file mode 100644index e7fffe2076e..00000000000--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/navigation/integration/DefaultTabNavigationComponent.kt+++ /dev/null@@ -1,54 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.ui.components.navigation.integration--import com.arkivanov.decompose.router.slot.ChildSlot-import com.arkivanov.decompose.router.slot.SlotNavigation-import com.arkivanov.decompose.router.slot.activate-import com.arkivanov.decompose.router.slot.childSlot-import com.arkivanov.decompose.value.Value-import com.arkivanov.essenty.lifecycle.doOnCreate-import com.arkivanov.essenty.lifecycle.doOnResume-import kotlinx.serialization.KSerializer-import org.apache.solr.ui.components.navigation.TabNavigationComponent-import org.apache.solr.ui.components.navigation.TabNavigationComponent.Configuration-import org.apache.solr.ui.utils.AppComponentContext--class DefaultTabNavigationComponent<T : Enum<T>, C : Any>(- componentContext: AppComponentContext,- initialTab: T,- tabSerializer: KSerializer<T>,- childFactory: (Configuration<T>, AppComponentContext) -> C,-) : TabNavigationComponent<T, C>,- AppComponentContext by componentContext {-- private val navigation = SlotNavigation<Configuration<T>>()-- override val tabSlot: Value<ChildSlot<Configuration<T>, C>> = childSlot(- source = navigation,- serializer = Configuration.serializer(tabSerializer),- handleBackButton = true,- childFactory = childFactory,- )-- init {- navigation.activate(configuration = Configuration(initialTab))- }-- override fun onNavigate(tab: T) = navigation.activate(configuration = Configuration(tab))-}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/domain/Configset.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/domain/Configset.ktindex 921f3ca9c16..e706cdb0426 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/domain/Configset.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/domain/Configset.kt@@ -17,6 +17,8 @@package org.apache.solr.ui.domain+import kotlinx.serialization.Serializable+/*** Configset entity that represents a basic configset. This data class does only hold the basic* information of a configset.@@ -26,6 +28,7 @@ package org.apache.solr.ui.domain** @property name The name and unique identifier of the configset.*/+@Serializabledata class Configset(val name: String = "",)diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/domain/PickedFile.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/domain/PickedFile.ktnew file mode 100644index 00000000000..cdae58963bc--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/domain/PickedFile.kt@@ -0,0 +1,44 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.domain++data class PickedFile(+ val name: String,+ val bytes: ByteArray,+ val extension: String? = null,+) {+ override fun equals(other: Any?): Boolean {+ if (this === other) return true+ if (other == null || this::class != other::class) return false++ other as PickedFile++ if (name != other.name) return false+ if (!bytes.contentEquals(other.bytes)) return false+ if (extension != other.extension) return false++ return true+ }++ override fun hashCode(): Int {+ var result = name.hashCode()+ result = 31 * result + bytes.contentHashCode()+ result = 31 * result + (extension?.hashCode() ?: 0)+ return result+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/AppDispatchers.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/AppDispatchers.ktnew file mode 100644index 00000000000..2c81218ba81--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/AppDispatchers.kt@@ -0,0 +1,36 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.utils++import kotlinx.coroutines.CoroutineDispatcher++/**+ * App dispatchers used for coroutines.+ */+interface AppDispatchers {++ /**+ * Coroutine dispatcher used for IO operations.+ */+ val io: CoroutineDispatcher+}++/**+ * Factory function to provide platform-specific dispatchers.+ */+expect fun platformDispatchers(): AppDispatchersdiff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/FileUtils.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/FileUtils.ktnew file mode 100644index 00000000000..889c375f55e--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/FileUtils.kt@@ -0,0 +1,25 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.utils++import org.apache.solr.ui.domain.PickedFile++/**+ * @param extensions e.g. listOf("zip", "json"). Empty = any.+ */+expect suspend fun pickFile(extensions: List<String> = emptyList()): PickedFile?diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/HttpClientUtils.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/HttpClientUtils.ktindex c7883b9f717..ca991937d4a 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/HttpClientUtils.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/HttpClientUtils.kt@@ -26,7 +26,9 @@ import io.ktor.client.plugins.auth.providers.basicimport io.ktor.client.plugins.auth.providers.bearerimport io.ktor.client.plugins.contentnegotiation.ContentNegotiationimport io.ktor.client.plugins.defaultRequest+import io.ktor.http.ContentTypeimport io.ktor.http.Url+import io.ktor.http.contentTypeimport io.ktor.serialization.kotlinx.json.jsonimport kotlinx.serialization.json.Jsonimport org.apache.solr.ui.domain.AuthOption@@ -41,6 +43,7 @@ fun getDefaultClient() = HttpClient {defaultRequest {url(url.toString())+ contentType(ContentType.Application.Json)}install(ContentNegotiation) {diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/Validators.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/Validators.ktnew file mode 100644index 00000000000..e3959d977bb--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/Validators.kt@@ -0,0 +1,34 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.utils++/**+ * Regex that configset names must match in order to be valid.+ *+ * Note that this regex is only used in the UI and does not represent the actual allowed+ * name regex for configsets, as this has not yet been defined.+ */+internal val configsetNameRegex = "[a-zA-Z0-9._-]+".toRegex()++/**+ * The maximum length a configset name may have.+ *+ * Note that this is a maximum length used in the UI only and does not represent the actual allowed+ * length for configset names.+ */+internal const val MAX_CONFIGSET_NAME_LENGTH = 256diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/components/SolrOutlinedTextField.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/components/SolrOutlinedTextField.ktnew file mode 100644index 00000000000..9f22b99d944--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/components/SolrOutlinedTextField.kt@@ -0,0 +1,86 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.views.components++import androidx.compose.foundation.interaction.MutableInteractionSource+import androidx.compose.foundation.text.KeyboardActions+import androidx.compose.foundation.text.KeyboardOptions+import androidx.compose.material3.LocalTextStyle+import androidx.compose.material3.MaterialTheme+import androidx.compose.material3.OutlinedTextField+import androidx.compose.material3.OutlinedTextFieldDefaults+import androidx.compose.material3.TextFieldColors+import androidx.compose.runtime.Composable+import androidx.compose.ui.Modifier+import androidx.compose.ui.graphics.Shape+import androidx.compose.ui.text.TextStyle+import androidx.compose.ui.text.input.VisualTransformation++@Composable+fun SolrOutlinedTextField(+ value: String,+ onValueChange: (String) -> Unit,+ modifier: Modifier = Modifier,+ enabled: Boolean = true,+ readOnly: Boolean = false,+ textStyle: TextStyle = LocalTextStyle.current,+ label: @Composable (() -> Unit)? = null,+ placeholder: @Composable (() -> Unit)? = null,+ leadingIcon: @Composable (() -> Unit)? = null,+ trailingIcon: @Composable (() -> Unit)? = null,+ prefix: @Composable (() -> Unit)? = null,+ suffix: @Composable (() -> Unit)? = null,+ supportingText: @Composable (() -> Unit)? = null,+ isError: Boolean = false,+ visualTransformation: VisualTransformation = VisualTransformation.None,+ keyboardOptions: KeyboardOptions = KeyboardOptions.Default,+ keyboardActions: KeyboardActions = KeyboardActions.Default,+ singleLine: Boolean = false,+ maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE,+ minLines: Int = 1,+ interactionSource: MutableInteractionSource? = null,+ shape: Shape = OutlinedTextFieldDefaults.shape,+ colors: TextFieldColors = OutlinedTextFieldDefaults.colors().copy(+ unfocusedContainerColor = MaterialTheme.colorScheme.background,+ focusedContainerColor = MaterialTheme.colorScheme.background,+ ),+) = OutlinedTextField(+ value = value,+ onValueChange = onValueChange,+ modifier = modifier,+ enabled = enabled,+ readOnly = readOnly,+ textStyle = textStyle,+ label = label,+ placeholder = placeholder,+ leadingIcon = leadingIcon,+ trailingIcon = trailingIcon,+ prefix = prefix,+ suffix = suffix,+ supportingText = supportingText,+ isError = isError,+ visualTransformation = visualTransformation,+ keyboardOptions = keyboardOptions,+ keyboardActions = keyboardActions,+ singleLine = singleLine,+ maxLines = maxLines,+ minLines = minLines,+ interactionSource = interactionSource,+ shape = shape,+ colors = colors,+)diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsContent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsContent.ktindex 24faf766cc7..88449d9be04 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsContent.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsContent.kt@@ -17,21 +17,23 @@package org.apache.solr.ui.views.configsetsimport androidx.compose.foundation.layout.Arrangement-import androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.ExperimentalLayoutApiimport androidx.compose.foundation.layout.FlowRowimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.padding-import androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValueimport androidx.compose.ui.Modifierimport androidx.compose.ui.unit.dp-import com.arkivanov.decompose.extensions.compose.subscribeAsState-import org.apache.solr.ui.components.configsets.ConfigsetsComponent-import org.apache.solr.ui.components.configsets.ConfigsetsComponent.Child+import androidx.lifecycle.viewmodel.compose.viewModel+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator+import androidx.navigation3.runtime.entryProvider+import androidx.navigation3.ui.NavDisplay+import org.apache.solr.ui.components.configsets.di.ConfigsetsComponent+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsScene+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsTabimport org.apache.solr.ui.generated.resources.Resimport org.apache.solr.ui.generated.resources.configsets_index_queryimport org.apache.solr.ui.generated.resources.configsets_request_handlers@@ -41,11 +43,10 @@ import org.apache.solr.ui.generated.resources.filesimport org.apache.solr.ui.generated.resources.overviewimport org.apache.solr.ui.generated.resources.schemaimport org.apache.solr.ui.views.navigation.NavigationTabs-import org.apache.solr.ui.views.navigation.configsets.ConfigsetsTab@OptIn(ExperimentalLayoutApi::class)@Composable-fun ConfigsetsContent(+fun ConfigsetsScene(component: ConfigsetsComponent,modifier: Modifier = Modifier,) = FlowRow(@@ -53,35 +54,33 @@ fun ConfigsetsContent(horizontalArrangement = Arrangement.spacedBy(16.dp),verticalArrangement = Arrangement.spacedBy(16.dp),) {- val model by component.model.collectAsState()- val slot by component.tabSlot.subscribeAsState()- val currentChild = slot.child+ val viewModel = viewModel { component.createConfigsetsRouteViewModel() }+ val model by viewModel.uiState.collectAsState()++ val sharedConfigsetsViewModel = viewModel { component.createConfigsetsViewModel() }Column(Modifier.fillMaxSize()) {NavigationTabs(- component = component,- entries = ConfigsetsTab.entries,+ tabs = ConfigsetsTab.entries,+ selectedTab = model.selectedTab,+ onSelectTab = viewModel::selectTab,mapper = ::tabLabelRes,modifier = Modifier.padding(1.dp),)- ConfigsetsDropdown(- selectedConfigSet = model.selectedConfigset,- selectConfigset = component::onSelectConfigset,- availableConfigsets = model.configsets,- )- Box(- Modifier- .fillMaxSize()- .padding(16.dp),- ) {- currentChild?.let {- when (val child = it.instance) {- is Child.Overview -> ConfigsetsOverviewContent(component = child.component)- is Child.Placeholder -> Text(text = child.tabName)+ NavDisplay(+ backStack = viewModel.backStack,+ entryDecorators = listOf(rememberViewModelStoreNavEntryDecorator()),+ entryProvider = entryProvider {+ entry<ConfigsetsScene.Overview> {+ ConfigsetsOverviewContent(+ component = component.createConfigsetsOverviewComponent(),+ configsetsViewModel = sharedConfigsetsViewModel,+ modifier = Modifier.fillMaxSize().padding(16.dp),+ )}- }- }+ },+ )}}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdown.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdown.ktindex 7ab6d51eae8..4f4a032e386 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdown.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdown.kt@@ -26,12 +26,14 @@ import androidx.compose.material3.IconButtonimport androidx.compose.material3.OutlinedTextFieldimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable+import androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.setValueimport androidx.compose.ui.Modifierimport androidx.compose.ui.platform.testTag+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsViewModelimport org.apache.solr.ui.domain.Configsetimport org.apache.solr.ui.generated.resources.Resimport org.apache.solr.ui.generated.resources.cd_clear_field@@ -44,14 +46,32 @@ import org.jetbrains.compose.resources.stringResource@OptIn(ExperimentalMaterial3Api::class)@Composablefun ConfigsetsDropdown(- selectedConfigSet: String,+ viewModel: ConfigsetsViewModel,+ modifier: Modifier = Modifier,+ enableReset: Boolean = false,+) {+ val model by viewModel.uiState.collectAsState()++ ConfigsetsDropdown(+ configsets = model.configsets,+ selectedConfigset = model.selectedConfigset,+ selectConfigset = viewModel::selectConfigset,+ modifier = modifier,+ enableReset = enableReset,+ )+}++@OptIn(ExperimentalMaterial3Api::class)+@Composable+fun ConfigsetsDropdown(+ selectedConfigset: String?,+ configsets: List<Configset>,selectConfigset: (String) -> Unit,- availableConfigsets: List<Configset>,modifier: Modifier = Modifier,enableReset: Boolean = false,) {var expanded by remember { mutableStateOf(false) }- val enabled = availableConfigsets.isNotEmpty()+ val enabled = configsets.isNotEmpty()ExposedDropdownMenuBox(expanded = expanded,@@ -59,14 +79,14 @@ fun ConfigsetsDropdown(modifier = modifier,) {OutlinedTextField(- value = selectedConfigSet,+ value = selectedConfigset ?: "",onValueChange = {},readOnly = true,enabled = enabled,singleLine = true,label = { Text(stringResource(Res.string.nav_configsets)) },placeholder = {- if (availableConfigsets.isEmpty()) {+ if (configsets.isEmpty()) {Text(modifier = Modifier.testTag("no_configsets_placeholder"),text = stringResource(Res.string.no_configsets),@@ -74,7 +94,7 @@ fun ConfigsetsDropdown(}},trailingIcon = {- if (enableReset && selectedConfigSet.isNotEmpty()) {+ if (enableReset && !selectedConfigset.isNullOrEmpty()) {IconButton(onClick = { selectConfigset("") }) {Icon(painter = painterResource(Res.drawable.close),@@ -97,7 +117,7 @@ fun ConfigsetsDropdown(expanded = expanded,onDismissRequest = { expanded = false },) {- availableConfigsets.forEach { configset ->+ configsets.forEach { configset ->DropdownMenuItem(modifier = Modifier.testTag(tag = configset.name),text = { Text(configset.name) },diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsOverviewContent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsOverviewContent.ktindex 623beda8bda..d0ecf4a2729 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsOverviewContent.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsOverviewContent.kt@@ -16,12 +16,148 @@*/package org.apache.solr.ui.views.configsets+import androidx.compose.foundation.horizontalScroll+import androidx.compose.foundation.layout.Arrangement+import androidx.compose.foundation.layout.Column+import androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.Spacer+import androidx.compose.foundation.layout.width+import androidx.compose.foundation.layout.widthIn+import androidx.compose.foundation.rememberScrollState+import androidx.compose.material3.Iconimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable+import androidx.compose.runtime.LaunchedEffect+import androidx.compose.runtime.collectAsState+import androidx.compose.runtime.getValue+import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier-import org.apache.solr.ui.components.configsets.overview.ConfigsetsOverviewComponent+import androidx.compose.ui.unit.dp+import androidx.lifecycle.viewmodel.compose.viewModel+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator+import androidx.navigation3.runtime.entryProvider+import androidx.navigation3.scene.DialogSceneStrategy+import androidx.navigation3.scene.DialogSceneStrategy.Companion.dialog+import androidx.navigation3.scene.SinglePaneSceneStrategy+import androidx.navigation3.ui.NavDisplay+import kotlin.collections.removeLastOrNull+import org.apache.solr.ui.components.configsets.di.ConfigsetsOverviewComponent+import org.apache.solr.ui.components.configsets.domain.CreateConfigsetEvent+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsOverviewEntry+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsOverviewEntry.ConfigsetsOverviewDialog.CreateConfigsetDialog+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsOverviewEntry.ConfigsetsOverviewDialog.ImportConfigsetDialog+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsViewModel+import org.apache.solr.ui.domain.Configset+import org.apache.solr.ui.generated.resources.Res+import org.apache.solr.ui.generated.resources.action_create_configset+import org.apache.solr.ui.generated.resources.action_edit_solrconfig+import org.apache.solr.ui.generated.resources.add+import org.apache.solr.ui.generated.resources.edit+import org.apache.solr.ui.views.components.SolrTextButton+import org.jetbrains.compose.resources.painterResource+import org.jetbrains.compose.resources.stringResource@Composable-fun ConfigsetsOverviewContent(component: ConfigsetsOverviewComponent, modifier: Modifier = Modifier) {- Text("Overview section")+fun ConfigsetsOverviewContent(+ component: ConfigsetsOverviewComponent,+ configsetsViewModel: ConfigsetsViewModel,+ modifier: Modifier = Modifier,+) = Column(modifier) {+ val viewModel = viewModel { component.createConfigsetsOverviewViewModel() }++ val configsetsModel by configsetsViewModel.uiState.collectAsState()++ val onConfigsetCreated: (Configset) -> Unit = {+ viewModel.closeDialog()+ configsetsViewModel.reloadConfigsets()+ configsetsViewModel.selectConfigset(it.name)+ }++ val createConfigsetEventCollector: (CreateConfigsetEvent) -> Unit = { event ->+ when (event) {+ is CreateConfigsetEvent.ConfigsetCreated -> onConfigsetCreated(event.configset)++ is CreateConfigsetEvent.ConfigsetCreationAborted -> viewModel.closeDialog()++ is CreateConfigsetEvent.ConfigsetCreateToggleInputForm ->+ if (event.useFileInput) {+ viewModel.openImportConfigsetDialog()+ } else {+ viewModel.openCreateConfigsetDialog()+ }++ else -> Unit+ }+ }++ NavDisplay(+ modifier = Modifier.horizontalScroll(rememberScrollState()),+ backStack = viewModel.backStack,+ sceneStrategies = listOf(DialogSceneStrategy(), SinglePaneSceneStrategy()),+ onBack = {+ if (viewModel.backStack.last() is ConfigsetsOverviewEntry.ConfigsetsOverviewDialog) {+ viewModel.backStack.removeLastOrNull()+ }+ },+ entryDecorators = listOf(rememberViewModelStoreNavEntryDecorator()),+ entryProvider = entryProvider {+ entry<ConfigsetsOverviewEntry.Main> {+ OverviewContent(+ viewModel = configsetsViewModel,+ selectedConfigset = configsetsModel.selectedConfigset,+ onOpenCreateConfigsetDialog = viewModel::openCreateConfigsetDialog,+ onEditSolrConfig = viewModel::editSolrConfig,+ )+ }+ entry<CreateConfigsetDialog>(metadata = dialog()) {+ val createViewModel = viewModel { component.createCreateConfigsetViewModel() }++ LaunchedEffect(createViewModel) {+ createViewModel.events.collect(collector = createConfigsetEventCollector)+ }++ CreateConfigsetDialog(viewModel = createViewModel)+ }+ entry<ImportConfigsetDialog>(metadata = dialog()) {+ val importViewModel = viewModel { component.createImportConfigsetViewModel() }++ LaunchedEffect(importViewModel) {+ importViewModel.events.collect(collector = createConfigsetEventCollector)+ }++ ImportConfigsetDialog(viewModel = importViewModel)+ }+ },+ )+}++@Composable+private fun OverviewContent(+ viewModel: ConfigsetsViewModel,+ onOpenCreateConfigsetDialog: () -> Unit,+ onEditSolrConfig: (String) -> Unit,+ modifier: Modifier = Modifier,+ selectedConfigset: String? = null,+) = Row(+ modifier = modifier,+ horizontalArrangement = Arrangement.spacedBy(8.dp),+ verticalAlignment = Alignment.CenterVertically,+) {+ ConfigsetsDropdown(+ viewModel = viewModel,+ modifier = Modifier.widthIn(min = 128.dp, max = 256.dp),+ )++ SolrTextButton(onClick = onOpenCreateConfigsetDialog) {+ Icon(painter = painterResource(Res.drawable.add), contentDescription = null)+ Spacer(modifier = Modifier.width(8.dp))+ Text(stringResource(Res.string.action_create_configset))+ }+ if (!selectedConfigset.isNullOrBlank()) {+ SolrTextButton(onClick = { onEditSolrConfig(selectedConfigset) }) {+ Icon(painter = painterResource(Res.drawable.edit), contentDescription = null)+ Spacer(modifier = Modifier.width(8.dp))+ Text(stringResource(Res.string.action_edit_solrconfig))+ }+ }}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/CreateConfigsetDialog.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/CreateConfigsetDialog.ktnew file mode 100644index 00000000000..f6a6426baa6--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/CreateConfigsetDialog.kt@@ -0,0 +1,110 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.views.configsets++import androidx.compose.foundation.layout.Arrangement+import androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.fillMaxWidth+import androidx.compose.foundation.layout.height+import androidx.compose.foundation.layout.padding+import androidx.compose.material3.MaterialTheme+import androidx.compose.material3.OutlinedTextField+import androidx.compose.material3.Text+import androidx.compose.runtime.Composable+import androidx.compose.runtime.collectAsState+import androidx.compose.runtime.getValue+import androidx.compose.ui.Alignment+import androidx.compose.ui.Modifier+import androidx.compose.ui.platform.testTag+import androidx.compose.ui.unit.dp+import androidx.compose.ui.window.Dialog+import org.apache.solr.ui.components.configsets.viewmodel.CreateConfigsetViewModel+import org.apache.solr.ui.generated.resources.Res+import org.apache.solr.ui.generated.resources.action_cancel+import org.apache.solr.ui.generated.resources.action_create_configset+import org.apache.solr.ui.generated.resources.action_import_configset+import org.apache.solr.ui.generated.resources.label_configset_name+import org.apache.solr.ui.generated.resources.title_create_configset+import org.apache.solr.ui.views.components.SolrButton+import org.apache.solr.ui.views.components.SolrCard+import org.apache.solr.ui.views.components.SolrTextButton+import org.jetbrains.compose.resources.stringResource++@Composable+fun CreateConfigsetDialog(+ viewModel: CreateConfigsetViewModel,+ modifier: Modifier = Modifier,+) = Dialog(onDismissRequest = viewModel::abortCreation) {+ val state by viewModel.uiState.collectAsState()+ val configsetsState by viewModel.configsetsUiState.collectAsState()++ SolrCard(+ modifier = modifier,+ verticalArrangement = Arrangement.spacedBy(16.dp),+ ) {+ Text(+ text = stringResource(Res.string.title_create_configset),+ style = MaterialTheme.typography.headlineSmall,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ )+ Row(+ horizontalArrangement = Arrangement.spacedBy(16.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ OutlinedTextField(+ modifier = Modifier.weight(1f)+ .height(64.dp)+ .testTag("create_configset_name_field"),+ value = state.configsetName,+ onValueChange = viewModel::changeConfigsetName,+ label = { Text(stringResource(Res.string.label_configset_name)) },+ singleLine = true,+ )+ ConfigsetsDropdown(+ modifier = Modifier.weight(1f),+ selectedConfigset = configsetsState.selectedConfigset,+ selectConfigset = viewModel::changeBaseConfigset,+ configsets = configsetsState.configsets,+ enableReset = true,+ )+ }++ Row(+ modifier = Modifier.padding(top = 16.dp).fillMaxWidth(),+ horizontalArrangement = Arrangement.SpaceBetween,+ ) {+ // Dialog actions+ SolrTextButton(onClick = viewModel::toggleInput) {+ Text(stringResource(Res.string.action_import_configset))+ }++ Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {+ SolrTextButton(onClick = viewModel::abortCreation) {+ Text(stringResource(Res.string.action_cancel))+ }+ SolrButton(+ modifier = Modifier.testTag("configset_create_button"),+ onClick = viewModel::createConfigset,+ enabled = state.configsetName.isNotBlank(),+ ) {+ Text(stringResource(Res.string.action_create_configset))+ }+ }+ }+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ImportConfigsetDialog.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ImportConfigsetDialog.ktnew file mode 100644index 00000000000..696a073889c--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/configsets/ImportConfigsetDialog.kt@@ -0,0 +1,115 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.views.configsets++import androidx.compose.foundation.layout.Arrangement+import androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.fillMaxWidth+import androidx.compose.foundation.layout.padding+import androidx.compose.material3.MaterialTheme+import androidx.compose.material3.OutlinedTextField+import androidx.compose.material3.Text+import androidx.compose.runtime.Composable+import androidx.compose.runtime.collectAsState+import androidx.compose.runtime.getValue+import androidx.compose.ui.Alignment+import androidx.compose.ui.Modifier+import androidx.compose.ui.platform.testTag+import androidx.compose.ui.unit.dp+import androidx.compose.ui.window.Dialog+import org.apache.solr.ui.components.configsets.viewmodel.ImportConfigsetViewModel+import org.apache.solr.ui.generated.resources.Res+import org.apache.solr.ui.generated.resources.action_cancel+import org.apache.solr.ui.generated.resources.action_create_configset+import org.apache.solr.ui.generated.resources.action_import_configset+import org.apache.solr.ui.generated.resources.label_configset_name+import org.apache.solr.ui.generated.resources.label_select_configset_file+import org.apache.solr.ui.generated.resources.title_import_configset+import org.apache.solr.ui.views.components.SolrButton+import org.apache.solr.ui.views.components.SolrCard+import org.apache.solr.ui.views.components.SolrTextButton+import org.apache.solr.ui.views.files.FileSelector+import org.jetbrains.compose.resources.stringResource++@Composable+fun ImportConfigsetDialog(+ viewModel: ImportConfigsetViewModel,+ modifier: Modifier = Modifier,+) = Dialog(onDismissRequest = viewModel::abortImport) {+ val model by viewModel.uiState.collectAsState()+ val fileSelectorModel by viewModel.fileSelectorUiState.collectAsState()++ SolrCard(+ modifier = modifier,+ verticalArrangement = Arrangement.spacedBy(16.dp),+ ) {+ Text(+ text = stringResource(Res.string.title_import_configset),+ style = MaterialTheme.typography.headlineSmall,+ color = MaterialTheme.colorScheme.onSurfaceVariant,+ )+ Row(+ modifier = Modifier.fillMaxWidth(),+ horizontalArrangement = Arrangement.spacedBy(16.dp),+ verticalAlignment = Alignment.CenterVertically,+ ) {+ FileSelector(+ modifier = Modifier.weight(1f).testTag("import_configset_file_field"),+ file = fileSelectorModel.file,+ onSelectFile = viewModel::selectFile,+ onClearSelection = viewModel::clearFile,+ label = stringResource(Res.string.label_select_configset_file),+ selectFileText = stringResource(Res.string.label_select_configset_file),+ )+ OutlinedTextField(+ modifier = Modifier.weight(1f).testTag("import_configset_name_field"),+ value = model.configsetName,+ onValueChange = viewModel::changeConfigsetName,+ label = { Text(stringResource(Res.string.label_configset_name)) },+ singleLine = true,+ )+ }++ val canImportConfigset = fileSelectorModel.file != null &&+ model.configsetName.isNotBlank() &&+ !model.isLoading++ Row(+ modifier = Modifier.padding(top = 16.dp).fillMaxWidth(),+ horizontalArrangement = Arrangement.SpaceBetween,+ ) {+ // Dialog actions+ SolrTextButton(onClick = viewModel::toggleInput) {+ Text(stringResource(Res.string.action_create_configset))+ }++ Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {+ SolrTextButton(onClick = viewModel::abortImport) {+ Text(stringResource(Res.string.action_cancel))+ }+ SolrButton(+ modifier = Modifier.testTag("configset_import_button"),+ onClick = viewModel::importConfigset,+ enabled = canImportConfigset,+ ) {+ Text(stringResource(Res.string.action_import_configset))+ }+ }+ }+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/files/FileSelector.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/files/FileSelector.ktnew file mode 100644index 00000000000..4f18f09cfca--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/files/FileSelector.kt@@ -0,0 +1,76 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.views.files++import androidx.compose.foundation.layout.Spacer+import androidx.compose.foundation.layout.width+import androidx.compose.material3.Icon+import androidx.compose.material3.IconButton+import androidx.compose.material3.OutlinedTextField+import androidx.compose.material3.Text+import androidx.compose.runtime.Composable+import androidx.compose.ui.Modifier+import androidx.compose.ui.platform.testTag+import androidx.compose.ui.unit.dp+import org.apache.solr.ui.domain.PickedFile+import org.apache.solr.ui.generated.resources.Res+import org.apache.solr.ui.generated.resources.cd_clear_field+import org.apache.solr.ui.generated.resources.close+import org.apache.solr.ui.generated.resources.upload+import org.apache.solr.ui.views.components.SolrTextButton+import org.jetbrains.compose.resources.painterResource+import org.jetbrains.compose.resources.stringResource++@Composable+fun FileSelector(+ file: PickedFile?,+ onSelectFile: () -> Unit,+ onClearSelection: () -> Unit,+ label: String,+ selectFileText: String,+ modifier: Modifier = Modifier,+) {+ if (file != null) {+ OutlinedTextField(+ modifier = modifier,+ value = file.name,+ label = { Text(label) },+ onValueChange = {},+ readOnly = true,+ singleLine = true,+ leadingIcon = { FileTypeIcon(file.extension ?: "") },+ trailingIcon = {+ IconButton(+ modifier = Modifier.testTag("file_selector_clear_button"),+ onClick = onClearSelection,+ ) {+ Icon(+ painter = painterResource(Res.drawable.close),+ contentDescription = stringResource(Res.string.cd_clear_field),+ )+ }+ },+ )+ } else {+ SolrTextButton(modifier = modifier, onClick = onSelectFile) {+ Icon(painter = painterResource(Res.drawable.upload), contentDescription = null)+ Spacer(modifier = Modifier.width(8.dp))+ Text(text = selectFileText)+ }+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/files/FileTypeIcon.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/files/FileTypeIcon.ktnew file mode 100644index 00000000000..f394702842f--- /dev/null+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/files/FileTypeIcon.kt@@ -0,0 +1,41 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.views.files++import androidx.compose.material3.Icon+import androidx.compose.runtime.Composable+import androidx.compose.ui.Modifier+import org.apache.solr.ui.generated.resources.Res+import org.apache.solr.ui.generated.resources.draft+import org.apache.solr.ui.generated.resources.folder_zip+import org.jetbrains.compose.resources.painterResource++@Composable+fun FileTypeIcon(+ fileType: String,+ modifier: Modifier = Modifier,+) = Icon(+ modifier = modifier,+ painter = painterResource(+ when (fileType) {+ "zip", "rar", "gz", "7z" -> Res.drawable.folder_zip+ else -> Res.drawable.draft+ },+ ),+ contentDescription = null,+)diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/main/MainContent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/main/MainContent.ktindex 3fe2ccc8765..b6f88e3b7ce 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/main/MainContent.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/main/MainContent.kt@@ -33,7 +33,7 @@ import com.arkivanov.decompose.extensions.compose.subscribeAsStateimport org.apache.solr.ui.components.main.MainComponentimport org.apache.solr.ui.components.main.integration.asMainMenuimport org.apache.solr.ui.views.cluster.ClusterContent-import org.apache.solr.ui.views.configsets.ConfigsetsContent+import org.apache.solr.ui.views.configsets.ConfigsetsSceneimport org.apache.solr.ui.views.environment.EnvironmentContentimport org.apache.solr.ui.views.logging.LoggingContentimport org.apache.solr.ui.views.navigation.NavigationSideBar@@ -71,7 +71,7 @@ fun MainContent(.verticalScroll(scrollState),)- is MainComponent.Child.Configsets -> ConfigsetsContent(+ is MainComponent.Child.Configsets -> ConfigsetsScene(component = child.component,modifier = Modifier.fillMaxWidth().verticalScroll(scrollState),diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationTabs.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationTabs.ktindex 798e1794939..18ab7a76e49 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationTabs.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationTabs.kt@@ -17,7 +17,7 @@package org.apache.solr.ui.views.navigation-import androidx.compose.material3.ScrollableTabRow+import androidx.compose.material3.PrimaryScrollableTabRowimport androidx.compose.material3.Tabimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable@@ -49,10 +49,10 @@ fun <T : Enum<T>, C : Any> NavigationTabs() {val slot by component.tabSlot.subscribeAsState()- val currentTab = slot.child?.configuration?.tab+ val currentTab = slot.child?.configurationval currentTabIndex = currentTab?.ordinal ?: 0- ScrollableTabRow(+ PrimaryScrollableTabRow(modifier = modifier,selectedTabIndex = currentTabIndex,edgePadding = 16.dp,@@ -74,3 +74,36 @@ fun <T : Enum<T>, C : Any> NavigationTabs(}}}++@Composable+fun <T : Enum<T>> NavigationTabs(+ tabs: EnumEntries<T>,+ selectedTab: T,+ onSelectTab: (T) -> Unit,+ mapper: (T) -> StringResource,+ modifier: Modifier = Modifier,+) {+ val currentTabIndex = selectedTab.ordinal ?: 0++ PrimaryScrollableTabRow(+ modifier = modifier,+ selectedTabIndex = currentTabIndex,+ edgePadding = 16.dp,+ ) {+ tabs.forEach { tab ->+ val selected = selectedTab == tab++ Tab(+ selected = selected,+ onClick = { onSelectTab(tab) },+ text = {+ Text(+ text = stringResource(mapper(tab)),+ maxLines = 1,+ overflow = TextOverflow.Ellipsis,+ )+ },+ )+ }+ }+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/start/StartContent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/start/StartContent.ktindex 8c593171a43..eeb2c87d735 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/start/StartContent.kt+++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/start/StartContent.kt@@ -48,6 +48,7 @@ import org.apache.solr.ui.utils.defaultSolrUrlimport org.apache.solr.ui.views.components.SolrButtonimport org.apache.solr.ui.views.components.SolrCardimport org.apache.solr.ui.views.components.SolrLinearProgressIndicator+import org.apache.solr.ui.views.components.SolrOutlinedTextFieldimport org.jetbrains.compose.resources.painterResourceimport org.jetbrains.compose.resources.stringResource@@ -96,7 +97,7 @@ fun StartContent(style = MaterialTheme.typography.bodyMedium,)- OutlinedTextField(+ SolrOutlinedTextField(modifier = Modifier.fillMaxWidth().testTag("solr_url_input"),value = model.url,singleLine = true,diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/TestDispatchers.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/TestDispatchers.ktnew file mode 100644index 00000000000..6cef4697c77--- /dev/null+++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/TestDispatchers.kt@@ -0,0 +1,23 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui++import kotlinx.coroutines.CoroutineDispatcher+import org.apache.solr.ui.utils.AppDispatchers++class TestDispatchers(override val io: CoroutineDispatcher) : AppDispatchersdiff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/configsets/DefaultConfigsetsComponentIntegrationTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/configsets/DefaultConfigsetsComponentIntegrationTest.ktdeleted file mode 100644index c6581f4d020..00000000000--- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/configsets/DefaultConfigsetsComponentIntegrationTest.kt+++ /dev/null@@ -1,135 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.ui.components.configsets--import com.arkivanov.essenty.lifecycle.LifecycleRegistry-import com.arkivanov.essenty.lifecycle.resume-import com.arkivanov.mvikotlin.core.store.StoreFactory-import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory-import io.ktor.client.HttpClient-import io.ktor.client.engine.mock.MockRequestHandleScope-import io.ktor.client.engine.mock.MockRequestHandler-import io.ktor.client.engine.mock.respond-import io.ktor.client.request.HttpRequestData-import io.ktor.http.ContentType-import io.ktor.http.HttpHeaders-import io.ktor.http.HttpStatusCode-import io.ktor.http.headersOf-import kotlin.test.Test-import kotlin.test.assertContains-import kotlin.test.assertContentEquals-import kotlin.test.assertEquals-import kotlinx.coroutines.ExperimentalCoroutinesApi-import kotlinx.coroutines.test.TestCoroutineScheduler-import kotlinx.coroutines.test.TestScope-import kotlinx.coroutines.test.advanceUntilIdle-import kotlinx.coroutines.test.runTest-import kotlinx.serialization.json.Json-import org.apache.solr.ui.TestAppComponentContext-import org.apache.solr.ui.components.configsets.data.ListConfigsets-import org.apache.solr.ui.components.configsets.integration.DefaultConfigsetsComponent-import org.apache.solr.ui.components.start.integration.DefaultStartComponent-import org.apache.solr.ui.createMockEngine-import org.apache.solr.ui.domain.Configset-import org.apache.solr.ui.testHttpClient-import org.apache.solr.ui.utils.AppComponentContext--@OptIn(ExperimentalCoroutinesApi::class)-class DefaultConfigsetsComponentIntegrationTest {-- private val configset1 = "_default"- private val configset2 = "techproducts"- private val configset3 = "getting_started"- private val configSets = listOf(configset1, configset2, configset3)-- /**- * Request handler that returns a list of configsets- */- private val configsetsResponseHandler: MockRequestHandler = { scope: MockRequestHandleScope, data: HttpRequestData ->- val content = ListConfigsets(configSets)- scope.respond(- content = Json.encodeToString(value = content),- status = HttpStatusCode.OK,- headers = headersOf(- name = HttpHeaders.ContentType,- value = ContentType.Application.Json.toString(),- ),- )- }-- @Test- fun `GIVEN configsets WHEN initialized THEN configsets fetched`() = runTest {- val engine = createMockEngine(configsetsResponseHandler)- val component = createComponent(httpClient = testHttpClient(engine))- advanceUntilIdle()-- component.model.value.configsets.forEach { configset ->- assertContains(- iterable = configSets,- element = configset.name,- )- }- }-- @Test- fun `GIVEN configsets WHEN configsets fetched THEN configsets sorted`() = runTest {- val engine = createMockEngine(configsetsResponseHandler)- val component = createComponent(httpClient = testHttpClient(engine))- advanceUntilIdle()-- assertContentEquals(- expected = configSets.sorted(),- actual = component.model.value.configsets.map(Configset::name),- )- }-- @Test- fun `GIVEN configsets WHEN configset selected THEN selectedConfigset updated`() = runTest {- val engine = createMockEngine(configsetsResponseHandler)- val component = createComponent(httpClient = testHttpClient(engine))- advanceUntilIdle()-- component.onSelectConfigset(name = configset2)- advanceUntilIdle()-- assertEquals(- expected = configset2,- actual = component.model.value.selectedConfigset,- )- }-- /**- * Helper function for creating an instance of the [DefaultStartComponent].- */- private fun TestScope.createComponent(- componentContext: AppComponentContext = TestAppComponentContext(scheduler = testScheduler),- storeFactory: StoreFactory = DefaultStoreFactory(),- httpClient: HttpClient = HttpClient(),- ): ConfigsetsComponent {- val lifecycle = LifecycleRegistry()-- val component = DefaultConfigsetsComponent(- componentContext = componentContext,- storeFactory = storeFactory,- httpClient = httpClient,- )-- lifecycle.resume()- return component- }-}diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsStateHolderTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsStateHolderTest.ktnew file mode 100644index 00000000000..190fe949f1d--- /dev/null+++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/configsets/viewmodel/ConfigsetsStateHolderTest.kt@@ -0,0 +1,93 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.components.configsets.viewmodel++import kotlin.test.Test+import kotlin.test.assertContains+import kotlin.test.assertContentEquals+import kotlin.test.assertEquals+import kotlinx.coroutines.ExperimentalCoroutinesApi+import kotlinx.coroutines.test.UnconfinedTestDispatcher+import kotlinx.coroutines.test.advanceUntilIdle+import kotlinx.coroutines.test.runTest+import org.apache.solr.ui.TestDispatchers+import org.apache.solr.ui.components.configsets.domain.LoadConfigsetsUseCase+import org.apache.solr.ui.domain.Configset++@OptIn(ExperimentalCoroutinesApi::class)+class ConfigsetsStateHolderTest {++ private val configset1 = "_default"+ private val configset2 = "techproducts"+ private val configset3 = "getting_started"+ private val configsets = listOf(configset1, configset2, configset3)++ @Test+ fun `GIVEN configsets WHEN initialized THEN configsets fetched`() = runTest {+ val stateHolder = ConfigsetsStateHolder(+ scope = this,+ loadConfigsetsUseCase = getLoadConfigsetsUseCase(configsets),+ dispatchers = TestDispatchers(UnconfinedTestDispatcher(scheduler = testScheduler)),+ )+ advanceUntilIdle()++ stateHolder.uiState.value.configsets.forEach { configset ->+ assertContains(+ iterable = configsets,+ element = configset.name,+ )+ }+ }++ @Test+ fun `GIVEN configsets WHEN configsets fetched THEN configsets sorted`() = runTest {+ val stateHolder = ConfigsetsStateHolder(+ scope = this,+ loadConfigsetsUseCase = getLoadConfigsetsUseCase(configsets),+ dispatchers = TestDispatchers(UnconfinedTestDispatcher(scheduler = testScheduler)),+ )+ advanceUntilIdle()++ assertContentEquals(+ expected = configsets.sorted(),+ actual = stateHolder.uiState.value.configsets.map(Configset::name),+ )+ }++ @Test+ fun `GIVEN configsets WHEN configset selected THEN selectedConfigset updated`() = runTest {+ val stateHolder = ConfigsetsStateHolder(+ scope = this,+ loadConfigsetsUseCase = getLoadConfigsetsUseCase(configsets),+ dispatchers = TestDispatchers(UnconfinedTestDispatcher(scheduler = testScheduler)),+ )+ advanceUntilIdle()++ stateHolder.selectConfigset(configset = configset2)+ advanceUntilIdle()++ assertEquals(+ expected = configset2,+ actual = stateHolder.uiState.value.selectedConfigset,+ )+ }++ private fun getLoadConfigsetsUseCase(configsets: List<String>) = object : LoadConfigsetsUseCase {+ override suspend fun invoke(): Result<List<Configset>> = Result.success(configsets.map { Configset(name = it) })+ }+}diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/navigation/DefaultTabNavigationComponentIntegrationTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/navigation/DefaultTabNavigationComponentIntegrationTest.ktdeleted file mode 100644index 43c0a46b6ce..00000000000--- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/navigation/DefaultTabNavigationComponentIntegrationTest.kt+++ /dev/null@@ -1,139 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.ui.components.navigation--import com.arkivanov.decompose.router.slot.child-import com.arkivanov.essenty.lifecycle.Lifecycle-import com.arkivanov.essenty.lifecycle.LifecycleRegistry-import com.arkivanov.essenty.lifecycle.create-import com.arkivanov.essenty.lifecycle.resume-import kotlin.test.Test-import kotlin.test.assertEquals-import kotlin.test.assertNotNull-import kotlin.test.assertTrue-import kotlin.test.fail-import kotlinx.coroutines.ExperimentalCoroutinesApi-import kotlinx.coroutines.test.TestScope-import kotlinx.coroutines.test.advanceUntilIdle-import kotlinx.coroutines.test.runTest-import kotlinx.serialization.KSerializer-import kotlinx.serialization.Serializable-import kotlinx.serialization.builtins.serializer-import org.apache.solr.ui.TestAppComponentContext-import org.apache.solr.ui.components.navigation.TabNavigationComponent.Configuration-import org.apache.solr.ui.components.navigation.integration.DefaultTabNavigationComponent-import org.apache.solr.ui.components.start.integration.DefaultStartComponent-import org.apache.solr.ui.utils.AppComponentContext--@OptIn(ExperimentalCoroutinesApi::class)-class DefaultTabNavigationComponentIntegrationTest {-- @Serializable- private enum class TestNavigationTab {- Tab1,- Tab2,- }-- private data class TabChild(- val configuration: Configuration<TestNavigationTab>,- val context: AppComponentContext? = null,- )-- @Test- fun `GIVEN initial tab WHEN initialized THEN childFactory called with initial tab`() = runTest {- val initialTab = TestNavigationTab.Tab1- var called = false- val component = createComponent(- initialTab = initialTab,- tabSerializer = TestNavigationTab.serializer(),- childFactory = { configuration, context ->- called = true- TabChild(configuration, context)- },- )-- advanceUntilIdle()- assertNotNull(actual = component.tabSlot.child?.instance)- assertEquals(- expected = TestNavigationTab.Tab1,- actual = component.tabSlot.child?.configuration?.tab,- )- assertTrue(actual = called, message = "child factory never called")- }-- @Test- fun `GIVEN a selection WHEN navigate to other tab THEN other tab selected`() = runTest {- val expectedTab = TestNavigationTab.Tab2- val component = createComponent(- initialTab = TestNavigationTab.Tab1,- tabSerializer = TestNavigationTab.serializer(),- childFactory = { configuration, context -> TabChild(configuration, context) },- )- advanceUntilIdle()-- component.onNavigate(expectedTab)- advanceUntilIdle()-- assertEquals(- expected = expectedTab,- actual = component.tabSlot.child?.configuration?.tab,- )- }-- @Test- fun `GIVEN a selection WHEN navigate to same tab THEN childFactory not called again`() = runTest {- val initialTab = TestNavigationTab.Tab1- var called = false- val component = createComponent(- initialTab = initialTab,- tabSerializer = TestNavigationTab.serializer(),- childFactory = { configuration, context ->- if (!called) {- called = true- } else {- fail("Should not be called twice")- }- TabChild(configuration, context)- },- )-- component.onNavigate(initialTab)- advanceUntilIdle()- }-- /**- * Helper function for creating an instance of the [DefaultStartComponent].- */- private fun <T : Enum<T>, C : Any> TestScope.createComponent(- componentContext: AppComponentContext = TestAppComponentContext(scheduler = testScheduler),- lifecycle: LifecycleRegistry = LifecycleRegistry(),- initialTab: T,- tabSerializer: KSerializer<T>,- childFactory: (Configuration<T>, AppComponentContext) -> C,- ): TabNavigationComponent<T, C> {- val component = DefaultTabNavigationComponent(- componentContext = componentContext,- tabSerializer = tabSerializer,- initialTab = initialTab,- childFactory = childFactory,- )-- lifecycle.resume()- return component- }-}diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsContentTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsContentTest.ktdeleted file mode 100644index 821f08a5ad2..00000000000--- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsContentTest.kt+++ /dev/null@@ -1,105 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */-package org.apache.solr.ui.views.configsets--import androidx.compose.ui.test.ExperimentalTestApi-import androidx.compose.ui.test.onNodeWithTag-import androidx.compose.ui.test.performClick-import androidx.compose.ui.test.runComposeUiTest-import com.arkivanov.decompose.Child-import com.arkivanov.decompose.router.slot.ChildSlot-import com.arkivanov.decompose.value.MutableValue-import com.arkivanov.decompose.value.Value-import kotlin.test.Ignore-import kotlin.test.Test-import kotlin.test.assertEquals-import kotlinx.coroutines.flow.MutableStateFlow-import kotlinx.coroutines.flow.StateFlow-import org.apache.solr.ui.components.configsets.ConfigsetsComponent-import org.apache.solr.ui.components.configsets.ConfigsetsComponent.Model-import org.apache.solr.ui.components.configsets.overview.ConfigsetsOverviewComponent-import org.apache.solr.ui.components.navigation.TabNavigationComponent.Configuration-import org.apache.solr.ui.domain.Configset-import org.apache.solr.ui.views.navigation.configsets.ConfigsetsTab--@OptIn(ExperimentalTestApi::class)-class ConfigsetsContentTest {-- @Test- @Ignore // See why the placeholder text is not shown- fun `GIVEN no configsets THEN no_configsets_placeholder is shown`() = runComposeUiTest {- val component = TestConfigsetsComponent()-- setContent { ConfigsetsContent(component = component) }-- // Placeholder text from the TextField- onNodeWithTag(testTag = "no_configsets_placeholder").assertExists()- }-- @Test- fun `GIVEN configsets WHEN a configset selected THEN onSelectConfigset called with configset`() = runComposeUiTest {- val selectedConfigset = "gettingstarted"- val expectedConfigsetSelection = "techproducts"- val component = TestConfigsetsComponent(- model = Model(- configsets = listOf(selectedConfigset, expectedConfigsetSelection)- .map { Configset(it) },- selectedConfigset = selectedConfigset,- ),- )-- setContent { ConfigsetsContent(component = component) }-- // Expand menu and select expected configset- onNodeWithTag(testTag = "configsets_dropdown").performClick()- onNodeWithTag(testTag = expectedConfigsetSelection).performClick()-- waitForIdle()- assertEquals(- expected = expectedConfigsetSelection,- actual = component.onSelectConfigset,- )- }-}--class TestConfigsetsComponent(- model: Model = Model(),-) : ConfigsetsComponent {-- var onSelectConfigset: String? = model.selectedConfigset- override val model: StateFlow<Model> = MutableStateFlow(model)-- private val overviewChild =- ConfigsetsComponent.Child.Overview(object : ConfigsetsOverviewComponent {})-- override val tabSlot: Value<ChildSlot<Configuration<ConfigsetsTab>, ConfigsetsComponent.Child>> = MutableValue(- ChildSlot(- Child.Created(- configuration = Configuration(tab = ConfigsetsTab.Overview),- instance = overviewChild,- ),- ),- )-- override fun onNavigate(tab: ConfigsetsTab) {- // Tested in TabNavigationTest (no need to test here)- }-- override fun onSelectConfigset(name: String) {- onSelectConfigset = name- }-}diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdownMenuTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdownTest.ktsimilarity index 84%rename from solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdownMenuTest.ktrename to solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdownTest.ktindex 81e1746e3ad..ca275943c22 100644--- a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdownMenuTest.kt+++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ConfigsetsDropdownTest.kt@@ -24,19 +24,18 @@ import androidx.compose.ui.test.onNodeWithTagimport androidx.compose.ui.test.performClickimport androidx.compose.ui.test.runComposeUiTestimport kotlin.test.Test-import org.apache.solr.ui.components.configsets.ConfigsetsComponent.Modelimport org.apache.solr.ui.domain.Configset@OptIn(ExperimentalTestApi::class)-class ConfigsetsDropdownMenuTest {+class ConfigsetsDropdownTest {@Testfun `GIVEN empty availableConfigsets WHEN dropdown clicked THEN not expanded`() = runComposeUiTest {setContent {ConfigsetsDropdown(selectConfigset = {},- availableConfigsets = emptyList(),- selectedConfigSet = "",+ configsets = emptyList(),+ selectedConfigset = "",)}@@ -50,8 +49,8 @@ class ConfigsetsDropdownMenuTest {setContent {ConfigsetsDropdown(selectConfigset = {},- availableConfigsets = emptyList(),- selectedConfigSet = "",+ configsets = emptyList(),+ selectedConfigset = "",)}@@ -62,15 +61,15 @@ class ConfigsetsDropdownMenuTest {@Testfun `GIVEN configsets WHEN clicking dropdown THEN dropdown expands`() = runComposeUiTest {val selectedConfigset = "gettingstarted"- val component = TestConfigsetsComponent(- model = Model(++ setContent {+ ConfigsetsDropdown(+ selectConfigset = {},configsets = listOf(selectedConfigset, "techproducts").map { Configset(it) },selectedConfigset = selectedConfigset,- ),- )-- setContent { ConfigsetsContent(component = component) }+ )+ }onNodeWithTag(testTag = "configsets_dropdown").performClick()onNodeWithTag(testTag = "configsets_exposed_dropdown_menu").isDisplayed()diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/CreateConfigsetDialogTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/CreateConfigsetDialogTest.ktnew file mode 100644index 00000000000..a3d7868eb9a--- /dev/null+++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/CreateConfigsetDialogTest.kt@@ -0,0 +1,83 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.views.configsets++import androidx.compose.ui.test.ExperimentalTestApi+import androidx.compose.ui.test.assertIsEnabled+import androidx.compose.ui.test.assertIsNotEnabled+import androidx.compose.ui.test.onNodeWithTag+import androidx.compose.ui.test.performTextClearance+import androidx.compose.ui.test.performTextInput+import androidx.compose.ui.test.runComposeUiTest+import kotlin.test.Test+import kotlinx.coroutines.ExperimentalCoroutinesApi+import kotlinx.coroutines.test.UnconfinedTestDispatcher+import org.apache.solr.ui.TestDispatchers+import org.apache.solr.ui.components.configsets.domain.CreateConfigsetResult+import org.apache.solr.ui.components.configsets.domain.CreateConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.LoadConfigsetsUseCase+import org.apache.solr.ui.components.configsets.viewmodel.CreateConfigsetViewModel+import org.apache.solr.ui.domain.Configset++@OptIn(ExperimentalTestApi::class, ExperimentalCoroutinesApi::class)+class CreateConfigsetDialogTest {+ @Test+ fun `WHEN configset name typed THEN creation button enabled`() = runComposeUiTest {+ setContent {+ CreateConfigsetDialog(viewModel())+ }++ val configsetTextField = onNodeWithTag(testTag = "create_configset_name_field")+ configsetTextField.performTextInput("testconfigset")++ onNodeWithTag(testTag = "configset_create_button").assertIsEnabled()+ }++ @Test+ fun `GIVEN configset name WHEN clearing configset name THEN creation button disabled`() = runComposeUiTest {+ setContent {+ CreateConfigsetDialog(viewModel())+ }++ val configsetTextField = onNodeWithTag(testTag = "create_configset_name_field")+ configsetTextField.performTextInput("testconfigset")++ configsetTextField.performTextClearance()++ onNodeWithTag(testTag = "configset_create_button").assertIsNotEnabled()+ }++ private fun viewModel() = CreateConfigsetViewModel(+ createConfigsetUseCase = SuccessCreateConfigsetUseCase,+ loadConfigsetsUseCase = SuccessLoadConfigsetsUseCase(),+ dispatchers = TestDispatchers(io = UnconfinedTestDispatcher()),+ )+}++private object SuccessCreateConfigsetUseCase : CreateConfigsetUseCase {+ override suspend fun invoke(+ configsetName: String,+ baseConfigset: String?,+ ): CreateConfigsetResult = CreateConfigsetResult.Success(Configset(name = configsetName))+}++private class SuccessLoadConfigsetsUseCase(+ private val configsets: List<Configset> = emptyList(),+) : LoadConfigsetsUseCase {+ override suspend fun invoke(): Result<List<Configset>> = Result.success(configsets)+}diff --git a/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ImportConfigsetDialogTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ImportConfigsetDialogTest.ktnew file mode 100644index 00000000000..1f064f31876--- /dev/null+++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/views/configsets/ImportConfigsetDialogTest.kt@@ -0,0 +1,116 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.views.configsets++import androidx.compose.ui.test.ExperimentalTestApi+import androidx.compose.ui.test.assertIsEnabled+import androidx.compose.ui.test.assertIsNotEnabled+import androidx.compose.ui.test.assertTextContains+import androidx.compose.ui.test.onNodeWithTag+import androidx.compose.ui.test.performClick+import androidx.compose.ui.test.performTextClearance+import androidx.compose.ui.test.runComposeUiTest+import kotlin.test.Test+import kotlinx.coroutines.ExperimentalCoroutinesApi+import kotlinx.coroutines.test.UnconfinedTestDispatcher+import org.apache.solr.ui.TestDispatchers+import org.apache.solr.ui.components.configsets.domain.ImportConfigsetResult+import org.apache.solr.ui.components.configsets.domain.ImportConfigsetUseCase+import org.apache.solr.ui.components.configsets.viewmodel.ImportConfigsetViewModel+import org.apache.solr.ui.components.files.domain.SelectFileResult+import org.apache.solr.ui.components.files.domain.SelectFileUseCase+import org.apache.solr.ui.domain.Configset+import org.apache.solr.ui.domain.PickedFile++@OptIn(ExperimentalTestApi::class, ExperimentalCoroutinesApi::class)+class ImportConfigsetDialogTest {+ val expectedConfigsetName = "testconfigset"+ val fileName = "${expectedConfigsetName}_configset.zip"+ val file = PickedFile(name = fileName, bytes = byteArrayOf(), extension = "zip")++ @Test+ fun `WHEN configset file selected THEN import button enabled`() = runComposeUiTest {+ setContent {+ val viewModel = viewModel(file)+ ImportConfigsetDialog(viewModel)+ viewModel.selectFile()+ }++ onNodeWithTag(testTag = "configset_import_button").assertIsEnabled()+ }++ @Test+ fun `WHEN configset file selected THEN configset name autofilled with modified file name`() = runComposeUiTest {+ setContent {+ val viewModel = viewModel(file)+ ImportConfigsetDialog(viewModel)+ viewModel.selectFile()+ }++ onNodeWithTag(testTag = "import_configset_name_field")+ .assertTextContains(expectedConfigsetName)+ }++ @Test+ fun `GIVEN configset file selected WHEN clearing configset file THEN import button disabled`() = runComposeUiTest {+ setContent {+ val viewModel = viewModel(file)+ ImportConfigsetDialog(viewModel)+ viewModel.selectFile()+ }++ val configsetClearButton = onNodeWithTag(testTag = "file_selector_clear_button")+ configsetClearButton.performClick()++ onNodeWithTag(testTag = "configset_import_button").assertIsNotEnabled()+ }++ @Test+ fun `GIVEN configset file selected WHEN clearing configset name THEN import button disabled`() = runComposeUiTest {+ setContent {+ val viewModel = viewModel(file)+ ImportConfigsetDialog(viewModel)+ viewModel.selectFile()+ }++ val configsetTextField = onNodeWithTag(testTag = "import_configset_name_field")+ configsetTextField.performTextClearance()++ onNodeWithTag(testTag = "configset_import_button").assertIsNotEnabled()+ }++ private fun viewModel(file: PickedFile) = ImportConfigsetViewModel(+ importConfigsetUseCase = SuccessImportConfigsetUseCase,+ selectFileUseCase = SuccessSelectFileUseCase(file),+ dispatchers = TestDispatchers(io = UnconfinedTestDispatcher()),+ )+}++private object SuccessImportConfigsetUseCase : ImportConfigsetUseCase {+ override suspend fun invoke(+ configsetName: String,+ file: PickedFile,+ ): ImportConfigsetResult = ImportConfigsetResult.Success(Configset(name = configsetName))+}++private class SuccessSelectFileUseCase(private val file: PickedFile) : SelectFileUseCase {+ override suspend fun invoke(+ extensions: List<String>,+ maxSize: Int?,+ ): SelectFileResult = SelectFileResult.Success(file)+}diff --git a/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/Main.kt b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/Main.ktindex 3ec26906a8a..dc59bc2886c 100644--- a/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/Main.kt+++ b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/Main.kt@@ -17,7 +17,6 @@package org.apache.solr.ui-import androidx.compose.foundation.isSystemInDarkThemeimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.material3.Surfaceimport androidx.compose.ui.Modifierdiff --git a/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/preview/configsets/PreviewConfigsetsContent.kt b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/preview/configsets/PreviewConfigsetsContent.ktindex 36cbac37eba..4b6f07ecb5d 100644--- a/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/preview/configsets/PreviewConfigsetsContent.kt+++ b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/preview/configsets/PreviewConfigsetsContent.kt@@ -19,57 +19,84 @@ package org.apache.solr.ui.preview.configsetsimport androidx.compose.runtime.Composableimport androidx.compose.ui.tooling.preview.Preview-import com.arkivanov.decompose.Child-import com.arkivanov.decompose.router.slot.ChildSlot-import com.arkivanov.decompose.value.MutableValue-import com.arkivanov.decompose.value.Value-import kotlinx.coroutines.flow.MutableStateFlow-import kotlinx.coroutines.flow.StateFlow-import org.apache.solr.ui.components.configsets.ConfigsetsComponent-import org.apache.solr.ui.components.configsets.ConfigsetsComponent.Model-import org.apache.solr.ui.components.configsets.overview.ConfigsetsOverviewComponent-import org.apache.solr.ui.components.navigation.TabNavigationComponent.Configuration+import kotlinx.coroutines.Dispatchers+import org.apache.solr.ui.components.configsets.di.ConfigsetsComponent+import org.apache.solr.ui.components.configsets.di.ConfigsetsOverviewComponent+import org.apache.solr.ui.components.configsets.domain.CreateConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.ImportConfigsetUseCase+import org.apache.solr.ui.components.configsets.domain.LoadConfigsetsUseCase+import org.apache.solr.ui.components.configsets.repository.ConfigsetsRepository+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsOverviewViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsRouteViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ConfigsetsViewModel+import org.apache.solr.ui.components.configsets.viewmodel.CreateConfigsetViewModel+import org.apache.solr.ui.components.configsets.viewmodel.ImportConfigsetViewModel+import org.apache.solr.ui.components.files.domain.SelectFileUseCaseimport org.apache.solr.ui.domain.Configsetimport org.apache.solr.ui.preview.PreviewContainer-import org.apache.solr.ui.views.configsets.ConfigsetsContent-import org.apache.solr.ui.views.navigation.configsets.ConfigsetsTab+import org.apache.solr.ui.utils.platformDispatchers+import org.apache.solr.ui.views.configsets.ConfigsetsScene@Preview@Composableprivate fun PreviewConfigsetsContentEmptyConfigsets() = PreviewContainer {- ConfigsetsContent(component = SimplePreviewConfigsetsComponent())+ ConfigsetsScene(component = PreviewConfigsetsComponent())}-@Preview-@Composable-private fun PreviewConfigsetsContentWithConfigsetSelected() = PreviewContainer {- val configset = "techproducts"- ConfigsetsContent(- component = SimplePreviewConfigsetsComponent(- model = Model(- configsets = listOf(configset, "getting_started").map { Configset(name = it) },- selectedConfigset = configset,- ),- ),+private class PreviewConfigsetsComponent(+ private val configsets: List<Configset> = emptyList(),+) : ConfigsetsComponent {++ private val dispatchers = platformDispatchers()++ override val configsetsRepository: ConfigsetsRepository = error("Not used in previews")++ override val loadConfigsetsUseCase: LoadConfigsetsUseCase = object : LoadConfigsetsUseCase {+ override suspend fun invoke(): Result<List<Configset>> = Result.success(configsets)+ }++ override fun createConfigsetsRouteViewModel(): ConfigsetsRouteViewModel = ConfigsetsRouteViewModel()++ override fun createConfigsetsViewModel(): ConfigsetsViewModel = ConfigsetsViewModel(+ loadConfigsetsUseCase = loadConfigsetsUseCase,+ dispatchers = dispatchers,)++ override fun createConfigsetsOverviewComponent(): ConfigsetsOverviewComponent = PreviewConfigsetsOverviewComponent(configsets)}-private class SimplePreviewConfigsetsComponent(model: Model = Model()) : ConfigsetsComponent {- override val model: StateFlow<Model> = MutableStateFlow(model)+private class PreviewConfigsetsOverviewComponent(configsets: List<Configset> = emptyList()) : ConfigsetsOverviewComponent {- override fun onSelectConfigset(name: String) = Unit+ private val dispatchers = platformDispatchers()- override val tabSlot: Value<ChildSlot<Configuration<ConfigsetsTab>, ConfigsetsComponent.Child>>- get() = MutableValue(- initialValue = ChildSlot(- Child.Created(- configuration = Configuration(tab = ConfigsetsTab.Overview),- instance = ConfigsetsComponent.Child.Overview(PreviewConfigsetsOverviewComponent),- ),- ),- )+ override val configsetsRepository: ConfigsetsRepository = error("Not used in previews")- override fun onNavigate(tab: ConfigsetsTab) = Unit-}+ override val createConfigsetUseCase: CreateConfigsetUseCase = error("Not used in previews")++ override val importConfigsetUseCase: ImportConfigsetUseCase = error("Not used in previews")-private object PreviewConfigsetsOverviewComponent : ConfigsetsOverviewComponent+ override val loadConfigsetsUseCase: LoadConfigsetsUseCase = object : LoadConfigsetsUseCase {+ override suspend fun invoke(): Result<List<Configset>> = Result.success(configsets)+ }++ override val selectFileUseCase: SelectFileUseCase = error("Not used in previews")++ override fun createConfigsetsViewModel(): ConfigsetsViewModel = ConfigsetsViewModel(+ loadConfigsetsUseCase = loadConfigsetsUseCase,+ dispatchers = dispatchers,+ )++ override fun createCreateConfigsetViewModel(): CreateConfigsetViewModel = CreateConfigsetViewModel(+ createConfigsetUseCase = createConfigsetUseCase,+ loadConfigsetsUseCase = loadConfigsetsUseCase,+ dispatchers = dispatchers,+ )++ override fun createImportConfigsetViewModel(): ImportConfigsetViewModel = ImportConfigsetViewModel(+ importConfigsetUseCase = importConfigsetUseCase,+ selectFileUseCase = selectFileUseCase,+ dispatchers = dispatchers,+ )++ override fun createConfigsetsOverviewViewModel(): ConfigsetsOverviewViewModel = ConfigsetsOverviewViewModel()+}diff --git a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/overview/ConfigsetsOverviewComponent.kt b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/utils/AppDispatchers.jvm.ktsimilarity index 80%rename from solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/overview/ConfigsetsOverviewComponent.ktrename to solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/utils/AppDispatchers.jvm.ktindex eed272cb259..8842a634751 100644--- a/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/overview/ConfigsetsOverviewComponent.kt+++ b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/utils/AppDispatchers.jvm.kt@@ -14,6 +14,11 @@* See the License for the specific language governing permissions and* limitations under the License.*/-package org.apache.solr.ui.components.configsets.overview-interface ConfigsetsOverviewComponent+package org.apache.solr.ui.utils++import kotlinx.coroutines.Dispatchers++actual fun platformDispatchers(): AppDispatchers = object : AppDispatchers {+ override val io = Dispatchers.IO+}diff --git a/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/utils/FileUtils.desktop.kt b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/utils/FileUtils.desktop.ktnew file mode 100644index 00000000000..cfbb2eac028--- /dev/null+++ b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/utils/FileUtils.desktop.kt@@ -0,0 +1,55 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.utils++import java.awt.FileDialog+import java.awt.Frame+import java.io.File+import javax.swing.SwingUtilities+import kotlin.coroutines.resume+import kotlinx.coroutines.suspendCancellableCoroutine+import org.apache.solr.ui.domain.PickedFile++actual suspend fun pickFile(extensions: List<String>): PickedFile? {+ val (dir, fileName) = suspendCancellableCoroutine { cont ->+ SwingUtilities.invokeLater {+ val dialog = FileDialog(null as Frame?, "Choose a file", FileDialog.LOAD).apply {+ isMultipleMode = false+ // Note: FileDialog filtering is platform-dependent; setFilenameFilter is best-effort.+ if (extensions.isNotEmpty()) {+ setFilenameFilter { _, name ->+ val lower = name.lowercase()+ extensions.any { ext -> lower.endsWith(".${ext.lowercase()}") }+ }+ }+ isVisible = true+ }+ cont.resume(dialog.directory to dialog.file)+ dialog.dispose()+ }+ }++ if (dir == null || fileName == null) return null++ val f = File(dir, fileName)+ return PickedFile(+ name = f.name,+ bytes = f.readBytes(),+ extension = f.extension,+ )+}diff --git a/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/Main.kt b/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/Main.ktindex dd6a54f4eb3..7fb3703656b 100644--- a/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/Main.kt+++ b/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/Main.kt@@ -17,7 +17,6 @@package org.apache.solr.ui-import androidx.compose.foundation.isSystemInDarkThemeimport androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.material3.Surfaceimport androidx.compose.ui.ExperimentalComposeUiApi@@ -79,7 +78,7 @@ fun main() {)ComposeViewport(document.body!!) {- SolrTheme(useDarkTheme = isSystemInDarkTheme()) {+ SolrTheme(useDarkTheme = false) {Surface(modifier = Modifier.fillMaxSize()) {RootContent(component)}diff --git a/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/utils/AppDispatchers.web.kt b/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/utils/AppDispatchers.web.ktnew file mode 100644index 00000000000..ae9f03eb29b--- /dev/null+++ b/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/utils/AppDispatchers.web.kt@@ -0,0 +1,24 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.utils++import kotlinx.coroutines.Dispatchers++actual fun platformDispatchers(): AppDispatchers = object : AppDispatchers {+ override val io = Dispatchers.Default+}diff --git a/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/utils/FileUtils.wasmJs.kt b/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/utils/FileUtils.wasmJs.ktnew file mode 100644index 00000000000..6fa8a22c53d--- /dev/null+++ b/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/utils/FileUtils.wasmJs.kt@@ -0,0 +1,101 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.ui.utils++import kotlin.coroutines.resume+import kotlinx.browser.document+import kotlinx.coroutines.suspendCancellableCoroutine+import org.apache.solr.ui.domain.PickedFile+import org.khronos.webgl.ArrayBuffer+import org.khronos.webgl.Uint8Array+import org.khronos.webgl.get+import org.w3c.dom.HTMLInputElement+import org.w3c.dom.asList+import org.w3c.dom.events.Event+import org.w3c.files.File+import org.w3c.files.FileReader++@OptIn(ExperimentalWasmJsInterop::class)+actual suspend fun pickFile(+ extensions: List<String>,+): PickedFile? = suspendCancellableCoroutine { cont ->+ val input = (document.createElement("input") as HTMLInputElement).apply {+ type = "file"+ style.display = "none"+ if (extensions.isNotEmpty()) {+ // Accept expects things like ".zip,.json" or MIME types.+ accept = extensions.joinToString(",") { ".${it.trimStart('.')}" }+ }+ }++ fun cleanup() {+ input.onchange = null+ input.remove()+ }++ input.onchange = onchange@{+ val chosen: File? = input.files?.asList()?.firstOrNull()+ if (chosen == null) {+ cleanup()+ cont.resume(null)+ return@onchange+ }++ val reader = FileReader()+ reader.onload = onload@{ _: Event ->+ val buffer = reader.result as? ArrayBuffer+ if (buffer == null) {+ cleanup()+ cont.resume(null)+ return@onload+ }++ val bytes = Uint8Array(buffer)+ val out = ByteArray(bytes.length) { i ->+ bytes[i].toInt().toByte()+ }++ cleanup()+ cont.resume(+ PickedFile(+ name = chosen.name,+ bytes = out,+ extension = chosen.name.substringAfterLast("."),+ ),+ )+ }++ reader.onerror = { _: Event ->+ cleanup()+ cont.resume(null)+ }++ reader.readAsArrayBuffer(chosen)+ cont.invokeOnCancellation {+ try {+ reader.abort()+ } catch (_: Throwable) {+ // Ignore: abort() may throw depending on state/platform bindings.+ }+ cleanup()+ }+ }++ document.body?.appendChild(input)+ input.click()+}