decidim-admin 0.23.3 → 0.24.0.rc1

data/app/helpers/decidim/admin/newsletters_helper.rb

@@ -131,23 +131,17 @@ module Decidim
         ]
       end
 
-      def newsletter_attention_callout_args
+      def newsletter_attention_callout_announcement
         {
-          announcement: {
-            body: t("warning", scope: "decidim.admin.newsletters.select_recipients_to_deliver").html_safe
-          },
-          callout_class: "warning"
+          body: t("warning", scope: "decidim.admin.newsletters.select_recipients_to_deliver").html_safe
         }
       end
 
-      def newsletter_recipients_count_callout_args
+      def newsletter_recipients_count_callout_announcement
         spinner = "<span id='recipients_count_spinner' class='loading-spinner hide'></span>"
         body = "#{t("recipients_count", scope: "decidim.admin.newsletters.select_recipients_to_deliver", count: recipients_count_query)} #{spinner}"
         {
-          announcement: {
-            body: body
-          },
-          callout_class: "warning"
+          body: body
         }
       end
     end

data/app/helpers/decidim/admin/settings_helper.rb

@@ -13,7 +13,8 @@ module Decidim
         string: :text_field,
         text: :text_area,
         scope: :scope_field,
-        enum: :collection_radio_buttons
+        enum: :collection_radio_buttons,
+        time: :datetime_field
       }.freeze
 
       # Public: Renders a form field that matches a settings attribute's

data/app/helpers/decidim/admin/sidebar_menu_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module SidebarMenuHelper
+      protected
+
+      def sidebar_menu(target_menu)
+        ::Decidim::Admin::SecondaryMenuPresenter.new(target_menu, self, active_class: "is-active")
+      end
+    end
+  end
+end

data/app/helpers/decidim/admin/user_moderations_helper.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Decidim::Admin
+  module UserModerationsHelper
+  end
+end

data/app/jobs/decidim/admin/import_participatory_space_private_user_csv_job.rb

@@ -20,7 +20,7 @@ module Decidim
                                                                current_particiaptory_space: privatable_to
                                                              )
 
-        Decidim::Admin::CreateParticipatorySpacePrivateUser.call(private_user_form, current_user, privatable_to, true)
+        Decidim::Admin::CreateParticipatorySpacePrivateUser.call(private_user_form, current_user, privatable_to, via_csv: true)
       end
     end
   end

data/app/jobs/decidim/admin/verify_user_group_from_csv_job.rb

@@ -14,7 +14,7 @@ module Decidim
         return if email.blank?
         return unless user_group
 
-        Decidim::Admin::VerifyUserGroup.call(user_group, verifier, true)
+        Decidim::Admin::VerifyUserGroup.call(user_group, verifier, via_csv: true)
       end
 
       private

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

@@ -29,6 +29,8 @@ module Decidim
         read_admin_dashboard_action?
         apply_newsletter_permissions_for_admin!
 
+        allow! if permission_action.subject == :global_moderation
+
         if user.admin? && admin_terms_accepted?
           allow! if read_admin_log_action?
           allow! if read_metrics_action?
@@ -47,6 +49,7 @@ module Decidim
           allow! if permission_action.subject == :area_type
           allow! if permission_action.subject == :user_group
           allow! if permission_action.subject == :officialization
+          allow! if permission_action.subject == :moderate_users
           allow! if permission_action.subject == :authorization
           allow! if permission_action.subject == :authorization_workflow
           allow! if permission_action.subject == :static_page_topic
@@ -82,9 +85,9 @@ module Decidim
 
         case permission_action.action
         when :index, :create
-          return allow!
+          allow!
         when :read, :update, :destroy
-          return toggle_allow(user == newsletter.author)
+          toggle_allow(user == newsletter.author)
         end
       end
 
@@ -174,14 +177,12 @@ module Decidim
         return unless permission_action.action == :enter &&
                       permission_action.subject == :space_area
 
