decidim-assemblies 0.24.3 → 0.25.0.rc1

data/lib/decidim/assemblies/admin_engine.rb

@@ -83,46 +83,138 @@ module Decidim
         end
       end
 
-      initializer "decidim_assemblies.action_controller" do |_app|
-        ActiveSupport.on_load :action_controller do
-          helper Decidim::Assemblies::Admin::AssembliesAdminMenuHelper if respond_to?(:helper)
+      initializer "decidim_assemblies.action_controller" do |app|
+        app.config.to_prepare do
+          ActiveSupport.on_load :action_controller do
+            helper Decidim::Assemblies::Admin::AssembliesAdminMenuHelper if respond_to?(:helper)
+          end
         end
       end
 
-      initializer "decidim_assemblies.admin_assets" do |app|
-        app.config.assets.precompile += %w(admin/decidim_assemblies_manifest.js)
-      end
-
       initializer "decidim_assemblies.admin_menu" do
         Decidim.menu :admin_menu do |menu|
-          menu.item I18n.t("menu.assemblies", scope: "decidim.admin"),
-                    decidim_admin_assemblies.assemblies_path,
-                    icon_name: "dial",
-                    position: 2.2,
-                    active: :inclusive,
-                    if: allowed_to?(:enter, :space_area, space_name: :assemblies)
+          menu.add_item :assemblies,
+                        I18n.t("menu.assemblies", scope: "decidim.admin"),
+                        decidim_admin_assemblies.assemblies_path,
+                        icon_name: "dial",
+                        position: 2.2,
+                        active: :inclusive,
+                        if: allowed_to?(:enter, :space_area, space_name: :assemblies)
+        end
+      end
+
+      initializer "decidim_assemblies.assemblies_admin_attachments_menu" do
+        Decidim.menu :assemblies_admin_attachments_menu do |menu|
+          menu.add_item :assembly_attachment_collections,
+                        I18n.t("attachment_collections", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment_collection, assembly: current_participatory_space)
+
+          menu.add_item :assembly_attachments,
+                        I18n.t("attachment_files", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.assembly_attachments_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment, assembly: current_participatory_space)
         end
       end
+      initializer "decidim_assemblies.admin_assemblies_components_menu" do
+        Decidim.menu :admin_assemblies_components_menu do |menu|
+          current_participatory_space.components.each do |component|
+            caption = translated_attribute(component.name)
+            if component.primary_stat.present?
+              caption += content_tag(:span, component.primary_stat, class: component.primary_stat.zero? ? "component-counter component-counter--off" : "component-counter")
+            end
 
+            menu.add_item [component.manifest_name, component.id].join("_"),
+                          caption.html_safe,
+                          manage_component_path(component),
+                          active: is_active_link?(manage_component_path(component)) ||
+                                  is_active_link?(decidim_admin_assemblies.edit_component_path(current_participatory_space, component)) ||
+                                  is_active_link?(decidim_admin_assemblies.edit_component_permissions_path(current_participatory_space, component)) ||
+                                  participatory_space_active_link?(component),
+                          if: component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name)
+          end
+        end
+      end
+      initializer "decidim_assemblies.assemblies_admin_menu" do
+        Decidim.menu :admin_assembly_menu do |menu|
+          menu.add_item :edit_assembly,
+                        I18n.t("info", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.edit_assembly_path(current_participatory_space),
+                        position: 1,
+                        if: allowed_to?(:update, :assembly, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.edit_assembly_path(current_participatory_space))
+
+          menu.add_item :components,
+                        I18n.t("components", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.components_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.components_path(current_participatory_space)),
+                        if: allowed_to?(:read, :component, assembly: current_participatory_space),
+                        submenu: { target_menu: :admin_assemblies_components_menu, options: { container_options: { id: "components-list" } } }
+
+          menu.add_item :categories,
+                        I18n.t("categories", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.categories_path(current_participatory_space),
+                        if: allowed_to?(:read, :category, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.categories_path(current_participatory_space))
+
+          menu.add_item :attachments,
+                        I18n.t("attachments", scope: "decidim.admin.menu.assemblies_submenu"),
+                        "#",
+                        active: is_active_link?(decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space)) ||
+                                is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment_collection, assembly: current_participatory_space) ||
+                            allowed_to?(:read, :attachment, assembly: current_participatory_space),
+                        submenu: { target_menu: :assemblies_admin_attachments_menu }
+
+          menu.add_item :assembly_members,
+                        I18n.t("assembly_members", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.assembly_members_path(current_participatory_space),
+                        if: allowed_to?(:read, :assembly_member, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.assembly_members_path(current_participatory_space))
+
+          menu.add_item :assembly_user_roles,
+                        I18n.t("assembly_admins", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space),
+                        if: allowed_to?(:read, :assembly_user_role, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space))
+
+          menu.add_item :participatory_space_private_users,
+                        I18n.t("private_users", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space),
+                        if: allowed_to?(:read, :space_private_user, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space))
+
+          menu.add_item :moderations,
+                        I18n.t("moderations", scope: "decidim.admin.menu.assemblies_submenu"),
+                        decidim_admin_assemblies.moderations_path(current_participatory_space),
+                        if: allowed_to?(:read, :moderation, assembly: current_participatory_space),
+                        active: is_active_link?(decidim_admin_assemblies.moderations_path(current_participatory_space))
+        end
+      end
       initializer "decidim_assemblies.admin_assemblies_menu" do
         Decidim.menu :admin_assemblies_menu do |menu|
