decidim-admin 0.20.0 → 0.23.1.rc1

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
 
@@ -39,7 +46,7 @@ module Decidim
       def spaces
         return if @form.participatory_space_types.blank?
 
-        @form.participatory_space_types.map do |type|
+        @spaces ||= @form.participatory_space_types.map do |type|
           next if type.ids.blank?
 
           object_class = "Decidim::#{type.manifest_name.classify}"
@@ -68,20 +75,24 @@ module Decidim
 
         participant_ids = []
         spaces.each do |space|
+          next unless defined? space.component_ids
+
           available_components = Decidim.component_manifests.map { |m| m.name.to_s if m.newsletter_participant_entities.present? }.compact
           Decidim::Component.where(id: space.component_ids, manifest_name: available_components).published.each do |component|
             Decidim.find_component_manifest(component.manifest_name).try(&:newsletter_participant_entities).flatten.each do |object|
               klass = Object.const_get(object)
-              participant_ids << klass.newsletter_participant_ids(component)
+              participant_ids |= klass.newsletter_participant_ids(component)
             end
           end
-          next unless defined?(Decidim::Comments)
+        end
 
-          Decidim::Comments.newsletter_participant_entities.flatten.each do |object|
+        if defined?(Decidim::Comments)
+          Decidim::Comments.newsletter_participant_entities.each do |object|
             klass = Object.const_get(object)
-            participant_ids << klass.newsletter_participant_ids(space)
+            participant_ids |= klass.newsletter_participant_ids(spaces.first)
           end
         end
+
         participant_ids.flatten.compact.uniq
       end
     end

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/attachment_collections/index.html.erb

@@ -34,7 +34,7 @@
                       <%= icon_link_to "circle-x", polymorphic_path([collection_for, attachment_collection]), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                     <% else %>
                       <span class="action-icon" title="<%= t("attachment_collections.index.attachment_collection_used", scope: "decidim.admin") %>" data-tooltip="true" data-disable-hover="false">
-                        <%= icon "circle-x", class: "action-icon action-icon--disabled" %>
+                        <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
                       </span>
                     <% end %>
                   <% end %>

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

@@ -1,4 +1,5 @@
 <div class="card">
+  <%= cell("decidim/verifications/revocations", @authorizations) %>
   <div class="card-divider">
     <h2 class="card-title">
       <%= t("decidim.admin.titles.authorization_workflows") %>

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

@@ -34,7 +34,7 @@
                       <%= icon_link_to "circle-x", category_path(current_participatory_space, category), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
                     <% else %>
                       <span class="action-icon" title="<%= t("categories.index.category_used", scope: "decidim.admin") %>" data-tooltip="true" data-disable-hover="false">
-                        <%= icon "circle-x", class: "action-icon action-icon--disabled" %>
+                        <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
                       </span>
                     <% end %>
                   <% end %>

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

@@ -1,39 +1,46 @@
-<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_resource_scope_for(component.scope) %>
+    <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 %>
+        <% end %>
+      <% 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 %>
+        <%= icon_link_to "cog", url_for(action: :edit, id: component, controller: "components"), t("actions.configure", scope: "decidim.admin"), class: "action-icon--configure" %>
       <% 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 %>
+        <% 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 %>
 
-    <% 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? :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" %>
       <% 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/_form.html.erb

@@ -77,6 +77,10 @@
           </div>
         </fieldset>
       <% end %>
+
+      <% unless component.published? %>
+        <%= render partial: "decidim/admin/share_tokens/share_tokens", locals: { share_tokens: form.object.share_tokens } %>
+      <% end %>
     </div>
   </div>
 </div>

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

@@ -3,8 +3,8 @@
     form,
     settings_attribute,
     field_name,
-    label: t("decidim.components.#{manifest.name}.settings.#{settings_name}.#{field_name}"),
+    "decidim.components.#{manifest.name}.settings.#{settings_name}",
     tabs_prefix: tabs_prefix,
-    help_text: help_text_for_component_setting(field_name, settings_name, manifest.name)
+    readonly: settings_attribute.readonly?(component: @component)
   ) %>
 <% 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>
 
@@ -19,6 +21,7 @@
         <thead>
           <th><%= t(".headers.name") %></th>
           <th><%= t(".headers.type") %></th>
+          <%= th_resource_scope_label(t(".headers.scope")) %>
           <th><%= t(".headers.actions") %></th>
         </thead>
 

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

@@ -1,16 +1,56 @@
+
 <h2 class="card-title">
   <%= t "decidim.admin.titles.dashboard" %>
 </h2>
+
 <div class="content">
   <p><%= t ".welcome" %></p>
