decidim-initiatives 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f700127f2cd4317eebf36ebc437cd3bf9f8db1b887afcf7c42e18d7735f71c1
-  data.tar.gz: aa39b6b6f75f465c331be6578b36d57a80dc486ed515d809889454ddcf2ad641
+  metadata.gz: bb3ddfb0265d59d3529b4855a3b5d195ae04616050f26d2baf9c621bfa165eb6
+  data.tar.gz: 4d16e5c1ae4cffa02b3077074bfc8f90ecf31b6a0a1dc6efac25549042dcc919
 SHA512:
-  metadata.gz: 5b4bb552d1c3d8aa05eab47f94905f45adf32864d98e7ffbd725b75702fbce0eed8876cc3f9adc8096cb08d66c23d45c58aa8918d63b0ef032f11d67cbcf02ca
-  data.tar.gz: 5d1c86ec5c714bd81a7186663756d501741fbfe88d54ff454aa11a44510d9f0ccb5f23dcaa0ac18f06d2ae5fcf6d4b14d070f11e47535d9b8c7a485dcfbc19ab
+  metadata.gz: 684b21bc414dec69621ae6291c9bb07012495a45c24bc035a0348c08b3478eb70fe587a9cb5f4c68c04c91d24e483850a324ef292d8c2303f10e0f0bb4558075
+  data.tar.gz: 7fb407da4a8752b56720500ba69f8d9c691d99821b0a13bfe273d2dda935ad6c68d44cee9439251743dde22b9ba940428dd62564aa086830d7d6d05030b240c6

