This is an automated email from the ASF dual-hosted git repository.
malliaridis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 8f926b6532c SOLR-18493: Rename Index & Query section in new admin UI
(#4994)
8f926b6532c is described below
commit 8f926b6532cdc625d11d91a1c99310c8de63e96f
Author: Jane Sandberg <[email protected]>
AuthorDate: Wed Oct 7 03:21:43 2026 -0700
SOLR-18493: Rename Index & Query section in new admin UI (#4994)
---
changelog/unreleased/SOLR-18493-rename-index-query-new-ui.yml | 7 +++++++
ui/shared/src/commonMain/composeResources/values/strings.xml | 2 +-
.../solr/ui/components/main/integration/DefaultMainComponent.kt | 4 ++--
.../kotlin/org/apache/solr/ui/views/navigation/MainMenu.kt | 2 +-
.../org/apache/solr/ui/views/navigation/NavigationSideBar.kt | 6 +++---
5 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/changelog/unreleased/SOLR-18493-rename-index-query-new-ui.yml
b/changelog/unreleased/SOLR-18493-rename-index-query-new-ui.yml
new file mode 100644
index 00000000000..4aa6ca6af89
--- /dev/null
+++ b/changelog/unreleased/SOLR-18493-rename-index-query-new-ui.yml
@@ -0,0 +1,7 @@
+title: Rename Index & Query section in new admin UI
+type: changed
+authors:
+ - name: Jane Sandberg
+links:
+ - name: SOLR-18493
+ url: https://issues.apache.org/jira/browse/SOLR-18493
diff --git a/ui/shared/src/commonMain/composeResources/values/strings.xml
b/ui/shared/src/commonMain/composeResources/values/strings.xml
index 57c9927b34e..1b28a6a8189 100644
--- a/ui/shared/src/commonMain/composeResources/values/strings.xml
+++ b/ui/shared/src/commonMain/composeResources/values/strings.xml
@@ -56,7 +56,7 @@
<string name="nav_environment">Environment</string>
<string name="nav_logging">Logging</string>
<string name="nav_metrics">Metrics</string>
- <string name="nav_queries_and_operations">Queries & Operations</string>
+ <string name="nav_index_and_query">Index & Query</string>
<string name="nav_security">Security</string>
<string name="nav_thread_dump">Thread Dump</string>
diff --git
a/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.kt
b/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.kt
index 1a354267c43..d3374d0b49a 100644
---
a/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.kt
+++
b/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/components/main/integration/DefaultMainComponent.kt
@@ -192,7 +192,7 @@ class DefaultMainComponent internal constructor(
data object Collections : Configuration
@Serializable
- data object QueriesAndOperations : Configuration
+ data object IndexAndQuery : Configuration
@Serializable
data object Environment : Configuration
@@ -211,7 +211,7 @@ class DefaultMainComponent internal constructor(
MainMenu.Security -> Configuration.Security
MainMenu.Configsets -> Configuration.Configsets
MainMenu.Collections -> Configuration.Collections
- MainMenu.QueriesAndOperations -> Configuration.QueriesAndOperations
+ MainMenu.IndexAndQuery -> Configuration.IndexAndQuery
MainMenu.Environment -> Configuration.Environment
MainMenu.Logging -> Configuration.Logging
MainMenu.ThreadDump -> Configuration.ThreadDump
diff --git
a/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/MainMenu.kt
b/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/MainMenu.kt
index 91a11d2161a..c1791069082 100644
---
a/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/MainMenu.kt
+++
b/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/MainMenu.kt
@@ -31,7 +31,7 @@ enum class MainMenu {
Security,
Configsets,
Collections,
- QueriesAndOperations,
+ IndexAndQuery,
Environment,
Logging,
ThreadDump,
diff --git
a/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt
b/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt
index 86a5ada0eb4..06f79f96c2f 100644
---
a/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt
+++
b/ui/shared/src/commonMain/kotlin/org/apache/solr/ui/views/navigation/NavigationSideBar.kt
@@ -58,7 +58,7 @@ import
org.apache.solr.ui.shared.generated.resources.nav_dashboard
import org.apache.solr.ui.shared.generated.resources.nav_environment
import org.apache.solr.ui.shared.generated.resources.nav_logging
import org.apache.solr.ui.shared.generated.resources.nav_metrics
-import org.apache.solr.ui.shared.generated.resources.nav_queries_and_operations
+import org.apache.solr.ui.shared.generated.resources.nav_index_and_query
import org.apache.solr.ui.shared.generated.resources.nav_security
import org.apache.solr.ui.shared.generated.resources.nav_thread_dump
import org.apache.solr.ui.shared.generated.resources.other_admission
@@ -177,7 +177,7 @@ private fun getMainMenuText(item: MainMenu) = when (item) {
MainMenu.Security -> Res.string.nav_security
MainMenu.Configsets -> Res.string.nav_configsets
MainMenu.Collections -> Res.string.nav_collections
- MainMenu.QueriesAndOperations -> Res.string.nav_queries_and_operations
+ MainMenu.IndexAndQuery -> Res.string.nav_index_and_query
MainMenu.Environment -> Res.string.nav_environment
MainMenu.Logging -> Res.string.nav_logging
MainMenu.ThreadDump -> Res.string.nav_thread_dump
@@ -200,7 +200,7 @@ private fun getMenuIcon(
MainMenu.Collections -> Res.drawable.apps
- MainMenu.QueriesAndOperations ->
+ MainMenu.IndexAndQuery ->
if (isSelected) Res.drawable.other_admission_filled else
Res.drawable.other_admission
MainMenu.Environment -> if (isSelected) Res.drawable.memory_filled else
Res.drawable.memory
