decidim-admin 0.29.2 → 0.30.0.rc2

data/app/controllers/decidim/admin/newsletters_controller.rb

@@ -7,7 +7,7 @@ module Decidim
       include Decidim::NewslettersHelper
       include Decidim::Admin::NewslettersHelper
       include Paginable
-      helper_method :newsletter, :recipients_count_query, :content_block
+      helper_method :newsletter, :recipients_count_query, :content_block, :selected_options, :newsletter_params
 
       def index
         enforce_permission_to :index, :newsletter
@@ -103,20 +103,22 @@ module Decidim
 
       def select_recipients_to_deliver
         enforce_permission_to(:update, :newsletter, newsletter:)
-        @form = form(SelectiveNewsletterForm).from_model(newsletter)
-        @form.send_to_all_users = current_user.admin?
+
+        @form = if newsletter_params.present?
+                  form(SelectiveNewsletterForm).from_params(newsletter_params)
+                else
+                  form(SelectiveNewsletterForm).from_model(newsletter)
+                end
       end
 
       def recipients_count
-        data = params.permit(newsletter: {}).to_h[:newsletter]
-
-        @form = form(SelectiveNewsletterForm).from_params(data)
+        @form = form(SelectiveNewsletterForm).from_params(newsletter_params)
         render plain: recipients_count_query
       end
 
       def deliver
         enforce_permission_to(:update, :newsletter, newsletter:)
-        @form = form(SelectiveNewsletterForm).from_params(params)
+        @form = form(SelectiveNewsletterForm).from_params(newsletter_params)
 
         DeliverNewsletter.call(newsletter, @form) do
           on(:ok) do
@@ -136,8 +138,49 @@ module Decidim
         end
       end
 
+      def confirm_recipients
+        enforce_permission_to(:update, :newsletter, newsletter:)
+        @form = form(SelectiveNewsletterForm).from_params(newsletter_params)
+        @recipients = NewsletterRecipients.for(@form).order(:email)
+        @recipients = paginate(@recipients)
+
+        render :confirm_recipients
+      end
+
       private
 
+      def newsletter_params
+        params.fetch(:newsletter, {}).permit(
+          :send_to_all_users,
+          :send_to_verified_users,
+          :send_to_followers,
+          :send_to_participants,
+          :send_to_private_members,
+          verification_types: [],
+          participatory_space_types: {
+            assemblies: [:manifest_name, { ids: [] }],
+            conferences: [:manifest_name, { ids: [] }],
+            initiatives: [:manifest_name, { ids: [] }],
+            participatory_processes: [:manifest_name, { ids: [] }]
+          }
+        )
+      end
+
+      def selected_options(key)
+        @selected_options ||= {}
+        @selected_options[key] ||= extract_selected_ids(params[:newsletter], key)
+      end
+
+      def extract_selected_ids(newsletter_params, key)
+        return {} unless newsletter_params.present? && newsletter_params[key].present?
+
+        if newsletter_params[key].is_a?(Array)
+          { key => newsletter_params[key].map(&:to_s) }
+        else
+          (newsletter_params[key] || {}).transform_values { |space| space["ids"] || [] }
+        end
+      end
+
       def collection
         @collection ||= Newsletter.where(organization: current_organization)
       end

data/app/controllers/decidim/admin/resource_permissions_controller.rb

@@ -87,7 +87,7 @@ module Decidim
       end
 
       def permissions
-        @permissions ||= (resource&.permissions || {})
+        @permissions ||= resource&.permissions || {}
       end
 
       def authorizations_for(action)

data/app/controllers/decidim/admin/scopes_controller.rb

@@ -6,6 +6,7 @@ module Decidim
     #
     class ScopesController < Decidim::Admin::ApplicationController
       include Decidim::Admin::Concerns::HasTabbedMenu
+      helper Decidim::Admin::ScopesHelper
 
       layout "decidim/admin/settings"
 

data/app/controllers/decidim/admin/share_tokens_controller.rb

@@ -2,11 +2,66 @@
 
 module Decidim
   module Admin
+    # This is an abstract controller allows sharing unpublished things.
+    # Final implementation must inherit from this controller and implement the `resource` method.
     class ShareTokensController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::Filterable
