decidim-initiatives 0.23.0 → 0.24.0.rc1

data/lib/decidim/initiatives/initiatives_filter_form_builder.rb

@@ -16,6 +16,24 @@ module Decidim
       def initiative_types_select(name, collection, options = {})
         selected = object.send(name)
 
+        types = types_for_options_for_select(selected, collection)
+
+        prompt = options.delete(:prompt)
+        remote_path = options.delete(:remote_path) || false
+        multiple = options.delete(:multiple) || false
+        html_options = {
+          multiple: multiple,
+          class: "select2",
+          "data-remote-path" => remote_path,
+          "data-placeholder" => prompt
+        }
+
+        select(name, @template.options_for_select(types, selected: selected), options, html_options)
+      end
+
+      private
+
+      def types_for_options_for_select(selected, collection)
         if selected.present?
           if selected == "all"
             types = collection.all.map do |type|
@@ -31,18 +49,7 @@ module Decidim
         else
           types = []
         end
-
-        prompt = options.delete(:prompt)
-        remote_path = options.delete(:remote_path) || false
-        multiple = options.delete(:multiple) || false
-        html_options = {
-          multiple: multiple,
-          class: "select2",
-          "data-remote-path" => remote_path,
-          "data-placeholder" => prompt
-        }
-
-        select(name, @template.options_for_select(types, selected: selected), options, html_options)
+        types
       end
     end
   end

data/lib/decidim/initiatives/participatory_space.rb

@@ -56,8 +56,8 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
 
     3.times do |n|
       type = Decidim::InitiativesType.create!(
-        title: Decidim::Faker::Localized.sentence(5),
-        description: Decidim::Faker::Localized.sentence(25),
+        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"))
       )
@@ -76,8 +76,8 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
       Decidim::Initiative.skip_callback(:create, :after, :notify_creation, raise: false)
 
       params = {
-        title: Decidim::Faker::Localized.sentence(3),
-        description: Decidim::Faker::Localized.sentence(25),
+        title: Decidim::Faker::Localized.sentence(word_count: 3),
+        description: Decidim::Faker::Localized.sentence(word_count: 25),
         scoped_type: Decidim::InitiativesTypeScope.reorder(Arel.sql("RANDOM()")).first,
         state: state,
         signature_type: "online",
@@ -101,8 +101,8 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
       Decidim::Comments::Seed.comments_for(initiative)
 
       Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(2),
-        description: Decidim::Faker::Localized.sentence(5),
+        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"))
       )

data/lib/decidim/initiatives/query_extensions.rb

@@ -10,31 +10,54 @@ module Decidim
       # type - A GraphQL::BaseType to extend.
       #
       # Returns nothing.
-      def self.define(type)
-        type.field :initiativesTypes do
-          type !types[InitiativeApiType]
+      def self.included(type)
+        type.field :initiatives_types, [InitiativeApiType], null: false do
           description "Lists all initiative types"
+        end
+
+        type.field :initiatives_type, InitiativeApiType, null: true, description: "Finds a initiative type" do
+          argument :id, GraphQL::Types::ID, "The ID of the initiative type", required: true
+        end
 
-          resolve lambda { |_obj, _args, ctx|
-            Decidim::InitiativesType.where(
-              organization: ctx[:current_organization]
-            )
-          }
+        type.field :initiatives,
+                   [Decidim::Initiatives::InitiativeType],
+                   null: true,
+                   description: "Lists all initiatives" do
+          argument :filter, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputFilter, "This argument lets you filter the results", required: false
+          argument :order, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputSort, "This argument lets you order the results", required: false
         end
 
-        type.field :initiativesType do
-          type InitiativeApiType
-          description "Finds a initiative type"
-          argument :id, !types.ID, "The ID of the initiative type"
-
-          resolve lambda { |_obj, args, ctx|
-            Decidim::InitiativesType.find_by(
-              organization: ctx[:current_organization],
-              id: args[:id]
-            )
-          }
+        type.field :initiative,
+                   Decidim::Initiatives::InitiativeType,
+                   null: true,
+                   description: "Finds a initiative" do
+          argument :id, GraphQL::Types::ID, "The ID of the participatory space", required: false
         end
       end
+
+      def initiatives_types
+        Decidim::InitiativesType.where(
+          organization: context[:current_organization]
+        )
+      end
+
+      def initiatives_type(id:)
+        Decidim::InitiativesType.find_by(
+          organization: context[:current_organization],
+          id: id
+        )
+      end
+
+      def initiatives(filter: {}, order: {})
+        manifest = Decidim.participatory_space_manifests.select { |m| m.name == :initiatives }.first
+        Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+      end
+
+      def initiative(id: nil)
+        manifest = Decidim.participatory_space_manifests.select { |m| m.name == :initiatives }.first
+
+        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id }, context)
+      end
     end
   end
 end

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

