decidim-admin 0.30.3 → 0.31.0.rc2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.30.3
+  version: 0.31.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -94,28 +94,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.3
+        version: 0.31.0.rc2
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -182,11 +182,9 @@ files:
 - app/commands/decidim/admin/participatory_space/unpublish.rb
 - app/commands/decidim/admin/participatory_space/update_admin.rb
 - app/commands/decidim/admin/process_participatory_space_private_user_import_csv.rb
-- app/commands/decidim/admin/process_user_group_verification_csv.rb
 - app/commands/decidim/admin/promote_managed_user.rb
 - app/commands/decidim/admin/publish_all_participatory_space_private_users.rb
 - app/commands/decidim/admin/publish_component.rb
-- app/commands/decidim/admin/reject_user_group.rb
 - app/commands/decidim/admin/remove_admin.rb
 - app/commands/decidim/admin/reorder_components.rb
 - app/commands/decidim/admin/reorder_taxonomies.rb
@@ -208,7 +206,6 @@ files:
 - app/commands/decidim/admin/update_help_sections.rb
 - app/commands/decidim/admin/update_newsletter.rb
 - app/commands/decidim/admin/update_organization.rb
-- app/commands/decidim/admin/update_organization_appearance.rb
 - app/commands/decidim/admin/update_organization_tos_version.rb
 - app/commands/decidim/admin/update_participatory_space_private_user.rb
 - app/commands/decidim/admin/update_resource_permissions.rb
@@ -219,8 +216,6 @@ files:
 - app/commands/decidim/admin/update_static_page_topic.rb
 - app/commands/decidim/admin/update_taxonomy.rb
 - app/commands/decidim/admin/update_taxonomy_filter.rb
-- app/commands/decidim/admin/update_user_groups.rb
-- app/commands/decidim/admin/verify_user_group.rb
 - app/constraints/decidim/admin/organization_dashboard_constraint.rb
 - app/controllers/concerns/decidim/admin/component_taxonomies_helper.rb
 - app/controllers/concerns/decidim/admin/content_blocks/landing_page.rb
@@ -235,8 +230,6 @@ files:
 - app/controllers/concerns/decidim/admin/participatory_space_admin_context.rb
 - app/controllers/concerns/decidim/admin/participatory_space_export.rb
 - app/controllers/concerns/decidim/admin/taxonomies/filterable.rb
-- app/controllers/concerns/decidim/admin/user_groups.rb
-- app/controllers/concerns/decidim/admin/user_groups/filterable.rb
 - app/controllers/concerns/decidim/admin/verification_conflicts/filterable.rb
 - app/controllers/concerns/decidim/moderated_users/admin/filterable.rb
 - app/controllers/concerns/decidim/moderations/admin/filterable.rb
@@ -269,7 +262,6 @@ files:
 - app/controllers/decidim/admin/logs_controller.rb
 - app/controllers/decidim/admin/managed_users/impersonation_logs_controller.rb
 - app/controllers/decidim/admin/managed_users/promotions_controller.rb
-- app/controllers/decidim/admin/metrics_controller.rb
 - app/controllers/decidim/admin/moderated_users_controller.rb
 - app/controllers/decidim/admin/moderations/reports_controller.rb
 - app/controllers/decidim/admin/moderations_controller.rb
@@ -291,12 +283,11 @@ files:
 - app/controllers/decidim/admin/static_page_content_blocks_controller.rb
 - app/controllers/decidim/admin/static_page_topics_controller.rb
 - app/controllers/decidim/admin/static_pages_controller.rb
+- app/controllers/decidim/admin/statistics_controller.rb
 - app/controllers/decidim/admin/taxonomies_controller.rb
 - app/controllers/decidim/admin/taxonomy_filters_controller.rb
 - app/controllers/decidim/admin/taxonomy_filters_selector_controller.rb
 - app/controllers/decidim/admin/taxonomy_items_controller.rb
-- app/controllers/decidim/admin/user_groups_controller.rb
-- app/controllers/decidim/admin/user_groups_csv_verifications_controller.rb
 - app/controllers/decidim/admin/users_controller.rb
 - app/events/decidim/attachment_created_event.rb
 - app/events/decidim/component_published_event.rb
