decidim-assemblies 0.23.3 → 0.24.0.rc1

data/lib/decidim/assemblies/query_extensions.rb

@@ -10,31 +10,50 @@ module Decidim
       # type - A GraphQL::BaseType to extend.
       #
       # Returns nothing.
-      def self.define(type)
-        type.field :assembliesTypes do
-          type !types[AssembliesTypeType]
-          description "Lists all assemblies types"
+      def self.included(type)
+        type.field :assemblies_types, [AssembliesTypeType], null: false, description: "Lists all assemblies types"
 
-          resolve lambda { |_obj, _args, ctx|
-            Decidim::AssembliesType.where(
-              organization: ctx[:current_organization]
-            )
-          }
+        type.field :assemblies_type, AssembliesTypeType, null: true, description: "Finds an assemblies type group" do
+          argument :id, GraphQL::Types::ID, description: "The ID of the Assemblies type", required: true
+        end
+        type.field :assemblies,
+                   [Decidim::Assemblies::AssemblyType],
+                   null: true,
+                   description: "Lists all assemblies" do
+          argument :filter, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputFilter, "This argument let's you filter the results", required: false
+          argument :order, Decidim::ParticipatoryProcesses::ParticipatoryProcessInputSort, "This argument let's you order the results", required: false
         end
 
-        type.field :assembliesType do
-          type AssembliesTypeType
-          description "Finds an assemblies type group"
-          argument :id, !types.ID, "The ID of the Assemblies type"
-
-          resolve lambda { |_obj, args, ctx|
-            Decidim::AssembliesType.find_by(
-              organization: ctx[:current_organization],
-              id: args[:id]
-            )
-          }
+        type.field :assembly,
+                   Decidim::Assemblies::AssemblyType,
+                   null: true,
+                   description: "Finds a assembly" do
+          argument :id, GraphQL::Types::ID, "The ID of the participatory space", required: false
         end
       end
+
+      def assemblies_types(*)
+        Decidim::AssembliesType.where(
+          organization: context[:current_organization]
+        )
+      end
+
+      def assemblies_type(id:)
+        Decidim::AssembliesType.find_by(
+          organization: context[:current_organization],
+          id: id
+        )
+      end
+
+      def assemblies(filter: {}, order: {})
+        manifest = Decidim.participatory_space_manifests.select { |m| m.name == :assemblies }.first
+        Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+      end
+
+      def assembly(id: nil)
+        manifest = Decidim.participatory_space_manifests.select { |m| m.name == :assemblies }.first
+        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id }, context)
+      end
     end
   end
 end

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

@@ -5,7 +5,7 @@ require "decidim/dev"
 
 FactoryBot.define do
   sequence(:assembly_slug) do |n|
-    "#{Faker::Internet.slug(nil, "-")}-#{n}"
+    "#{Decidim::Faker::Internet.slug(words: nil, glue: "-")}-#{n}"
   end
 
   factory :assemblies_setting, class: "Decidim::AssembliesSetting" do
@@ -53,6 +53,7 @@ FactoryBot.define do
     instagram_handler { "others" }
     youtube_handler { "others" }
     github_handler { "others" }
+    weight { 1 }
 
     trait :with_type do
       assembly_type { create :assemblies_type, organization: organization }
@@ -162,14 +163,14 @@ FactoryBot.define do
 
     full_name { Faker::Name.name }
     gender { Faker::Lorem.word }
-    birthday { Faker::Date.birthday(18, 65) }
+    birthday { Faker::Date.birthday(min_age: 18, max_age: 65) }
     birthplace { Faker::Lorem.word }
     position { Decidim::AssemblyMember::POSITIONS.first }
-    designation_date { Faker::Date.between(1.year.ago, 1.month.ago) }
+    designation_date { Faker::Date.between(from: 1.year.ago, to: 1.month.ago) }
     designation_mode { Faker::Lorem.word }
 
     trait :ceased do
-      ceased_date { Faker::Date.between(1.day.ago, 5.days.ago) }
+      ceased_date { Faker::Date.between(from: 1.day.ago, to: 5.days.ago) }
     end
 
     trait :with_user do

data/lib/decidim/assemblies/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.24.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-01 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.23.3
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.0.rc1
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -82,6 +82,10 @@ 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
@@ -121,6 +125,8 @@ files:
 - app/controllers/decidim/assemblies/admin/components_controller.rb
 - app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
 - app/controllers/decidim/assemblies/admin/exports_controller.rb
+- app/controllers/decidim/assemblies/admin/imports_controller.rb
+- app/controllers/decidim/assemblies/admin/moderations/reports_controller.rb
 - app/controllers/decidim/assemblies/admin/moderations_controller.rb
 - app/controllers/decidim/assemblies/admin/participatory_space_private_users_controller.rb
 - app/controllers/decidim/assemblies/admin/participatory_space_private_users_csv_imports_controller.rb
@@ -137,6 +143,7 @@ files:
 - app/forms/decidim/assemblies/admin/assembly_import_form.rb
 - app/forms/decidim/assemblies/admin/assembly_member_form.rb
 - app/forms/decidim/assemblies/admin/assembly_user_role_form.rb
