decidim-accountability 0.26.0 → 0.27.0.rc1

data/config/locales/sw-KE.yml

@@ -1 +1,2 @@
+---
 sw:

data/config/locales/ti-ER.yml

@@ -1 +1,2 @@
+---
 ti:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -156,7 +157,6 @@ tr:
             progress: İlerleme
         timeline_entry:
           fields:
-            description: Açıklama
             entry_date: tarih
       result_m:
         executed: Yürütüldü

data/config/locales/uk.yml

@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -128,7 +129,6 @@ uk:
             progress: Перебіг
         timeline_entry:
           fields:
-            description: Опис
             entry_date: Дата
       results:
         count:

data/config/locales/val-ES.yml

@@ -1 +1,2 @@
+---
 val:

data/config/locales/vi.yml

@@ -1 +1,2 @@
+---
 vi:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -144,7 +145,6 @@ zh-CN:
             progress: 进展情况
         timeline_entry:
           fields:
-            description: 描述
             entry_date: 日期
       results:
         count:

data/config/locales/zh-TW.yml

@@ -1 +1,2 @@
+---
 zh-TW:

data/db/migrate/20220331150008_add_title_to_timeline_entries.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTitleToTimelineEntries < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_accountability_timeline_entries, :title, :jsonb
+  end
+end

data/db/migrate/20220331150155_move_legacy_description_to_title_of_timeline_entries.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class MoveLegacyDescriptionToTitleOfTimelineEntries < ActiveRecord::Migration[6.1]
+  class TimelineEntry < ApplicationRecord
+    self.table_name = :decidim_accountability_timeline_entries
+  end
+
+  def up
+    TimelineEntry.find_each do |timeline_entry|
+      timeline_entry.update!(title: timeline_entry.description, description: nil)
+    end
+  end
+end

data/lib/decidim/accountability/component.rb

@@ -159,7 +159,8 @@ Decidim.register_component(:accountability) do |component|
           rand(0..5).times do |i|
             child_result.timeline_entries.create!(
               entry_date: child_result.start_date + i.days,
-              description: Decidim::Faker::Localized.sentence(word_count: 2)
+              title: Decidim::Faker::Localized.sentence(word_count: 2),
+              description: Decidim::Faker::Localized.paragraph(sentence_count: 1)
             )
           end
 

data/lib/decidim/accountability/test/factories.rb

@@ -45,6 +45,7 @@ FactoryBot.define do
   factory :timeline_entry, class: "Decidim::Accountability::TimelineEntry" do
     result { create(:result) }
     entry_date { "12/7/2017" }
+    title { generate_localized_title }
     description { generate_localized_title }
   end
 end

data/lib/decidim/accountability/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.26.0"
+      "0.27.0.rc1"
     end
   end
 end

data/lib/decidim/api/timeline_entry_type.rb

@@ -7,6 +7,7 @@ module Decidim
 
       field :id, GraphQL::Types::ID, "The internal ID for this timeline entry", null: false
       field :entry_date, Decidim::Core::DateType, "The entry date for this timeline entry", null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this timeline entry", null: true
       field :description, Decidim::Core::TranslatedFieldType, "The description for this timeline entry", null: true
       field :created_at, Decidim::Core::DateTimeType, "When this timeline entry was created", null: true
       field :updated_at, Decidim::Core::DateTimeType, "When this timeline entry was updated", null: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,126 +18,126 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0.rc1
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -200,7 +200,7 @@ files:
 - app/models/decidim/accountability/timeline_entry.rb
 - app/packs/entrypoints/decidim_accountability.js
 - app/packs/entrypoints/decidim_accountability_admin.js
-- app/packs/images/decidim/accountability/decidim_accountability_icon.svg
+- app/packs/images/decidim/accountability/decidim_accountability.svg
 - app/packs/src/decidim/accountability/admin/index.js
 - app/packs/src/decidim/accountability/index.js
 - app/packs/src/decidim/accountability/version_diff.js
@@ -212,10 +212,11 @@ files:
 - app/permissions/decidim/accountability/admin/permissions.rb
 - app/permissions/decidim/accountability/permissions.rb
 - app/presenters/decidim/accountability/admin_log/result_presenter.rb
+- app/presenters/decidim/accountability/admin_log/status_presenter.rb
+- app/presenters/decidim/accountability/admin_log/timeline_entry_presenter.rb
 - app/presenters/decidim/accountability/admin_log/value_types/parent_presenter.rb
 - app/queries/decidim/accountability/metrics/results_metric_manage.rb
 - app/services/decidim/accountability/diff_renderer.rb
-- app/services/decidim/accountability/result_search.rb
 - app/services/decidim/accountability/result_stats_calculator.rb
 - app/services/decidim/accountability/results_calculator.rb
 - app/services/decidim/accountability/results_csv_importer.rb
@@ -340,6 +341,8 @@ files:
 - db/migrate/20180508170647_add_external_id_to_results.rb
 - db/migrate/20200320105903_index_foreign_keys_in_decidim_accountability_results.rb
 - db/migrate/20200827154103_add_commentable_counter_cache_to_results.rb
+- db/migrate/20220331150008_add_title_to_timeline_entries.rb
+- db/migrate/20220331150155_move_legacy_description_to_title_of_timeline_entries.rb
 - lib/decidim/accountability.rb
 - lib/decidim/accountability/admin.rb
 - lib/decidim/accountability/admin_engine.rb
@@ -365,14 +368,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim accountability module

data/app/services/decidim/accountability/result_search.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    # This class handles search and filtering of results. Needs a
-    # `current_component` param with a `Decidim::Component` in order to
-    # find the results.
-    class ResultSearch < ResourceSearch
-      text_search_fields :title, :description
-
-      # Public: Initializes the service.
-      #
-      # options - A hash of options to modify the search. These options will be
-      #          converted to methods by SearchLight so they can be used on filter
-      #          methods. (Default {})
-      #          * component - A Decidim::Component to get the results from.
-      #          * organization - A Decidim::Organization object.
-      #          * parent_id - The parent ID of the result. The value is forced to false to force
-      #                        the filter execution when the value is nil
-      #          * deep_search - Whether to perform the search on all children levels or just the
-      #                          first one. True by default.
-      def initialize(options = {})
-        options = options.dup
-        options[:deep_search] = true if options[:deep_search].nil?
-        options[:parent_id] = "root" if options[:parent_id].nil?
-        super(Result.all, options)
-      end
-
-      # Handle parent_id filter
-      def search_parent_id
-        parent_id = options[:parent_id]
-        parent_id = nil if parent_id == "root"
-
-        if options[:deep_search]
-          query.where(parent_id: [parent_id] + children_ids(parent_id))
-        else
-          query.where(parent_id: parent_id)
-        end
-      end
-
-      private
-
-      def children_ids(parent_id)
-        Result.where(parent_id: parent_id).pluck(:id)
-      end
-    end
-  end
-end