decidim-initiatives 0.24.3 → 0.25.0.rc4

data/config/locales/sv.yml

@@ -82,8 +82,12 @@ sv:
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Sök %{collection} med titel, beskrivning, ID eller författarnamn.
       menu:
+        attachments: Bilagor
+        components: Komponenter
+        information: Information
         initiatives: Initiativ
         initiatives_types: Initiativtyper
+        moderations: Moderering
       models:
         initiatives:
           fields:
@@ -533,12 +537,6 @@ sv:
           vote: Underteckna
   layouts:
     decidim:
-      admin:
-        initiative:
-          attachments: Bilagor
-          committee_members: Kommittémedlemmar
-          components: Komponenter
-          information: Information
       initiative_creation_header:
         back: Tillbaka
         fill_data: Skapa

data/config/locales/tr-TR.yml

@@ -85,6 +85,8 @@ tr:
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: '%{collection} ''ı başlık, açıklama, kimlik veya yazar adına göre arayın.'
       menu:
+        components: Bileşenler
+        information: Bilgi
         initiatives: Girişimler
         initiatives_types: Girişim türleri
       models:
@@ -554,12 +556,6 @@ tr:
           vote: İmza
   layouts:
     decidim:
-      admin:
-        initiative:
-          attachments: Ekli Dosyalar
-          committee_members: Komite üyeleri
-          components: Bileşenler
-          information: Bilgi
       initiative_creation_header:
         back: Geri
         fill_data: Oluştur

data/config/locales/uk.yml

@@ -46,6 +46,8 @@ uk:
       actions:
         new_initiative_type: Додати різновид почину
       menu:
+        components: Складові
+        information: Відомості
         initiatives: Почини
         initiatives_types: Різновиди починів
       models:
@@ -304,11 +306,6 @@ uk:
       initiatives: Почини
   layouts:
     decidim:
-      admin:
-        initiative:
-          committee_members: Члени робочого гурту
-          components: Складові
-          information: Відомості
       initiative_creation_header:
         fill_data: Внести
         finish: Завершити

data/config/locales/zh-CN.yml

@@ -82,6 +82,8 @@ zh-CN:
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: 按标题、描述、ID或作者名称搜索 %{collection}。
       menu:
+        components: 组件
+        information: 信息
         initiatives: 倡议
         initiatives_types: 倡议类型
       models:
@@ -479,12 +481,6 @@ zh-CN:
           vote: 签名
   layouts:
     decidim:
-      admin:
-        initiative:
-          attachments: 附件
-          committee_members: 委员会成员
-          components: 组件
-          information: 信息
       initiative_creation_header:
         back: 后退
         fill_data: 创建

data/db/migrate/20191002082220_move_signature_type_to_initative_type.rb

@@ -22,7 +22,7 @@ class MoveSignatureTypeToInitativeType < ActiveRecord::Migration[5.2]
 
     InitiativesType.reset_column_information
 
-    Decidim::Initiatives::InitiativesType.find_each do |type|
+    InitiativesType.find_each do |type|
       type.signature_type = if type.online_signature_enabled && face_to_face_voting_allowed
                               :any
                             elsif type.online_signature_enabled && !face_to_face_voting_allowed

data/lib/decidim/api/initiative_api_type.rb

@@ -21,6 +21,10 @@ module Decidim
       field :signature_type, GraphQL::Types::String, "Signature type of the initiative", null: true
 
       field :initiatives, [Decidim::Initiatives::InitiativeType, { null: true }], "The initiatives that have this type", null: false
+
+      def banner_image
+        object.attached_uploader(:banner_image).path
+      end
     end
   end
 end

data/lib/decidim/initiatives/admin_engine.rb

@@ -44,6 +44,8 @@ module Decidim
             end
           end
 
+          resource :permissions, controller: "initiatives_permissions"
+
           resource :answer, only: [:edit, :update]
         end
 
@@ -79,41 +81,84 @@ module Decidim
         end
       end
 
-      initializer "admin_decidim_initiatives.assets" do |app|
-        app.config.assets.precompile += %w(
-          admin_decidim_initiatives_manifest.js
-        )
+      initializer "decidim_initiaves.admin_menu" do
+        Decidim.menu :admin_menu do |menu|
+          menu.add_item :initiatives,
+                        I18n.t("menu.initiatives", scope: "decidim.admin"),
+                        decidim_admin_initiatives.initiatives_path,
+                        icon_name: "chat",
+                        position: 2.4,
+                        active: :inclusive,
+                        if: allowed_to?(:enter, :space_area, space_name: :initiatives)
+        end
       end
 
