fix the checkConfig mismatch + handle new API response (workspace)

convertigo · Nov 21, 2024 · 4ba934f · 4ba934f
1 parent fbfd065
commit 4ba934f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/_c8oProject/mobilePages/BrowseTables.yaml b/_c8oProject/mobilePages/BrowseTables.yaml
@@ -563,7 +563,7 @@ title: First page
                                 '{
                                  "ionBean": "SetLocalAction",
                                  "Property": "plain:groupName",
-                                 "Value": "source:{\"filter\":\"Iteration\",\"project\":\"lib_BaseRow\",\"input\":\"\",\"model\":{\"data\":[{\"priority\":1667635335398}],\"path\":\"?.group?.name\",\"prefix\":\"\",\"suffix\":\"\",\"custom\":\"\",\"useCustom\":false}}"
+                                 "Value": "source:{\"filter\":\"Iteration\",\"project\":\"lib_BaseRow\",\"input\":\"\",\"model\":{\"data\":[{\"priority\":1667635335398}],\"path\":\"\",\"prefix\":\"\",\"suffix\":\"?.workspace?.name\",\"custom\":\"\",\"useCustom\":false}}"
                                 }'
                               tagName: SetLocal
                               ↓SetLocal1 [ngx.components.UIDynamicAction-1679052845680]: 

diff --git a/_c8oProject/sequences/formscommon_CheckConfig.yaml b/_c8oProject/sequences/formscommon_CheckConfig.yaml
@@ -10,31 +10,32 @@ accessibility: Private
   sourceTransaction: C8Oforms.c8oforms_fs.GetDocument
   ↓_use_docid [variables.StepVariable-1729157830651]: 
     description: Document ID
-↓IfExistThenElse [steps.IfExistThenElseStep-1729158259008]: 
+↓formSourceConfig [steps.SimpleSourceStep-1732208590734]: 
   sourceDefinition: 
     - xmlizable: 
       - ↑classname: com.twinsoft.convertigo.beans.common.XMLVector
       - com.twinsoft.convertigo.beans.common.XMLVector: 
         - java.lang.String: 
           - ↑value: 1729157830649
         - java.lang.String: 
-          - ↑value: ./document/couchdb_output//item[id = '{{{ source_id }}}']/sources[.//forms_config/str = '{{{ forms_config }}}']
-  ↓jThen [steps.ThenStep-1729158260118]: 
-  ↓jElse [steps.ElseStep-1729158260120]: 
-    ↓Error_structure [steps.XMLErrorStep-1729158280799]: 
-      code: 
-        - xmlizable: 
-          - ↑classname: com.twinsoft.convertigo.beans.steps.SmartType
-          - SmartType: 
-            - ↑mode: PLAIN
-            - →→: 7
-      message: 
-        - xmlizable: 
-          - ↑classname: com.twinsoft.convertigo.beans.steps.SmartType
-          - SmartType: 
-            - ↑mode: PLAIN
-            - →→: forms_config mismatch
-    ↓Return [steps.ReturnStep-1729158270026]: 
+          - ↑value: ./document/couchdb_output//item[id = '{{{ source_id }}}']/sources//forms_config/str/text()
+  variableName: doc_forms_config
+↓jIf [steps.IfStep-1732208668695]: 
+  condition: forms_config != doc_forms_config
+  ↓Error_structure [steps.XMLErrorStep-1732208675113]: 
+    code: 
+      - xmlizable: 
+        - ↑classname: com.twinsoft.convertigo.beans.steps.SmartType
+        - SmartType: 
+          - ↑mode: PLAIN
+          - →→: 7
+    message: 
+      - xmlizable: 
+        - ↑classname: com.twinsoft.convertigo.beans.steps.SmartType
+        - SmartType: 
+          - ↑mode: PLAIN
+          - →→: forms_config mismatch
+  ↓Return [steps.ReturnStep-1732208675116]: 
 ↓Call_Sequence1 [steps.SequenceStep-1729157238702]: 
   sourceSequence: C8Oforms.BaserowAccountGet
   ↓owner [variables.StepVariable-1729157238705]: 

diff --git 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.0-beta10
+  version: 1.1.0-beta11
   ↓Baserow_API_spec [connectors.HttpConnector]: 🗏 connectors/Baserow_API_spec.yaml
   ↓MediaConnector [connectors.HttpConnector]: 🗏 connectors/MediaConnector.yaml
   ↓AdminLogin [sequences.GenericSequence]: 🗏 sequences/AdminLogin.yaml