decidim-admin 0.30.1 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d9a36f20b03c890e4ffaaa64ed9d80deb07ef73ee4f550d950840c08623a125
-  data.tar.gz: 5eaccb3a7f2327f244c9a8b8b71bc4bd923cf763b1d63ed5ddf7fd4d76f69e67
+  metadata.gz: c34cd47009937e22b9702e072abd4ed2b202b23b76d6977a1e82eb777dfa1fde
+  data.tar.gz: 536f248f74f2b6c02c0d486b7d8c0237a9e714816b6a1d6be9fd4efb9e4de5f8
 SHA512:
-  metadata.gz: 939bd69210abf20272825c2b7b7d5a7089727e32fb7ec0667adb338e2d8dec379150ddb54b24a48fdb3a2aba3d02ce8c52702071394f8a40f2d126245f24826f
-  data.tar.gz: 34c44b4ef00e560f6d71ab6f5476df3d7fb8387962ed06b92d877d51163d7b13f9d22919d406a550cd745c04fdebd81c5968c376171d92ebc2330e4849217f0e
+  metadata.gz: 840132645dcff9896ac71fd53b2feb8dc4f3026ec9d1b855951b1285d3e914dd100bdb437269ef0e411195a1b8346761e8232f2ddc1833196a1343a49fe51d84
+  data.tar.gz: 91dd77784880249c7909850780737c7dcbc6f0d619f3e553bbc677fcfac177e1504b790df63edf1a87d052d35fdf520c16400c53ac5799b3d43f648bc9e21f26

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

@@ -5,10 +5,14 @@ module Decidim
     # A command with all the business logic for updating the current
     # organization.
     class UpdateOrganization < Decidim::Commands::UpdateResource
-      fetch_form_attributes :name, :default_locale, :reference_prefix, :time_zone, :twitter_handler,
+      fetch_file_attributes :logo, :favicon, :official_img_footer
+
+      fetch_form_attributes :name, :description, :default_locale, :reference_prefix, :time_zone, :twitter_handler,
                             :facebook_handler, :instagram_handler, :youtube_handler, :github_handler, :badges_enabled,
-                            :user_groups_enabled, :comments_max_length, :enable_machine_translations,
-                            :admin_terms_of_service_body, :rich_text_editor_in_public_views, :enable_participatory_space_filters
+                            :comments_max_length, :enable_machine_translations, :admin_terms_of_service_body,
+                            :rich_text_editor_in_public_views, :enable_participatory_space_filters, :official_url,
+                            :enable_omnipresent_banner, :omnipresent_banner_url, :omnipresent_banner_title,
+                            :omnipresent_banner_short_description
 
       private
 
@@ -16,6 +20,7 @@ module Decidim
         super
           .merge(welcome_notification_attributes)
           .merge(machine_translation_attributes)
+          .merge(colors_attributes)
       end
 
       def welcome_notification_attributes
@@ -33,6 +38,16 @@ module Decidim
           machine_translation_display_priority: form.machine_translation_display_priority
         }
       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/controllers/concerns/decidim/admin/content_blocks/landing_page_content_blocks.rb

@@ -55,7 +55,7 @@ module Decidim
                 redirect_to edit_resource_landing_page_path
               end
               on(:invalid) do
-                render "decidim/admin/shared/landing_page_content_blocks/edit"
+                render "decidim/admin/shared/landing_page_content_blocks/edit", status: :unprocessable_entity
               end
             end
           end

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

@@ -186,7 +186,7 @@ module Decidim
 
         # Plural model name. Used in search_field placeholder.
         def collection_name
-          query.klass.model_name.human(count: 2)
+          query.klass.model_name.human(count: 2).downcase
         end
 
         def taxonomy_order_or_search?

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

