From 83b1ab39e261fc75959b9d9172e30f48cf024fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Prunayre?= <fx.prunayre@gmail.com>
Date: Fri, 17 May 2024 11:40:52 +0200
Subject: [PATCH] Editor / Table mode / Add ordering control. (#8016)

Add possibility to enable ordering control in table mode.

Refactor templates to use the same for all plugins.

Also stop event propagation to avoid to collapse a fieldset when moving
such elements.

Fix visibility of icons depending on position.

Funded by Ifremer.
---
 schemas/config-editor.xsd                     |  11 +-
 .../iso19115-3.2018/layout/config-editor.xml  |   9 ++
 .../layout/layout-custom-fields.xsl           | 131 +----------------
 .../plugin/iso19139/layout/config-editor.xml  |   4 +
 .../iso19139/layout/layout-custom-tpl.xsl     | 133 +-----------------
 .../components/edit/FieldsDirective.js        |   3 +-
 .../metadatamanager/EditorService.js          |  12 +-
 .../views/default/less/gn_editor_default.less |   3 -
 .../webapp/xslt/ui-metadata/form-builder.xsl  | 126 ++++++++++++++++-
 9 files changed, 159 insertions(+), 273 deletions(-)

diff --git a/schemas/config-editor.xsd b/schemas/config-editor.xsd
index c648ad2739a..e319325e0ed 100644
--- a/schemas/config-editor.xsd
+++ b/schemas/config-editor.xsd
@@ -263,12 +263,14 @@ Configure here the list of fields to display using a table. This only applies to
         <tableFields>
           <table for="gmd:CI_OnlineResource">
             <header>
-              <hcol label="gmd:protocol"/>
-              <hcol label="gmd:linkage"/>
-              <hcol label="gmd:name"/>
-              <hcol/>
+              <col/>
+              <col label="gmd:protocol"/>
+              <col label="gmd:linkage"/>
+              <col label="gmd:name"/>
+              <col/>
             </header>
             <row>
+              <col orderControl=".."/>
               <col xpath="gmd:protocol"/>
               <col xpath="gmd:linkage"/>
               <col xpath="gmd:name"/>
@@ -434,6 +436,7 @@ Table column.
             </xs:sequence>
             <xs:attribute name="xpath" type="xs:string" use="optional"/>
             <xs:attribute name="del" type="xs:string" use="optional"/>
+            <xs:attribute name="orderControl" type="xs:string" use="optional"/>
             <xs:attribute name="use" type="xs:string" use="optional"/>
           </xs:complexType>
         </xs:element>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
index 30d0871920a..5131c31b54a 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
@@ -569,12 +569,14 @@
     a table view force some constraints. -->
     <table for="cit:CI_Responsibility">
       <header>
+        <col/>
         <col label="cit:role"/>
         <col label="cit:CI_Organisation"/>
         <col label="cit:electronicMailAddress"/>
         <col/>
       </header>
       <row>
+        <col orderControl=".."/>
         <col xpath="cit:role"/>
         <col xpath="cit:party/cit:CI_Organisation/cit:name"/>
         <col xpath="cit:party/*/cit:contactInfo/*/cit:address/*/cit:electronicMailAddress"/>
@@ -583,11 +585,14 @@
     </table>
     <table for="gfc:FC_ListedValue">
       <header>
+        <col/>
         <col label="gfc:code"/>
         <col label="gfc:label"/>
         <col label="gfc:definition"/>
+        <col/>
       </header>
       <row>
+        <col orderControl=".."/>
         <col xpath="gfc:code"/>
         <col xpath="gfc:label"/>
         <col xpath="gfc:definition"/>
@@ -596,11 +601,15 @@
     </table>
     <table for="gfc:FC_ListedValue">
       <header>
+        <col/>
         <col label="gfc:code"/>
         <col label="gfc:label"/>
         <col label="gfc:definition"/>
+        <col label="gfc:valueType"/>
+        <col/>
       </header>
       <row>
+        <col orderControl=".."/>
         <col xpath="gfc:code"/>
         <col xpath="gfc:label"/>
         <col xpath="gfc:definition"/>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields.xsl
index 146a1071cd2..d0c6585bd35 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/layout-custom-fields.xsl
@@ -346,7 +346,9 @@
                         (1 or @gn:addedObj = 'true') and
                         $isFlatMode]"
                 priority="2000">
