decidim-sortitions 0.30.2 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 528aeccea681953497464424a06e1fa79d16269de0489592162e41e5074d9a77
-  data.tar.gz: 999d98e4329e6e29ab11bd4476afadf391ceef8df99ea97c7223ad280fc03aaa
+  metadata.gz: 6049e18adda680e39fe40b90bb0f7ab89a7aa12885b810ab18bfc3e07a1842f0
+  data.tar.gz: 11d520778aaae305d879c2d8d28a6d6d20315e751cf157b49b61607b13b824fa
 SHA512:
-  metadata.gz: 16129cf1d2c5069712e403b065856dbd0fb6084ad8a96753ae45fe408a8f54e82483eae6476093c2f5e55c9fa2e52616b730cce569921c766f889842e11b39db
-  data.tar.gz: 5093e493991640f3a04fdf8f5c8207927609881bfe7953373cc84b9befbee5f968ce2e0416c6f3318ed2073cd7f763658ca05b9be0b0f487ea4579ddb3616f12
+  metadata.gz: fbdd3e7cf122a6217ecdaba9f8b49a7e9b345775711429050d71484ff3e3ad7a664cea8013957d6cee43f2d7573758b4b8deff03617e12a5556e4a39b035c07f
+  data.tar.gz: 98e12575c5bb01f2286cee65ce6844617b7354613853a166a6e758bee0fce3eacf84caf862ee740f2700b8a39c75c61dbad0f1a030ebb7c402378836a423d842

data/app/controllers/decidim/sortitions/admin/sortitions_controller.rb

@@ -33,7 +33,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("sortitions.update.error", scope: "decidim.sortitions.admin")
-              render :edit
+              render :edit, status: :unprocessable_entity
             end
           end
         end
@@ -56,7 +56,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("sortitions.create.error", scope: "decidim.sortitions.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -79,7 +79,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("sortitions.destroy.error", scope: "decidim.sortitions.admin")
-              render :confirm_destroy
+              render :confirm_destroy, status: :unprocessable_entity
             end
           end
         end

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

@@ -37,6 +37,10 @@ module Decidim
         Decidim::Sortitions::AdminLog::SortitionPresenter
       end
 
+      def presenter
+        Decidim::Sortitions::SortitionPresenter.new(self)
+      end
+
       def proposals
         Decidim::Proposals::Proposal.where(id: selected_proposals)
       end
@@ -93,7 +97,7 @@ module Decidim
 
       def self.ransackable_associations(_auth_object = nil)
         %w(author cancelled_by_user taxonomies comment_threads comments component decidim_proposals_component resource_links_from
-           resource_links_to resource_permission user_group versions)
+           resource_links_to resource_permission versions)
       end
     end
   end

data/app/presenters/decidim/sortitions/sortition_presenter.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Sortitions
+    class SortitionPresenter < Decidim::ResourcePresenter
+      def sortition
+        __getobj__
+      end
+
+      def title(html_escape: false, all_locales: false)
+        return unless sortition
+
+        super(sortition.title, html_escape, all_locales)
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@
       <%= render partial: "decidim/admin/components/resource_action" %>
     </h1>
   </div>
-  <div class="table-scroll">
+  <div class="table-stacked">
     <table class="table-list">
       <thead>
         <tr>
@@ -22,31 +22,62 @@
       <tbody>
         <% sortitions.each do |sortition| %>
         <tr>
-          <td><%= sortition.reference %></td>
-          <td>
+          <td data-label="<%= t("models.sortition.fields.reference", scope: "decidim.sortitions.admin") %>">
+            <%= sortition.reference %>
+          </td>
+          <td data-label="<%= t("models.sortition.fields.title", scope: "decidim.sortitions.admin") %>">
             <% if allowed_to? :update, :sortition, sortition: sortition %>
               <%= link_to decidim_escape_translated(sortition.title), edit_sortition_path(sortition) %>
             <% else %>
               <%= decidim_escape_translated(sortition.title) %>
             <% end %>
           </td>
-          <td><%= l sortition.created_at, format: :short %></td>
-          <td class="table-list__actions">
-            <% if allowed_to? :update, :sortition, sortition: sortition %>
-              <%= icon_link_to "pencil-line", edit_sortition_path(sortition), t("actions.edit", scope: "decidim.sortitions.admin"), class: "action-icon--edit" %>
-            <% else %>
-              <span class="action-space icon"></span>
-            <% end %>
+          <td data-label="<%= t("models.sortition.fields.created_at", scope: "decidim.sortitions.admin") %>">
+            <%= l sortition.created_at, format: :short %>
+          </td>
+          <td class="table-list__actions" data-label="<%= t("actions.title", scope: "decidim.sortitions.admin") %>">
+            <button type="button" data-controller="dropdown" data-target="actions-sortition-<%= sortition.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: sortition.title) %>">
+              <%= icon "more-fill", class: "text-secondary" %>
+            </button>
 
