Feature #10542

When a folder and its content (both subfolders and publications) are put
into the bin, the actual operation operated by the KmeliaService is now
a move instead of a simple node detail update.
Rename the confirmation text when emptying the trash can.
When the trash can is emptied, the folders deletion is now taken into
account by the treeview.
Fix a bug with the number of publications displayed with the folder name
computed when a folder is deleted with its whole content.

Author: mmoqui

kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle.properties

@@ -187,7 +187,7 @@ kmelia.RightsSpecificEnable=Cliquez ici pour d\u00e9finir des droits sp\u00e9cif
 kmelia.PubInBasket=Cette publication est actuellement dans la corbeille
 Description=Description
 kmelia.SupervisorNotifSubject=Nouvelle publication en ligne
-ConfirmFlushTrashBean=Etes-vous sur de vouloir supprimer toutes les publications de la corbeille ?
+ConfirmFlushTrashBean=\u00cates-vous s\u00fbr de vouloir supprimer le contenu de la corbeille ?
 PubCreer=Cr\u00e9er une publication
 kmelia.RightsSpecificDisable=Cliquez ici pour ne plus utiliser les droits sp\u00e9cifiques...
 kmelia.ProcessDuration=Temps de traitement \:

kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_de.properties

@@ -90,7 +90,7 @@ ConfirmDeletePath = Sind Sie sicher, den Speicherort l\u00f6schen zu wollen?
 UnknownAuthor = Ersteller unbekannt
 PubDeclass = Deklassifizierte Ver\u00f6ffentlichung
 NPubDeclass = Referenzierte Ver\u00f6ffentlichungen.
-ConfirmFlushTrashBean = Sind Sie sicher, alle Ver\u00f6ffentlichungen des Papierkorbes l\u00f6schen zu wollen ?
+ConfirmFlushTrashBean=M\u00f6chten Sie den M\u00fclleimer wirklich leeren?
 EmptyBasket = Papierkorb leeren
 kmelia.AddFile=Datei hinzuf\u00fcgen
 

kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_en.properties

@@ -117,8 +117,7 @@ UnknownAuthor = Unknown author
 
 PubDeclass = Unclassified publication
 NPubDeclass = Associated publication(s)
-
-ConfirmFlushTrashBean = Do you really want to delete ALL trashcan's publication ?
+ConfirmFlushTrashBean=Do you really want to empty the trash can?
 EmptyBasket = Empty trashcan
 kmelia.AddFile = Add a file
 
@@ -505,7 +504,7 @@ kmelia.publications.batch.update.none=No publication has been modified
 kmelia.publications.batch.update.success = {0} publications modified successfully
 kmelia.publications.batch.update.fail = {0} publications could not be modified
 kmelia.publications.batch.update = You are about to modify the content of <b>{0} publications</b> ... Only the fields filled in will be applied to these publications.
-kmelia.ExportPDFApplication=Alle PDFs der Bewerbung zusammenführen
+kmelia.ExportPDFApplication=Alle PDFs der Bewerbung zusammenf\u00fchren
 kmelia.LocalPathMandatory=A local place is mandatory!
 kmax.ExportPublicationsFound=Export found publications
 kmelia.RightsSpecificEnable=Click here to set specific access rights...

kmelia/kmelia-configuration/src/main/config/properties/org/silverpeas/kmelia/multilang/kmeliaBundle_fr.properties

@@ -188,7 +188,7 @@ kmelia.RightsSpecificEnable=Cliquez ici pour d\u00e9finir des droits sp\u00e9cif
 kmelia.PubInBasket=Cette publication est actuellement dans la corbeille
 Description=Description
 kmelia.SupervisorNotifSubject=Nouvelle publication en ligne
-ConfirmFlushTrashBean=Etes-vous sur de vouloir supprimer toutes les publications de la corbeille ?
+ConfirmFlushTrashBean=\u00cates-vous s\u00fbr de vouloir supprimer le contenu de la corbeille ?
 PubCreer=Cr\u00e9er une publication
 kmelia.RightsSpecificDisable=Cliquez ici pour ne plus utiliser les droits sp\u00e9cifiques...
 kmelia.ProcessDuration=Temps de traitement \:

