decidim-meetings 0.28.5 → 0.29.0.rc1

data/app/packs/stylesheets/decidim/meetings/_live_event.scss

@@ -18,8 +18,6 @@
   &__aside {
     @apply flex-none bg-background-2;
 
-    counter-reset: question;
-
     &.is-open {
       @apply w-1/5 [&+div]:w-4/5;
 
@@ -33,96 +31,4 @@
       }
     }
   }
-
-  &__question {
-    @apply bg-white;
-
-    summary {
-      @apply p-4 cursor-pointer font-bold text-secondary text-md transition border-b border-b-background hover:bg-background;
-
-      transition: background-color 0.2s ease-in-out;
-
-      &::after {
-        counter-increment: question;
-        content: "#" counter(question);
-      }
-
-      & ~ * {
-        @apply p-4;
-
-        // dynamic content
-        > :first-child {
-          @apply font-bold;
-        }
-
-        label {
-          @apply flex items-baseline cursor-pointer;
-        }
-
-        label + label {
-          @apply mt-4;
-        }
-        // end dynamic content
-      }
-    }
-
-    &[open] .meeting-polls__answer--bar > * {
-      opacity: 1;
-      transform: translateX(0);
-    }
-
-    &.is-new {
-      animation: animateHighlight 5s ease-in-out forwards;
-    }
-
-    @keyframes animateHighlight {
-      0%,
-      80% {
-        background-color: rgba(var(--warning-rgb), 0.1);
-      }
-    }
-  }
-
-  &__question--admin {
-    summary ~ * {
-      @apply border-t border-t-background p-4 bg-background-2;
-
-      a {
-        @apply my-4 block text-sm underline;
-      }
-
-      > :first-child {
-        @apply font-normal;
-      }
-    }
-  }
-
-  &__answer {
-    @apply flex items-center gap-2;
-
-    &--value {
-      @apply w-1/5 font-bold;
-    }
-
-    &--bar {
-      @apply w-4/5 h-2.5 overflow-hidden;
-
-      > * {
-        @apply bg-primary h-full opacity-0;
-      }
-    }
-  }
-
-  // vertical flow
-  label + &__answer + label {
-    @apply mt-6;
-  }
-
-  &__admin-label {
-    @apply p-4 bg-secondary text-white font-bold text-sm;
-  }
-
-  &__admin-action {
-    @apply py-2 flex items-center border-t-background [&>*]:flex-none first:[&>*]:w-2/5 last:[&>*]:w-3/5;
-  }
 }

data/app/permissions/decidim/meetings/permissions.rb

@@ -4,17 +4,12 @@ module Decidim
   module Meetings
     class Permissions < Decidim::DefaultPermissions
       def permissions
+        return permission_action unless user
+
         # Delegate the admin permission checks to the admin permissions class
         return Decidim::Meetings::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
 
-        if permission_action.subject == :meeting && permission_action.action == :read
-          toggle_allow(!meeting&.hidden? && meeting&.current_user_can_visit_meeting?(user))
-          return permission_action
-        end
-
-        return permission_action unless user
-
         case permission_action.subject
         when :answer
           case permission_action.action
@@ -44,6 +39,13 @@ module Decidim
             toggle_allow(can_close_meeting?)
           when :register
             toggle_allow(can_register_invitation_meeting?)
+          when :reply_poll
+            toggle_allow(can_reply_poll?)
+          end
+        when :poll
+          case permission_action.action
+          when :update
+            toggle_allow(can_update_poll?)
           end
         else
           return permission_action
@@ -117,6 +119,19 @@ module Decidim
           authorized?(:register, resource: meeting)
       end
 
+      def can_reply_poll?
+        meeting.present? &&
+          meeting.poll.present? &&
+          authorized?(:reply_poll, resource: meeting)
+      end
+
+      def can_update_poll?
+        user.present? &&
+          user.admin? &&
+          meeting.present? &&
+          meeting.poll.present?
+      end
+
       def can_answer_question?
         question.present? && user.present? && !question.answered_by?(user)
       end