-    <xsl:call-template name="iso19115-3.2018-table"/>
+    <xsl:call-template name="build-table">
+      <xsl:with-param name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/>
+    </xsl:call-template>
   </xsl:template>
 
   <!-- Ignore the following -->
@@ -358,132 +360,5 @@
                         $isFlatMode]"
                 priority="2000"/>
 
-  <!-- Define table layout -->
-  <xsl:template name="iso19115-3.2018-table">
-    <xsl:variable name="name" select="name()"/>
-    <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>
-    <xsl:variable name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/>
-
-    <xsl:variable name="childName"
-                  select="*[1]/name()"/>
-
-    <xsl:variable name="isEmbeddedMode"
-                  select="@gn:addedObj = 'true'"/>
-    <xsl:variable name="isFirstOfItsKind"
-                  select="preceding-sibling::*[1]/name() != $name"/>
-
-    <xsl:variable name="tableConfig"
-                  select="$editorConfig/editor/tableFields/table[@for = $childName]"/>
-
-    <xsl:variable name="values">
-      <xsl:if test="not($isEmbeddedMode) or ($isEmbeddedMode and $isFirstOfItsKind)">
-        <header>
-          <xsl:for-each select="$tableConfig/header/col">
-            <col>
-              <xsl:copy-of select="@*"/>
-              <xsl:if test="@label">
-                <!-- TODO: column names may comes from strings.xml -->
-                <xsl:value-of select="gn-fn-metadata:getLabel($schema, @label, $labels, '', $isoType, $xpath)/label"/>
-              </xsl:if>
-            </col>
-          </xsl:for-each>
-        </header>
-      </xsl:if>
-      <xsl:for-each select="(.|following-sibling::*[name() = $name])/*[name() = $childName]">
-
-        <xsl:variable name="base"
-                      select="."/>
-        <xsl:for-each select="$tableConfig/row">
-          <row>
-            <xsl:for-each select="col">
-              <col>
-                <xsl:if test="@use != ''">
-                  <xsl:copy-of select="@use|directiveAttributes"/>
-                </xsl:if>
-                <xsl:if test="@del != ''">
-                  <xsl:attribute name="remove" select="'true'"/>
-
-                  <saxon:call-template name="{concat('evaluate-', $schema)}">
-                    <xsl:with-param name="base" select="$base"/>
-                    <xsl:with-param name="in"
-                                    select="concat('/', @del, '/gn:element')"/>
-                  </saxon:call-template>
-                </xsl:if>
-
-                <xsl:if test="@xpath != ''">
-                  <saxon:call-template name="{concat('evaluate-', $schema)}">
-                    <xsl:with-param name="base" select="$base"/>
-                    <xsl:with-param name="in"
-                                    select="concat('/', @xpath)"/>
-                  </saxon:call-template>
-                </xsl:if>
-              </col>
-            </xsl:for-each>
-          </row>
-
-          <xsl:for-each select="section[@xpath]">
-            <row>
-              <col colspan="{count(../col)}" type="form" withLabel="true">
-                <xsl:apply-templates mode="form-builder" select=".">
-                  <xsl:with-param name="base" select="$base"/>
-                </xsl:apply-templates>
-                <!--<xsl:variable name="nodes">
-
-                <saxon:call-template name="{concat('evaluate-', $schema)}">
-                  <xsl:with-param name="base" select="$base"/>
-                  <xsl:with-param name="in"
-                                  select="concat('/', @xpath)"/>
-                </saxon:call-template>
-                </xsl:variable>
-
-                <xsl:for-each select="$nodes">
-                  <saxon:call-template name="{concat('dispatch-', $schema)}">
-                    <xsl:with-param name="base" select="."/>
-                  </saxon:call-template>
-                </xsl:for-each>
-
-                <xsl:if test="@or and @in">
-                  <saxon:call-template name="{concat('evaluate-', $schema)}">
-                    <xsl:with-param name="base" select="$base"/>
-                    <xsl:with-param name="in"
-                                    select="concat('/../', @in, '/gn:child[@name=''', @or, ''']')"/>
-                  </saxon:call-template>
-                </xsl:if>-->
-              </col>
-            </row>
-          </xsl:for-each>
-        </xsl:for-each>
-      </xsl:for-each>
-    </xsl:variable>
-
-
-    <!-- Return only the new row in embed mode. -->
-    <xsl:choose>
-      <xsl:when test="$tableConfig/@fieldset = 'false' or ($isEmbeddedMode and not($isFirstOfItsKind))">
-        <xsl:call-template name="render-table">
-          <xsl:with-param name="values" select="$values"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-
-        <xsl:variable name="tableTitle" select="if (($tableConfig/@label) and (string($strings/*[name() = $tableConfig/@label])))
-              then $strings/*[name() = $tableConfig/@label]
-              else gn-fn-metadata:getLabel($schema, $name, $labels, name(..), $isoType, $xpath)/label" />
-
-        <xsl:call-template name="render-boxed-element">
-          <xsl:with-param name="label"
-                          select="$tableTitle"/>
-          <xsl:with-param name="cls" select="local-name()"/>
-          <xsl:with-param name="subTreeSnippet">
-
-            <xsl:call-template name="render-table">
-              <xsl:with-param name="values" select="$values"/>
-            </xsl:call-template>
-
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
 
 </xsl:stylesheet>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml b/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml
index f37d3ba1d75..2c88bb6e15d 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml
@@ -424,6 +424,7 @@
   <tableFields>
     <table for="gmd:CI_ResponsibleParty">
       <header>
+        <col/>
         <!-- TODO: Add label from strings.xml / label with context-->
         <col label="gmd:organisationName"/>
         <col label="gmd:individualName"/>
@@ -432,6 +433,7 @@
         <col/>
       </header>
       <row>
+        <col orderControl=".."/>
         <col xpath="gmd:organisationName"/>
         <col xpath="gmd:individualName"/>
         <col xpath="gmd:contactInfo/*/gmd:address/*/gmd:electronicMailAddress"/>
@@ -441,12 +443,14 @@
     </table>
     <table for="gmd:CI_OnlineResource">
       <header>
+        <col/>
         <col label="gmd:protocol"/>
         <col label="gmd:linkage"/>
         <col label="gmd:name"/>
         <col/>
       </header>
       <row>
+        <col orderControl=".."/>
         <col xpath="gmd:protocol"/>
         <col xpath="gmd:linkage"/>
         <col xpath="gmd:name"/>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-tpl.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-tpl.xsl
index 1feab1d2102..0193166e2a7 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-tpl.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-tpl.xsl
@@ -23,7 +23,9 @@
                         (1 or @gn:addedObj = 'true') and
                         $isFlatMode]"
                 priority="2000">
-    <xsl:call-template name="iso19139-table"/>
+    <xsl:call-template name="build-table">
+      <xsl:with-param name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/>
+    </xsl:call-template>
   </xsl:template>
 
   <!-- Ignore the following -->
@@ -35,135 +37,6 @@
                         $isFlatMode]"
                 priority="2000"/>
 
-  <!-- Define table layout -->
-  <xsl:template name="iso19139-table">
-    <xsl:variable name="name" select="name()"/>
-    <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>
-    <xsl:variable name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/>
-
-    <xsl:variable name="childName"
-                  select="*[1]/name()"/>
-
-    <xsl:variable name="isEmbeddedMode"
-                  select="@gn:addedObj = 'true'"/>
-    <xsl:variable name="isFirstOfItsKind"
-                  select="preceding-sibling::*[1]/name() != $name"/>
-
-    <xsl:variable name="tableConfig"
-                  select="$editorConfig/editor/tableFields/table[@for = $childName]"/>
-
-    <xsl:variable name="values">
-      <xsl:if test="not($isEmbeddedMode) or ($isEmbeddedMode and $isFirstOfItsKind)">
-        <header>
-          <xsl:for-each select="$tableConfig/header/col">
-            <col>
-              <xsl:copy-of select="@*"/>
-              <xsl:if test="@label">
-                <!-- TODO: column names may comes from strings.xml -->
-                <xsl:value-of select="gn-fn-metadata:getLabel($schema, @label, $labels, '', $isoType, $xpath)/label"/>
-              </xsl:if>
-            </col>
-          </xsl:for-each>
-        </header>
-      </xsl:if>
-      <xsl:for-each select="(.|following-sibling::*[name() = $name])/*[name() = $childName]">
-
-        <xsl:variable name="base"
-                      select="."/>
-        <xsl:for-each select="$tableConfig/row">
-          <row>
-            <xsl:for-each select="col">
-              <col>
-                <xsl:if test="@use != ''">
-                  <xsl:copy-of select="@use|directiveAttributes"/>
-                </xsl:if>
-                <xsl:if test="@del != ''">
-                  <xsl:attribute name="remove" select="'true'"/>
-
-                  <saxon:call-template name="{concat('evaluate-', $schema)}">
-                    <xsl:with-param name="base" select="$base"/>
-                    <xsl:with-param name="in"
-                                    select="concat('/', @del, '/gn:element')"/>
-                  </saxon:call-template>
-                </xsl:if>
-
-                <xsl:if test="@xpath != ''">
-                  <saxon:call-template name="{concat('evaluate-', $schema)}">
-                    <xsl:with-param name="base" select="$base"/>
-                    <xsl:with-param name="in"
-                                    select="concat('/', @xpath)"/>
-                  </saxon:call-template>
-                </xsl:if>
-              </col>
-            </xsl:for-each>
-          </row>
-
-          <xsl:for-each select="section[@xpath]">
-            <row>
-              <col colspan="{count(../col)}" type="form" withLabel="true">
-                <xsl:apply-templates mode="form-builder" select=".">
-                  <xsl:with-param name="base" select="$base"/>
-                </xsl:apply-templates>
-                <!--<xsl:variable name="nodes">
-
-                <saxon:call-template name="{concat('evaluate-', $schema)}">
-                  <xsl:with-param name="base" select="$base"/>
-                  <xsl:with-param name="in"
-                                  select="concat('/', @xpath)"/>
-                </saxon:call-template>
-                </xsl:variable>
-
-                <xsl:for-each select="$nodes">
-                  <saxon:call-template name="{concat('dispatch-', $schema)}">
-                    <xsl:with-param name="base" select="."/>
-                  </saxon:call-template>
-                </xsl:for-each>
-
-                <xsl:if test="@or and @in">
-                  <saxon:call-template name="{concat('evaluate-', $schema)}">
-                    <xsl:with-param name="base" select="$base"/>
-                    <xsl:with-param name="in"
-                                    select="concat('/../', @in, '/gn:child[@name=''', @or, ''']')"/>
-                  </saxon:call-template>
-                </xsl:if>-->
-              </col>
-            </row>
-          </xsl:for-each>
-        </xsl:for-each>
-      </xsl:for-each>
-    </xsl:variable>
-
-
-    <!-- Return only the new row in embed mode. -->
-    <xsl:choose>
-      <xsl:when test="$tableConfig/@fieldset = 'false' or ($isEmbeddedMode and not($isFirstOfItsKind))">
-        <xsl:call-template name="render-table">
-          <xsl:with-param name="values" select="$values"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-
-        <xsl:variable name="tableTitle" select="if (($tableConfig/@label) and (string($strings/*[name() = $tableConfig/@label])))
-              then $strings/*[name() = $tableConfig/@label]
-              else gn-fn-metadata:getLabel($schema, $name, $labels, name(..), $isoType, $xpath)/label" />
-
-        <xsl:call-template name="render-boxed-element">
-          <xsl:with-param name="label"
-                          select="$tableTitle"/>
-          <xsl:with-param name="cls" select="local-name()"/>
-          <xsl:with-param name="subTreeSnippet">
-
-            <xsl:call-template name="render-table">
-              <xsl:with-param name="values" select="$values"/>
-            </xsl:call-template>
-
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-
 
 
   <xsl:template mode="mode-iso19139"
diff --git a/web-ui/src/main/resources/catalog/components/edit/FieldsDirective.js b/web-ui/src/main/resources/catalog/components/edit/FieldsDirective.js
index 89bd0973dcf..d71d7f6dcb7 100644
--- a/web-ui/src/main/resources/catalog/components/edit/FieldsDirective.js
+++ b/web-ui/src/main/resources/catalog/components/edit/FieldsDirective.js
@@ -474,7 +474,8 @@
             element.off();
           });
 
-          $(element).click(function () {
+          $(element).click(function (event) {
+            event.stopPropagation();
             gnEditor.move(scope.ref, scope.direction || "down", scope.domelementToMove);
           });
         }
diff --git a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
index 527e6f8b2ae..702c3427526 100644
--- a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
+++ b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js
@@ -668,12 +668,12 @@
 
             // For each existing up/down control transfer
             // the hidden class between the two elements.
-            angular.forEach(switchWithElementCtrl, function (ctrl, idx) {
-              var ctrl2 = currentElementCtrl[idx];
-              var ctrlHidden = $(ctrl).hasClass("invisible");
-              var ctrl2Hidden = $(ctrl2).hasClass("invisible");
-              $(ctrl).toggleClass("invisible", ctrl2Hidden);
-              $(ctrl2).toggleClass("invisible", ctrlHidden);
+            angular.forEach(switchWithElementCtrl, function (switchedElement, idx) {
+              var movedElement = currentElementCtrl[idx];
+              var switchHidden = $(switchedElement).hasClass("hidden");
+              var movedHidden = $(movedElement).hasClass("hidden");
+              $(switchedElement).toggleClass("hidden", movedHidden);
+              $(movedElement).toggleClass("hidden", switchHidden);
             });
 
             var hasClass = currentElement.hasClass("gn-extra-field");
diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_editor_default.less b/web-ui/src/main/resources/catalog/views/default/less/gn_editor_default.less
index bef674ada12..a4a29e57ddb 100644
--- a/web-ui/src/main/resources/catalog/views/default/less/gn_editor_default.less
+++ b/web-ui/src/main/resources/catalog/views/default/less/gn_editor_default.less
@@ -211,9 +211,6 @@
             padding-left: 15px;
           }
         }
-        .gn-move {
-          display: none;
-        }
       }
       .table {
         margin-bottom: 0px;
diff --git a/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl b/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
index e700a0f9f8f..c37260a275d 100644
--- a/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
+++ b/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
@@ -1482,8 +1482,10 @@
   <xsl:template name="render-form-field-control-move">
     <xsl:param name="elementEditInfo"/>
     <xsl:param name="domeElementToMoveRef" required="no" select="''"/>
+    <xsl:param name="forceDisplay" required="no" as="xs:boolean" select="false()"/>
 
-    <xsl:if test="not($viewConfig/@upAndDownControlHidden)">
+
+    <xsl:if test="not($viewConfig/@upAndDownControlHidden) or $forceDisplay">
       <div class="gn-move">
         <xsl:variable name="elementToMoveRef"
                       select="if ($elementEditInfo) then $elementEditInfo/@ref else ''"/>
@@ -1726,6 +1728,121 @@
   <row...
 
   -->
+  <xsl:template name="build-table">
+    <xsl:param name="isoType" as="xs:string"/>
+
+    <xsl:variable name="name" select="name()"/>
+    <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>
+
+    <xsl:variable name="childName"
+                  select="*[1]/name()"/>
+
+    <xsl:variable name="isEmbeddedMode"
+                  select="@gn:addedObj = 'true'"/>
+    <xsl:variable name="isFirstOfItsKind"
+                  select="preceding-sibling::*[1]/name() != $name"/>
+
+    <xsl:variable name="tableConfig"
+                  select="$editorConfig/editor/tableFields/table[@for = $childName]"/>
+
+    <xsl:variable name="values">
+      <xsl:if test="not($isEmbeddedMode) or ($isEmbeddedMode and $isFirstOfItsKind)">
+        <header>
+          <xsl:for-each select="$tableConfig/header/col">
+            <col>
+              <xsl:copy-of select="@*"/>
+              <xsl:if test="@label">
+                <!-- TODO: column names may comes from strings.xml -->
+                <xsl:value-of select="gn-fn-metadata:getLabel($schema, @label, $labels, '', $isoType, $xpath)/label"/>
+              </xsl:if>
+            </col>
+          </xsl:for-each>
+        </header>
+      </xsl:if>
+      <xsl:for-each select="(.|following-sibling::*[name() = $name])/*[name() = $childName]">
+
+        <xsl:variable name="base"
+                      select="."/>
+        <xsl:for-each select="$tableConfig/row">
+          <row>
+            <xsl:for-each select="col">
+              <col>
+                <xsl:choose>
+                  <xsl:when test="@use != ''">
+                    <xsl:copy-of select="@use|directiveAttributes"/>
+                  </xsl:when>
+                  <xsl:when test="@del != ''">
+                    <xsl:attribute name="remove" select="'true'"/>
+
+                    <saxon:call-template name="{concat('evaluate-', $schema)}">
+                      <xsl:with-param name="base" select="$base"/>
+                      <xsl:with-param name="in"
+                                      select="concat('/', @del, '/gn:element')"/>
+                    </saxon:call-template>
+                  </xsl:when>
+                  <xsl:when test="@orderControl != ''">
+                    <xsl:attribute name="orderControl" select="'true'"/>
+
+                    <saxon:call-template name="{concat('evaluate-', $schema)}">
+                      <xsl:with-param name="base" select="$base"/>
+                      <xsl:with-param name="in"
+                                      select="concat('/', @orderControl, '/gn:element')"/>
+                    </saxon:call-template>
+                  </xsl:when>
+                  <xsl:when test="@xpath != ''">
+                    <saxon:call-template name="{concat('evaluate-', $schema)}">
+                      <xsl:with-param name="base" select="$base"/>
+                      <xsl:with-param name="in"
+                                      select="concat('/', @xpath)"/>
+                    </saxon:call-template>
+                  </xsl:when>
+                </xsl:choose>
+              </col>
+            </xsl:for-each>
+          </row>
+
+          <xsl:for-each select="section[@xpath]">
+            <row>
+              <col colspan="{count(../col)}" type="form" withLabel="true">
+                <xsl:apply-templates mode="form-builder" select=".">
+                  <xsl:with-param name="base" select="$base"/>
+                </xsl:apply-templates>
+              </col>
+            </row>
+          </xsl:for-each>
+        </xsl:for-each>
+      </xsl:for-each>
+    </xsl:variable>
+
+    <!-- Return only the new row in embed mode. -->
+    <xsl:choose>
+      <xsl:when test="$tableConfig/@fieldset = 'false' or ($isEmbeddedMode and not($isFirstOfItsKind))">
+        <xsl:call-template name="render-table">
+          <xsl:with-param name="values" select="$values"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+
+        <xsl:variable name="tableTitle" select="if (($tableConfig/@label) and (string($strings/*[name() = $tableConfig/@label])))
+              then $strings/*[name() = $tableConfig/@label]
+              else gn-fn-metadata:getLabel($schema, $name, $labels, name(..), $isoType, $xpath)/label" />
+
+        <xsl:call-template name="render-boxed-element">
+          <xsl:with-param name="label"
+                          select="$tableTitle"/>
+          <xsl:with-param name="cls" select="local-name()"/>
+          <xsl:with-param name="subTreeSnippet">
+
+            <xsl:call-template name="render-table">
+              <xsl:with-param name="values" select="$values"/>
+            </xsl:call-template>
+
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
   <xsl:template name="render-table">
     <xsl:param name="values" as="node()"/>
     <xsl:param name="addControl" as="node()?"/>
@@ -1778,6 +1895,13 @@
                       <xsl:with-param name="editInfo" select="gn:element"/>
                     </xsl:call-template>
                   </xsl:when>
+                  <xsl:when test="@orderControl">
+                    <xsl:call-template name="render-form-field-control-move">
+                      <xsl:with-param name="elementEditInfo" select="gn:element"/>
+                      <xsl:with-param name="domeElementToMoveRef" select="gn:element/@ref"/>
+                      <xsl:with-param name="forceDisplay" select="true()"/>
+                    </xsl:call-template>
+                  </xsl:when>
                   <!-- Form is inserted directly in the row. -->
                   <xsl:when test="@type = 'form'">
                    <xsl:copy-of select="*"/>