decidim-sortitions 0.23.6 → 0.24.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58f70f3c5a38eb41682275c0cf0355ca2cc7da4bee496576bfbc5c4f3b6b7184
-  data.tar.gz: 17be53af4a57f48f493964cff89095f806df5b280cc04be2a0bfebec4ed5eb41
+  metadata.gz: '095adb49e1dfae6f8e713f3769d97c4118f7ccadc98c420bb2d4571daa74c133'
+  data.tar.gz: c09f5f0eeb89f08e43f7812b2528d1363e8ba853eeb124fc32730d78b8b67fbd
 SHA512:
-  metadata.gz: ab4b3c7b80b97ec4ec6e194fb41b8dca779da8e09ec9627d2fdc460de4da043a6e397f0171a200bdcf89b8050e406b358840d2e4f1c520b64145194a15dbd537
-  data.tar.gz: 175ce47cabbcfa49dc4dc7b27424aa5991f07ec4b108516cb9093b11d6d6c6d909168a9290d966ada39040f8a38c49c1988aefa3f6c02fe012fc83f1a5b10d63
+  metadata.gz: 69da4c44caeb9c76ffdfcd74cd4ca77e3b231c818a7e2b4f06ec03e0844730f43878aefe175fb465eb2e233cdebcd3b013b54c61947b70162192a46718523b8a
+  data.tar.gz: c6371b962f6395ee9aeca3368a5d6ad0f02a1307b0e4787a3e02e382ffb502edd39b3d1d9b075c59088f95dd5b263ce931ecd77e9738471bbba3e9f933d60ba3

data/app/models/decidim/sortitions/sortition.rb

@@ -20,11 +20,9 @@ module Decidim
       translatable_fields :title, :witnesses, :additional_info, :cancel_reason
 
       belongs_to :decidim_proposals_component,
-                 foreign_key: "decidim_proposals_component_id",
                  class_name: "Decidim::Component"
 
       belongs_to :cancelled_by_user,
-                 foreign_key: "cancelled_by_user_id",
                  class_name: "Decidim::User",
                  optional: true
 

data/app/queries/decidim/sortitions/admin/participatory_space_proposals.rb

@@ -42,7 +42,7 @@ module Decidim
             .not_hidden
             .where(component: sortition.decidim_proposals_component)
             .where("decidim_proposals_proposals.created_at < ?", request_timestamp)
-            .where("decidim_categorizations.decidim_category_id = ?", category.id)
+            .where(decidim_categorizations: { decidim_category_id: category.id })
             .order(id: :asc)
         end
 

data/app/views/decidim/sortitions/admin/sortitions/index.html.erb

@@ -38,13 +38,17 @@
                                 edit_sortition_path(sortition),
                                 t("actions.edit", scope: "decidim.sortitions.admin"),
                                 class: "action-icon--edit" %>
-             <% end %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
               <% if allowed_to? :destroy, :sortition, sortition: sortition %>
                 <%= icon_link_to "circle-x",
                                  confirm_destroy_sortition_path(sortition),
                                  t("actions.destroy", scope: "decidim.sortitions.admin"),
                                  class: "action-icon--remove" %>
+              <% else %>
+                 <span class="action-space icon"></span>
               <% end %>
             </td>
           </tr>

data/config/locales/ca.yml

@@ -140,8 +140,8 @@ ca:
         sortition:
           random_seed: Llavor aleatòria
           selected_proposals:
-            one: proposta seleccionada
-            other: propostes seleccionades
+            one: 1 proposta seleccionada
+            other: '%{count} propostes seleccionades'
           view: Veure
         sortition_author:
           deleted: Participant eliminada

data/config/locales/es.yml

@@ -141,7 +141,7 @@ es:
           random_seed: Semilla aleatoria
           selected_proposals:
             one: 1 propuesta seleccionada
-            other: propuestas seleccionadas
+            other: '%{count} propuestas seleccionadas'
           view: Ver
         sortition_author:
           deleted: Participante eliminada

data/config/locales/fi-plain.yml

@@ -37,7 +37,7 @@ fi-pl:
           sortitions_count: Satunnaistamiset
     participatory_processes:
       statistics:
-        sortitions_count: Satunnaistamiset
+        sortitions_count: Satunnaistamisia
     sortitions:
       admin:
         actions:

data/config/locales/fi.yml

@@ -34,10 +34,10 @@ fi:
     pages:
       home:
         statistics:
-          sortitions_count: Satunnaistamiset
+          sortitions_count: Satunnaistamisia
     participatory_processes:
       statistics:
-        sortitions_count: Satunnaistamiset
+        sortitions_count: Satunnaistamista
     sortitions:
       admin:
         actions:

data/config/locales/is-IS.yml

