decidim-sortitions 0.27.4 → 0.28.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 074e2509c41ebe41cf98ac0492fe2dedab356bf835858a155fb50d7dcc4f9785
-  data.tar.gz: 8a64a92fd78a6790744bedbe39c5194068a71a96e33a11ae3ade1ede5f9239e7
+  metadata.gz: b752bd537322391e9eef685c8b24df7db576e68da1724ad333d9f12f8660da02
+  data.tar.gz: 64f3be1146e837aa0d63d9de6ccb403f12ba5e001bc7ba5f95c4d02f5395cc9d
 SHA512:
-  metadata.gz: 37a6cb3e8ed1bfdddba0405fb78965cc40d7858ad632a065678cec74f026f83b8a15b804abe6dcd4bd639c797ec6ae0e7df8d68ba413395b9a723613699c1c93
-  data.tar.gz: 74c61a532bf9688ba8608e0e1ec608bb4409e7ce65e1dd0ec3ed23a35d1e1f9b78dadb4dd73928799d0057006ccfa55acdc69f3b92b22ceceb3159db67da3b88
+  metadata.gz: 16d549e378742e762d96cc60e68e73171b44869ad7fced9a837b7063c033cf168caef0983278a710686edfaad7dff72bfb552747ee6879b243c5cbaca89e5325
+  data.tar.gz: 39552eb7e17285cc6c666a42b4385a9ef5ff800007bb32067f94be3524c6e7ff2d3f1ad308f1f515962c269fa129a3ccb7b7ea3e24741d0f5754103a03940377

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/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>

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

@@ -1,64 +1,57 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t(".title") %>
-      <div class="button--title">
-        <% if allowed_to? :create, :sortition %>
-          <%= link_to t("actions.new", scope: "decidim.sortitions.admin", name: t("models.sortition.name", scope: "decidim.sortitions.admin")), new_sortition_path, class: "button tiny button--simple" %>
-        <% end %>
-      </div>
+      <% if allowed_to? :create, :sortition %>
+        <%= link_to t("actions.new_sortition", scope: "decidim.sortitions.admin"), new_sortition_path, class: "button button__sm button__secondary" %>
+      <% end %>
+      <%= render partial: "decidim/admin/components/resource_action" %>
     </h2>
   </div>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("models.sortition.fields.reference", scope: "decidim.sortitions.admin") %></th>
+          <th><%= t("models.sortition.fields.title", scope: "decidim.sortitions.admin") %></th>
+          <th><%= t("models.sortition.fields.created_at", scope: "decidim.sortitions.admin") %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% sortitions.each do |sortition| %>
+        <tr>
+          <td><%= sortition.reference %></td>
+          <td>
+            <% if allowed_to? :update, :sortition, sortition: sortition %>
+              <%= link_to decidim_html_escape(translated_attribute(sortition.title)), edit_sortition_path(sortition) %>
+            <% else %>
+              <%= decidim_html_escape(translated_attribute(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 %>
 
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= t("models.sortition.fields.reference", scope: "decidim.sortitions.admin") %></th>
-            <th><%= t("models.sortition.fields.title", scope: "decidim.sortitions.admin") %></th>
-            <th><%= t("models.sortition.fields.created_at", scope: "decidim.sortitions.admin") %></th>
-            <th class="actions"></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% sortitions.each do |sortition| %>
-          <tr>
-            <td><%= sortition.reference %></td>
-            <td><%= decidim_html_escape(translated_attribute(sortition.title)) %></td>
-            <td><%= l sortition.created_at, format: :short %></td>
-            <td class="table-list__actions">
-              <%= icon_link_to "eye",
-                               sortition_path(sortition),
-                               t("actions.show", scope: "decidim.sortitions.admin"),
-                               class: "action-icon--preview" %>
-
-              <% if allowed_to? :update, :sortition, sortition: sortition %>
-                <%= icon_link_to "pencil",
-                                edit_sortition_path(sortition),
-                                t("actions.edit", scope: "decidim.sortitions.admin"),
-                                class: "action-icon--edit" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
+            <%= icon_link_to "eye-line", sortition_path(sortition), t("actions.show", scope: "decidim.sortitions.admin"), class: "action-icon--preview", target: "_blank", data: { "external-link": false } %>
 
-              <%= resource_permissions_link(sortition) %>
+            <%= resource_permissions_link(sortition) %>
 
-              <% 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>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate sortitions, theme: "decidim" %>
-    </div>
+            <% 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 %>
+          </td>
+        </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
+<%= decidim_paginate sortitions %>