decidim-sortitions 0.27.10 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d77767e358f111bb799c6336d4f43502a3ae8de9906a388f6f28aa89686cee0
-  data.tar.gz: d285c9c1dc84ca86dbffcdf72526ddb72b0160449d0f69a11889d0d19e7995fd
+  metadata.gz: a5be4a8d72565a12df3e2fd05734597bbe71a1e14a5a056b088ba2d5e09c1c95
+  data.tar.gz: 741c81d9b1718a83b5b9e783b05d3368597bfd1613b8613e9473792f8a6e5438
 SHA512:
-  metadata.gz: 107e7befa5368b035fb0f3865b5818c79b5c8528731c41701f34e92256e4544c66266f4cd1f8ce72a51dd412c392a48cc4cd14db3ae6ac124163b52245643737
-  data.tar.gz: 8c345c7010ff24251bc5006c2f05f017c2b41469c312be549ae303433731b3d11068377342ebc518a28253f6eb159bbe000feba1b3c3ed895c7d7d86921701b4
+  metadata.gz: 87c3ca33a587afca502d04d11bf55f301d002c05dcf234198a7b5b9941bbeb40a35838af4c482b70a18d4466221a73bc82a378bfbe90c40b1ba0f36b82ed753f
+  data.tar.gz: '098d446e98c7334bb8ee053d8e35a0f2a852de313cd2f94d8160a6bca2e2fa60053e9e2af79f286c9b9bcf64dc2afee7a39fcd655cb0ff9c58fc2c4638a9b099'

data/app/cells/decidim/sortitions/sortition_cell.rb

@@ -14,7 +14,7 @@ module Decidim
       private
 
       def card_size
-        "decidim/sortitions/sortition_m"
+        "decidim/sortitions/sortition_l"
       end
     end
   end

data/app/cells/decidim/sortitions/sortition_l_cell.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Sortitions
+    # This cell renders a sortition with its L-size card.
+    class SortitionLCell < Decidim::CardLCell
+      include Decidim::Sortitions::Engine.routes.url_helpers
+
+      private
+
+      def has_author?
+        false
+      end
+
+      def has_state?
+        true
+      end
+
+      def metadata_cell
+        "decidim/sortitions/sortition_metadata"
+      end
+    end
+  end
+end

data/app/cells/decidim/sortitions/sortition_metadata_cell.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Sortitions
+    # This cell renders the assembly metadata for l card
+    class SortitionMetadataCell < Decidim::CardMetadataCell
+      include Decidim::Sortitions::SortitionsHelper
+
+      delegate :state, to: :model
+
+      def initialize(*)
+        super
+
+        @items.prepend(*sortition_items)
+      end
+
+      def sortition_items
+        [count_item, seed_item, badge_item]
+      end
+
+      def count_item
+        {
+          text: data_with_text(proposals_count, t("decidim.sortitions.sortitions.sortition.selected_proposals", count: proposals_count)),
+          icon: "chat-new-line"
+        }
+      end
+
+      def seed_item
+        {
+          text: data_with_text(model.seed, t("random_seed", scope: "decidim.sortitions.sortitions.sortition")),
+          icon: "seedling-line"
+        }
+      end
+
+      def badge_item
+        {
+          text: content_tag(:span, class: "label #{state_classes}") { badge_name }
+        }
+      end
+
+      def has_badge?
+        false
+      end
+
+      def badge_name
+        return t("filters.cancelled", scope: "decidim.sortitions.sortitions") if model.cancelled?
+
+        t("filters.active", scope: "decidim.sortitions.sortitions")
+      end
+
+      def data_with_text(data, text)
+        "#{content_tag(:strong) { data }}#{content_tag(:span) { text }}".html_safe
+      end
+
+      def state_classes
+        return "alert" if model.cancelled?
+
+        "success"
+      end
+
+      def proposals_count
+        @proposals_count = model.proposals.count
+      end
+    end
+  end
+end

data/app/commands/decidim/sortitions/admin/create_sortition.rb