-            <%= icon_link_to "fullscreen-line", sortition_path(sortition), t("actions.show", scope: "decidim.sortitions.admin"), class: "action-icon--preview", target: "_blank", data: { "external-link": false } %>
+            <div class="inline-block relative">
+              <ul id="actions-sortition-<%= sortition.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                <% if allowed_to? :update, :sortition, sortition: sortition %>
+                  <li class="dropdown__item">
+                    <%= link_to edit_sortition_path(sortition), class: "dropdown__button" do %>
+                      <%= icon "pencil-line" %>
+                      <%= t("actions.edit", scope: "decidim.sortitions.admin") %>
+                    <% end %>
+                  </li>
 
-            <%= resource_permissions_link(sortition) %>
+                  <hr>
+                <% end %>
 
-            <% if allowed_to? :destroy, :sortition, sortition: sortition %>
-              <%= icon_link_to "delete-bin-line", confirm_destroy_sortition_path(sortition), t("actions.destroy", scope: "decidim.sortitions.admin"), class: "action-icon--remove" %>
-            <% else %>
-               <span class="action-space icon"></span>
-            <% end %>
+                <li class="dropdown__item">
+                  <%= link_to sortition_path(sortition), target: "_blank", data: { "external-link": false }, class: "dropdown__button" do %>
+                    <%= icon "fullscreen-line" %>
+                    <%= t("actions.show", scope: "decidim.sortitions.admin") %>
+                  <% end %>
+                </li>
+
+                <hr>
+
+                <li class="dropdown__item">
+                  <%= dropdown_resource_permissions_link(sortition) %>
+                </li>
+
+                <hr>
+
+                <% if allowed_to? :destroy, :sortition, sortition: sortition %>
+                  <li class="dropdown__item">
+                    <%= link_to confirm_destroy_sortition_path(sortition), class: "dropdown__button" do %>
+                      <%= icon "delete-bin-line" %>
+                      <%= t("actions.destroy", scope: "decidim.sortitions.admin") %>
+                    <% end %>
+                  </li>
+                <% end %>
+              </ul>
+            </div>
           </td>
         </tr>
         <% end %>

data/config/assets.rb