-        space_allows_admin_access_to_current_action?(args)
+        space_allows_admin_access_to_current_action?(**args)
       end
 
       def space_allows_admin_access_to_current_action?(require_admin_terms_accepted: false)
         Decidim.participatory_space_manifests.any? do |manifest|
-          if manifest.name != :initiatives && require_admin_terms_accepted
-            next unless admin_terms_accepted?
-          end
+          next if manifest.name != :initiatives && require_admin_terms_accepted && !admin_terms_accepted?
 
           new_permission_action = Decidim::PermissionAction.new(
             action: permission_action.action,

data/app/presenters/decidim/admin/dashboard_metric_charts_presenter.rb

@@ -31,7 +31,7 @@ module Decidim
           highlight: false,
           scope: "home"
         ).select do |registry|
-          %w(comments meetings accepted_proposals results).include? registry.metric_name
+          %w(comments meetings accepted_proposals results blocked_users user_reports reported_users).include? registry.metric_name
         end
       end
 

data/app/presenters/decidim/admin/secondary_menu_presenter.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class SecondaryMenuPresenter < Decidim::MenuPresenter
+      def render(render_options = {}, &block)
+        styles = %w(secondary-nav)
+        styles.push "secondary-nav--subnav" unless render_options.fetch(:title, false)
+        content_tag :div, class: styles.join(" ") do
+          output = []
+          output.push render_title(render_options) if render_options.fetch(:title, false)
+          output.push render_menu(&block)
+          safe_join(output)
+        end
+      end
+
+      protected
+
+      def render_title(render_options)
+        content_tag :div, class: "secondary-nav__title" do
+          render_options.fetch(:title)
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/admin/active_users_counter.rb

@@ -23,8 +23,7 @@ module Decidim
 
         query = Decidim::User.left_outer_joins(:organization).where(decidim_organizations: { id: organization.id })
         query = query.where("#{Decidim::User.table_name}.current_sign_in_at >= ?", date)
-        query = query.where(admin: admin)
-        query
+        query.where(admin: admin)
       end
 
       private

data/app/queries/decidim/admin/user_filter.rb

@@ -36,8 +36,7 @@ module Decidim
       def query
         users = scope
         users = filter_by_search(users)
-        users = filter_by_state(users)
-        users
+        filter_by_state(users)
       end
 
       private

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

@@ -3,7 +3,7 @@
     <h2 class='card-title'>
       <%= t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin") %>
       <% if allowed_to? :create, :attachment_collection %>
-        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.attachment_collection.name", scope: "decidim.admin")), url_for(action: :new), class: "button tiny button--title new" %>
+        <%= link_to t("actions.attachment_collection.new", scope: "decidim.admin"), url_for(action: :new), class: "button tiny button--title new" %>
       <% end %>
     </h2>
   </div>

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

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= t(".attachments_title") %>
       <% if allowed_to? :create, :attachment %>
-        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.attachment.name", scope: "decidim.admin")), url_for(action: :new), class: "button tiny button--title new" %>
+        <%= link_to t("actions.attachment.new", scope: "decidim.admin"), url_for(action: :new), class: "button tiny button--title new" %>
       <% end %>
     </h2>
   </div>

data/app/views/decidim/admin/block_user/new.html.erb

@@ -0,0 +1,22 @@
+<h2 class="process-title-summary">
+  <%= t(".title", name: user.name) %>
+</h2>
+
+<%= decidim_form_for(@form, html: { class: "form new_user_block" }, url: user_block_path(user_id: user.id), method: :post) do |f| %>
+  <div class="card">
+    <div class="card-section">
+      <div class="row column">
+        <%= t(".description") %>
+      </div>
+      <br>
+      <div class="row column">
+        <%= f.hidden_field :user_id %>
+        <%= f.text_area :justification, required: true, label: t(".justification") %>
+      </div>
+    </div>
+  </div>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".action") %>
+  </div>
+<% end %>

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

@@ -3,7 +3,7 @@
     <h2 class='card-title'>
       <%= t("categories.index.categories_title", scope: "decidim.admin") %>
       <% if allowed_to? :create, :category %>
