decidim-assemblies 0.20.1 → 0.21.0

data/lib/decidim/assemblies/admin_engine.rb

@@ -15,6 +15,8 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
+        resources :assemblies_types
+
         resources :assemblies, param: :slug, except: [:show, :destroy] do
           resource :publish, controller: "assembly_publications", only: [:create, :destroy]
           resources :copies, controller: "assembly_copies", only: [:new, :create]

data/lib/decidim/assemblies/engine.rb

@@ -4,6 +4,7 @@ require "rails"
 require "active_support/all"
 
 require "decidim/core"
+require "decidim/assemblies/query_extensions"
 
 module Decidim
   module Assemblies
@@ -108,6 +109,12 @@ module Decidim
           end
         end
       end
+
+      initializer "decidim_assemblies.query_extensions" do
+        Decidim::Api::QueryType.define do
+          QueryExtensions.define(self)
+        end
+      end
     end
   end
 end

data/lib/decidim/assemblies/participatory_space.rb

@@ -10,6 +10,8 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
 
   participatory_space.permissions_class_name = "Decidim::Assemblies::Permissions"
 
+  participatory_space.query_type = "Decidim::Assemblies::AssemblyType"
+
   participatory_space.register_resource(:assembly) do |resource|
     resource.model_class_name = "Decidim::Assembly"
     resource.card = "decidim/assemblies/assembly"
@@ -68,8 +70,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         composition: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end,
-        assembly_type: "others",
-        assembly_type_other: Decidim::Faker::Localized.word,
+        assembly_type: Decidim::AssembliesType.create!(organization: organization, title: Decidim::Faker::Localized.word),
         creation_date: 1.day.from_now,
         created_by: "others",
         created_by_other: Decidim::Faker::Localized.word,

data/lib/decidim/assemblies/query_extensions.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This module's job is to extend the API with custom fields related to
+    # decidim-assemblies.
+    module QueryExtensions
+      # Public: Extends a type with `decidim-assemblies`'s fields.
+      #
+      # type - A GraphQL::BaseType to extend.
+      #
+      # Returns nothing.
+      def self.define(type)
+        type.field :assembliesTypes do
+          type !types[AssembliesTypeType]
+          description "Lists all assemblies types"
+
+          resolve lambda { |_obj, _args, ctx|
+            Decidim::AssembliesType.where(
+              organization: ctx[:current_organization]
+            )
+          }
+        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]
+            )
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,11 @@ FactoryBot.define do
     "#{Faker::Internet.slug(nil, "-")}-#{n}"
   end
 
+  factory :assemblies_type, class: "Decidim::AssembliesType" do
+    title { generate_localized_title }
+    organization
+  end
+
   factory :assembly, class: "Decidim::Assembly" do
     title { generate_localized_title }
     slug { generate(:assembly_slug) }