@@ -2,7 +2,7 @@
 
 base_path = File.expand_path("..", __dir__)
 
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
-Decidim::Webpacker.register_entrypoints(
+Decidim::Shakapacker.register_path("#{base_path}/app/packs")
+Decidim::Shakapacker.register_entrypoints(
   decidim_sortitions: "#{base_path}/app/packs/entrypoints/decidim_sortitions.js"
 )

data/config/locales/ca-IT.yml

@@ -45,6 +45,7 @@ ca-IT:
           edit: Edita
           new_sortition: Afegir sorteig
           show: Detalls del sorteig
+          title: Accions
         models:
           sortition:
             fields:
@@ -143,3 +144,4 @@ ca-IT:
             other: "%{count} classificacions"
     statistics:
       sortitions_count: Sortejos
+      sortitions_count_tooltip: El nombre de seleccions aleatòries realitzades per a la presa de decisions.

data/config/locales/ca.yml

@@ -45,6 +45,7 @@ ca:
           edit: Edita
           new_sortition: Afegir sorteig
           show: Detalls del sorteig
+          title: Accions
         models:
           sortition:
             fields:
@@ -143,3 +144,4 @@ ca:
             other: "%{count} classificacions"
     statistics:
       sortitions_count: Sortejos
+      sortitions_count_tooltip: El nombre de seleccions aleatòries realitzades per a la presa de decisions.

data/config/locales/cs.yml

@@ -47,6 +47,7 @@ cs:
           edit: Upravit
           new_sortition: Nové losování
           show: Detaily losování
+          title: Akce
         models:
           sortition:
             fields:

data/config/locales/de.yml

@@ -45,6 +45,7 @@ de:
           edit: Bearbeiten
           new_sortition: Neue Sortierung
           show: Sortierdetails
+          title: Aktionen
         models:
           sortition:
             fields:

data/config/locales/en.yml

@@ -45,6 +45,7 @@ en:
           edit: Edit
           new_sortition: New sortition
           show: Sortition details
+          title: Actions
         models:
           sortition:
             fields:
@@ -143,3 +144,4 @@ en:
             other: "%{count} sortitions"
     statistics:
       sortitions_count: Sortitions
+      sortitions_count_tooltip: The number of random selections carried out for decision-making.

data/config/locales/es-MX.yml

@@ -45,6 +45,7 @@ es-MX:
           edit: Editar
           new_sortition: Añadir sorteo
           show: Detalles de la clasificación
+          title: Acciones
         models:
           sortition:
             fields:
@@ -143,3 +144,4 @@ es-MX:
             other: "%{count} clasificaciones"
     statistics:
       sortitions_count: Sorteos
+      sortitions_count_tooltip: El número de selecciones aleatorias realizadas para la toma de decisiones.

data/config/locales/es-PY.yml

@@ -45,6 +45,7 @@ es-PY:
           edit: Editar
           new_sortition: Añadir sorteo
           show: Detalles de la clasificación
+          title: Acciones
         models:
           sortition:
             fields:
@@ -143,3 +144,4 @@ es-PY:
             other: "%{count} clasificaciones"
     statistics:
       sortitions_count: Sorteos
+      sortitions_count_tooltip: El número de selecciones aleatorias realizadas para la toma de decisiones.

data/config/locales/es.yml

@@ -45,6 +45,7 @@ es:
           edit: Editar
           new_sortition: Añadir sorteo
           show: Detalles del sorteo
+          title: Acciones
         models:
           sortition:
             fields:
@@ -143,3 +144,4 @@ es:
             other: "%{count} clasificaciones"
     statistics:
       sortitions_count: Sorteos
+      sortitions_count_tooltip: El número de selecciones aleatorias realizadas para la toma de decisiones.

data/config/locales/eu.yml

@@ -45,6 +45,7 @@ eu:
           edit: Editatu
           new_sortition: Beste zozketa bat
           show: Zozketaren xehetasunak
+          title: Ekintzak
         models:
           sortition:
             fields:
@@ -143,3 +144,4 @@ eu:
             other: "%{count} zozketa"
     statistics:
       sortitions_count: Zozketak
+      sortitions_count_tooltip: Erabakiak hartzeko egindako ausazko selekzioen kopurua.

data/config/locales/fi-plain.yml

@@ -45,6 +45,7 @@ fi-pl:
           edit: Muokkaa
           new_sortition: Uusi satunnaisvalinta
           show: Satunnaistamisen yksityiskohdat
+          title: Toiminnot
         models:
           sortition:
             fields:
@@ -143,3 +144,4 @@ fi-pl:
             other: "%{count} satunnaisvalintaa"
     statistics:
       sortitions_count: Satunnaistamista
+      sortitions_count_tooltip: Päätöksentekoa varten tehtyjen satunnaisvalintojen lukumäärä.

data/config/locales/fi.yml

@@ -45,6 +45,7 @@ fi:
           edit: Muokkaa
           new_sortition: Uusi satunnaisvalinta
           show: Satunnaisvalinnan tarkemmat tiedot
+          title: Toiminnot
         models:
           sortition:
             fields:
@@ -143,3 +144,4 @@ fi:
             other: "%{count} satunnaisvalintaa"
     statistics:
       sortitions_count: Satunnaisvalintaa
+      sortitions_count_tooltip: Päätöksentekoa varten tehtyjen satunnaisvalintojen lukumäärä.

data/config/locales/fr-CA.yml

@@ -43,6 +43,7 @@ fr-CA:
           edit: Éditer
           new_sortition: Nouveau tirage au sort
           show: Détails du tirage au sort
+          title: Actions
         models:
           sortition:
             fields:
@@ -135,3 +136,4 @@ fr-CA:
             other: "%{count} tirages au sort"
     statistics:
       sortitions_count: Tirages au sort
+      sortitions_count_tooltip: Le nombre de tirages au sort réalisés dans le cadre du processus décisionnel.

data/config/locales/fr.yml

@@ -43,6 +43,7 @@ fr:
           edit: Éditer
           new_sortition: Nouveau tirage au sort
           show: Détails du tirage au sort
+          title: Actions
         models:
           sortition:
             fields:
@@ -135,3 +136,4 @@ fr:
             other: "%{count} tirages au sort"
     statistics:
       sortitions_count: Tirages au sort
+      sortitions_count_tooltip: Le nombre de tirages au sort réalisés dans le cadre du processus décisionnel.

data/config/locales/ja.yml

@@ -44,6 +44,7 @@ ja:
           edit: 編集
           new_sortition: 新しいソート順
           show: 並べ替えの詳細
+          title: アクション
         models:
           sortition:
             fields:
@@ -138,3 +139,4 @@ ja:
             other: "%{count} ソート数"
     statistics:
       sortitions_count: 並べ替え
+      sortitions_count_tooltip: 意思決定のために実施されたランダム抽選の数です。

data/config/locales/ro-RO.yml

@@ -45,6 +45,7 @@ ro:
           destroy: Anulează tragerea la sorți
           edit: Editează
           show: Detalii privind tragerea la sorți
+          title: Acțiuni
         models:
           sortition:
             fields:
@@ -143,3 +144,4 @@ ro:
             other: "%{count} trageri la sorți"
     statistics:
       sortitions_count: Trageri la sorți
+      sortitions_count_tooltip: Numărul de selecții aleatorii efectuate pentru luarea deciziilor.

data/config/locales/sv.yml

@@ -40,6 +40,7 @@ sv:
           edit: Redigera
           new_sortition: Ny lottning
           show: Detaljer om tilldelningen
+          title: Handlingar
         models:
           sortition:
             fields:
@@ -132,3 +133,4 @@ sv:
             other: "%{count} tilldelningar"
     statistics:
       sortitions_count: Lottningar
+      sortitions_count_tooltip: Antalet slumpmässiga val som görs för beslutsfattandet.

data/lib/decidim/api/sortition_type.rb

@@ -7,6 +7,7 @@ module Decidim
       implements Decidim::Comments::CommentableInterface
       implements Decidim::Core::TaxonomizableInterface
       implements Decidim::Core::TimestampsInterface
+      implements Decidim::Core::ReferableInterface
 
       description "A sortition"
 
@@ -17,13 +18,18 @@ module Decidim
       field :candidate_proposals, [GraphQL::Types::Int, { null: true }], "The candidate proposal for this sortition", null: true
       field :dice, GraphQL::Types::Int, "The dice for this sortition", null: true
       field :id, GraphQL::Types::ID, "The internal ID for this sortition", null: false
-      field :reference, GraphQL::Types::String, "The reference 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 :proposals, [Decidim::Proposals::ProposalType, { null: true }], "The selected proposal for this sortition", null: true
+      field :request_timestamp, Decidim::Core::DateTimeType, "The request time stamp for this request", null: true
+      field :selected_proposals, [GraphQL::Types::Int, { null: true }], "The selected proposal ids for this sortition", null: true
       field :target_items, GraphQL::Types::Int, "The target items for this sortition", null: true
       field :title, Decidim::Core::TranslatedFieldType, "The title for this sortition", null: true
+      field :url, GraphQL::Types::String, "The URL for this sortition", null: false
       field :witnesses, Decidim::Core::TranslatedFieldType, "The witnesses for this sortition", null: true
 
+      def url
+        Decidim::ResourceLocatorPresenter.new(object).url
+      end
+
       def self.authorized?(object, context)
         context[:sortition] = object
 

data/lib/decidim/sortitions/component.rb

@@ -30,7 +30,11 @@ Decidim.register_component(:sortitions) do |component|
     resource.actions = %w(comment)
   end
 
-  component.register_stat :sortitions_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, start_at, end_at|
+  component.register_stat :sortitions_count,
+                          primary: true,
+                          priority: Decidim::StatsRegistry::MEDIUM_PRIORITY,
+                          icon_name: "team-line",
+                          tooltip_key: "sortitions_count_tooltip" do |components, start_at, end_at|
     Decidim::Sortitions::FilteredSortitions.for(components, start_at, end_at).count
   end
 

data/lib/decidim/sortitions/engine.rb

@@ -28,7 +28,7 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Sortitions::Engine.root}/app/views") # for proposal partials
       end
 
-      initializer "decidim_sortitions.webpacker.assets_path" do
+      initializer "decidim_sortitions.shakapacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
     end

data/lib/decidim/sortitions/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-sortitions
 version: !ruby/object:Gem::Version
-  version: 0.30.2
+  version: 0.31.0.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 2025-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
 description: This module makes possible to select amount a set of proposal by sortition
 email:
 - jsperezg@gmail.com
@@ -142,6 +142,7 @@ files:
 - app/permissions/decidim/sortitions/admin/permissions.rb
 - app/permissions/decidim/sortitions/permissions.rb
 - app/presenters/decidim/sortitions/admin_log/sortition_presenter.rb
+- app/presenters/decidim/sortitions/sortition_presenter.rb
 - app/queries/decidim/sortitions/admin/participatory_space_proposal_components.rb
 - app/queries/decidim/sortitions/admin/participatory_space_proposals.rb
 - app/queries/decidim/sortitions/filtered_sortitions.rb