data/app/presenters/decidim/meetings/meeting_presenter.rb

@@ -64,17 +64,20 @@ module Decidim
         end
       end
 
-      def closing_report(links: false, extras: false, strip_tags: false, all_locales: false)
+      def closing_report(links: false, all_locales: false)
         return unless meeting
 
-        content_handle_locale(meeting.closing_report, all_locales, extras, links, strip_tags)
+        handle_locales(meeting.closing_report, all_locales) do |content|
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(sanitized(content))
+          renderer.render(links:).html_safe
+        end
       end
 
       def registration_email_custom_content(links: false, all_locales: false)
         return unless meeting
 
         handle_locales(meeting.registration_email_custom_content, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize_editor_admin(content))
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(sanitized(content))
           renderer.render(links:).html_safe
         end
       end
@@ -135,6 +138,10 @@ module Decidim
 
         proposals.map.with_index { |proposal, index| "#{index + 1}) #{proposal.title}\n" }
       end
+
+      def sanitized(content)
+        decidim_sanitize_editor(content)
+      end
     end
   end
 end

data/app/services/decidim/meetings/calendar/component_calendar.rb

@@ -31,7 +31,7 @@ module Decidim
         #
         # Returns a collection of Meetings filtered based on provided params.
         def filtered_meetings
-          meetings.not_hidden.published.except_withdrawn.ransack(@filters).result
+          meetings.not_hidden.published.not_withdrawn.ransack(@filters).result
         end
       end
     end

data/app/services/decidim/meetings/calendar/meeting_to_event.rb

@@ -22,7 +22,7 @@ module Decidim
       class MeetingToEvent
         include ActionView::Helpers::SanitizeHelper
 
-        # Initializes the converteer for the given meeting.
+        # Initializes the converter for the given meeting.
         #
         # meeting - the Meeting to convert
         def initialize(meeting)

data/app/services/decidim/meetings/close_meeting_reminder_generator.rb

@@ -27,7 +27,7 @@ module Decidim
         Decidim::Meetings::Meeting
           .published
           .not_hidden