@@ -320,7 +311,6 @@ files:
 - app/forms/decidim/admin/managed_user_promotion_form.rb
 - app/forms/decidim/admin/newsletter_form.rb
 - app/forms/decidim/admin/officialization_form.rb
-- app/forms/decidim/admin/organization_appearance_form.rb
 - app/forms/decidim/admin/organization_external_domain_allowlist_form.rb
 - app/forms/decidim/admin/organization_form.rb
 - app/forms/decidim/admin/participatory_space_admin_user_form.rb
@@ -339,7 +329,6 @@ files:
 - app/forms/decidim/admin/taxonomy_form.rb
 - app/forms/decidim/admin/taxonomy_item_form.rb
 - app/forms/decidim/admin/transfer_user_form.rb
-- app/forms/decidim/admin/user_group_csv_verification_form.rb
 - app/helpers/decidim/admin/admin_terms_helper.rb
 - app/helpers/decidim/admin/application_helper.rb
 - app/helpers/decidim/admin/areas_helper.rb
@@ -370,7 +359,6 @@ files:
 - app/jobs/decidim/admin/import_participatory_space_private_user_csv_job.rb
 - app/jobs/decidim/admin/newsletter_delivery_job.rb
 - app/jobs/decidim/admin/newsletter_job.rb
-- app/jobs/decidim/admin/verify_user_group_from_csv_job.rb
 - app/models/decidim/admin/fake_newsletter.rb
 - app/packs/entrypoints/decidim_admin.js
 - app/packs/entrypoints/decidim_admin.scss
@@ -382,6 +370,8 @@ files:
 - app/packs/src/decidim/admin/auto_label_by_position.component.js
 - app/packs/src/decidim/admin/budget_rule_toggler.component.js
 - app/packs/src/decidim/admin/choose_language.js
+- app/packs/src/decidim/admin/controllers/slug/controller.js
+- app/packs/src/decidim/admin/controllers/slug/slug.test.js
 - app/packs/src/decidim/admin/css_preview.js
 - app/packs/src/decidim/admin/draggable-list.js
 - app/packs/src/decidim/admin/draggable-table.js
@@ -408,8 +398,6 @@ files:
 - app/packs/src/decidim/admin/text_copy.js
 - app/packs/src/decidim/admin/toggle_nav.js
 - app/packs/src/decidim/admin/triadic_color_picker.js
-- app/packs/src/decidim/admin/welcome_notification.js
-- app/packs/stylesheets/decidim/admin/_bulk_actions.scss
 - app/packs/stylesheets/decidim/admin/_cards.scss
 - app/packs/stylesheets/decidim/admin/_color_picker.scss
 - app/packs/stylesheets/decidim/admin/_component-show.scss
@@ -441,7 +429,7 @@ files:
 - app/permissions/decidim/admin/permissions.rb
 - app/permissions/decidim/admin/user_manager_permissions.rb
 - app/presenters/decidim/admin/aside_menu_presenter.rb
-- app/presenters/decidim/admin/dashboard_metric_charts_presenter.rb
+- app/presenters/decidim/admin/dashboard_statistic_charts_presenter.rb
 - app/presenters/decidim/admin/secondary_menu_presenter.rb
 - app/presenters/decidim/admin/simple_menu_presenter.rb
 - app/queries/decidim/admin/active_users_counter.rb
@@ -449,7 +437,6 @@ files:
 - app/queries/decidim/admin/moderation_stats.rb
 - app/queries/decidim/admin/newsletter_recipients.rb
 - app/queries/decidim/admin/user_filter.rb
-- app/queries/decidim/admin/user_groups_evaluation.rb
 - app/views/decidim/admin/admin_terms/show.html.erb
 - app/views/decidim/admin/area_types/_form.html.erb
 - app/views/decidim/admin/area_types/edit.html.erb
@@ -504,8 +491,6 @@ files:
 - app/views/decidim/admin/managed_users/impersonation_logs/index.html.erb
 - app/views/decidim/admin/managed_users/promotions/_form.html.erb
 - app/views/decidim/admin/managed_users/promotions/new.html.erb
