You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by jo...@apache.org on 2023/06/07 07:22:11 UTC
[causeway] 01/01: kvision=6.3.2, compiler=ir, kotlin=1.8.21
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch kvision-6-upgrade
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit ab7fbf10de7175b67e2aea2a77989255d6289324
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Wed Jun 7 08:58:59 2023 +0200
kvision=6.3.2, compiler=ir, kotlin=1.8.21
---
incubator/clients/kroviz/TODO.adoc | 11 ---
.../kroviz/partials/design/uml-exposer.adoc | 54 ++++++++++
incubator/clients/kroviz/build.gradle.kts | 37 +++----
incubator/clients/kroviz/gradle.properties | 10 +-
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
.../org/apache/causeway/client/kroviz/App.kt | 12 +--
.../client/kroviz/core/model/CollectionDM.kt | 6 +-
.../causeway/client/kroviz/core/model/Exposer.kt | 50 +++++++---
.../causeway/client/kroviz/core/model/ObjectDM.kt | 4 +-
.../client/kroviz/core/model/PropertyDetails.kt | 3 +
.../org/apache/causeway/client/kroviz/to/Member.kt | 2 +-
.../apache/causeway/client/kroviz/to/TypeMapper.kt | 6 +-
.../client/kroviz/ui/builder/ColBuilder.kt | 28 +++---
.../client/kroviz/ui/builder/FieldSetBuilder.kt | 2 +-
.../client/kroviz/ui/core/ColumnFactory.kt | 109 ++++++++++++++-------
.../client/kroviz/ui/core/FormPanelFactory.kt | 40 +++++---
.../causeway/client/kroviz/ui/core/RoDialog.kt | 36 ++++---
.../causeway/client/kroviz/ui/core/RoIconBar.kt | 9 +-
.../causeway/client/kroviz/ui/core/RoMenuBar.kt | 3 +-
.../causeway/client/kroviz/ui/core/RoStatusBar.kt | 6 +-
.../causeway/client/kroviz/ui/core/RoTable.kt | 69 ++++++-------
.../causeway/client/kroviz/ui/core/ViewManager.kt | 1 -
.../causeway/client/kroviz/ui/diagram/Tree.kt | 3 -
.../client/kroviz/ui/dialog/ActionPrompt.kt | 4 +-
.../client/kroviz/ui/dialog/EventExportDialog.kt | 4 +-
.../client/kroviz/ui/dialog/EventImportDialog.kt | 4 +-
.../client/kroviz/ui/dialog/LoginPrompt.kt | 4 +-
.../client/kroviz/ui/kv/override/RoTabPanel.kt | 21 ++--
.../client/kroviz/ui/kv/override/RoWindow.kt | 12 +--
.../client/kroviz/ui/panel/DropdownSearch.kt | 70 -------------
.../causeway/client/kroviz/ui/panel/ImageSample.kt | 10 +-
.../client/kroviz/ui/panel/PlantumlPanel.kt | 2 +-
.../causeway/client/kroviz/utils/IconManager.kt | 10 ++
.../causeway/client/kroviz/IntegrationTest.kt | 1 +
.../client/kroviz/core/model/ExposerTest.kt | 4 +-
.../client/kroviz/ui/table/TableFactoryTest.kt | 3 +-
36 files changed, 350 insertions(+), 302 deletions(-)
diff --git a/incubator/clients/kroviz/TODO.adoc b/incubator/clients/kroviz/TODO.adoc
deleted file mode 100644
index a5b9e4e5a8..0000000000
--- a/incubator/clients/kroviz/TODO.adoc
+++ /dev/null
@@ -1,11 +0,0 @@
-= KVision
-
-* upgrade to 5.latest, kotlin to 1.5.10
-* revert patch to build.gradle.kts
-* https://github.com/rjaros/kvision/issues/306 (select in dropdown)
-* https://github.com/rjaros/kvision/issues/247 (map to fill whole container)
-* https://github.com/rjaros/kvision/issues/299 (header footer access)
-* Remove duplicated / copied KV files
-
-= Long Term
-* use docker for integration test
diff --git a/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-exposer.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-exposer.adoc
new file mode 100644
index 0000000000..ed6f2ab877
--- /dev/null
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/partials/design/uml-exposer.adoc
@@ -0,0 +1,54 @@
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+
+.Exposer Diagram
+[plantuml,file="uml-exposer.png"]
+----
+@startuml
+
+class Exposer {
+ delegate: TObject
+ dynamize(): dynamic
+}
+
+class TObject #LightGreen {
+ properties: List<Member>
+ actions: List<Member>
+}
+
+Exposer -right-> TObject
+class Member #LightBlue {
+ id: String
+ memberType: Enum
+ value: {String | Number | etc.}
+}
+TObject *-right- Member : has Members \nof type PROPERTY
+
+note bottom of Exposer
+dynamize() turns an Exposer into a JS object - like as dynamic().
+It adds all properties of its delegate as key/value pairs.
+end note
+
+note top of TObject
+is a kind of meta class.
+Various types of object differ in their
+* properties
+* actions
+* collections
+end note
+
+class JsObject {
+ id_1: <MemberType_1>
+ id_2: <MemberType_2>
+ id_n: <MemberType_n>
+}
+
+Exposer ..> JsObject : dynamize() creates
+
+note bottom of JsObject
+when dynamize() has been applied to Exposer,
+all its delegates members of type property are
+available on the outside
+end note
+
+@enduml
+----
diff --git a/incubator/clients/kroviz/build.gradle.kts b/incubator/clients/kroviz/build.gradle.kts
index ec18720abc..f7e7613a7f 100644
--- a/incubator/clients/kroviz/build.gradle.kts
+++ b/incubator/clients/kroviz/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
val kotlinVersion: String by System.getProperties()
kotlin("plugin.serialization") version kotlinVersion
kotlin("js") version kotlinVersion
+
val kvisionVersion: String by System.getProperties()
id("io.kvision") version kvisionVersion
}
@@ -36,7 +37,6 @@ kotlin.sourceSets.all {
repositories {
maven ("https://repository.int.kn/nexus/content/repositories/thirdparty/")
mavenCentral()
- jcenter()
google()
mavenLocal()
}
@@ -76,43 +76,38 @@ kotlin {
binaries.executable()
}
sourceSets["main"].dependencies {
+ implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
implementation(npm("react-awesome-button", "*"))
implementation(npm("prop-types", "*"))
implementation("io.kvision:kvision:$kvisionVersion")
implementation("io.kvision:kvision-bootstrap:$kvisionVersion")
- implementation("io.kvision:kvision-bootstrap-css:$kvisionVersion")
- implementation("io.kvision:kvision-bootstrap-datetime:$kvisionVersion")
- implementation("io.kvision:kvision-bootstrap-dialog:$kvisionVersion")
- implementation("io.kvision:kvision-bootstrap-select:$kvisionVersion")
- implementation("io.kvision:kvision-bootstrap-spinner:$kvisionVersion")
- implementation("io.kvision:kvision-bootstrap-typeahead:$kvisionVersion")
implementation("io.kvision:kvision-bootstrap-upload:$kvisionVersion")
+ implementation("io.kvision:kvision-datetime:$kvisionVersion")
+ implementation("io.kvision:kvision-tom-select:$kvisionVersion")
implementation("io.kvision:kvision-fontawesome:$kvisionVersion")
implementation("io.kvision:kvision-i18n:$kvisionVersion")
implementation("io.kvision:kvision-richtext:$kvisionVersion")
implementation("io.kvision:kvision-handlebars:$kvisionVersion")
- implementation("io.kvision:kvision-datacontainer:$kvisionVersion")
implementation("io.kvision:kvision-chart:$kvisionVersion")
implementation("io.kvision:kvision-tabulator:$kvisionVersion")
implementation("io.kvision:kvision-pace:$kvisionVersion")
- implementation("io.kvision:kvision-toast:$kvisionVersion")
implementation("io.kvision:kvision-react:$kvisionVersion")
implementation("io.kvision:kvision-routing-navigo:$kvisionVersion")
implementation("io.kvision:kvision-state:$kvisionVersion")
implementation("io.kvision:kvision-rest:$kvisionVersion")
- implementation("io.kvision:kvision-moment:$kvisionVersion")
implementation("io.kvision:kvision-maps:$kvisionVersion")
- implementation(npm("xmltojson", "1.3.5", false))
- implementation(npm("flatted", "3.2.2", false))
- implementation(npm("diff", "5.0.0", false))
- implementation(npm("diff2html", "3.4.13", false))
- implementation(npm("xml-beautify", "1.1.2", false))
- implementation(npm("xterm", "4.15.0", false))
- implementation(npm("pdfjs", "2.4.7", false))
- implementation(npm("vega", "5.22.1", false))
- implementation(npm("vega-lite", "5.6.0", true))
- implementation(npm("element-resize-event", "3.0.6", false))
- implementation(npm("asciidoctor", "2.2.6", false))
+ implementation("io.kvision:kvision-jquery:$kvisionVersion")
+ implementation(npm("xmltojson", "1.3.5"))
+ implementation(npm("flatted", "3.2.7"))
+ implementation(npm("diff", "5.0.0"))
+ implementation(npm("diff2html", "3.4.13"))
+ implementation(npm("xml-beautify", "1.1.2"))
+ implementation(npm("xterm", "4.15.0"))
+ implementation(npm("pdfjs", "2.4.7"))
+ implementation(npm("vega", "5.22.1"))
+ implementation(npm("vega-lite", "5.6.0"))
+ implementation(npm("element-resize-event", "3.0.6"))
+ implementation(npm("asciidoctor", "2.2.6"))
}
sourceSets["test"].dependencies {
implementation(kotlin("test-js"))
diff --git a/incubator/clients/kroviz/gradle.properties b/incubator/clients/kroviz/gradle.properties
index a5f5c4ffad..0935f863fb 100644
--- a/incubator/clients/kroviz/gradle.properties
+++ b/incubator/clients/kroviz/gradle.properties
@@ -16,14 +16,14 @@
# specific language governing permissions and limitations
# under the License.
#
-javaVersion=1.8
+javaVersion=17
#Plugins
systemProp.kotlinVersion=1.8.21
-serializationVersion=1.3.3
+serializationVersion=1.5.0
#Dependencies
-systemProp.kvisionVersion=5.15.3
-coroutinesVersion=1.5.2
+systemProp.kvisionVersion=6.3.2
+coroutinesVersion=1.6.4
kotlin.mpp.stability.nowarn=true
-kotlin.js.compiler=legacy
+kotlin.js.compiler=ir
org.gradle.jvmargs=-Xmx2g
diff --git a/incubator/clients/kroviz/gradle/wrapper/gradle-wrapper.properties b/incubator/clients/kroviz/gradle/wrapper/gradle-wrapper.properties
index 9008281fc9..fae08049a6 100644
--- a/incubator/clients/kroviz/gradle/wrapper/gradle-wrapper.properties
+++ b/incubator/clients/kroviz/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1grad-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/App.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/App.kt
index a207a53e53..9596dc8836 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/App.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/App.kt
@@ -61,15 +61,15 @@ fun main() {
BootstrapModule,
BootstrapCssModule,
FontAwesomeModule,
- BootstrapSelectModule,
- BootstrapDatetimeModule,
- BootstrapSpinnerModule,
- BootstrapTypeaheadModule,
- BootstrapUploadModule,
+// BootstrapSelectModule,
+// BootstrapDatetimeModule,
+// BootstrapSpinnerModule,
+// BootstrapTypeaheadModule,
+// BootstrapUploadModule,
RichTextModule,
ChartModule,
TabulatorModule,
CoreModule,
- panelsCompatibilityMode = true,
+// panelsCompatibilityMode = true,
)
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/CollectionDM.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/CollectionDM.kt
index 1f1f47c6c5..ebf19cd706 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/CollectionDM.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/CollectionDM.kt
@@ -72,9 +72,9 @@ class CollectionDM(override var title: String) : DisplayModelWithLayout() {
override fun addData(obj: TransferObject) {
rawData.add(obj)
- val exo = Exposer(obj as TObject)
- //if exposer is not dynamised, data access in Tabulator tables won't work
- data.add(exo.dynamise() as Exposer)
+ val tObj = obj as TObject
+ val exo = Exposer(tObj)
+ data.add(exo)
}
override fun reset() {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/Exposer.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/Exposer.kt
index dc3fc88722..ad70301e90 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/Exposer.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/Exposer.kt
@@ -19,50 +19,70 @@
package org.apache.causeway.client.kroviz.core.model
import kotlinx.serialization.Serializable
+import org.apache.causeway.client.kroviz.core.event.ResourceSpecification
import org.apache.causeway.client.kroviz.to.Icon
import org.apache.causeway.client.kroviz.to.MemberType
import org.apache.causeway.client.kroviz.to.TObject
+import org.apache.causeway.client.kroviz.ui.core.SessionManager
import org.apache.causeway.client.kroviz.utils.IconManager
/**
- * Makes properties of delegate available for display in Lists.
+ * Makes properties of delegate available for display in tables.
* For regular TObjects these are members (properties).
* For FixtureResults these are: result, resultClass etc.
*
* Exposer bears some similarity to the JS "Revealing Module Pattern"
* (see: https://addyosmani.com/resources/essentialjsdesignpatterns/book/),
- * but it goes further since it even reveals members of it's delegate.
+ * but it goes further since it even reveals members of its delegate.
*/
-@Serializable
class Exposer(val delegate: TObject) {
+ val iconName: String = IconManager.findFor(delegate) //required by ColumnFactory
+ val exhibit: Exhibit
- var iconName = "" //required by ColumnFactory
-
- fun dynamise(): dynamic {
- val thys = this.asDynamic()
+ init {
+ val delegateUrl = getDelegateUrl()
+ exhibit = Exhibit(delegateUrl)
for (m in delegate.members) {
val member = m.value
if (member.memberType == MemberType.PROPERTY.type) {
val realValue = member.value
if (realValue != null) {
- thys[member.id] = realValue.content
+ (exhibit.asDynamic())[member.id] = realValue.content
}
}
}
- iconName = IconManager.find(delegate.title)
- if (iconName == IconManager.DEFAULT_ICON) {
- iconName = IconManager.find(delegate.domainType)
- }
- return thys
}
- // eg. for dataNucleusId
+ /** delegate:TObject is here 'dehydrated' to it's url and
+ * in Exhibit.getDelegate() it's 'rehydrated' back to TObject -
+ * otherwise there would be issues with serialization. */
+ private fun getDelegateUrl(): String {
+ val eventStore = SessionManager.getEventStore()
+ val le = eventStore.findBy(delegate)
+ return le?.url ?: ""
+ }
+
+ fun getWithDelegateProperties(): dynamic {
+ return exhibit.asDynamic()
+ }
+
fun get(propertyName: String): Any? {
return this.delegate.getProperty(propertyName)?.value
}
fun setIcon(icon: Icon) {
- this.asDynamic()["icon"] = icon.image.src
+ exhibit.asDynamic()["icon"] = icon.image.src
}
}
+
+@Serializable
+class Exhibit(private val url: String) {
+
+ fun getDelegate(): TObject {
+ val rs = ResourceSpecification(url)
+ val le = SessionManager.getEventStore().findBy(rs)
+ return le!!.getTransferObject() as TObject
+ }
+
+}
\ No newline at end of file
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/ObjectDM.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/ObjectDM.kt
index 9edca84dff..aeb990a22e 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/ObjectDM.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/ObjectDM.kt
@@ -45,6 +45,8 @@ class ObjectDM(override val title: String) : DisplayModelWithLayout() {
}
fun hasCollectionModels(): Boolean {
+ console.log("[ODM_hasCollectionModels]")
+ console.log(collectionModelList)
return collectionModelList.isNotEmpty()
}
@@ -76,7 +78,7 @@ class ObjectDM(override val title: String) : DisplayModelWithLayout() {
override fun addData(obj: TransferObject) {
(obj as TObject)
val exo = Exposer(obj)
- data = exo.dynamise() as? Exposer
+ data = exo
}
fun addResult(resultObject: ResultObject) {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/PropertyDetails.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/PropertyDetails.kt
index d11e8edf6f..e400087f75 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/PropertyDetails.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/core/model/PropertyDetails.kt
@@ -20,6 +20,8 @@ package org.apache.causeway.client.kroviz.core.model
import org.apache.causeway.client.kroviz.to.Member
import org.apache.causeway.client.kroviz.to.PropertyDescription
+import org.apache.causeway.client.kroviz.to.TypeMapper
+import org.apache.causeway.client.kroviz.to.ValueType
import org.apache.causeway.client.kroviz.to.bs.PropertyBs
/**
@@ -36,6 +38,7 @@ class PropertyDetails(member: Member) {
private var isAmendedFromBs = false
private var isAmendedFromPropertyDescription = false
var typicalLength: Int = 10
+ var type = TypeMapper.match(member)
fun amendWith(pbs: PropertyBs) {
name = pbs.named
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/Member.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/Member.kt
index c2e0ae51e9..0df18d3e91 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/Member.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/Member.kt
@@ -42,7 +42,7 @@ data class Member(val id: String,
&& extensions.xCausewayFormat == "string") {
value = Value("")
}
- type = TypeMapper().match(this)
+ type = TypeMapper.match(this)
}
private fun isProperty(): Boolean {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/TypeMapper.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/TypeMapper.kt
index 29523671ac..ad2d211d7e 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/TypeMapper.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/to/TypeMapper.kt
@@ -32,7 +32,7 @@ enum class ValueType(val type: String) {
TEXT("Text"),
TEXT_AREA("TextArea"),
TIME("Time"),
- SIMPLE_SELECT("SimpleSelect"),
+ SIMPLE_SELECT("Select"),
SLIDER("Slider"),
SHELL("Shell"),
SVG_MAPPED("Map"),
@@ -40,7 +40,7 @@ enum class ValueType(val type: String) {
CANVAS("Canvas"),
}
-class TypeMapper {
+object TypeMapper {
fun match(member: Member): String {
val mf = member.format
@@ -74,7 +74,7 @@ class TypeMapper {
}
fun forType(type: String): ValueType {
- console.log("[TM_forType] $type")
+// console.log("[TM_forType] $type")
when (type) {
ValueType.BOOLEAN.type -> return ValueType.BOOLEAN
ValueType.DATE.type -> return ValueType.DATE
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/ColBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/ColBuilder.kt
index b498cf3d74..71f0548590 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/ColBuilder.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/ColBuilder.kt
@@ -83,36 +83,37 @@ class ColBuilder(
}
private fun addCollections() {
- col.collectionList.forEach {
- buildTableAndWrapInFsPanel(it)
+ console.log("[CB_addCollections]")
+ if (dsp.displayModel.hasCollectionModels()) {
+ col.collectionList.forEach {
+ console.log(it)
+ buildTableAndWrapInFsPanel(it)
+ }
}
}
private fun buildTableAndWrapInFsPanel(it: CollectionBs) {
- val id = it.id
val objectDM = dsp.displayModel
try {
- // objectDM is sometimes null
- val cdm = objectDM.getCollectionDisplayModelFor(id)!!
+ val cdm = objectDM.getCollectionDisplayModelFor(it.id)!!
val fsPanel = FieldsetPanel(legend = cdm.getTitle())
- fsPanel.add(RoTable(cdm))
+ val table = RoTable(cdm)
+ console.log(table)
+ fsPanel.add(table)
panel.add(fsPanel)
cdm.isRendered = true
- console.log("[CB_buildTableAndWrapInFsPanel] succeeded")
} catch (npe: NullPointerException) {
- console.log("[CB_buildTableAndWrapInFsPanel] failed with NPE")
- throw npe
+ return
}
}
private fun buildFieldSetPanel(fs: FieldSetBs): SimplePanel {
- console.log("[CB_buildFieldSetPanel]")
val fsCpt = FieldSetBuilder().create(fs, tObject, dsp)!!
val legend = extractLegend(fs)
- val fsPanel = FieldsetPanel(legend = legend).add(fsCpt)
+ val fsPanel = FieldsetPanel(legend = legend)
+ fsPanel.add(fsCpt)
val tto = TooltipOptions(title = fs.id)
fsPanel.enableTooltip(tto)
-// fsPanel.flexDirection = FlexDirection.ROW
return fsPanel
}
@@ -150,9 +151,6 @@ class ColBuilder(
val proportion = col.span.toDouble().div(12)
val percent = proportion * 100
val rounded = round(percent)
- console.log("[CB_assignWidth]")
- console.log(col.span)
- console.log(rounded)
val cssWidth = CssSize(rounded, UNIT.perc)
panel.flexBasis = cssWidth
panel.flexGrow = 1
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt
index 46fb3292f6..f16747b0d7 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt
@@ -42,7 +42,7 @@ class FieldSetBuilder {
var label = p.id
val member = members.firstOrNull() { it.id == label }
if (member != null) {
- val memberType = TypeMapper().forType(member.type!!)
+ val memberType = TypeMapper.forType(member.type!!)
var content = member.value?.content
label = p.named
if (memberType == ValueType.HTML && content is String) {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/ColumnFactory.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/ColumnFactory.kt
index 96c8987651..0d8596962d 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/ColumnFactory.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/ColumnFactory.kt
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.client.kroviz.ui.core
+import io.kvision.core.Component
+import io.kvision.panel.VPanel
import io.kvision.tabulator.Align
import io.kvision.tabulator.ColumnDefinition
import io.kvision.tabulator.Editor
@@ -25,8 +27,11 @@ import io.kvision.tabulator.Formatter
import io.kvision.tabulator.js.Tabulator
import io.kvision.utils.obj
import org.apache.causeway.client.kroviz.core.model.CollectionDM
-import org.apache.causeway.client.kroviz.core.model.Exposer
+import org.apache.causeway.client.kroviz.core.model.PropertyDetails
+import org.apache.causeway.client.kroviz.to.ValueType
+import org.apache.causeway.client.kroviz.to.Vega5
import org.apache.causeway.client.kroviz.ui.menu.DynamicMenuBuilder
+import org.apache.causeway.client.kroviz.utils.js.Vega
/**
* Create ColumnDefinitions for Tabulator tables
@@ -41,13 +46,18 @@ class ColumnFactory {
}
fun buildColumns(displayCollection: CollectionDM): List<ColumnDefinition<dynamic>> {
- val columns = mutableListOf<ColumnDefinition<Exposer>>()
- addColumnForObjectIcon(displayCollection, columns)
- addColumnsForProperties(displayCollection, columns)
+ val columns = mutableListOf<ColumnDefinition<dynamic>>()
+ columns.add(columnForObjectIcon(displayCollection))
+ columns.addAll(columnsForProperties(displayCollection))
columns.add(columnForObjectMenu())
return columns
}
+ private fun columnForObjectIcon(displayCollection: CollectionDM): ColumnDefinition<dynamic> {
+ exposeIcons(displayCollection)
+ return buildIconColumn()
+ }
+
private fun columnForObjectMenu(): ColumnDefinition<dynamic> {
return ColumnDefinition<dynamic>(
"",
@@ -65,31 +75,22 @@ class ColumnFactory {
private fun buildObjectMenu(cell: Tabulator.CellComponent): dynamic {
val row = cell.getRow()
- val exposer = row.getData() as Exposer
- val tObject = exposer.delegate
+ val dynamic = row.getData().asDynamic()
+ val tObject = dynamic.delegate
return DynamicMenuBuilder().buildObjectMenu(tObject)
}
- private fun addColumnForObjectIcon(
- displayCollection: CollectionDM,
- columns: MutableList<ColumnDefinition<Exposer>>,
- ) {
- exposeIcons(displayCollection)
- val iconColumn = buildIconColumn()
- columns.add(iconColumn)
- }
-
private fun exposeIcons(displayCollection: CollectionDM) {
val model = displayCollection.data
val icon = displayCollection.icon
- model.forEach { exposer ->
+ model.forEach { dynamic ->
if (icon != null) {
- exposer.setIcon(icon)
+ dynamic.setIcon(icon)
}
}
}
- private fun buildIconColumn(): ColumnDefinition<Exposer> {
+ private fun buildIconColumn(): ColumnDefinition<dynamic> {
return ColumnDefinition<dynamic>(
"",
field = "icon",
@@ -97,13 +98,12 @@ class ColumnFactory {
formatterParams = obj { width = "16px"; height = "16px" },
hozAlign = Align.CENTER,
width = "40",
- headerSort = false)
+ headerSort = false
+ )
}
- private fun addColumnsForProperties(
- collectionModel: CollectionDM,
- columns: MutableList<ColumnDefinition<Exposer>>,
- ) {
+ private fun columnsForProperties(collectionModel: CollectionDM): MutableList<ColumnDefinition<dynamic>> {
+ val answer = mutableListOf<ColumnDefinition<dynamic>>()
val clo = collectionModel.collectionLayout
val propSpecList = clo.propertyDetailsList
if (propSpecList.size == 0) {
@@ -112,20 +112,63 @@ class ColumnFactory {
}
propSpecList.forEach {
if (!it.hidden) {
- var colDef = ColumnDefinition<dynamic>(
- title = it.name,
- field = it.id,
- width = (it.typicalLength * 8).toString(),
- headerFilter = Editor.INPUT)
- if (it.id == "object") {
- colDef = buildLink()
- }
- columns.add(colDef)
+ val colDef = buildColumnDefinition(it)
+ answer.add(colDef)
}
}
+ return answer
+ }
+
+ private fun buildColumnDefinition(pd: PropertyDetails): ColumnDefinition<dynamic> {
+ return when {
+ pd.id == "object" -> buildLink()
+ pd.type.equals(ValueType.CANVAS.type) -> buildVega(pd)
+ else -> buildDefault(pd)
+ }
+ }
+
+ private fun buildDefault(it: PropertyDetails): ColumnDefinition<dynamic> {
+ return ColumnDefinition<dynamic>(
+ title = it.name,
+ field = it.id,
+ width = (it.typicalLength * 8).toString(),
+ headerFilter = Editor.INPUT
+ )
+ }
+
+ private fun buildVega(it: PropertyDetails): ColumnDefinition<dynamic> {
+ return ColumnDefinition<dynamic>(
+ title = it.name,
+ field = it.id,
+ width = (it.typicalLength * 8).toString(),
+ headerFilter = Editor.INPUT,
+ formatterComponentFunction = { cellComponent: dynamic, _, data: dynamic ->
+ console.log("[CF_buildVega]")
+ console.log(cellComponent)
+ this.buildDiagramPanel(cellComponent.unsafeCast<Tabulator.CellComponent>())
+ })
+ }
+
+ private fun buildDiagramPanel(cellComponent: Tabulator.CellComponent): Component {
+ console.log("[CF_buildDiagramPanel]")
+ console.log(cellComponent)
+ val panel = VPanel()
+ panel.addAfterInsertHook {
+ val row = cellComponent.getRow()
+ val dynamic = row.getData().asDynamic()
+ val json = dynamic.get("readOnlyProperty") as String
+ val spec = JSON.parse<Vega5>(json)
+ val view = Vega.View(Vega.parse(spec), obj {
+ this.renderer = "canvas"
+ this.container = getElement()
+ this.hover = true
+ })
+ view.runAsync()
+ }
+ return panel
}
- private fun buildLink(): ColumnDefinition<Exposer> {
+ private fun buildLink(): ColumnDefinition<dynamic> {
return ColumnDefinition<dynamic>(
title = "ResultListResult",
field = "result",
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/FormPanelFactory.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/FormPanelFactory.kt
index 8ac0c2ba6e..3a64dfee54 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/FormPanelFactory.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/FormPanelFactory.kt
@@ -24,26 +24,32 @@ import io.kvision.core.onEvent
import io.kvision.form.FormPanel
import io.kvision.form.check.CheckBox
import io.kvision.form.formPanel
-import io.kvision.form.range.Range
-import io.kvision.form.select.SimpleSelect
-import io.kvision.form.spinner.Spinner
+import io.kvision.form.number.Range
+import io.kvision.form.select.Select
+import io.kvision.form.number.Spinner
import io.kvision.form.text.Password
import io.kvision.form.text.Text
import io.kvision.form.text.TextArea
import io.kvision.form.time.DateTime
import io.kvision.form.time.dateTime
-import io.kvision.html.*
+import io.kvision.html.Button
+import io.kvision.html.Div
+import io.kvision.html.Iframe
+import io.kvision.html.Image
import io.kvision.panel.VPanel
import io.kvision.panel.vPanel
import io.kvision.utils.auto
+import io.kvision.utils.obj
import io.kvision.utils.px
import io.kvision.utils.vh
import org.apache.causeway.client.kroviz.to.ValueType
+import org.apache.causeway.client.kroviz.to.Vega5
import org.apache.causeway.client.kroviz.ui.dialog.Controller
import org.apache.causeway.client.kroviz.ui.panel.SvgPanel
import org.apache.causeway.client.kroviz.utils.DateHelper
import org.apache.causeway.client.kroviz.utils.IconManager
import org.apache.causeway.client.kroviz.utils.UUID
+import org.apache.causeway.client.kroviz.utils.js.Vega
class FormPanelFactory(items: List<FormItem>) : VPanel() {
@@ -54,6 +60,8 @@ class FormPanelFactory(items: List<FormItem>) : VPanel() {
height = auto
margin = 10.px
for (fi: FormItem in items) {
+ console.log("[FPF_init]")
+ console.log(fi.type)
when (fi.type) {
ValueType.TEXT -> add(createText(fi))
ValueType.PASSWORD -> add(createPassword(fi))
@@ -158,14 +166,14 @@ class FormPanelFactory(items: List<FormItem>) : VPanel() {
return item
}
- private fun createSelect(fi: FormItem): SimpleSelect {
+ private fun createSelect(fi: FormItem): Select {
@Suppress("UNCHECKED_CAST")
val list = fi.content as List<StringPair>
var preSelectedValue: String? = null
if (list.isNotEmpty()) {
preSelectedValue = list.first().first
}
- return SimpleSelect(label = fi.label, options = list, value = preSelectedValue)
+ return Select(label = fi.label, options = list, value = preSelectedValue)
}
private fun createImage(fi: FormItem): VPanel {
@@ -243,13 +251,21 @@ class FormPanelFactory(items: List<FormItem>) : VPanel() {
}
private fun createCanvas(fi: FormItem): VPanel {
- val item = VPanel {
- val vega = fi.content as String
- val canvas = Canvas()
-
- add(canvas)
+ console.log("[FPF_createCanvas]")
+ val panel = VPanel()
+ panel.addAfterInsertHook {
+ val json = fi.content as String
+ val specFromClass = JSON.parse<Vega5>(json)
+// console.log(specFromClass)
+ val view = Vega.View(Vega.parse(specFromClass), obj {
+ this.renderer = "canvas"
+ this.container = getElement()
+ this.hover = true
+ })
+ view.runAsync()
}
- return item
+ console.log(panel)
+ return panel
}
companion object {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoDialog.kt
index 8afc06e891..4c9aa02227 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoDialog.kt
@@ -18,6 +18,7 @@
*/
package org.apache.causeway.client.kroviz.ui.core
+import io.kvision.core.Component
import io.kvision.core.CssSize
import io.kvision.core.UNIT
import io.kvision.core.Widget
@@ -47,24 +48,27 @@ class RoDialog(
) :
Displayable, RoWindow(caption = caption, closeButton = true, menu = menu) {
- private val okButton = Button(
- text = defaultAction,
- icon = IconManager.find(defaultAction),
- style = ButtonStyle.SUCCESS
- )
- .onClick {
+ private val okButton:Button;
+ private val cancelButton:Button;
+ init {
+ okButton = Button(
+ text = defaultAction,
+ icon = IconManager.find(defaultAction),
+ style = ButtonStyle.SUCCESS
+ )
+ okButton.onClick {
execute()
}
- private val cancelButton = Button(
- "Cancel",
- "fas fa-times",
- ButtonStyle.OUTLINEINFO
- )
- .onClick {
+ cancelButton = Button(
+ "Cancel",
+ "fas fa-times",
+ ButtonStyle.OUTLINEINFO
+ )
+ cancelButton.onClick {
close()
}
-
+ }
@Deprecated("remove once leaflet/svg is fully operational")
private val scaleUpButton = Button(
"",
@@ -118,8 +122,8 @@ class RoDialog(
}
buttonBar.add(cancelButton)
if (items.isNotEmpty() && hasScalableContent()) {
- buttonBar.add(scaleUpButton)
- buttonBar.add(scaleDownButton)
+ buttonBar.add(scaleUpButton as Component)
+ buttonBar.add(scaleDownButton as Component)
}
return buttonBar
}
@@ -132,7 +136,7 @@ class RoDialog(
fun open(at: Point = Point(x = 100, y = 100)): Widget {
ViewManager.openDialog(this, at)
super.show()
- okButton.focus()
+ (okButton as Component).focus()
return this
}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoIconBar.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoIconBar.kt
index 4d9f8e78c5..a5476403b5 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoIconBar.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoIconBar.kt
@@ -20,7 +20,6 @@ package org.apache.causeway.client.kroviz.ui.core
import io.kvision.core.CssSize
import io.kvision.core.UNIT
-import io.kvision.core.Widget
import io.kvision.dropdown.DropDown
import io.kvision.html.Button
import io.kvision.html.ButtonStyle
@@ -66,13 +65,13 @@ class RoIconBar : SimplePanel() {
if (panel.width?.first == 0) show() else hide()
}
- override fun hide(): Widget {
+ override fun hide(): Unit {
panel.width = CssSize(0, UNIT.px)
panel.removeAll()
- return super.hide()
+ super.hide()
}
- override fun show(): Widget {
+ override fun show(): Unit {
panel.width = CssSize(40, UNIT.px)
icons.forEach { panel.add(it) }
return super.show()
@@ -105,7 +104,7 @@ class RoIconBar : SimplePanel() {
(obj == null) -> null
is TObject -> {
val exp = Exposer(obj)
- val ed = exp.dynamise()
+ val ed = exp.getWithDelegateProperties()
val hasIconName = ed.hasOwnProperty("iconName") as Boolean
val iconName = if (hasIconName) (ed["iconName"] as String) else ""
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoMenuBar.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoMenuBar.kt
index bf915b3ddb..8e2e925e47 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoMenuBar.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoMenuBar.kt
@@ -134,7 +134,8 @@ class RoMenuBar : SimplePanel() {
private fun buildMenuEntry(label: String, iconName: String, action: dynamic): Link {
val icon = IconManager.find(iconName)
- val link = Link(label, icon = icon, className = "dropdown-item").onClick { e ->
+ val link = Link(label, icon = icon, className = "dropdown-item")
+ link.onClick { e ->
val at = Point(e.pageX.toInt(), e.pageY.toInt())
ViewManager.position = at
action()
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoStatusBar.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoStatusBar.kt
index f464311f67..ecf1ca6aa7 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoStatusBar.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoStatusBar.kt
@@ -167,18 +167,20 @@ class RoStatusBar {
val classes = "causeway-logo-button-image logo-button"
val b = Button("", style = ButtonStyle.LINK)
b.addCssClass(classes)
- return b.onClick {
+ b.onClick {
window.open("https://causeway.apache.org")
}
+ return b
}
private fun kvisionButton(): Button {
val classes = "kvision-logo-button-image logo-button"
val b = Button("", style = ButtonStyle.LINK)
b.addCssClass(classes)
- return b.onClick {
+ b.onClick {
window.open("https://kvision.io")
}
+ return b
}
/*
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoTable.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoTable.kt
index b489e64336..b07e6df5e0 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoTable.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/RoTable.kt
@@ -18,7 +18,6 @@
*/
package org.apache.causeway.client.kroviz.ui.core
-import io.kvision.core.Container
import io.kvision.core.CssSize
import io.kvision.core.UNIT
import io.kvision.panel.SimplePanel
@@ -27,9 +26,11 @@ import io.kvision.tabulator.TableType
import io.kvision.tabulator.Tabulator
import io.kvision.tabulator.TabulatorOptions
import io.kvision.tabulator.js.Tabulator.CellComponent
+import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.serializer
import org.apache.causeway.client.kroviz.core.event.ResourceProxy
import org.apache.causeway.client.kroviz.core.model.CollectionDM
-import org.apache.causeway.client.kroviz.core.model.Exposer
+import org.apache.causeway.client.kroviz.core.model.Exhibit
import org.apache.causeway.client.kroviz.utils.StringUtils
/**
@@ -43,10 +44,14 @@ class RoTable(displayCollection: CollectionDM) : SimplePanel() {
init {
title = StringUtils.extractTitle(displayCollection.title)
width = CssSize(100, UNIT.perc)
- val model = displayCollection.data
+ val model = mutableListOf<Exhibit>()
+ displayCollection.data.forEach {
+ model.add(it.getWithDelegateProperties())
+ }
val columns = ColumnFactory().buildColumns(
displayCollection
)
+ console.log(columns)
val options = TabulatorOptions(
movableColumns = true,
height = Constants.calcHeight,
@@ -57,47 +62,33 @@ class RoTable(displayCollection: CollectionDM) : SimplePanel() {
val tableTypes = setOf(TableType.STRIPED, TableType.HOVER)
- tabulator(model, options = options, types = tableTypes) {
- setEventListener<Tabulator<Exposer>> {
- cellClickTabulator = {
- // can't check cast to external interface
- val cc = it.detail as CellComponent
- val column = cc.getColumn().getField()
- if (column == "icon") {
- val exposer = cc.getData() as Exposer
- val tObject = exposer.delegate
- ResourceProxy().load(tObject)
- }
+ console.log("[RT_before] tabulator()")
+ val tabulator = createTabulator(model, options, tableTypes)
+ tabulator.setEventListener<Tabulator<dynamic>> {
+ cellClickTabulator = {
+ // can't check cast to external interface
+ val cc = it.detail as CellComponent
+ val column = cc.getColumn().getField()
+ if (column == "icon") {
+ val exhibit = cc.getData() as Exhibit
+ val tObject = exhibit.getDelegate()
+ ResourceProxy().load(tObject)
}
}
}
}
- fun <T : Any> Container.tabulator(
- data: List<T>? = null,
- dataUpdateOnEdit: Boolean = true,
- options: TabulatorOptions<T> = TabulatorOptions(),
- types: Set<TableType> = setOf(),
- className: String? = null,
- init: (Tabulator<T>.() -> Unit)? = null
- ): Tabulator<T> {
- val tabulator = create(data, dataUpdateOnEdit, options, types)
- if (className != null)
- tabulator.addCssClass(className)
- init?.invoke(tabulator)
- this.add(tabulator)
- return tabulator
- }
-
- fun <T : Any> create(
- data: List<T>? = null,
- dataUpdateOnEdit: Boolean = true,
- options: TabulatorOptions<T> = TabulatorOptions(),
- types: Set<TableType> = setOf(),
- className: String? = null,
- init: (Tabulator<T>.() -> Unit)? = null
- ): Tabulator<T> {
- val tabulator = Tabulator(data, dataUpdateOnEdit, options, types)
+ @OptIn(InternalSerializationApi::class)
+ private fun createTabulator(
+ data: List<Exhibit>,
+ options: TabulatorOptions<Exhibit>,
+ types: Set<TableType>
+ ): Tabulator<dynamic> {
+ val dataUpdateOnEdit = true
+ val className: String? = null
+ val init: (Tabulator<dynamic>.() -> Unit)? = null
+ val serializer = Exhibit::class.serializer()
+ val tabulator = Tabulator(data, dataUpdateOnEdit, options, types, serializer = serializer)
if (className != null)
tabulator.addCssClass(className)
init?.invoke(tabulator)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/ViewManager.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/ViewManager.kt
index 5e6331e2ee..ddead11c9e 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/ViewManager.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/core/ViewManager.kt
@@ -174,7 +174,6 @@ object ViewManager {
}
fun openObjectView(aggregator: SystemAggregator) {
- console.log("[VM_openObjectView]")
val dm = aggregator.displayModel
dm.isRendered = true
setNormalCursor()
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/diagram/Tree.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/diagram/Tree.kt
index 308a6de448..9b94d6453f 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/diagram/Tree.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/diagram/Tree.kt
@@ -23,9 +23,6 @@ class Tree(val root: Node) {
fun addChildToParent(childUrl: String, parentUrl: String) {
var p = find(root, parentUrl)
if (p == null) {
- console.log("[Tree.addChildToParent] nothing found for parentUrl")
- console.log(childUrl)
- console.log(parentUrl)
p = root
}
val c = Node(childUrl, p)
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/ActionPrompt.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/ActionPrompt.kt
index 1083138064..36755077fa 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/ActionPrompt.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/ActionPrompt.kt
@@ -26,7 +26,7 @@ import org.apache.causeway.client.kroviz.ui.core.FormItem
import org.apache.causeway.client.kroviz.utils.Point
import org.apache.causeway.client.kroviz.utils.StringUtils
import io.kvision.core.StringPair
-import io.kvision.form.select.SimpleSelect
+import io.kvision.form.select.Select
import io.kvision.form.text.TextArea
import org.apache.causeway.client.kroviz.ui.core.RoDialog
@@ -93,7 +93,7 @@ class ActionPrompt(val action: Action) : Controller() {
key = i.label!!
value = i.getValue()
}
- is SimpleSelect -> {
+ is Select -> {
key = i.label!!
value = i.getValue()!!
val p: Parameter = action.findParameterByName(key.lowercase())!!
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/EventExportDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/EventExportDialog.kt
index 11077bb245..c87b82dd8a 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/EventExportDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/EventExportDialog.kt
@@ -24,7 +24,7 @@ import org.apache.causeway.client.kroviz.core.event.ReplayEvent
import org.apache.causeway.client.kroviz.to.ValueType
import org.apache.causeway.client.kroviz.ui.core.RoDialog
import io.kvision.core.StringPair
-import io.kvision.form.select.SimpleSelect
+import io.kvision.form.select.Select
import org.apache.causeway.client.kroviz.ui.core.FormItem
import org.apache.causeway.client.kroviz.ui.core.SessionManager
@@ -87,7 +87,7 @@ class EventExportDialog : Controller() {
//iterate over FormItems (0,1) but not Buttons(2,3)
for (i in kids) {
when (i) {
- is SimpleSelect -> {
+ is Select -> {
val key = i.label!!
val value = i.getValue()!!
if (key == fieldName) {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/EventImportDialog.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/EventImportDialog.kt
index 2a6c6eb5f3..33d79fd701 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/EventImportDialog.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/EventImportDialog.kt
@@ -24,7 +24,7 @@ import org.apache.causeway.client.kroviz.core.event.ReplayEvent
import org.apache.causeway.client.kroviz.to.ValueType
import org.apache.causeway.client.kroviz.ui.core.RoDialog
import io.kvision.core.StringPair
-import io.kvision.form.select.SimpleSelect
+import io.kvision.form.select.Select
import org.apache.causeway.client.kroviz.ui.core.FormItem
import org.apache.causeway.client.kroviz.ui.core.SessionManager
@@ -87,7 +87,7 @@ class EventImportDialog : Controller() {
//iterate over FormItems (0,1) but not Buttons(2,3)
for (i in kids) {
when (i) {
- is SimpleSelect -> {
+ is Select -> {
val key = i.label!!
val value = i.getValue()!!
if (key == fieldName) {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/LoginPrompt.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/LoginPrompt.kt
index 80da73d9ee..18eed5dd28 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/LoginPrompt.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/dialog/LoginPrompt.kt
@@ -19,7 +19,7 @@
package org.apache.causeway.client.kroviz.ui.dialog
import io.kvision.core.StringPair
-import io.kvision.form.select.SimpleSelect
+import io.kvision.form.select.Select
import io.kvision.form.text.Password
import io.kvision.form.text.Text
import org.apache.causeway.client.kroviz.core.event.ReplayController
@@ -70,7 +70,7 @@ class LoginPrompt(val nextController: Controller? = null) : Controller() {
//iterate over FormItems (0,1,2) but not Buttons(3,4)
for (i in kids) {
when (i) {
- is SimpleSelect -> {
+ is Select -> {
url = i.getValue()!!
}
is Text -> {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/kv/override/RoTabPanel.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/kv/override/RoTabPanel.kt
index 7cd8a93eb6..826b7ced6a 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/kv/override/RoTabPanel.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/kv/override/RoTabPanel.kt
@@ -283,25 +283,22 @@ open class RoTabPanel(
}
}
- override fun add(child: Component): RoTabPanel {
+ override fun add(child: Component) {
addChild(child)
refresh()
- return this
}
- override fun add(position: Int, child: Component): RoTabPanel {
+ override fun add(position: Int, child: Component) {
addChild(child, position)
refresh()
- return this
}
- override fun addAll(children: List<Component>): RoTabPanel {
+ override fun addAll(children: List<Component>) {
children.forEach(::addChild)
refresh()
- return this
}
- override fun remove(child: Component): RoTabPanel {
+ override fun remove(child: Component) {
if (child is RoTab) {
removeTab(child)
refresh()
@@ -311,10 +308,9 @@ open class RoTabPanel(
refresh()
}
}
- return this
}
- override fun removeAt(position: Int): RoTabPanel {
+ override fun removeAt(position: Int) {
if (position >= 0 && position < tabs.size) {
val tab = tabs.removeAt(position)
tab.parent = null
@@ -326,18 +322,15 @@ open class RoTabPanel(
activeIndex = activeIndex
}
}
- return this
}
- override fun removeAll(): RoTabPanel {
+ override fun removeAll() {
tabs.forEach { removeTab(it) }
- return this
}
- override fun disposeAll(): RoTabPanel {
+ override fun disposeAll() {
tabs.forEach { it.dispose() }
removeAll()
- return this
}
fun findTab(title: String): Int? {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/kv/override/RoWindow.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/kv/override/RoWindow.kt
index 1719846b19..bddefa65a1 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/kv/override/RoWindow.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/kv/override/RoWindow.kt
@@ -397,24 +397,20 @@ open class RoWindow(
}
}
- override fun add(child: Component): SimplePanel {
+ override fun add(child: Component) {
content.add(child)
- return this
}
- override fun addAll(children: List<Component>): SimplePanel {
+ override fun addAll(children: List<Component>) {
content.addAll(children)
- return this
}
- override fun remove(child: Component): SimplePanel {
+ override fun remove(child: Component) {
content.remove(child)
- return this
}
- override fun removeAll(): SimplePanel {
+ override fun removeAll() {
content.removeAll()
- return this
}
override fun getChildren(): List<Component> {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/DropdownSearch.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/DropdownSearch.kt
deleted file mode 100644
index 84aeab1e46..0000000000
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/DropdownSearch.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.causeway.client.kroviz.ui.panel
-
-import io.kvision.form.formPanel
-import io.kvision.form.select.AjaxOptions
-import io.kvision.form.select.Select
-import io.kvision.panel.SimplePanel
-import io.kvision.utils.obj
-import io.kvision.utils.pc
-import io.kvision.utils.px
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class Form(
- val select: String? = null,
- val ajaxselect: String? = null,
-)
-
-class DropdownSearch() : SimplePanel() {
- val cachedValues = listOf("1" to "About", "2" to "Base", "3" to "Blog", "4" to "Contact", "5" to "Custom", "6" to "Support", "7" to "Tools")
-
- init {
- this.marginTop = 10.px
- this.marginLeft = 40.px
- this.width = 100.pc
- formPanel<Form> {
- add(
- Form::select, Select(
- options = cachedValues,
- label = "Dropdown search with in-memory values"
- ).apply {
- liveSearch = true
- }
- )
- add(Form::ajaxselect, Select(label = "Dropdown search on remote data source").apply {
- emptyOption = true
- ajaxOptions = AjaxOptions("https://api.github.com/search/repositories", preprocessData = {
- it.items.map { item ->
- obj {
- this.value = item.id
- this.text = item.name
- this.data = obj {
- this.subtext = item.owner.login
- }
- }
- }
- }, data = obj {
- q = "{{{q}}}"
- }, minLength = 3, requestDelay = 500)
- })
- }
- }
-}
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/ImageSample.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/ImageSample.kt
index 3d33e0d72b..6328791f10 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/ImageSample.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/ImageSample.kt
@@ -19,8 +19,9 @@
package org.apache.causeway.client.kroviz.ui.panel
-import io.kvision.form.upload.uploadInput
+import io.kvision.form.upload.BootstrapUpload
import io.kvision.html.button
+import io.kvision.i18n.I18n
import io.kvision.panel.VPanel
import io.kvision.panel.vPanel
import org.w3c.files.FileReader
@@ -30,10 +31,15 @@ object ImageSample : VPanel() {
init {
vPanel(spacing = 10) {
val button = button("Button")
- val upload = uploadInput("/") {
+ val upload = BootstrapUpload(
+ "/",
+ multiple = true,
+ label = I18n.tr("Upload files")
+ ).apply {
showUpload = false
showCancel = false
}
+
button("Add image to button").onClick {
upload.value?.firstOrNull()?.let { upload.getNativeFile(it) }?.slice()?.let { blob ->
//
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/PlantumlPanel.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/PlantumlPanel.kt
index a4c5aaf1e2..6ff93d9d51 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/PlantumlPanel.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/panel/PlantumlPanel.kt
@@ -54,7 +54,7 @@ object PlantumlPanel : VPanel() {
width = CssSize(400, UNIT.px)
textBox.value = sampleCode
add(textBox)
- add(okButton)
+// add(okButton)
}
init {
diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/IconManager.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/IconManager.kt
index efa0ce2246..873b9c943b 100644
--- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/IconManager.kt
+++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/IconManager.kt
@@ -18,6 +18,8 @@
*/
package org.apache.causeway.client.kroviz.utils
+import org.apache.causeway.client.kroviz.to.TObject
+
object IconManager {
private const val PREFIX = "fas fa-" //TODO far fa- ???
const val DEFAULT_ICON = PREFIX + "play"
@@ -136,6 +138,14 @@ object IconManager {
return DEFAULT_ICON
}
+ fun findFor(tObject: TObject): String {
+ var iconName = find(tObject.title)
+ if (iconName == DEFAULT_ICON) {
+ iconName = find(tObject.domainType)
+ }
+ return iconName
+ }
+
fun findStyleFor(actionName: String): String {
return when (actionName) {
"delete" -> DANGER
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/IntegrationTest.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/IntegrationTest.kt
index 8581c9a2a3..3da8665fdc 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/IntegrationTest.kt
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/IntegrationTest.kt
@@ -84,6 +84,7 @@ open class IntegrationTest {
return le
}
+ @OptIn
fun wait(milliseconds: Long) {
GlobalScope.launch {
delay(milliseconds)
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/core/model/ExposerTest.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/core/model/ExposerTest.kt
index d53e962ee5..a5101b30ea 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/core/model/ExposerTest.kt
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/core/model/ExposerTest.kt
@@ -48,7 +48,7 @@ class ExposerTest {
val jsonStr = CFG_1.str
val to = TObjectHandler().parse(jsonStr) as TObject
- val exposer = Exposer(to).dynamise()
+ val exposer = Exposer(to).getWithDelegateProperties()
val actKey = exposer["key"]
assertEquals("causeway.appManifest", actKey)
@@ -73,7 +73,7 @@ class ExposerTest {
val actualDnvers = exposer.get("datanucleusVersionTimestamp") as Value
assertEquals(1514897074953L, actualDnvers.content as Long)
- val dynEx = exposer.dynamise()
+ val dynEx = exposer.getWithDelegateProperties()
val actKey = dynEx["name"]
assertEquals("Foo", actKey)
diff --git a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/ui/table/TableFactoryTest.kt b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/ui/table/TableFactoryTest.kt
index 217a7da71b..65d7c9e675 100644
--- a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/ui/table/TableFactoryTest.kt
+++ b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/ui/table/TableFactoryTest.kt
@@ -26,7 +26,6 @@ import org.apache.causeway.client.kroviz.to.MemberType
import org.apache.causeway.client.kroviz.to.TObject
import org.apache.causeway.client.kroviz.to.Extensions
-
class TableFactoryTest {
//TODO how can this be tested?
@@ -37,7 +36,7 @@ class TableFactoryTest {
val map = mapOf("m1" to m1, "m2" to m2)
val t1 = TObject(extensions = Extensions(), members = map)
val o1 = Exposer(t1)
- val d1 = o1.dynamise()
+ val d1 = o1.exhibit.asDynamic()
d1["var1"] = "string1"
d1["var2"] = 1
answer.add(d1)