decidim-reporting_proposals 0.5.1 → 0.6.0

data/app/packs/stylesheets/decidim/reporting_proposals/list_component_admin.scss

@@ -1,27 +1,27 @@
-.table__title-block{
+.table__title-block {
   display: flex;
   align-items: flex-start;
 }
 
-.table__title-icon{
+.table__title-icon {
   width: 20px;
   padding: 3px;
   margin-right: 5px;
   float: left;
 }
 
-.table__list-title{
+.table__list-title {
   display: flex;
   flex-direction: column;
   align-items: start;
 }
 
-.table__list-title a{
+.table__list-title a {
   text-align: start;
 }
 
-.help-text-overdue{
+.help-text-overdue {
   font-style: italic;
-  font-size: .8125rem;
+  font-size: 0.8125rem;
   text-align: start;
 }

data/app/packs/stylesheets/decidim/reporting_proposals/manage_component_admin.scss

@@ -1,62 +1,76 @@
 .global-settings,
-.step-settings{
-  .readonly_container{
+.step-settings {
+  .readonly_container {
     display: none;
   }
 }
 
-.proposal-photo.gallery__item{
+.proposal-photo.gallery__item {
   position: relative;
   margin: 0 0 1rem;
-  border: 1px solid rgba(0, 0, 0, .2);
+  border: 1px solid rgba(0, 0, 0, 0.2);
   border-radius: 0;
   background-color: white;
   color: #202734;
 }
 
-.proposal-photo .thumbnail{
+.proposal-photo .thumbnail {
   margin-bottom: 0;
 }
 
-.delete-proposal__button{
+.delete-proposal__button {
   position: absolute;
-  right: 0;
+  right: 7px;
   top: 7px;
-  width: 2rem;
-  height: 2rem;
-  background: rgba(var(--primary-rgb), .8);
-  color: #fff;
+  width: 1.3rem;
+  height: 1.3rem;
+  background-color: rgba(var(--tertiary-rgb) / 0.8);
   border-radius: 50%;
   text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  cursor: pointer;
+  transition: background-color 0.3s ease;
+
+  svg {
+    fill: #fff;
+    stroke: #fff;
+    stroke-width: 2px;
+  }
 }
 
-//Variables
+.delete-proposal__button:hover {
+  background: rgba(var(--tertiary-rgb) / 1);
+}
 
-/* Card address */
-.address{
-  display: flex;
-  padding: 1rem;
+.delete-proposal__button:active {
+  transform: scale(0.95);
 }
 
-.address--alone{
-  flex-grow: 1;
+#proposal_photo_add_photos {
+  display: block;
+  margin-top: 1rem;
 }
 
-.address__info{
+.admin-address {
   display: flex;
-  flex-grow: 1;
+  gap: 1rem;
+  margin-top: 1rem;
+
+  .component__show-address {
+    max-height: 3rem;
+  }
 }
 
-.address__icon{
-  float: left;
-  display: flex;
-  align-self: center;
-  fill: var(--primary);
+.component__show_notes-grid {
+  a {
+    text-decoration: underline;
+  }
 }
 
-.address__details{
-  float: left;
-  max-width: 100%; //IE10 bug fix
-  padding-left: .5em;
-  align-self: center;
+//Variables
+.layout-content table svg.hide-button {
+  fill: var(--secondary);
 }

data/app/packs/stylesheets/decidim/reporting_proposals/proposals/add_proposal.scss

@@ -1,12 +1,17 @@
-.has_no_address{
+.has_no_address {
   text-align: right;
 }
 
-.editor{
-  .form-error{
+.editor {
+  .form-error {
     margin: -1rem 0 1rem;
-    font-size: .75rem;
+    font-size: 0.75rem;
     font-weight: 600;
     color: var(--alert);
   }
 }
+
+/* reporting proposals have only 3 steps */
+.wizard-steps > * {
+  width: 33%;
+}

data/app/packs/stylesheets/decidim/reporting_proposals/user_camera_inputs.scss

@@ -1,19 +1,27 @@
-button.user-device-camera{
-  border-radius: 4px !important;
-  max-height: 3rem;
-}
+.camera-container {
+  @apply md:flex md:justify-between md:items-center;
 
-.has_no_image{
-  margin-top: -1rem;
-  text-align: right;
-}
+  button.user-device-camera {
+    @apply md:flex-none whitespace-nowrap w-full md:w-auto p-2 mt-2 text-lg;
+
+    svg {
+      margin-right: 0.2rem;
+    }
+  }
 
-@media only screen and (max-width: 596px){
-  .gallery__container .input-group .input-group-button{
-    display: block;
+  .input-group-button {
+    @apply w-full md:w-auto;
   }
 
-  .has_no_image{
-    margin-top: -.5rem;
+  label {
+    @apply truncate mr-2;
   }
+
+  #proposal_add_photos {
+    @apply mt-2 block;
+  }
+}
+
+.has_no_image {
+  @apply md:text-right -mt-1;
 }

data/app/permissions/concerns/decidim/reporting_proposals/admin/permissions_override.rb

@@ -7,8 +7,81 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
+          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          def permissions
+            # The public part needs to be implemented yet
+            return permission_action if permission_action.scope != :admin
+
+            # Valuators can only perform these actions
+            if user_is_valuator?
+              if valuator_assigned_to_proposal?
+                can_create_proposal_note?
+                can_create_proposal_answer?
+                allow! if action_is_show_on_proposal?
+              elsif action_is_show_on_proposal?
+                disallow!
+              end
+              can_export_proposals?
+              valuator_can_unassign_valuator_from_proposals?
+
+              return permission_action
+            end
+
+            if create_permission_action?
+              can_create_proposal_note?
+              can_create_proposal_from_admin?
+              can_create_proposal_answer?
+            end
+
+            # Allow any admin user to view a proposal.
+            allow! if action_is_show_on_proposal?
+
+            # Admins can only edit official proposals if they are within the
+            # time limit.
+            allow! if permission_action.subject == :proposal && permission_action.action == :edit && admin_edition_is_available?
+
+            # Every user allowed by the space can update the category of the proposal
+            allow! if permission_action.subject == :proposal_category && permission_action.action == :update
+
+            # Every user allowed by the space can update the scope of the proposal
+            allow! if permission_action.subject == :proposal_scope && permission_action.action == :update
+
+            # Every user allowed by the space can import proposals from another_component
+            allow! if permission_action.subject == :proposals && permission_action.action == :import
+
+            # Every user allowed by the space can export proposals
+            can_export_proposals?
+
+            # Every user allowed by the space can merge proposals to another component
+            allow! if permission_action.subject == :proposals && permission_action.action == :merge
+
+            # Every user allowed by the space can split proposals to another component
+            allow! if permission_action.subject == :proposals && permission_action.action == :split
+
+            # Every user allowed by the space can assign proposals to a valuator
+            allow! if permission_action.subject == :proposals && permission_action.action == :assign_to_valuator
+
+            # Every user allowed by the space can unassign a valuator from proposals
+            can_unassign_valuator_from_proposals?
+
+            # Only admin users can publish many answers at once
+            toggle_allow(user.admin?) if permission_action.subject == :proposals && permission_action.action == :publish_answers
+
+            if permission_action.subject == :participatory_texts && participatory_texts_are_enabled? && permission_action.action == :manage
+              # Every user allowed by the space can manage (import, update and publish) participatory texts to proposals
+              allow!
+            end
+
+            permission_action
+          end
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
           private
 
+          def action_is_show_on_proposal?
+            permission_action.subject == :proposal && permission_action.action == :show
+          end
+
           def valuator_can_unassign_valuator_from_proposals?
             can_unassign_valuator_from_proposals? if user == context.fetch(:valuator, nil)
 

data/app/permissions/decidim/templates/admin/permissions.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    module Admin
+      # this is here due a bug in Decidim 0.28 when they introduced proposal answer templates
+      # they didn't take into account that valuators can answer proposals
+      # This can be removed after https://github.com/decidim/decidim/pull/12765 is merge & backported
+      class Permissions < Decidim::DefaultPermissions
+        def permissions
+          return permission_action if permission_action.scope != :admin
+          return permission_action unless user
+          return permission_action if context[:current_organization] != user.organization
+
+          if user_has_a_role? && (permission_action.subject == :template && permission_action.action == :read)
+            allow!
+          else
+            return permission_action unless user.admin?
+
+            case permission_action.subject
+            when :template
+              allow! if [:read, :create, :update, :destroy, :copy].include? permission_action.action
+            when :templates
+              allow! if permission_action.action == :index
+            when :questionnaire
+              allow!
+            end
+          end
+
+          permission_action
+        end
+
+        private
+
+        def participatory_space
+          @participatory_space ||= context[:proposal].try(:participatory_space)
+        end
+
+        def user_roles
+          @user_roles ||= participatory_space.try(:user_roles)
+        end
+
+        def user_has_a_role?
+          return unless user_roles
+
+          user_roles.exists?(user:)
+        end
+      end
+    end
+  end
+end

data/app/presenters/concerns/decidim/reporting_proposals/resource_locator_presenter_override.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module ResourceLocatorPresenterOverride
+      extend ActiveSupport::Concern
+
+      included do
+        # Generates and admin url only if the manifest has the property :admin_route_name defined
+        # this allows to distinct from resources that can be administrated from those that are not
+        def admin_url(options = {})
+          admin_member_route("url", options.merge(host: root_resource.organization.host))
+        end
+
+        private
+
+        def admin_member_route(route_type, options)
+          return if manifest_for(target).admin_route_name.blank?
+
+          options.merge!(options_for_polymorphic)
+          admin_route_proxy.send("#{admin_member_route_name}_#{route_type}", target, options)
+        end
+
+        def admin_member_route_name
+          if polymorphic?
+            admin_polymorphic_member_route_name
+          else
+            manifest_for(target).admin_route_name
+          end
+        end
+
+        def admin_polymorphic_member_route_name
+          return unless polymorphic?
+
+          resource.map { |record| manifest_for(record).admin_route_name }.join("_")
+        end
+      end
+    end
+  end
+end

data/app/resources/concerns/decidim/reporting_proposals/resource_manifest_override.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module ResourceManifestOverride
+      extend ActiveSupport::Concern
+
+      included do
+        # The name of the named Rails route to create the url to admin the resource
+        # If it is not defined, the resource will be considered non-administrable
+        # and no link will be generated in some places
+        attribute :admin_route_name, String
+      end
+    end
+  end
+end

data/app/serializers/decidim/reporting_proposals/proposal_serializer_override.rb

@@ -33,19 +33,19 @@ module Decidim
             state: proposal.state.to_s,
             reference: proposal.reference,
             answer: ensure_translatable(proposal.answer),
-            answer_time: answer_time,
+            answer_time:,
             supports: proposal.proposal_votes_count,
             endorsements: {
               total_count: proposal.endorsements.size,
-              user_endorsements: user_endorsements
+              user_endorsements:
             },
             comments: proposal.comments_count,
             attachments: proposal.attachments.size,
             followers: proposal.follows.size,
             published_at: proposal.published_at,
-            url: url,
+            url:,
             meeting_urls: meetings,
-            related_proposals: related_proposals,
+            related_proposals:,
             is_amend: proposal.emendation?,
             original_proposal: {
               title: proposal&.amendable&.title,

data/app/views/decidim/proposals/admin/proposal_notes/_editing_note.html.erb

@@ -1,13 +1,13 @@
 <% if note.author == current_user %>
   <%= cell("decidim/reporting_proposals/edit_note_modal", note, modal_id: "editNoteModal#{note.id}", note: note, proposal: proposal) %>
   <button type="button" class="link-alt m-xs"
-          data-open="<%= current_user.present? ? "editNoteModal#{note.id}" : "loginModal" %>"
+          data-dialog-open="editNoteModal<%= note.id %>"
           title="<%= t("modal.title", scope: "decidim.reporting_proposals.admin.proposal_notes") %>"
-          aria-controls="<%= current_user.present? ? "editNoteModal#{note.id}" : "loginModal" %>"
+          aria-controls="editNoteModal<%= note.id %>"
           aria-haspopup="true"
           tabindex="0"
           style="color:#97a2b2; cursor: pointer">
-    <%= icon "pencil", aria_hidden: true, class: "action-icon--preview", role: "img", "aria-hidden": true %>
+    <%= icon "pencil-line", aria_hidden: true, class: "action-icon--preview", role: "img", "aria-hidden": true %>
   </button>
 <% end %>
 <% if note.created_at != note.updated_at %>

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes_body.html.erb

@@ -1,5 +1,5 @@
 <% note.body.split("\n").each_with_index do |paragraph, index| %>
-  <%= Decidim::ContentRenderers::LinkRenderer.new(paragraph.gsub(URI.regexp, '<a href="\0" target="_blank">\0</a>')).render.html_safe %>
+  <%= Decidim::ContentRenderers::LinkRenderer.new(paragraph).render("data-external-link"=> false).html_safe %>
   <% unless index == note.body.split("\n").size - 1 %>
     <br>
   <% end %>

data/app/views/decidim/proposals/admin/proposals/_address.html.erb

@@ -1,13 +1,14 @@
 <% if component_settings.geocoding_enabled? %>
-  <div class="row column">
-    <strong><%= t ".geolocated_at" %>:</strong>
-    <div class="address__info">
-      <div class="address__icon">
-        <%= icon "proposals", role: "img", "aria-hidden": true, width: 40, height: 70 %>
-      </div>
-      <div class="address__details">
-        <%= render partial: "decidim/shared/address_details", locals: { geolocalizable: proposal } %>
-      </div>
+  </div><!-- close previous .row.column -->
+  <div class="row column admin-address">
+    <div class="left">
+      <span class="component__show-title"><%= t ".geolocated_at" %>:</span>
+      <%= cell("decidim/address", proposal) %>
     </div>
-  </div>
+    <div class="component__show-address">
+      <% if Decidim::Map.available?(:static) || Decidim::Map.available?(:dynamic) %>
+        <%= static_map_link(proposal) %>
+      <% end %>
+    </div>
+  <%# Skip close here as is in the overriden view %>
 <% end %>

data/app/views/decidim/proposals/admin/proposals/_send_email_button.html.erb

@@ -1,4 +1,6 @@
-<p>
-  <%= link_to t(".send_mail"), "mailto:#{presented_author.email}?subject=#{translated_attribute(proposal.title)}&body=#{resource_locator(proposal).url}",
-              class: "button tiny", target: "_blank" %>
-</p>
+<% if presented_author.respond_to?(:email) %>
+  <p>
+    <%= link_to t(".send_mail"), "mailto:#{presented_author.email}?subject=#{translated_attribute(proposal.title)}&body=#{resource_locator(proposal).url}",
+                class: "help-text", target: "_blank" %>
+  </p>
+<% end %>

data/app/views/decidim/proposals/proposals/_additional_button.html.erb

@@ -2,5 +2,5 @@
   current_component.settings.additional_button_text.present? &&
   current_component.settings.additional_button_link.present? %>
   <%= link_to translated_attribute(component_settings.additional_button_text),
-              component_settings.additional_button_link, class: "title-action__action button small ml-s" %>
+              component_settings.additional_button_link, class: "button button__sm button__transparent-secondary" %>
 <% end %>

data/app/views/decidim/proposals/proposals/index.js.erb

@@ -1,8 +1,6 @@
 var $proposals = $('#proposals');
-var $proposalsCount = $('#proposals-count');
 var $orderFilterInput = $('.order_filter');
 $proposals.html('<%= j(render partial: "proposals").strip.html_safe %>');
-$proposalsCount.html('<%= j(render partial: "count").strip.html_safe %>');
 $orderFilterInput.val('<%= order %>');
 
 var $dropdownMenu = $('.dropdown.menu', $proposals);

data/app/views/decidim/reporting_proposals/admin/proposals/_photo_form.html.erb

@@ -3,11 +3,10 @@
                      html: { multipart: true, class: "form edit_proposal proposal_form_admin" }) do |f| %>
   <div class="row column gallery__container">
     <fieldset>
-      <legend><%= t(".gallery_legend") %></legend>
       <% if proposal.photos.any? %>
         <div class="gallery row">
           <% proposal.photos.each do |photo| %>
-            <div class="callout gallery__item">
+            <div class="gallery__item">
               <%= f.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
             </div>
           <% end %>
@@ -17,7 +16,7 @@
         <%= f.file_field :add_photos, multiple: true %>
       </div>
       <div class="actions">
-        <%= f.submit t(".action") %>
+        <%= f.submit t(".action"), class: "button button__sm button__secondary" %>
       </div>
     </fieldset>
   </div>

data/app/views/decidim/reporting_proposals/admin/proposals/_photo_gallery.html.erb

@@ -1,17 +1,16 @@
 <% if proposal.photos.any? %>
   <div class="row column">
-    <strong><%= t(".photos") %>:</strong>
-    <div id="photos" class="gallery row flex--fsc proposal-<%= proposal.id %>">
+    <div id="photos" class="gallery grid grid-cols-1 md:grid-cols-4 gap-6 proposal-<%= proposal.id %>">
       <% proposal.photos.each do |photo| %>
         <div class="proposal-photo gallery__item" id="photo-<%= photo.id %>">
           <%= link_to photo.big_url, target: "_blank", rel: "noopener" do %>
             <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: strip_tags(translated_attribute(photo.title)) %>
             <% if admin_allowed_to? :edit_photos, :proposals, extra_context = { proposal: proposal }, chain = [::Decidim::ReportingProposals::Admin::Permissions] %>
-              <%= icon_link_to "x",
+              <%= icon_link_to "close-line",
                                decidim_admin_reporting_proposals.remove_photo_path(id: proposal.id, photo_id: photo.id),
                                t(".delete_image"),
                                method: :delete,
-                               class: "delete-proposal__button", style: "color:white;" %>
+                               class: "delete-proposal__button" %>
             <% end %>
           <% end %>
         </div>

data/app/views/decidim/reporting_proposals/admin/proposals/_photos.html.erb

@@ -1,14 +1,18 @@
-<% if proposal.photos.any? || component_settings.attachments_allowed? %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t(".title") %></h2>
-    </div>
-    <div class="card-section">
-      <%= render partial: "decidim/reporting_proposals/admin/proposals/photo_gallery" %>
-
-      <% if admin_allowed_to? :edit_photos, :proposals, extra_context = { proposal: proposal }, chain = [::Decidim::ReportingProposals::Admin::Permissions] %>
-        <%= render partial: "decidim/reporting_proposals/admin/proposals/photo_form" %>
-      <% end %>
+<% if component_settings.attachments_allowed? %>
+  <div class="card-section">
+    <div class="component__show_photos" data-component="accordion" id="accordion-photos">
+      <button class="card-divider-button" data-controls="panel-photos" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title">
+          <%= t(".title") %>
+        </h2>
+      </button>
+      <div id="panel-photos">
+        <%= render partial: "decidim/reporting_proposals/admin/proposals/photo_gallery" %>
+        <% if admin_allowed_to? :edit_photos, :proposals, extra_context = { proposal: proposal }, chain = [::Decidim::ReportingProposals::Admin::Permissions] %>
+          <%= render partial: "decidim/reporting_proposals/admin/proposals/photo_form" %>
+        <% end %>
+      </div>
     </div>
   </div>
 <% end %>

data/app/views/decidim/reporting_proposals/admin/proposals/_proposal_td_hide.html.erb

@@ -1,20 +1,16 @@
 <% if admin_allowed_to?(:hide_proposal, :proposals, extra_context = { proposal: proposal }, chain = [::Decidim::ReportingProposals::Admin::Permissions]) %>
   <% if proposal.reported? %>
-    <%= icon_link_to "trash", decidim_admin_reporting_proposals.hide_proposal_path(id: proposal),
+    <%= icon_link_to "delete-bin-line", decidim_admin_reporting_proposals.hide_proposal_path(id: proposal),
                      t("actions.hide", scope: "decidim.moderations"), method: :put, class: "action-icon" %>
   <% else %>
     <%= cell("decidim/flag_modal", proposal, modal_id: "flagModal#{proposal.id}") %>
-    <button type="button" class="link-alt"
-            data-open="<%= current_user.present? ? "flagModal#{proposal.id}" : "loginModal" %>"
-            title="<%= t("report", scope: "decidim.proposals.proposals.show") %>"
-            aria-controls="<%= current_user.present? ? "flagModal#{proposal.id}" : "loginModal" %>"
+    <button type="button" class="action-icon icon--small action-icon--show-proposal"
+            data-dialog-open="flagModal<%= proposal.id %>"
+            title="<%= t("report", scope: "decidim.proposals.admin.proposals.show") %>"
+            aria-controls="flagModal<%= proposal.id %>"
             aria-haspopup="true"
-            tabindex="0"
-            style="color:#97a2b2; cursor: pointer">
-      <%= icon "flag", aria_hidden: true, class: "action-icon--preview", role: "img", "aria-hidden": true %>
-      <span class="show-for-sr">
-    <%= t("report", scope: "decidim.proposals.proposals.show") %>
-  </span>
+            tabindex="0">
+      <%= icon "flag-line", aria_hidden: true, class: "hide-button icon--small action-icon--show-proposal", role: "img", "aria-hidden": true %>
     </button>
   <% end %>
 <% end %>

data/app/views/decidim/reporting_proposals/admin/proposals/_proposal_td_title.html.erb

@@ -1,9 +1,9 @@
 <div class="table__title-block">
   <span class="table__title-icon">
     <% if unanswered_proposals_overdue?(proposal) || evaluating_proposals_overdue?(proposal) %>
-      <%= icon "datetime", class: "text-alert" %>
+      <%= icon "timer-line", class: "text-alert" %>
     <% elsif grace_period_unanswered?(proposal) || grace_period_evaluating?(proposal) %>
-      <%= icon "timer", class: "text-warning" %>
+      <%= icon "timer-line", class: "text-warning" %>
     <% end %>
   </span>
   <div class="table__list-title">

data/app/views/decidim/reporting_proposals/admin/proposals_valuator_mailer/notify_proposals_valuator.html.erb

@@ -0,0 +1,17 @@
+<p class="email-greeting"><%= t("greeting", scope: "decidim.reporting_proposals.admin.proposals_valuator_mailer.notify_proposals_valuator", name: @valuator_user.name) %></p>
+
+<p class="email-instructions"><%= t("email_body", scope: "decidim.reporting_proposals.admin.proposals_valuator_mailer.notify_proposals_valuator") %></p>
+
+<p class="email-instructions">
+  <ul>
+    <% @proposals.each do |proposal| %>
+      <li class="mb-sm">
+        <span><%= translated_attribute(proposal.title) %></span>:
+        <%= sanitize link_to(t("public_side", scope: "decidim.reporting_proposals.admin.proposals_valuator_mailer.notify_proposals_valuator"), Decidim::ResourceLocatorPresenter.new(proposal).url), tags: ["a"], attributes: ["href"] %>,
+        <%= sanitize link_to(t("admin_panel", scope: "decidim.reporting_proposals.admin.proposals_valuator_mailer.notify_proposals_valuator"), Decidim::ResourceLocatorPresenter.new(proposal).admin_url), tags: ["a"], attributes: ["href"] %>
+      </li>
+    <% end %>
+  </ul>
+</p>
+
+<p class="email-closing"><%= t("gratitude", scope: "decidim.reporting_proposals.admin.proposals_valuator_mailer.notify_proposals_valuator") %></p>