decidim-admin 0.20.0 → 0.23.1.rc1

data/app/commands/decidim/admin/update_newsletter.rb

@@ -11,25 +11,47 @@ module Decidim
       # user       - The user that updates the newsletter.
       def initialize(newsletter, form, user)
         @newsletter = newsletter
+        @content_block = newsletter.template
         @form = form
         @user = user
         @organization = user.organization
       end
 
       def call
-        return broadcast(:invalid) unless @form.valid?
-        return broadcast(:invalid) if @newsletter.sent?
-        return broadcast(:invalid) unless @organization == @newsletter.organization
+        return broadcast(:invalid) unless form.valid?
+        return broadcast(:invalid) if newsletter.sent?
+        return broadcast(:invalid) unless organization == newsletter.organization
 
+        transaction do
+          update_newsletter
+          update_content_block
+        end
+
+        broadcast(:ok, newsletter)
+      end
+
+      private
+
+      attr_reader :user, :newsletter, :content_block, :organization, :form
+
+      def update_newsletter
         @newsletter = Decidim.traceability.update!(
-          @newsletter,
-          @user,
-          subject: @form.subject,
-          body: @form.body,
-          author: @user
+          newsletter,
+          user,
+          subject: form.subject,
+          author: user
         )
+      end
 
-        broadcast(:ok, @newsletter)
+      def update_content_block
+        UpdateContentBlock.call(form, content_block, user) do
+          on(:ok) do |content_block|
+            @content_block = content_block
+          end
+          on(:invalid) do
+            raise "There was a problem persisting the changes to the content block"
+          end
+        end
       end
     end
   end

data/app/commands/decidim/admin/update_organization.rb

@@ -45,14 +45,20 @@ module Decidim
           name: form.name,
           default_locale: form.default_locale,
           reference_prefix: form.reference_prefix,
+          time_zone: form.time_zone,
           twitter_handler: form.twitter_handler,
           facebook_handler: form.facebook_handler,
           instagram_handler: form.instagram_handler,
           youtube_handler: form.youtube_handler,
           github_handler: form.github_handler,
           badges_enabled: form.badges_enabled,
-          user_groups_enabled: form.user_groups_enabled
+          user_groups_enabled: form.user_groups_enabled,
+          comments_max_length: form.comments_max_length,
+          enable_machine_translations: form.enable_machine_translations,
+          admin_terms_of_use_body: form.admin_terms_of_use_body,
+          rich_text_editor_in_public_views: form.rich_text_editor_in_public_views
         }.merge(welcome_notification_attributes)
+          .merge(machine_translation_attributes || {})
       end
 
       def welcome_notification_attributes
@@ -62,6 +68,14 @@ module Decidim
           welcome_notification_body: form.customize_welcome_notification ? form.welcome_notification_body : nil
         }
       end
+
+      def machine_translation_attributes
+        return unless Decidim.config.enable_machine_translations
+
+        {
+          machine_translation_display_priority: form.machine_translation_display_priority
+        }
+      end
     end
   end
 end

data/app/commands/decidim/admin/update_organization_appearance.rb

@@ -102,7 +102,9 @@ module Decidim
             secondary: form.secondary_color,
             success: form.success_color,
             warning: form.warning_color,
-            alert: form.alert_color
+            alert: form.alert_color,
+            highlight: form.highlight_color,
+            "highlight-alternative": form.highlight_alternative_color
           }
         }
       end