-- app/views/decidim/admin/metrics/_metrics.html.erb
-- app/views/decidim/admin/metrics/index.html.erb
 - app/views/decidim/admin/moderated_users/_bulk-actions.html.erb
 - app/views/decidim/admin/moderated_users/_report.html.erb
 - app/views/decidim/admin/moderated_users/bulk_actions/_block.html.erb
@@ -539,12 +524,13 @@ files:
 - app/views/decidim/admin/officializations/show_email.html.erb
 - app/views/decidim/admin/organization/_form.html.erb
 - app/views/decidim/admin/organization/edit.html.erb
-- app/views/decidim/admin/organization_appearance/_form.html.erb
-- app/views/decidim/admin/organization_appearance/edit.html.erb
-- app/views/decidim/admin/organization_appearance/form/_colors.html.erb
-- app/views/decidim/admin/organization_appearance/form/_header_snippets.html.erb
-- app/views/decidim/admin/organization_appearance/form/_images.html.erb
-- app/views/decidim/admin/organization_appearance/form/_minimap.html.erb
+- app/views/decidim/admin/organization/form/_admin_terms_of_service.html.erb
+- app/views/decidim/admin/organization/form/_basic_configuration.html.erb
+- app/views/decidim/admin/organization/form/_colors.html.erb
+- app/views/decidim/admin/organization/form/_extra_features.html.erb
+- app/views/decidim/admin/organization/form/_logos.html.erb
+- app/views/decidim/admin/organization/form/_minimap.html.erb
+- app/views/decidim/admin/organization/form/_welcome_notification.html.erb
 - app/views/decidim/admin/organization_external_domain_allowlist/_external_domain.html.erb
 - app/views/decidim/admin/organization_external_domain_allowlist/_form.html.erb
 - app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
@@ -586,6 +572,8 @@ files:
 - app/views/decidim/admin/static_pages/edit.html.erb
 - app/views/decidim/admin/static_pages/index.html.erb
 - app/views/decidim/admin/static_pages/new.html.erb
+- app/views/decidim/admin/statistics/_statistics.html.erb
+- app/views/decidim/admin/statistics/index.html.erb
 - app/views/decidim/admin/taxonomies/_filters.html.erb
 - app/views/decidim/admin/taxonomies/_form.html.erb
 - app/views/decidim/admin/taxonomies/_row.html.erb
@@ -610,8 +598,6 @@ files:
 - app/views/decidim/admin/taxonomy_items/_form.html.erb
 - app/views/decidim/admin/taxonomy_items/edit.html.erb
 - app/views/decidim/admin/taxonomy_items/new.html.erb
-- app/views/decidim/admin/user_groups/index.html.erb
-- app/views/decidim/admin/user_groups_csv_verifications/new.html.erb
 - app/views/decidim/admin/users/_form.html.erb
 - app/views/decidim/admin/users/index.html.erb
 - app/views/decidim/admin/users/new.html.erb
@@ -627,6 +613,7 @@ files:
 - app/views/layouts/decidim/admin/_title_bar_responsive.html.erb
 - app/views/layouts/decidim/admin/application.html.erb
 - app/views/layouts/decidim/admin/global_moderations.html.erb