@@ -22,10 +22,6 @@ is-IS:
           email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með "%{participatory_space_title}". Þú getur sleppt því frá fyrri tengilinn.
           email_subject: Ný flokkun bætt við %{participatory_space_title}
           notification_title: Flokkunin <a href="%{resource_path}">%{resource_title}</a> hefur verið bætt við %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          sortitions_count: Flokkanir
     participatory_processes:
       statistics:
         sortitions_count: Flokkanir

data/config/locales/nl.yml

@@ -34,10 +34,10 @@ nl:
     pages:
       home:
         statistics:
-          sortitions_count: Loting
+          sortitions_count: Sortitions
     participatory_processes:
       statistics:
-        sortitions_count: Loting
+        sortitions_count: Lotingen
     sortitions:
       admin:
         actions:

data/config/locales/pl.yml

@@ -36,10 +36,10 @@ pl:
     pages:
       home:
         statistics:
-          sortitions_count: Wybory losowe
+          sortitions_count: Wybór losowy
     participatory_processes:
       statistics:
-        sortitions_count: Wybory losowe
+        sortitions_count: Wybór losowy
     sortitions:
       admin:
         actions:

data/config/locales/ru.yml

@@ -35,10 +35,10 @@ ru:
     pages:
       home:
         statistics:
-          sortitions_count: Жеребьевки
+          sortitions_count: Жеребьевок
     participatory_processes:
       statistics:
-        sortitions_count: Жеребьевки
+        sortitions_count: Жеребьевок
     sortitions:
       admin:
         actions:

data/config/locales/uk.yml

@@ -35,10 +35,10 @@ uk:
     pages:
       home:
         statistics:
-          sortitions_count: Жеребкування
+          sortitions_count: Жеребкувань
     participatory_processes:
       statistics:
-        sortitions_count: Жеребкування
+        sortitions_count: Жеребкувань
     sortitions:
       admin:
         actions:

data/lib/decidim/api/sortition_type.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Sortitions
+    class SortitionType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::AuthorableInterface
+      implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::CategorizableInterface
+
+      description "A sortition"
+
+      field :id, GraphQL::Types::ID, "The internal ID for this sortition", null: false
+      field :dice, GraphQL::Types::Int, "The dice for this sortition", null: true
+      field :target_items, GraphQL::Types::Int, "The target items for this sortition", null: true
+      field :request_timestamp, Decidim::Core::DateType, "The request time stamp for this request", null: true
+      field :selected_proposals, [GraphQL::Types::Int, { null: true }], "The selected proposals for this sortition", null: true
+      field :created_at, Decidim::Core::DateTimeType, "When this sortition was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "When this sortition was updated", null: true
+      field :witnesses, Decidim::Core::TranslatedFieldType, "The witnesses for this sortition", null: true
+      field :additional_info, Decidim::Core::TranslatedFieldType, "The additional info for this sortition", null: true
+      field :reference, GraphQL::Types::String, "The reference for this sortition", null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this sortition", null: true
+      field :cancel_reason, Decidim::Core::TranslatedFieldType, "The cancel reason for this sortition", null: true
+      field :cancelled_on, Decidim::Core::DateType, "When this sortition was cancelled", null: true
+      field :cancelled_by_user, Decidim::Core::UserType, "Who cancelled this sortition", null: true
+      field :candidate_proposals, [GraphQL::Types::Int, { null: true }], "The candidate proposal for this sortition", null: true
+    end
+  end
+end

data/lib/decidim/api/sortitions_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Sortitions
+    class SortitionsType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
+
+      graphql_name "Sortitions"
+      description "A sortition component of a participatory space."
+
+      field :sortitions, Decidim::Sortitions::SortitionType.connection_type, null: true, connection: true
+
+      def sortitions
+        Sortition.where(component: object).includes(:component)
+      end
+
+      field :sortition, Decidim::Sortitions::SortitionType, null: true do
+        argument :id, GraphQL::Types::ID, required: true
+      end
+
+      def sortition(**args)
+        Sortition.where(component: object).find_by(id: args[:id])
+      end
+    end
+  end
+end

data/lib/decidim/sortitions/api.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Sortitions
+    autoload :SortitionType, "decidim/api/sortition_type"
+    autoload :SortitionsType, "decidim/api/sortitions_type"
+  end
+end

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

@@ -20,8 +20,8 @@ FactoryBot.define do
       create(:user, :admin, organization: component.organization) if component
     end
 