-      initializer "admin_decidim_initiatives.action_controller" do |_app|
-        ActiveSupport.on_load :action_controller do
-          helper Decidim::Initiatives::Admin::InitiativeAdminMenuHelper if respond_to?(:helper)
+      initializer "admin_decidim_initiatives.admin_components_menu" do
+        Decidim.menu :admin_initiatives_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)),
+                          if: component.manifest.admin_engine # && user_role_config.component_is_accessible?(component.manifest_name)
+          end
         end
       end
 
-      initializer "decidim_initiaves.admin_menu" do
-        Decidim.menu :admin_menu do |menu|
-          menu.item I18n.t("menu.initiatives", scope: "decidim.admin"),
-                    decidim_admin_initiatives.initiatives_path,
-                    icon_name: "chat",
-                    position: 2.4,
-                    active: :inclusive,
-                    if: allowed_to?(:enter, :space_area, space_name: :initiatives)
+      initializer "admin_decidim_initiative.admin_menu" do
+        Decidim.menu :admin_initiative_menu do |menu|
+          menu.add_item :edit_initiative,
+                        I18n.t("menu.information", scope: "decidim.admin"),
+                        decidim_admin_initiatives.edit_initiative_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_initiatives.edit_initiative_path(current_participatory_space)),
+                        if: allowed_to?(:edit, :initiative, initiative: current_participatory_space)
+
+          menu.add_item :initiative_committee_requests,
+                        I18n.t("menu.committee_members", scope: "decidim.admin"),
+                        decidim_admin_initiatives.initiative_committee_requests_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_initiatives.initiative_committee_requests_path(current_participatory_space)),
+                        if: current_participatory_space.promoting_committee_enabled? && allowed_to?(:manage_membership, :initiative, initiative: current_participatory_space)
+
+          menu.add_item :components,
+                        I18n.t("menu.components", scope: "decidim.admin"),
+                        decidim_admin_initiatives.components_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_initiatives.components_path(current_participatory_space)),
+                        if: allowed_to?(:read, :component, initiative: current_participatory_space),
+                        submenu: { target_menu: :admin_initiatives_components_menu, options: { container_options: { id: "components-list" } } }
+
+          menu.add_item :initiative_attachments,
+                        I18n.t("menu.attachments", scope: "decidim.admin"),
+                        decidim_admin_initiatives.initiative_attachments_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_initiatives.initiative_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment, initiative: current_participatory_space)
+
+          menu.add_item :moderations,
+                        I18n.t("menu.moderations", scope: "decidim.admin"),
+                        decidim_admin_initiatives.moderations_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_initiatives.moderations_path(current_participatory_space)),
+                        if: allowed_to?(:read, :moderation)
         end
       end
 
       initializer "admin_decidim_initiatives.admin_menu" do
         Decidim.menu :admin_initiatives_menu do |menu|
-          menu.item I18n.t("menu.initiatives", scope: "decidim.admin"),
-                    decidim_admin_initiatives.initiatives_path,
-                    position: 1.0,
-                    active: is_active_link?(decidim_admin_initiatives.initiatives_path),
-                    if: allowed_to?(:index, :initiative)
-
-          menu.item I18n.t("menu.initiatives_types", scope: "decidim.admin"),
-                    decidim_admin_initiatives.initiatives_types_path,
-                    active: is_active_link?(decidim_admin_initiatives.initiatives_types_path),
-                    if: allowed_to?(:manage, :initiative_type)
+          menu.add_item :initiatives,
+                        I18n.t("menu.initiatives", scope: "decidim.admin"),
+                        decidim_admin_initiatives.initiatives_path,
+                        position: 1.0,
+                        active: is_active_link?(decidim_admin_initiatives.initiatives_path),
+                        if: allowed_to?(:index, :initiative)
+
+          menu.add_item :initiatives_types,
+                        I18n.t("menu.initiatives_types", scope: "decidim.admin"),
+                        decidim_admin_initiatives.initiatives_types_path,
+                        active: is_active_link?(decidim_admin_initiatives.initiatives_types_path),
+                        if: allowed_to?(:manage, :initiative_type)
         end
       end
     end