-        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.category.name", scope: "decidim.admin")), new_category_path(current_participatory_space), class: "button tiny button--title new" %>
+        <%= link_to t("actions.category.new", scope: "decidim.admin"), new_category_path(current_participatory_space), class: "button tiny button--title new" %>
       <% end %>
     </h2>
   </div>

data/app/views/decidim/admin/components/_component.html.erb

@@ -12,6 +12,8 @@
     <td class="table-list__actions">
       <% if component.manifest.admin_engine %>
         <%= icon_link_to "pencil", manage_component_path(component), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
+      <% else %>
+        <span class="action-space icon"></span>
       <% end %>
 
       <% if allowed_to?(:update, :component, component: component) %>
@@ -20,10 +22,14 @@
         <% else %>
           <%= icon_link_to "check", url_for(action: :publish, id: component, controller: "components"), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :put %>
         <% end %>
+      <% else %>
+        <span class="action-space icon"></span>
       <% end %>
 
       <% if allowed_to? :update, :component, component: component %>
         <%= icon_link_to "cog", url_for(action: :edit, id: component, controller: "components"), t("actions.configure", scope: "decidim.admin"), class: "action-icon--configure" %>
+      <% else %>
+        <span class="action-space icon"></span>
       <% end %>
 
       <% if allowed_to? :update, :component, component: component %>
@@ -32,14 +38,20 @@
         <% else %>
           <%= icon_link_to "key", url_for(action: :edit, component_id: component, controller: "component_permissions"), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
         <% end %>
+      <% else %>
+        <span class="action-space icon"></span>
       <% end %>
 
       <% if allowed_to? :share, :component, component: component %>
         <%= icon_link_to "share", url_for(action: :share, id: component, controller: "components"), t("actions.share", scope: "decidim.admin"), class: "action-icon--share", target: "_blank" %>
+      <% else %>
+        <span class="action-space icon"></span>
       <% end %>
 
       <% if allowed_to? :destroy, :component, component: component %>
         <%= icon_link_to "circle-x", url_for(action: :destroy, id: component, controller: "components"), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete %>
+      <% else %>
+        <span class="action-space icon"></span>
       <% end %>
     </td>
   </tr>

data/app/views/decidim/admin/conflicts/edit.html.erb

@@ -0,0 +1,46 @@
+<div class="card">
+  <div class="card-divider">
+    <div class="card-title">Transfer User</div>
+  </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th></th>
+            <th><%= t("user_name", scope: "decidim.admin.conflicts") %></th>
+            <th><%= t("managed_user_name", scope: "decidim.admin.conflicts") %></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td><%= t("name", scope: "decidim.admin.conflicts.transfer") %></td>
+            <td><%= @form.conflict.current_user.name %></td>
+            <td><%= @form.conflict.managed_user.name %></td>
+          </tr>
+          <tr>
+            <td><%= t("email", scope: "decidim.admin.conflicts.transfer") %></td>
+            <td><%= @form.conflict.current_user.email %></td>
+            <td><%= @form.conflict.managed_user.email.present? ? @form.conflict.managed_user.email : "-" %></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+
+<%= decidim_form_for(@form, url: conflict_path, method: :put, html: { class: "form" }) do |f| %>
+  <div class="card">
+    <div class="card-section">
+      <div class="row column">
+        <%= f.text_field :reason, label: t("reason", scope: "decidim.admin.conflicts.transfer") %>
+
+        <%= f.text_field :email, label: t("email", scope: "decidim.admin.conflicts.transfer") %>
+      </div>
+    </div>
+  </div>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t("title", scope: "decidim.admin.conflicts.transfer") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,34 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t("title", scope: "decidim.admin.conflicts") %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("user_name", scope: "decidim.admin.conflicts") %></th>
+            <th><%= t("managed_user_name", scope: "decidim.admin.conflicts") %></th>
+            <th><%= t("attempts", scope: "decidim.admin.conflicts") %></th>
+            <th><%= t("solved", scope: "decidim.admin.conflicts") %></th>
+            <th class="table-list__actions"><%= t("title", scope: "decidim.admin.conflicts.transfer") %></h1>
+
+          </tr>
+        </thead>
+        <tbody>
+          <% @conflicts.each do |conflict| %>
+            <tr>
+              <td><%= conflict.current_user.name %></td>
+              <td><%= conflict.managed_user.name %></td>
+              <td><%= conflict.times %></td>
+              <td><%= t(conflict.solved, scope: "decidim.admin.conflicts") %></td>
+              <td><%= icon_link_to "transfer", decidim_admin.edit_conflict_path(conflict), t("title", scope: "decidim.admin.conflicts.transfer") %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

