decidim-admin 0.20.1 → 0.21.0

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

@@ -130,6 +130,24 @@ module Decidim
           { class: space.try(:closed?) ? "red" : "green", title: translated_attribute(space.title).to_s }
         ]
       end
+
+      def newsletter_attention_callout_args
+        {
+          announcement: {
+            body: t("warning", scope: "decidim.admin.newsletters.select_recipients_to_deliver").html_safe
+          },
+          callout_class: "warning"
+        }
+      end
+
+      def newsletter_recipients_count_callout_args
+        {
+          announcement: {
+            body: t("recipients_count", scope: "decidim.admin.newsletters.select_recipients_to_deliver", count: recipients_count_query)
+          },
+          callout_class: "warning"
+        }
+      end
     end
   end
 end

data/app/helpers/decidim/admin/paginable/per_page_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module Paginable
+      # This module includes helpers the :per_page cell's option
+      module PerPageHelper
+        def per_page_options
+          OpenStruct.new(
+            per_page: per_page,
+            per_page_range: Decidim::Admin.per_page_range
+          )
+        end
+
+        # Renders the pagination dropdown menu in the admin panel.
+        def admin_filters_pagination
+          cell("decidim/admin/results_per_page", per_page_options)
+        end
+      end
+    end
+  end
+end

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

@@ -32,6 +32,12 @@ module Decidim
             Option.new(scope_type.id, translated_attribute(scope_type.name))
           end
       end
+
+      def organization_scope_depths(organization = current_organization)
+        organization.scope_types.map do |scope_type|
+          Option.new(scope_type.id, translated_attribute(scope_type.name))
+        end.reverse
+      end
     end
   end
 end

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

@@ -26,9 +26,14 @@ module Decidim
         if name == :amendments_visibility
           amendments_visibility_form_field(form, options)
         elsif attribute.translated?
-          form.send(:translated, form_method_for_attribute(attribute), name, options.merge(tabs_id: "#{options[:tabs_prefix]}-#{name}-tabs"))
+          form_method = form_method_for_attribute(attribute)
+          tab_options = { tabs_id: "#{options[:tabs_prefix]}-#{name}-tabs" }
+          extra_options = tab_options.merge(extra_options_for_type(form_method))
+          form.send(:translated, form_method, name, options.merge(extra_options))
         else
-          form.send(form_method_for_attribute(attribute), name, options.merge(extra_options_for(name)))
+          form_method = form_method_for_attribute(attribute)
+          extra_options = extra_options_for(name).merge(extra_options_for_type(form_method))
+          form.send(form_method, name, options.merge(extra_options))
         end
       end
 
@@ -78,6 +83,17 @@ module Decidim
         end
       end
 
+      # Handles special cases.
+      # Returns an empty Hash or a Hash with extra HTML options.
+      def extra_options_for_type(input_type)
+        case input_type
+        when :text_area
+          { rows: 6 }
+        else
+          {}
+        end
+      end
+
       # Marks :participatory_texts_enabled setting with a CSS class if the
       # Proposals component has existing proposals, so it can be identified
       # in "decidim/admin/form.js". Also, adds a help_text.

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module UserRolesHelper
+      def user_role_config
+        return @user_role_config if @user_role_config
+
+        space = current_participatory_space
+        @user_role_config = if current_user.admin?
+                              space.user_role_config_for(current_user, :organization_admin)
+                            else
+                              role = space.user_roles.find_by(user: current_user)
+                              space.user_role_config_for(current_user, role&.role)
+                            end
+      end
+    end
+  end
+end

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

@@ -16,14 +16,20 @@ module Decidim
           return permission_action
         end
 
-        return user_manager_permissions if user_manager?
+        if user_manager?
+          begin
+            allow! if user_manager_permissions.allowed?
+          rescue Decidim::PermissionAction::PermissionNotSetError
+            nil
+          end
+        end
 
-        allow! if user_can_enter_space_area?
+        allow! if user_can_enter_space_area?(require_admin_terms_accepted: true)
 
         read_admin_dashboard_action?
         apply_newsletter_permissions_for_admin!
 
-        if user.admin?
+        if user.admin? && admin_terms_accepted?
           allow! if read_admin_log_action?
           allow! if static_page_action?
           allow! if organization_action?
@@ -66,6 +72,7 @@ module Decidim
       end
 
       def apply_newsletter_permissions_for_admin!
+        return unless admin_terms_accepted?
         return unless permission_action.subject == :newsletter
         return allow! if user.admin?
         return unless space_allows_admin_access?
@@ -157,15 +164,19 @@ module Decidim
         @organization ||= context.fetch(:organization, nil) || context.fetch(:current_organization, nil)
       end
 
-      def user_can_enter_space_area?
+      def user_can_enter_space_area?(**args)
         return unless permission_action.action == :enter &&
                       permission_action.subject == :space_area
 
