decidim-comments 0.29.1 → 0.30.0.rc1

data/app/packs/stylesheets/comments.scss

@@ -1,13 +1,19 @@
+@import "stylesheets/decidim/_tribute.scss";
+
 .comments {
   &__container {
     @apply md:mt-12;
   }
 
   .add-comment {
-    @apply mt-12;
+    @apply mt-12 md:bg-gray-5 p-0 md:px-4 md:pb-6 md:pt-1 rounded-lg w-full;
+
+    .new_comment {
+      @apply w-full;
+    }
 
     .remaining-character-count {
-      @apply block text-right text-sm text-gray-2;
+      @apply block text-left text-sm text-gray-2 mx-4 md:m-0;
     }
 
     .form__wrapper {
@@ -19,61 +25,62 @@
     }
   }
 
+  .account-message {
+    a {
+      @apply text-secondary underline font-semibold;
+    }
+  }
+
   &__header {
-    @apply flex flex-col md:flex-row md:items-center gap-x-2 mb-4;
+    @apply flex justify-between md:flex-row md:items-center mb-4;
+
+    option {
+      &.selected {
+        @apply font-bold;
+      }
+    }
   }
 
   .author__avatar-container {
     @apply w-8 h-8;
   }
 
-  .tribute-container {
-    @apply w-full relative;
-
-    #results {
-      @apply absolute max-h-[225px] top-full left-0 right-0 p-0 my-2 rounded z-50 overflow-y-scroll bg-white;
-
-      border: 1px solid rgba(33, 33, 33, 0.1);
-
-      li {
-        @apply flex items-center gap-2 cursor-pointer px-4 py-2;
-      }
-
-      li:hover {
-        @apply cursor-pointer;
+  .comments-section {
+    &__header {
+      @apply flex items-center justify-center space-x-2 p-4 bg-secondary/5 rounded-b-md mb-4;
 
-        background-color: rgba(123, 123, 123, 0.1);
-      }
-
-      img {
-        @apply rounded-full w-6 h-6 object-cover;
-      }
-
-      span,
-      strong {
-        @apply font-semibold text-sm text-secondary;
+      svg {
+        @apply w-6 h-6 mr-2 fill-secondary;
       }
+    }
 
-      small {
-        @apply font-normal text-gray-2 text-xs;
-      }
+    &__title {
+      @apply text-md font-semibold text-secondary;
+    }
+  }
+}
 
-      svg {
-        @apply w-4 h-4 text-primary fill-current;
-      }
+.comments-two-columns {
+  .most-upvoted-label {
+    @apply px-2 mb-2;
+  }
 
-      .is-group {
-        @apply ml-auto flex items-center gap-1;
-      }
+  input[type="radio"] {
+    &:not(.reset-defaults) {
+      @apply inline-block mr-0;
     }
   }
 }
 
 .comment {
-  @apply rounded-lg border-2 border-background p-3 pl-6;
+  @apply rounded-lg border-2 border-background-5 p-3 pl-6;
+
+  &.top-comment {
+    @apply border-gray-2;
+  }
 
   &__header {
-    @apply flex items-center gap-x-2 mb-2 -ml-10 relative;
+    @apply flex items-center gap-x-2 mb-2 relative;
 
     a[href^="/profile"] > span:first-child {
       @apply z-10;
@@ -82,11 +89,30 @@
     &--edited {
       @apply text-sm font-semibold;
     }
+
+    /* affects the left margin of the avatar in the comment replies */
+    & ~ [data-comment-footer] {
+      .comment__header {
+        @apply -ml-10;
+      }
+
+      [data-target*="dropdown-menu-add-comment"] {
+        @apply w-full flex items-center justify-between gap-2 px-0 pt-2 pb-0 first-of-type:[&>svg]:block last-of-type:[&>svg]:hidden;
+
+        > svg {
+          @apply w-6 h-6 flex-none text-secondary fill-current;
+        }
+      }
+    }
   }
 
   /* overwrite default dropdown styles */
   [data-target*="dropdown"] {
     @apply md:flex w-auto cursor-pointer text-sm text-secondary;
+
+    > svg {
+      @apply h-3 w-3;
+    }
   }
 
   /* overwrite default dropdown styles */
@@ -95,11 +121,11 @@
   }
 
   &__footer-grid {
-    @apply grid grid-cols-2 items-center mt-4;
+    @apply grid items-center mt-4;
   }
 
   &-reply {
-    @apply rounded-lg border-2 border-background ml-3 relative;
+    @apply rounded-lg border-2 border-background-5 ml-3 relative;
   }
 
   &-reply:empty {
@@ -107,7 +133,7 @@
   }
 
   &-reply::after {
-    @apply bg-background-3 inline-block absolute top-8 h-4/5 w-px -z-10;
+    @apply bg-background-5 inline-block absolute top-8 h-4/5 w-px -z-10;
 
     content: "";
   }
@@ -142,7 +168,27 @@
   }
 
   &__as {
-    @apply my-4;
+    @apply my-4 px-4 md:p-0;
+
+    &-author-container {
+      @apply flex justify-between items-center;
+    }
+
+    &-author-info {
+      @apply flex items-center gap-2;
+    }
+
+    &-author-name {
+      @apply text-secondary font-semibold;
+    }
+
+    &-author-selected {
+      @apply flex flex-col;
+
+      .author__avatar-container {
+        @apply -mt-3.5;
+      }
+    }
   }
 
   .add-comment {
@@ -156,10 +202,8 @@
       @apply mr-2;
     }
 
-    .button_to:first-child,
-    button:first-child,
-    button:nth-child(2),
-    .button_to:nth-child(2) {
+    > :first-child,
+    > :nth-child(2) {
       svg:first-child {
         @apply block;
       }
@@ -189,7 +233,7 @@
       }
     }
 
-    .button_to:nth-child(2) {
+    > :nth-child(2) {
       svg:first-child {
         @apply block;
       }
@@ -234,11 +278,15 @@
   }
 
   &-order-by {
-    @apply ml-auto grid grid-cols-4 place-items-center mt-4 md:mt-0;
+    @apply ml-auto flex place-items-center md:mt-0;
+
+    > form {
+      @apply flex;
+    }
   }
 
   &__actions {
-    @apply flex items-center gap-4;
+    @apply flex items-center justify-center gap-4;
 
     .button[aria-expanded="false"] {
       svg:first-of-type {
@@ -277,6 +325,50 @@
     }
   }
 
+  &__reply-button {
+    @apply flex items-center justify-center;
+
+    .button[aria-expanded="false"] {
+      svg:first-of-type {
+        @apply block;
+      }
+
+      svg:last-of-type {
+        @apply hidden;
+      }
+
+      span:first-of-type {
+        @apply block;
+      }
+
+      span:last-of-type {
+        @apply hidden;
+      }
+    }
+
+    .button[aria-expanded="true"] {
+      svg:first-of-type {
+        @apply hidden;
+      }
+
+      svg:last-of-type {
+        @apply block;
+      }
+
+      span:first-of-type {
+        @apply hidden;
+      }
+
+      span:last-of-type {
+        @apply block;
+      }
+    }
+  }
+
+  &__votes-actions {
+    @apply flex justify-between;
+  }
+
   &__content {
     &--label {
       @apply inline-block mb-2;
@@ -289,7 +381,15 @@
     }
 
     &-submit {
-      @apply flex flex-col md:flex-row justify-between items-stretch md:items-end gap-4 mt-4;
+      @apply flex flex-col md:flex-row md:justify-between items-stretch md:items-end gap-4 mt-4;
+    }
+
+    &-mobile-banner {
+      @apply flex relative md:hidden h-[72px] border-b border-gray justify-center items-center;
+
+      .close-button {
+        @apply absolute top-7 right-6 [&_svg]:w-4 [&_svg]:h-4;
+      }
     }
   }
 
@@ -325,3 +425,56 @@
     @apply text-md;
   }
 }
+
+.comments-label-dropdown {
+  @apply mr-2 mt-2;
+}
+
+[id*="dropdown-menu-add-comment"] {
+  @apply flex flex-col py-0 mx-0 border-t-0 border-gray-3 cursor-pointer;
+
+  &[aria-hidden="true"] {
+    @apply hidden;
+  }
+}
+
+[data-target*="dropdown-menu-add-comment"] {
+  @apply w-full flex items-center justify-between mb-4 gap-2 px-0 pt-2 pb-0 first-of-type:[&>svg]:block last-of-type:[&>svg]:hidden;
+
+  & > span {
+    @apply hidden font-semibold text-secondary;
+
+    &:only-of-type,
+    &.is-active {
+      @apply flex items-center gap-2 [&_svg]:fill-current;
+    }
+  }
+
+  > svg {
+    @apply w-6 h-6 flex-none text-secondary fill-current;
+  }
+
+  &[aria-expanded="false"] > svg:last-of-type,
+  &[aria-expanded="true"] > svg:first-of-type {
+    @apply hidden;
+  }
+
+  &[aria-expanded="true"] > svg:last-of-type,
+  &[aria-expanded="false"] > svg:first-of-type {
+    @apply block;
+  }
+}
+
+.publish-comment-button {
+  @apply md:relative fixed inset-x-0 bottom-0 z-30 md:z-0 flex flex-row items-center md:items-end md:justify-end font-semibold justify-around bg-white md:bg-transparent gap-4 md:gap-0 p-4 md:p-0 shadow-inner md:shadow-none first:[&>*]:grow md:first:[&>*]:grow-0 h-14 md:h-fit first:[&>button]:py-3;
+}
+
+.fullscreen {
+  @apply fixed md:relative inset-0 w-screen md:w-full h-screen bg-white z-50 p-0 overflow-auto md:overflow-hidden rounded-none;
+}
+
+.comments {
+  .fullscreen.add-comment {
+    @apply mt-0;
+  }
+}

data/app/queries/decidim/comments/metrics/comment_participants_metric_measure.rb

@@ -40,7 +40,7 @@ module Decidim
         def retrieve_comments_for_organization
           user_ids = Decidim::User.where(organization: @resource.organization).pluck(:id)
           Decidim::Comments::Comment.includes(:root_commentable).not_hidden.not_deleted
-                                    .where("decidim_comments_comments.created_at <= ?", end_time)
+                                    .where(decidim_comments_comments: { created_at: ..end_time })
                                     .where(decidim_comments_comments: { decidim_author_id: user_ids })
                                     .where(decidim_comments_comments: { decidim_author_type: "Decidim::UserBaseEntity" })
         end

data/app/queries/decidim/comments/metrics/comments_metric_manage.rb

@@ -14,10 +14,10 @@ module Decidim
             next if cumulative_value.zero?
 
             quantity_value = results[:quantity] || 0
-            space_type, space_id, category_id, related_object_type, related_object_id = key
+            space_type, space_id, taxonomy_id, related_object_type, related_object_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
                                                            participatory_space_type: space_type, participatory_space_id: space_id,
-                                                           organization: @organization, decidim_category_id: category_id,
+                                                           organization: @organization, decidim_taxonomy_id: taxonomy_id,
                                                            related_object_type:, related_object_id:)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
             record.save!
@@ -29,7 +29,7 @@ module Decidim
         # Creates a Hashed structure with comments grouped by
         #
         #  - ParticipatorySpace (type & ID)
-        #  - Category (ID)
+        #  - Taxonomy (ID)
         #  - RelatedObject (type & ID)
         #
         def query
@@ -39,14 +39,15 @@ module Decidim
             related_object = comment.root_commentable
             next grouped_comments unless related_object
 
-            group_key = generate_group_key(related_object)
-            next grouped_comments unless group_key
+            group_keys = generate_group_keys(related_object)
 
-            grouped_comments[group_key] ||= { cumulative: 0, quantity: 0 }
-            grouped_comments[group_key][:cumulative] += 1
-            grouped_comments[group_key][:quantity] += 1 if comment.created_at >= start_time
+            next grouped_comments unless group_keys
 
-            grouped_comments
+            group_keys.map do |group_key|
+              grouped_comments[group_key] ||= { cumulative: 0, quantity: 0 }
+              grouped_comments[group_key][:cumulative] += 1
+              grouped_comments[group_key][:quantity] += 1 if comment.created_at >= start_time
+            end
           end
 
           @query
@@ -60,22 +61,26 @@ module Decidim
           user_ids = Decidim::User.select(:id).where(organization: @organization).collect(&:id)
           user_group_ids = Decidim::UserGroup.select(:id).where(organization: @organization).collect(&:id)
           Decidim::Comments::Comment.includes(:root_commentable).not_hidden.not_deleted
-                                    .where("decidim_comments_comments.created_at <= ?", end_time)
+                                    .where(decidim_comments_comments: { created_at: ..end_time })
                                     .where("decidim_comments_comments.decidim_author_id IN (?) OR
                                            decidim_comments_comments.decidim_user_group_id IN (?)", user_ids, user_group_ids)
         end
 
         # Generates a group key from the related object of a Comment
-        def generate_group_key(related_object)
+        def generate_group_keys(related_object)
           participatory_space = retrieve_participatory_space(related_object)
           return unless participatory_space
 
-          category_id = related_object.respond_to?(:category) ? related_object.category.try(:id) : ""
-          group_key = []
-          group_key += [participatory_space.class.name, participatory_space.id]
-          group_key += [category_id]
-          group_key += [related_object.class.name, related_object.id]
-          group_key
+          return unless related_object.respond_to?(:taxonomies)
+
+          taxonomy_ids = related_object.taxonomies.pluck(:id)
+          taxonomy_ids.each_with_object([]) do |taxonomy_id, group_keys|
+            group_key = []
+            group_key += [participatory_space.class.name, participatory_space.id]
+            group_key += [taxonomy_id]
+            group_key += [related_object.class.name, related_object.id]
+            group_keys << group_key
+          end
         end
 
         # Gets current ParticipatorySpace of a given 'related_object'

data/app/views/decidim/comments/comments/create.js.erb

@@ -2,6 +2,7 @@
   var rootCommentableId = <%== "comments-for-#{@comment.root_commentable.commentable_type.demodulize}-#{@comment.root_commentable.id}".to_json %>;
   var commentHtml = '<%== j(render @comment).strip %>';
   var inReplyTo = <%== (reply?(@comment) ? @commentable.id : nil).to_json %>;
+  var alignment = <%= @comment.alignment.nil? ? "null" : @comment.alignment %>;
 
   var $comments = $("#" + rootCommentableId);
   var component = $comments.data("comments");
@@ -12,7 +13,7 @@
     hideButton.find("[data-show-comment-reply]").first().html('<%= t("decidim.components.comment.show_replies", count: Decidim::Comments::SortedComments.for(root_comment.reload).size) %>');
 
   } else {
-    component.addThread(commentHtml, true);
+    component.addThread(commentHtml, alignment, true);
   }
 
   Rails.fire(document, "comments:loaded", {
@@ -21,4 +22,11 @@
 
   // Update the comments count
   $(".comments-count", $comments).text(<%== t("decidim.components.comments.title", count: @comments_count).to_json %>);
+
+  var $addCommentCard = $("#add-comment-anchor");
+
+  if ($addCommentCard.hasClass("fullscreen")) {
+    $addCommentCard.addClass("hidden");
+    $addCommentCard.removeClass("fullscreen");
+  }
 }());

data/app/views/decidim/comments/comments/update.js.erb

@@ -10,6 +10,12 @@ $(() => {
   var commentId = <%= @comment.id.to_json %>;
   var $comment = $("#comment_<%= @comment.id %>");
 
+  var $edit_modal = document.getElementById(`editCommentModal${commentId}`)
+
+  if ($edit_modal !== undefined) {
+    $edit_modal.remove()
+  }
+
   $comment.replaceWith(commentHtml);
 
   // Re-create the component

data/config/locales/ar.yml

@@ -92,7 +92,6 @@ ar:
       comments:
         blocked_comments_for_unauthorized_user_warning: يجب أن تكون عضوا محققا من أجل التعليق حالياً، ولكن يمكنك قراءة ما سبق.
         blocked_comments_for_user_warning: لا يمكنك التعليق في هذه اللحظة ، ولكن يمكنك قراءة التعليقات السابقة.
-        blocked_comments_warning: التعليقات معطلة في هذا الوقت ، لكن يمكنك قراءة التعليقات السابقة.
         comment_details_title: تفاصيل التعليق
         loading: جارٍ تحميل التعليقات ...
         single_comment_warning: <a href="%{url}"> عرض جميع التعليقات</a>

data/config/locales/bg.yml

@@ -103,7 +103,6 @@ bg:
       comments:
         blocked_comments_for_unauthorized_user_warning: Трябва да сте верифицирани, за да коментирате в този момент, но можете да прочетете предишните.
         blocked_comments_for_user_warning: Понастоящем не можете да коментирате, но можете да прочетете предходните коментари.
-        blocked_comments_warning: Коментарите в момента са деактивирани, но можете да прочетете предишните.
         comment_details_title: Детайли за коментара
         loading: Коментарите се зареждат...
         single_comment_warning: <a href="%{url}">Вижте всички коментари</a>

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1,15 @@
+---
+bs:
+  decidim:
+    components:
+      comments:
+        comment_details_title: Detalji o komentaru
+        single_comment_warning_title: Vidite samo jedan komentar
+    events:
+      comments:
+        comment_by_followed_user_group:
+          email_intro: 'Grupa %{author_name} je ostavila komentar na %{resource_title}. Možete ga pročitati na ovoj strani:'
+        user_group_mentioned:
+          email_intro: Grupa kojoj pripadate je pomenuta
+          email_outro: Dobili ste ovo obaveštenje jer ste član grupe %{group_name} koja je pomenuta u %{resource_title}.
+          email_subject: Pomenuti ste u %{resource_title} kao član grupe %{group_name}

data/config/locales/ca.yml

@@ -17,6 +17,10 @@ ca:
         one: Vot
         other: Vots
   decidim:
+    admin:
+      admin_log:
+        changeset:
+          comments: Comentaris
     comments:
       admin:
         shared:
@@ -39,7 +43,8 @@ ca:
           error: S'ha produït un error en votar el comentari.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Inicia sessió</a> o <a href="%{sign_up_url}">crea un compte</a> per afegir el teu comentari.
+        account_message: Inicia sessió o crea un compte per afegir el teu comentari.
+        add_comment: Afegir un comentari
         form:
           body:
             label: Comentari
@@ -49,6 +54,7 @@ ca:
           submit_root_comment: Publicar comentari
           user_group_id:
             label: Comentar com a
+            your_profile: El teu perfil
         opinion:
           label: La teva opinió sobre aquest tema
           negative: Negativa
@@ -64,6 +70,9 @@ ca:
         alignment:
           against: En contra
           in_favor: A favor
+        answers:
+          one: "%{count} resposta"
+          other: "%{count} respuestas"
         cancel_reply: Cancel·lar resposta
         comment_label: Comentari %{comment_id}
         comment_label_reply: Comentari %{comment_id} (respon al comentari %{parent_comment_id})
@@ -94,6 +103,7 @@ ca:
           one: Mostra la resposta
           other: Mostra les %{count} respostes
         single_comment_link_title: Obtenir enllaç
+        sort_by: 'Ordenar per: '
       comment_order_selector:
         order:
           best_rated: Més ben valorats
@@ -102,16 +112,19 @@ ca:
           recent: Recent
         title: 'Ordenar per:'
       comments:
+        against: En contra
         blocked_comments_for_unauthorized_user_warning: Has d'estar verificat abans de poder fer comentaris, però pots llegir els comentaris anteriors.
         blocked_comments_for_user_warning: No pots fer comentaris en aquest moment, però pots llegir els anteriors.
-        blocked_comments_warning: Els comentaris estan desactivats en aquest moment, però pots llegir els anteriors.
+        blocked_comments_warning: Els comentaris estan deshabilitats en aquests moments, només les administradores poden respondre o publicar-ne de nous.
         comment_details_title: Detalls del comentari
+        in_favor: A favor
         loading: Carregant els comentaris ...
         single_comment_warning: <a href="%{url}">Mostra tots els comentaris</a>
         single_comment_warning_title: Estàs veient un sol comentari
         title:
           one: "%{count} comentari"
           other: "%{count} comentaris"
+        top_comment_label: Més ben valorat
       down_vote_button:
         text: No estic d'acord amb aquest comentari
       edit_comment_modal_form:
@@ -124,6 +137,26 @@ ca:
         title: Edita el teu comentari
       up_vote_button:
         text: Estic d'acord amb aquest comentari
+    download_your_data:
+      help:
+        comment_votes:
+          comment: La id del comentari que es va valorar
+          created_at: La data i l'hora en què es va valorar aquest comentari
+          id: La id de la valoració del comentari
+          updated_at: La data i l'hora de la darrera actualització de la valoració d'aquest comentari
+          weight: El pes de la valoració (1 a favor, -1 en contra)
+        comments:
+          alignment: Si aquest comentari va ser a favor, en contra o neutral
+          author: El nom d'usuària de la participant que va fer aquest comentari
+          body: El comentari pròpiament
+          commentable_id: L'identificador únic d'allò que es podia comentar
+          commentable_type: La tipologia d'allò sobre el que es va fer el comentari (si va ser un resultat, una proposta, etc.)
+          created_at: La data en què es va crear aquest comentari
+          depth: El lloc on es troba aquest comentari a la terna de comentaris (si és una resposta a un comentari, o la resposta d'una resposta)
+          id: L'identificador d'aquest comentari
+          locale: La configuració regional (idioma) que la participant tenia en deixar aquest comentari
+          root_commentable_url: L'URL (adreça web) del recurs que enllaça amb aquest comentari
+          user_group: El nom del grup d'usuàries que va fer aquest comentari (si n'hi ha)
     events:
       comments:
         comment_by_followed_user:
@@ -137,7 +170,7 @@ ca:
           email_subject: Hi ha un nou comentari de %{author_name} en %{resource_title}
           notification_title: Hi ha un nou comentari per <a href="%{author_path}">%{author_name} %{author_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
-          email_intro: "S'ha comentat %{resource_title}. Pots llegir el comentari d'aquesta pàgina:"
+          email_intro: "Algú ha deixat un comentari a \"%{resource_title}\". Pots llegir el comentari a través del següent enllaç:"
           email_outro: Has rebut aquesta notificació perquè estàs seguint el comentari "%{resource_title}" o la seva autora. Pots deixar de seguir-la des de l'enllaç anterior.
           email_subject: Hi ha un nou comentari de %{author_name} a %{resource_title}
           notification_title: Hi ha un nou comentari de <a href="%{author_path}">%{author_name} %{author_nickname}</a> en <a href="%{resource_path}">%{resource_title}</a>