+- app/helpers/decidim/assemblies/admin/assemblies_admin_menu_helper.rb
 - app/helpers/decidim/assemblies/admin/assemblies_helper.rb
 - app/helpers/decidim/assemblies/assemblies_helper.rb
 - app/helpers/decidim/assemblies/filter_assemblies_helper.rb
@@ -177,9 +184,6 @@ files:
 - app/serializers/decidim/assemblies/assembly_importer.rb
 - app/serializers/decidim/assemblies/assembly_serializer.rb
 - app/services/decidim/assemblies/assembly_search.rb
-- app/types/decidim/assemblies/assemblies_type_type.rb
-- app/types/decidim/assemblies/assembly_member_type.rb
-- app/types/decidim/assemblies/assembly_type.rb
 - app/views/decidim/assemblies/_assembly.html.erb
 - app/views/decidim/assemblies/_filter_by_type.html.erb
 - app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -208,7 +212,6 @@ files:
 - app/views/decidim/assemblies/assemblies/_nav_breadcumb.html.erb
 - app/views/decidim/assemblies/assemblies/_parent_assemblies.html.erb
 - app/views/decidim/assemblies/assemblies/_promoted_assembly.html.erb
-- app/views/decidim/assemblies/assemblies/_statistics.html.erb
 - app/views/decidim/assemblies/assemblies/index.html.erb
 - app/views/decidim/assemblies/assemblies/index.js.erb
 - app/views/decidim/assemblies/assemblies/show.html.erb
@@ -306,13 +309,18 @@ files:
 - db/migrate/20200320105907_index_foreign_keys_in_decidim_assembly_user_roles.rb
 - db/migrate/20200416132109_remove_legacy_decidim_assembly_type.rb
 - db/migrate/20200430202456_create_decidim_assemblies_settings.rb
+- db/migrate/20210204152393_add_weight_field_to_assembly.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
 - db/seeds/homepage_image.jpg
+- lib/decidim/api/assemblies_type_type.rb
+- lib/decidim/api/assembly_member_type.rb
+- lib/decidim/api/assembly_type.rb
 - lib/decidim/assemblies.rb
 - lib/decidim/assemblies/admin.rb
 - lib/decidim/assemblies/admin_engine.rb
+- lib/decidim/assemblies/api.rb
 - lib/decidim/assemblies/engine.rb
 - lib/decidim/assemblies/participatory_space.rb
 - lib/decidim/assemblies/query_extensions.rb
@@ -330,14 +338,14 @@ 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
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim assemblies module

data/app/types/decidim/assemblies/assemblies_type_type.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    # This type represents an AssembliesType.
-    AssembliesTypeType = GraphQL::ObjectType.define do
-      name "AssembliesType"
-      description "An assemblies type"
-
-      field :id, !types.ID, "The assemblies type's unique ID"
-      field :title, !Decidim::Core::TranslatedFieldType, "The title of this assemblies type."
-      field :createdAt, !Decidim::Core::DateTimeType, "The time this assemblies type was created", property: :created_at
-      field :updatedAt, !Decidim::Core::DateTimeType, "The time this assemblies type was updated", property: :updated_at
-      field :assemblies, !types[Decidim::Assemblies::AssemblyType], "Assemblies with this assemblies type"
-    end
-  end
-end

data/app/types/decidim/assemblies/assembly_member_type.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    # This type represents a assembly.
-    AssemblyMemberType = GraphQL::ObjectType.define do
-      name "AssemblyMember"
-      description "An assembly member"
-
-      field :id, !types.ID, "Internal ID of the member"
-      field :fullName, types.String, "Full name of the member", property: :full_name
-      field :position, types.String, "Position of the member in the assembly"
-
-      field :user, Decidim::Core::UserType, "The corresponding decidim user", property: :user
-
-      field :createdAt, Decidim::Core::DateTimeType, "The time this member was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "The time this member was updated", property: :updated_at
-
-      field :weight, types.Int, "Order of appearance in which it should be represented"
-      field :gender, types.String, "Gender of the member"
-      # field :birthday, Decidim::Core::DateType, "Birthday date of the member" # non-public currently
-      field :birthplace, types.String, "Birthplace of the member"
-      field :designationDate, Decidim::Core::DateType, "Date of designation of the member", property: :designation_date
-      # field :designationMode, types.String, "Mode in which the member was designated", property: :designation_mode # non-public currently
-      field :positionOther, types.String, "Custom position name", property: :position_other
-      field :ceasedDate, Decidim::Core::DateType, "Date of cease for the member", property: :ceased_date
-    end
-  end
-end