-        space_allows_admin_access_to_current_action?
+        space_allows_admin_access_to_current_action?(args)
       end
 
-      def space_allows_admin_access_to_current_action?
+      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
+
           new_permission_action = Decidim::PermissionAction.new(
             action: permission_action.action,
             scope: permission_action.scope,
@@ -181,6 +192,12 @@ module Decidim
         Decidim::Admin::UserManagerPermissions.new(user, permission_action, context).permissions
       end
 
+      def admin_terms_accepted?
+        return unless permission_action.scope == :admin
+
+        user&.admin_terms_accepted?
+      end
+
       def available_authorization_handlers?
         user.organization.available_authorization_handlers.any?
       end

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

@@ -5,15 +5,22 @@ module Decidim
     # A class used to find the recipients of the
     # Newsletter depending on the params of the form
     class NewsletterRecipients < Rectify::Query
-      # newsletter - the Newsletter that will be send and needs to be selected the recipients.
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
       # form - params to filter the query
-      def initialize(newsletter, form)
-        @newsletter = newsletter
+      def self.for(form)
+        new(form).query
+      end
+
+      # Initializes the class.
+      #
+      # form - params to filter the query
+      def initialize(form)
         @form = form
       end
 
       def query
-        recipients = Decidim::User.where(organization: @newsletter.organization)
+        recipients = Decidim::User.where(organization: @form.current_organization)
                                   .where.not(newsletter_notifications_at: nil, email: nil, confirmed_at: nil)
                                   .not_deleted
 

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

@@ -0,0 +1,26 @@
+<%= cell("decidim/announcement", admin_terms_announcement_args ) %>
+
+<article class="card">
+  <div class="card-section grid-x grid-margin-x">
+    <div class="cell medium-12">
+
+      <div class="content">
+        <%= admin_terms_of_use_body %>
+      </div>
+    </div>
+
+    <% unless current_user.admin_terms_accepted? %>
+      <h4 class="cell medium-12 text-center">
+        <%= t("decidim.admin.admin_terms_of_use.actions.title") %>
+      </h4>
+
+      <div class="cell medium-6 small-order-2 medium-order-1 text-center">
+        <%= button_to_refuse_admin_terms %>
+      </div>
+
+      <div class="cell medium-6 small-order-1 medium-order-2 text-center">
+        <%= button_to_accept_admin_terms %>
+      </div>
+    <% end %>
+  </div>
+</article>

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

@@ -1,39 +1,41 @@
-<tr class="component-<%= component.id %>">
-  <td>
-    <%= link_to main_component_path(component), target: "_blank" do %>
-      <%= translated_attribute component.name %>
-    <% end %>
-  </td>
-  <td>
-    <%= t "decidim.components.#{component.manifest.name}.name" %>
-  </td>
-  <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" %>
-    <% end %>
+<% if user_role_config.component_is_accessible?(component.manifest_name) %>
+  <tr class="component-<%= component.id %>">
+    <td>
+      <%= link_to main_component_path(component), target: "_blank" do %>
+        <%= translated_attribute component.name %>
+      <% end %>
+    </td>
+    <td>
+      <%= t "decidim.components.#{component.manifest.name}.name" %>
+    </td>
+    <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" %>
+      <% end %>
 
-    <% if allowed_to?(:update, :component, component: component) %>
-      <% if component.published? %>
-        <%= icon_link_to "x", url_for(action: :unpublish, id: component, controller: "components"), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :put %>
-      <% 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 %>
+      <% if allowed_to?(:update, :component, component: component) %>
+        <% if component.published? %>
+          <%= icon_link_to "x", url_for(action: :unpublish, id: component, controller: "components"), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :put %>
+        <% 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 %>
       <% end %>
-    <% 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" %>
-    <% 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" %>
+      <% end %>
 
-    <% if allowed_to? :update, :component, component: component %>
-      <% if component.manifest.actions.empty? %>
-        <%= icon "key", class: "action-icon action-icon--disabled" %>
-      <% 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" %>
+      <% if allowed_to? :update, :component, component: component %>
+        <% if component.manifest.actions.empty? %>
+          <%= icon "key", class: "action-icon action-icon--disabled" %>
+        <% 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 %>
       <% end %>
-    <% 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 %>
-    <% end %>
-  </td>
-</tr>
+      <% 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 %>
+      <% end %>
+    </td>
+  </tr>
+<% end %>

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

@@ -2,14 +2,16 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t("components.title", scope: "decidim.admin") %>
-      <button class="dropdown tiny button button--title" data-toggle="add-component-dropdown"><%= t "components.index.add", scope: "decidim.admin" %></button>
-      <div class="dropdown-pane" id="add-component-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
-        <ul class="vertical menu add-components">
-          <% @manifests.each do |manifest| %>
-            <li><%= link_to t("#{manifest.name}.name", scope: "decidim.components"), new_component_path(type: manifest.name), class: manifest.name %></li>
-          <% end %>
-        </ul>
-      </div>
+      <% if allowed_to?(:create, :component) %>
+        <button class="dropdown tiny button button--title" data-toggle="add-component-dropdown"><%= t "components.index.add", scope: "decidim.admin" %></button>
+        <div class="dropdown-pane" id="add-component-dropdown" data-dropdown data-auto-focus="true" data-close-on-click="true">
+          <ul class="vertical menu add-components">
+            <% @manifests.each do |manifest| %>
+              <li><%= link_to t("#{manifest.name}.name", scope: "decidim.components"), new_component_path(type: manifest.name), class: manifest.name %></li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
     </h2>
   </div>
 

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

@@ -1,8 +1,15 @@
+
 <h2 class="card-title">
   <%= t "decidim.admin.titles.dashboard" %>
 </h2>
+
 <div class="content">
   <p><%= t ".welcome" %></p>
+
+  <% unless current_user.admin_terms_accepted? %>
+    <%= cell("decidim/announcement", admin_terms_announcement_args ) %>
+  <% end %>
+
   <% if allowed_to? :read, :admin_log %>
     <div class="row">
       <h3 class="card-title">
@@ -13,4 +20,12 @@
       <% end %>
     </div>
   <% end %>
+
+  <% if current_user.admin_terms_accepted? %>
+    <p class="text-right">
+      <small>
+        <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_use"), admin_terms_show_path) %>
+      </small>
+    </p>
+  <% end %>
 </div>

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

@@ -2,10 +2,16 @@
   <div class="card-divider">
     <h2 class="card-title">
       <%= t ".title" %>
-      <% if allowed_to? :create, :newsletter %>
-        <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.newsletter.name", scope: "decidim.admin").downcase), ["new", "newsletter"], class: "button tiny button--title new" %>
-      <% end %>
     </h2>
+    <div class="card-title">
+      <div class="text-right">
+        <strong class="subscribed_title"><%= t("newsletters.index.subscribed_count", scope: "decidim.admin") %></strong>
+        <span class="subscribed_count"><%= recipients_count_query %></span>
+        <% if allowed_to? :create, :newsletter %>
+          <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.newsletter.name", scope: "decidim.admin").downcase), ["new", "newsletter"], class: "button tiny button--title new" %>
+        <% end %>
+      </div>
+    </div>
   </div>
   <div class="card-section">
     <div class="table-scroll">

data/app/views/decidim/admin/newsletters/select_recipients_to_deliver.html.erb

@@ -1,13 +1,11 @@
-<%= decidim_form_for(@form, url: deliver_newsletter_path(@newsletter), method: :post, html: { class: "form newsletter_deliver" }) do |f| %>
+<%= decidim_form_for(@form, url: deliver_newsletter_path(@newsletter), method: :post, html: { class: "form newsletter_deliver" }, data: { "recipients-count-newsletter-path": recipients_count_newsletter_path(@newsletter) }) do |f| %>
   <div class="card">
 
     <div class="card-divider">
       <h2 class="card-title"><%= t ".title" %></h2>
     </div>
     <div class="card-section">
-      <div class="callout warning">
-        <%= t(".warning").html_safe %>
-      </div>
+      <%= cell("decidim/announcement", newsletter_attention_callout_args) %>
 
       <div class="card">
         <div class="card-divider">
@@ -63,6 +61,8 @@
         </div>
       <% end %>
 
+      <%= cell("decidim/announcement", newsletter_recipients_count_callout_args) %>
+
       <div class="button--double form-general-submit">
         <% if allowed_to?(:update, :newsletter, newsletter: @newsletter) && !@newsletter.sent? %>
           <%= link_to t("actions.edit", scope: "decidim.admin"), ["edit", @newsletter], class: "button" %>

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

@@ -1,44 +1,8 @@
-<div class="filters row">
-  <div class="column medium-3">
-    <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
-    <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
-        <li class="is-dropdown-submenu-parent">
-          <a href="#">
-          <% if @state.present? %>
-            <%= t(".filter.#{@state}") %>
-          <% else %>
-            <%= t(".filter.all") %>
-          <% end %>
-          </a>
-          <ul class="menu is-dropdown-submenu">
-            <li><%= link_to t(".filter.officialized"), url_for(state: "officialized", q: @query) %></li>
-            <li><%= link_to t(".filter.not_officialized"), url_for(state: "not_officialized", q: @query) %></li>
-            <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
-          </ul>
-        </li>
-      </ul>
-  </div>
-  <div class="column medium-4">
-    <%= form_tag "", method: :get do %>
-      <div class="filters__search">
-        <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="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
-            </button>
-          </div>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>
-
-<div class="card" id='user-groups'>
+<div class="card with-overflow" id='user-groups'>
   <div class="card-divider">
     <h2 class="card-title"><%= t "decidim.admin.titles.participants" %></h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">