data/app/controllers/concerns/decidim/initiatives/admin/filterable.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Initiatives
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def search_field_predicate
+            :title_or_description_cont
+          end
+
+          def filters
+            [:state_eq]
+          end
+
+          def filters_with_values
+            {
+              state_eq: Initiative.states.keys
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/initiatives/admin/initiatives_controller.rb

@@ -9,6 +9,7 @@ module Decidim
       class InitiativesController < Decidim::Initiatives::Admin::ApplicationController
         include Decidim::Initiatives::NeedsInitiative
         include Decidim::Initiatives::TypeSelectorOptions
+        include Decidim::Initiatives::Admin::Filterable
 
         helper Decidim::Initiatives::InitiativeHelper
         helper Decidim::Initiatives::CreateInitiativeHelper
@@ -16,18 +17,7 @@ module Decidim
         # GET /admin/initiatives
         def index
           enforce_permission_to :list, :initiative
-
-          @query = params[:q]
-          @state = params[:state]
-          @initiatives = ManageableInitiatives
-                         .for(
-                           current_organization,
-                           current_user,
-                           @query,
-                           @state
-                         )
-                         .page(params[:page])
-                         .per(15)
+          @initiatives = filtered_collection
         end
 
         # GET /admin/initiatives/:id
@@ -165,6 +155,10 @@ module Decidim
 
         private
 
+        def collection
+          @collection ||= ManageableInitiatives.for(current_user)
+        end
+
         def pdf_signature_service
           @pdf_signature_service ||= Decidim.pdf_signature_service.to_s.safe_constantize
         end

data/app/models/decidim/initiative.rb

@@ -68,7 +68,7 @@ module Decidim
 
     scope :open, lambda {
       published
-        .where.not(state: [:discarded, :rejected, :accepted])
+        .where.not(state: [:discarded, :rejected, :accepted, :created])
         .where("signature_start_date <= ?", Date.current)
         .where("signature_end_date >= ?", Date.current)
     }
@@ -332,6 +332,13 @@ module Decidim
       organization.available_authorizations.include?("sms") && type.validate_sms_code_on_votes?
     end
 
+    # Public: Returns an empty object. This method should be implemented by
+    # `ParticipatorySpaceResourceable`, but for some reason this model does not
+    # implement this interface.
+    def user_role_config_for(_user, _role_name)
+      Decidim::ParticipatorySpaceRoleConfig::Base.new(:empty_role_name)
+    end
+
     private
 
     def signature_type_allowed
@@ -351,5 +358,15 @@ module Decidim
       notifier = Decidim::Initiatives::StatusChangeNotifier.new(initiative: self)
       notifier.notify
     end
+
+    # Allow ransacker to search for a key in a hstore column (`title`.`en`)
+    [:title, :description].each do |column|
+      ransacker column do |parent|
+        Arel::Nodes::InfixOperation.new("->>", parent.table[column], Arel::Nodes.build_quoted(I18n.locale.to_s))
+      end
+    end
+
+    # Allow ransacker to search on an Enum Field
+    ransacker :state, formatter: proc { |int| states[int] }
   end
 end

data/app/permissions/decidim/initiatives/admin/permissions.rb

@@ -151,6 +151,8 @@ module Decidim
                       initiative.signature_end_date < Date.current &&
                       initiative.percentage < 100
             toggle_allow(allowed)
+          when :send_to_technical_validation
+            toggle_allow(allowed_to_send_to_technical_validation?)
           else
             allow!
           end
@@ -180,18 +182,20 @@ module Decidim
           when :update
             toggle_allow(initiative.created?)
           when :send_to_technical_validation
-            allowed = initiative.created? && (
-                        !initiative.created_by_individual? ||
-                        initiative.enough_committee_members?
-                      )
-
-            toggle_allow(allowed)
+            toggle_allow(allowed_to_send_to_technical_validation?)
           when :manage_membership
             toggle_allow(initiative.promoting_committee_enabled?)
           else
             disallow!
           end
         end
+
+        def allowed_to_send_to_technical_validation?
+          initiative.created? && (
+            !initiative.created_by_individual? ||
+            initiative.enough_committee_members?
+          )
+        end
       end
     end
   end

data/app/queries/decidim/initiatives/admin/manageable_initiatives.rb

@@ -7,57 +7,25 @@ module Decidim
       # Regular users will get only their initiatives. Administrators will
       # retrieve all initiatives.
       class ManageableInitiatives < Rectify::Query
-        attr_reader :organization, :user, :q, :state
-
         # Syntactic sugar to initialize the class and return the queried objects
         #
-        # organization - Decidim::Organization
-        # user         - Decidim::User
-        # query        - String
-        # state        - String
-        def self.for(organization, user, query, state)
-          new(organization, user, query, state).query
+        # user - Decidim::User
+        def self.for(user)
+          new(user).query
         end
 
         # Initializes the class.
         #
-        # organization - Decidim::Organization
-        # user         - Decidim::User
-        # query        - String
-        # state        - String
-        def initialize(organization, user, query, state)
-          @organization = organization
+        # user - Decidim::User
+        def initialize(user)
           @user = user
-          @q = query
-          @state = state
         end
 
         # Retrieves all initiatives / Initiatives created by the user.
         def query
-          if user.admin?
-            base = Initiative
-                   .where(organization: organization)
-                   .with_state(state)
-          else
-            ids = InitiativesCreated.by(user).with_state(state).pluck(:id)
-            ids += InitiativesPromoted.by(user).with_state(state).pluck(:id)
-            base = Initiative.where(id: ids)
-          end
-
-          return base if q.blank?
-
-          organization.available_locales.each_with_index do |loc, index|
-            base = if index.zero?
-                     base.where("title->>? ilike ?", loc, "%#{q}%")
-                         .or(Initiative.where("description->>? ilike ?", loc, "%#{q}%"))
-                   else
-                     base
-                       .or(Initiative.where("title->>? ilike ?", loc, "%#{q}%"))
-                       .or(Initiative.where("description->>? ilike ?", loc, "%#{q}%"))
-                   end
-          end
+          return Initiative.where(organization: @user.organization) if @user.admin?
 
-          base
+          Initiative.where(id: InitiativesCreated.by(@user) + InitiativesPromoted.by(@user))
         end
       end
     end

data/app/types/decidim/initiatives/initiative_api_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    InitiativeApiType = GraphQL::ObjectType.define do
+      name "InitiativeType"
+      description "An initiative type"
+
+      field :id, !types.ID, "The internal ID for this initiative type"
+      field :title, Decidim::Core::TranslatedFieldType, "Initiative type name"
+      field :description, Decidim::Core::TranslatedFieldType, "This is the initiative type description"
+      field :createdAt, Decidim::Core::DateTimeType, "The date this initiative type was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The date this initiative type was updated", property: :updated_at
+      field :bannerImage, types.String, "Banner image", property: :banner_image
+      field :collectUserExtraFields, types.Boolean, "Collect participant personal data on signature", property: :collect_user_extra_fields
+      field :extraFieldsLegalInformation, types.String, "Legal information about the collection of personal data", property: :extra_fields_legal_information
+      field :minimumCommitteeMembers, types.Int, "Minimum of committee members", property: :minimum_committee_members
+      field :validateSmsCodeOnVotes, types.Boolean, "Add SMS code validation step to signature process", property: :validate_sms_code_on_votes
+      field :undoOnlineSignaturesEnabled, types.Boolean, "Enable participants to undo their online signatures", property: :undo_online_signatures_enabled
+      field :promotingComitteeEnabled, types.Boolean, "If promoting committee is enabled", property: :promoting_committee_enabled
+      field :signatureType, types.String, "Signature type of the initiative", property: :signature_type
+
+      field :initiatives, !types[Decidim::Initiatives::InitiativeType], "The initiatives that have this type"
+    end
+  end
+end

data/app/types/decidim/initiatives/initiative_committee_member_type.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This type represents a initiative committee member.
+    InitiativeCommitteeMemberType = GraphQL::ObjectType.define do
+      name "InitiativeCommitteeMemberType"
+      description "A initiative committee member"
+
+      field :id, !types.ID, "Internal ID for this member of the committee"
+      field :user, Decidim::Core::UserType, "The decidim user for this initiative committee member"
+
+      field :state, types.Int, "Type of the committee member"
+      field :createdAt, Decidim::Core::DateTimeType, "The date this initiative committee member was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The date this initiative committee member was updated", property: :updated_at
+    end
+  end
+end

data/app/types/decidim/initiatives/initiative_type.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This type represents a Initiative.
+    InitiativeType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ParticipatorySpaceInterface },
+        -> { Decidim::Core::ScopableInterface },
+        -> { Decidim::Core::AttachableInterface },
+        -> { Decidim::Core::AuthorInterface },
+        -> { Decidim::Initiatives::InitiativeTypeInterface }
+      ]
+
+      name "Initiative"
+      description "A initiative"
+
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this initiative."
+      field :slug, !types.String
+      field :hashtag, types.String, "The hashtag for this initiative"
+      field :createdAt, !Decidim::Core::DateTimeType, "The time this initiative was created", property: :created_at
+      field :updatedAt, !Decidim::Core::DateTimeType, "The time this initiative was updated", property: :updated_at
+      field :publishedAt, !Decidim::Core::DateTimeType, "The time this initiative was published", property: :published_at
+      field :reference, !types.String, "Reference prefix for this initiative"
+      field :state, types.String, "Current status of the initiative"
+      field :signatureType, types.String, "Signature type of the initiative", property: :signature_type
+      field :signatureStartDate, !Decidim::Core::DateType, "The signature start date", property: :signature_start_date
+      field :signatureEndDate, !Decidim::Core::DateType, "The signature end date", property: :signature_end_date
+      field :offlineVotes, types.Int, "The number of offline votes in this initiative", property: :offline_votes
+      field :initiativeVotesCount, types.Int, "The number of votes in this initiative", property: :initiative_votes_count
+      field :initiativeSupportsCount, types.Int, "The number of supports in this initiative", property: :initiative_supports_count
+
+      field :author, !Decidim::Core::AuthorInterface, "The initiative author" do
+        resolve lambda { |obj, _args, _ctx|
+          obj.user_group || obj.author
+        }
+      end
+
+      field :committeeMembers, types[Decidim::Initiatives::InitiativeCommitteeMemberType], property: :committee_members
+    end
+  end
+end

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

