You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2020/06/22 05:04:46 UTC
[isis] branch master updated: ISIS-2350 match menu items based on
their action title
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 4bbc38e ISIS-2350 match menu items based on their action title
new 66efd8c Merge remote-tracking branch 'origin/master'
4bbc38e is described below
commit 4bbc38e555e2149a47f48fbbeec0a74ce7f409fc
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Mon Jun 22 07:04:01 2020 +0200
ISIS-2350 match menu items based on their action title
---
.../apache/isis/client/kroviz/ui/kv/MenuFactory.kt | 37 ++++++++++++++--------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/MenuFactory.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/MenuFactory.kt
index 4c0d05d..3a6f343 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/MenuFactory.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/ui/kv/MenuFactory.kt
@@ -80,24 +80,29 @@ object MenuFactory {
withText = false)
}
- private fun findMenuByTitle(title: String): Menu? {
+ private fun findMenuByTitle(menuTitle: String): Menu? {
val menuBars = EventStore.findMenuBars()!!.obj as Menubars
- var menu = findMenu(menuBars.primary, title)
- if (menu == null) menu = findMenu(menuBars.secondary, title)
- if (menu == null) menu = findMenu(menuBars.tertiary, title)
+ var menu = findMenu(menuBars.primary, menuTitle)
+ if (menu == null) menu = findMenu(menuBars.secondary, menuTitle)
+ if (menu == null) menu = findMenu(menuBars.tertiary, menuTitle)
return menu
}
- private fun findMenu(menuEntry: MenuEntry, title: String): Menu? {
- return menuEntry.menu.firstOrNull { it.named == title }
+ private fun findMenu(menuEntry: MenuEntry, menuTitle: String): Menu? {
+ return menuEntry.menu.firstOrNull { it.named == menuTitle }
}
- fun buildForAction(menuTitle: String, actionTitle: String): KvisionHtmlLink? {
+ fun buildForAction(
+ menuTitle: String,
+ actionTitle: String): KvisionHtmlLink? {
+ console.log("[MF.buildForAction] $menuTitle / $actionTitle")
val menu = findMenuByTitle(menuTitle)!!
menu.section.forEachIndexed { _, section ->
section.serviceAction.forEach { sa ->
- if (actionTitle == sa.named) {
- val action = buildActionLink(sa.id!!, menuTitle)
+ val saTitle = Utils.deCamel(sa.id!!)
+ console.log(saTitle)
+ if (saTitle == actionTitle) {
+ val action = buildActionLink(sa.id, menuTitle)
action.label = ""
action.onClick {
ActionDispatcher().invoke(sa.link!!)
@@ -109,15 +114,17 @@ object MenuFactory {
return null
}
- private fun buildActionLink(label: String, menuTitle: String): KvisionHtmlLink {
+ private fun buildActionLink(
+ label: String,
+ menuTitle: String): KvisionHtmlLink {
val actionTitle = Utils.deCamel(label)
val actionLink: KvisionHtmlLink = ddLink(
label = actionTitle,
icon = IconManager.find(label),
classes = IconManager.findStyleFor(label))
- val title = "$menuTitle${Constants.actionSeparator}$actionTitle"
- actionLink.setDragDropData(Constants.format, title)
- actionLink.id = title
+ val id = "$menuTitle${Constants.actionSeparator}$actionTitle"
+ actionLink.setDragDropData(Constants.format, id)
+ actionLink.id = id
return actionLink
}
@@ -140,7 +147,9 @@ object MenuFactory {
}
// initially added items will be enabled
- fun amendWithSaveUndo(dd: DropDown, tObject: TObject) {
+ fun amendWithSaveUndo(
+ dd: DropDown,
+ tObject: TObject) {
dd.separator()
val saveLink = tObject.links.first()