-    dice { Faker::Number.between(1, 6).to_i }
-    target_items { Faker::Number.between(1, 5).to_i }
+    dice { Faker::Number.between(from: 1, to: 6).to_i }
+    target_items { Faker::Number.between(from: 1, to: 5).to_i }
     request_timestamp { Time.now.utc }
     witnesses { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     additional_info { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }

data/lib/decidim/sortitions/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     def self.version
-      "0.23.6"
+      "0.24.0.rc1"
     end
   end
 end

data/lib/decidim/sortitions.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/sortitions/admin"
+require "decidim/sortitions/api"
 require "decidim/sortitions/engine"
 require "decidim/sortitions/admin_engine"
 require "decidim/sortitions/component"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-sortitions
 version: !ruby/object:Gem::Version
-  version: 0.23.6
+  version: 0.24.0.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        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.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        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.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        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.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 description: This module makes possible to select amont a set of proposal by sortition
 email:
 - jsperezg@gmail.com
@@ -121,8 +121,6 @@ files:
 - app/queries/decidim/sortitions/filtered_sortitions.rb
 - app/services/decidim/sortitions/admin/draw.rb
 - app/services/decidim/sortitions/sortition_search.rb
-- app/types/decidim/sortitions/sortition_type.rb
-- app/types/decidim/sortitions/sortitions_type.rb
 - app/views/decidim/sortitions/admin/sortitions/_form.html.erb
 - app/views/decidim/sortitions/admin/sortitions/confirm_destroy.html.erb
 - app/views/decidim/sortitions/admin/sortitions/edit.html.erb
@@ -230,9 +228,12 @@ files:
 - db/migrate/20181017110803_make_sortitions_authors_polymorphic.rb
 - db/migrate/20200320105926_index_foreign_keys_in_decidim_sortitions_sortitions.rb
 - db/migrate/20200827154036_add_commentable_counter_cache_to_sortitions.rb
+- lib/decidim/api/sortition_type.rb
+- lib/decidim/api/sortitions_type.rb
 - lib/decidim/sortitions.rb
 - lib/decidim/sortitions/admin.rb
 - lib/decidim/sortitions/admin_engine.rb
+- lib/decidim/sortitions/api.rb
 - lib/decidim/sortitions/component.rb
 - lib/decidim/sortitions/engine.rb
 - lib/decidim/sortitions/test/factories.rb
@@ -249,14 +250,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 sortitions module

data/app/types/decidim/sortitions/sortition_type.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Sortitions
-    SortitionType = GraphQL::ObjectType.define do
-      interfaces [
-        -> { Decidim::Core::AuthorableInterface },
-        -> { Decidim::Comments::CommentableInterface },
-        -> { Decidim::Core::CategorizableInterface }
-      ]
-
-      name "Sortition"
-      description "A sortition"
-
-      field :id, !types.ID, "The internal ID for this sortition"
-      field :dice, types.Int, "The dice for this sortition"
-      field :targetItems, types.Int, "The target items for this sortition", property: :target_items
-      field :requestTimestamp, Decidim::Core::DateType, "The request time stamp for this request", property: :request_timestamp
-      field :selectedProposals, types[types.Int], "The selected proposals for this sortition", property: :selected_proposals
-      field :createdAt, Decidim::Core::DateTimeType, "When this sortition was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "When this sortition was updated", property: :updated_at
-      field :witnesses, Decidim::Core::TranslatedFieldType, "The witnesses for this sortition"
-      field :additionalInfo, Decidim::Core::TranslatedFieldType, "The additional info for this sortition", property: :additional_info
-      field :reference, types.String, "The reference for this sortition"
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this sortition"
-      field :cancelReason, Decidim::Core::TranslatedFieldType, "The cancel reason for this sortition", property: :cancel_reason
-      field :cancelledOn, Decidim::Core::DateType, "When this sortition was cancelled", property: :cancelled_on
-      field :cancelledByUser, Decidim::Core::UserType, "Who cancelled this sortition", property: :cancelled_by_user
-      field :candidateProposals, Decidim::Core::TranslatedFieldType, "The candidate proposal for this sortition", property: :candidate_proposals
-    end
-  end
-end

data/app/types/decidim/sortitions/sortitions_type.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Sortitions
-    SortitionsType = GraphQL::ObjectType.define do
-      interfaces [-> { Decidim::Core::ComponentInterface }]
-
-      name "Sortitions"
-      description "A sortition component of a participatory space."
-
-      connection :sortitions, SortitionType.connection_type do
-        resolve ->(component, _args, _ctx) {
-                  SortitionTypeHelper.base_scope(component).includes(:component)
-                }
-      end
-
-      field(:sortition, SortitionType) do
-        argument :id, !types.ID
-
-        resolve ->(component, args, _ctx) {
-          SortitionTypeHelper.base_scope(component).find_by(id: args[:id])
-        }
-      end
-    end
-
-    module SortitionTypeHelper
-      def self.base_scope(component)
-        Sortition.where(component: component)
-      end
-    end
-  end
-end