@@ -1,50 +1,10 @@
-<div class="filters row">
-  <div class="column medium-3">
-    <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
-    <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
-      <li class="is-dropdown-submenu-parent">
-        <a href="#">
-          <% if @state.present? %>
-              <%= t(".filter.#{@state}") %>
-          <% else %>
-              <%= t(".filter.all") %>
-          <% end %>
-        </a>
-        <ul class="menu is-dropdown-submenu">
-          <li><%= link_to t(".filter.created"), url_for(state: "created", q: @query) %></li>
-          <li><%= link_to t(".filter.validating"), url_for(state: "validating", q: @query) %></li>
-          <li><%= link_to t(".filter.discarded"), url_for(state: "discarded", q: @query) %></li>
-          <li><%= link_to t(".filter.published"), url_for(state: "published", q: @query) %></li>
-          <li><%= link_to t(".filter.rejected"), url_for(state: "rejected", q: @query) %></li>
-          <li><%= link_to t(".filter.accepted"), url_for(state: "accepted", q: @query) %></li>
-          <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
-        </ul>
-      </li>
-    </ul>
-  </div>
-  <div class="column medium-4">
-    <%= form_tag "", method: :get do %>
-        <div class="filters__search">
-          <div class="input-group">
-            <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
-            <%= hidden_field_tag :state, @state %>
-            <div class="input-group-button">
-              <button type="submit" class="button button--muted">
-                <%= icon "magnifying-glass", aria_label: t(".search") %>
-              </button>
-            </div>
-          </div>
-        </div>
-    <% end %>
-  </div>
-</div>
-
-<div class="card" id="initiatives">
+<div class="card with-overflow" id="initiatives">
   <div class="card-divider">
     <h2 class="card-title">
       <%= t "decidim.admin.titles.initiatives" %>
     </h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