-          .except_withdrawn
+          .not_withdrawn
           .where(
             "decidim_component_id = ? AND end_time >= ? AND end_time <= ? AND closed_at IS NULL",
             component_id,

data/app/services/decidim/meetings/meeting_iframe_embedder.rb

@@ -5,7 +5,7 @@ require "cgi"
 module Decidim
   module Meetings
     # This class handles the streaming url to be included in the iframe present
-    # in the live event. For some services it is required to transforma a bit
+    # in the live event. For some services it is required to transform a bit
     # the structure of the URL.
     class MeetingIframeEmbedder
       # Public: Initializes the service.
@@ -55,7 +55,7 @@ module Decidim
         @embeddable_services ||= Meetings.embeddable_services
       end
 
-      # Youtube transformation consists on:
+      # YouTube transformation consists on:
       # 1. extract the video id from the parameter v
       # 2. Create a new URL using the domain youtube-nocookie.com, converting it to an embed
       #    and appending the video id

data/app/views/decidim/meetings/_calendar_modal.html.erb

@@ -1,4 +1,4 @@
-<button class="button button__sm button__transparent-secondary mt-6 md:mt-12 md:self-start" data-dialog-open="calendarShare" role=menuitem>
+<button class="button button__sm button__transparent-secondary mt-6 md:mt-12 md:self-start" data-dialog-open="calendarShare">
   <%= t(".export_calendar") %>
   <%= icon "download-cloud-2-line", class: "fill-current" %>
 </button>

data/app/views/decidim/meetings/admin/agenda/_agenda_item.html.erb

@@ -6,15 +6,15 @@
         <%== "#{icon("drag-move-2-fill")} #{t(".agenda_item")}" %>
       </span>
 
-      <button class="button button__sm button__transparent-secondary small alert hollow move-up-agenda-item button--title">
+      <button class="button button__sm button__transparent-secondary small alert move-up-agenda-item button--title">
         <%== "#{icon("arrow-up-line")} #{t(".up")}" %>
       </button>
 
-      <button class="button button__sm button__transparent-secondary small alert hollow move-down-agenda-item button--title">
+      <button class="button button__sm button__transparent-secondary small alert move-down-agenda-item button--title">
         <%== "#{icon("arrow-down-line")} #{t(".down")}" %>
       </button>
 
-      <button class="button button__sm button__transparent-secondary small alert hollow remove-agenda-item button--title">
+      <button class="button button__sm button__transparent-secondary small alert remove-agenda-item button--title">
         <%= t(".remove") %>
       </button>
     </h2>

data/app/views/decidim/meetings/admin/agenda/_agenda_item_child.html.erb

@@ -6,15 +6,15 @@
         <%== "#{icon("drag-move-2-fill")} #{t(".agenda_item_child")}" %>
       </span>
 
-      <button class="button button__sm button__transparent-secondary small alert hollow move-up-agenda-item-child button--title">
+      <button class="button button__sm button__transparent-secondary small alert move-up-agenda-item-child button--title">
         <%== "#{icon("arrow-up-line")} #{t(".up")}" %>
       </button>
 
-      <button class="button button__sm button__transparent-secondary small alert hollow move-down-agenda-item-child button--title">
+      <button class="button button__sm button__transparent-secondary small alert move-down-agenda-item-child button--title">
         <%== "#{icon("arrow-down-line")} #{t(".down")}" %>
       </button>
 
-      <button class="button button__sm button__transparent-secondary small alert hollow remove-agenda-item-child button--title">
+      <button class="button button__sm button__transparent-secondary small alert remove-agenda-item-child button--title">
         <%= t(".remove") %>
       </button>
     </h2>

data/app/views/decidim/meetings/admin/agenda/_agenda_item_fields.html.erb

@@ -1,14 +1,14 @@
 <div class="grid-x">
-  <div class="cell auto">
+  <div class="cell">
     <%= form.translated :text_field, :title, tabs_id:, aria: { label: :title } %>
   </div>
-  <div class="cell small-2">
+  <div class="cell">
     <%= form.number_field :duration, tabs_id:, min: 0 %>
   </div>
 </div>
 
 <div class="grid-x">
-  <div class="cell auto">
+  <div class="cell">
     <%= form.translated :editor, :description, tabs_id:, rows: 6, aria: { label: :description } %>
   </div>
 </div>

data/app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb

@@ -1,7 +1,9 @@
 <p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @user.name) %></p>
 
 <p class="email-instructions">
-  <%= t ".invited_you_to_join_a_meeting", invited_by: @invited_by.name, application: @user.organization.name %>
+  <%= t ".invited_you_to_join_a_meeting",
+        invited_by: @invited_by.name,
+        application: translated_attribute(@user.organization.name) %>
 </p>
 
 <p class="email-button email-button__cta cta-decline">

data/app/views/decidim/meetings/admin/invites/_form.html.erb

@@ -12,7 +12,7 @@
     <div id="panel-attendee" class="card-section">
 
       <div class="row column">
-        <fieldset class="check-radio-collection">
+        <fieldset>
           <%= form.collection_radio_buttons(:existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], :last, :first) %>
         </fieldset>
       </div>
@@ -22,14 +22,14 @@
       </div>
 
       <div class="row column">
-        <div class="auto cell attendee-fields--new-user">
+        <div class="cell attendee-fields--new-user">
           <%= form.text_field :name, disabled: %>
         </div>
-        <div class="auto cell attendee-fields--new-user">
+        <div class="cell attendee-fields--new-user">
           <%= form.text_field :email, disabled: %>
         </div>
 
-        <div class="auto cell attendee-fields--user-picker">
+        <div class="cell attendee-fields--user-picker">
           <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
           <%= form.autocomplete_select(:user_id, form.object.user.presence, { multiple: false, class: "autocomplete-field--results-inline" }, prompt_options) do |user|
             { value: user.id, label: "#{user.name} (@#{user.nickname})" }