data/app/controllers/concerns/decidim/admin/filterable.rb

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    # Common logic to filter admin resources.
+    module Filterable
+      extend ActiveSupport::Concern
+
+      included do
+        include Decidim::Admin::Paginable
+        include Decidim::TranslatableAttributes
+
+        helper Decidim::Admin::FilterableHelper
+
+        helper_method :collection_name,
+                      :extra_allowed_params,
+                      :extra_filters,
+                      :filters,
+                      :filters_with_values,
+                      :find_dynamic_translation,
+                      :query,
+                      :query_params,
+                      :query_params_with,
+                      :query_params_without,
+                      :ransack_params,
+                      :search_field_predicate
+
+        delegate :categories, to: :current_component
+        delegate :scopes, to: :current_organization
+
+        def query
+          @query ||= base_query.ransack(ransack_params)
+        end
+
+        private
+
+        def filtered_collection
+          paginate(query.result)
+        end
+
+        def base_query
+          raise NotImplementedError, "A base query is needed to filter admin resources"
+        end
+
+        def query_params
+          params.permit(*allowed_query_params).to_h.deep_symbolize_keys
+        end
+
+        def allowed_query_params
+          [*extra_allowed_params, q: {}]
+        end
+
+        # Non ransack params (outside :q) to be allowed in the query links.
+        # Also, used in FilterableHelper#applied_filters_hidden_field_tags
+        # to ensure that these params are kept in the search_form_for.
+        def extra_allowed_params
+          [:per_page]
+        end
+
+        def ransack_params
+          query_params[:q] || {}
+        end
+
+        # For injecting ransack params while keeping query params in links.
+        def query_params_with(hash)
+          query_params.merge(q: ransack_params.merge(hash))
+        end
+
+        # For rejecting ransack params while keeping query params in links.
+        def query_params_without(*filters)
+          query_params.merge(q: ransack_params.except(*filters))
+        end
+
+        # Ransack predicate to use in the search_form_for.
+        def search_field_predicate
+          :title_cont
+        end
+
+        # Informs which filters are being used IN the dropdown.
+        # Array<Symbol> of ransack params (inside :q) keys used in:
+        # - FilterableHelper#applied_filters_tags
+        # To build the tags that inform which filters are being applied and
+        # that allow to discard them.
+        # - FilterableHelper#applied_filters_hidden_field_tags
+        # To ensure that filters are kept in the search_form_for.
+        def filters
+          [:private_space_eq, :published_at_null]
+        end
+
+        # Informs which filters are being used OUTSIDE the dropdown.
+        # Optional Array<Symbol> of ransack params (inside :q) keys
+        # used in FilterableHelper#applied_filters_hidden_field_tags
+        # to ensure that these filters are kept in the search_form_for.
+        def extra_filters
+          []
+        end
+
+        # A Hash of filters as Symbol and its options as Array or Hash.
+        # Needed to build the tree of links used to build the dropdown submenu.
+        # Array values are used to build simple dropdown submenus with one level.
+        # Hash values are used to build nested dropdown submenus with many levels.
+        # By default, uses the Symbols in `filters` as keys and injects an Array
+        # with true and false as values. If these values fit your filtering needs,
+        # you won't have to declare a `filters_with_values` method in your concern.
+        def filters_with_values
+          filters.each_with_object({}) do |filter, hash|
+            hash[filter] = [true, false]
+          end
+        end
+
+        # Plural model name. Used in search_field placeholder.
+        def collection_name
+          query.klass.model_name.human(count: 2)
+        end
+
+        # A tree of Category IDs. Leaves are `nil`.
+        def category_ids_hash(categories)
+          categories.each_with_object({}) do |category, hash|
+            hash[category.id] = category.subcategories.any? ? category_ids_hash(category.subcategories) : nil
+          end
+        end
+
+        # A tree of Scope IDs. Leaves are `nil`.
+        def scope_ids_hash(scopes)
+          scopes.each_with_object({}) do |scope, hash|
+            hash[scope.id] = scope.children.any? ? scope_ids_hash(scope.children) : nil
+          end
+        end
+
+        # Array<Symbol> of filters that implement a method to find translations.
+        # Useful when translations cannot be found in i18n or come from a Model.
+        def dynamically_translated_filters
+          [:scope_id_eq, :category_id_eq]
+        end
+
+        def find_dynamic_translation(filter, value)
+          send("translated_#{filter}", value) if filter.in?(dynamically_translated_filters)
+        end
+
+        def translated_scope_id_eq(id)
+          translated_attribute(scopes.find_by(id: id).name)
+        end
+
+        def translated_category_id_eq(id)
+          translated_attribute(categories.find_by(id: id).name)
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/admin/officializations/filterable.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module Officializations
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def search_field_predicate
+            :name_or_nickname_or_email_cont
+          end
+
+          def filters
+            [:officialized_at_null]
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/admin/paginable.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Admin
+    module Paginable
+      # Common logic to paginate admin resources
+      extend ActiveSupport::Concern
+
+      included do
+        include Decidim::Paginable
+
+        def per_page
+          params[:per_page].present? ? params[:per_page].to_i : Decidim::Admin.per_page_range.first
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/admin/participatory_space_export.rb

@@ -11,19 +11,25 @@ module Decidim
         def create
           enforce_permission_to :create, :export_space, participatory_space: exportable_space
 
-          ExportParticipatorySpaceJob.perform_later(current_user, exportable_space, "participatory_processes", default_format)
+          ExportParticipatorySpaceJob.perform_later(current_user, exportable_space, manifest_name, default_format)
 
           flash[:notice] = t("decidim.admin.exports.notice")
 
           redirect_back(fallback_location: after_export_path)
         end
 
-        # Public: The only method to be implemented at the controller. You need to
+        # Public: To be implemented at the controller. You need to
         # return the space that will be exported.
         def exportable_space
           raise NotImplementedError
         end
 
+        # Public: To be implemented at the controller. You need to
+        # return the plural of the name of the space that will be exported.
+        def manifest_name
+          raise NotImplementedError
+        end
+
         # Public: Returns a String or Object that will be passed to `redirect_to` after
         # exporing a space. By default it redirects to the root_path.
         #

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # The controller to handle the Admin
+    # Terms of use agreement.
+    class AdminTermsController < Decidim::Admin::ApplicationController
+      def accept
+        current_user.admin_terms_accepted_at = Time.current
+        if current_user.save!
+          flash[:notice] = t("accept.success", scope: "decidim.admin.admin_terms_of_use")
+          redirect_to decidim_admin.root_path
+        else
+          flash[:alert] = t("accept.error", scope: "decidim.admin.admin_terms_of_use")
+          redirect_to decidim_admin.admin_terms_show_path
+        end
+      end
+    end
+  end
+end

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

