decidim-admin 0.28.2 → 0.29.0.rc2

data/app/forms/decidim/admin/attachment_form.rb

@@ -12,10 +12,12 @@ module Decidim
       translatable_attribute :description, String
       attribute :weight, Integer, default: 0
       attribute :attachment_collection_id, Integer
+      attribute :link, String
 
       mimic :attachment
 
-      validates :file, presence: true, unless: :persisted?
+      validates :file, presence: true, unless: :persisted_or_link?
+      validates :link, url: true
       validates :file, passthru: { to: Decidim::Attachment }
       validates :title, :description, translatable_presence: true
       validates :attachment_collection, presence: true, if: ->(form) { form.attachment_collection_id.present? }
@@ -25,6 +27,10 @@ module Decidim
 
       alias organization current_organization
 
+      def persisted_or_link?
+        persisted? || link.present?
+      end
+
       def attachment_collections
         @attachment_collections ||= attached_to.attachment_collections
       end

data/app/forms/decidim/admin/organization_appearance_form.rb

@@ -30,9 +30,6 @@ module Decidim
       attribute :primary_color, String
       attribute :secondary_color, String
       attribute :tertiary_color, String
-      attribute :success_color, String
-      attribute :warning_color, String
-      attribute :alert_color, String
 
       translatable_attribute :cta_button_text, String
       translatable_attribute :description, String

data/app/forms/decidim/admin/{organization_external_domain_whitelist_form.rb → organization_external_domain_allowlist_form.rb}

@@ -2,20 +2,20 @@
 
 module Decidim
   module Admin
-    class OrganizationExternalDomainWhitelistForm < Form
+    class OrganizationExternalDomainAllowlistForm < Form
       attribute :external_domains, Array[Decidim::Admin::ExternalDomainForm]
 
       validate :external_domains_validator
 
       def map_model(model)
-        self.external_domains = model.external_domain_whitelist.map do |external_domain|
+        self.external_domains = model.external_domain_allowlist.map do |external_domain|
           ExternalDomainForm.new(value: external_domain)
         end
       end
 
       def external_domains_validator
         @external_domains_validator ||= external_domains.reject(&:deleted).each do |domain|
-          errors.add(:external_domains, I18n.t("decidim.admin.domain_whitelist.form.domain_too_short")) if domain.value.length <= 3
+          errors.add(:external_domains, I18n.t("decidim.admin.domain_allowlist.form.domain_too_short")) if domain.value.length <= 3
         end.map(&:value).uniq
       end
     end

data/app/forms/decidim/admin/organization_form.rb

@@ -10,7 +10,7 @@ module Decidim
 
       mimic :organization
 
-      attribute :name, String
+      translatable_attribute :name, String
       attribute :reference_prefix, String
       attribute :time_zone, String
       attribute :twitter_handler, String
@@ -37,7 +37,7 @@ module Decidim
 
       validates :welcome_notification_subject, :welcome_notification_body, translatable_presence: true, if: proc { |form| form.customize_welcome_notification }
 
-      validates :name, presence: true
+      validates :name, translatable_presence: true
       validates :time_zone, presence: true
       validates :time_zone, time_zone: true
       validates :default_locale, :reference_prefix, presence: true

data/app/forms/decidim/admin/static_page_form.rb

@@ -11,7 +11,6 @@ module Decidim
       translatable_attribute :title, String
       translatable_attribute :content, String
       attribute :changed_notably, Boolean
-      attribute :show_in_footer, Boolean
       attribute :allow_public_access, Boolean
       attribute :weight, Integer
       attribute :topic_id, Integer

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

@@ -32,7 +32,7 @@ module Decidim
         links.index_with { nil }
       end
 
-      # To be overriden. Useful for adding links that do not match with the filter.
+      # To be overridden. Useful for adding links that do not match with the filter.
       # Must return an Array.
       def extra_dropdown_submenu_options_items(_filter, _i18n_scope)
         []
@@ -98,9 +98,14 @@ module Decidim
       end
 
       def applied_filters_tags(i18n_ctx)
-        ransack_params.slice(*filters).map do |filter, value|
+        tags = ransack_params.slice(*filters).map do |filter, value|
           applied_filter_tag(filter, value, filterable_i18n_scope_from_ctx(i18n_ctx))
-        end.join.html_safe
+        end
+        return if tags.blank?
+
+        tags << remove_all_filters_tag if tags.count > 1
+
+        tags.join.html_safe
       end
 
       def applied_filter_tag(filter, value, i18n_scope)
@@ -111,6 +116,13 @@ module Decidim
         end
       end
 