data/app/views/decidim/meetings/admin/invites/index.html.erb

@@ -18,38 +18,8 @@
       <% end %>
     <% end %>
 
-    <%# NOTE: this old filters section should be refactorized in order to use the shared admin_filter_selector method
-    it would require the definition of concerns similar to decidim-conferences/app/controllers/concerns/decidim/conferences/admin/filterable.rb %>
-    <div class="filters__section mt-4">
-      <div class="fcell">
-        <ul class="dropdown menu" data-dropdown-menu data-click-open="true" data-close-on-click-inside="false">
-          <li class="is-dropdown-submenu-parent">
-            <a href="#" class="dropdown button">
-              <%= t("filter_label", scope: "decidim.admin.filters") %>
-              <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
-            </a>
-            <ul class="menu is-dropdown-submenu">
-              <li><%= link_to t(".filter.sent"), url_for(status: "sent", q: @query) %></li>
-              <li><%= link_to t(".filter.accepted"), url_for(status: "accepted", q: @query) %></li>
-              <li><%= link_to t(".filter.rejected"), url_for(status: "rejected", q: @query) %></li>
-              <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-      <div class="fcell search">
-        <%= form_tag "", method: :get do %>
-          <div class="input-group">
-            <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
-            <%= hidden_field_tag :state, @state %>
-            <div class="input-group-button">
-              <button type="submit" class="text-secondary" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
-                <%= icon "search-line", class: "fill-secondary w-4 h-4" %>
-              </button>
-            </div>
-          </div>
-        <% end %>
-      </div>
+    <div class="mt-4">
+      <%= admin_filter_selector %>
     </div>
 
     <div class="card" id="meeting-invites">
@@ -67,7 +37,7 @@
             </tr>
           </thead>
           <tbody>
-            <% invites.each do |invite| %>
+            <% @invites.each do |invite| %>
               <% presenter = Decidim::Meetings::InvitePresenter.new(invite) %>
               <tr data-id="<%= invite.id %>">
                 <td>
@@ -90,6 +60,6 @@
         </table>
       </div>
     </div>
-    <%= decidim_paginate invites %>
+    <%= decidim_paginate @invites %>
   </div>
 </div>

data/app/views/decidim/meetings/admin/meetings/_form.html.erb

@@ -1,11 +1,11 @@
 <div class="form__wrapper">
   <div class="card pt-4">
     <div class="card-section">
-      <div class="row column hashtags__container">
+      <div class="row column">
         <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
       </div>
 
-      <div class="row column hashtags__container">
+      <div class="row column">
         <%= form.translated :editor, :description, hashtaggable: true, aria: { label: :description } %>
       </div>
 
@@ -16,11 +16,11 @@
                         { multiple: false } %>
       </div>
 
-      <div class="row column field" data-meeting-type="in_person">
+      <div class="row column" data-meeting-type="in_person">
         <%= form.geocoding_field :address, help_text: t(".address_help") %>
       </div>
 
-      <div class="row column field" data-meeting-type="in_person">
+      <div class="row column" data-meeting-type="in_person">
         <%= form.translated :text_area, :location, help_text: t(".location_help") %>
       </div>
 
@@ -28,12 +28,12 @@
         <%= form.translated :text_area, :location_hints, help_text: t(".location_hints_help") %>
       </div>
 
-      <div class="row column field" data-meeting-type="online">
+      <div class="row column" data-meeting-type="online">
         <%= form.text_field :online_meeting_url, help_text: t(".online_meeting_url_help") %>
       </div>
 
       <div class="iframe-fields">
-        <div class="row column field iframe-fields--embed-type" id="meeting_iframe_embed_type" data-meeting-type="online">
+        <div class="row column iframe-fields--embed-type" id="meeting_iframe_embed_type" data-meeting-type="online">
           <%= form.select :iframe_embed_type,
                           @form.iframe_embed_type_select,
                           {
@@ -42,7 +42,7 @@
                           } %>
         </div>
 