@@ -15,7 +15,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -49,7 +49,7 @@ module Decidim
             additional_info: form.additional_info,
             selected_proposals: [],
             candidate_proposals: [],
-            category: category
+            category:
           )
         end
 

data/app/commands/decidim/sortitions/admin/destroy_sortition.rb

@@ -15,7 +15,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/sortitions/admin/update_sortition.rb

@@ -15,7 +15,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -12,19 +12,19 @@ module Decidim
         def index; end
 
         def show
-          enforce_permission_to :read, :sortition, sortition: sortition
+          enforce_permission_to :read, :sortition, sortition:
         end
 
         def edit
-          enforce_permission_to :update, :sortition, sortition: sortition
+          enforce_permission_to(:update, :sortition, sortition:)
 
-          @form = edit_sortition_form.from_model(sortition, current_participatory_space: current_participatory_space)
+          @form = edit_sortition_form.from_model(sortition, current_participatory_space:)
         end
 
         def update
-          enforce_permission_to :update, :sortition, sortition: sortition
+          enforce_permission_to(:update, :sortition, sortition:)
 
-          @form = edit_sortition_form.from_params(params, current_participatory_space: current_participatory_space)
+          @form = edit_sortition_form.from_params(params, current_participatory_space:)
           UpdateSortition.call(@form) do
             on(:ok) do |_sortition|
               flash[:notice] = I18n.t("sortitions.update.success", scope: "decidim.sortitions.admin")
@@ -41,13 +41,13 @@ module Decidim
         def new
           enforce_permission_to :create, :sortition
 
-          @form = sortition_form.instance(current_participatory_space: current_participatory_space)
+          @form = sortition_form.instance(current_participatory_space:)
         end
 
         def create
           enforce_permission_to :create, :sortition
 
-          @form = sortition_form.from_params(params, current_participatory_space: current_participatory_space)
+          @form = sortition_form.from_params(params, current_participatory_space:)
           CreateSortition.call(@form) do
             on(:ok) do |sortition|
               flash[:notice] = I18n.t("sortitions.create.success", scope: "decidim.sortitions.admin")
@@ -62,15 +62,15 @@ module Decidim
         end
 
         def confirm_destroy
-          enforce_permission_to :destroy, :sortition, sortition: sortition
+          enforce_permission_to(:destroy, :sortition, sortition:)
 
-          @form = destroy_sortition_form.from_model(sortition, current_participatory_space: current_participatory_space)
+          @form = destroy_sortition_form.from_model(sortition, current_participatory_space:)
         end
 
         def destroy
-          enforce_permission_to :destroy, :sortition, sortition: sortition
+          enforce_permission_to(:destroy, :sortition, sortition:)
 
-          @form = destroy_sortition_form.from_params(params, current_participatory_space: current_participatory_space)
+          @form = destroy_sortition_form.from_params(params, current_participatory_space:)
           DestroySortition.call(@form) do
             on(:ok) do |_sortition|
               flash[:notice] = I18n.t("sortitions.destroy.success", scope: "decidim.sortitions.admin")

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

@@ -4,7 +4,6 @@ module Decidim
   module Sortitions
     # Exposes the sortition resource so users can view them
     class SortitionsController < Decidim::Sortitions::ApplicationController
-      helper Decidim::WidgetUrlsHelper
       include FilterResource
       include Decidim::Sortitions::Orderable
       include Paginable

data/app/helpers/decidim/sortitions/admin/sortitions_helper.rb

@@ -5,6 +5,7 @@ module Decidim
     module Admin
       module SortitionsHelper
         include Decidim::TranslationsHelper
+        include Decidim::PaginateHelper
 
         # Converst a list of components into a list of selectable options
         def components_options(components)

data/app/helpers/decidim/sortitions/sortitions_helper.rb

@@ -10,6 +10,10 @@ module Decidim
         EngineRouter.main_proxy(proposal.component).proposal_path(proposal)
       end
 