+      def remove_all_filters_tag
+        link_to(url_for(blank_query_params), class: "label bg-transparent") do
+          concat t("decidim.admin.filters.remove_all")
+          concat icon("delete-bin-line", aria_label: t("decidim.admin.filters.remove_all"), role: "img")
+        end
+      end
+
       def remove_filter_icon_link(filter)
         icon_link_to(
           "delete-bin-line",
@@ -125,6 +137,10 @@ module Decidim
         i18n_scope += ".#{i18n_ctx}" if i18n_ctx
         i18n_scope
       end
+
+      def filtered_adjacent_paths(item, path_method)
+        adjacent_items(item).transform_values(&method(path_method))
+      end
     end
   end
 end

data/app/helpers/decidim/admin/moderations/reports_helper.rb

@@ -25,9 +25,11 @@ module Decidim
               when Decidim::Meetings::Meeting
                 content_tag :li do
                   link_to resource_locator(author).path, target: "_blank", rel: "noopener" do
-                    decidim_sanitize(translated_attribute(author.title))
+                    decidim_sanitize_translated(author.title)
                   end
                 end
+              when Decidim::Organization
+                content_tag :li, organization_name(author)
               else
                 content_tag(:li, author.name)
               end

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

@@ -65,7 +65,7 @@ module Decidim
 
       def sent_to_spaces(newsletter)
         html = "<p style='margin-bottom:0;'> "
-        newsletter.sended_to_partipatory_spaces.try(:each) do |type|
+        newsletter.sent_to_participatory_spaces.try(:each) do |type|
           next if type["ids"].blank?
 
           html += t("index.segmented_to", scope: "decidim.admin.newsletters", subject: t("activerecord.models.decidim/#{type["manifest_name"].singularize}.other"))
@@ -74,7 +74,7 @@ module Decidim
           else
             Decidim.find_participatory_space_manifest(type["manifest_name"].to_sym)
                    .participatory_spaces.call(current_organization).where(id: type["ids"]).each do |space|
-              html += "<strong>#{decidim_html_escape(translated_attribute(space.title))}</strong>"
+              html += "<strong>#{decidim_escape_translated(space.title)}</strong>"
             end
           end
           html += "<br/>"
@@ -88,7 +88,7 @@ module Decidim
           concat t("index.segmented_to", scope: "decidim.admin.newsletters", subject: nil)
           if newsletter.sent_scopes.any?
             newsletter.sent_scopes.each do |scope|
-              concat content_tag(:strong, decidim_html_escape(translated_attribute(scope.name)).to_s)
+              concat content_tag(:strong, decidim_escape_translated(scope.name).to_s)
             end
           else
             concat content_tag(:strong, t("index.no_scopes", scope: "decidim.admin.newsletters"))

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

@@ -17,10 +17,10 @@ module Decidim
         private_user_form = ParticipatorySpacePrivateUserForm.from_params(params, privatable_to:)
                                                              .with_context(
                                                                current_user:,
-                                                               current_particiaptory_space: privatable_to
+                                                               current_participatory_space: privatable_to
                                                              )
 
-        Decidim::Admin::CreateParticipatorySpacePrivateUser.call(private_user_form, current_user, privatable_to, via_csv: true)
+        Decidim::Admin::CreateParticipatorySpacePrivateUser.call(private_user_form, privatable_to, via_csv: true)
       end
     end
   end

data/app/packs/entrypoints/decidim_admin.js

@@ -8,7 +8,7 @@ import "src/decidim/admin/resources_permissions"
 import "src/decidim/admin/welcome_notification"
 import "src/decidim/admin/newsletters"
 import "src/decidim/admin/form"
-import "src/decidim/admin/external_domain_whitelist"
+import "src/decidim/admin/external_domain_allowlist"
 import "src/decidim/admin/draggable-list"
 import "src/decidim/admin/sortable"
 import "src/decidim/admin/moderations"
@@ -17,6 +17,9 @@ import "src/decidim/slug_form"
 import "src/decidim/admin/admin_autocomplete"
 import "src/decidim/admin/triadic_color_picker"
 import "src/decidim/admin/participatory_space_search"
+import "src/decidim/admin/css_preview"
+import "src/decidim/admin/sync_radio_buttons"
+import "src/decidim/admin/text_copy"
 
 // CSS
 import "entrypoints/decidim_admin.scss";

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

@@ -1,15 +1,15 @@
 /* eslint-disable no-invalid-this */
 
-import toggleNav from "src/decidim/admin/toggle_nav"
-import createSortList from "src/decidim/admin/sort_list.component"
-import FormFilterComponent from "src/decidim/form_filter"
-import Configuration from "src/decidim/configuration"
-import InputCharacterCounter from "src/decidim/input_character_counter"
-import managedUsersForm from "src/decidim/admin/managed_users"
+import toggleNav from "src/decidim/admin/toggle_nav";
+import createSortList from "src/decidim/admin/sort_list.component";
+import FormFilterComponent from "src/decidim/form_filter";
+import Configuration from "src/decidim/configuration";
+import InputCharacterCounter from "src/decidim/input_character_counter";
+import managedUsersForm from "src/decidim/admin/managed_users";
 
 window.Decidim = window.Decidim || {};
-window.Decidim.managedUsersForm = managedUsersForm
-window.Decidim.config = new Configuration()
+window.Decidim.managedUsersForm = managedUsersForm;
+window.Decidim.config = new Configuration();
 window.Decidim.InputCharacterCounter = InputCharacterCounter;
 
 // REDESIGN_PENDING: deprecated
@@ -31,23 +31,27 @@ $(() => {
   toggleNav();
 
   createSortList("#steps tbody", {
-    placeholder: $('<tr style="border-style: dashed; border-color: #000"><td colspan="4">&nbsp;</td></tr>')[0],
+    placeholder: $(
+      '<tr style="border-style: dashed; border-color: #000"><td colspan="4">&nbsp;</td></tr>'
+    )[0],
     onSortUpdate: ($children) => {
-      const sortUrl = $("#steps tbody").data("sort-url")
-      const order = $children.map((index, child) => $(child).data("id")).toArray();
+      const sortUrl = $("#steps tbody").data("sort-url");
+      const order = $children.
+        map((index, child) => $(child).data("id")).
+        toArray();
 
       $.ajax({
         method: "POST",
         url: sortUrl,
         contentType: "application/json",
-        data: JSON.stringify({ items_ids: order }) }, // eslint-disable-line camelcase
-      );
+        data: JSON.stringify({ items_ids: order }) // eslint-disable-line camelcase
+      });
     }
-  })
+  });
 
   $("form.new_filter").each(function () {
     const formFilter = new FormFilterComponent($(this));
 
     formFilter.mountComponent();
-  })
+  });
 });

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