-          menu.item I18n.t("menu.assemblies", scope: "decidim.admin"),
-                    decidim_admin_assemblies.assemblies_path,
-                    position: 1.0,
-                    active: is_active_link?(decidim_admin_assemblies.assemblies_path),
-                    if: allowed_to?(:read, :assembly_list)
-
-          menu.item I18n.t("menu.assemblies_types", scope: "decidim.admin"),
-                    decidim_admin_assemblies.assemblies_types_path,
-                    active: is_active_link?(decidim_admin_assemblies.assemblies_types_path),
-                    position: 1.1,
-                    if: allowed_to?(:manage, :assemblies_type)
-
-          menu.item I18n.t("menu.assemblies_settings", scope: "decidim.admin"),
-                    decidim_admin_assemblies.edit_assemblies_settings_path,
-                    active: is_active_link?(decidim_admin_assemblies.edit_assemblies_settings_path),
-                    position: 1.3,
-                    if: allowed_to?(:read, :assemblies_setting)
+          menu.add_item :assemblies,
+                        I18n.t("menu.assemblies", scope: "decidim.admin"),
+                        decidim_admin_assemblies.assemblies_path,
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_assemblies.assemblies_path),
+                        if: allowed_to?(:read, :assembly_list)
+
+          menu.add_item :assemblies_types,
+                        I18n.t("menu.assemblies_types", scope: "decidim.admin"),
+                        decidim_admin_assemblies.assemblies_types_path,
+                        active: is_active_link?(decidim_admin_assemblies.assemblies_types_path),
+                        position: 1.1,
+                        if: allowed_to?(:manage, :assemblies_type)
+
+          menu.add_item :edit_assemblies_settings,
+                        I18n.t("menu.assemblies_settings", scope: "decidim.admin"),
+                        decidim_admin_assemblies.edit_assemblies_settings_path,
+                        active: is_active_link?(decidim_admin_assemblies.edit_assemblies_settings_path),
+                        position: 1.3,
+                        if: allowed_to?(:read, :assemblies_setting)
         end
       end
     end

data/lib/decidim/assemblies/engine.rb

@@ -39,10 +39,6 @@ module Decidim
         end
       end
 
-      initializer "decidim_assemblies.assets" do |app|
-        app.config.assets.precompile += %w(decidim_assemblies_manifest.js)
-      end
-
       initializer "decidim_assemblies.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Assemblies::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Assemblies::Engine.root}/app/views") # for partials
@@ -56,11 +52,12 @@ module Decidim
 
       initializer "decidim_assemblies.menu" do
         Decidim.menu :menu do |menu|
-          menu.item I18n.t("menu.assemblies", scope: "decidim"),
-                    decidim_assemblies.assemblies_path,
-                    position: 2.2,
-                    if: OrganizationPublishedAssemblies.new(current_organization, current_user).any?,
-                    active: :inclusive
+          menu.add_item :assemblies,
+                        I18n.t("menu.assemblies", scope: "decidim"),
+                        decidim_assemblies.assemblies_path,
+                        position: 2.2,
+                        if: OrganizationPublishedAssemblies.new(current_organization, current_user).any?,
+                        active: :inclusive
         end
       end
 

data/lib/decidim/assemblies/participatory_space.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:assemblies) do |participatory_space|
-  participatory_space.icon = "decidim/assemblies/assembly.svg"
+  participatory_space.icon = "media/images/decidim_assemblies.svg"
   participatory_space.model_class_name = "Decidim::Assembly"
 
   participatory_space.participatory_spaces do |organization|
@@ -66,8 +66,18 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
+        hero_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city.jpeg")),
+          filename: "hero_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
+        banner_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city2.jpeg")),
+          filename: "banner_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
         promoted: true,
         published_at: 2.weeks.ago,
         meta_scope: Decidim::Faker::Localized.word,
@@ -149,8 +159,18 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
+        hero_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city.jpeg")),
+          filename: "hero_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
+        banner_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city2.jpeg")),
+          filename: "banner_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
         promoted: true,
         published_at: 2.weeks.ago,
         meta_scope: Decidim::Faker::Localized.word,
