decidim-sortitions 0.23.3 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b77e4077adcec553ab717fd64a9eb56625300e568862dce0860a29e51a3e406
-  data.tar.gz: 622d806ae19005b7bd11a17749b3de6910a5ab347c46d4fe22df305ca8839a53
+  metadata.gz: f43a4b7d47ec03462ea489ba092e189cb3f69cc1c346e9654f9fd2bd5fcccaf6
+  data.tar.gz: dc76a1377c798e1880be1be242b10f4af4739d64b9c1391cc160db0cce7dd7da
 SHA512:
-  metadata.gz: ca71e43dad6be3c8348a189ad6fa978941bf8529289b910ee346bd1247a6b657130bd6247872af61ffede887848567d51db3754ab2d59ba8b24ec153a06ee46a
-  data.tar.gz: 48b6e320d4a3dddfc70d14e13073376d2ecaf68a24a35296f2d625c76bcffa477a847d86a6b49d0d892c7a64f38c1c7814c9b0a95f72c55a7481e8d1128d854e
+  metadata.gz: 9ab1c8845dbe0922886dbf4fe87a336effb73cdc1ba5960b9173433975417300a012c7062d706359e97642d7c08c219868bb894c09be1012f03751a6aa1394ca
+  data.tar.gz: c80f00226aca64b08fab59eef214722915dbd6e0d31521dbd52117f718b55ee7c7a45ed2cb0b467c2a77989d81c65f27f0545921c508a1348d29f6e8fd28bd7b

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/app/views/decidim/sortitions/sortitions/_filters_small_view.html.erb

@@ -13,6 +13,6 @@
     </button>
   </div>
   <div class="filters">
-    <%= render partial: "filters" %>
+    <%= render partial: "filters", locals: { type: :small } %>
   </div>
 </div>

data/config/locales/ca.yml

@@ -140,8 +140,8 @@ ca:
         sortition:
           random_seed: Llavor aleatòria
           selected_proposals:
-            one: 1 proposta seleccionada
-            other: '%{count} propostes seleccionades'
+            one: proposta seleccionada
+            other: 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: '%{count} propuestas seleccionadas'
+            other: 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: Satunnaistamisia
+        sortitions_count: Satunnaistamiset
     sortitions:
       admin:
         actions:

data/config/locales/fi.yml

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

data/config/locales/is-IS.yml

@@ -22,6 +22,10 @@ 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: Sortitions
+          sortitions_count: Loting
     participatory_processes:
       statistics:
-        sortitions_count: Lotingen
+        sortitions_count: Loting
     sortitions:
       admin:
         actions:

data/config/locales/pl.yml

@@ -36,10 +36,10 @@ pl:
     pages:
       home:
         statistics:
-          sortitions_count: Wybór losowy
+          sortitions_count: Wybory losowe
     participatory_processes:
       statistics:
-        sortitions_count: Wybór losowy
+        sortitions_count: Wybory losowe
     sortitions:
       admin:
         actions:
@@ -114,7 +114,7 @@ pl:
           search: Szukaj
           state: Status
         filters_small_view:
-          close_modal: Zamknij modalne
+          close_modal: Zamknij okno
           filter: Filtr
           filter_by: Filtruj według
           unfold: Rozwiń

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.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"

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.3"
+      "0.24.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-sortitions
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.24.1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-04-08 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.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 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'
 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