#42 Combine XML (Grid) and JSON based Layout in DisplayList/Object 2/n

joerg-rade · Mar 12, 2020 · 0f759b4 · 0f759b4
1 parent fec2981
commit 0f759b4
Show file tree

Hide file tree

Showing 32 changed files with 478 additions and 168 deletions.
diff --git a/src/main/kotlin/org/ro/core/aggregator/ActionDispatcher.kt b/src/main/kotlin/org/ro/core/aggregator/ActionDispatcher.kt
@@ -7,11 +7,10 @@ import org.ro.to.Method
 import org.ro.ui.Point
 import org.ro.ui.kv.ActionPrompt
 import org.ro.utils.Utils
-import org.w3c.dom.MimeType
 
 class ActionDispatcher(private val at: Point = Point(100, 100)) : BaseAggregator() {
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
         val action = logEntry.getTransferObject() as Action
         action.links.forEach { link ->
             // it.rel should be neither: (self | up | describedBy )
@@ -36,7 +35,7 @@ class ActionDispatcher(private val at: Point = Point(100, 100)) : BaseAggregator
         if (link.hasArguments()) {
             ActionPrompt(action).open(at)
         } else {
-            invoke(link)
+            link.invokeWith(this)
         }
     }
 

diff --git a/src/main/kotlin/org/ro/core/aggregator/BaseAggregator.kt b/src/main/kotlin/org/ro/core/aggregator/BaseAggregator.kt
@@ -23,7 +23,7 @@ abstract class BaseAggregator {
 
     open lateinit var dsp: BaseDisplayable
 
-    open fun update(logEntry: LogEntry, mimeType: String) {}
+    open fun update(logEntry: LogEntry, subType: String) {}
 
     open fun reset(): BaseAggregator {
         /* do nothing and */ return this
@@ -60,8 +60,8 @@ abstract class BaseAggregator {
         // save a line break in when formatting
     }
 
-    fun Link.invokeWith(aggregator: BaseAggregator, mimeType: String = "json") {
-        RoXmlHttpRequest().invoke(this, aggregator, mimeType)
+    fun Link.invokeWith(aggregator: BaseAggregator, subType: String = "json") {
+        RoXmlHttpRequest().invoke(this, aggregator, subType)
     }
 
 }
diff --git a/src/main/kotlin/org/ro/core/aggregator/DiagramDispatcher.kt b/src/main/kotlin/org/ro/core/aggregator/DiagramDispatcher.kt
@@ -2,11 +2,10 @@ package org.ro.core.aggregator
 
 import org.ro.core.event.LogEntry
 import org.ro.utils.DomHelper
-import org.w3c.dom.MimeType
 
 class DiagramDispatcher(private val uuid: String) : BaseAggregator() {
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
         val response = logEntry.response
         DomHelper.appendTo(response, uuid)
     }

diff --git a/src/main/kotlin/org/ro/core/aggregator/DomainTypesAggregator.kt b/src/main/kotlin/org/ro/core/aggregator/DomainTypesAggregator.kt
@@ -14,7 +14,7 @@ class DomainTypesAggregator(val url: String) : BaseAggregator() {
         dsp = DiagramDisplay(url)
     }
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
         when (val obj = logEntry.getTransferObject()) {
             is DomainTypes -> handleDomainTypes(obj)
             is DomainType -> handleDomainType(obj)

diff --git a/src/main/kotlin/org/ro/core/aggregator/DownloadDispatcher.kt b/src/main/kotlin/org/ro/core/aggregator/DownloadDispatcher.kt
@@ -5,7 +5,7 @@ import org.ro.ui.FileAlert
 
 class DownloadDispatcher(val actionTitle: String) : BaseAggregator() {
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
         FileAlert(logEntry).open()
     }
 

diff --git a/src/main/kotlin/org/ro/core/aggregator/ErrorDispatcher.kt b/src/main/kotlin/org/ro/core/aggregator/ErrorDispatcher.kt
@@ -5,11 +5,10 @@ import org.ro.core.event.LogEntry
 import org.ro.core.event.ResourceSpecification
 import org.ro.to.HttpError
 import org.ro.ui.ErrorAlert
-import org.w3c.dom.MimeType
 
 class ErrorDispatcher : BaseAggregator() {
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
         val error = logEntry.getTransferObject() as HttpError
         val url = logEntry.url
         val message = error.message

diff --git a/src/main/kotlin/org/ro/core/aggregator/ListAggregator.kt b/src/main/kotlin/org/ro/core/aggregator/ListAggregator.kt
@@ -3,6 +3,7 @@ package org.ro.core.aggregator
 import org.ro.core.event.LogEntry
 import org.ro.core.model.DisplayList
 import org.ro.layout.Layout
+import org.ro.layout.PropertyLt
 import org.ro.to.Property
 import org.ro.to.ResultList
 import org.ro.to.TObject
@@ -22,7 +23,7 @@ class ListAggregator(actionTitle: String) : BaseAggregator() {
         dsp = DisplayList(actionTitle)
     }
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
 
         when (val obj = logEntry.getTransferObject()) {
             null -> log(logEntry)
@@ -59,19 +60,18 @@ class ListAggregator(actionTitle: String) : BaseAggregator() {
     }
 
     private fun handleLayout(layout: Layout) {
-        dsp.layout = layout
-        layout.propertyList.forEach { p ->
-            val l = p.link!!
+        val dspl = dsp as DisplayList
+        dspl.addLayout(layout)
+        dspl.propertyList.forEach { p ->
+            val l = p.links.firstOrNull{it.rel == "describedby"}!!
             if (!l.href.contains("datanucleus")) {
                 l.invokeWith(this)
             }
         }
     }
 
     private fun handleGrid(grid: Grid) {
-   //     console.log("[LA.handleGrid]")
-   //     console.log(grid)
-   //     dsp.layout!!.initGrid(grid)
+        (dsp as DisplayList).grid = grid
     }
 
     private fun handleProperty(p: Property) {

diff --git a/src/main/kotlin/org/ro/core/aggregator/NavigationDispatcher.kt b/src/main/kotlin/org/ro/core/aggregator/NavigationDispatcher.kt
@@ -6,7 +6,7 @@ import org.ro.ui.kv.UiManager
 
 class NavigationDispatcher() : BaseAggregator() {
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
         val obj = logEntry.getTransferObject()
         val result = obj as Menubars
         UiManager.amendMenu(result)

diff --git a/src/main/kotlin/org/ro/core/aggregator/ObjectAggregator.kt b/src/main/kotlin/org/ro/core/aggregator/ObjectAggregator.kt
@@ -5,6 +5,7 @@ import org.ro.core.model.DisplayObject
 import org.ro.layout.Layout
 import org.ro.to.HttpError
 import org.ro.to.Property
+import org.ro.to.ResultObject
 import org.ro.to.TObject
 import org.ro.ui.ErrorAlert
 import org.ro.ui.kv.UiManager
@@ -15,10 +16,11 @@ class ObjectAggregator(val actionTitle: String) : BaseAggregator() {
         dsp = DisplayObject(actionTitle)
     }
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
 
         when (val obj = logEntry.getTransferObject()) {
             is TObject -> handleObject(obj)
+            is ResultObject -> handleResultObject(obj)
             is Property -> handleProperty(obj)
             is Layout -> handleLayout(obj)
             is HttpError -> ErrorAlert(logEntry).open()
@@ -35,6 +37,12 @@ class ObjectAggregator(val actionTitle: String) : BaseAggregator() {
         obj.getLayoutLink()?.invokeWith(this)
     }
 
+    fun handleResultObject(obj: ResultObject) {
+        console.log("[OA.handleResultObject]")
+        console.log(obj)
+       // dsp.addData(obj)
+    }
+
     override fun getObject(): TObject? {
         return dsp.getObject()
     }
@@ -45,13 +53,14 @@ class ObjectAggregator(val actionTitle: String) : BaseAggregator() {
     }
 
     private fun handleLayout(layout: Layout) {
-        dsp.layout = layout
-        layout.propertyDescriptionList.forEach {
+        (dsp as DisplayObject).addLayout(layout)
+        //FIXME do analogous to DisplayList
+ /*       layout.propertyDescriptionList.forEach {
             it.links.forEach { l ->
                 //TODO correct link?
                 l.invokeWith(this)
             }
-        }
+        } */
     }
 
     override fun reset(): ObjectAggregator {

diff --git a/src/main/kotlin/org/ro/core/aggregator/RestfulDispatcher.kt b/src/main/kotlin/org/ro/core/aggregator/RestfulDispatcher.kt
@@ -7,7 +7,7 @@ import org.ro.to.Restful
 
 class RestfulDispatcher() : BaseAggregator() {
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
         val restful = logEntry.getTransferObject() as Restful
         restful.links.forEach {
             when {

diff --git a/src/main/kotlin/org/ro/core/aggregator/SystemAggregator.kt b/src/main/kotlin/org/ro/core/aggregator/SystemAggregator.kt
@@ -12,7 +12,7 @@ class SystemAggregator() : BaseAggregator() {
         dsp = DisplaySystem("not filled (yet)")
     }
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
 
         when (val obj = logEntry.getTransferObject()) {
             is User -> dsp.addData(obj)

diff --git a/src/main/kotlin/org/ro/core/aggregator/UndefinedDispatcher.kt b/src/main/kotlin/org/ro/core/aggregator/UndefinedDispatcher.kt
@@ -5,7 +5,7 @@ import org.ro.view.UndefinedAlert
 
 class UndefinedDispatcher : BaseAggregator() {
 
-    override fun update(logEntry: LogEntry, mimeType: String) {
+    override fun update(logEntry: LogEntry, subType: String) {
         UndefinedAlert(logEntry).open()
     }
 

diff --git a/src/main/kotlin/org/ro/core/event/EventStore.kt b/src/main/kotlin/org/ro/core/event/EventStore.kt
@@ -2,7 +2,6 @@ package org.ro.core.event
 
 import org.ro.utils.Utils
 import org.ro.core.aggregator.BaseAggregator
-import org.ro.core.event.ResourceSpecification
 import org.ro.to.TObject
 import org.ro.ui.kv.UiManager
 import pl.treksoft.kvision.panel.SimplePanel
@@ -29,9 +28,9 @@ object EventStore {
 
     fun start(reSpec: ResourceSpecification,
               method: String,
-              body: String = "",
+              body:String = "",
               aggregator: BaseAggregator? = null): LogEntry {
-        val entry = LogEntry(reSpec.url, method, body, reSpec.mimeType)
+        val entry = LogEntry(reSpec.url, method, request = body, subType= reSpec.subType)
         if (aggregator != null) {
             entry.addAggregator(aggregator)
         }
@@ -114,16 +113,17 @@ object EventStore {
     }
 
     internal fun findExact(reSpec: ResourceSpecification): LogEntry? {
-        return log.firstOrNull { it.url == reSpec.url && it.mimeType == reSpec.mimeType}
+        return log.firstOrNull { it.url == reSpec.url && it.subType == reSpec.subType}
     }
 
     internal fun findView(title: String): LogEntry? {
         return log.firstOrNull { it.title == title && it.isView() }
     }
 
     internal fun findEquivalent(reSpec: ResourceSpecification): LogEntry? {
-        val url = reSpec.url
-        return log.firstOrNull { areEquivalent(it.url, url) }
+        return log.firstOrNull {
+            it.subType == reSpec.subType
+                    && areEquivalent(it.url, reSpec.url) }
     }
 
     private fun areEquivalent(searchUrl: String, compareUrl: String, allowedDiff: Int = 1): Boolean {
@@ -155,7 +155,7 @@ object EventStore {
         val le = this.find(reSpec)
         if (le != null) {
             when {
-                le.hasResponse() && le.method == method && le.mimeType == reSpec.mimeType -> answer = true
+                le.hasResponse() && le.method == method && le.subType == reSpec.subType -> answer = true
                 le.isView() -> answer = true
             }
         }

diff --git a/src/main/kotlin/org/ro/core/event/LogEntry.kt b/src/main/kotlin/org/ro/core/event/LogEntry.kt
@@ -29,7 +29,7 @@ data class LogEntry(
         val url: String,
         val method: String? = "",
         val request: String = "",
-        val mimeType: String = "json",
+        val subType: String = "json",
         @ContextualSerialization val createdAt: Date = Date()) {
     var state = EventState.INITIAL
     var title: String = ""

diff --git a/src/main/kotlin/org/ro/core/event/ResourceSpecification.kt b/src/main/kotlin/org/ro/core/event/ResourceSpecification.kt
@@ -2,4 +2,4 @@ package org.ro.core.event
 
 class ResourceSpecification(
         val url: String,
-        val mimeType: String = "Json")
+        val subType: String = "json")
diff --git a/src/main/kotlin/org/ro/core/event/RoXmlHttpRequest.kt b/src/main/kotlin/org/ro/core/event/RoXmlHttpRequest.kt
@@ -14,12 +14,12 @@ import org.w3c.xhr.XMLHttpRequest
  */
 class RoXmlHttpRequest {
 
-    fun invoke(link: Link, aggregator: BaseAggregator?, mimeType: String = "json") {
+    fun invoke(link: Link, aggregator: BaseAggregator?, subType: String = "json") {
         val reSpec = ResourceSpecification(link.href)
         if (EventStore.isCached(reSpec, link.method)) {
             processCached(reSpec)
         } else {
-            process(link, aggregator, mimeType)
+            process(link, aggregator, subType)
         }
     }
 
@@ -30,7 +30,7 @@ class RoXmlHttpRequest {
         EventStore.cached(reSpec)
     }
 
-    private fun process(link: Link, aggregator: BaseAggregator?, mimeType: String) {
+    private fun process(link: Link, aggregator: BaseAggregator?, subType: String) {
         val method = link.method
         var url = link.href
         if (method != Method.POST.operation) {
@@ -41,10 +41,10 @@ class RoXmlHttpRequest {
         val xhr = XMLHttpRequest()
         xhr.open(method, url, true)
         xhr.setRequestHeader("Authorization", "Basic $credentials")
-        xhr.setRequestHeader("Content-Type", "application/$mimeType;charset=UTF-8")
-        xhr.setRequestHeader("Accept", "application/$mimeType")
+        xhr.setRequestHeader("Content-Type", "application/$subType;charset=UTF-8")
+        xhr.setRequestHeader("Accept", "application/$subType")
 
-        val reSpec = ResourceSpecification(url, mimeType)
+        val reSpec = ResourceSpecification(url, subType)
         xhr.onload = { _ -> resultHandler(reSpec, xhr.responseText) }
         xhr.onerror = { _ -> errorHandler(reSpec, xhr.responseText) }
         xhr.ontimeout = { _ -> errorHandler(reSpec, xhr.responseText) }

diff --git a/src/main/kotlin/org/ro/core/model/DisplayList.kt b/src/main/kotlin/org/ro/core/model/DisplayList.kt
@@ -1,36 +1,65 @@
 package org.ro.core.model
 
 import org.ro.layout.Layout
+import org.ro.layout.PropertyLt
 import org.ro.to.Extensions
 import org.ro.to.Property
 import org.ro.to.TObject
 import org.ro.to.TransferObject
+import org.ro.to.bs3.Grid
 import pl.treksoft.kvision.state.observableListOf
 
 class DisplayList(override val title: String) : BaseDisplayable() {
     var data = observableListOf<Exposer>()
     override var layout: Layout? = null
+    var grid: Grid? = null
     var propertyDescriptionList = mutableMapOf<String, String>()
     var propertyList = mutableListOf<Property>()
+    var propertyLayoutList = mutableListOf<PropertyLt>()
 
     override fun canBeDisplayed(): Boolean {
         when {
             isRendered -> return false
             layout == null -> return false
+            grid == null -> return false
             else -> {
-                val lps = layout!!.propertyList.size
+                val lps = propertyList.size
                 val pds = propertyDescriptionList.size
-              //  val ps =  propertyList.size
+                //  val ps =  propertyList.size
                 val descriptionsComplete = lps <= pds
-              //  val propertiesComplete = lps <= ps
+                //  val propertiesComplete = lps <= ps
                 console.log("[DL.canBeDisplayed] layout.properties: $lps")
                 console.log("[DL.canBeDisplayed] propertyDescriptions: $pds")
-             //   console.log("[DL.canBeDisplayed] properties: $ps")
+                //   console.log("[DL.canBeDisplayed] properties: $ps")
                 return descriptionsComplete //&& propertiesComplete
             }
         }
     }
 
+    fun addLayout(layout: Layout) {
+        this.layout = layout
+        layout.row.forEach { r ->
+            r.cols.forEach { cs ->
+                cs.col.fieldSet.forEach { fs ->
+                    fs.property.forEach { p ->
+                        propertyLayoutList.add(p)
+                    }
+                }
+                cs.col.row.forEach { r ->
+                    r.cols.forEach { cs ->
+                        cs.col.fieldSet.forEach { fs ->
+                            fs.property.forEach { p ->
+                                propertyLayoutList.add(p)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        console.log("[DL.addLayout]")
+        console.log(propertyLayoutList)
+    }
+
     override fun addData(obj: TransferObject) {
         val exo = Exposer(obj as TObject)
         data.add(exo.dynamise())  //if exposer is not dynamised, data access in tables won't work
@@ -41,7 +70,6 @@ class DisplayList(override val title: String) : BaseDisplayable() {
         val e: Extensions = p.extensions!!
         val friendlyName = e.friendlyName
         propertyDescriptionList.put(id, friendlyName)
-        layout?.addPropertyDescription(p)
     }
 
     fun addProperty(property: Property) {