From 8d75853e3a4213f186649c32f5c03a7a187308e3 Mon Sep 17 00:00:00 2001
From: Charles Grimont
Date: Mon, 6 Jan 2025 11:11:08 +0100
Subject: [PATCH] ref convertigo/C8oForms/issues/833 fixed
---
.../sequences/formssource_GetTableData.yaml | 2 +-
c8oProject.yaml | 2 +-
js/utils.js | 24 +++++++++----------
project.md | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/_c8oProject/sequences/formssource_GetTableData.yaml b/_c8oProject/sequences/formssource_GetTableData.yaml
index 4876087..8f19ebb 100644
--- a/_c8oProject/sequences/formssource_GetTableData.yaml
+++ b/_c8oProject/sequences/formssource_GetTableData.yaml
@@ -316,7 +316,7 @@ comment: |
var current = elem[key];
if(current != null){
obj[key] = {"displayName": key, "type": "html", value:""};
- var result = computeAnyType(current);
+ var result = computeAnyType(current, false);
html += result.innerHtml;
obj[key].value = result.value;
if(key == "id" || key == "order" || (jConfig.hidden ? jConfig.hidden.includes(key) : false)){
diff --git a/c8oProject.yaml b/c8oProject.yaml
index 3b4b913..876b354 100644
--- a/c8oProject.yaml
+++ b/c8oProject.yaml
@@ -14,7 +14,7 @@
contextTimeout: ${lib_baserow.context_timout=3600}
corsOrigin: =Origin
httpSessionTimeout: ${lib_baserow.session_timout=3600}
- version: 1.1.7
+ version: 1.1.8
↓Baserow_API_spec [connectors.HttpConnector]: 🗏 connectors/Baserow_API_spec.yaml
↓MediaConnector [connectors.HttpConnector]: 🗏 connectors/MediaConnector.yaml
↓_disabled_formssource_GetSelectDataOld [sequences.GenericSequence]: 🗏 sequences/_disabled_formssource_GetSelectDataOld.yaml
diff --git a/js/utils.js b/js/utils.js
index 05b730e..a794603 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -35,52 +35,52 @@ var get_base_array_image_html = (url)=>{
var get_base_array_link_html = (url, visibleName)=>{
return "" + visibleName + "
"
}
-var computeAnyType = (element)=>{
+var computeAnyType = (element, nested)=>{
var value;
var innerHtml = "";
if(Array.isArray(element)){
value = [];
element.forEach((arrayItem)=>{
- var result = computeAnyType(arrayItem);
+ var result = computeAnyType(arrayItem, true);
value.push(result.value);
innerHtml += result.innerHtml;
});
- innerHtml += close_html;
+ //innerHtml += close_html;
}
else if(typeof element == "object"){
if(element.value != undefined && typeof element.value == "object"){
- var result = computeAnyType(element.value);
+ var result = computeAnyType(element.value, true);
innerHtml = result.innerHtml;
value = result.value;
}
else if(element.value != undefined){
- innerHtml = get_base_array_html(element.value, element.color) + close_html;
+ innerHtml = get_base_array_html(element.value, element.color); // + close_html;
value = element;
}
else if(element.name != undefined && element.is_image == undefined && element.url == undefined) {
- innerHtml = get_base_array_html(element.name, element.color) + close_html;
+ innerHtml = get_base_array_html(element.name, element.color); // + close_html;
value = element;
}
else if(element.url != undefined && element.label != undefined && element.is_image == undefined){
- innerHtml = get_base_btn_html(element.url, element.label, "light-blue") + close_html;
+ innerHtml = get_base_btn_html(element.url, element.label, "light-blue"); // + close_html;
value = element;
}
else if(element.is_image != undefined){
if(element.is_image == true){
- innerHtml = get_base_array_image_html(element.url) + close_html;
+ innerHtml = get_base_array_image_html(element.url); // + close_html;
}
else{
- innerHtml = get_base_array_link_html(element.url, arrayItem.visible_name) + close_html;
+ innerHtml = get_base_array_link_html(element.url, arrayItem.visible_name); // + close_html;
}
value = element;
}
else{
- log.warn("toto");
+ log.warn("type not handled");
}
}
else{
- innerHtml = element + close_html;
+ innerHtml = element; // + close_html;
value = element;
}
- return {innerHtml: innerHtml, value: value};
+ return {innerHtml: innerHtml + (nested ? "" : close_html), value: value};
}
\ No newline at end of file
diff --git a/project.md b/project.md
index 7d4db30..bb2a1a2 100644
--- a/project.md
+++ b/project.md
@@ -12,7 +12,7 @@ This is the Baserow No Code connector for Convertigo. Use this connector to exch
##  C8Oforms
-see [readme](https://github.com/convertigo/C8oForms/tree/hotfix/2.0.4#readme)
+see [readme](https://github.com/convertigo/C8oForms/tree/hotfix/2.0.5#readme)
CouchDb_schema