+- app/views/layouts/decidim/admin/insights.html.erb
 - app/views/layouts/decidim/admin/newsletters.erb
 - app/views/layouts/decidim/admin/settings.html.erb
 - app/views/layouts/decidim/admin/taxonomy_filters.html.erb

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

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "csv"
-
-module Decidim
-  module Admin
-    # A command with all the business logic when processing the CSV to verify
-    # user groups.
-    class ProcessUserGroupVerificationCsv < Decidim::Command
-      include Decidim::Admin::CustomImport
-
-      # Public: Initializes the command.
-      #
-      # form - the form object containing the uploaded file
-      def initialize(form)
-        @form = form
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) unless @form.valid?
-
-        process_csv
-        broadcast(:ok)
-      end
-
-      private
-
-      def process_csv
-        verifier = @form.current_user
-        organization = @form.current_organization
-
-        process_import_file(@form.file) do |(email)|
-          VerifyUserGroupFromCsvJob.perform_later(email, verifier, organization) if email.present?
-        end
-      end
-    end
-  end
-end

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

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A command with all the business logic when rejecting a user_group.
-    class RejectUserGroup < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # user_group - The user_group to reject
-      # current_user - The user performing the action
-      def initialize(user_group, current_user)
-        @user_group = user_group
-        @current_user = current_user
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) unless @user_group.valid?
-
-        reject_user_group
-        broadcast(:ok)
-      end
-
-      private
-
-      def reject_user_group
-        Decidim.traceability.perform_action!(
-          "reject",
-          @user_group,
-          @current_user
-        ) do
-          @user_group.reject!
-        end
-      end
-    end
-  end
-end

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

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A command with all the business logic for updating the current
-    # organization appearance.
-    class UpdateOrganizationAppearance < Decidim::Commands::UpdateResource
-      fetch_file_attributes :logo, :highlighted_content_banner_image, :favicon, :official_img_footer
-
-      fetch_form_attributes :cta_button_path, :cta_button_text, :description, :official_url,
-                            :highlighted_content_banner_enabled, :highlighted_content_banner_action_url,
-                            :highlighted_content_banner_title, :highlighted_content_banner_short_description,
-                            :highlighted_content_banner_action_title,
-                            :highlighted_content_banner_action_subtitle, :enable_omnipresent_banner, :omnipresent_banner_url,
-                            :omnipresent_banner_title, :omnipresent_banner_short_description
-
-      private
-
-      def attributes
-        super
-          .merge(colors_attributes)
-          .delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
-          .tap do |attributes|
-            attributes[:header_snippets] = form.header_snippets if Decidim.enable_html_header_snippets
-          end
-      end
-
-      def colors_attributes
-        {
-          colors: {
-            primary: form.primary_color,
-            secondary: form.secondary_color,
-            tertiary: form.tertiary_color
-          }.compact_blank
-        }
-      end
-    end
-  end
-end

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

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A command with all the business logic when updating a usergroup.
-    class UpdateUserGroups < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # scope - The Scope to update
-      # form - A form object with the params.
-      def initialize(user_group)
-        @user_group = user_group
-        @form = form
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      # - :invalid if the form was not valid and we could not proceed.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) if form.invalid?
-
-        update_scope
-        broadcast(:ok)
-      end
-
-      private
-
-      attr_reader :form
-
-      def update_scope
-        @scope.update!(attributes)
-      end
-
-      def attributes
-        {
-          name: form.name
-        }
-      end
-    end
-  end
-end

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

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # A command with all the business logic when verifying a user_group.
-    class VerifyUserGroup < Decidim::Command
-      # Public: Initializes the command.
-      #
-      # user_group - The user_group to verify
-      # current_user - the user performing the action
-      def initialize(user_group, current_user, via_csv: false)
-        @user_group = user_group
-        @current_user = current_user
-        @via_csv = via_csv
-      end
-
-      # Executes the command. Broadcasts these events:
-      #
-      # - :ok when everything is valid.
-      #
-      # Returns nothing.
-      def call
-        return broadcast(:invalid) unless @user_group.valid?
-
-        verify_user_group
-        broadcast(:ok)
-      end
-
-      private
-
-      def verify_user_group
-        action = @via_csv ? "verify_via_csv" : "verify"
-        Decidim.traceability.perform_action!(
-          action,
-          @user_group,
-          @current_user
-        ) do
-          @user_group.verify!
-        end
-      end
-    end
-  end
-end

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

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
-  module Admin
-    module UserGroups
-      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
-            [
-              :state_eq
-            ]
-          end
-
-          def filters_with_values
-            {
-              state_eq: user_groups_states
-            }
-          end
-
-          protected
-
-          def user_groups_states
-            %w(all pending rejected verified)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support/concern"
-
-module Decidim
-  module Admin
-    # The UserGroups concern must be included in all controllers related
-    # to UserGroups feature. It adds a method to enforce that the feature
-    # is enabled.
-    module UserGroups
-      extend ActiveSupport::Concern
-
-      included do
-        delegate :user_groups_enabled?, to: :current_organization
-
-        helper_method :user_groups_enabled?
-      end
-
-      def enforce_user_groups_enabled
-        raise Decidim::ActionForbidden unless current_organization.user_groups_enabled?
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    class MetricsController < Decidim::Admin::ApplicationController
-      helper_method :metrics_presenter
-
-      def index
-        enforce_permission_to :read, :metrics
-      end
-
-      private
-
-      def metrics_presenter
-        @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
-          summary: false,
-          organization: current_organization,
-          view_context:
-        )
-      end
-    end
-  end
-end

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

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # Controller that allows managing user groups at the admin panel.
-    #
-    class UserGroupsController < Decidim::Admin::ApplicationController
-      include UserGroups
-      include Decidim::Admin::UserGroups::Filterable
-
-      before_action :enforce_user_groups_enabled
-
-      layout "decidim/admin/users"
-
-      add_breadcrumb_item_from_menu :admin_user_menu
-
-      def index
-        enforce_permission_to :index, :user_group
-
-        @user_groups = filtered_collection
-      end
-
-      def verify
-        @user_group = collection.find(params[:id])
-        enforce_permission_to :verify, :user_group, user_group: @user_group
-
-        VerifyUserGroup.call(@user_group, current_user) do
-          on(:ok) do
-            flash[:notice] = I18n.t("user_group.verify.success", scope: "decidim.admin")
-            redirect_back(fallback_location: decidim_admin.user_groups_path)
-          end
-
-          on(:invalid) do
-            flash[:alert] = I18n.t("user_group.verify.invalid", scope: "decidim.admin")
-            redirect_back(fallback_location: decidim_admin.user_groups_path)
-          end
-        end
-      end
-
-      def reject
-        @user_group = collection.find(params[:id])
-        enforce_permission_to :reject, :user_group, user_group: @user_group
-
-        RejectUserGroup.call(@user_group, current_user) do
-          on(:ok) do
-            flash[:notice] = I18n.t("user_group.reject.success", scope: "decidim.admin")
-            redirect_back(fallback_location: decidim_admin.user_groups_path)
-          end
-
-          on(:invalid) do
-            flash[:alert] = I18n.t("user_group.reject.invalid", scope: "decidim.admin")
-            redirect_back(fallback_location: decidim_admin.user_groups_path)
-          end
-        end
-      end
-
-      private
-
-      def filtered_collection
-        paginate(query.result)
-      end
-
-      def base_query
-        Decidim::Admin::UserGroupsEvaluation.for(collection, @query, @state)
-      end
-
-      def collection
-        UserGroup
-          .left_outer_joins(:memberships)
-          .select("decidim_users.*, COUNT(decidim_user_group_memberships.decidim_user_group_id) as users_count")
-          .where(decidim_user_group_memberships: { decidim_user_id: current_organization.users })
-          .group(Arel.sql("decidim_users.id"))
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # Controller that allows batch verifying user groups by uploading a CSV file.
-    class UserGroupsCsvVerificationsController < Decidim::Admin::ApplicationController
-      include UserGroups
-
-      before_action :enforce_user_groups_enabled
-
-      layout "decidim/admin/users"
-
-      def new
-        enforce_permission_to :csv_verify, :user_group
-        @form = form(UserGroupCsvVerificationForm).instance
-      end
-
-      def create
-        enforce_permission_to :csv_verify, :user_group
-        @form = form(UserGroupCsvVerificationForm).from_params(params)
-
-        ProcessUserGroupVerificationCsv.call(@form) do
-          on(:ok) do
-            flash[:notice] = I18n.t("user_group.csv_verify.success", scope: "decidim.admin")
-            redirect_to decidim_admin.user_groups_path
-          end
-
-          on(:invalid) do
-            flash[:alert] = I18n.t("user_group.csv_verify.invalid", scope: "decidim.admin")
-            render :new
-          end
-        end
-      end
-    end
-  end
-end