@@ -34,7 +34,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("area_types.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -56,7 +56,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("area_types.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -35,7 +35,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("areas.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -57,7 +57,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("areas.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -27,7 +27,7 @@ module Decidim
 
           on(:invalid) do
             flash[:alert] = I18n.t("officializations.block.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -65,7 +65,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("officializations.bulk_action.block.invalid", scope: "decidim.admin")
-            render :bulk_new
+            render :bulk_new, status: :unprocessable_entity
           end
         end
       end

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

@@ -26,7 +26,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("component_permissions.update.error", scope: "decidim.admin")
-            render action: :edit
+            render action: :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -47,7 +47,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("components.create.error", scope: "decidim.admin")
-            render action: "new"
+            render action: "new", status: :unprocessable_entity
           end
         end
       end
@@ -74,7 +74,7 @@ module Decidim
 
           on(:invalid) do
             flash[:alert] = I18n.t("components.update.error", scope: "decidim.admin")
-            render action: :edit
+            render action: :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -39,7 +39,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachment_collections.create.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachment_collections/new"
+                render template: "decidim/admin/attachment_collections/new", status: :unprocessable_entity
               end
             end
           end
@@ -64,7 +64,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachment_collections.update.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachment_collections/edit"
+                render template: "decidim/admin/attachment_collections/edit", status: :unprocessable_entity
               end
             end
           end

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

@@ -39,7 +39,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachments.create.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachments/new"
+                render template: "decidim/admin/attachments/new", status: :unprocessable_entity
               end
             end
           end
@@ -64,7 +64,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("attachments.update.error", scope: "decidim.admin")
-                render template: "decidim/admin/attachments/edit"
+                render template: "decidim/admin/attachments/edit", status: :unprocessable_entity
               end
             end
           end

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

@@ -51,7 +51,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("participatory_space_private_users.update.error", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users/edit"
+                render template: "decidim/admin/participatory_space_private_users/edit", status: :unprocessable_entity
               end
             end
           end
@@ -68,7 +68,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("participatory_space_private_users.create.error", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users/new"
+                render template: "decidim/admin/participatory_space_private_users/new", status: :unprocessable_entity
               end
             end
           end
@@ -84,7 +84,7 @@ module Decidim
 
               on(:invalid) do
                 flash.now[:alert] = I18n.t("participatory_space_private_users.destroy.error", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users/index"
+                render template: "decidim/admin/participatory_space_private_users/index", status: :unprocessable_entity
               end
             end
           end

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

@@ -34,7 +34,7 @@ module Decidim
 
               on(:invalid) do
                 flash[:alert] = I18n.t("participatory_space_private_users_csv_imports.create.invalid", scope: "decidim.admin")
-                render template: "decidim/admin/participatory_space_private_users_csv_imports/new"
+                render template: "decidim/admin/participatory_space_private_users_csv_imports/new", status: :unprocessable_entity
               end
             end
           end

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

@@ -47,7 +47,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("error", scope: "decidim.admin.conflicts.transfer")
-            render action: "edit"
+            render action: "edit", status: :unprocessable_entity
           end
         end
       end

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

@@ -7,7 +7,6 @@ module Decidim
     class DashboardController < Decidim::Admin::ApplicationController
       helper_method :latest_action_logs
       helper_method :users_counter
-      helper_method :metrics_presenter
       helper_method :count_pending_moderations
 
       def show
@@ -29,14 +28,6 @@ module Decidim
                                 .first(5)
       end
 
-      def metrics_presenter
-        @metrics_presenter ||= Decidim::Admin::DashboardMetricChartsPresenter.new(
-          summary: true,
-          organization: current_organization,
-          view_context:
-        )
-      end
-
       def users_counter
         last_day = Time.zone.yesterday
         last_week = Time.zone.today.prev_week

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

@@ -46,7 +46,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("impersonations.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end

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

@@ -39,7 +39,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("decidim.admin.imports.error")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/admin/managed_users/promotions_controller.rb

@@ -25,7 +25,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("managed_users.promotion.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end

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

@@ -56,7 +56,7 @@ module Decidim
           on(:invalid) do |newsletter|
             @newsletter = newsletter
             flash.now[:error] = I18n.t("newsletters.create.error", scope: "decidim.admin")
-            render action: :new
+            render action: :new, status: :unprocessable_entity
           end
         end
       end
@@ -80,7 +80,7 @@ module Decidim
           on(:invalid) do |newsletter|
             @newsletter = newsletter
             flash.now[:error] = I18n.t("newsletters.update.error", scope: "decidim.admin")
-            render action: :edit
+            render action: :edit, status: :unprocessable_entity
           end
         end
       end
@@ -128,12 +128,12 @@ module Decidim
 
           on(:invalid) do
             flash.now[:error] = I18n.t("newsletters.deliver.error", scope: "decidim.admin")
-            render action: :select_recipients_to_deliver
+            render action: :select_recipients_to_deliver, status: :unprocessable_entity
           end
 
           on(:no_recipients) do
             flash.now[:error] = I18n.t("newsletters.send.no_recipients", scope: "decidim.admin")
-            render action: :select_recipients_to_deliver
+            render action: :select_recipients_to_deliver, status: :unprocessable_entity
           end
         end
       end

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

@@ -8,8 +8,6 @@ module Decidim
 
       add_breadcrumb_item_from_menu :admin_settings_menu
 
-      helper Decidim::Admin::UploaderImageDimensionsHelper
-
       def edit
         enforce_permission_to :update, :organization, organization: current_organization
         @form = form(OrganizationAppearanceForm).from_model(current_organization)
@@ -27,7 +25,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("organization.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -7,6 +7,8 @@ module Decidim
     class OrganizationController < Decidim::Admin::ApplicationController
       layout "decidim/admin/settings"
 
+      helper Decidim::Admin::UploaderImageDimensionsHelper
+
       add_breadcrumb_item_from_menu :admin_settings_menu
 
       def edit
@@ -27,7 +29,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("organization.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end
@@ -36,10 +38,6 @@ module Decidim
         search(current_organization.users.available)
       end
 
-      def user_entities
-        search(current_organization.user_entities.available)
-      end
-
       private
 
       def search(relation)

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

@@ -25,7 +25,7 @@ module Decidim
           end
           on(:invalid) do
             flash[:notice] = t("domain_allowlist.update.error", scope: "decidim.admin")
-            render action: "edit"
+            render action: "edit", status: :unprocessable_entity
           end
         end
       end

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

@@ -33,6 +33,10 @@ module Decidim
       def resource_content_block_cell
         "decidim/admin/homepage_content_block"
       end
+
+      def content_blocks_title
+        t("decidim.admin.menu.homepage")
+      end
     end
   end
 end

data/app/controllers/decidim/admin/participatory_space/user_role_controller.rb

@@ -38,7 +38,7 @@ module Decidim
 
             on(:invalid) do
               flash[:alert] = I18n.t("create.error", scope: i18n_scope)
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -56,7 +56,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("update.error", scope: i18n_scope)
-              render :edit
+              render :edit, status: :unprocessable_entity
             end
           end
         end

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

@@ -27,7 +27,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("decidim.admin.reminders.create.error")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end

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

@@ -25,7 +25,7 @@ module Decidim
           end
 
           on(:invalid) do
-            render action: :edit
+            render action: :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -34,7 +34,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("scope_types.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -56,7 +56,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("scope_types.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -36,7 +36,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("scopes.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -58,7 +58,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("scopes.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -10,17 +10,17 @@ module Decidim
       helper_method :current_token, :resource, :resource_title, :share_tokens_path
 
       def index
-        enforce_permission_to :read, :share_tokens
+        enforce_permission_to :read, :share_token
         @share_tokens = filtered_collection
       end
 
       def new
-        enforce_permission_to :create, :share_tokens
+        enforce_permission_to :create, :share_token
         @form = form(ShareTokenForm).instance
       end
 
       def create
-        enforce_permission_to :create, :share_tokens
+        enforce_permission_to :create, :share_token
         @form = form(ShareTokenForm).from_params(params, resource:)
 
         CreateShareToken.call(@form) do
@@ -31,18 +31,18 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("share_tokens.create.invalid", scope: "decidim.admin")
-            render action: "new"
+            render action: "new", status: :unprocessable_entity
           end
         end
       end
 
       def edit
-        enforce_permission_to(:update, :share_tokens, share_token: current_token)
+        enforce_permission_to(:update, :share_token, share_token: current_token)
         @form = form(ShareTokenForm).from_model(current_token)
       end
 
       def update
-        enforce_permission_to(:update, :share_tokens, share_token: current_token)
+        enforce_permission_to(:update, :share_token, share_token: current_token)
         @form = form(ShareTokenForm).from_params(params, resource:)
 
         UpdateShareToken.call(@form, current_token) do
@@ -53,13 +53,13 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("share_tokens.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end
 
       def destroy
-        enforce_permission_to(:destroy, :share_tokens, share_token: current_token)
+        enforce_permission_to(:destroy, :share_token, share_token: current_token)
 
         DestroyShareToken.call(current_token, current_user) do
           on(:ok) do

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

@@ -30,7 +30,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("static_page_topics.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -52,7 +52,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("static_page_topics.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -62,7 +62,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("static_pages.create.error", scope: "decidim.admin")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -85,7 +85,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("static_pages.update.error", scope: "decidim.admin")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class StatisticsController < Decidim::Admin::ApplicationController
+      layout "decidim/admin/insights"
+
+      helper_method :statistics_presenter
+
+      before_action :set_statistic_breadcrumb_item
+
+      def index
+        enforce_permission_to :read, :statistics
+      end
+
+      private
+
+      def statistics_presenter
+        @statistics_presenter ||= Decidim::Admin::DashboardStatisticChartsPresenter.new(
+          organization: current_organization,
+          view_context:
+        )
+      end
+
+      def set_statistic_breadcrumb_item
+        controller_breadcrumb_items << {
+          label: I18n.t("menu.statistics", scope: "decidim.admin"),
+          url: decidim_admin.statistics_path,
+          active: true
+        }
+      end
+    end
+  end
+end

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

@@ -39,7 +39,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("create.invalid", scope: "decidim.admin.taxonomies")
-            render action: "new"
+            render action: "new", status: :unprocessable_entity
           end
         end
       end
@@ -66,7 +66,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("update.invalid", scope: "decidim.admin.taxonomies")
-            render action: "edit"
+            render action: "edit", status: :unprocessable_entity
           end
         end
       end

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

@@ -41,7 +41,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("create.error", scope: "decidim.admin.taxonomy_filters")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end
@@ -63,7 +63,7 @@ module Decidim
           end
           on(:invalid) do
             flash.now[:alert] = I18n.t("update.error", scope: "decidim.admin.taxonomy_filters")
-            render :edit
+            render :edit, status: :unprocessable_entity
           end
         end
       end