+
+      helper_method :current_token, :resource, :resource_title, :share_tokens_path
+
+      def index
+        enforce_permission_to :read, :share_tokens
+        @share_tokens = filtered_collection
+      end
+
+      def new
+        enforce_permission_to :create, :share_tokens
+        @form = form(ShareTokenForm).instance
+      end
+
+      def create
+        enforce_permission_to :create, :share_tokens
+        @form = form(ShareTokenForm).from_params(params, resource:)
+
+        CreateShareToken.call(@form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("share_tokens.create.success", scope: "decidim.admin")
+            redirect_to share_tokens_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("share_tokens.create.invalid", scope: "decidim.admin")
+            render action: "new"
+          end
+        end
+      end
+
+      def edit
+        enforce_permission_to(:update, :share_tokens, share_token: current_token)
+        @form = form(ShareTokenForm).from_model(current_token)
+      end
+
+      def update
+        enforce_permission_to(:update, :share_tokens, share_token: current_token)
+        @form = form(ShareTokenForm).from_params(params, resource:)
+
+        UpdateShareToken.call(@form, current_token) do
+          on(:ok) do
+            flash[:notice] = I18n.t("share_tokens.update.success", scope: "decidim.admin")
+            redirect_to share_tokens_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("share_tokens.update.error", scope: "decidim.admin")
+            render :edit
+          end
+        end
+      end
+
       def destroy
-        enforce_permission_to(:destroy, :share_token, share_token:)
+        enforce_permission_to(:destroy, :share_tokens, share_token: current_token)
 
-        Decidim::Commands::DestroyResource.call(share_token, current_user) do
+        DestroyShareToken.call(current_token, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("share_tokens.destroy.success", scope: "decidim.admin")
           end
@@ -15,15 +70,62 @@ module Decidim
           end
         end
 
-        redirect_back(fallback_location: root_path)
+        redirect_to share_tokens_path
       end
 
       private
 
-      def share_token
-        @share_token ||= Decidim::ShareToken.where(
-          organization: current_organization
-        ).find(params[:id])
+      # override this method in the destination controller to specify the resource associated with the shared token (ie: a component)
+      def resource
+        raise NotImplementedError
+      end
+
+      # Override also this method if resource does not respond to a translatable name or title
+      def resource_title
+        translated_attribute(resource.try(:name) || resource.title)
+      end
+
+      # sets the prefix for the route helper methods (this may vary depending on the resource type)
+      # This setup works fine for participatory spaces and components, override if needed
+      def route_name
+        @route_name ||= "#{resource.manifest.route_name}_"
+      end
+
+      def route_proxy
+        @route_proxy ||= EngineRouter.admin_proxy(resource.try(:participatory_space) || resource)
+      end
+
+      # returns the proper path for managing a share token according to the resource
+      # this works fine for components and participatory spaces, override if needed
+      def share_tokens_path(method = :index, options = {})
+        args = resource.is_a?(Decidim::Component) ? [resource, options] : [options]
+
+        case method
+        when :index, :create
+          route_proxy.send("#{route_name}share_tokens_path", *args)
+        when :new
+          route_proxy.send("new_#{route_name}share_token_path", *args)
+        when :update, :destroy
+          route_proxy.send("#{route_name}share_token_path", *args)
+        when :edit
+          route_proxy.send("edit_#{route_name}share_token_path", *args)
+        end
+      end
+
+      def base_query
+        collection
+      end
+
+      def collection
+        @collection ||= Decidim::ShareToken.where(organization: current_organization, token_for: resource)
+      end
+
+      def filters
+        []
+      end
+
+      def current_token
+        @current_token ||= collection.find(params[:id])
       end
     end
   end

data/app/controllers/decidim/admin/taxonomies_controller.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class TaxonomiesController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::Taxonomies::Filterable
+
+      layout "decidim/admin/settings"
+
+      before_action :set_taxonomies_breadcrumb_item
+      before_action only: :edit do
+        redirect_to edit_taxonomy_path(taxonomy.parent) unless taxonomy && taxonomy.root?
+      end
+
+      helper_method :collection, :parent_options, :taxonomy
+
+      def index
+        enforce_permission_to :index, :taxonomy
+        @taxonomies = filtered_collection
+      end
+
+      def new
+        enforce_permission_to :create, :taxonomy
+        add_breadcrumb_item :new, decidim_admin.new_taxonomy_path
+
+        @form = form(Decidim::Admin::TaxonomyForm).instance
+      end
+
+      def create
+        enforce_permission_to :create, :taxonomy
+        add_breadcrumb_item :new, decidim_admin.new_taxonomy_path
+
+        @form = form(Decidim::Admin::TaxonomyForm).from_params(params)
+        CreateTaxonomy.call(@form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("create.success", scope: "decidim.admin.taxonomies")
+            redirect_to taxonomies_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("create.invalid", scope: "decidim.admin.taxonomies")
+            render action: "new"
+          end
+        end
+      end
+
+      def edit
+        enforce_permission_to(:update, :taxonomy, taxonomy:)
+        add_breadcrumb_item :edit, decidim_admin.edit_taxonomy_path(taxonomy)
+
+        @form = form(Decidim::Admin::TaxonomyForm).from_model(taxonomy)
+        @taxonomies = filtered_collection
+      end
+
+      def update
+        enforce_permission_to(:update, :taxonomy, taxonomy:)
+        add_breadcrumb_item :edit, decidim_admin.edit_taxonomy_path(taxonomy)
+
+        @form = form(Decidim::Admin::TaxonomyForm).from_params(params)
+
+        UpdateTaxonomy.call(@form, taxonomy) do
+          on(:ok) do
+            flash[:notice] = I18n.t("update.success", scope: "decidim.admin.taxonomies")
+            redirect_to taxonomies_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("update.invalid", scope: "decidim.admin.taxonomies")
+            render action: "edit"
+          end
+        end
+      end
+
+      def destroy
+        enforce_permission_to(:destroy, :taxonomy, taxonomy:)
+
+        DestroyTaxonomy.call(taxonomy, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("destroy.success", scope: "decidim.admin.taxonomies")
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("destroy.invalid", scope: "decidim.admin.taxonomies")
+          end
+        end
+        redirect_back(fallback_location: taxonomies_path)
+      end
+
+      def reorder
+        enforce_permission_to :update, :taxonomy
+
+        ReorderTaxonomies.call(current_organization, params[:ids_order], page_offset) do
+          on(:ok) do
+            head :ok
+          end
+
+          on(:invalid) do
+            head :bad_request
+          end
+        end
+      end
+
+      private
+
+      def collection
+        @collection ||= taxonomy ? taxonomy.children : root_taxonomies
+      end
+
+      def root_taxonomies
+        @root_taxonomies ||= current_organization.taxonomies.roots
+      end
+
+      def taxonomy
+        @taxonomy ||= current_organization.taxonomies.find_by(id: params[:id])
+      end
+
+      def set_taxonomies_breadcrumb_item
+        add_breadcrumb_item I18n.t("menu.taxonomies", scope: "decidim.admin"), decidim_admin.taxonomies_path
+      end
+
+      def add_breadcrumb_item(key, url)
+        controller_breadcrumb_items << {
+          label: I18n.t(key, scope: "decidim.admin.taxonomies.breadcrumb", default: key),
+          url:
+        }
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/taxonomy_filters_controller.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class TaxonomyFiltersController < Decidim::Admin::ApplicationController
+      include Decidim::Admin::Taxonomies::Filterable
+
+      layout "decidim/admin/settings"
+
+      before_action :set_taxonomies_breadcrumb_item
+      before_action only: :edit do
+        redirect_to taxonomy_filters_path(root_taxonomy) unless taxonomy_filter && root_taxonomy == taxonomy_filter.root_taxonomy
+      end
+
+      helper_method :collection, :root_taxonomy, :taxonomy_filter
+
+      # Returns non-layout views of for use in selecting filters for components or other places using a drawer.
+      def show
+        enforce_permission_to :show, :taxonomy_filter
+      end
+
+      def index
+        enforce_permission_to :index, :taxonomy_filter
+      end
+
+      def new
+        enforce_permission_to :create, :taxonomy_filter
+        add_breadcrumb_item :new, decidim_admin.new_taxonomy_filter_path
+        @form = form(Decidim::Admin::TaxonomyFilterForm).from_params(root_taxonomy_id: params[:taxonomy_id])
+      end
+
+      def create
+        enforce_permission_to :create, :taxonomy_filter
+        add_breadcrumb_item :new, decidim_admin.new_taxonomy_filter_path
+        @form = form(Decidim::Admin::TaxonomyFilterForm).from_params(params)
+        CreateTaxonomyFilter.call(@form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("create.success", scope: "decidim.admin.taxonomy_filters")
+            redirect_to decidim_admin.taxonomy_filters_path(root_taxonomy)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("create.error", scope: "decidim.admin.taxonomy_filters")
+            render :new
+          end
+        end
+      end
+
+      def edit
+        enforce_permission_to(:update, :taxonomy_filter, taxonomy_filter:)
+        add_breadcrumb_item :edit, decidim_admin.edit_taxonomy_filter_path
+        @form = form(Decidim::Admin::TaxonomyFilterForm).from_model(taxonomy_filter)
+      end
+
+      def update
+        enforce_permission_to(:update, :taxonomy_filter, taxonomy_filter:)
+        add_breadcrumb_item :edit, decidim_admin.edit_taxonomy_filter_path
+        @form = form(Decidim::Admin::TaxonomyFilterForm).from_params(params)
+        UpdateTaxonomyFilter.call(@form, taxonomy_filter) do
+          on(:ok) do
+            flash[:notice] = I18n.t("update.success", scope: "decidim.admin.taxonomy_filters")
+            redirect_to decidim_admin.taxonomy_filters_path(root_taxonomy)
+          end
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("update.error", scope: "decidim.admin.taxonomy_filters")
+            render :edit
+          end
+        end
+      end
+
+      def destroy
+        enforce_permission_to(:destroy, :taxonomy_filter, taxonomy_filter:)
+        DestroyTaxonomyFilter.call(taxonomy_filter, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("destroy.success", scope: "decidim.admin.taxonomy_filters")
+          end
+          on(:invalid) do
+            flash[:alert] = I18n.t("destroy.error", scope: "decidim.admin.taxonomy_filters")
+          end
+        end
+        redirect_back(fallback_location: decidim_admin.taxonomy_filters_path(root_taxonomy))
+      end
+
+      private
+
+      def collection
+        @collection ||= root_taxonomy.taxonomy_filters
+      end
+
+      def root_taxonomy
+        @root_taxonomy ||= Taxonomy.roots.find(params[:taxonomy_id])
+      end
+
+      def taxonomy_filter
+        @taxonomy_filter ||= TaxonomyFilter.find_by(id: params[:id])
+      end
+
+      def set_taxonomies_breadcrumb_item
+        add_breadcrumb_item I18n.t("menu.taxonomies", scope: "decidim.admin"), decidim_admin.taxonomies_path
+        add_breadcrumb_item root_taxonomy.name, decidim_admin.taxonomy_filters_path(root_taxonomy)
+        add_breadcrumb_item :filters, decidim_admin.taxonomy_filters_path(root_taxonomy)
+      end
+
+      def add_breadcrumb_item(key, url)
+        controller_breadcrumb_items << {
+          label: I18n.t(key, scope: "decidim.admin.taxonomy_filters.breadcrumb", default: key),
+          url:
+        }
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/taxonomy_filters_selector_controller.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class TaxonomyFiltersSelectorController < Decidim::Admin::ApplicationController
+      layout "decidim/admin/taxonomy_filters_selector"
+
+      helper_method :root_taxonomy, :taxonomy_filter, :component, :field_name
+
+      # ensure component is valid
+      before_action do
+        raise Decidim::ActionForbidden unless component && component.organization == current_organization
+      end
+
+      before_action except: :index do
+        redirect_to taxonomy_filters_selector_index_path(component_id: params[:component_id]) if root_taxonomy.nil?
+      end
+
+      before_action except: [:index, :new, :destroy] do
+        redirect_to new_taxonomy_filters_selector_path(component_id: params[:component_id], taxonomy_id: params[:taxonomy_id]) if taxonomy_filter.nil?
+      end
+
+      # Renders "choose the taxonomy" step
+      def index
+        enforce_permission_to :index, :taxonomy_filter
+      end
+
+      # Renders "choose the taxonomy filter" step
+      def new
+        enforce_permission_to :create, :taxonomy_filter
+      end
+
+      # Updates the component with the selected taxonomy filter
+      def create
+        enforce_permission_to :create, :taxonomy_filter
+
+        update_filters!(component.settings.taxonomy_filters + [taxonomy_filter.id.to_s])
+
+        render partial: "decidim/admin/taxonomy_filters_selector/component_table"
+      end
+
+      # Renders the component with the selected taxonomy filter
+      def show
+        enforce_permission_to :show, :taxonomy_filter
+      end
+
+      # Removes the selected taxonomy filter from the component
+      def destroy
+        enforce_permission_to :destroy, :taxonomy_filter
+
+        update_filters!(component.settings.taxonomy_filters - [taxonomy_filter.id.to_s]) if taxonomy_filter
+
+        render partial: "decidim/admin/taxonomy_filters_selector/component_table"
+      end
+
+      private
+
+      def update_filters!(filter_ids)
+        Decidim.traceability.perform_action!("update_filters", component, current_user) do
+          component.update!(settings: { taxonomy_filters: filter_ids.map(&:to_s).uniq })
+        end
+      end
+
+      def field_name
+        "component[settings][taxonomy_filters][]"
+      end
+
+      def component
+        @component ||= Component.find_by(id: params[:component_id])
+      end
+
+      def root_taxonomy
+        @root_taxonomy ||= current_organization.taxonomies.roots.find_by(id: params[:taxonomy_id])
+      end
+
+      def taxonomy_filter
+        @taxonomy_filter ||= root_taxonomy.taxonomy_filters.find_by(id: params[:taxonomy_filter_id])
+      end
+    end
+  end
+end

data/app/controllers/decidim/admin/taxonomy_items_controller.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class TaxonomyItemsController < Decidim::Admin::ApplicationController
+      layout false
+
+      helper_method :taxonomy, :taxonomy_item, :parent_options, :selected_parent_id
+      before_action do
+        if taxonomy_item && taxonomy_item.parent_ids.exclude?(taxonomy.id)
+          flash[:alert] = I18n.t("update.invalid", scope: "decidim.admin.taxonomies")
+          render plain: I18n.t("update.invalid", scope: "decidim.admin.taxonomies"), status: :unprocessable_entity
+        end
+      end
+
+      def new
+        enforce_permission_to :create, :taxonomy_item
+        @form = form(Decidim::Admin::TaxonomyItemForm).instance
+      end
+
+      def create
+        enforce_permission_to :create, :taxonomy_item
+        @form = form(Decidim::Admin::TaxonomyItemForm).from_params(params)
+        CreateTaxonomy.call(@form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("create.success", scope: "decidim.admin.taxonomies")
+            redirect_to edit_taxonomy_path(taxonomy)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("create.invalid", scope: "decidim.admin.taxonomies")
+            render action: "new"
+          end
+        end
+      end
+
+      def edit
+        enforce_permission_to :update, :taxonomy_item, taxonomy: taxonomy_item
+        @form = form(Decidim::Admin::TaxonomyItemForm).from_model(taxonomy_item)
+      end
+
+      def update
+        enforce_permission_to :update, :taxonomy_item, taxonomy: taxonomy_item
+        @form = form(Decidim::Admin::TaxonomyItemForm).from_params(params)
+        UpdateTaxonomy.call(@form, taxonomy_item) do
+          on(:ok) do
+            flash[:notice] = I18n.t("update.success", scope: "decidim.admin.taxonomies")
+            redirect_to edit_taxonomy_path(taxonomy)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("update.invalid", scope: "decidim.admin.taxonomies")
+            render action: "edit"
+          end
+        end
+      end
+
+      private
+
+      def taxonomy
+        @taxonomy ||= Decidim::Taxonomy.find_by(organization: current_organization, id: params[:taxonomy_id])
+      end
+
+      def taxonomy_item
+        @taxonomy_item ||= Decidim::Taxonomy.find_by(organization: current_organization, id: params[:id])
+      end
+
+      def selected_parent_id
+        @selected_parent_id ||= taxonomy_item&.parent_id || taxonomy.id
+      end
+
+      def parent_options
+        @parent_options ||= begin
+          options = [[I18n.t("new.none", scope: "decidim.admin.taxonomy_items"), taxonomy.id]]
+          taxonomy.children.each do |child|
+            next if child.id == taxonomy_item&.id
+
+            options << [translated_attribute(child.name).to_s, child.id]
+            # add children to the list with indentation
+            child.children.each do |grandchild|
+              next if grandchild.id == taxonomy_item&.id
+
+              options << ["&nbsp;&nbsp;&nbsp;#{translated_attribute(grandchild.name)}".html_safe, grandchild.id]
+            end
+          end
+          options
+        end
+      end
+    end
+  end
+end