Bug #13551: The order in which the form is displayed in the list changes after modification

Author: SilverDav

formsOnline/formsOnline-configuration/src/main/config/xmlcomponents/formsOnline.xml

@@ -120,5 +120,49 @@
         </message>
       </help>
     </parameter>
+    <parameter>
+      <name>displaySort</name>
+      <label>
+        <message lang="fr">Ordre d'affichage des formulaires</message>
+        <message lang="en">Order of display of forms</message>
+        <message lang="de">Reihenfolge der Anzeige von Formularen</message>
+      </label>
+      <order>2</order>
+      <mandatory>true</mandatory>
+      <value>name</value>
+      <options>
+        <option>
+          <name>
+            <message lang="fr">Par ordre alphabétique</message>
+            <message lang="en">Name ascending</message>
+            <message lang="de">In alphabetischer Reihenfolge</message>
+          </name>
+          <value>name asc</value>
+        </option>
+        <option>
+          <name>
+            <message lang="fr">Date de création croissante</message>
+            <message lang="en">Creation date ascending</message>
+            <message lang="de">Erstellungsdatum aufsteigend</message>
+          </name>
+          <value>creationDate asc</value>
+        </option>
+        <option>
+          <name>
+            <message lang="fr">Date de création décroissante</message>
+            <message lang="en">Creation date descending</message>
+            <message lang="de">Erstellungsdatum absteigend</message>
+          </name>
+          <value>creationDate desc</value>
+        </option>
+      </options>
+      <type>select</type>
+      <updatable>always</updatable>
+      <help>
+        <message lang="fr">Permet de définir l'ordre d'affichage des formulaires</message>
+        <message lang="en">Allows you to define the order in which the forms are displayed</message>
+        <message lang="de">Ermöglicht es Ihnen, die Reihenfolge festzulegen, in der die Formulare angezeigt werden.</message>
+      </help>
+    </parameter>
   </parameters>
 </WAComponent>

formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineDAO.java

@@ -37,9 +37,10 @@ public interface FormsOnlineDAO {
   /**
    * Get all forms that has been created in given instance
    * @param instanceId the instance id
+   * @param orderBy sort order method
    * @return a List of FormDetail object
    */
-  List<FormDetail> findAllForms(String instanceId) throws FormsOnlineException;
+  List<FormDetail> findAllForms(String instanceId, String orderBy) throws FormsOnlineException;
 
   /**
    * Load forms from database with given instance Id and form id

formsOnline/formsOnline-library/src/main/java/org/silverpeas/components/formsonline/model/FormsOnlineDAOJdbc.java

@@ -83,9 +83,8 @@ public class FormsOnlineDAOJdbc implements FormsOnlineDAO {
   private static final String SELECT_FROM = "SELECT * FROM ";
   private static final String INSERT_INTO = "INSERT INTO ";
   private static final String DELETE_FROM = "DELETE FROM ";
+
   // Queries about Forms
-  private static final String QUERY_FIND_FORMS =
-      SELECT_FROM + FORMS_TABLENAME + " where instanceId = ?";
   private static final String QUERY_LOAD_FORM =
       SELECT_FROM + FORMS_TABLENAME + " where instanceId = ? and id = ?";
   private static final String QUERY_INSERT_FORM = INSERT_INTO + FORMS_TABLENAME +
@@ -199,21 +198,24 @@ public FormDetail getForm(FormPK pk) throws FormsOnlineException {
   }
 
   @Override
-  public List<FormDetail> findAllForms(String instanceId) throws FormsOnlineException {
-    List<FormDetail> forms = new ArrayList<>();
-    try (final Connection con = getConnection();
-         final PreparedStatement stmt = con.prepareStatement(QUERY_FIND_FORMS)) {
-      stmt.setString(1, instanceId);
-      try (ResultSet rs = stmt.executeQuery()) {
-        while (rs.next()) {
-          FormDetail form = fetchFormDetail(rs);
-          forms.add(form);
-        }
-      }
+  public List<FormDetail> findAllForms(String instanceId, String orderBy) throws FormsOnlineException {
+    try {
+      final List<FormDetail> forms = new ArrayList<>();
+        final JdbcSqlQuery query = JdbcSqlQuery.createSelect("*")
+            .from(FORMS_TABLENAME)
+            // 1st criteria : correct instanceId
+            .where(INSTANCE_ID).in(instanceId)
+            .orderBy(orderBy);
+        query.execute(r -> {
+          forms.add(fetchFormDetail(r));
+          return null;
+        });
+    return forms;
     } catch (SQLException se) {
-      throw new FormsOnlineException(failureOnGetting("all forms of instance", instanceId), se);
+      throw new FormsOnlineException(
+          failureOnGetting("Available forms of instance",
+              String.join(",", instanceId)), se);
     }
-    return forms;
   }
 
   @Override