@@ -28,8 +33,6 @@ FactoryBot.define do
     private_space { false }
     purpose_of_action { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     composition { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    assembly_type { "others" }
-    assembly_type_other { generate_localized_title }
     creation_date { 1.month.ago }
     created_by { "others" }
     created_by_other { Decidim::Faker::Localized.word }
@@ -46,6 +49,10 @@ FactoryBot.define do
     youtube_handler { "others" }
     github_handler { "others" }
 
+    trait :with_type do
+      assembly_type { create :assemblies_type, organization: organization }
+    end
+
     trait :promoted do
       promoted { true }
     end
@@ -130,6 +137,21 @@ FactoryBot.define do
     end
   end
 
+  factory :assembly_valuator, parent: :user, class: "Decidim::User" do
+    transient do
+      assembly { create(:assembly) }
+    end
+
+    organization { assembly.organization }
+
+    after(:create) do |user, evaluator|
+      create :assembly_user_role,
+             user: user,
+             assembly: evaluator.assembly,
+             role: :valuator
+    end
+  end
+
   factory :assembly_member, class: "Decidim::AssemblyMember" do
     assembly { create(:assembly) }
 

data/lib/decidim/assemblies/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-08 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.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -83,21 +83,26 @@ files:
 - app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form_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
 - app/commands/decidim/assemblies/admin/create_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly_admin.rb
 - app/commands/decidim/assemblies/admin/create_assembly_member.rb
+- app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb
 - app/commands/decidim/assemblies/admin/destroy_assembly_admin.rb
 - app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
 - app/commands/decidim/assemblies/admin/publish_assembly.rb
 - app/commands/decidim/assemblies/admin/unpublish_assembly.rb
+- app/commands/decidim/assemblies/admin/update_assemblies_type.rb
 - app/commands/decidim/assemblies/admin/update_assembly.rb
 - app/commands/decidim/assemblies/admin/update_assembly_admin.rb
 - app/commands/decidim/assemblies/admin/update_assembly_member.rb
 - app/constraints/decidim/assemblies/current_assembly.rb
 - app/constraints/decidim/assemblies/current_component.rb
 - app/controllers/concerns/decidim/assemblies/admin/assembly_context.rb
+- app/controllers/concerns/decidim/assemblies/admin/filterable.rb
 - app/controllers/decidim/assemblies/admin/application_controller.rb
 - app/controllers/decidim/assemblies/admin/assemblies_controller.rb
+- app/controllers/decidim/assemblies/admin/assemblies_types_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_attachment_collections_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_attachments_controller.rb
 - app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb
@@ -116,6 +121,7 @@ files:
 - app/controllers/decidim/assemblies/assemblies_controller.rb
 - app/controllers/decidim/assemblies/assembly_members_controller.rb
 - app/controllers/decidim/assemblies/assembly_widgets_controller.rb
+- app/forms/decidim/assemblies/admin/assemblies_type_form.rb
 - app/forms/decidim/assemblies/admin/assembly_copy_form.rb
 - app/forms/decidim/assemblies/admin/assembly_form.rb
 - app/forms/decidim/assemblies/admin/assembly_member_form.rb
@@ -123,11 +129,13 @@ files:
 - app/helpers/decidim/assemblies/admin/assemblies_helper.rb
 - app/helpers/decidim/assemblies/assemblies_helper.rb
 - app/helpers/decidim/assemblies/filter_assemblies_helper.rb
+- app/models/decidim/assemblies_type.rb
 - app/models/decidim/assembly.rb
 - app/models/decidim/assembly_member.rb
 - app/models/decidim/assembly_user_role.rb
 - app/permissions/decidim/assemblies/permissions.rb
 - app/presenters/decidim/admin/assembly_member_presenter.rb
+- app/presenters/decidim/assemblies/admin_log/assemblies_type_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assembly_member_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb
 - app/presenters/decidim/assemblies/admin_log/assembly_user_role_presenter.rb
@@ -137,6 +145,7 @@ files:
 - app/presenters/decidim/assembly_member_presenter.rb
 - app/presenters/decidim/assembly_presenter.rb
 - app/presenters/decidim/log/value_types/assembly_presenter.rb
+- app/presenters/decidim/log/value_types/assembly_type_presenter.rb
 - app/queries/decidim/assemblies/admin/admin_users.rb
 - app/queries/decidim/assemblies/admin/assembly_members.rb
 - app/queries/decidim/assemblies/assemblies_with_user_role.rb
@@ -146,17 +155,25 @@ files:
 - app/queries/decidim/assemblies/organization_prioritized_assemblies.rb
 - app/queries/decidim/assemblies/organization_published_assemblies.rb
 - app/queries/decidim/assemblies/parent_assemblies.rb
+- app/queries/decidim/assemblies/parent_assemblies_for_select.rb
 - app/queries/decidim/assemblies/prioritized_assemblies.rb
 - app/queries/decidim/assemblies/promoted_assemblies.rb
 - app/queries/decidim/assemblies/published_assemblies.rb
 - app/queries/decidim/assemblies/visible_assemblies.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
 - app/views/decidim/assemblies/admin/assemblies/edit.html.erb
 - app/views/decidim/assemblies/admin/assemblies/index.html.erb
 - app/views/decidim/assemblies/admin/assemblies/new.html.erb
+- app/views/decidim/assemblies/admin/assemblies_types/_form.html.erb
+- app/views/decidim/assemblies/admin/assemblies_types/edit.html.erb
+- app/views/decidim/assemblies/admin/assemblies_types/index.html.erb
+- app/views/decidim/assemblies/admin/assemblies_types/new.html.erb
 - app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb
 - app/views/decidim/assemblies/admin/assembly_copies/new.html.erb
 - app/views/decidim/assemblies/admin/assembly_members/_form.html.erb
@@ -176,7 +193,6 @@ files:
 - app/views/decidim/assemblies/assemblies/index.js.erb
 - app/views/decidim/assemblies/assemblies/show.html.erb
 - app/views/decidim/assemblies/assembly_members/index.html.erb
-- app/views/decidim/assemblies/assembly_widgets/show.html.erb
 - app/views/decidim/assemblies/pages/user_profile/_member_of.html.erb
 - app/views/decidim/assembly_members/_assembly_member.html.erb
 - app/views/layouts/decidim/_assembly_header.html.erb
@@ -191,6 +207,7 @@ files:
 - config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - config/locales/es-MX.yml
@@ -227,6 +244,8 @@ files:
 - db/migrate/20180426162405_assembly_member_belongs_to_user.rb
 - db/migrate/20180515073049_update_assembly_members_index.rb
 - db/migrate/20190215093700_reset_negative_children_count_counters.rb
+- db/migrate/20200108113855_create_decidim_assembly_types.rb
+- db/migrate/20200108123050_migrate_decidim_assembly_types.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -236,6 +255,7 @@ files:
 - lib/decidim/assemblies/admin_engine.rb
 - lib/decidim/assemblies/engine.rb
 - lib/decidim/assemblies/participatory_space.rb
+- lib/decidim/assemblies/query_extensions.rb
 - lib/decidim/assemblies/test/factories.rb
 - lib/decidim/assemblies/version.rb
 homepage: https://github.com/decidim/decidim

data/app/views/decidim/assemblies/assembly_widgets/show.html.erb

@@ -1,11 +0,0 @@
-<% content_for(:header, "false") %>
-<% content_for(:title, translated_attribute(model.title)) %>
-<p class="card__desc"><%= decidim_sanitize html_truncate(translated_attribute(model.short_description), length: 630, separator: "...") %></p>
-<% content_for(:footer) do %>
-  <div class="card__support">
-    <span class="card--process__small"></span>
-    <%= link_to assembly_path(model), class: "card__button button small" do %>
-      <%= t("assembly_widgets.show.take_part", scope: "layouts.decidim") %>
-    <% end %>
-  </div>
-<% end %>