-  <% if allowed_to? :read, :admin_log %>
-    <div class="row">
-      <h3 class="card-title">
-      </h3>
-      <%= render partial: "decidim/admin/logs/logs_list", locals: { logs: latest_action_logs } %>
-      <% if latest_action_logs.any? %>
-        <div class="text-center"><%= link_to t(".view_more_logs"), logs_path %></div>
-      <% end %>
-    </div>
+
+  <% unless current_user.admin_terms_accepted? %>
+    <%= cell("decidim/announcement", admin_terms_announcement_args ) %>
+  <% end %>
+
+  <div class="grid-x grid-margin-x">
+    <% if current_user.admin? && current_user.organization&.id == current_organization.id %>
+      <div class="cell small-12 medium-6 large-4">
+        <%= render(
+          partial: "decidim/admin/users_statistics/users_count",
+          locals: {
+            result: users_counter
+          }
+        ) %>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="grid-x grid-margin-x">
+    <% if allowed_to? :read, :metrics %>
+      <div class="cell small-6">
+        <%= render(
+          partial: "decidim/admin/metrics/metrics",
+          locals: {
+            metrics_presenter: metrics_presenter,
+            show_link_to_more: true
+          }
+        ) %>
+      </div>
+    <% end %>
+
+    <% if allowed_to? :read, :admin_log %>
+      <div class="cell small-6">
+        <%= render partial: "decidim/admin/logs/logs_list", locals: { logs: latest_action_logs } %>
+        <% if latest_action_logs.any? %>
+          <div class="text-center"><%= link_to t(".view_more_logs"), logs_path %></div>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+
+  <% 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/exports/_dropdown.html.erb

@@ -2,8 +2,12 @@
 <div class="dropdown-pane" id="export-dropdown" data-dropdown data-position=bottom data-alignment=right data-auto-focus="true" data-close-on-click="true">
   <ul class="vertical menu add-components">
     <% component.manifest.export_manifests.each do |manifest| %>
-      <% %w{CSV JSON Excel}.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: format.upcase), exports_path(component, id: manifest.name, format: format), method: :post %></li>
+      <% 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),
+            method: :post %>
+        </li>
       <% end %>
     <% end %>
   </ul>

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

@@ -33,8 +33,8 @@
           <%= 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 type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>

data/app/views/decidim/admin/metrics/_metrics.html.erb

@@ -0,0 +1,21 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t "decidim.admin.titles.metrics" %>
+    </h2>
+  </div>
+
+<div class="grid-y grid-padding-y">
+  <div class="cell grid-x grid-padding-x">
+    <%= metrics_presenter.highlighted %>
+  </div>
+
+  <div class="cell grid-x grid-padding-x">
+    <%= metrics_presenter.not_highlighted %>
+  </div>
+</div>
+</div>
+
+<% if show_link_to_more %>
+  <div class="text-center"><%= link_to t(".see_more_metrics"), metrics_path %></div>
+<% end %>

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

@@ -0,0 +1,7 @@
+<%= render(
+  partial: "decidim/admin/metrics/metrics",
+  locals: {
+    metrics_presenter: metrics_presenter,
+    show_link_to_more: false
+  }
+) %>

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

@@ -0,0 +1,28 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t ".title" %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="grid-x grid-margin-x card-grid">
+    <% templates.each do |newsletter_template| %>
+      <div class="cell small-6">
+        <div class="card card--mini" id="<%= newsletter_template.name %>">
+          <iframe src="<%= preview_newsletter_template_path(newsletter_template.name) %>" class="email-preview newsletter-template-preview">
+          </iframe>
+
+          <div class="card-footer">
+            <h2 class="card-title">
+              <%= t newsletter_template.public_name_key %>
+              <%= link_to(t(".preview_template"), newsletter_template_path(newsletter_template.name), class: "button tiny button--title") %>
+              <%= link_to(t(".use_template"), new_newsletter_template_newsletter_path(newsletter_template.name), class: "button tiny button--title") %>
+            </h2>
+          </div>
+        </div>
+      </div>
+    <% end %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,12 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".preview", template_name: t(template_manifest.public_name_key) %></h2>
+  </div>
+  <div class="card-section">
+    <iframe src="<%= preview_newsletter_template_path(template_manifest.name) %>" class="email-preview">
+    </iframe>
+  </div>
+</div>
+<div class="button--double form-general-submit">
+  <%= link_to(t(".use_template"), new_newsletter_template_newsletter_path(template_manifest.name), class: "button") %>
+</div>

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

@@ -2,10 +2,4 @@
   <%= form.translated :text_field, :subject %>
 </div>
 
-<div class="row column">
-  <%= form.translated :editor, :body, toolbar: "basic-no-video" %>
-</div>
-
-<div class="row column">
-  <%= t(".interpolations_hint") %>
-</div>
+<%= cell content_block.settings_form_cell, form, content_block: content_block %>

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

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, html: { class: "form edit_newsletter" }) do |f| %>
+<%= decidim_form_for(@form, html: { class: "form edit_newsletter" }, url: newsletter_path(newsletter)) do |f| %>
   <div class="card">
     <div class="card-divider">
       <h2 class="card-title"><%= t ".title" %></h2>

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), ["newsletter_templates"], class: "button tiny button--title new" %>
+        <% end %>
+      </div>
+    </div>
   </div>
   <div class="card-section">
     <div class="table-scroll">