-        <div class="row column field iframe-fields--access-level" data-meeting-type="online-access-level">
+        <div class="row column iframe-fields--access-level" data-meeting-type="online-access-level">
           <%= form.select :iframe_access_level,
                           @form.iframe_access_level_select,
                           { include_blank: t(".select_an_iframe_access_level") },
@@ -80,7 +80,7 @@
 
       <div class="row column" id="meeting_registration_url">
         <%= form.text_field :registration_url, help_text: t(".registration_url_help") %>
-        <%= cell("decidim/announcement", t(".disclaimer", organization: current_component.organization.name), callout_class: "alert" ) %>
+        <%= cell("decidim/announcement", t(".disclaimer", organization: organization_name(current_component.organization)), callout_class: "alert" ) %>
       </div>
 
       <div class="row column" id="private_meeting">

data/app/views/decidim/meetings/admin/meetings/_service.html.erb

@@ -6,17 +6,17 @@
       <span><%= t(".service") %></span>
 
       <div class="ml-auto flex gap-x-4">
-        <button class="button button__sm button__transparent-secondary small alert hollow move-up-service button--title">
+        <button class="button button__sm button__transparent-secondary small alert move-up-service button--title">
           <%= icon "arrow-up-line" %>
           <%= t(".up") %>
         </button>
 
-        <button class="button button__sm button__transparent-secondary small alert hollow move-down-service button--title">
+        <button class="button button__sm button__transparent-secondary small alert move-down-service button--title">
           <%= icon "arrow-down-line" %>
           <%= t(".down") %>
         </button>
 
-        <button class="button button__sm button__transparent-secondary small alert hollow remove-service button--title">
+        <button class="button button__sm button__transparent-secondary small alert remove-service button--title">
           <%= t(".remove") %>
         </button>
       </div>

data/app/views/decidim/meetings/admin/meetings/index.html.erb

@@ -37,7 +37,7 @@
               <%= sort_link(query, :scope_name, t("models.proposal.fields.scope", scope: "decidim.proposals") ) %>
             </th>
           <% end %>
-          <th class="actions"><%= t("actions.title", scope: "decidim.meetings") %></th>
+          <th><%= t("actions.title", scope: "decidim.meetings") %></th>
         </tr>
       </thead>
       <tbody>
