decidim-admin 0.28.0 → 0.28.1

data/lib/decidim/admin/engine.rb

@@ -57,39 +57,15 @@ module Decidim
         Mime::Type.register Decidim::Admin::Import::Readers::XLSX::MIME_TYPE, :xlsx
       end
 
-      initializer "decidim_admin.global_moderation_menu" do
+      initializer "decidim_admin.menu" do
         Decidim::Admin::Menu.register_admin_global_moderation_menu!
-      end
-
-      initializer "decidim_admin.workflows_menu" do
         Decidim::Admin::Menu.register_workflows_menu!
-      end
-
-      initializer "decidim_admin.impersonate_menu" do
         Decidim::Admin::Menu.register_impersonate_menu!
-      end
-
-      initializer "decidim_admin.static_pages_menu" do
         Decidim::Admin::Menu.register_admin_static_pages_menu!
-      end
-
-      initializer "decidim_admin.user_menu" do
         Decidim::Admin::Menu.register_admin_user_menu!
-      end
-
-      initializer "decidim_admin.scopes_menu" do
         Decidim::Admin::Menu.register_admin_scopes_menu!
-      end
-
-      initializer "decidim_admin.areas_menu" do
         Decidim::Admin::Menu.register_admin_areas_menu!
-      end
-
-      initializer "decidim_admin.settings_menu" do
         Decidim::Admin::Menu.register_admin_settings_menu!
-      end
-
-      initializer "decidim_admin.menu" do
         Decidim::Admin::Menu.register_admin_menu!
       end
 

data/lib/decidim/admin/menu.rb

@@ -8,7 +8,7 @@ module Decidim
           moderations_count = Decidim::Admin::ModerationStats.new(current_user).count_content_moderations
 
           caption = I18n.t("menu.content", scope: "decidim.admin")
-          caption += content_tag(:span, moderations_count, class: moderations_count.zero? ? "component-counter component-counter--off" : "component-counter")
+          caption += content_tag(:span, moderations_count, class: "component-counter")
 
           menu.add_item :moderations,
                         caption.html_safe,
@@ -20,7 +20,7 @@ module Decidim
           user_reports = Decidim::Admin::ModerationStats.new(current_user).count_user_pending_reports
 
           caption = I18n.t("menu.reported_users", scope: "decidim.admin")
-          caption += content_tag(:span, user_reports, class: user_reports.zero? ? "component-counter component-counter--off" : "component-counter")
+          caption += content_tag(:span, user_reports, class: "component-counter")
 
           menu.add_item :moderated_users,
                         caption.html_safe,
@@ -168,13 +168,22 @@ module Decidim
                         decidim_admin.scopes_path,
                         icon_name: "price-tag-3-line",
                         position: 1.3,
-                        if: allowed_to?(:read, :scope)
+                        if: allowed_to?(:read, :scope),
+                        active: [%w(
+                          decidim/admin/scopes
+                          decidim/admin/scope_types
+                        ), []]
+
           menu.add_item :areas,
                         I18n.t("menu.areas", scope: "decidim.admin"),
                         decidim_admin.areas_path,
                         icon_name: "layout-masonry-line",
                         position: 1.5,
-                        if: allowed_to?(:read, :area)
+                        if: allowed_to?(:read, :area),
+                        active: [%w(
+                          decidim/admin/areas
+                          decidim/admin/area_types
+                        ), []]
 
           menu.add_item :help_sections,
                         I18n.t("menu.help_sections", scope: "decidim.admin"),

data/lib/decidim/admin/test/commands/destroy_category_examples.rb

@@ -19,6 +19,15 @@ module Decidim
           end
         end
 
+        context "when the category is being used by a resource" do
+          let(:component) { create(:dummy_component, participatory_space:) }
+          let!(:resource) { create(:dummy_resource, component:, category:) }
+
+          it "broadcasts invalid" do
+            expect { command.call }.to broadcast(:invalid)
+          end
+        end
+
         context "when the category is not empty" do
           let!(:subcategory) { create :subcategory, parent: category }
 

data/lib/decidim/admin/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.28.0"
+      "0.28.1"
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -94,28 +94,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -351,6 +351,8 @@ files:
 - app/models/decidim/admin/fake_newsletter.rb
 - app/packs/entrypoints/decidim_admin.js
 - app/packs/entrypoints/decidim_admin.scss
+- app/packs/entrypoints/decidim_admin_overrides.scss
+- app/packs/images/decidim/admin/.keep
 - app/packs/src/decidim/admin/admin_autocomplete.js
 - app/packs/src/decidim/admin/application.js
 - app/packs/src/decidim/admin/auto_buttons_by_position.component.js
@@ -402,6 +404,7 @@ files:
 - app/packs/stylesheets/decidim/admin/_title-bar.scss
 - app/packs/stylesheets/decidim/admin/_user-login.scss
 - app/packs/stylesheets/decidim/admin/application.scss
+- app/packs/stylesheets/decidim/admin/decidim_application.scss
 - app/permissions/decidim/admin/permissions.rb
 - app/permissions/decidim/admin/user_manager_permissions.rb
 - app/presenters/decidim/admin/aside_menu_presenter.rb
@@ -554,7 +557,6 @@ files:
 - app/views/layouts/decidim/admin/users.html.erb
 - config/assets.rb
 - config/brakeman.ignore
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -587,6 +589,7 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
+- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -640,6 +643,7 @@ files:
 - db/migrate/20171219154507_add_officialization_to_users.rb
 - db/migrate/20180413233318_add_reason_to_decidim_impersonation_logs.rb
 - db/migrate/20191118112040_add_accepted_admin_terms_at_field_to_users.rb
+- decidim-admin.gemspec
 - lib/decidim/admin.rb
 - lib/decidim/admin/components.rb
 - lib/decidim/admin/custom_import.rb
@@ -691,23 +695,23 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: Decidim organization administration
 test_files: []

data/config/environment.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-# Empty line for playing nice with tpope/vim-rails