decidim-decidim_awesome 0.11.4 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d76b564c88310b85cca5f32876773b3698805bde193ab100281f3729a5d17184
-  data.tar.gz: daef24e9c1ee24620267137e92fe8f25be2878aa9f26a0c1be65cfab96b90286
+  metadata.gz: 29689a9ea7f9c930c3683f13c34ecf797b125dc8241ed704ca44174085d59a00
+  data.tar.gz: f3552ebb84814f2f854f7a9b9bb1f80a0d8b3739cd1fd9626c3cbc4f6a7c7a6e
 SHA512:
-  metadata.gz: 854f55867d965a8301d262bd7700266f362015cab0f993285a619da1b9349753a9dedd56f472d287c2459bfb5991eb22241983b10fdf7b03c8094d9253f4e5bc
-  data.tar.gz: ca46f4d43cc00b2b2cf63dea0ae8625cf7bd58605935aa78ef0196d703548f25a5786a8fbea3b886e125448676cdd1dff6777636a127897383f8d65bcf7779a2
+  metadata.gz: a521a9f071f71436ad251a7ce20c9a7d6202fe83518e291927ce4d9affdbc138238b2e5b618b505db66882beb3af2775f90993ca501c290b7f4152990a38d456
+  data.tar.gz: 28c137dced1adb31664299f427b55257877f56b4d06041de46a0194fb14b976adf6375dad4a17063ff155031ab4ba6ff6345b4bf2066bcfa9102a3f00a7a482a

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+v0.12.0
+-------
+Compatibility:
+  - Decidim 0.29.x
+
+Features:
+  - Upgrade to Decidim v0.29
+
 v0.11.4
 -------
 Compatibility:
