decidim-admin 0.27.5 → 0.27.7

data/decidim-admin.gemspec

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "decidim/admin/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.version = Decidim::Admin.version
+  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
+  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
+  s.license = "AGPL-3.0"
+  s.homepage = "https://github.com/decidim/decidim"
+  s.required_ruby_version = "~> 3.0.0"
+
+  s.name = "decidim-admin"
+  s.summary = "Decidim organization administration"
+  s.description = "Organization administration to manage a single organization."
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  end
+
+  s.add_dependency "active_link_to", "~> 1.0"
+  s.add_dependency "decidim-core", Decidim::Admin.version
+  s.add_dependency "devise", "~> 4.7"
+  s.add_dependency "devise-i18n", "~> 1.2"
+  s.add_dependency "devise_invitable", "~> 2.0", ">= 2.0.9"
+
+  s.add_development_dependency "decidim-dev", Decidim::Admin.version
+  s.add_development_dependency "decidim-participatory_processes", Decidim::Admin.version
+end

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: participatory_space) }
+          let!(:resource) { create(:dummy_resource, component: component, category: 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/test/manage_attachment_collections_examples.rb

@@ -2,6 +2,7 @@
 
 shared_examples "manage attachment collections examples" do
   let!(:attachment_collection) { create(:attachment_collection, collection_for: collection_for) }
+  let(:attributes) { attributes_for(:attachment_collection) }
 
   before do
     visit current_path
@@ -18,9 +19,9 @@ shared_examples "manage attachment collections examples" do
       click_link translated(attachment_collection.name, locale: :en)
     end
 
-    expect(page).to have_selector("input#attachment_collection_name_en[value='#{translated(attachment_collection.name, locale: :en)}']")
-    expect(page).to have_selector("input#attachment_collection_weight[value='#{attachment_collection.weight}']")
-    expect(page).to have_selector("input#attachment_collection_description_en[value='#{translated(attachment_collection.description, locale: :en)}']")
+    expect(page).to have_selector(%(input#attachment_collection_name_en[value="#{translated(attachment_collection.name, locale: :en)}"]))
+    expect(page).to have_selector(%(input#attachment_collection_weight[value="#{attachment_collection.weight}"]))
+    expect(page).to have_selector(%(input#attachment_collection_description_en[value="#{translated(attachment_collection.description, locale: :en)}"]))
   end
 
   it "can add attachment collections to a process" do
@@ -30,17 +31,13 @@ shared_examples "manage attachment collections examples" do
       fill_in_i18n(
         :attachment_collection_name,
         "#attachment_collection-name-tabs",
-        en: "Application forms",
-        es: "Formularios de solicitud",
-        ca: "Formularis de sol·licitud"
+        **attributes[:name].except("machine_translations")
       )
 
       fill_in_i18n(
         :attachment_collection_description,
         "#attachment_collection-description-tabs",
-        en: "Contains the application forms",
-        es: "Contiene los formularios de solicitud",
-        ca: "Conté els formularis de sol·licitud"
+        **attributes[:description].except("machine_translations")
       )
 
       find("*[type=submit]").click
@@ -49,8 +46,11 @@ shared_examples "manage attachment collections examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#attachment_collections table" do
-      expect(page).to have_link("Application forms")
+      expect(page).to have_content(translated(attributes[:name]))
     end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("created the #{translated(attributes[:name])} attachment collection")
   end
 
   it "can update an attachment collection" do
@@ -64,9 +64,7 @@ shared_examples "manage attachment collections examples" do
       fill_in_i18n(
         :attachment_collection_name,
         "#attachment_collection-name-tabs",
-        en: "Latest application forms",
-        es: "Últimos formularios de solicitud",
-        ca: "Últims formularis de sol·licitud"
+        **attributes[:name].except("machine_translations")
       )
 
       find("*[type=submit]").click
@@ -75,8 +73,11 @@ shared_examples "manage attachment collections examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#attachment_collections table" do
-      expect(page).to have_link("Latest application forms")
+      expect(page).to have_content(translated(attributes[:name]))
     end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("updated the #{translated(attributes[:name])} attachment collection")
   end
 
   context "when deleting a attachment collection" do

data/lib/decidim/admin/test/manage_attachments_examples.rb

@@ -22,9 +22,9 @@ shared_examples "manage attachments examples" do
         click_link translated(attachment.title, locale: :en)
       end
 
-      expect(page).to have_selector("input#attachment_title_en[value='#{translated(attachment.title, locale: :en)}']")
-      expect(page).to have_selector("input#attachment_description_en[value='#{translated(attachment.description, locale: :en)}']")
-      expect(page).to have_selector("input#attachment_weight[value='#{attachment.weight}']")
+      expect(page).to have_selector(%(input#attachment_title_en[value="#{translated(attachment.title, locale: :en)}"]))
+      expect(page).to have_selector(%(input#attachment_description_en[value="#{translated(attachment.description, locale: :en)}"]))
+      expect(page).to have_selector(%(input#attachment_weight[value="#{attachment.weight}"]))
       expect(page).to have_select("attachment_attachment_collection_id", selected: translated(attachment_collection.name, locale: :en))
       expect(page).to have_css("img[src~='#{attachment.url}']")
     end

data/lib/decidim/admin/test/manage_categories_examples.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples "manage categories examples" do
+  let(:attributes) { attributes_for(:category) }
   it "lists all the categories for the process" do
     within "#categories table" do
       expect(page).to have_content(translated(category.name, locale: :en))
@@ -12,7 +13,7 @@ shared_examples "manage categories examples" do
       click_link translated(category.name, locale: :en)
     end
 
-    expect(page).to have_selector("input#category_name_en[value='#{translated(category.name, locale: :en)}']")
+    expect(page).to have_selector(%(input#category_name_en[value="#{translated(category.name, locale: :en)}"]))
     expect(page).to have_selector("input#category_weight[value='#{category.weight}']")
 
     expect(page).to have_selector("select#category_parent_id")
@@ -25,9 +26,7 @@ shared_examples "manage categories examples" do
       fill_in_i18n(
         :category_name,
         "#category-name-tabs",
-        en: "My category",
-        es: "Mi categoría",
-        ca: "La meva categoria"
+        **attributes[:name].except("machine_translations")
       )
 
       find("*[type=submit]").click
@@ -36,8 +35,11 @@ shared_examples "manage categories examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#categories table" do
-      expect(page).to have_content("My category")
+      expect(page).to have_content(translated(attributes[:name]))
     end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("added the #{translated(attributes[:name])} category to the")
   end
 
   it "updates a category" do
@@ -51,9 +53,7 @@ shared_examples "manage categories examples" do
       fill_in_i18n(
         :category_name,
         "#category-name-tabs",
-        en: "My new name",
-        es: "Mi nuevo nombre",
-        ca: "El meu nou nom"
+        **attributes[:name].except("machine_translations")
       )
 
       find("*[type=submit]").click
@@ -62,8 +62,11 @@ shared_examples "manage categories examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#categories table" do
-      expect(page).to have_content("My new name")
+      expect(page).to have_content(translated(attributes[:name]))
     end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("updated the #{translated(attributes[:name])} category in the")
   end
 
   context "when deleting a category" do

data/lib/decidim/admin/test/manage_moderations_examples.rb

@@ -77,15 +77,6 @@ shared_examples "manage moderations" do
       expect(page).to have_admin_callout("Resource successfully unreported")
     end
 
-    it "user can hide a resource" do
-      within "tr[data-id=\"#{moderation.id}\"]" do
-        click_link "Hide"
-      end
-
-      expect(page).to have_admin_callout("Resource successfully hidden")
-      expect(page).to have_no_content(moderation.reportable.reported_content_url)
-    end
-
     it "user can sort by report count" do
       moderations.each_with_index { |moderation, index| moderation.update(report_count: index + 1) }
       moderations_ordered_by_report_count_asc = moderations.sort_by(&:report_count)

data/lib/decidim/admin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-admin
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.7
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-07-16 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.27.5
+        version: 0.27.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -94,28 +94,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.7
 description: Organization administration to manage a single organization.
 email:
 - josepjaume@gmail.com
@@ -327,10 +327,10 @@ files:
 - 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/mailers/decidim/admin/application_mailer.rb
 - app/models/decidim/admin/fake_newsletter.rb
 - app/packs/entrypoints/decidim_admin.js
 - app/packs/entrypoints/decidim_admin.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
@@ -589,7 +589,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
@@ -622,6 +621,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
@@ -675,6 +675,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/engine.rb
@@ -720,16 +721,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Decidim organization administration

data/app/mailers/decidim/admin/application_mailer.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Admin
-    # Custom application mailer, scoped to the admin mailer.
-    #
-    class ApplicationMailer < ActionMailer::Base
-      default from: Decidim.config.mailer_sender
-      layout "mailer"
-    end
-  end
-end

data/config/environment.rb

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