+      def component_name
+        (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.components.sortitions.name")
+      end
+
       # Generates the sortition category label
       def sortition_category_label(sortition)
         if sortition.category.present?
@@ -32,7 +36,27 @@ module Decidim
                     end
         end
 
-        result.join(", ").html_safe
+        result.join(" - ").html_safe
+      end
+
+      def filter_sections_sortitions
+        sections = [{ method: :with_any_state, collection: filter_state_values, label_scope: "decidim.sortitions.sortitions.filters", id: "state" }]
+        if current_participatory_space.categories.any?
+          sections.append(
+            method: :with_category,
+            collection: filter_categories_values,
+            label_scope: "decidim.sortitions.sortitions.filters", id: "category"
+          )
+        end
+        sections.reject { |item| item[:collection].blank? }
+      end
+
+      def filter_state_values
+        [
+          ["all", t("all", scope: "decidim.sortitions.sortitions.filters")],
+          ["active", t("active", scope: "decidim.sortitions.sortitions.filters")],
+          ["cancelled", t("cancelled", scope: "decidim.sortitions.sortitions.filters")]
+        ]
       end
     end
   end

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

@@ -41,10 +41,10 @@ module Decidim
       end
 
       def similar_count
-        Sortition.where(component: component)
-                 .where(decidim_proposals_component: decidim_proposals_component)
+        Sortition.where(component:)
+                 .where(decidim_proposals_component:)
                  .with_category(category&.id)
-                 .where(target_items: target_items)
+                 .where(target_items:)
                  .count
       end
 

data/app/packs/entrypoints/decidim_sortitions.js

@@ -1,2 +1,5 @@
 // Images
 require.context("../images", true)
+
+// CSS
+import "stylesheets/sortitions.scss"

data/app/packs/stylesheets/sortitions.scss

@@ -0,0 +1,31 @@
+.sortition {
+  &__aside-element {
+    &-item {
+      @apply border-b border-gray-3 py-4 first:pt-0 last:pb-0 last:border-b-0;
+    }
+
+    &-item__title {
+      @apply text-sm block text-gray-2 mb-1;
+    }
+
+    &-item__text {
+      @apply text-md block font-semibold text-gray-2;
+    }
+
+    &-item__numbers {
+      @apply text-md block text-gray-2;
+    }
+  }
+
+  &__aside__count-number {
+    @apply text-5xl block text-center text-gray-2 font-bold;
+  }
+
+  &__aside__count-text {
+    @apply text-gray-2 text-sm block text-center;
+  }
+}
+
+a.sortition__aside-element-item__title {
+  @apply text-secondary underline;
+}

data/app/permissions/decidim/sortitions/permissions.rb

@@ -4,26 +4,12 @@ module Decidim
   module Sortitions
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        allow_embed_sortition?
         return permission_action unless user
 
         return Decidim::Sortitions::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
 
         permission_action
       end
-
-      private
-
-      def sortition
-        @sortition ||= context.fetch(:sortition, nil) || context.fetch(:resource, nil)
-      end
-
-      # As this is a public action, we need to run this before other checks
-      def allow_embed_sortition?
-        return unless permission_action.action == :embed && permission_action.subject == :sortition && sortition
-
-        allow!
-      end
     end
   end
 end

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Sortitions::Sortition`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -20,7 +20,7 @@ module Decidim
 
         def query
           Component
-            .where(participatory_space: participatory_space, manifest_name: "proposals")
+            .where(participatory_space:, manifest_name: "proposals")
             .published
         end
       end

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

@@ -1,40 +1,38 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".title" %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row">
-      <div class="columns xlarge-12">
-        <%= form.translated :text_field, :title, autofocus: true %>
-      </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row">
+        <div class="columns">
+          <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+        </div>
 
-      <div class="columns xlarge-4">
-        <%= form.select :decidim_proposals_component_id,
-                        components_options(proposal_components),
-                        prompt: t(".select_proposal_component") %>
-      </div>
+        <div class="columns">
+          <%= form.select :decidim_proposals_component_id,
+                          components_options(proposal_components),
+                          prompt: t(".select_proposal_component") %>
+        </div>
 
-      <div class="columns xlarge-4">
-        <%= form.categories_select :decidim_category_id,
-                                   @form.categories,
-                                   include_blank: t(".all_categories") %>
-      </div>
+        <div class="columns">
+          <%= form.categories_select :decidim_category_id,
+                                     @form.categories,
+                                     include_blank: t(".all_categories") %>
+        </div>
 
-      <div class="columns xlarge-4">
-        <%= form.number_field :target_items, min: 1, step: 1 %>
-      </div>
+        <div class="columns">
+          <%= form.number_field :target_items, min: 1, step: 1 %>
+        </div>
 
-      <div class="columns xlarge-12">
-        <%= form.translated :editor, :witnesses, lines: 10, toolbar: :content %>
-      </div>
+        <div class="columns">
+          <%= form.translated :editor, :witnesses, lines: 10, toolbar: :content, aria: { label: :witnesses } %>
+        </div>
 
-      <div class="columns xlarge-12">
-        <%= form.translated :editor, :additional_info, lines: 10 %>
-      </div>
+        <div class="columns">
+          <%= form.translated :editor, :additional_info, lines: 10, aria: { label: :additional_info } %>
+        </div>
 
-      <div class="columns xlarge-2">
-        <%= form.number_field :dice, min: 1, max: 6, step: 1 %>
+        <div class="columns">
+          <%= form.number_field :dice, min: 1, max: 6, step: 1 %>
+        </div>
       </div>
     </div>
   </div>

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

@@ -1,22 +1,31 @@
 <% add_decidim_page_title(t(".title")) %>
-<h2 class="process-title-summary"><%= t ".title" %></h2>
 
-<%= decidim_form_for(@form, html: { class: "form confirm_destroy_sortition" }, method: :delete) do |form| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= decidim_html_escape(translated_attribute(sortition.title)) %></h2>
-    </div>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
 
-    <div class="card-section">
-      <div class="row">
-        <div class="columns xlarge-12">
-          <%= form.translated :editor, :cancel_reason, lines: 10, toolbar: :content %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form form-defaults confirm_destroy_sortition" }, method: :delete) do |form| %>
+      <div class="form__wrapper">
+        <div class="card pt-4">
+          <div class="card-section">
+            <div class="row">
+              <div class="columns">
+                <%= form.translated :editor, :cancel_reason, lines: 10, toolbar: :content, aria: { label: :cancel_reason } %>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
-    </div>
-  </div>
 
-  <div class="button--double form-general-submit">
-    <%= form.submit t(".destroy"), data: { confirm: t(".confirm_destroy") } %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit t(".destroy"), data: { confirm: t(".confirm_destroy") }, class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,28 +1,32 @@
 <% add_decidim_page_title(translated_attribute(sortition.title)) %>
-<h2 class="process-title-summary">
-  <%= decidim_html_escape(translated_attribute(sortition.title)) %>
-</h2>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form edit_sortition" }) do |form| %>
+      <div class="form__wrapper">
+        <div class="card pt-4">
+          <div class="card-section">
+            <div class="row">
+              <div class="columns">
+                <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+              </div>
 
-<%= decidim_form_for(@form, html: { class: "form edit_sortition" }) do |form| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
-    </div>
-
-    <div class="card-section">
-      <div class="row">
-        <div class="columns xlarge-12">
-          <%= form.translated :text_field, :title, autofocus: true %>
+              <div class="columns">
+                <%= form.translated :editor, :additional_info, lines: 10, aria: { label: :additional_info } %>
+              </div>
+            </div>
+          </div>
         </div>
-
-        <div class="columns xlarge-12">
-          <%= form.translated :editor, :additional_info, lines: 10 %>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= form.submit t(".update"), class: "button button__sm button__secondary" %>
+          </div>
         </div>
       </div>
-    </div>
-  </div>
-
-  <div class="button--double form-general-submit">
-    <%= form.submit t(".update") %>
+    <% end %>
   </div>
-<% end %>
+</div>