decidim-admin 0.21.0 → 0.23.2

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class DashboardMetricChartsPresenter < Decidim::MetricChartsPresenter
+      attribute :summary, Boolean
+
+      def render_not_highlighted(metrics)
+        safe_join(
+          metrics.map do |metric|
+            render_metrics_data(metric.metric_name, klass: not_highlighted_classes, graph_klass: "small")
+          end
+        )
+      end
+
+      def highlighted_metrics
+        return super unless summary?
+
+        Decidim.metrics_registry.filtered(
+          highlight: true,
+          scope: "home"
+        ).select do |registry|
+          %w(users proposals).include? registry.metric_name
+        end
+      end
+
+      def not_highlighted_metrics
+        return super unless summary?
+
+        Decidim.metrics_registry.filtered(
+          highlight: false,
+          scope: "home"
+        ).select do |registry|
+          %w(comments meetings accepted_proposals results).include? registry.metric_name
+        end
+      end
+
+      private
+
+      def highlighted_classes
+        return "cell medium-6" if summary?
+
+        "cell medium-4"
+      end
+
+      def not_highlighted_classes
+        return "cell medium-3" if summary?
+
+        "cell medium-2"
+      end
+
+      def not_highlighted_wrapper_classes
+        "grid-x grid-margin-x"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Counts active users making a distinction between whether they are admins or participants
+    class ActiveUsersCounter < Rectify::Query
+      # Initializes the class.
+      #
+      # @param organization [Organization] Current organization
+      # @param date [Date] Period time to make users count check
+      # @param admin [boolean] Possible values : t for Admin or f for participant
+      def initialize(organization:, date:, admin: false)
+        @organization = organization
+        @date = date
+        @admin = admin
+      end
+
+      # Count the user's number who have logged in since given date
+      #
+      # Returns an ActiveRecord::Relation
+      def query
+        return Decidim::User.none unless organization && date
+
+        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
+      end
+
+      private
+
+      attr_reader :organization, :date, :admin
+    end
+  end
+end

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

@@ -46,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}"
@@ -75,20 +75,17 @@ 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)
-
-          Decidim::Comments.newsletter_participant_entities.flatten.each do |object|
-            klass = Object.const_get(object)
-            participant_ids << klass.newsletter_participant_ids(space)
-          end
         end
+
         participant_ids.flatten.compact.uniq
       end
     end

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

@@ -8,6 +8,7 @@
     <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" %>
@@ -33,6 +34,10 @@
         <% end %>
       <% 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" %>
+      <% 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 %>

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

@@ -21,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

@@ -10,16 +10,41 @@
     <%= cell("decidim/announcement", admin_terms_announcement_args ) %>
   <% end %>
 
-  <% 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>
-  <% 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">

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

@@ -8,7 +8,7 @@
         <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" %>
+          <%= 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>

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

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, html: { class: "form new_newsletter" }) do |f| %>
+<%= decidim_form_for(@form, html: { class: "form new_newsletter" }, url: newsletter_template_newsletters_path(newsletter_template_id: params[:newsletter_template_id])) do |f| %>
   <div class="card">
     <div class="card-divider">
       <h2 class="card-title"><%= t ".title" %></h2>

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

@@ -0,0 +1,31 @@
+<div class="reveal" id="show-email-modal" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title"><%= t(".title") %></h3>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="row">
+    <div class="columns medium-4 medium-centered">
+      <p><%= t(".description") %></p>
+
+      <div class="show_email">
+        <h4><%= t(".full_name") %></h4>
+        <div><p id="user_full_name"></p></div>
+        <h4><%= t(".email_address") %></h4>
+        <div>
+          <p id="user_email"></p>
+          <p><%= t(".hidden") %></p>
+        </div>
+      </div>
+
+      <div class="button--double form-general-submit">
+        <button class="button" data-open="user_email" data-open-url="">
+          <%= t(".show") %>
+        </button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -31,15 +31,18 @@
               <td><%= translated_attribute(user.officialized_as) %></td>
 
               <td class="table-list__actions">
+                <% if allowed_to? :show_email, :user, user: user %>
+                  <%= icon_link_to "envelope-open", show_email_officialization_path(user_id: user.id), t(".show_email"), class: "action-icon action-icon--show-email", data: { full_name: user.name, toggle: "show-email-modal" } %>
+                <% end %>
                 <%= icon_link_to "envelope-closed", current_or_new_conversation_path_with(user), t("decidim.contact"), class:"action-icon--new" %>
                 <% if user.officialized? %>
-                  <%= icon "circle-check", class: "action-icon action-icon--disabled" %>
+                  <%= icon "circle-check", class: "action-icon action-icon--disabled", role: "img" %>
                   <%= icon_link_to "pencil", new_officialization_path(user_id: user.id), t(".reofficialize"), class: "action-icon--new" %>
                   <%= icon_link_to "circle-x", officialization_path(user.id), t(".unofficialize"), method: :delete, class: "action-icon--reject" %>
                 <% else %>
                   <%= icon_link_to "circle-check", new_officialization_path(user_id: user.id), t(".officialize"), class: "action-icon--verify" %>
-                  <%= icon "pencil", class: "action-icon action-icon--disabled" %>
-                  <%= icon "circle-x", class: "action-icon action-icon--disabled" %>
+                  <%= icon "pencil", class: "action-icon action-icon--disabled", role: "img" %>
+                  <%= icon "circle-x", class: "action-icon action-icon--disabled", role: "img" %>
                 <% end %>
               </td>
             </tr>
@@ -50,3 +53,4 @@
     </div>
   </div>
 </div>
+<%= render "show_email_modal" %>