data/app/views/decidim/admin/dashboard/show.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("decidim.admin.titles.dashboard")) %>
 
 <h2 class="card-title">
   <%= t "decidim.admin.titles.dashboard" %>

data/app/views/decidim/admin/exports/_dropdown.html.erb

@@ -5,7 +5,7 @@
       <% manifest.formats.each do |format| %>
         <li class="exports--format--<%= format.downcase %> exports--<%= manifest.name %>">
           <%= link_to t("decidim.admin.exports.export_as", name: t("decidim.#{component.manifest.name}.admin.exports.#{manifest.name}"), export_format: t("decidim.admin.exports.formats.#{format}")),
-            exports_path(component, id: manifest.name, format: format),
+            exports_path(component, id: manifest.name, format: format, resource_id: resource_id),
             method: :post %>
         </li>
       <% end %>

data/app/views/decidim/admin/imports/_dropdown.html.erb

@@ -0,0 +1,9 @@
+<span class="imports dropdown tiny button button--simple" data-toggle="import-dropdown"><%= t "actions.import", scope: "decidim.admin" %></span>
+<div class="dropdown-pane" id="import-dropdown" data-dropdown data-position=bottom data-alignment=right data-auto-focus="true" data-close-on-click="true">
+  <ul class="vertical menu add-components">
+    <%= block if defined?(block) %>
+    <li class="imports--file imports--<%= component.manifest.name %>">
+      <%= link_to t("decidim.admin.imports.import_from_file"), admin_imports_path(component, resource_id: resource_id) %>
+    </li>
+  </ul>
+</div>

data/app/views/decidim/admin/imports/new.html.erb

@@ -0,0 +1,57 @@
+<%= decidim_form_for(@form, url: component_imports_path, class: "form grid-container") do |form| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title flex--sbc">
+        <div class="flex--cc flex-gap--1">
+          <div id="js-other-actions-wrapper">
+            <%= link_to t(".actions.back"), manage_component_path(@current_component), class: "button hollow tiny button--simple" %>
+          </div>
+        </div>
+      </h2>
+    </div>
+    <div class="card-section">
+      <div class="row column">
+        <%=
+          form.select :creator,
+          @form.creators.map { |m| [t("decidim.admin.imports.creators.#{m[:name]}"), m[:creator]] },
+          { prompt: true }
+        %>
+      </div>
+      <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+        <div class="field">
+          <%=
+            form.select(
+              :user_group_id,
+              user_groups.map { |g| [g.name, g.id] },
+              include_blank: current_user.name
+            )
+          %>
+        </div>
+      <% end %>
+      <div class="grid-x">
+        <div class="cell">
+          <fieldset>
+            <legend>
+              <%= t(".file_legend", valid_mime_types: mime_types).html_safe %>
+              <div class="creator-guidances">
+                <% @form.creators.each do |creator| %>
+                  <%= content_tag :div, class: "guidance creator-#{creator[:name]}" do %>
+                    <% t("decidim.admin.imports.help.#{creator[:name]}") %>
+                  <% end %>
+                <% end %>
+              </div>
+            </legend>
+            <div class="row column">
+              <%= form.upload :file, optional: false, help_i18n_scope: "decidim.admin.forms.file_help.import" %>
+            </div>
+          </fieldset>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="grid-x align-center mt-sm">
+    <%= form.submit t(".import") %>
+  </div>
+<% end -%>
+
+<%= javascript_include_tag "decidim/admin/import_guidance" %>