data/lib/decidim/initiatives/engine.rb

@@ -65,13 +65,6 @@ module Decidim
         end
       end
 
-      initializer "decidim_initiatives.assets" do |app|
-        app.config.assets.precompile += %w(
-          decidim_initiatives_manifest.js
-          decidim_initiatives_manifest.css
-        )
-      end
-
       initializer "decidim_initiatives.content_blocks" do
         Decidim.content_blocks.register(:homepage, :highlighted_initiatives) do |content_block|
           content_block.cell = "decidim/initiatives/content_blocks/highlighted_initiatives"
@@ -92,10 +85,11 @@ module Decidim
 
       initializer "decidim_initiatives.menu" do
         Decidim.menu :menu do |menu|
-          menu.item I18n.t("menu.initiatives", scope: "decidim"),
-                    decidim_initiatives.initiatives_path,
-                    position: 2.4,
-                    active: :inclusive
+          menu.add_item :initiatives,
+                        I18n.t("menu.initiatives", scope: "decidim"),
+                        decidim_initiatives.initiatives_path,
+                        position: 2.4,
+                        active: :inclusive
         end
       end
 

data/lib/decidim/initiatives/participatory_space.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:initiatives) do |participatory_space|
-  participatory_space.icon = "decidim/initiatives/icon.svg"
+  participatory_space.icon = "media/images/decidim_initiatives.svg"
   participatory_space.stylesheet = "decidim/initiatives/initiatives"
 
   participatory_space.context(:public) do |context|
@@ -21,6 +21,8 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
   participatory_space.query_type = "Decidim::Initiatives::InitiativeType"
 
   participatory_space.register_resource(:initiative) do |resource|
+    resource.actions = %w(comment)
+    resource.permissions_class_name = "Decidim::Initiatives::Permissions"
     resource.model_class_name = "Decidim::Initiative"
     resource.card = "decidim/initiatives/initiative"
     resource.searchable = true
@@ -59,7 +61,12 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
         title: Decidim::Faker::Localized.sentence(word_count: 5),
         description: Decidim::Faker::Localized.sentence(word_count: 25),
         organization: organization,
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg"))
+        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
+        )
       )
 
       organization.top_scopes.each do |scope|
@@ -104,7 +111,13 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
         title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: initiative,
-        file: File.new(File.join(seeds_root, "city.jpeg"))
+        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
+        )
       )
 
       Decidim::Initiatives.default_components.each do |component_name|

data/lib/decidim/initiatives/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.24.3"
+      "0.25.0.rc4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0.rc4
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,76 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: origami
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 description: Citizen initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -179,22 +159,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/admin_decidim_initiatives_manifest.js
-- app/assets/config/decidim_initiatives_manifest.css
-- app/assets/config/decidim_initiatives_manifest.js
-- app/assets/images/decidim/gamification/badges/initiatives.svg
-- app/assets/images/decidim/initiatives/icon.svg
-- app/assets/javascripts/decidim/initiatives/admin/initiatives_types.js.es6
-- app/assets/javascripts/decidim/initiatives/admin/invite_users.js
-- app/assets/javascripts/decidim/initiatives/application.js
-- app/assets/javascripts/decidim/initiatives/identity_selector_dialog.js
-- app/assets/javascripts/decidim/initiatives/scoped_type.js
-- app/assets/stylesheet/decidim/initiatives/admin.css.scss
-- app/assets/stylesheet/decidim/initiatives/initiatives-votes.css.scss
-- app/assets/stylesheet/decidim/initiatives/initiatives.scss
-- app/assets/stylesheet/decidim/initiatives/popularity_item.css.scss
-- app/assets/stylesheet/decidim/initiatives/print-initiative.css.scss
-- app/assets/stylesheet/decidim/initiatives/statistics.css.scss
 - app/cells/decidim/initiative_activity_cell.rb
 - app/cells/decidim/initiatives/content_blocks/highlighted_initiatives/show.erb
 - app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_cell.rb
@@ -242,6 +206,7 @@ files:
 - app/controllers/decidim/initiatives/admin/components_controller.rb
 - app/controllers/decidim/initiatives/admin/initiative_attachments_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_controller.rb