@@ -0,0 +1,39 @@
+// Preview CSS changes in real time through data attributes when the change event is dispatched.
+//
+// @example
+// ```erb
+// <%= form.radio_button :text_color, "Blue"
+//                       data: {
+//                         "css-preview" => true,
+//                         "css-preview-updates" => "[data-css-example]:color:blue;"
+//                       } %>
+//
+// <%= form.radio_button :text_color, "Red"
+//                       data: {
+//                         "css-preview" => true,
+//                         "css-preview-updates" => "[data-css-example]:color:red;"
+//                       } %>
+//
+// <div data-css-example>This is an example</div>
+// ```
+//
+// It supports multiple rules separated by semicolons:
+//   selector:property:value; selector:property:value;
+//
+// for example:
+//   strong[data-css-example]:color:#0000ff; strong[data-css-example]:backgroundColor:#eeeeee;
+//
+window.addEventListener("DOMContentLoaded", () => {
+  document.querySelectorAll("input[data-css-preview=true]").forEach((element) => {
+    element.addEventListener("change", (event) => {
+      const updateRules = event.target.dataset.cssPreviewUpdates.split(";");
+
+      updateRules.forEach((rule) => {
+        const [target, property, value] = rule.split(":");
+        if (target !== "") {
+          document.querySelector(target).style[property.trim()] = value.trim();
+        }
+      });
+    })
+  })
+})

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

@@ -28,7 +28,7 @@ $(() => {
   // - amendment_promotion_enabled
 
   // (1) Hides target fields if amendments_enabled component setting is NOT checked.
-  // (2) Toggles visibilty of target fields when amendments_enabled component setting is clicked.
+  // (2) Toggles visibility of target fields when amendments_enabled component setting is clicked.
   const $amendmentsEnabled = $("input#component_settings_amendments_enabled");
 
   if ($amendmentsEnabled.length > 0) {
@@ -42,4 +42,21 @@ $(() => {
       $amendmentStepSettings.toggle();
     });
   }
+
+  // Toggles visibility of the attachments_allowed help text when the checkbox is clicked.
+  // Show the help text if the checkbox is checked.
+  const $attachmentsAllowedCheckbox = $("#component_settings_attachments_allowed");
+  const $attachmentsHelpText = $(".attachments_allowed_container .help-text");
+
+  if (!$attachmentsAllowedCheckbox.is(":checked")) {
+    $attachmentsHelpText.hide();
+  }
+
+  $attachmentsAllowedCheckbox.on("change", () => {
+    if ($attachmentsAllowedCheckbox.is(":checked")) {
+      $attachmentsHelpText.show();
+    } else {
+      $attachmentsHelpText.hide();
+    }
+  });
 });

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

@@ -25,7 +25,7 @@ const apiRequest = (query) => {
 /**
  * Resolves the different root fields for listing different participatory spaces
  * available in the instance. Returns all LIST kind root fields that list
- * records implemeting the ParticipatorySpaceInterface.
+ * records implementing the ParticipatorySpaceInterface.
  *
  * @returns {Promise} A promise resolving the root fields for querying different
  *   participatory spaces.

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/_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

@@ -218,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)

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 %>