@@ -6,8 +6,10 @@ module Decidim
     class ApplicationController < ::DecidimController
       include NeedsOrganization
       include NeedsPermission
+      include NeedsSnippets
       include FormFactory
       include LocaleSwitcher
+      include UseOrganizationTimeZone
       include PayloadInfo
       include HttpCachingDisabler
 
@@ -17,6 +19,7 @@ module Decidim
       helper Decidim::Admin::IconLinkHelper
       helper Decidim::Admin::MenuHelper
       helper Decidim::Admin::ScopesHelper
+      helper Decidim::Admin::Paginable::PerPageHelper
       helper Decidim::DecidimFormHelper
       helper Decidim::ReplaceButtonsHelper
       helper Decidim::ScopesHelper

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

@@ -9,6 +9,12 @@ module Decidim
         enforce_permission_to :index, :authorization_workflow
 
         @workflows = Decidim::Verifications.admin_workflows
+
+        # Decidim::Verifications::Authorizations Query
+        @authorizations = Decidim::Verifications::Authorizations.new(
+          organization: current_organization,
+          granted: true
+        ).query
       end
     end
   end

data/app/controllers/decidim/admin/components/base_controller.rb

@@ -22,7 +22,7 @@ module Decidim
                       :parent_path
 
         before_action except: [:index, :show] do
-          enforce_permission_to :manage, :component, component: current_component
+          enforce_permission_to :manage, :component, component: current_component unless skip_manage_component_permission
         end
 
         before_action on: [:index, :show] do
@@ -59,6 +59,10 @@ module Decidim
         def parent_path
           @parent_path ||= ::Decidim::EngineRouter.admin_proxy(current_participatory_space).components_path
         end
+
+        def skip_manage_component_permission
+          false
+        end
       end
     end
   end

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

@@ -20,14 +20,17 @@ module Decidim
         @component = Component.new(
           name: default_name(manifest),
           manifest_name: params[:type],
-          participatory_space: current_participatory_space
+          participatory_space: current_participatory_space,
+          settings: {
+            scope_id: current_participatory_space.scope.try(:id)
+          }
         )
 
-        @form = form(ComponentForm).from_model(@component)
+        @form = form(@component.form_class).from_model(@component)
       end
 
       def create
-        @form = form(ComponentForm).from_params(form_params)
+        @form = form(manifest.component_form_class).from_params(component_params)
         enforce_permission_to :create, :component
 
         CreateComponent.call(@form) do
@@ -47,12 +50,12 @@ module Decidim
         @component = query_scope.find(params[:id])
         enforce_permission_to :update, :component, component: @component
 
-        @form = form(ComponentForm).from_model(@component)
+        @form = form(@component.form_class).from_model(@component)
       end
 
       def update
         @component = query_scope.find(params[:id])
-        @form = form(ComponentForm).from_params(form_params)
+        @form = form(@component.form_class).from_params(component_params)
         enforce_permission_to :update, :component, component: @component
 
         UpdateComponent.call(@form, @component) do
@@ -111,30 +114,34 @@ module Decidim
         end
       end
 
-      private
+      def share
+        @component = query_scope.find(params[:id])
+        share_token = @component.share_tokens.create!(user: current_user, organization: current_organization)
 
-      # Returns a Class with the attributes sanitized, coerced  and filtered
-      # to the right type. See Decidim::SettingsManifest#schema.
-      def new_settings_schema(name, data)
-        manifest.settings(name).schema.new(data, current_organization.default_locale)
+        redirect_to share_token.url
       end
 
-      # Processes the component params so Decidim::Admin::ComponentForm
+      private
+
+      # Processes the component params so the form object defined in the manifest (component_form_class_name)
       # can assign and validate the attributes when using #from_params.
-      def form_params
-        form_params = params[:component].permit!
-        form_params[:id] = params[:id]
-        form_params[:manifest] = manifest
-        form_params[:participatory_space] = current_participatory_space
-        form_params[:settings] = new_settings_schema(:global, form_params[:settings])
-        if form_params[:default_step_settings]
-          form_params[:default_step_settings] = new_settings_schema(:step, form_params[:default_step_settings])
-        else
-          form_params[:step_settings].each do |key, value|
-            form_params[:step_settings][key] = new_settings_schema(:step, value)
+      def component_params
+        new_settings = proc { |name, data| Component.build_settings(manifest, name, data, current_organization) }
+
+        params[:component].permit!.tap do |hsh|
+          hsh[:id] = params[:id]
+          hsh[:manifest] = manifest
+          hsh[:participatory_space] = current_participatory_space
+          hsh[:settings] = new_settings.call(:global, hsh[:settings])
+          if hsh[:default_step_settings]
+            hsh[:default_step_settings] = new_settings.call(:step, hsh[:default_step_settings])
+          else
+            hsh[:step_settings] ||= {}
+            hsh[:step_settings].each do |key, value|
+              hsh[:step_settings][key] = new_settings.call(:step, value)
+            end
           end
         end
-        form_params
       end
 
       def query_scope