+- app/controllers/decidim/initiatives/admin/initiatives_permissions_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_types_permissions_controller.rb
@@ -278,7 +243,7 @@ files:
 - app/forms/decidim/initiatives/previous_form.rb
 - app/forms/decidim/initiatives/select_initiative_type_form.rb
 - app/forms/decidim/initiatives/vote_form.rb
-- app/helpers/decidim/initiatives/admin/initiative_admin_menu_helper.rb
+- app/helpers/decidim/initiatives/admin/initiatives_helper.rb
 - app/helpers/decidim/initiatives/application_helper.rb
 - app/helpers/decidim/initiatives/create_initiative_helper.rb
 - app/helpers/decidim/initiatives/initiative_helper.rb
@@ -291,6 +256,25 @@ files:
 - app/models/decidim/initiatives_type.rb
 - app/models/decidim/initiatives_type_scope.rb
 - app/models/decidim/initiatives_vote.rb
+- app/packs/entrypoints/decidim_initiatives.js
+- app/packs/entrypoints/decidim_initiatives_admin.js
+- app/packs/entrypoints/decidim_initiatives_initiatives_votes.js
+- app/packs/entrypoints/decidim_initiatives_initiatives_votes.scss
+- app/packs/entrypoints/decidim_initiatives_print.js
+- app/packs/entrypoints/decidim_initiatives_print.scss
+- app/packs/images/decidim/gamification/badges/decidim_gamification_badges_initiatives.svg
+- app/packs/images/decidim/initiatives/decidim_initiatives.svg
+- app/packs/src/decidim/initiatives/admin/initiatives_types.js
+- app/packs/src/decidim/initiatives/admin/invite_users.js
+- app/packs/src/decidim/initiatives/application.js
+- app/packs/src/decidim/initiatives/identity_selector_dialog.js
+- app/packs/src/decidim/initiatives/scoped_type.js
+- app/packs/stylesheets/decidim/initiatives/admin.scss
+- app/packs/stylesheets/decidim/initiatives/initiatives-votes.scss
+- app/packs/stylesheets/decidim/initiatives/initiatives.scss
+- app/packs/stylesheets/decidim/initiatives/popularity_item.scss
+- app/packs/stylesheets/decidim/initiatives/print-initiative.scss
+- app/packs/stylesheets/decidim/initiatives/statistics.scss
 - app/permissions/decidim/initiatives/admin/permissions.rb
 - app/permissions/decidim/initiatives/permissions.rb
 - app/presenters/decidim/initiative_presenter.rb
@@ -392,6 +376,7 @@ files:
 - app/views/layouts/decidim/initiative.html.erb
 - app/views/layouts/decidim/initiative_creation.html.erb
 - app/views/layouts/decidim/initiative_signature_creation.html.erb
+- config/assets.rb
 - config/initializers/mail_previews.rb
 - config/initializers/wicked_pdf.rb
 - config/locales/am-ET.yml
@@ -420,6 +405,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
@@ -430,10 +416,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
@@ -553,9 +539,9 @@ 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
 signing_key:

data/app/assets/config/admin_decidim_initiatives_manifest.js

@@ -1,4 +0,0 @@
-//= link decidim/initiatives/admin/invite_users.js
-//= link decidim/initiatives/admin/initiatives_types.js
-//= link decidim/initiatives/scoped_type.js
-//= link decidim/initiatives/print-initiative.css

data/app/assets/config/decidim_initiatives_manifest.css

@@ -1,3 +0,0 @@
-/*
- *= link decidim/initiatives/initiatives.css
- */

data/app/assets/config/decidim_initiatives_manifest.js

@@ -1,5 +0,0 @@
-//= link decidim/initiatives/application.js
-//= link decidim/initiatives/identity_selector_dialog.js
-//= link decidim/initiatives/scoped_type.js
-//= link decidim/initiatives/admin/invite_users.js
-//= link_tree ../images/decidim

data/app/assets/javascripts/decidim/initiatives/application.js

@@ -1 +0,0 @@
-// = require decidim/editor

data/app/helpers/decidim/initiatives/admin/initiative_admin_menu_helper.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Initiatives
-    module Admin
-      module InitiativeAdminMenuHelper
-        include Decidim::Admin::SidebarMenuHelper
-
-        def admin_initiatives_menu
-          @admin_initiatives_menu ||= sidebar_menu(:admin_initiatives_menu)
-        end
-      end
-    end
-  end
-end