decidim-admin 0.28.6 → 0.29.0.rc1

data/app/packs/src/decidim/admin/proposal_infinite_edit.js

@@ -1,10 +1,10 @@
 $(() => {
-  const $limitiedTimeLabel = $("label[for='component_settings_proposal_edit_time_limited']")
+  const $limitedTimeLabel = $("label[for='component_settings_proposal_edit_time_limited']")
   const $limitedTimeRadioButton = $("#component_settings_proposal_edit_time_limited")
   const $infiniteTimeRadioButton = $("#component_settings_proposal_edit_time_infinite")
   const $editTimeContainer = $(".proposal_edit_before_minutes_container")
 
-  $editTimeContainer.detach().appendTo($limitiedTimeLabel)
+  $editTimeContainer.detach().appendTo($limitedTimeLabel)
 
   if ($infiniteTimeRadioButton.is(":checked")) {
     $editTimeContainer.hide();

data/app/packs/src/decidim/admin/sync_radio_buttons.js

@@ -0,0 +1,27 @@
+// Check one radio button when another is checked
+//
+// @example
+// ```erb
+// <%= form.radio_button :text_color, "Blue",
+//                       data: {
+//                         "sync-radio-buttons" => true,
+//                         "sync-radio-buttons-value" => "unique-key"
+//                       } %>
+//
+// <%= form.radio_button :bg_color, "Blue,"
+//                       data: {
+//                         "sync-radio-buttons-value-target" => "unique-key"
+//                       } %>
+// ```
+//
+window.addEventListener("DOMContentLoaded", () => {
+  document.querySelectorAll("input[data-sync-radio-buttons=true]").forEach((element) => {
+    element.addEventListener("change", (event) => {
+      const value = event.target.dataset.syncRadioButtonsValue;
+      const radio = document.querySelector(`input[data-sync-radio-buttons-value-target=${value}]`);
+
+      radio.checked = true;
+      radio.dispatchEvent(new Event("change"));
+    })
+  })
+})

data/app/packs/src/decidim/admin/text_copy.js

@@ -0,0 +1,19 @@
+// Copy the value of a text input or textarea to another element.
+//
+// @example
+// ```erb
+// <%= form.translated :text_field, :example, data: { "text-copy" => true, "target" => "strong[data-copy-example]" } %>
+//
+// <div data-copy-example>
+//   <%= t(".preview") %>
+// </div>
+// ```
+//
+window.addEventListener("DOMContentLoaded", () => {
+  document.querySelectorAll("input[data-text-copy=true], textarea[data-text-copy=true]").forEach((element) => {
+    element.addEventListener("change", (event) => {
+      const target = document.querySelector(event.target.dataset.target);
+      target.innerText = event.target.value;
+    })
+  });
+})

data/app/packs/stylesheets/decidim/admin/_cards.scss

@@ -107,7 +107,7 @@
 }
 
 .fcell .label {
-  @apply p-2 mb-2;
+  @apply p-2;
 }
 
 .card-section-draggable-list {

data/app/packs/stylesheets/decidim/admin/_datepicker.scss

@@ -0,0 +1,62 @@
+.wc-datepicker {
+  @apply z-[2];
+
+  &__current-month {
+    @apply mt-4;
+  }
+
+  &__next-month-button,
+  &__previous-month-button {
+    > svg {
+      @apply fill-none w-16 h-16;
+    }
+  }
+}
+
+.datepicker {
+  &__clock-button {
+    @apply top-0;
+  }
+
+  &__calendar-button {
+    @apply top-0;
+  }
+
+  &__pick-calendar {
+    @apply z-[3];
+  }
+
+  &__close-calendar {
+    @apply z-[3];
+  }
+
+  &__time-frame {
+    @apply z-[1];
+  }
+
+  &__hour-picker,
+  &__minute-picker {
+    @apply left-2 ml-px;
+  }
+
+  &__hour-down,
+  &__hour-up,
+  &__minute-up,
+  &__minute-down {
+    @apply h-6 w-full;
+
+    > svg {
+      @apply w-10 h-6 pr-1;
+    }
+  }
+}
+
+.item__edit {
+  &-form {
+    .form {
+      [type="number"].wc-datepicker__year-select {
+        @apply text-sm;
+      }
+    }
+  }
+}

data/app/packs/stylesheets/decidim/admin/_item_edit.scss

@@ -101,7 +101,7 @@
   }
 
   &-sticky {
-    @apply w-full fixed left-0 bottom-0 bg-gray-2 border-t border-white;
+    @apply w-full fixed left-0 bottom-0 bg-gray-2 border-t border-white z-[4];
 
     &-container {
       @apply px-8 py-4 flex gap-x-4 justify-end;

data/app/packs/stylesheets/decidim/admin/_item_show.scss

@@ -16,6 +16,14 @@
       @apply font-normal;
     }
   }
+
+  &--with-action-options {
+    @apply flex-row flex-wrap;
+  }
+
+  &__action-options {
+    @apply flex bg-background p-8 w-full mt-4 w-full;
+  }
 }
 
 .item_show__content {

data/app/packs/stylesheets/decidim/admin/_moderations.scss

@@ -29,14 +29,6 @@
     list-style: none;
     margin: 0;
 
-    li a {
-      @apply flex items-center;
-
-      svg {
-        @apply ml-1;
-      }
-    }
-
     .icon {
       @apply ml-2;
     }

data/app/packs/stylesheets/decidim/admin/_proposal_status.scss

@@ -0,0 +1,5 @@
+.proposal-status__color {
+  label {
+    @apply sr-only;
+  }
+}

data/app/packs/stylesheets/decidim/admin/application.scss

@@ -35,4 +35,6 @@
 @import "stylesheets/decidim/admin/_data_picker.scss";
 @import "stylesheets/decidim/admin/_legacy_foundation.scss";
 @import "stylesheets/decidim/admin/_sidebar-menu.scss";
+@import "stylesheets/decidim/admin/_datepicker.scss";
 @import "stylesheets/decidim/admin/_minimap.scss";
+@import "stylesheets/decidim/admin/_proposal_status.scss";

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

@@ -3,8 +3,6 @@
 module Decidim
   module Admin
     class Permissions < Decidim::DefaultPermissions
-      include Decidim::UserRoleChecker
-
       def permissions
         return permission_action if managed_user_action?
 
@@ -33,8 +31,6 @@ module Decidim
 
         apply_global_moderations_permission_for_admin!
 
-        can_use_image_editor?
-
         if user.admin? && admin_terms_accepted?
           allow! if read_admin_log_action?
           allow! if read_user_statistics_action?
@@ -222,11 +218,11 @@ module Decidim
         @organization ||= context.fetch(:organization, nil) || context.fetch(:current_organization, nil)
       end
 
-      def user_can_enter_space_area?(**args)
+      def user_can_enter_space_area?(**)
         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?(**)
       end
 
       def space_allows_admin_access_to_current_action?(require_admin_terms_accepted: false)
@@ -257,14 +253,6 @@ module Decidim
       def available_authorization_handlers?
         user.organization.available_authorization_handlers.any?
       end
-
-      def component
-        context.fetch(:component, nil)
-      end
-
-      def can_use_image_editor?
-        allow! if permission_action.subject == :editor_image && user_has_any_role?(user, nil, broad_check: true)
-      end
     end
   end
 end

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

@@ -20,7 +20,11 @@ module Decidim
       end
 
       def query
-        recipients = recipients_base_query
+        recipients = Decidim::User.where(organization: @form.current_organization)
+                                  .where.not(newsletter_notifications_at: nil)
+                                  .where.not(email: nil)
+                                  .where.not(confirmed_at: nil)
+                                  .not_deleted
 
         recipients = recipients.interested_in_scopes(@form.scope_ids) if @form.scope_ids.present?
 
@@ -37,14 +41,6 @@ module Decidim
 
       private
 
-      def recipients_base_query
-        Decidim::User.available
-                     .where(organization: @form.current_organization)
-                     .where.not(newsletter_notifications_at: nil)
-                     .where.not(email: nil)
-                     .confirmed
-      end
-
       # Return the ids of the ParticipatorySpace selected
       # in form, grouped by type
       # This will be used to take followers and

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

@@ -2,10 +2,10 @@
 
 module Decidim
   module Admin
-    # A class used to filter users by whitelisted scope or searches on their
+    # A class used to filter users by allowed scope or searches on their
     # name
     class UserFilter < Decidim::Query
-      WHITELISTED_STATE_SCOPES = %w(
+      ALLOWED_STATE_SCOPES = %w(
         officialized
         not_officialized
         managed
@@ -32,7 +32,7 @@ module Decidim
         @state = state
       end
 
-      # List the User groups by the diferents filters.
+      # List the User groups by the different filters.
       def query
         users = scope
         users = filter_by_search(users)
@@ -50,7 +50,7 @@ module Decidim
       end
 
       def filter_by_state(users)
-        return users unless WHITELISTED_STATE_SCOPES.include?(state)
+        return users unless ALLOWED_STATE_SCOPES.include?(state)
 
         users.public_send(state)
       end

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

@@ -24,7 +24,7 @@ module Decidim
         @state = state
       end
 
-      # List the User groups by the diferent filters.
+      # List the User groups by the different filters.
       def query
         @user_groups = filter_by_search(@user_groups)
         @user_groups = filter_by_state(@user_groups)

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

@@ -14,7 +14,7 @@
         <thead>
           <tr>
             <th><%= t("activemodel.attributes.attachment_collection.name") %></th>
-            <th class="actions"></th>
+            <th></th>
           </tr>
         </thead>
         <tbody>

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

@@ -17,8 +17,27 @@
         <%= form.select :attachment_collection_id, @form.attachment_collections.map { |c| [translated_attribute(c.name), c.id] }, include_blank: true %>
       </div>
 
-      <div class="row column">
-        <%= form.upload :file, button_class: "button button__sm button__transparent-secondary" %>
+      <div class="p-6" data-file-or-link-tabs-controller>
+        <%= cell "decidim/tab_panels", [
+          {
+            enabled: true,
+            id: "file",
+            text: "Upload file",
+            icon: "file-upload-line",
+            method: :cell,
+            selected: form.object.file.present?,
+            args: ["/decidim/attachments_file_tab", form]
+          },
+          {
+            enabled: true,
+            id: "link",
+            text: "Link",
+            icon: "link",
+            method: :cell,
+            selected: form.object.link.present?,
+            args: ["/decidim/attachments_link_tab", form]
+          }
+        ] %>
       </div>
     </div>
   </div>

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

@@ -18,7 +18,7 @@
             <th><%= t("models.attachment.fields.collection", scope: "decidim.admin") %></th>
             <th><%= t("models.attachment.fields.content_type", scope: "decidim.admin") %></th>
             <th><%= t("models.attachment.fields.file_size", scope: "decidim.admin") %></th>
-            <th class="actions"></th>
+            <th></th>
           </tr>
         </thead>
         <tbody>
@@ -34,7 +34,7 @@
                 <%= attachment.file_type %>
               </td>
               <td>
-                <%= number_to_human_size(attachment.file_size) %>
+                <%= attachment.file? ? number_to_human_size(attachment.file_size) : "-" %>
               </td>
               <td class="table-list__actions">
                 <% if allowed_to? :update, :attachment, attachment: attachment %>

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

@@ -14,24 +14,42 @@
     </h2>
   </div>
   <div class="card-section">
-    <table class="table-list table-list--lastleft">
+    <table class="table-list">
       <thead>
         <tr>
           <th><%= t("decidim.authorization_handlers.name") %></th>
-          <th><%= t("decidim.authorization_handlers.help") %></th>
+          <th class="!text-left"><%= t("decidim.authorization_handlers.help") %></th>
         </tr>
       </thead>
       <tbody>
         <% @workflows.each do |manifest| %>
           <tr>
             <% workflow = Decidim::Verifications::Adapter.new(manifest) %>
-            <td><%= link_to workflow.fullname, workflow.admin_root_path %></td>
             <td>
-              <ul>
-                <% t("decidim.authorization_handlers.admin.#{workflow.key}.help").each do |tip| %>
-                  <li><%= tip %></li>
-                <% end %>
-              </ul>
+              <% if workflow.has_admin_root_path? %>
+                <%= link_to workflow.fullname, workflow.admin_root_path %>
+              <% else %>
+                <%= workflow.fullname %>
+              <% end %>
+            </td>
+            <td class="!text-left">
+              <% i18n_key = "decidim.authorization_handlers.admin.#{workflow.key}.help" %>
+              <% if I18n.exists?(i18n_key, current_locale) %>
+                <ul class="list-decimal ml-4">
+                  <% t(i18n_key).each do |tip| %>
+                    <li><%= tip %></li>
+                  <% end %>
+                </ul>
+              <% else %>
+                <div class="flash warning">
+                  <ul>
+                    <% default_help = t("decidim.authorization_handlers.admin.default.help", authorization_handler: i18n_key) %>
+                    <% default_help.each do |tip| %>
+                      <li><%= tip %></li>
+                    <% end %>
+                  </ul>
+                </div>
+              <% end %>
             </td>
           </tr>
         <% end %>

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

@@ -19,7 +19,7 @@
               <%= cell("decidim/announcement", t(".already_reported_html"), callout_class: "alert" ) %>
             <% end %>
 
-            <% if Decidim.module_installed?(:templates) %>
+            <% if defined?(Decidim::Templates) %>
               <%= render "decidim/templates/admin/block_user_templates/template_chooser", form: f %>
             <% end %>
 

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

@@ -14,7 +14,7 @@
         <thead>
           <tr>
             <th><%= t("activemodel.attributes.category.name") %></th>
-            <th class="actions"></th>
+            <th></th>
           </tr>
         </thead>
         <tbody>
@@ -38,7 +38,7 @@
               </td>
             </tr>
             <% category.subcategories.each do |subcategory| %>
-              <tr class="extra__table-list__subcategory">
+              <tr>
                 <td>
                   <%= link_to translated_attribute(subcategory.name), edit_category_path(current_participatory_space, subcategory) %><br>
                 </td>

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

@@ -59,7 +59,7 @@
 
       <div id="panel-step_settings" class="card-section">
         <div class="row column">
-          <fieldset class="step-settings">
+          <fieldset>
             <div class="card-section">
               <% current_participatory_space.steps.each do |step| %>
                 <fieldset class="step-settings-<%= step.id %>">

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

@@ -14,12 +14,8 @@
         <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 font-normal">
             <% @manifests.each do |manifest| %>
-             <%= link_to new_component_path(type: manifest.name), class: manifest.name do %>
-              <li>
-                <%= t("#{manifest.name}.name", scope: "decidim.components") %>
-              </li>
+              <li><%= link_to t("#{manifest.name}.name", scope: "decidim.components"), new_component_path(type: manifest.name), class: manifest.name %></li>
             <% end %>
-          <% end %>
           </ul>
         </div>
       </div>

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

@@ -27,28 +27,18 @@
   </div>
 </div>
 
-<div class="item__edit item__edit-1col">
-  <div class="item__edit-form">
-    <%= decidim_form_for(@form, url: conflict_path, method: :put, html: { class: "form form-defaults" }) do |f| %>
-      <div class="form__wrapper">
-        <div class="card pt-4">
-          <div class="card-section">
-            <div class="row column">
+<%= 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 :reason, label: t("reason", scope: "decidim.admin.conflicts.transfer") %>
-            </div>
-
-            <div class="row column">
-
-              <%= f.text_field :email, label: t("email", scope: "decidim.admin.conflicts.transfer") %>
-            </div>
-          </div>
-        </div>
+        <%= f.text_field :email, label: t("email", scope: "decidim.admin.conflicts.transfer") %>
       </div>
+    </div>
+  </div>
 
-      <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
-        <%= f.submit t("title", scope: "decidim.admin.conflicts.transfer"), class: "button button__sm button__secondary" %>
-      </div>
-    <% end %>
+  <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+    <%= f.submit t("title", scope: "decidim.admin.conflicts.transfer"), class: "button button__sm button__secondary" %>
   </div>
-</div>
+<% end %>

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

@@ -1,32 +1,10 @@
 <% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
-<div class="item_show__header">
-  <h1 class="item_show__header-title">
-    <%= t("title", scope: "decidim.admin.conflicts") %>
-  </h1>
-</div>
-
-<div class="filters__section">
-  <div class="fcell search">
-    <%= search_form_for(query, url: url_for) do |form| %>
-      <%= applied_filters_hidden_field_tags %>
-      <div class="input-group">
-        <%= form.search_field(
-              search_field_predicate,
-              class: "input-group-field",
-              label: false,
-              placeholder: t(".text")
-            ) %>
-        <div class="input-group-button">
-          <button type="submit" class="text-secondary" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
-            <%= icon "search-line", class: "fill-secondary w-4 h-4" %>
-          </button>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>
-
 <div class="card">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t("title", scope: "decidim.admin.conflicts") %>
+    </h1>
+  </div>
   <div class="table-scroll">
     <table class="table-list">
       <thead>
@@ -39,7 +17,7 @@
         </tr>
       </thead>
       <tbody>
-        <% conflicts.each do |conflict| %>
+        <% @conflicts.each do |conflict| %>
           <tr>
             <td><%= conflict.current_user.name %></td>
             <td><%= conflict.managed_user.name %></td>
@@ -52,4 +30,3 @@
     </table>
   </div>
 </div>
-<%= decidim_paginate conflicts %>

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

@@ -6,7 +6,7 @@
   </div>
 
   <div class="card-section">
-    <p><%= t(".anouncement", count: count_pending_moderations) %></p>
+    <p><%= t(".announcement", count: count_pending_moderations) %></p>
     <p><%= link_to t(".goto_moderation"), moderations_path, class: "button button__sm button__secondary mt-2" %></p>
   </div>
 </div>

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

@@ -2,7 +2,7 @@
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-  <%= t "decidim.admin.titles.dashboard" %> <%= current_organization.name %>
+  <%= t "decidim.admin.titles.dashboard" %> <%= current_organization_name %>
   </h1>
 </div>
 

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

@@ -1,4 +1,4 @@
-<span class="exports button button__sm button__secondary button--simple" data-toggle="<%= dropdown_id(filters) %>">
+<span class="exports button button__sm button__secondary" data-toggle="<%= dropdown_id(filters) %>">
   <% if filters.present? %>
     <%= t("actions.export-selection", scope: "decidim.admin") %>
   <% else %>
@@ -10,11 +10,11 @@
   <ul class="vertical menu add-components">
     <% component.manifest.export_manifests.each do |manifest| %>
       <% manifest.formats.each do |format| %>
-        <%= link_to exports_path(component, id: manifest.name, format:, resource_id:, filters:), method: :post do %>
-          <li class="exports--format--<%= format.downcase %> exports--<%= manifest.name %>">
-            <%= t("decidim.admin.exports.export_as", name: t("decidim.#{component.manifest.name}.admin.exports.#{manifest.name}"), export_format: t("decidim.admin.exports.formats.#{format}")) %>
-          </li>
-        <% end %>
+        <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:, resource_id:, filters:),
+                      method: :post %>
+        </li>
       <% end %>
     <% end %>
   </ul>

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

@@ -1,6 +1,6 @@
 <% add_decidim_page_title(t("impersonatable_users", scope: "decidim.admin.titles")) %>
 <% if current_organization.available_authorizations.empty? %>
-  <div class="section">
+  <div>
     <%= cell("decidim/announcement", t(".needs_authorization_warning"), callout_class: "warning" ) %>
   </div>
 <% end %>
@@ -32,7 +32,7 @@
   </div>
   <div class="fcell search">
     <%= form_tag "", method: :get do %>
-      <div class="filters__search">
+      <div>
         <div class="input-group">
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <%= hidden_field_tag :state, @state %>
@@ -64,7 +64,7 @@
             <td><%= user.managed? ? t(".managed") : t(".not_managed") %></td>
             <td class="table-list__actions">
               <% if allowed_to? :impersonate, :impersonatable_user, user: user %>
-                <%= icon_link_to "login-box-line", new_impersonatable_user_impersonation_path(user), t(".impersonate"), class: "action-icon--impersonate" %>
+                <%= icon_link_to "user-line", new_impersonatable_user_impersonation_path(user), t(".impersonate"), class: "action-icon--impersonate" %>
               <% end %>
               <%= icon_link_to "time-line", impersonatable_user_impersonation_logs_path(user), t(".view_logs"), class: "action-icon--view-logs" %>
               <% if allowed_to? :promote, :impersonatable_user, user: user %>