@@ -190,6 +190,42 @@ FactoryBot.define do
                type: create(:initiatives_type, :with_user_extra_fields_collection, organization: organization))
       end
     end
+
+    trait :with_area do
+      area { create(:area, organization: organization) }
+    end
+
+    trait :with_documents do
+      transient do
+        documents_number { 2 }
+      end
+
+      after :create do |initiative, evaluator|
+        evaluator.documents_number.times do
+          initiative.attachments << create(
+            :attachment,
+            :with_pdf,
+            attached_to: initiative
+          )
+        end
+      end
+    end
+
+    trait :with_photos do
+      transient do
+        photos_number { 2 }
+      end
+
+      after :create do |initiative, evaluator|
+        evaluator.photos_number.times do
+          initiative.attachments << create(
+            :attachment,
+            :with_image,
+            attached_to: initiative
+          )
+        end
+      end
+    end
   end
 
   factory :initiative_user_vote, class: "Decidim::InitiativesVote" do

data/lib/decidim/initiatives/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.23.0"
+      "0.24.0.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0.rc1
 description: Citizen initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -216,10 +216,14 @@ files:
 - app/commands/decidim/initiatives/admin/update_initiative_answer.rb
 - app/commands/decidim/initiatives/admin/update_initiative_type.rb
 - app/commands/decidim/initiatives/admin/update_initiative_type_scope.rb
+- app/commands/decidim/initiatives/approve_membership_request.rb
 - app/commands/decidim/initiatives/attachment_methods.rb
 - app/commands/decidim/initiatives/create_initiative.rb
+- app/commands/decidim/initiatives/revoke_membership_request.rb
+- app/commands/decidim/initiatives/send_initiative_to_technical_validation.rb
 - app/commands/decidim/initiatives/spawn_committee_request.rb
 - app/commands/decidim/initiatives/unvote_initiative.rb
+- app/commands/decidim/initiatives/update_initiative.rb
 - app/commands/decidim/initiatives/validate_mobile_phone.rb
 - app/commands/decidim/initiatives/validate_sms_code.rb
 - app/commands/decidim/initiatives/vote_initiative.rb
@@ -241,6 +245,7 @@ files:
 - 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
+- app/controllers/decidim/initiatives/admin/moderations/reports_controller.rb
 - app/controllers/decidim/initiatives/admin/moderations_controller.rb
 - app/controllers/decidim/initiatives/application_controller.rb
 - app/controllers/decidim/initiatives/authorization_sign_modals_controller.rb
@@ -256,10 +261,14 @@ files:
 - app/controllers/decidim/initiatives/widgets_controller.rb
 - app/events/decidim/initiatives/admin/initiative_sent_to_technical_validation_event.rb
 - app/events/decidim/initiatives/admin/support_threshold_reached_event.rb
+- app/events/decidim/initiatives/approve_membership_request_event.rb
 - app/events/decidim/initiatives/create_initiative_event.rb
 - app/events/decidim/initiatives/endorse_initiative_event.rb
 - app/events/decidim/initiatives/extend_initiative_event.rb
+- app/events/decidim/initiatives/initiative_sent_to_technical_validation_event.rb
 - app/events/decidim/initiatives/milestone_completed_event.rb
+- app/events/decidim/initiatives/revoke_membership_request_event.rb
+- app/events/decidim/initiatives/spawn_committee_request_event.rb
 - app/forms/decidim/initiatives/admin/initiative_answer_form.rb
 - app/forms/decidim/initiatives/admin/initiative_form.rb
 - app/forms/decidim/initiatives/admin/initiative_type_form.rb
@@ -269,6 +278,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/application_helper.rb
 - app/helpers/decidim/initiatives/create_initiative_helper.rb
 - app/helpers/decidim/initiatives/initiative_helper.rb
@@ -305,9 +315,6 @@ files:
 - app/services/decidim/initiatives/pdf_signature_example.rb
 - app/services/decidim/initiatives/progress_notifier.rb
 - app/services/decidim/initiatives/status_change_notifier.rb
-- app/types/decidim/initiatives/initiative_api_type.rb
-- app/types/decidim/initiatives/initiative_committee_member_type.rb
-- app/types/decidim/initiatives/initiative_type.rb
 - app/views/decidim/initiatives/_initiative.html.erb
 - app/views/decidim/initiatives/admin/answers/_info_initiative.html.erb
 - app/views/decidim/initiatives/admin/answers/edit.html.erb
@@ -337,6 +344,7 @@ files:
 - app/views/decidim/initiatives/create_initiative/select_initiative_type.html.erb
 - app/views/decidim/initiatives/create_initiative/show_similar_initiatives.html.erb
 - app/views/decidim/initiatives/initiative_signatures/_wizard_steps.html.erb