@@ -138,7 +138,7 @@
                 <% else %>
                   <%=
                     content_tag(:button,
-                                class: ["action-icon", "action-icon--remove", "destroy-meeting-alert"],
+                                :class => ["action-icon", "action-icon--remove", "destroy-meeting-alert"],
                                 "data-invalid-destroy-message" => t("actions.invalid_destroy.proposals_count", count: present(meeting).authored_proposals.size, scope: "decidim.meetings"),
                                 "data-proposal-titles" => present(meeting).formatted_proposals_titles) do
                       content_tag(:span,

data/app/views/decidim/meetings/admin/poll/_answer_option.html.erb

@@ -5,7 +5,7 @@
     <h2 class="card-title">
     <span><%= t("answer_option", scope: "decidim.forms.admin.questionnaires.answer_option") %></span>
     <% if editable %>
-      <button class="button button__sm button__transparent-secondary small alert hollow remove-answer-option button--title mb-2">
+      <button class="button button__sm button__transparent-secondary small alert remove-answer-option button--title mb-2">
         <%= icon("delete-bin-line") %>
         <%= t("remove", scope: "decidim.forms.admin.questionnaires.answer_option") %>
       </button>

data/app/views/decidim/meetings/admin/poll/_answer_option_template.html.erb

@@ -2,6 +2,6 @@
 
 <script type="text/template" class="decidim-answer-option-template decidim-template" id="<%= template_id %>">
   <%= fields_for "questionnaire[questions][#{question.to_param}][answer_options][]", blank_answer_option do |answer_option_form| %>
-    <%= render "decidim/meetings/admin/poll/answer_option", form: answer_option_form, question:, editable: %>
+    <%= render "decidim/meetings/admin/poll/answer_option", form: answer_option_form, question:, editable: question.editable? %>
   <% end %>
 </script>

data/app/views/decidim/meetings/admin/poll/_form.html.erb

@@ -4,19 +4,24 @@
     <button type="button" class="button button__sm button__secondary expand-all"><%= t("expand", scope: "decidim.forms.admin.questionnaires.form") %></button>
   </div>
 
-  <% if questionnaire.questions_editable? %>
-    <%= fields_for "questionnaire[questions][#{blank_question.to_param}]", blank_question do |question_form| %>
-      <script type="text/template" class="decidim-question-template decidim-template" id="question-template">
-        <%= render "decidim/meetings/admin/poll/question",
-                   form: question_form,
-                   id: tabs_id_for_question(blank_question),
-                   editable: questionnaire.questions_editable?,
-                   answer_option_template_selector: "#answer-option-template-dummy" %>
-      </script>
-      <%= render "decidim/meetings/admin/poll/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-dummy" %>
-    <% end %>
-  <% else %>
-    <%= cell("decidim/announcement", t("already_answered_warning", scope: "decidim.forms.admin.questionnaires.form"), callout_class: "warning" ) %>
+  <% announcement_body = capture do %>
+    <ul>
+      <% t("announcement_html", admin_link: Decidim::EngineRouter.main_proxy(meeting.component).admin_meeting_polls_answers_path(meeting), scope: "decidim.meetings.admin.poll.form").each do |item| %>
+        <li> <%= item %></li>
+      <% end %>
+    </ul>
+  <% end %>
+  <%= cell("decidim/announcement", { body: announcement_body }, callout_class: "info") %>
+
+  <%= fields_for "questionnaire[questions][#{blank_question.to_param}]", blank_question do |question_form| %>
+    <script type="text/template" class="decidim-question-template decidim-template" id="question-template">
+      <%= render "decidim/meetings/admin/poll/question",
+                 form: question_form,
+                 id: tabs_id_for_question(blank_question),
+                 editable: true,
+                 answer_option_template_selector: "#answer-option-template-dummy" %>
+    </script>
+    <%= render "decidim/meetings/admin/poll/answer_option_template", form: question_form, editable: true, template_id: "answer-option-template-dummy" %>
   <% end %>
 
   <div class="questionnaire-questions-list flex flex-col py-6 gap-6 last:pb-0">
@@ -25,24 +30,20 @@
         <%= render "decidim/meetings/admin/poll/question",
                    form: question_form,
                    id: tabs_id_for_question(question),
-                   editable: questionnaire.questions_editable?,
+                   editable: question.editable?,
                    answer_option_template_selector: "#answer-option-template-#{index}" %>
-        <%= render "decidim/meetings/admin/poll/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-#{index}" %>
+        <%= render "decidim/meetings/admin/poll/answer_option_template", form: question_form, editable: question.editable?, template_id: "answer-option-template-#{index}" %>
       <% end %>
     <% end %>
   </div>
 
-  <% if questionnaire.questions_editable? %>
-    <button class="button button__sm button__secondary add-question"><%= t("add_question", scope: "decidim.forms.admin.questionnaires.form") %></button>
-  <% end %>
+  <button class="button button__sm button__secondary add-question"><%= t("add_question", scope: "decidim.forms.admin.questionnaires.form") %></button>
 </div>
 
 <%= append_javascript_pack_tag "decidim_forms_admin" %>
 
-<% if questionnaire.questions_editable? %>
-  <script>
-    document.addEventListener("DOMContentLoaded", function () {
-      window.Decidim.createEditableForm()
-    })
-  </script>
-<% end %>
+<script>
+  document.addEventListener("DOMContentLoaded", function () {
+    window.Decidim.createEditableForm()
+  })
+</script>