@@ -54,7 +14,7 @@
             <th><%= t("models.initiatives.fields.title", scope: "decidim.admin") %></th>
             <th><%= t("models.initiatives.fields.state", scope: "decidim.admin") %></th>
             <th><%= t("models.initiatives.fields.supports_count", scope: "decidim.admin") %></th>
-            <th><%= t("models.initiatives.fields.created_at", scope: "decidim.admin") %></th>
+            <th><%= sort_link(query, :created_at, t("models.initiatives.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
             <th class="actions"><%= t ".actions_title" %></th>
           </tr>
         </thead>

data/config/locales/ar.yml

@@ -73,6 +73,18 @@ ar:
     admin:
       actions:
         new_initiative_type: نوع المبادرة الجديدة
+      filters:
+        search_placeholder:
+          title_or_description_cont: البحث عن %{collection} بحسب العنوان أو الوصف.
+        state_eq:
+          label: الحالة
+          values:
+            accepted: وافقت
+            created: تمّ إنشاؤه
+            discarded: التخلص منها
+            published: نشرت
+            rejected: مرفوض
+            validating: المصادقة الفنية
       menu:
         initiatives: المبادرات
         initiatives_types: أنواع المبادرة
@@ -188,18 +200,8 @@ ar:
             title: معلومات عامة
           index:
             actions_title: عمل
-            filter:
-              accepted: وافقت
-              all: الكل
-              created: تمّ إنشاؤه
-              discarded: التخلص منها
-              published: نشرت
-              rejected: مرفوض
-              validating: المصادقة الفنية
-            filter_by: مصنف بواسطة
             preview: معاينة
             print: طباعة
-            search: بحث
           show:
             print: طباعة
           update:

data/config/locales/ca.yml

@@ -61,6 +61,18 @@ ca:
     admin:
       actions:
         new_initiative_type: Nou tipus d'iniciativa
+      filters:
+        search_placeholder:
+          title_or_description_cont: Cerca %{collection} per títol o descripció.
+        state_eq:
+          label: Estat
+          values:
+            accepted: Acceptada
+            created: Creada
+            discarded: Rebutjada
+            published: Publicada
+            rejected: Rebutjada
+            validating: Validació tècnica
       menu:
         initiatives: Iniciatives
         initiatives_types: Tipus d'iniciatives
@@ -176,18 +188,8 @@ ca:
             title: Informació general
           index:
             actions_title: Acció
-            filter:
-              accepted: Acceptada
-              all: Totes
-              created: Creada
-              discarded: Rebutjada
-              published: Publicada
-              rejected: Rebutjada
-              validating: Validació tècnica
-            filter_by: Filtra per
             preview: Vista prèvia
             print: Imprimir
-            search: Cerca
           show:
             print: Imprimir
           update: