decidim-decidim_awesome 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a1fe6960b9ed33f3defb30e768248df4870961195c2f46765ef1eb9566351d
-  data.tar.gz: 4c7f4bf56b879a8bc0d703bcebd4db55b25df81ed66437576bb1990d7657f8ef
+  metadata.gz: 31452817d0be4914eed1dd89206dae3da650e3c475928a72573d47ab112c845f
+  data.tar.gz: fd8b114966df8f4a93300ba081ac87e5bf59d572186c179a23dd7ada2d13718b
 SHA512:
-  metadata.gz: b7eb4c6ae1001e0ea3ac83284977b684417fbcbfda5f3c9daace8685ee1d35b6e0fca54a5746f8f4bfdac13c5c0f02341f22c62527afa98e29211e9f372a27e9
-  data.tar.gz: 05e3bbe5441aafca5c54491a79e66f804e06b8ae9ac375ddac0af0458cafb630ffba4cf49e73544393a4d9ecfd5614aa85cb9854289da1b956bb25d138a05196
+  metadata.gz: 217d456c8e991103aca2dc8ec505b5eaa3f30c516a7875149643484b91db4eabeac1550b48408f04bb1d414a1344c6b5045693e8a1056999ff5468be46533b0a
+  data.tar.gz: 47df9e655b54468206c5dd1c8e56d8927cae9279e9d54f211ac6e6c1c1bce25dcd28342a868a52be5fe3b2df8869df53fda5773386a7c1af9f418ee99bb1d152

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 CHANGELOG
 =========
 
+unreleased
+-------
+
+v0.14.3
+-------
+Compatibility:
+  - Decidim 0.31.x
+
+Features:
+  - Add the integrated awesome authorization handler ([#612](https://github.com/decidim-ice/decidim-module-decidim_awesome/pull/612))
+  - Add the ability to vote by "Non answered" proposals ([#590](https://github.com/decidim-ice/decidim-module-decidim_awesome/pull/590))
+  - Some fixes in updating cookies settings the ordering in the awesome global menu
+
 v0.14.2
 -------
 
@@ -14,6 +27,7 @@ Features:
   - Add Rich Text content block for landing pages ([#543](https://github.com/decidim-ice/decidim-module-decidim_awesome/pull/543))
   - Add a new cookie policy/category manager ([#521](https://github.com/decidim-ice/decidim-module-decidim_awesome/pull/521))
   - Fix proposal creation in admin when custom fields are enabled for Decidim >= 0.31.3
+  - Allow admins to restrict proposal voting to selected proposal states per step ([#572](https://github.com/decidim-ice/decidim-module-decidim_awesome/issues/572))
 
 v0.14.1
 -------

data/app/cells/concerns/decidim/decidim_awesome/proposals/proposal_vote_cell_override.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      module ProposalVoteCellOverride
+        extend ActiveSupport::Concern
+
+        included do
+          alias_method :awesome_original_show, :show
+
+          def show
+            return render(:not_allowed) if awesome_voting_restricted_by_status?(resource)
+
+            awesome_original_show
+          end
+        end
+      end
+    end
+  end
+end

data/app/cells/concerns/decidim/decidim_awesome/proposals/proposal_votes_count_cell_override.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      # Renders the votes count view defined by the active voting manifest
+      # instead of the default one
+      module ProposalVotesCountCellOverride
+        def show
+          view = awesome_voting_manifest_for(component)&.show_votes_count_view
+          return super if view.nil?
+
+          return render(partial: view, formats: [:html], locals: { proposal: resource, from_proposals_list: from_proposals_list? }) if view.present?
+
+          awesome_hidden_votes_count_placeholder
+        end
+
+        private
+
+        # Hidden placeholder kept in the DOM so update_buttons_and_counters.js.erb
+        # can update the votes count without raising a console error.
+        def awesome_hidden_votes_count_placeholder
+          return if current_settings.votes_hidden?
+
+          content_tag(:span, progress, style: "display: none", id: element_id)
+        end
+      end
+    end
+  end
+end

data/app/cells/concerns/decidim/decidim_awesome/voting/voting_cards_proposal_vote_cell_override.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Voting
+      # Prepended into VotingCardsProposalVoteCell so that when the proposal is
+      # restricted by the "votes by proposal status" filter we render the
+      # same :not_allowed template used by the standard ProposalVoteCell,
+      # instead of the voting cards UI.
+      module VotingCardsProposalVoteCellOverride
+        def show
+          return render(:not_allowed) if awesome_voting_restricted_by_status?(resource)
+
+          super
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/data_consent/category.erb

@@ -13,12 +13,12 @@
       <%= icon "close-line", class: "cookies__category-toggle-icon" %>
     </label>
 
-    <div id="accordion-trigger-<%= category["slug"] %>" data-controls="accordion-panel-<%= category["slug"] %>" aria-labelledby="accordion-title-<%= category["slug"] %>">
-      <h3 id="accordion-title-<%= category["slug"] %>" class="cookies__category-trigger-title">
-        <%= category["title"] %>
-      </h3>
+    <h3 id="accordion-title-<%= category["slug"] %>" class="cookies__category-trigger-title">
+      <%= category["title"] %>
+    </h3>
 
-      <span>
+    <div id="accordion-trigger-<%= category["slug"] %>" role="group" data-controls="accordion-panel-<%= category["slug"] %>" aria-labelledby="accordion-title-<%= category["slug"] %>">
+      <span aria-hidden="true">
         <%= icon "arrow-down-s-line", class: "cookies__category-trigger-arrow" %>
         <%= icon "arrow-up-s-line", class: "cookies__category-trigger-arrow" %>
       </span>

data/app/cells/decidim/decidim_awesome/content_blocks/map/show.erb

@@ -1,5 +1,5 @@
-<section class="map-block home__section">
-  <%= content_tag("h3", section_title) if section_title.present? %>
+<section class="map-block home__section content-block">
+  <%= content_tag(:h2, section_title, class: "mb-[20px]") if section_title.present? %>
 
   <%= awesome_map_for global_map_components do %>
     <%= render partial: "decidim/decidim_awesome/map_component/map/map_template.html", locals: { taxonomies: all_taxonomies, map_height: model.settings.map_height } %>

data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb

@@ -47,7 +47,7 @@ module Decidim
           return if model.settings.title.blank?
           return if model.settings.title.values.join.blank?
 
-          content_tag :h3, class: "section-heading" do
+          content_tag :h3, class: "h3 section-heading" do
             translated_attribute(model.settings.title)
           end
         end

data/app/cells/decidim/proposals/proposal_vote/not_allowed.erb

@@ -0,0 +1,16 @@
+<% if !current_settings.votes_hidden? && (current_component.participatory_space.can_participate?(current_user) || current_user&.admin?) %>
+  <% progress = resource.proposal_votes_count || 0 %>
+  <% total = resource.maximum_votes || 0 %>
+  <%= cell(
+        "decidim/progress_bar",
+        progress,
+        total:,
+        units_name: "decidim.proposals.proposals.votes_count.count",
+        element_id: "proposal-#{resource.id}-votes-count",
+        class: total.positive? ? "card__proposals-votes-limited" : "card__proposals-votes-unlimited"
+      ) %>
+<% end %>
+
+<div id="proposal-<%= resource.id %>-vote-button" class="card__proposals-votes-container">
+  <span class="help-text italic"><%= t("decidim.decidim_awesome.proposals.votes.blocked_by_status") %></span>
+</div>

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class CreateAwesomeAuthorizationGroup < Command
+        # Public: Initializes the command.
+        #
+        # form - The form object with the authorization group data
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid, form.errors.full_messages.join("; ")) if form.invalid?
+
+          create_authorization_group!
+
+          broadcast(:ok, authorization_group)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        attr_reader :form, :authorization_group
+
+        def create_authorization_group!
+          @authorization_group = form.current_organization.awesome_authorization_groups.create!(
+            name: form.name,
+            purpose: form.purpose
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class CreateAwesomeAuthorizationMembers < Command
+        # Public: Initializes the command.
+        #
+        # form - The form object containing the authorization group and emails.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when all members were added or already existed.
+        # - :invalid if some members could not be created.
+        #
+        # Returns nothing.
+        def call
+          authorization_group.members.destroy_all if form.remove_previous_members
+
+          previous_members_count = authorization_group.members.count
+          authorization_group.members.insert_all( # rubocop:disable Rails/SkipsModelValidations
+            form.data.map { |email| { email: email.strip.downcase } },
+            unique_by: :index_auth_members_group_email
+          )
+          created_count = authorization_group.members.count - previous_members_count
+
+          if created_count.zero? && form.remove_previous_members.blank?
+            return broadcast(:invalid,
+                             I18n.t("decidim.decidim_awesome.admin.awesome_authorization_users.update.empty"))
+          end
+
+          broadcast(:ok, created_count)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        attr_reader :form
+
+        def authorization_group
+          form.authorization_group
+        end
+      end
+    end
+  end
+end

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

@@ -11,7 +11,8 @@ module Decidim
         def initialize(forms, category_slug)
           @forms = forms
           @category_slug = category_slug
-          @config = AwesomeConfig.find_by(organization: forms.first.current_organization, var: :cookie_management)
+          @organization = forms.first.current_organization
+          @config = AwesomeConfig.find_or_initialize_by(organization: @organization, var: :cookie_management)
         end
 
         # Executes the command. Broadcasts these events:
@@ -31,7 +32,8 @@ module Decidim
 
             UpdateCookieItem.call(form_with_context, category_slug) do
               on(:ok) do
-                existing_items.merge!(form.name => form.to_params)
+                category["items"] ||= {}
+                category["items"].merge!(form.name => form.to_params)
               end
               on(:invalid) do |error_message|
                 errors << "#{form.name}: #{error_message.presence || form.errors.full_messages.join(", ")}"
@@ -50,12 +52,12 @@ module Decidim
 
         attr_reader :forms, :category_slug
 
-        def category
-          @category ||= @config.value[category_slug]
+        def store
+          @store ||= CookieManagementStore.new(@organization, @config.value || {})
         end
 
-        def existing_items
-          @existing_items ||= category["items"] || {}
+        def category
+          @category ||= store.categories[category_slug]
         end
       end
     end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class UpdateAwesomeAuthorizationGroup < Command
+        # Public: Initializes the command.
+        #
+        # form - The form object with the authorization group data
+        # authorization_group - The authorization group to update
+        def initialize(form, authorization_group)
+          @form = form
+          @authorization_group = authorization_group
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid, form.errors.full_messages.join("; ")) if form.invalid?
+
+          update_authorization_group!
+
+          broadcast(:ok, authorization_group)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        attr_reader :form, :authorization_group
+
+        def update_authorization_group!
+          authorization_group.update!(
+            name: form.name,
+            purpose: form.purpose
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class UpdateAwesomeAuthorizationProperties < Command
+        # Public: Initializes the command.
+        #
+        # form - A AwesomeAuthorizationPropertiesForm form
+        def initialize(form)
+          @form = form
+        end
+
+        attr_reader :form
+
+        def call
+          return broadcast(:invalid, form.errors.full_messages.join("; ")) if form.invalid?
+
+          config = Decidim::DecidimAwesome::AwesomeConfig.find_or_initialize_by(var: :awesome_authorization_handler, organization: form.current_organization)
+
+          if form.empty?
+            config.destroy! if config.persisted?
+          else
+            config.value = {
+              name: form.name,
+              explanation: form.explanation
+            }
+            config.save!
+          end
+
+          broadcast(:ok)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module Decidim
         def initialize(form, category_slug)
           @form = form
           @category_slug = category_slug
-          @config = AwesomeConfig.find_by(organization: form.current_organization, var: :cookie_management)
+          @config = AwesomeConfig.find_or_initialize_by(organization: form.current_organization, var: :cookie_management)
         end
 
         attr_reader :form, :category_slug, :config
@@ -25,7 +25,11 @@ module Decidim
         # Returns nothing.
         def call
           return broadcast(:invalid) if form.invalid?
-          return broadcast(:invalid) unless config&.value&.[](category_slug)
+
+          config.value ||= {}
+          return broadcast(:invalid) unless store.categories[category_slug]
+
+          config.value[category_slug] ||= { "slug" => category_slug, "items" => {} }
 
           config.value[category_slug]["items"] ||= {}
           # Handle slug change by deleting old key
@@ -39,6 +43,12 @@ module Decidim
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end
+
+        private
+
+        def store
+          @store ||= CookieManagementStore.new(form.current_organization, config.value)
+        end
       end
     end
   end

data/app/controllers/concerns/decidim/decidim_awesome/needs_thread_variables.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module NeedsThreadVariables
+      extend ActiveSupport::Concern
+
+      included do
+        around_action :with_thread_variables
+      end
+
+      private
+
+      def with_thread_variables
+        set_thread_variables
+        yield
+      ensure
+        clear_thread_variables
+      end
+
+      def set_thread_variables
+        return unless respond_to?(:current_organization)
+
+        config = Decidim::DecidimAwesome::AwesomeConfig.find_by(
+          organization: current_organization,
+          var: :awesome_authorization_handler
+        )
+        Thread.current[:awesome_authorization_handler] = config&.value
+      end
+
+      def clear_thread_variables
+        Thread.current[:awesome_authorization_handler] = nil
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class AwesomeAuthorizationPropertiesController < DecidimAwesome::Admin::ApplicationController
+        helper ConfigConstraintsHelpers
+
+        before_action do
+          enforce_permission_to :edit_config, :awesome_authorization_handler
+        end
+
+        def index
+          @form = form(AwesomeAuthorizationPropertiesForm).from_params(current_properties)
+        end
+
+        def create
+          @form = form(AwesomeAuthorizationPropertiesForm).from_params(params)
+
+          UpdateAwesomeAuthorizationProperties.call(@form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("awesome_authorization_properties.create.success", scope: "decidim.decidim_awesome.admin")
+              redirect_to decidim_admin_decidim_awesome.awesome_authorizations_path
+            end
+
+            on(:invalid) do |error|
+              flash.now[:alert] = I18n.t("awesome_authorization_properties.create.error", error:, scope: "decidim.decidim_awesome.admin")
+              render :index
+            end
+          end
+        end
+
+        private
+
+        def current_properties
+          value = AwesomeConfig.find_by(var: :awesome_authorization_handler, organization: current_organization)&.value
+          return {} unless value.is_a?(Hash)
+
+          value.slice("name", "explanation")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require "csv"
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class AwesomeAuthorizationUsersController < DecidimAwesome::Admin::ApplicationController
+        include Decidim::Admin::Filterable
+        helper ConfigConstraintsHelpers
+
+        before_action do
+          enforce_permission_to :edit_config, :awesome_authorization_handler
+        end
+
+        helper_method :authorization_group, :authorization_members
+
+        def index; end
+
+        def new
+          @form = form(AwesomeAuthorizationMembersForm).instance
+        end
+
+        def create
+          @form = form(AwesomeAuthorizationMembersForm).from_params(params, authorization_group:)
+
+          CreateAwesomeAuthorizationMembers.call(@form) do
+            on(:ok) do |created_count|
+              Decidim::DecidimAwesome::SyncAwesomeAuthorizationGroupJob.perform_later(authorization_group.id)
+              flash[:notice] = I18n.t("decidim.decidim_awesome.admin.awesome_authorization_users.create.success", count: created_count)
+              redirect_to decidim_admin_decidim_awesome.awesome_authorization_users_path(authorization_group)
+            end
+
+            on(:invalid) do |error|
+              flash.now[:alert] = I18n.t("decidim.decidim_awesome.admin.awesome_authorization_users.create.error", error: error)
+              render :new
+            end
+          end
+        end
+
+        def destroy
+          Decidim::DecidimAwesome::SyncAwesomeAuthorizationGroupJob.perform_later(authorization_group.id)
+          authorization_group.members.find(params[:id]).destroy!
+          flash[:notice] = I18n.t("decidim.decidim_awesome.admin.awesome_authorization_users.destroy.success")
+          redirect_to decidim_admin_decidim_awesome.awesome_authorization_users_path(authorization_group)
+        end
+
+        private
+
+        def base_query
+          authorization_group.members.order(:email)
+        end
+
+        def authorization_group
+          @authorization_group ||= current_organization.awesome_authorization_groups.find(params[:awesome_authorization_id])
+        end
+
+        def authorization_members
+          @authorization_members ||= paginate(base_query)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class AwesomeAuthorizationsController < DecidimAwesome::Admin::ApplicationController
+        helper ConfigConstraintsHelpers
+        helper_method :available?, :authorization_groups
+
+        before_action do
+          enforce_permission_to :edit_config, :awesome_authorization_handler
+        end
+
+        def index; end
+
+        def edit
+          @form = form(AwesomeAuthorizationGroupForm).from_model(authorization_group)
+        end
+
+        def new
+          @form = form(AwesomeAuthorizationGroupForm).instance
+        end
+
+        def create
+          @form = form(AwesomeAuthorizationGroupForm).from_params(params)
+
+          CreateAwesomeAuthorizationGroup.call(@form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("decidim.decidim_awesome.admin.awesome_authorizations.create.success")
+              redirect_to decidim_admin_decidim_awesome.awesome_authorizations_path
+            end
+
+            on(:invalid) do |error|
+              flash.now[:alert] = I18n.t("decidim.decidim_awesome.admin.awesome_authorizations.create.error", error:)
+              render :new
+            end
+          end
+        end
+
+        def update
+          @form = form(AwesomeAuthorizationGroupForm).from_params(params)
+
+          UpdateAwesomeAuthorizationGroup.call(@form, authorization_group) do
+            on(:ok) do
+              flash[:notice] = I18n.t("decidim.decidim_awesome.admin.awesome_authorizations.update.success")
+              redirect_to decidim_admin_decidim_awesome.awesome_authorizations_path
+            end
+
+            on(:invalid) do |error|
+              flash.now[:alert] = I18n.t("decidim.decidim_awesome.admin.awesome_authorizations.update.error", error:)
+              render :edit
+            end
+          end
+        end
+
+        def destroy
+          users_to_sync = authorization_group.granted_in_group.to_a
+
+          authorization_group.destroy!
+          users_to_sync.each do |user|
+            Decidim::DecidimAwesome::SyncAwesomeAuthorizationUserJob.perform_later(user.id)
+          end
+
+          flash[:notice] = I18n.t("decidim.decidim_awesome.admin.awesome_authorizations.destroy.success")
+          redirect_to decidim_admin_decidim_awesome.awesome_authorizations_path
+        end
+
+        def sync
+          Decidim::DecidimAwesome::SyncAwesomeAuthorizationGroupJob.perform_later(authorization_group.id)
+          flash[:notice] = I18n.t("decidim.decidim_awesome.admin.awesome_authorizations.sync.success")
+          redirect_to decidim_admin_decidim_awesome.awesome_authorizations_path
+        end
+
+        private
+
+        def available?
+          @available ||= current_organization.available_authorizations.include?("awesome_authorization_handler")
+        end
+
+        def authorization_groups
+          @authorization_groups ||= current_organization.awesome_authorization_groups
+        end
+
+        def authorization_group
+          @authorization_group ||= authorization_groups.find(params[:id])
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/decidim_awesome/admin/authorization_group_form.rb

@@ -7,7 +7,7 @@ module Decidim
         include TranslatableAttributes
 
         attribute :authorization_handlers, { String => Object }
-        attribute :authorization_handlers_names, Array[String]
+        attribute :authorization_handlers_names, [String]
         attribute :authorization_handlers_options, { String => Object }
         translatable_attribute :force_authorization_help_text, String, default: {}