kmelia/kmelia-library/src/main/java/org/silverpeas/components/kmelia/service/DefaultKmeliaService.java

@@ -323,9 +323,10 @@ public List<KmeliaPublication> getLatestAuthorizedPublications(String instanceId
                           .limitTo(limit));
               return asKmeliaPublication(pubDetails);
             });
+    String count = result == null ? "" : String.valueOf(result.size());
     SilverLogger.getLogger(this)
         .debug(() -> format("getting {0} latest authorized publications of instance {1} in {2}",
-            result.size(), instanceId, formatDurationHMS(System.currentTimeMillis() - start)));
+            count, instanceId, formatDurationHMS(System.currentTimeMillis() - start)));
     return result;
   }
 
@@ -511,13 +512,6 @@ public NodeDetail getSubTopicDetail(NodePK pk) {
     return subTopic;
   }
 
-  /**
-   * Delete a topic and all descendants. Delete all links between descendants and publications. This
-   * publications will be visible in the Declassified zone. Delete All subscriptions and favorites
-   * on this topics and all descendants
-   * @param pkToDelete the id of the topic to delete
-   * @since 1.0
-   */
   @Override
   @Transactional(Transactional.TxType.REQUIRED)
   public void deleteTopic(NodePK pkToDelete) {
@@ -533,7 +527,8 @@ public void deleteTopic(NodePK pkToDelete) {
         for (PublicationDetail onePubToCheck : pubsToCheck) {
           final KmeliaPublication kmeliaPub = fromDetail(onePubToCheck, oneNodeToDelete);
           if (!kmeliaPub.isAlias()) {
-            sendPublicationInBasket(kmeliaPub.getPk());
+            // delete definitively the publication
+            deletePublication(kmeliaPub.getPk());
           } else {
             // remove only the alias
             final Collection<Location> aliases = singletonList(kmeliaPub.getLocation());
@@ -1455,7 +1450,6 @@ private void sendPublicationInBasket(PublicationPK pubPK) {
   private void sendTopicInBasket(NodeDetail topic) {
     NodePK trash = new NodePK(NodePK.BIN_NODE_ID,
         topic.getIdentifier().getComponentInstanceId());
-    topic.setFatherPK(trash);
 
     // get all the tree of folders, rooted to the topic, to be sent in the basket with the topic
     final Collection<NodeDetail> children = nodeService.getDescendantDetails(topic.getNodePK());
@@ -1477,7 +1471,7 @@ private void sendTopicInBasket(NodeDetail topic) {
       }
     }
 
-    nodeService.setDetail(topic);
+    nodeService.moveNode(topic.getNodePK(), trash);
   }
 
   @Override
@@ -3929,19 +3923,19 @@ public List<String> deletePublications(List<String> publiIds, NodePK topicId, St
 
   @Transactional(Transactional.TxType.REQUIRED)
   @Override
-  public void deleteTopic(@NonNull NodePK topic, @NonNull NodePK parent, String userId) {
+  public void deleteTopic(@NonNull NodePK topic, String userId) {
     Objects.requireNonNull(topic);
-    Objects.requireNonNull(parent);
     if (topic.isTrash() || topic.isRoot()) {
       return;
     }
     NodeDetail folder = getNodeHeader(topic);
+    boolean isInTrash = nodeService.getPath(topic).get(1).getId().equals(NodePK.BIN_NODE_ID);
     // check if user is allowed to delete this topic
     NodePK root = new NodePK(NodePK.ROOT_NODE_ID, topic.getInstanceId());
     if (SilverpeasRole.ADMIN.isInRole(getUserTopicProfile(topic, userId)) ||
         SilverpeasRole.ADMIN.isInRole(getUserTopicProfile(root, userId)) ||
         SilverpeasRole.ADMIN.isInRole(getUserTopicProfile(folder.getFatherPK(), userId))) {
-      if (parent.isTrash() && folder.getFatherPK().isTrash()) {
+      if (isInTrash) {
         deleteTopic(topic);
       } else {
         sendTopicInBasket(folder);