For #6518: don't require app/form name for testing form

orbeon · Dec 18, 2024 · efa3523 · efa3523
1 parent 06be989
commit efa3523
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 46 deletions.
diff --git a/form-builder/jvm/src/main/resources/forms/orbeon/builder/form/model.xml b/form-builder/jvm/src/main/resources/forms/orbeon/builder/form/model.xml
@@ -677,7 +677,14 @@
             )"
         method="post"
         replace="all"
-        resource="/fr/{bind('application-name-bind')}/{bind('form-name-bind')}/test?fr-language={$fb-lang}"
+        resource="
+            /fr/{
+                (bind('application-name-bind')[xxf:non-blank()], '_')[1]
+            }/{
+                (bind('form-name-bind')[xxf:non-blank()], '_')[1]
+            }/test?fr-language={
+                $fb-lang
+            }"
         xxf:target="fb-test-iframe"
         xxf:show-progress="false"
     />
@@ -711,7 +718,14 @@
             )"
         method="post"
         replace="all"
-        resource="/fr/{bind('application-name-bind')}/{bind('form-name-bind')}/test"
+        resource="
+            /fr/{
+                (bind('application-name-bind')[xxf:non-blank()], '_')[1]
+            }/{
+                (bind('form-name-bind')[xxf:non-blank()], '_')[1]
+            }/test?fr-language={
+                $fb-lang
+            }"
         xxf:target="fb-test-iframe"
         xxf:show-progress="false"
     />
@@ -751,7 +765,12 @@
             )"
         method="post"
         replace="all"
-        resource="/fr/service/{bind('application-name-bind')}/{bind('form-name-bind')}/compile?format=zip"
+        resource="
+            /fr/service/{
+                (bind('application-name-bind')[xxf:non-blank()], '_')[1]
+            }/{
+                (bind('form-name-bind')[xxf:non-blank()], '_')[1]
+            }/compile?format=zip"
         xxf:target="fb-test-iframe"
         xxf:show-progress="false"
     />
@@ -781,14 +800,19 @@
             )"
         method="post"
         replace="all"
-        resource="/fr/service/{bind('application-name-bind')}/{bind('form-name-bind')}/test-pdf?{
+        resource="
+            /fr/service/{
+                (bind('application-name-bind')[xxf:non-blank()], '_')[1]
+            }/{
+                (bind('form-name-bind')[xxf:non-blank()], '_')[1]
+            }/test-pdf?{
             string-join(
                 for $p in instance('fb-test-pdf-submission-params')/@*[xxf:non-blank(.)]
                 return
                     concat(name($p), '=', encode-for-uri(string($p))),
                 '&amp;'
             )
-        }&amp;fr-remember-language=false"
+            }&amp;fr-remember-language=false"
         xxf:target="_blank"
         xxf:show-progress="false"
     />

diff --git a/src/main/resources/config/properties-form-builder.xml b/src/main/resources/config/properties-form-builder.xml
@@ -180,58 +180,22 @@
     </property>
 
     <property as="xs:string"  name="oxf.fr.detail.process.test.orbeon.builder">
-        if ("
-            let $metadata := xxf:instance('fb-form-instance')/xh:head/xf:model[@id = 'fr-form-model']/xf:instance[@id = 'fr-form-metadata']/*
-            return
-                xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
-        ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "test") then
-            suspend then
-            xf:dispatch(name = "fb-test-form")
-        ) else
-            xf:dispatch(name = "fb-test-form")
+        xf:dispatch(name = "fb-test-form")
     </property>
 
     <property as="xs:string"  name="oxf.fr.detail.process.test-formulas.orbeon.builder">
-        if ("
-            let $metadata := xxf:instance('fb-form-instance')/xh:head/xf:model[@id = 'fr-form-model']/xf:instance[@id = 'fr-form-metadata']/*
-            return
-                xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
-        ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "test-formulas") then
-            suspend then
-            xf:dispatch(name = "fb-test-formulas")
-        ) else
-            xf:dispatch(name = "fb-test-formulas")
+        xf:dispatch(name = "fb-test-formulas")
     </property>
 
     <property as="xs:string"  name="oxf.fr.detail.process.test-offline.orbeon.builder">
-        if ("
-            let $metadata := xxf:instance('fb-form-instance')/xh:head/xf:model[@id = 'fr-form-model']/xf:instance[@id = 'fr-form-metadata']/*
-            return
-                xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
-        ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "test-offline") then
-            suspend then
-            xf:dispatch(name = "fb-test-offline")
-        ) else
-            xf:dispatch(name = "fb-test-offline")
+        xf:dispatch(name = "fb-test-offline")
     </property>
 
     <property as="xs:string"  name="oxf.fr.detail.process.test-pdf.orbeon.builder">
-        if ("
-            let $metadata := xxf:instance('fb-form-instance')/xh:head/xf:model[@id = 'fr-form-model']/xf:instance[@id = 'fr-form-metadata']/*
-            return
-                xxf:is-blank($metadata/application-name) or xxf:is-blank($metadata/form-name)
-        ") then (
-            xf:dispatch(name = "DOMActivate", targetid="open-form-settings-trigger", mode = "app-form", for-button-name = "test-pdf") then
-            suspend then
-            xf:dispatch(name = "fb-test-pdf-show-dialog")
-        ) else
-            xf:dispatch(name = "fb-test-pdf-show-dialog")
+        xf:dispatch(name = "fb-test-pdf-show-dialog")
     </property>
 
-<property as="xs:string"  name="oxf.fr.detail.process.publish.orbeon.builder">
+    <property as="xs:string"  name="oxf.fr.detail.process.publish.orbeon.builder">
         if ("
             let $metadata := xxf:instance('fb-form-instance')/xh:head/xf:model[@id = 'fr-form-model']/xf:instance[@id = 'fr-form-metadata']/*
             return