@@ -176,21 +196,39 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attachment_collection: attachment_collection,
           attached_to: current_assembly,
-          file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
+          content_type: "application/pdf",
+          file: ActiveStorage::Blob.create_after_upload!(
+            io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
+            filename: "Exampledocument.pdf",
+            content_type: "application/pdf",
+            metadata: nil
+          ) # Keep after attached_to
         )
 
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(word_count: 2),
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: current_assembly,
-          file: File.new(File.join(seeds_root, "city.jpeg")) # Keep after attached_to
+          content_type: "image/jpeg",
+          file: ActiveStorage::Blob.create_after_upload!(
+            io: File.open(File.join(seeds_root, "city.jpeg")),
+            filename: "city.jpeg",
+            content_type: "image/jpeg",
+            metadata: nil
+          ) # Keep after attached_to
         )
 
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(word_count: 2),
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: current_assembly,
-          file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
+          content_type: "application/pdf",
+          file: ActiveStorage::Blob.create_after_upload!(
+            io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
+            filename: "Exampledocument.pdf",
+            content_type: "application/pdf",
+            metadata: nil
+          ) # Keep after attached_to
         )
 
         2.times do

data/lib/decidim/assemblies/test/factories.rb

@@ -54,6 +54,7 @@ FactoryBot.define do
     youtube_handler { "others" }
     github_handler { "others" }
     weight { 1 }
+    announcement { generate_localized_title }
 
     trait :with_type do
       assembly_type { create :assemblies_type, organization: organization }

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.24.3"
+      "0.25.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -65,13 +65,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/admin/decidim_assemblies_manifest.js
-- app/assets/config/decidim_assemblies_manifest.js
-- app/assets/images/decidim/assemblies/assembly.svg
-- app/assets/javascripts/decidim/assemblies/admin/assemblies.js.es6
-- app/assets/javascripts/decidim/assemblies/admin/assembly_members.js.es6
-- app/assets/javascripts/decidim/assemblies/assemblies.js.es6
-- app/assets/javascripts/decidim/assemblies/orgchart.js.es6
 - app/cells/decidim/assemblies/assembly_cell.rb
 - app/cells/decidim/assemblies/assembly_m/footer.erb
 - app/cells/decidim/assemblies/assembly_m/tags.erb
@@ -82,10 +75,6 @@ files:
 - app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb
 - app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form/show.erb
 - app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form_cell.rb
-- app/cells/decidim/assemblies/statistic/show.erb
-- app/cells/decidim/assemblies/statistic_cell.rb
-- app/cells/decidim/assemblies/statistics/show.erb
-- app/cells/decidim/assemblies/statistics_cell.rb
 - app/cells/decidim/assembly_activity_cell.rb
 - app/commands/decidim/assemblies/admin/copy_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assemblies_type.rb
@@ -152,6 +141,13 @@ files:
 - app/models/decidim/assembly.rb
 - app/models/decidim/assembly_member.rb
 - app/models/decidim/assembly_user_role.rb
+- app/packs/entrypoints/decidim_assemblies.js
+- app/packs/entrypoints/decidim_assemblies_admin.js
+- app/packs/images/decidim/assemblies/decidim_assemblies.svg
+- app/packs/src/decidim/assemblies/admin/assemblies.js
+- app/packs/src/decidim/assemblies/admin/assembly_members.js
+- app/packs/src/decidim/assemblies/assemblies.js
+- app/packs/src/decidim/assemblies/orgchart.js
 - app/permissions/decidim/assemblies/permissions.rb
 - app/presenters/decidim/admin/assembly_member_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assemblies_setting_presenter.rb
@@ -223,6 +219,7 @@ files:
 - app/views/layouts/decidim/admin/assemblies.html.erb
 - app/views/layouts/decidim/admin/assembly.html.erb
 - app/views/layouts/decidim/assembly.html.erb
+- config/assets.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -249,6 +246,7 @@ files:
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
 - config/locales/fr-CA.yml
+- config/locales/fr-LU.yml
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
@@ -259,10 +257,10 @@ files:
 - config/locales/is-IS.yml
 - config/locales/is.yml
 - config/locales/it.yml
-- config/locales/ja-JP.yml
 - config/locales/ja.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
+- config/locales/lb-LU.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -311,6 +309,7 @@ files:
 - db/migrate/20200430202456_create_decidim_assemblies_settings.rb
 - db/migrate/20210204152393_add_weight_field_to_assembly.rb
 - db/migrate/20210310120444_add_followable_counter_cache_to_assemblies.rb
+- db/migrate/20210507063604_add_announcement_to_assemblies.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -342,11 +341,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Decidim assemblies module