From 23e53d29f5beea9f7b514b1e37791c3944d7d0ce Mon Sep 17 00:00:00 2001 From: Christos Malliaridis Date: Tue, 4 Feb 2025 20:38:00 +0100 Subject: [PATCH] Remove "compose" from packages, paths and names --- .github/labeler.yml | 2 +- dev-docs/ui/introduction.adoc | 2 +- dev-docs/ui/module-structure.adoc | 6 ++-- dev-docs/ui/testing-and-deployment.adoc | 24 +++++++-------- settings.gradle | 2 +- solr/server/etc/jetty-new-ui-dev.xml | 4 +-- solr/server/etc/jetty-new-ui-prod.xml | 4 +-- solr/{compose-ui => ui}/README.md | 4 +-- solr/{compose-ui => ui}/assets/logo.ico | Bin solr/{compose-ui => ui}/assets/logo.png | Bin solr/{compose-ui => ui}/build.gradle.kts | 2 +- solr/{compose-ui => ui}/gradle.lockfile | 0 .../karma.config.d/wasm/adjust-timeouts.js | 0 .../drawable/solr-logo-dark.svg | 0 .../drawable/solr-logo-light.svg | 0 .../composeResources/values/strings.xml | 0 .../environment/EnvironmentComponent.kt | 8 ++--- .../data/JavaPropertiesResponse.kt | 2 +- .../environment/data/JavaProperty.kt | 2 +- .../environment/data/JavaRuntimeInfo.kt | 2 +- .../ui}/components/environment/data/Jmx.kt | 2 +- .../components/environment/data/JvmData.kt | 2 +- .../components/environment/data/JvmMemory.kt | 2 +- .../environment/data/JvmMemoryRaw.kt | 2 +- .../environment/data/SecurityConfig.kt | 2 +- .../components/environment/data/SystemData.kt | 2 +- .../environment/data/SystemInformation.kt | 2 +- .../components/environment/data/SystemMode.kt | 2 +- .../components/environment/data/Versions.kt | 2 +- .../DefaultEnvironmentComponent.kt | 12 ++++---- .../integration/HttpEnvironmentStoreClient.kt | 10 +++---- .../environment/integration/Mappers.kt | 6 ++-- .../environment/store/EnvironmentStore.kt | 18 +++++------ .../store/EnvironmentStoreProvider.kt | 10 +++---- .../components/logging/LoggingComponent.kt | 2 +- .../integration/DefaultLoggingComponent.kt | 6 ++-- .../solr/ui}/components/main/MainComponent.kt | 10 +++---- .../main/integration/DefaultMainComponent.kt | 18 +++++------ .../components/main/integration/Mappers.kt | 6 ++-- .../navigation/NavigationComponent.kt | 2 +- .../solr/ui}/components/root/RootComponent.kt | 4 +-- .../root/integration/SimpleRootComponent.kt | 10 +++---- .../solr/ui}/utils/AppComponentContext.kt | 2 +- .../solr/ui}/utils/CoroutineContextOwner.kt | 2 +- .../solr/ui}/utils/CoroutineScopeExt.kt | 2 +- .../ui}/utils/DefaultAppComponentContext.kt | 2 +- .../apache/solr/ui}/utils/HttpClientUtils.kt | 2 +- .../solr/ui/views}/components/SolrCard.kt | 2 +- .../environment/CommandLineArgumentsCard.kt | 6 ++-- .../views}/environment/EnvironmentContent.kt | 4 +-- .../views}/environment/JavaPropertiesCard.kt | 8 ++--- .../ui/views}/environment/VersionsCard.kt | 8 ++--- .../apache/solr/ui/views}/icons/SolrLogo.kt | 10 +++---- .../solr/ui/views}/logging/LoggingContent.kt | 4 +-- .../apache/solr/ui/views}/main/MainContent.kt | 12 ++++---- .../solr/ui/views}/navigation/Footer.kt | 18 +++++------ .../solr/ui/views}/navigation/MainMenu.kt | 2 +- .../ui/views}/navigation/NavigationSideBar.kt | 28 +++++++++--------- .../apache/solr/ui/views}/root/RootContent.kt | 8 ++--- .../solr/ui/views}/theme/ColorFamily.kt | 2 +- .../org/apache/solr/ui/views}/theme/Colors.kt | 2 +- .../org/apache/solr/ui/views}/theme/Shapes.kt | 2 +- .../org/apache/solr/ui/views}/theme/Theme.kt | 2 +- .../apache/solr/ui/views}/theme/Typography.kt | 2 +- .../store/EnvironmentStoreProviderTest.kt | 4 +-- .../store/MockedEnvironmentStoreClient.kt | 6 ++-- .../solr/ui}/ui/components/SolrCardTest.kt | 2 +- .../ui/environment/EnvironmentContentTest.kt | 6 ++-- .../kotlin/org/apache/solr/ui}/Main.kt | 14 ++++----- .../kotlin/org/apache/solr/ui}/Utils.kt | 2 +- .../solr/ui}/preview/PreviewContainer.kt | 4 +-- .../navigation/PreviewNavigationSideBar.kt | 6 ++-- .../kotlin/org/apache/solr/ui}/Main.kt | 14 ++++----- .../src/wasmJsMain/resources/index.html | 0 .../src/wasmJsMain/resources/styles.css | 0 .../webpack.config.d/adjust-limits.js | 0 solr/webapp/build.gradle | 20 ++++++------- solr/webapp/web/index.html | 2 +- solr/webapp/web/js/angular/app.js | 4 +-- 79 files changed, 205 insertions(+), 205 deletions(-) rename solr/{compose-ui => ui}/README.md (95%) rename solr/{compose-ui => ui}/assets/logo.ico (100%) rename solr/{compose-ui => ui}/assets/logo.png (100%) rename solr/{compose-ui => ui}/build.gradle.kts (99%) rename solr/{compose-ui => ui}/gradle.lockfile (100%) rename solr/{compose-ui => ui}/karma.config.d/wasm/adjust-timeouts.js (100%) rename solr/{compose-ui => ui}/src/commonMain/composeResources/drawable/solr-logo-dark.svg (100%) rename solr/{compose-ui => ui}/src/commonMain/composeResources/drawable/solr-logo-light.svg (100%) rename solr/{compose-ui => ui}/src/commonMain/composeResources/values/strings.xml (100%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/EnvironmentComponent.kt (82%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/JavaPropertiesResponse.kt (95%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/JavaProperty.kt (94%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/JavaRuntimeInfo.kt (94%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/Jmx.kt (94%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/JvmData.kt (95%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/JvmMemory.kt (94%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/JvmMemoryRaw.kt (94%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/SecurityConfig.kt (93%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/SystemData.kt (95%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/SystemInformation.kt (96%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/SystemMode.kt (94%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/data/Versions.kt (95%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/integration/DefaultEnvironmentComponent.kt (82%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/integration/HttpEnvironmentStoreClient.kt (86%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/integration/Mappers.kt (82%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/store/EnvironmentStore.kt (73%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/environment/store/EnvironmentStoreProvider.kt (93%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/logging/LoggingComponent.kt (94%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/logging/integration/DefaultLoggingComponent.kt (84%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/main/MainComponent.kt (90%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/main/integration/DefaultMainComponent.kt (92%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/main/integration/Mappers.kt (85%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/navigation/NavigationComponent.kt (95%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/root/RootComponent.kt (92%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/components/root/integration/SimpleRootComponent.kt (90%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/utils/AppComponentContext.kt (96%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/utils/CoroutineContextOwner.kt (96%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/utils/CoroutineScopeExt.kt (98%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/utils/DefaultAppComponentContext.kt (98%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui => ui/src/commonMain/kotlin/org/apache/solr/ui}/utils/HttpClientUtils.kt (97%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/components/SolrCard.kt (97%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/environment/CommandLineArgumentsCard.kt (94%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/environment/EnvironmentContent.kt (95%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/environment/JavaPropertiesCard.kt (93%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/environment/VersionsCard.kt (92%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/icons/SolrLogo.kt (84%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/logging/LoggingContent.kt (90%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/main/MainContent.kt (88%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/navigation/Footer.kt (89%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/navigation/MainMenu.kt (96%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/navigation/NavigationSideBar.kt (88%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/root/RootContent.kt (89%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/theme/ColorFamily.kt (96%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/theme/Colors.kt (99%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/theme/Shapes.kt (97%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/theme/Theme.kt (98%) rename solr/{compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui => ui/src/commonMain/kotlin/org/apache/solr/ui/views}/theme/Typography.kt (99%) rename solr/{compose-ui/src/commonTest/kotlin/org/apache/solr/composeui => ui/src/commonTest/kotlin/org/apache/solr/ui}/components/environment/store/EnvironmentStoreProviderTest.kt (96%) rename solr/{compose-ui/src/commonTest/kotlin/org/apache/solr/composeui => ui/src/commonTest/kotlin/org/apache/solr/ui}/components/environment/store/MockedEnvironmentStoreClient.kt (85%) rename solr/{compose-ui/src/commonTest/kotlin/org/apache/solr/composeui => ui/src/commonTest/kotlin/org/apache/solr/ui}/ui/components/SolrCardTest.kt (97%) rename solr/{compose-ui/src/commonTest/kotlin/org/apache/solr/composeui => ui/src/commonTest/kotlin/org/apache/solr/ui}/ui/environment/EnvironmentContentTest.kt (91%) rename solr/{compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui => ui/src/desktopMain/kotlin/org/apache/solr/ui}/Main.kt (88%) rename solr/{compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui => ui/src/desktopMain/kotlin/org/apache/solr/ui}/Utils.kt (97%) rename solr/{compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui => ui/src/desktopMain/kotlin/org/apache/solr/ui}/preview/PreviewContainer.kt (93%) rename solr/{compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui => ui/src/desktopMain/kotlin/org/apache/solr/ui}/preview/navigation/PreviewNavigationSideBar.kt (85%) rename solr/{compose-ui/src/wasmJsMain/kotlin/org/apache/solr/composeui => ui/src/wasmJsMain/kotlin/org/apache/solr/ui}/Main.kt (86%) rename solr/{compose-ui => ui}/src/wasmJsMain/resources/index.html (100%) rename solr/{compose-ui => ui}/src/wasmJsMain/resources/styles.css (100%) rename solr/{compose-ui => ui}/webpack.config.d/adjust-limits.js (100%) diff --git a/.github/labeler.yml b/.github/labeler.yml index 2e08d3d7649..11c43e84f84 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -96,7 +96,7 @@ admin-ui: - changed-files: - any-glob-to-any-file: - solr/webapp/** - - solr/compose-ui/** + - solr/ui/** # Add 'prometheus-exporter' label prometheus-exporter: diff --git a/dev-docs/ui/introduction.adoc b/dev-docs/ui/introduction.adoc index f7a830c3c00..906bb00b3ba 100644 --- a/dev-docs/ui/introduction.adoc +++ b/dev-docs/ui/introduction.adoc @@ -18,4 +18,4 @@ the documentation is covering the following topics for new and experienced devel == Notes All the references to files and directories in the UI documentation are from within -the `solr/compose-ui` module, if not otherwise stated. \ No newline at end of file +the `solr/ui` module, if not otherwise stated. \ No newline at end of file diff --git a/dev-docs/ui/module-structure.adoc b/dev-docs/ui/module-structure.adoc index 62a52f8c9d6..5b678e4a9a3 100644 --- a/dev-docs/ui/module-structure.adoc +++ b/dev-docs/ui/module-structure.adoc @@ -2,7 +2,7 @@ == Module Structure -The UI module `compose-ui` follows a quite simple structure. It is split in +The `ui` module follows a quite simple structure. It is split in - *components*, which covers the logic part of the frontend and therefore contains the interfaces and implementations of them, @@ -14,7 +14,7 @@ if not the same, structure and files. == Components (Logic) -The logical part of a simple component (`org/apache/solr/composeui/components`) usually consists of: +The logical part of a simple component (`org/apache/solr/ui/components`) usually consists of: - **The component interface** (`[ComponentName]Component.kt`), that defines the UI state and the interaction options, @@ -48,7 +48,7 @@ This structure is strongly inspired by Decompose's https://arkivanov.github.io/D == User Interface (UI) Similar to the logical part, the UI classes are also separated in components under -`org.apache.solr.composeui.ui`. +`org.apache.solr.ui.views`. Components may consist of one or multiple composables that make up a screen, section or element. The composables may also be reused, which is why they may be moved at some point diff --git a/dev-docs/ui/testing-and-deployment.adoc b/dev-docs/ui/testing-and-deployment.adoc index f966752395f..b06b998b93a 100644 --- a/dev-docs/ui/testing-and-deployment.adoc +++ b/dev-docs/ui/testing-and-deployment.adoc @@ -32,7 +32,7 @@ To launch the JVM client, you can use: [source,bash] ---- -./gradlew :solr:compose-ui:run +./gradlew :solr:ui:run ---- To run the app on the web, you can launch the web target with: @@ -40,7 +40,7 @@ To run the app on the web, you can launch the web target with: [source,bash] ---- # not recommended for the above reasons -./gradlew :solr:compose-ui:wasmJsBrowserRun +./gradlew :solr:ui:wasmJsBrowserRun ---- Build times may be a bit longer than with the standalone JVM build. @@ -48,7 +48,7 @@ Build times may be a bit longer than with the standalone JVM build. === Integration Tests The integration tests of the module focus on testing the implementation found in -`org.apache.solr.composeui.ui`. That includes all UI elements / composables. Integration tests +`org.apache.solr.ui.views`. That includes all UI elements / composables. Integration tests may test entire flows as well, but require a suitable testing environment. Since UI tests require a more complex and platform-specific testing environment, they are disabled @@ -57,7 +57,7 @@ UI tests and a suitable testing environment for them, we may run these tests in === Unit Tests -Unit tests test the implementation found in `org.apache.solr.compose.components`. That package +Unit tests test the implementation found in `org.apache.solr.ui.components`. That package includes the logical part of the new UI and does not have any constraints to the UI part. Therefore, they can be executed in the automation pipelines easily. @@ -66,11 +66,11 @@ components to confirm correct component state transitions with specific inputs. == Deployment -The `compose-ui` module is configured to build artifacts for `WebAssembly` and `JVM`. +The `ui` module is configured to build artifacts for `WebAssembly` and `JVM`. === Packaging -The module `compose-ui` can be built and packaged for two targets (wasmJs / JVM) with two +The module `ui` can be built and packaged for two targets (wasmJs / JVM) with two variants each, development and production. To package the JVM target for development and generate a distribution (DEB, MSI or DMG file), @@ -78,16 +78,16 @@ you can use: [source,bash] ---- -./gradlew :solr:compose-ui:packageDistributionForCurrentOS +./gradlew :solr:ui:packageDistributionForCurrentOS ---- -The distribution can be found at `solr/compose-ui/build/compose/binaries/main/[deb|msi|dmg]/`. +The distribution can be found at `solr/ui/build/compose/binaries/main/[deb|msi|dmg]/`. To build the JVM target for production, you can use: [source,bash] ---- -./gradlew :solr:compose-ui:packageReleaseDistributionForCurrentOS +./gradlew :solr:ui:packageReleaseDistributionForCurrentOS ---- Platform-specific gradle tasks exist as well, but you cannot build for a @@ -98,10 +98,10 @@ If the client machine has Java installed, you can also generate an UberJar: [source,bash] ---- # for development -./gradlew :solr:compose-ui:packageUberJarForCurrentOs +./gradlew :solr:ui:packageUberJarForCurrentOs # for production -./gradlew :solr:compose-ui:packageReleaseUberJarForCurrentOs +./gradlew :solr:ui:packageReleaseUberJarForCurrentOs ---- When building the entire Solr project, the wasmJs target is included in the build artifacts. @@ -116,7 +116,7 @@ To tell the build process to use the production variant instead, you have ot pas The WebAssembly (wasmJs) target is used to generate artifacts that can be hosted together with our current webapp. The `server` that hosts the webapp is configured to host the new UI -as a module that is available under the URL path `/solr/compose`. +as a module that is available under the URL path `/solr/ui`. For that, two configuration files are added, one for development (`jetty-new-ui-dev.xml`) and one for production (`jetty-new-ui.xml`). The module configuration for development is less strict, diff --git a/settings.gradle b/settings.gradle index 724ee74b610..cf4acf46a84 100644 --- a/settings.gradle +++ b/settings.gradle @@ -58,6 +58,7 @@ include "solr:modules:s3-repository" include "solr:modules:scripting" include "solr:modules:sql" include "solr:webapp" +include "solr:ui" include "solr:benchmark" include "solr:test-framework" include "solr:solr-ref-guide" @@ -67,7 +68,6 @@ include "solr:packaging" include "solr:distribution" include "solr:docker" include "solr:prometheus-exporter" -include "solr:compose-ui" // Configures development for joint Lucene/ Solr composite build. apply from: file('gradle/lucene-dev/lucene-dev-repo-composite.gradle') diff --git a/solr/server/etc/jetty-new-ui-dev.xml b/solr/server/etc/jetty-new-ui-dev.xml index 30dfa57c10a..e3e74434ccf 100644 --- a/solr/server/etc/jetty-new-ui-dev.xml +++ b/solr/server/etc/jetty-new-ui-dev.xml @@ -20,7 +20,7 @@ - + @@ -30,7 +30,7 @@ - /solr/compose/* + /solr/ui/* Content-Security-Policy default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval'; worker-src 'self'; diff --git a/solr/server/etc/jetty-new-ui-prod.xml b/solr/server/etc/jetty-new-ui-prod.xml index 2a0218176dd..c73b1e43133 100644 --- a/solr/server/etc/jetty-new-ui-prod.xml +++ b/solr/server/etc/jetty-new-ui-prod.xml @@ -3,7 +3,7 @@ - + @@ -17,7 +17,7 @@ - /solr/compose/* + /solr/ui/* Content-Security-Policy default-src 'none'; base-uri 'none'; connect-src 'self'; form-action 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data:; media-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'wasm-unsafe-eval'; worker-src 'self'; diff --git a/solr/compose-ui/README.md b/solr/ui/README.md similarity index 95% rename from solr/compose-ui/README.md rename to solr/ui/README.md index 38848c70dc0..a9ebef64d27 100644 --- a/solr/compose-ui/README.md +++ b/solr/ui/README.md @@ -36,7 +36,7 @@ The module is available for desktop / JVM targets and web (WebAssembly). > reflect the module's configuration requirements. Review the differences between your file and > `gradle/template.gradle.properties` and update accordingly. -To build and run the desktop client simply run `./gradlew :solr:compose-ui:run`. +To build and run the desktop client simply run `./gradlew :solr:ui:run`. Make sure that you have a Solr development instance running on `localhost:8983`, as the current implementation uses hardcoded values. @@ -48,7 +48,7 @@ you can build the project as usual (see [Quickstart](../../README.md#quickstart) Various references are included in the webapp for already migrated pages. > Note that the standalone WebAssembly app executed via -> `./gradlew :solr:compose-ui:wasmJsBrowserRun` runs on port `8080` and will run +> `./gradlew :solr:ui:wasmJsBrowserRun` runs on port `8080` and will run > into CORS exceptions. Therefore, the usage of it for development is > discouraged. > diff --git a/solr/compose-ui/assets/logo.ico b/solr/ui/assets/logo.ico similarity index 100% rename from solr/compose-ui/assets/logo.ico rename to solr/ui/assets/logo.ico diff --git a/solr/compose-ui/assets/logo.png b/solr/ui/assets/logo.png similarity index 100% rename from solr/compose-ui/assets/logo.png rename to solr/ui/assets/logo.png diff --git a/solr/compose-ui/build.gradle.kts b/solr/ui/build.gradle.kts similarity index 99% rename from solr/compose-ui/build.gradle.kts rename to solr/ui/build.gradle.kts index 30e1ed6972c..ef110a296a5 100644 --- a/solr/compose-ui/build.gradle.kts +++ b/solr/ui/build.gradle.kts @@ -138,7 +138,7 @@ configurations { compose.desktop { application { - mainClass = "org.apache.solr.composeui.MainKt" + mainClass = "org.apache.solr.ui.MainKt" nativeDistributions { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) diff --git a/solr/compose-ui/gradle.lockfile b/solr/ui/gradle.lockfile similarity index 100% rename from solr/compose-ui/gradle.lockfile rename to solr/ui/gradle.lockfile diff --git a/solr/compose-ui/karma.config.d/wasm/adjust-timeouts.js b/solr/ui/karma.config.d/wasm/adjust-timeouts.js similarity index 100% rename from solr/compose-ui/karma.config.d/wasm/adjust-timeouts.js rename to solr/ui/karma.config.d/wasm/adjust-timeouts.js diff --git a/solr/compose-ui/src/commonMain/composeResources/drawable/solr-logo-dark.svg b/solr/ui/src/commonMain/composeResources/drawable/solr-logo-dark.svg similarity index 100% rename from solr/compose-ui/src/commonMain/composeResources/drawable/solr-logo-dark.svg rename to solr/ui/src/commonMain/composeResources/drawable/solr-logo-dark.svg diff --git a/solr/compose-ui/src/commonMain/composeResources/drawable/solr-logo-light.svg b/solr/ui/src/commonMain/composeResources/drawable/solr-logo-light.svg similarity index 100% rename from solr/compose-ui/src/commonMain/composeResources/drawable/solr-logo-light.svg rename to solr/ui/src/commonMain/composeResources/drawable/solr-logo-light.svg diff --git a/solr/compose-ui/src/commonMain/composeResources/values/strings.xml b/solr/ui/src/commonMain/composeResources/values/strings.xml similarity index 100% rename from solr/compose-ui/src/commonMain/composeResources/values/strings.xml rename to solr/ui/src/commonMain/composeResources/values/strings.xml diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/EnvironmentComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/EnvironmentComponent.kt similarity index 82% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/EnvironmentComponent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/EnvironmentComponent.kt index addd5dd4d11..99d6ee0183d 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/EnvironmentComponent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/EnvironmentComponent.kt @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment +package org.apache.solr.ui.components.environment import kotlinx.coroutines.flow.StateFlow -import org.apache.solr.composeui.components.environment.data.JavaProperty -import org.apache.solr.composeui.components.environment.data.JvmData -import org.apache.solr.composeui.components.environment.data.Versions +import org.apache.solr.ui.components.environment.data.JavaProperty +import org.apache.solr.ui.components.environment.data.JvmData +import org.apache.solr.ui.components.environment.data.Versions /** * Component interface that represents the environment section. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JavaPropertiesResponse.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JavaPropertiesResponse.kt similarity index 95% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JavaPropertiesResponse.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JavaPropertiesResponse.kt index db128264920..a83b08bc773 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JavaPropertiesResponse.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JavaPropertiesResponse.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JavaProperty.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JavaProperty.kt similarity index 94% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JavaProperty.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JavaProperty.kt index 0202d8e5f2c..1f349fa3d88 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JavaProperty.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JavaProperty.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data /** * Typealias of JavaProperty, which are simple key-value pairs. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JavaRuntimeInfo.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JavaRuntimeInfo.kt similarity index 94% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JavaRuntimeInfo.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JavaRuntimeInfo.kt index 145a657c5af..2dcc1daa4a6 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JavaRuntimeInfo.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JavaRuntimeInfo.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/Jmx.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/Jmx.kt similarity index 94% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/Jmx.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/Jmx.kt index b81fae33aa9..7ee8e8b94f9 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/Jmx.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/Jmx.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JvmData.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JvmData.kt similarity index 95% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JvmData.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JvmData.kt index a4c70d7d22c..ebc89f2bcad 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JvmData.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JvmData.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JvmMemory.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JvmMemory.kt similarity index 94% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JvmMemory.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JvmMemory.kt index b2bb8b13064..4da6819d2e5 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JvmMemory.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JvmMemory.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JvmMemoryRaw.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JvmMemoryRaw.kt similarity index 94% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JvmMemoryRaw.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JvmMemoryRaw.kt index f8b0e9e6290..d739e1bafb9 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/JvmMemoryRaw.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/JvmMemoryRaw.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SecurityConfig.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SecurityConfig.kt similarity index 93% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SecurityConfig.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SecurityConfig.kt index 39b86b74ea5..00871a8f080 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SecurityConfig.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SecurityConfig.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SystemData.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SystemData.kt similarity index 95% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SystemData.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SystemData.kt index 5576f872e87..674a2acdf3c 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SystemData.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SystemData.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SystemInformation.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SystemInformation.kt similarity index 96% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SystemInformation.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SystemInformation.kt index 37a71bdaf76..905c750719d 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SystemInformation.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SystemInformation.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SystemMode.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SystemMode.kt similarity index 94% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SystemMode.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SystemMode.kt index dca74148045..aa854e95da7 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/SystemMode.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/SystemMode.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/Versions.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/Versions.kt similarity index 95% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/Versions.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/Versions.kt index bc4a4c16c06..b06ab69cf31 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/data/Versions.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/data/Versions.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.data +package org.apache.solr.ui.components.environment.data import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/integration/DefaultEnvironmentComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/integration/DefaultEnvironmentComponent.kt similarity index 82% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/integration/DefaultEnvironmentComponent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/integration/DefaultEnvironmentComponent.kt index 151eca7d385..17456a43822 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/integration/DefaultEnvironmentComponent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/integration/DefaultEnvironmentComponent.kt @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.integration +package org.apache.solr.ui.components.environment.integration 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 org.apache.solr.composeui.components.environment.EnvironmentComponent -import org.apache.solr.composeui.components.environment.store.EnvironmentStoreProvider -import org.apache.solr.composeui.utils.AppComponentContext -import org.apache.solr.composeui.utils.coroutineScope -import org.apache.solr.composeui.utils.map +import org.apache.solr.ui.components.environment.EnvironmentComponent +import org.apache.solr.ui.components.environment.store.EnvironmentStoreProvider +import org.apache.solr.ui.utils.AppComponentContext +import org.apache.solr.ui.utils.coroutineScope +import org.apache.solr.ui.utils.map /** * Default implementation of the [EnvironmentComponent]. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/integration/HttpEnvironmentStoreClient.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/integration/HttpEnvironmentStoreClient.kt similarity index 86% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/integration/HttpEnvironmentStoreClient.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/integration/HttpEnvironmentStoreClient.kt index 758b1200cf8..1673c48c8ff 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/integration/HttpEnvironmentStoreClient.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/integration/HttpEnvironmentStoreClient.kt @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.integration +package org.apache.solr.ui.components.environment.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.composeui.components.environment.data.JavaPropertiesResponse -import org.apache.solr.composeui.components.environment.data.JavaProperty -import org.apache.solr.composeui.components.environment.data.SystemData -import org.apache.solr.composeui.components.environment.store.EnvironmentStoreProvider +import org.apache.solr.ui.components.environment.data.JavaPropertiesResponse +import org.apache.solr.ui.components.environment.data.JavaProperty +import org.apache.solr.ui.components.environment.data.SystemData +import org.apache.solr.ui.components.environment.store.EnvironmentStoreProvider /** * Client implementation of the [EnvironmentStoreProvider.Client] that makes use diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/integration/Mappers.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/integration/Mappers.kt similarity index 82% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/integration/Mappers.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/integration/Mappers.kt index 78e9f7b0114..3a8f89a7264 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/integration/Mappers.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/integration/Mappers.kt @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.integration +package org.apache.solr.ui.components.environment.integration -import org.apache.solr.composeui.components.environment.EnvironmentComponent -import org.apache.solr.composeui.components.environment.store.EnvironmentStore +import org.apache.solr.ui.components.environment.EnvironmentComponent +import org.apache.solr.ui.components.environment.store.EnvironmentStore internal val environmentStateToModel: (EnvironmentStore.State) -> EnvironmentComponent.Model = { EnvironmentComponent.Model( diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/store/EnvironmentStore.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/store/EnvironmentStore.kt similarity index 73% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/store/EnvironmentStore.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/store/EnvironmentStore.kt index 633bb4ef47f..4c6ae252d6b 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/store/EnvironmentStore.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/store/EnvironmentStore.kt @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.store +package org.apache.solr.ui.components.environment.store import com.arkivanov.mvikotlin.core.store.Store -import org.apache.solr.composeui.components.environment.data.JavaProperty -import org.apache.solr.composeui.components.environment.data.JvmData -import org.apache.solr.composeui.components.environment.data.SecurityConfig -import org.apache.solr.composeui.components.environment.data.SystemInformation -import org.apache.solr.composeui.components.environment.data.SystemMode -import org.apache.solr.composeui.components.environment.data.Versions -import org.apache.solr.composeui.components.environment.store.EnvironmentStore.Intent -import org.apache.solr.composeui.components.environment.store.EnvironmentStore.State +import org.apache.solr.ui.components.environment.data.JavaProperty +import org.apache.solr.ui.components.environment.data.JvmData +import org.apache.solr.ui.components.environment.data.SecurityConfig +import org.apache.solr.ui.components.environment.data.SystemInformation +import org.apache.solr.ui.components.environment.data.SystemMode +import org.apache.solr.ui.components.environment.data.Versions +import org.apache.solr.ui.components.environment.store.EnvironmentStore.Intent +import org.apache.solr.ui.components.environment.store.EnvironmentStore.State /** * State store interface of the environment. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/store/EnvironmentStoreProvider.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/store/EnvironmentStoreProvider.kt similarity index 93% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/store/EnvironmentStoreProvider.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/store/EnvironmentStoreProvider.kt index 22c9ff99270..fea0f1fcf73 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/environment/store/EnvironmentStoreProvider.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/environment/store/EnvironmentStoreProvider.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.store +package org.apache.solr.ui.components.environment.store import com.arkivanov.mvikotlin.core.store.Reducer import com.arkivanov.mvikotlin.core.store.SimpleBootstrapper @@ -25,10 +25,10 @@ import com.arkivanov.mvikotlin.extensions.coroutines.CoroutineExecutor import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.apache.solr.composeui.components.environment.data.JavaProperty -import org.apache.solr.composeui.components.environment.data.SystemData -import org.apache.solr.composeui.components.environment.store.EnvironmentStore.Intent -import org.apache.solr.composeui.components.environment.store.EnvironmentStore.State +import org.apache.solr.ui.components.environment.data.JavaProperty +import org.apache.solr.ui.components.environment.data.SystemData +import org.apache.solr.ui.components.environment.store.EnvironmentStore.Intent +import org.apache.solr.ui.components.environment.store.EnvironmentStore.State /** * Store provider that [provide]s instances of [EnvironmentStore]. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/logging/LoggingComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/logging/LoggingComponent.kt similarity index 94% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/logging/LoggingComponent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/logging/LoggingComponent.kt index b1073b58aa8..6e074228a74 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/logging/LoggingComponent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/logging/LoggingComponent.kt @@ -15,6 +15,6 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.logging +package org.apache.solr.ui.components.logging interface LoggingComponent diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/logging/integration/DefaultLoggingComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/logging/integration/DefaultLoggingComponent.kt similarity index 84% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/logging/integration/DefaultLoggingComponent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/logging/integration/DefaultLoggingComponent.kt index 572d228e7bb..3e7f381f8a2 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/logging/integration/DefaultLoggingComponent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/logging/integration/DefaultLoggingComponent.kt @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.logging.integration +package org.apache.solr.ui.components.logging.integration import com.arkivanov.mvikotlin.core.store.StoreFactory -import org.apache.solr.composeui.components.logging.LoggingComponent -import org.apache.solr.composeui.utils.AppComponentContext +import org.apache.solr.ui.components.logging.LoggingComponent +import org.apache.solr.ui.utils.AppComponentContext class DefaultLoggingComponent( componentContext: AppComponentContext, diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/main/MainComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/MainComponent.kt similarity index 90% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/main/MainComponent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/MainComponent.kt index e27e682b36c..3be4f9ef9cd 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/main/MainComponent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/MainComponent.kt @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.main +package org.apache.solr.ui.components.main import com.arkivanov.decompose.router.stack.ChildStack import com.arkivanov.decompose.value.Value -import org.apache.solr.composeui.components.environment.EnvironmentComponent -import org.apache.solr.composeui.components.logging.LoggingComponent -import org.apache.solr.composeui.components.navigation.NavigationComponent -import org.apache.solr.composeui.ui.navigation.MainMenu +import org.apache.solr.ui.components.environment.EnvironmentComponent +import org.apache.solr.ui.components.logging.LoggingComponent +import org.apache.solr.ui.components.navigation.NavigationComponent +import org.apache.solr.ui.views.navigation.MainMenu /** * Main component of the application that is used as base for users with access. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/main/integration/DefaultMainComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.kt similarity index 92% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/main/integration/DefaultMainComponent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.kt index 5e55fb8583c..f7100c8a5a1 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/main/integration/DefaultMainComponent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.main.integration +package org.apache.solr.ui.components.main.integration import com.arkivanov.decompose.router.stack.ChildStack import com.arkivanov.decompose.router.stack.StackNavigation @@ -25,14 +25,14 @@ import com.arkivanov.decompose.value.Value import com.arkivanov.mvikotlin.core.store.StoreFactory import io.ktor.client.HttpClient import kotlinx.serialization.Serializable -import org.apache.solr.composeui.components.environment.EnvironmentComponent -import org.apache.solr.composeui.components.environment.integration.DefaultEnvironmentComponent -import org.apache.solr.composeui.components.logging.LoggingComponent -import org.apache.solr.composeui.components.logging.integration.DefaultLoggingComponent -import org.apache.solr.composeui.components.main.MainComponent -import org.apache.solr.composeui.components.main.MainComponent.Child -import org.apache.solr.composeui.ui.navigation.MainMenu -import org.apache.solr.composeui.utils.AppComponentContext +import org.apache.solr.ui.components.environment.EnvironmentComponent +import org.apache.solr.ui.components.environment.integration.DefaultEnvironmentComponent +import org.apache.solr.ui.components.logging.LoggingComponent +import org.apache.solr.ui.components.logging.integration.DefaultLoggingComponent +import org.apache.solr.ui.components.main.MainComponent +import org.apache.solr.ui.components.main.MainComponent.Child +import org.apache.solr.ui.views.navigation.MainMenu +import org.apache.solr.ui.utils.AppComponentContext class DefaultMainComponent internal constructor( componentContext: AppComponentContext, diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/main/integration/Mappers.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/Mappers.kt similarity index 85% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/main/integration/Mappers.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/Mappers.kt index fe02c36381d..19557f36d01 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/main/integration/Mappers.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/Mappers.kt @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.main.integration +package org.apache.solr.ui.components.main.integration -import org.apache.solr.composeui.components.main.MainComponent -import org.apache.solr.composeui.ui.navigation.MainMenu +import org.apache.solr.ui.components.main.MainComponent +import org.apache.solr.ui.views.navigation.MainMenu val MainComponent.Child.asMainMenu: MainMenu get() = when (this) { diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/navigation/NavigationComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/navigation/NavigationComponent.kt similarity index 95% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/navigation/NavigationComponent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/navigation/NavigationComponent.kt index e00173fd960..1ecdb1bfe20 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/navigation/NavigationComponent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/navigation/NavigationComponent.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.navigation +package org.apache.solr.ui.components.navigation /** * Interface that provides the basic functionality for any navigation component. Navigation diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/root/RootComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/root/RootComponent.kt similarity index 92% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/root/RootComponent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/root/RootComponent.kt index 6628f93b7d6..bd0c89f1842 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/root/RootComponent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/root/RootComponent.kt @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.root +package org.apache.solr.ui.components.root import com.arkivanov.decompose.router.stack.ChildStack import com.arkivanov.decompose.value.Value -import org.apache.solr.composeui.components.main.MainComponent +import org.apache.solr.ui.components.main.MainComponent /** * Root component used by each target as an entry point to the application. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/root/integration/SimpleRootComponent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/root/integration/SimpleRootComponent.kt similarity index 90% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/root/integration/SimpleRootComponent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/root/integration/SimpleRootComponent.kt index a58888f92cf..4789db8c611 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/components/root/integration/SimpleRootComponent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/root/integration/SimpleRootComponent.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.root.integration +package org.apache.solr.ui.components.root.integration import com.arkivanov.decompose.router.stack.ChildStack import com.arkivanov.decompose.router.stack.StackNavigation @@ -24,10 +24,10 @@ import com.arkivanov.decompose.value.Value import com.arkivanov.mvikotlin.core.store.StoreFactory import io.ktor.client.HttpClient import kotlinx.serialization.Serializable -import org.apache.solr.composeui.components.main.MainComponent -import org.apache.solr.composeui.components.main.integration.DefaultMainComponent -import org.apache.solr.composeui.components.root.RootComponent -import org.apache.solr.composeui.utils.AppComponentContext +import org.apache.solr.ui.components.main.MainComponent +import org.apache.solr.ui.components.main.integration.DefaultMainComponent +import org.apache.solr.ui.components.root.RootComponent +import org.apache.solr.ui.utils.AppComponentContext /** * A simple root component implementation that does not check the user's access level and redirects diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/AppComponentContext.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/AppComponentContext.kt similarity index 96% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/AppComponentContext.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/AppComponentContext.kt index 19efd6c8364..e477ab745c7 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/AppComponentContext.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/AppComponentContext.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.utils +package org.apache.solr.ui.utils import com.arkivanov.decompose.GenericComponentContext diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/CoroutineContextOwner.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/CoroutineContextOwner.kt similarity index 96% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/CoroutineContextOwner.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/CoroutineContextOwner.kt index a39de3dfcaf..d39edc9d809 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/CoroutineContextOwner.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/CoroutineContextOwner.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.utils +package org.apache.solr.ui.utils import kotlin.coroutines.CoroutineContext diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/CoroutineScopeExt.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/CoroutineScopeExt.kt similarity index 98% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/CoroutineScopeExt.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/CoroutineScopeExt.kt index d744cb612f7..ed9f8d1a15a 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/CoroutineScopeExt.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/CoroutineScopeExt.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.utils +package org.apache.solr.ui.utils import com.arkivanov.essenty.lifecycle.Lifecycle import com.arkivanov.essenty.lifecycle.LifecycleOwner diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/DefaultAppComponentContext.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/DefaultAppComponentContext.kt similarity index 98% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/DefaultAppComponentContext.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/DefaultAppComponentContext.kt index 4fea772bc68..e648bf68045 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/DefaultAppComponentContext.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/DefaultAppComponentContext.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.utils +package org.apache.solr.ui.utils import com.arkivanov.decompose.ComponentContext import com.arkivanov.decompose.ComponentContextFactory diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/HttpClientUtils.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/HttpClientUtils.kt similarity index 97% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/HttpClientUtils.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/HttpClientUtils.kt index a615afa436f..3e894a5f938 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/utils/HttpClientUtils.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/utils/HttpClientUtils.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.utils +package org.apache.solr.ui.utils import io.ktor.client.HttpClient import io.ktor.client.plugins.contentnegotiation.ContentNegotiation diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/components/SolrCard.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/components/SolrCard.kt similarity index 97% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/components/SolrCard.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/components/SolrCard.kt index 63c0134220e..545296d01e3 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/components/SolrCard.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/components/SolrCard.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.components +package org.apache.solr.ui.views.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/CommandLineArgumentsCard.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/CommandLineArgumentsCard.kt similarity index 94% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/CommandLineArgumentsCard.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/CommandLineArgumentsCard.kt index af46e35b797..2e02e38b694 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/CommandLineArgumentsCard.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/CommandLineArgumentsCard.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.environment +package org.apache.solr.ui.views.environment import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -30,8 +30,8 @@ import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.apache.solr.composeui.ui.components.SolrCard -import org.apache.solr.composeui.ui.theme.SolrTheme +import org.apache.solr.ui.views.components.SolrCard +import org.apache.solr.ui.views.theme.SolrTheme /** * A card that displays the provided command line arguments in a list. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/EnvironmentContent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/EnvironmentContent.kt similarity index 95% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/EnvironmentContent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/EnvironmentContent.kt index 0bbba80b686..2dc20f808eb 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/EnvironmentContent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/EnvironmentContent.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.environment +package org.apache.solr.ui.views.environment import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.ExperimentalLayoutApi @@ -27,7 +27,7 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.apache.solr.composeui.components.environment.EnvironmentComponent +import org.apache.solr.ui.components.environment.EnvironmentComponent /** * Composable for loading the environment section. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/JavaPropertiesCard.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/JavaPropertiesCard.kt similarity index 93% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/JavaPropertiesCard.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/JavaPropertiesCard.kt index b6b64f4fa29..a6de782cd73 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/JavaPropertiesCard.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/JavaPropertiesCard.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.environment +package org.apache.solr.ui.views.environment import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -31,9 +31,9 @@ import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.apache.solr.composeui.components.environment.data.JavaProperty -import org.apache.solr.composeui.ui.components.SolrCard -import org.apache.solr.composeui.ui.theme.SolrTheme +import org.apache.solr.ui.components.environment.data.JavaProperty +import org.apache.solr.ui.views.components.SolrCard +import org.apache.solr.ui.views.theme.SolrTheme /** * Composable card that displays the provided java properties. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/VersionsCard.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/VersionsCard.kt similarity index 92% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/VersionsCard.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/VersionsCard.kt index 601394064b5..cec7a52dcc0 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/environment/VersionsCard.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/environment/VersionsCard.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.environment +package org.apache.solr.ui.views.environment import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row @@ -27,9 +27,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.apache.solr.composeui.components.environment.data.JvmData -import org.apache.solr.composeui.components.environment.data.Versions -import org.apache.solr.composeui.ui.components.SolrCard +import org.apache.solr.ui.components.environment.data.JvmData +import org.apache.solr.ui.components.environment.data.Versions +import org.apache.solr.ui.views.components.SolrCard /** * Composable card that displays system values related to versions. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/icons/SolrLogo.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/icons/SolrLogo.kt similarity index 84% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/icons/SolrLogo.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/icons/SolrLogo.kt index 06b6af2da7c..a2a540d0e46 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/icons/SolrLogo.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/icons/SolrLogo.kt @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.icons +package org.apache.solr.ui.views.icons import androidx.compose.foundation.Image import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import org.apache.solr.compose_ui.generated.resources.Res -import org.apache.solr.compose_ui.generated.resources.cd_solr_logo -import org.apache.solr.compose_ui.generated.resources.solr_logo_dark -import org.apache.solr.compose_ui.generated.resources.solr_logo_light +import org.apache.solr.ui.generated.resources.Res +import org.apache.solr.ui.generated.resources.cd_solr_logo +import org.apache.solr.ui.generated.resources.solr_logo_dark +import org.apache.solr.ui.generated.resources.solr_logo_light import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/logging/LoggingContent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/logging/LoggingContent.kt similarity index 90% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/logging/LoggingContent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/logging/LoggingContent.kt index 0706ff8674f..30cf6e2691a 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/logging/LoggingContent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/logging/LoggingContent.kt @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.logging +package org.apache.solr.ui.views.logging import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import org.apache.solr.composeui.components.logging.LoggingComponent +import org.apache.solr.ui.components.logging.LoggingComponent @Composable fun LoggingContent( diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/main/MainContent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/main/MainContent.kt similarity index 88% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/main/MainContent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/main/MainContent.kt index bb9f373bc8a..f0796ff4701 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/main/MainContent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/main/MainContent.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.main +package org.apache.solr.ui.views.main import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxHeight @@ -30,11 +30,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.arkivanov.decompose.extensions.compose.stack.Children import com.arkivanov.decompose.extensions.compose.subscribeAsState -import org.apache.solr.composeui.components.main.MainComponent -import org.apache.solr.composeui.components.main.integration.asMainMenu -import org.apache.solr.composeui.ui.environment.EnvironmentContent -import org.apache.solr.composeui.ui.logging.LoggingContent -import org.apache.solr.composeui.ui.navigation.NavigationSideBar +import org.apache.solr.ui.components.main.MainComponent +import org.apache.solr.ui.components.main.integration.asMainMenu +import org.apache.solr.ui.views.environment.EnvironmentContent +import org.apache.solr.ui.views.logging.LoggingContent +import org.apache.solr.ui.views.navigation.NavigationSideBar /** * The composable used for users that have already authenticated. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/navigation/Footer.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/Footer.kt similarity index 89% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/navigation/Footer.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/Footer.kt index bcaf6cfe6fa..a3333cb228f 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/navigation/Footer.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/Footer.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.navigation +package org.apache.solr.ui.views.navigation import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -46,14 +46,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.apache.solr.compose_ui.generated.resources.Res -import org.apache.solr.compose_ui.generated.resources.community -import org.apache.solr.compose_ui.generated.resources.documentation -import org.apache.solr.compose_ui.generated.resources.irc -import org.apache.solr.compose_ui.generated.resources.issue_tracker -import org.apache.solr.compose_ui.generated.resources.slack -import org.apache.solr.compose_ui.generated.resources.solr_query_syntax -import org.apache.solr.compose_ui.generated.resources.support +import org.apache.solr.ui.generated.resources.Res +import org.apache.solr.ui.generated.resources.community +import org.apache.solr.ui.generated.resources.documentation +import org.apache.solr.ui.generated.resources.irc +import org.apache.solr.ui.generated.resources.issue_tracker +import org.apache.solr.ui.generated.resources.slack +import org.apache.solr.ui.generated.resources.solr_query_syntax +import org.apache.solr.ui.generated.resources.support import org.jetbrains.compose.resources.StringResource import org.jetbrains.compose.resources.stringResource diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/navigation/MainMenu.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/MainMenu.kt similarity index 96% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/navigation/MainMenu.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/MainMenu.kt index 704790a23fa..91a11d2161a 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/navigation/MainMenu.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/MainMenu.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.navigation +package org.apache.solr.ui.views.navigation /** * An enum class that holds all the menu items of the main navigation. diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/navigation/NavigationSideBar.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt similarity index 88% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/navigation/NavigationSideBar.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt index c244199d576..a51e859296e 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/navigation/NavigationSideBar.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.navigation +package org.apache.solr.ui.views.navigation import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -49,19 +49,19 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -import org.apache.solr.compose_ui.generated.resources.Res -import org.apache.solr.compose_ui.generated.resources.logout -import org.apache.solr.compose_ui.generated.resources.nav_cluster -import org.apache.solr.compose_ui.generated.resources.nav_collections -import org.apache.solr.compose_ui.generated.resources.nav_configsets -import org.apache.solr.compose_ui.generated.resources.nav_dashboard -import org.apache.solr.compose_ui.generated.resources.nav_environment -import org.apache.solr.compose_ui.generated.resources.nav_logging -import org.apache.solr.compose_ui.generated.resources.nav_metrics -import org.apache.solr.compose_ui.generated.resources.nav_queries_and_operations -import org.apache.solr.compose_ui.generated.resources.nav_security -import org.apache.solr.compose_ui.generated.resources.nav_thread_dump -import org.apache.solr.composeui.ui.icons.SolrLogo +import org.apache.solr.ui.generated.resources.Res +import org.apache.solr.ui.generated.resources.logout +import org.apache.solr.ui.generated.resources.nav_cluster +import org.apache.solr.ui.generated.resources.nav_collections +import org.apache.solr.ui.generated.resources.nav_configsets +import org.apache.solr.ui.generated.resources.nav_dashboard +import org.apache.solr.ui.generated.resources.nav_environment +import org.apache.solr.ui.generated.resources.nav_logging +import org.apache.solr.ui.generated.resources.nav_metrics +import org.apache.solr.ui.generated.resources.nav_queries_and_operations +import org.apache.solr.ui.generated.resources.nav_security +import org.apache.solr.ui.generated.resources.nav_thread_dump +import org.apache.solr.ui.views.icons.SolrLogo import org.jetbrains.compose.resources.stringResource /** diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/root/RootContent.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/root/RootContent.kt similarity index 89% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/root/RootContent.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/root/RootContent.kt index 1fc6c7ff5d6..b30c4d5a267 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/root/RootContent.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/root/RootContent.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.root +package org.apache.solr.ui.views.root import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize @@ -23,9 +23,9 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import com.arkivanov.decompose.extensions.compose.stack.Children -import org.apache.solr.composeui.components.root.RootComponent -import org.apache.solr.composeui.ui.main.MainContent -import org.apache.solr.composeui.ui.navigation.Footer +import org.apache.solr.ui.components.root.RootComponent +import org.apache.solr.ui.views.main.MainContent +import org.apache.solr.ui.views.navigation.Footer /** * The root composable of the Compose application. This function is used as the shared entry diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/ColorFamily.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/ColorFamily.kt similarity index 96% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/ColorFamily.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/ColorFamily.kt index 1d67d153a29..49a29431f90 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/ColorFamily.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/ColorFamily.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.theme +package org.apache.solr.ui.views.theme import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Colors.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Colors.kt similarity index 99% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Colors.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Colors.kt index 19c866bae12..af76f577884 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Colors.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Colors.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.theme +package org.apache.solr.ui.views.theme import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Shapes.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Shapes.kt similarity index 97% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Shapes.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Shapes.kt index 2fe628b2ce0..0f6557739bf 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Shapes.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Shapes.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.theme +package org.apache.solr.ui.views.theme import androidx.compose.foundation.shape.CutCornerShape import androidx.compose.material3.Shapes diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Theme.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Theme.kt similarity index 98% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Theme.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Theme.kt index 751190f0468..04c5fa9804a 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Theme.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Theme.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.theme +package org.apache.solr.ui.views.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Typography.kt b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Typography.kt similarity index 99% rename from solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Typography.kt rename to solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Typography.kt index 8c49b80c270..a1bccf0127b 100644 --- a/solr/compose-ui/src/commonMain/kotlin/org/apache/solr/composeui/ui/theme/Typography.kt +++ b/solr/ui/src/commonMain/kotlin/org/apache/solr/ui/views/theme/Typography.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.theme +package org.apache.solr.ui.views.theme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Typography diff --git a/solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/components/environment/store/EnvironmentStoreProviderTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/environment/store/EnvironmentStoreProviderTest.kt similarity index 96% rename from solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/components/environment/store/EnvironmentStoreProviderTest.kt rename to solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/environment/store/EnvironmentStoreProviderTest.kt index ffa8b5a7f43..45fa54180c2 100644 --- a/solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/components/environment/store/EnvironmentStoreProviderTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/environment/store/EnvironmentStoreProviderTest.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.store +package org.apache.solr.ui.components.environment.store import com.arkivanov.mvikotlin.extensions.coroutines.stateFlow import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory @@ -24,7 +24,7 @@ import kotlin.time.Duration.Companion.seconds import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.first import kotlinx.coroutines.test.runTest -import org.apache.solr.composeui.components.environment.data.SystemData +import org.apache.solr.ui.components.environment.data.SystemData @OptIn(ExperimentalCoroutinesApi::class) class EnvironmentStoreProviderTest { diff --git a/solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/components/environment/store/MockedEnvironmentStoreClient.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/environment/store/MockedEnvironmentStoreClient.kt similarity index 85% rename from solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/components/environment/store/MockedEnvironmentStoreClient.kt rename to solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/environment/store/MockedEnvironmentStoreClient.kt index a9014cd2cc0..5f21a885c8f 100644 --- a/solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/components/environment/store/MockedEnvironmentStoreClient.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/components/environment/store/MockedEnvironmentStoreClient.kt @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.solr.composeui.components.environment.store +package org.apache.solr.ui.components.environment.store -import org.apache.solr.composeui.components.environment.data.JavaProperty -import org.apache.solr.composeui.components.environment.data.SystemData +import org.apache.solr.ui.components.environment.data.JavaProperty +import org.apache.solr.ui.components.environment.data.SystemData class MockedEnvironmentStoreClient( private val onGetSystemData: () -> Result, diff --git a/solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/ui/components/SolrCardTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/ui/components/SolrCardTest.kt similarity index 97% rename from solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/ui/components/SolrCardTest.kt rename to solr/ui/src/commonTest/kotlin/org/apache/solr/ui/ui/components/SolrCardTest.kt index baca0c6abb2..044496cfb78 100644 --- a/solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/ui/components/SolrCardTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/ui/components/SolrCardTest.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.components +package org.apache.solr.ui.views.components import androidx.compose.material3.Text import androidx.compose.ui.Modifier diff --git a/solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/ui/environment/EnvironmentContentTest.kt b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/ui/environment/EnvironmentContentTest.kt similarity index 91% rename from solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/ui/environment/EnvironmentContentTest.kt rename to solr/ui/src/commonTest/kotlin/org/apache/solr/ui/ui/environment/EnvironmentContentTest.kt index 58afa8cece9..8a017113c50 100644 --- a/solr/compose-ui/src/commonTest/kotlin/org/apache/solr/composeui/ui/environment/EnvironmentContentTest.kt +++ b/solr/ui/src/commonTest/kotlin/org/apache/solr/ui/ui/environment/EnvironmentContentTest.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.ui.environment +package org.apache.solr.ui.views.environment import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.onNodeWithText @@ -23,8 +23,8 @@ import androidx.compose.ui.test.runComposeUiTest import kotlin.test.Test import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.apache.solr.composeui.components.environment.EnvironmentComponent -import org.apache.solr.composeui.components.environment.data.Versions +import org.apache.solr.ui.components.environment.EnvironmentComponent +import org.apache.solr.ui.components.environment.data.Versions class EnvironmentContentTest { diff --git a/solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/Main.kt b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/Main.kt similarity index 88% rename from solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/Main.kt rename to solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/Main.kt index dc1d2382d63..fa8449bd325 100644 --- a/solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/Main.kt +++ b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/Main.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui +package org.apache.solr.ui import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.fillMaxSize @@ -31,12 +31,12 @@ import com.arkivanov.mvikotlin.core.utils.setMainThreadId import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory import java.awt.Dimension import kotlinx.coroutines.Dispatchers -import org.apache.solr.composeui.components.root.RootComponent -import org.apache.solr.composeui.components.root.integration.SimpleRootComponent -import org.apache.solr.composeui.ui.root.RootContent -import org.apache.solr.composeui.ui.theme.SolrTheme -import org.apache.solr.composeui.utils.DefaultAppComponentContext -import org.apache.solr.composeui.utils.getDefaultClient +import org.apache.solr.ui.components.root.RootComponent +import org.apache.solr.ui.components.root.integration.SimpleRootComponent +import org.apache.solr.ui.views.root.RootContent +import org.apache.solr.ui.views.theme.SolrTheme +import org.apache.solr.ui.utils.DefaultAppComponentContext +import org.apache.solr.ui.utils.getDefaultClient /** * Entry point of the Compose application for all JVM-based (desktop) targets. diff --git a/solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/Utils.kt b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/Utils.kt similarity index 97% rename from solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/Utils.kt rename to solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/Utils.kt index 4f351f201bf..5e8d1193f32 100644 --- a/solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/Utils.kt +++ b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/Utils.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui +package org.apache.solr.ui import javax.swing.SwingUtilities diff --git a/solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/preview/PreviewContainer.kt b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/preview/PreviewContainer.kt similarity index 93% rename from solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/preview/PreviewContainer.kt rename to solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/preview/PreviewContainer.kt index 36266ec2871..ff54a61c919 100644 --- a/solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/preview/PreviewContainer.kt +++ b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/preview/PreviewContainer.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui.preview +package org.apache.solr.ui.preview import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding @@ -23,7 +23,7 @@ import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.apache.solr.composeui.ui.theme.SolrTheme +import org.apache.solr.ui.views.theme.SolrTheme /** * This preview container can be used for applying the basic app theme on existing components. diff --git a/solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/preview/navigation/PreviewNavigationSideBar.kt b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/preview/navigation/PreviewNavigationSideBar.kt similarity index 85% rename from solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/preview/navigation/PreviewNavigationSideBar.kt rename to solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/preview/navigation/PreviewNavigationSideBar.kt index 24084f0379a..d3a00fc9ebe 100644 --- a/solr/compose-ui/src/desktopMain/kotlin/org/apache/solr/composeui/preview/navigation/PreviewNavigationSideBar.kt +++ b/solr/ui/src/desktopMain/kotlin/org/apache/solr/ui/preview/navigation/PreviewNavigationSideBar.kt @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.solr.composeui.preview.navigation +package org.apache.solr.ui.preview.navigation import androidx.compose.desktop.ui.tooling.preview.Preview import androidx.compose.runtime.Composable -import org.apache.solr.composeui.preview.PreviewContainer -import org.apache.solr.composeui.ui.navigation.NavigationSideBar +import org.apache.solr.ui.preview.PreviewContainer +import org.apache.solr.ui.views.navigation.NavigationSideBar @Preview @Composable diff --git a/solr/compose-ui/src/wasmJsMain/kotlin/org/apache/solr/composeui/Main.kt b/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/Main.kt similarity index 86% rename from solr/compose-ui/src/wasmJsMain/kotlin/org/apache/solr/composeui/Main.kt rename to solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/Main.kt index 8c537707f3d..2bb836c657e 100644 --- a/solr/compose-ui/src/wasmJsMain/kotlin/org/apache/solr/composeui/Main.kt +++ b/solr/ui/src/wasmJsMain/kotlin/org/apache/solr/ui/Main.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.composeui +package org.apache.solr.ui import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.fillMaxSize @@ -30,12 +30,12 @@ import io.ktor.http.Url import kotlinx.browser.document import kotlinx.browser.window import kotlinx.coroutines.Dispatchers -import org.apache.solr.composeui.components.root.RootComponent -import org.apache.solr.composeui.components.root.integration.SimpleRootComponent -import org.apache.solr.composeui.ui.root.RootContent -import org.apache.solr.composeui.ui.theme.SolrTheme -import org.apache.solr.composeui.utils.DefaultAppComponentContext -import org.apache.solr.composeui.utils.getDefaultClient +import org.apache.solr.ui.components.root.RootComponent +import org.apache.solr.ui.components.root.integration.SimpleRootComponent +import org.apache.solr.ui.views.root.RootContent +import org.apache.solr.ui.views.theme.SolrTheme +import org.apache.solr.ui.utils.DefaultAppComponentContext +import org.apache.solr.ui.utils.getDefaultClient /** * Entry point of the Compose application for all wasmJs (browser) targets. diff --git a/solr/compose-ui/src/wasmJsMain/resources/index.html b/solr/ui/src/wasmJsMain/resources/index.html similarity index 100% rename from solr/compose-ui/src/wasmJsMain/resources/index.html rename to solr/ui/src/wasmJsMain/resources/index.html diff --git a/solr/compose-ui/src/wasmJsMain/resources/styles.css b/solr/ui/src/wasmJsMain/resources/styles.css similarity index 100% rename from solr/compose-ui/src/wasmJsMain/resources/styles.css rename to solr/ui/src/wasmJsMain/resources/styles.css diff --git a/solr/compose-ui/webpack.config.d/adjust-limits.js b/solr/ui/webpack.config.d/adjust-limits.js similarity index 100% rename from solr/compose-ui/webpack.config.d/adjust-limits.js rename to solr/ui/webpack.config.d/adjust-limits.js diff --git a/solr/webapp/build.gradle b/solr/webapp/build.gradle index 1da248f9cbe..b4d6b3df56b 100644 --- a/solr/webapp/build.gradle +++ b/solr/webapp/build.gradle @@ -94,22 +94,22 @@ task downloadBrowserify(type: NpmTask) { outputs.dir("${nodeProjectDir}/node_modules/browserify") } -tasks.register("generateComposeUiDevFiles") { +tasks.register("generateUiDevFiles") { description = "Generate new UI for development and add files to outputs for later referencing." group = "build" // Development files are larger in size but have shorter compile times. - dependsOn project(":solr:compose-ui").tasks.wasmJsBrowserDevelopmentExecutableDistribution - outputs.dir(project(":solr:compose-ui").file("build/dist/wasmJs/developmentExecutable/")) + dependsOn project(":solr:ui").tasks.wasmJsBrowserDevelopmentExecutableDistribution + outputs.dir(project(":solr:ui").file("build/dist/wasmJs/developmentExecutable/")) } -tasks.register("generateComposeUiProdFiles") { +tasks.register("generateUiProdFiles") { description = "Generate new UI for production and add files to outputs for later referencing" group = "build" // Production files are smaller in size but have longer compile times. - dependsOn project(":solr:compose-ui").tasks.wasmJsBrowserDistribution - outputs.dir(project(":solr:compose-ui").file("build/dist/wasmJs/productionExecutable/")) + dependsOn project(":solr:ui").tasks.wasmJsBrowserDistribution + outputs.dir(project(":solr:ui").file("build/dist/wasmJs/productionExecutable/")) } task generateJsClientBundle(type: NpxTask) { @@ -160,12 +160,12 @@ war { // Include new Admin UI files in webapp // By default, we always build dev that does not optimize generated files for release to reduce build times. if (rootProject.ext.development) { - from (tasks.generateComposeUiDevFiles) { - into "compose" + from (tasks.generateUiDevFiles) { + into "ui" } } else { - from (tasks.generateComposeUiProdFiles) { - into "compose" + from (tasks.generateUiProdFiles) { + into "ui" } } } diff --git a/solr/webapp/web/index.html b/solr/webapp/web/index.html index 29ec87ac764..7e692e0efcd 100644 --- a/solr/webapp/web/index.html +++ b/solr/webapp/web/index.html @@ -194,7 +194,7 @@

Connection recovered...

  • Thread Dump

    • -

  • Open New UI

    • +

  • Open New UI

    • diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/js/angular/app.js index 57814595145..abdd53f0c59 100644 --- a/solr/webapp/web/js/angular/app.js +++ b/solr/webapp/web/js/angular/app.js @@ -67,8 +67,8 @@ solrAdminApp.config([ templateUrl: 'partials/index.html', controller: 'IndexController' }). - when('/compose', { - redirectTo: 'compose/index.html' + when('/ui', { + redirectTo: 'ui/index.html' }). when('/unknown', { templateUrl: 'partials/unknown.html',