data/app/types/decidim/assemblies/assembly_type.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    # This type represents a assembly.
-    AssemblyType = GraphQL::ObjectType.define do
-      interfaces [
-        -> { Decidim::Core::ParticipatorySpaceInterface },
-        -> { Decidim::Core::AttachableInterface },
-        -> { Decidim::Core::ParticipatorySpaceResourceableInterface }
-      ]
-
-      name "Assembly"
-      description "An assembly"
-
-      field :id, !types.ID, "The internal ID for this assembly"
-      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this assembly"
-      field :shortDescription, Decidim::Core::TranslatedFieldType, "The sort description of this assembly", property: :short_description
-      field :description, Decidim::Core::TranslatedFieldType, "The description of this assembly"
-      field :slug, !types.String, "The slug of this assembly"
-      field :hashtag, types.String, "The hashtag for this assembly"
-      field :createdAt, !Decidim::Core::DateTimeType, "The time this assembly was created", property: :created_at
-      field :updatedAt, !Decidim::Core::DateTimeType, "The time this assembly was updated", property: :updated_at
-      field :publishedAt, !Decidim::Core::DateTimeType, "The time this assembly was published", property: :published_at
-      field :reference, !types.String, "Reference for this assembly"
-      field :categories, !types[Decidim::Core::CategoryType], "Categories for this assembly"
-
-      field :heroImage, types.String, "The hero image for this assembly", property: :hero_image
-      field :bannerImage, types.String, "The banner image for this assembly", property: :banner_image
-      field :promoted, types.Boolean, "If this assembly is promoted (therefore in the homepage)"
-      field :developerGroup, Decidim::Core::TranslatedFieldType, "The promoter group of this assembly", property: :developer_group
-      field :metaScope, Decidim::Core::TranslatedFieldType, "The scope metadata of this assembly", property: :meta_scope
-      field :localArea, Decidim::Core::TranslatedFieldType, "The organization area of this assembly", property: :local_area
-      field :target, Decidim::Core::TranslatedFieldType, "Who participates in this assembly"
-      field :participatoryScope, Decidim::Core::TranslatedFieldType, "What is decided on this assembly", property: :participatory_scope
-      field :participatoryStructure, Decidim::Core::TranslatedFieldType, "How it is decided on this assembly", property: :participatory_structure
-      field :showStatistics, types.Boolean, "If this assembly should show statistics", property: :show_statistics
-      field :scopesEnabled, types.Boolean, "If this assembly has scopes enabled", property: :scopes_enabled
-      field :privateSpace, types.Boolean, "If this assembly is a private space", property: :private_space
-      field :area, Decidim::Core::AreaApiType, "Area of this assembly"
-      field :parent, Decidim::Assemblies::AssemblyType, "The parent assembly of this assembly"
-      field :parentsPath, types.String, "Assembly hierarchy representation", property: :parents_path
-      field :childrenCount, types.Int, "Number of children assemblies", property: :children_count
-      field :purposeOfAction, Decidim::Core::TranslatedFieldType, "Purpose of action", property: :purpose_of_action
-      field :composition, Decidim::Core::TranslatedFieldType, "Composition of this assembly"
-      field :assemblyType, Decidim::Assemblies::AssembliesTypeType, "Type of the assembly", property: :assembly_type
-      field :creationDate, Decidim::Core::DateType, "Creation date of this assembly", property: :creation_date
-      field :createdBy, types.String, "The creator of this assembly", property: :created_by
-      field :createdByOther, Decidim::Core::TranslatedFieldType, "Custom creator", property: :created_by_other
-      field :duration, Decidim::Core::DateType, "Duration of this assembly"
-      field :includedAt, Decidim::Core::DateType, "Included at", property: :included_at
-      field :closingDate, Decidim::Core::DateType, "Closing date of the assembly", property: :closing_date
-      field :closingDateReason, Decidim::Core::TranslatedFieldType, "Closing date reason of this assembly", property: :closing_date_reason
-      field :internalOrganisation, Decidim::Core::TranslatedFieldType, "Internal organisation of this assembly", property: :internal_organisation
-      field :isTransparent, types.Boolean, "If this assembly is transparent", property: :is_transparent
-      field :specialFeatures, Decidim::Core::TranslatedFieldType, "Special features of this assembly", property: :special_features
-      field :twitterHandler, types.String, "Twitter handler", property: :twitter_handler
-      field :instagramHandler, types.String, "Instagram handler", property: :instagram_handler
-      field :facebookHandler, types.String, "Facebook handler", property: :facebook_handler
-      field :youtubeHandler, types.String, "Youtube handler", property: :youtube_handler
-      field :githubHandler, types.String, "Github handler", property: :github_handler
-
-      field :members, !types[Decidim::Assemblies::AssemblyMemberType], "Members of this assembly"
-      field :children, !types[Decidim::Assemblies::AssemblyType], "Childrens of this assembly"
-    end
-  end
-end

data/app/views/decidim/assemblies/assemblies/_statistics.html.erb

@@ -1,10 +0,0 @@
-<section class="extended" id="assembly-statistics" class="statistics">
-  <div class="row column">
-    <h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.assemblies") %></h4>
-  </div>
-  <div class="row">
-    <div class="columns small-centered mediumlarge-12 large-12 process_stats">
-      <%= stats.highlighted %>
-    </div>
-  </div>
-</section>