@@ -88,8 +96,8 @@ Compatibility:
 
 Features:
   - Migrate to [Deface](https://github.com/spree/deface) for overrides
-  - Introduce Weighted Voting with configurable manifests for different types of votings with grades
-  - Fix wrong behaviour showing proposals on map
+  - Introduce Weighted Voting with configurable manifests for different types of voting with grades
+  - Fix wrong behavior showing proposals on map
   - Introduced new sorting options for proposals. Added alphabetical sorting, reverse sorting, sorting by votes first and last.
 
 v0.9.3
@@ -111,7 +119,7 @@ Compatibility:
 
 Features:
   - Fixes for the menu hacker
- 
+
 v0.9.1
 ------
 
@@ -187,7 +195,7 @@ Features:
   - Now awesome components can be disabled using the `disabled_components` configuration var.
   - Feature: Custom redirections editor: Create shorter URL redirections to other places, inside or outside Decidim.
   - Update to webpacker compatiblity and Decidim 0.25
-  - Added tasks `bin/rails decidim_awesome:active_storage_migrations:check_migration_from_carrierwave` and `bin/rails decidim_awesome:active_storage_migrations:migrate_from_carrierwave` (also accessible as a backgroundjob from the awesome admin checks)
+  - Added tasks `bin/rails decidim_awesome:active_storage_migrations:check_migration_from_carrierwave` and `bin/rails decidim_awesome:active_storage_migrations:migrate_from_carrierwave` (also accessible as a background job from the awesome admin checks)
   - REMOVED: SCSS themes are not available anymore (the alternative is to use custom styles). This is mostly because of webpacker.
 
 v0.7.2
@@ -199,7 +207,7 @@ Compatibility:
 
 Features:
   - Added custom fields (with admin interface and scopable) to replace normal body in proposals.
-  - Change Markdown editor behaviour: now it is converted to HTML before storing in the database. This makes the editor compatible with all Rich Text editors.
+  - Change Markdown editor behavior: now it is converted to HTML before storing in the database. This makes the editor compatible with all Rich Text editors.
   - Added icons in the awesome config menu
   - Fixes scoped admins accessing process groups
 
@@ -215,7 +223,7 @@ Features:
   - Add Awesome Map content block for the homepage
   - Added processes groups constraint for different scoped tweaks
   - Added "Never" constraint to deactivated scoped tweaks temporarily
-  - Change Markdown editor behaviour: now it is converted to HTML before storing in the database. This makes the editor compatible with all Rich Text editors. This also takes this feature out the the "experimental" zone as the resulting edited text is fully compatible with standard Decidim.
+  - Change Markdown editor behavior: now it is converted to HTML before storing in the database. This makes the editor compatible with all Rich Text editors. This also takes this feature out the the "experimental" zone as the resulting edited text is fully compatible with standard Decidim.
   - Added scoped admins feature: Any user can be turned into a limited admin and scoped to one or more participatory spaces.
   - Fix allowing access to participatory space admins (only full admins can access the module).
   - Added `participatory_spaces_routes_context` config variable to specify additional routes correspondences to participatory spaces.

data/README.md

@@ -317,7 +317,7 @@ When building a new view for the vote button ([see the original](https://github.
 - If votes are blocked `if current_settings.votes_blocked?`
 - If the user has already voted `if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user)`
 - If maximum votes have already reached `if proposal.maximum_votes_reached?`
-- If the proposal can accumulate supports beyond maximum `if proposal.can_accumulate_supports_beyond_threshold`
+- If the proposal can accumulate supports beyond maximum `if proposal.can_accumulate_votes_beyond_threshold`
 - If the current component allows the user to participate `if current_component.participatory_space.can_participate?(current_user)`
 - Note that the [original view](https://github.com/decidim/decidim/blob/release/0.28-stable/decidim-proposals/app/views/decidim/proposals/proposals/_vote_button.html.erb) is overridden only inside the tag  `<div id="proposal-<%= proposal.id %>-vote-button" class="button--vote-button">`. You only need to substitute the part inside.
 
@@ -413,7 +413,7 @@ Decidim::DecidimAwesome.configure do |config|
 #### 21. Manual verifications
 
 The admin will be allowed to manually authorize users using the methods specified in the `/system` admin section.
-Currently, only form based handlers are supported (Direct methods). 
+Currently, only form based handlers are supported (Direct methods).
 Admins can manually override or verify users in the participants list but they still have to fulfill the requirements of the verifier (although they will be allowed to force the authorization even if some of them fails).
 
 Admin logs are also created in each action for accountability.
@@ -464,29 +464,14 @@ Go to `yourdomain/admin/decidim_awesome` and start tweaking things!
 > bin/rails decidim_decidim_awesome:webpacker:install
 > ```
 
-
-If you are upgrading from a version prior to 0.8, make sure to visit the URL `/admin/decidim_awesome/checks` and run image migrations for the old images:
-
-![Check image migrations](examples/check_image_migrations.png)
-
-If you are a system admin, you can also perform this task by executing this rake task in the console:
-
-```
-RAILS_ENV=production bin/rails decidim_awesome:active_storage_migrations:migrate_from_carrierwave
-```
-
-Or check your migration status with:
-```
-RAILS_ENV=production bin/rails decidim_awesome:active_storage_migrations:check_migration_from_carrierwave
-```
-
 The correct version of Decidim Awesome should resolved automatically by the Bundler.
-However you can force some specific version using `gem "decidim-decidim_awesome", "~> 0.11.0"` in the Gemfile.
+However you can force some specific version using `gem "decidim-decidim_awesome", "~> 0.12.0"` in the Gemfile.
 
 Depending on your Decidim version, choose the corresponding Awesome version to ensure compatibility:
 
 | Awesome version | Compatible Decidim versions |
 |---|---|
+| 0.12.x | 0.29.x |
 | 0.11.x | 0.28.x |
 | 0.10.x | >= 0.26.7, >= 0.27.x |
 | 0.9.2 | >= 0.26.7, >= 0.27.3 |
@@ -600,7 +585,6 @@ bundle exec rubocop
 To ease up following the style guide, you should install the plugin to your
 favorite editor, such as:
 
-- Atom - [linter-rubocop](https://atom.io/packages/linter-rubocop)
 - Sublime Text - [Sublime RuboCop](https://github.com/pderichs/sublime_rubocop)
 - Visual Studio Code - [Rubocop for Visual Studio Code](https://github.com/misogi/vscode-ruby-rubocop)
 
@@ -614,8 +598,8 @@ DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rake test_
 DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rspec
 ```
 
-> Note: the following is not currently applicable as version v0.11 is only compatible with version Decidim v0.28
-> Is left here for future reference
+> Note: the following is not currently applicable as from version v0.11 this plugin is compatible one version at the time.
+> This is left here for future reference.
 
 However, this project works with different versions of Decidim. In order to test them all, we maintain two different Gemfiles: `Gemfile` and `Gemfile.legacy`. The first one is used for development and testing the latest Decidim version supported, the second one is used for testing against the old Decidim version.
 
@@ -624,9 +608,9 @@ You can run run tests against the legacy Decidim versions by using:
 ```bash
 export DATABASE_USERNAME=<username>
 export DATABASE_PASSWORD=<password>
-RBENV_VERSION=3.1.1 BUNDLE_GEMFILE=Gemfile.legacy bundle
-RBENV_VERSION=3.1.1 BUNDLE_GEMFILE=Gemfile.legacy bundle exec rake test_app
-RBENV_VERSION=3.1.1 BUNDLE_GEMFILE=Gemfile.legacy bundle exec rspec
+RBENV_VERSION=3.2.2 BUNDLE_GEMFILE=Gemfile.legacy bundle
+RBENV_VERSION=3.2.2 BUNDLE_GEMFILE=Gemfile.legacy bundle exec rake test_app
+RBENV_VERSION=3.2.2 BUNDLE_GEMFILE=Gemfile.legacy bundle exec rspec
 ```
 
 For convenience, you can use the scripts `bin/test` and `bin/test-legacy` to run tests against one or the other version:

data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/show.erb

@@ -27,7 +27,7 @@
                                     id: "change-vote",
                                     class: "change-vote-button vote-action font-semibold" %>
     </p>
-  <% elsif proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+  <% elsif proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
     <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.maximum_votes_reached") %></p>
   <% elsif vote_limit_enabled? && remaining_votes_count_for(current_user) <= 0 %>
     <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %></p>

data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal_cell.rb

@@ -18,8 +18,8 @@ module Decidim
         end
 
         def vote_instructions
-          translated_attribute(current_component.settings.voting_cards_instructions).presence || t("decidim.decidim_awesome.voting.voting_cards.default_instructions_html",
-                                                                                                   organization: current_organization.name)
+          translated_attribute(current_component.settings.voting_cards_instructions).presence ||
+            t("decidim.decidim_awesome.voting.voting_cards.default_instructions_html", organization: translated_attribute(current_organization.name))
         end
 
         def proposal_votes(weight)
@@ -69,9 +69,7 @@ module Decidim
         def disabled?
           return true if voted_for_any? || current_settings.votes_blocked?
 
-          if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user)
-            return true
-          end
+          return true if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user)
 
           true if vote_limit_enabled? && remaining_votes_count_for(current_user) <= 0
         end

data/app/commands/concerns/decidim/decidim_awesome/system/{register_organization_override.rb → create_organization_override.rb}

@@ -3,7 +3,7 @@
 module Decidim
   module DecidimAwesome
     module System
-      module RegisterOrganizationOverride
+      module CreateOrganizationOverride
         extend ActiveSupport::Concern
 
         included do

data/app/commands/concerns/decidim/decidim_awesome/update_account_override.rb

@@ -13,11 +13,11 @@ module Decidim
           decidim_update_personal_data
           return if @form.user_time_zone.blank?
 
-          @user.extended_data ||= {}
-          if @form.user_time_zone == @user.organization.time_zone
-            @user.extended_data.delete("time_zone")
+          current_user.extended_data ||= {}
+          if @form.user_time_zone == current_user.organization.time_zone
+            current_user.extended_data.delete("time_zone")
           else
-            @user.extended_data["time_zone"] = @form.user_time_zone
+            current_user.extended_data["time_zone"] = @form.user_time_zone
           end
         end
 

data/app/commands/decidim/decidim_awesome/admin/create_constraint.rb

@@ -39,7 +39,7 @@ module Decidim
         attr_reader :form, :constraint
 
         def attributes
-          form.attributes.filter { |_i, v| v.present? }
+          form.attributes.compact_blank
         end
       end
     end

data/app/commands/decidim/decidim_awesome/create_editor_image.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module DecidimAwesome
-    class CreateEditorImage < Command
+    class CreateEditorImage < Decidim::Command
       # Creates a blueprint.
       #
       # form - The form with the data.
@@ -13,7 +13,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form wasn't valid, and we couldn't proceed.
       #
       # Returns nothing.
       def call

data/app/controllers/decidim/decidim_awesome/admin/checks_controller.rb

@@ -15,12 +15,6 @@ module Decidim
 
         helper_method :head, :admin_head, :head_addons, :admin_addons
 
-        def migrate_images
-          Decidim::DecidimAwesome::MigrateLegacyImagesJob.perform_later(current_organization.id)
-          flash[:notice] = I18n.t("image_migrations_started", scope: "decidim.decidim_awesome.admin.checks.index")
-          redirect_to checks_maintenance_index_path
-        end
-
         private
 
         def head

data/app/forms/concerns/decidim/decidim_awesome/proposals/{proposal_wizard_create_step_form_override.rb → proposal_form_customizations.rb}

@@ -4,7 +4,7 @@
 module Decidim
   module DecidimAwesome
     module Proposals
-      module ProposalWizardCreateStepFormOverride
+      module ProposalFormCustomizations
         extend ActiveSupport::Concern
 
         included do

data/app/forms/concerns/decidim/decidim_awesome/system/organization_form_override.rb

@@ -9,7 +9,7 @@ module Decidim
         included do
           alias_method :decidim_original_map_model, :map_model
 
-          attribute :awesome_admins_available_authorizations, Array[String]
+          attribute :awesome_admins_available_authorizations, [String]
 
           def map_model(model)
             decidim_original_map_model(model)
@@ -19,7 +19,7 @@ module Decidim
           def clean_awesome_admins_available_authorizations
             return unless awesome_admins_available_authorizations
 
-            awesome_admins_available_authorizations.select(&:present?)
+            awesome_admins_available_authorizations.compact_blank
           end
 
           private

data/app/packs/entrypoints/decidim_admin_decidim_awesome_search_form.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/decidim_awesome/admin/admin_accountability";

data/app/packs/stylesheets/decidim/decidim_awesome/admin/admin_accountability.scss

@@ -0,0 +1,67 @@
+.filters__section {
+  @apply flex gap-4 items-start;
+
+  input {
+    @apply h-9;
+  }
+
+  .form-label {
+    @apply block;
+  }
+
+  .dropdown__container {
+    @apply flex flex-col items-start gap-0 py-0;
+
+    .form-label {
+      @apply block text-sm p-0;
+    }
+
+    .dropdown {
+      @apply flex items-center h-9;
+    }
+  }
+
+  .grid {
+    @apply flex gap-4 items-start;
+  }
+
+  .datepicker_field {
+    @apply flex flex-col;
+
+    .datepicker__datepicker-row {
+      @apply flex items-center gap-2 order-1;
+    }
+
+    .datepicker__help-text-container {
+      @apply order-2 w-full;
+    }
+
+    .help-text.datepicker__help-date {
+      @apply w-full;
+    }
+
+    .input-group-field {
+      @apply h-9 px-2;
+    }
+
+    .search-button-container button {
+      @apply h-9 w-9 flex items-center justify-center;
+    }
+  }
+
+  .row.column:last-child {
+    @apply flex items-center justify-center;
+  }
+
+  .search-button-container {
+    @apply flex flex-col items-start;
+
+    button {
+      @apply h-9 px-4 flex items-center justify-center;
+    }
+  }
+
+  .row.column.search-field {
+    @apply flex-grow;
+  }
+}

data/app/permissions/decidim/decidim_awesome/permissions.rb

@@ -22,13 +22,14 @@ module Decidim
         return allow! if user.admin?
         return allow! if config[:allow_images_in_proposals]
         return allow! if config[:allow_images_in_editors]
-        return allow! if config[:allow_videos_in_editors]
+
+        allow! if config[:allow_videos_in_editors]
       end
 
       def required_authorizations_action?
         return false unless permission_action.subject == :required_authorizations
 
-        return allow! unless context[:user_is_authorized]
+        allow! unless context[:user_is_authorized]
       end
     end
   end

data/app/uploaders/decidim/decidim_awesome/image_uploader.rb

@@ -9,6 +9,18 @@ module Decidim
           thumbnail: { resize_to_fit: [nil, 237] }
         }
       end
+
+      def extension_allowlist
+        %w(jpg jpeg png)
+      end
+
+      def content_type_allowlist
+        %w(image/jpeg image/png)
+      end
+
+      def max_image_height_or_width
+        8000
+      end
     end
   end
 end

data/app/views/decidim/decidim_awesome/admin/admin_accountability/index.html.erb

@@ -68,3 +68,4 @@
     </div>
   </div>
 </div>
+<% append_stylesheet_pack_tag "decidim_admin_decidim_awesome_search_form" %>

data/app/views/decidim/decidim_awesome/admin/shared/_filters_with_date.html.erb

@@ -1,5 +1,7 @@
 <div class="filters__section p-4 flex mb-0">
-  <div class="fcell filter self-start">
+  <div class="fcell filter dropdown__container">
+    <!-- Label added to align the button vertically with other inputs -->
+    <label class="form-label">&nbsp;</label>
     <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
       <li>
         <a href="#" class="dropdown button button__sm button__secondary">
@@ -10,38 +12,45 @@
       </li>
     </ul>
   </div>
+
   <div class="fcell search">
-    <%= search_form_for(query, url: url_for, html: { class: "form-defaults form" }) do |form| %>
-      <%= applied_filters_hidden_field_tags %>
-      <div class="input-group flex items-center">
-        <%= form.search_field(
-              search_field_predicate,
-              class: "input-group-field shadow-md border-alert",
-              label: false,
-              placeholder: t(search_field_predicate,
-                             collection: collection_name,
-                             scope: "decidim.admin.filters.search_placeholder")
-            ) %>
-        <div class="input-group-button">
-          <button type="submit" class="text-secondary py-2 px-4 rounded-r focus:outline-none outline-none">
-            <%= icon "search-line", class: "fill-secondary w-4 h-4", aria_label: t("search_label", scope: "decidim.admin.filters") %>
-          </button>
-        </div>
-      </div>
-      <div class="input-group flex mt-4 w-full justify-center">
-        <div class="input-group-field flex flex-col w-full">
-          <%= form.label t("search_field_start_date", scope: "decidim.admin.filters.label") %>
-          <%= form.date_field(:created_at_gteq,
-                              class: "input-group-field",
-                              label: false,
-                              datepicker: true) %>
-        </div>
-        <div class="input-group-field flex flex-col w-full">
-          <%= form.label t("search_field_end_date", scope: "decidim.admin.filters.label") %>
-          <%= form.date_field(:created_at_lteq,
-                              class: "input-group-field",
-                              label: false,
-                              datepicker: true) %>
+    <%= search_form_for(query, url: url_for, html: { class: "form form-defaults" }) do |form| %>
+      <%= hidden_field_tag :admins, params[:admins] %>
+      <div class="form__wrapper">
+        <div class="card">
+          <div class="card-section">
+            <div class="grid grid-cols-4 gap-x-4">
+              <div class="row column search-field">
+                <%= form.label search_field_predicate, t("decidim.search.term_input_placeholder"), class: "form-label" %>
+                <%= form.search_field(
+                      search_field_predicate,
+                      class: "input-group-field",
+                      placeholder: t("decidim.search.term_input_placeholder"),
+                      label: false
+                    ) %>
+              </div>
+              <div class="row column datepicker_field">
+                <%= form.label :created_at_gteq, t("search_field_start_date", scope: "decidim.admin.filters.label"), class: "form-label" %>
+                <%= form.date_field(:created_at_gteq,
+                                    class: "input-group-field",
+                                    label: false) %>
+              </div>
+
+              <div class="row column datepicker_field">
+                <%= form.label :created_at_lteq, t("search_field_end_date", scope: "decidim.admin.filters.label"), class: "form-label" %>
+                <%= form.date_field(:created_at_lteq,
+                                    class: "input-group-field",
+                                    label: false) %>
+              </div>
+              <div class="row column search-button-container">
+                <!-- Label added to align the button vertically with other inputs -->
+                <label class="form-label">&nbsp;</label>
+                <button type="submit" class="button button__sm button__secondary" aria-label="<%= t("decidim.search.term_input_placeholder") %>">
+                  <%= icon "search-line", class: "!fill-white w-4 h-4" %>
+                </button>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     <% end %>

data/app/views/decidim/decidim_awesome/map_component/map/_map_template.html.erb

@@ -78,7 +78,7 @@
 <script>
   window.AwesomeMap = window.AwesomeMap || {};
   window.AwesomeMap.categories = <%= current_categories(categories).to_json.html_safe %>;
-  window.AwesomeMapProposalTexts = <%= Decidim::Proposals::Proposal::STATES.to_h { |state, _| [state, t("decidim.proposals.answers.#{state}")] }.to_json.html_safe %>;
+  window.AwesomeMapProposalTexts = <%= Decidim::Proposals::ProposalState.pluck(:token).index_with { |state| t("decidim.proposals.answers.#{state}") }.to_json.html_safe %>;
   window.AwesomeMapMeetingTypes = <%= Decidim::Meetings::Meeting::TYPE_OF_MEETING.to_h { |type, _| [type, Decidim.icons.all[type.to_s]["icon"]] }.to_json.html_safe %>;
   window.AwesomeMapMeetingTexts = <%= Decidim::Meetings::Meeting::TYPE_OF_MEETING.to_h { |type, _| [type, t("decidim.meetings.meetings.filters.type_values.#{type}")] }.to_json.html_safe %>;
 </script>

data/config/assets.rb

@@ -12,5 +12,6 @@ Decidim::Webpacker.register_entrypoints(
   decidim_admin_decidim_awesome_global: "#{base_path}/app/packs/entrypoints/decidim_admin_decidim_awesome_global.js",
   decidim_decidim_awesome_map: "#{base_path}/app/packs/entrypoints/decidim_decidim_awesome_map.js",
   decidim_decidim_awesome_custom_fields: "#{base_path}/app/packs/entrypoints/decidim_decidim_awesome_custom_fields.js",
-  decidim_decidim_awesome_iframe: "#{base_path}/app/packs/entrypoints/decidim_decidim_awesome_iframe.scss"
+  decidim_decidim_awesome_iframe: "#{base_path}/app/packs/entrypoints/decidim_decidim_awesome_iframe.scss",
+  decidim_admin_decidim_awesome_search_form: "#{base_path}/app/packs/entrypoints/decidim_admin_decidim_awesome_search_form.scss"
 )