+- app/views/decidim/initiatives/initiative_signatures/error_on_vote.js.erb
 - app/views/decidim/initiatives/initiative_signatures/fill_personal_data.html.erb
 - app/views/decidim/initiatives/initiative_signatures/finish.html.erb
 - app/views/decidim/initiatives/initiative_signatures/sms_code.html.erb
@@ -344,9 +352,11 @@ files:
 - app/views/decidim/initiatives/initiative_signatures/update_buttons_and_counters.js.erb
 - app/views/decidim/initiatives/initiative_votes/update_buttons_and_counters.js.erb
 - app/views/decidim/initiatives/initiatives/_author.html.erb
+- app/views/decidim/initiatives/initiatives/_committee_members.html.erb
 - app/views/decidim/initiatives/initiatives/_count.html.erb
 - app/views/decidim/initiatives/initiatives/_filters.html.erb
 - app/views/decidim/initiatives/initiatives/_filters_small_view.html.erb
+- app/views/decidim/initiatives/initiatives/_form.html.erb
 - app/views/decidim/initiatives/initiatives/_index_header.html.erb
 - app/views/decidim/initiatives/initiatives/_initiative_badge.html.erb
 - app/views/decidim/initiatives/initiatives/_initiatives.html.erb
@@ -355,11 +365,14 @@ files:
 - app/views/decidim/initiatives/initiatives/_no_initiatives_yet.html.erb
 - app/views/decidim/initiatives/initiatives/_progress_bar.html.erb
 - app/views/decidim/initiatives/initiatives/_result.html.erb
+- app/views/decidim/initiatives/initiatives/_send_to_technical_validation.html.erb
 - app/views/decidim/initiatives/initiatives/_tags.html.erb
 - app/views/decidim/initiatives/initiatives/_vote_button.html.erb
 - app/views/decidim/initiatives/initiatives/_vote_cabin.html.erb
+- app/views/decidim/initiatives/initiatives/edit.html.erb
 - app/views/decidim/initiatives/initiatives/index.html.erb
 - app/views/decidim/initiatives/initiatives/index.js.erb
+- app/views/decidim/initiatives/initiatives/print.html.erb
 - app/views/decidim/initiatives/initiatives/show.html.erb
 - app/views/decidim/initiatives/initiatives_mailer/_initiative_link.html.erb
 - app/views/decidim/initiatives/initiatives_mailer/notify_creation.html.erb
@@ -434,12 +447,14 @@ files:
 - config/locales/pt.yml
 - config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/si-LK.yml
 - config/locales/sk-SK.yml
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/sw-KE.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -505,6 +520,9 @@ files:
 - db/migrate/20200827154214_add_commentable_counter_cache_to_initiatives.rb
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
+- lib/decidim/api/initiative_api_type.rb
+- lib/decidim/api/initiative_committee_member_type.rb
+- lib/decidim/api/initiative_type.rb
 - lib/decidim/api/initiative_type_interface.rb
 - lib/decidim/initiatives.rb
 - lib/decidim/initiatives/admin.rb
@@ -523,7 +541,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -531,15 +549,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      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.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Decidim initiatives module
 test_files: []

data/app/types/decidim/initiatives/initiative_api_type.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Initiatives
-    InitiativeApiType = GraphQL::ObjectType.define do
-      name "InitiativeType"
-      description "An initiative type"
-
-      field :id, !types.ID, "The internal ID for this initiative type"
-      field :title, Decidim::Core::TranslatedFieldType, "Initiative type name"
-      field :description, Decidim::Core::TranslatedFieldType, "This is the initiative type description"
-      field :createdAt, Decidim::Core::DateTimeType, "The date this initiative type was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "The date this initiative type was updated", property: :updated_at
-      field :bannerImage, types.String, "Banner image", property: :banner_image
-      field :collectUserExtraFields, types.Boolean, "Collect participant personal data on signature", property: :collect_user_extra_fields
-      field :extraFieldsLegalInformation, types.String, "Legal information about the collection of personal data", property: :extra_fields_legal_information
-      field :minimumCommitteeMembers, types.Int, "Minimum of committee members", property: :minimum_committee_members
-      field :validateSmsCodeOnVotes, types.Boolean, "Add SMS code validation step to signature process", property: :validate_sms_code_on_votes
-      field :undoOnlineSignaturesEnabled, types.Boolean, "Enable participants to undo their online signatures", property: :undo_online_signatures_enabled
-      field :promotingComitteeEnabled, types.Boolean, "If promoting committee is enabled", property: :promoting_committee_enabled
-      field :signatureType, types.String, "Signature type of the initiative", property: :signature_type
-
-      field :initiatives, !types[Decidim::Initiatives::InitiativeType], "The initiatives that have this type"
-    end
-  end
-end