Apache Solr open-source search software
SOLR-18493: Rename Index & Query section in new admin UI (#4994)
Jane Sandberg8f926b6532cd
diff --git a/changelog/unreleased/SOLR-18493-rename-index-query-new-ui.yml b/changelog/unreleased/SOLR-18493-rename-index-query-new-ui.ymlnew file mode 100644index 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-18493diff --git a/ui/shared/src/commonMain/composeResources/values/strings.xml b/ui/shared/src/commonMain/composeResources/values/strings.xmlindex 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.ktindex 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@Serializabledata object Environment : Configuration@@ -211,7 +211,7 @@ class DefaultMainComponent internal constructor(MainMenu.Security -> Configuration.SecurityMainMenu.Configsets -> Configuration.ConfigsetsMainMenu.Collections -> Configuration.Collections- MainMenu.QueriesAndOperations -> Configuration.QueriesAndOperations+ MainMenu.IndexAndQuery -> Configuration.IndexAndQueryMainMenu.Environment -> Configuration.EnvironmentMainMenu.Logging -> Configuration.LoggingMainMenu.ThreadDump -> Configuration.ThreadDumpdiff --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.ktindex 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.ktindex 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_dashboardimport org.apache.solr.ui.shared.generated.resources.nav_environmentimport org.apache.solr.ui.shared.generated.resources.nav_loggingimport 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_queryimport org.apache.solr.ui.shared.generated.resources.nav_securityimport org.apache.solr.ui.shared.generated.resources.nav_thread_dumpimport 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_securityMainMenu.Configsets -> Res.string.nav_configsetsMainMenu.Collections -> Res.string.nav_collections- MainMenu.QueriesAndOperations -> Res.string.nav_queries_and_operations+ MainMenu.IndexAndQuery -> Res.string.nav_index_and_queryMainMenu.Environment -> Res.string.nav_environmentMainMenu.Logging -> Res.string.nav_loggingMainMenu.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_admissionMainMenu.Environment -> if (isSelected) Res.drawable.memory_filled else Res.drawable.memory