decidim-accountability 0.30.2 → 0.31.0.rc1

data/config/locales/zh-TW.yml

@@ -17,9 +17,6 @@ zh-TW:
         key: 金鑰
         name: 名稱
         progress: 進度
-      timeline_entry:
-        description: 說明
-        title: 標題
     models:
       decidim/accountability/proposal_linked_event: 在結果的建議
       decidim/accountability/result_progress_updated_event: 結果程序已更新
@@ -30,13 +27,10 @@ zh-TW:
   decidim:
     accountability:
       actions:
-        attachment_collections: 資料夾
-        attachments: 附件
         confirm_destroy: 確定要刪除 %{name} ？
         destroy: 刪除
         edit: 編輯
         preview: 預覽
-        timeline_entries: 專案評估
         title: 操作
       admin:
         exports:
@@ -89,23 +83,6 @@ zh-TW:
           update:
             invalid: 更新狀態時發生錯誤.
             success: 狀態成功更新.
-        timeline_entries:
-          create:
-            invalid: 建立資料時發生錯誤.
-            success: 資料成功建立.
-          destroy:
-            success: 資料成功刪除.
-          edit:
-            title: 編輯資料
-            update: 更新資料
-          index:
-            title: 專案時程資料
-          new:
-            create: 建立資料
-            title: 新資料
-          update:
-            invalid: 更新資料時發生錯誤.
-            success: 資料成功更新.
       admin_log:
         result:
           create: "%{user_name} 建立結果 %{resource_name} 在 %{space_name}"
@@ -115,10 +92,6 @@ zh-TW:
           create: "%{user_name} 建立了 %{resource_name} 狀態"
           delete: "%{user_name} 刪除了 %{resource_name} 狀態"
           update: "%{user_name} 更新了 %{resource_name} 狀態"
-        timeline_entry:
-          create: "%{user_name} 建立了 %{resource_name} 時間表資料"
-          delete: "%{user_name} 刪除了 %{resource_name} 時間表資料"
-          update: "%{user_name} 更新了 %{resource_name} 時間表資料"
         value_types:
           parent_presenter:
             not_found: '資料庫中找不到上一層 (ID: %{id})'
@@ -156,9 +129,6 @@ zh-TW:
             key: 金鑰
             name: 名稱
             progress: 進度
-        timeline_entry:
-          fields:
-            title: 標題
       results:
         count:
           results_count:
@@ -170,8 +140,6 @@ zh-TW:
         show:
           stats:
             back_to_resource: 返回至結果
-        timeline:
-          title: 專案評估
     admin:
       filters:
         results:
@@ -202,11 +170,6 @@ zh-TW:
           email_outro: 收到這個通知表示正在訂閱 "%{proposal_title}" ，而這個提案包含在結果 "%{resource_title}" ，透過下面連結可以停止接收通知。
           email_subject: '%{resource_title} 的更新進度'
           notification_title: 這個結果 <a href="%{resource_path}">%{resource_title}</a> 包含提案 <a href="%{proposal_path}">%{proposal_title}</a>，現在完成 %{progress}% 。
-    metrics:
-      results:
-        description: 產生的結果數量
-        object: 結果
-        title: 結果
     participatory_spaces:
       highlighted_results:
         see_all: 檢視所有結果 (%{count})

data/db/migrate/20250606155946_rename_timeline_table_to_milestone.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RenameTimelineTableToMilestone < ActiveRecord::Migration[7.2]
+  def change
+    rename_table :decidim_accountability_timeline_entries, :decidim_accountability_milestones
+
+    rename_index :decidim_accountability_milestones,
+                 "index_decidim_accountability_timeline_entries_on_results_id",
+                 "index_decidim_accountability_milestones_on_results_id"
+  end
+end

data/lib/decidim/accountability/admin_engine.rb

@@ -30,7 +30,7 @@ module Decidim
 
           resources :attachment_collections, except: [:show]
           resources :attachments, except: [:show]
-          resources :timeline_entries, except: [:show]
+          resources :milestones, except: [:show]
         end
         resources :import_components, only: [:new, :create] do
           get :preview, on: :collection

data/lib/decidim/accountability/api.rb

@@ -5,6 +5,6 @@ module Decidim
     autoload :AccountabilityType, "decidim/api/accountability_type"
     autoload :ResultType, "decidim/api/result_type"
     autoload :StatusType, "decidim/api/status_type"
-    autoload :TimelineEntryType, "decidim/api/timeline_entry_type"
+    autoload :MilestoneType, "decidim/api/milestone_type"
   end
 end

data/lib/decidim/accountability/component.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 Decidim.register_component(:accountability) do |component|
+  include Decidim::TranslatableAttributes
+
   component.engine = Decidim::Accountability::Engine
   component.admin_engine = Decidim::Accountability::AdminEngine
   component.icon = "media/images/decidim_accountability.svg"
@@ -31,9 +33,24 @@ Decidim.register_component(:accountability) do |component|
     settings.attribute :intro, type: :text, translated: true, editor: true
     settings.attribute :display_progress_enabled, type: :boolean, default: true
     settings.attribute :geocoding_enabled, type: :boolean, default: false
+    settings.attribute :default_taxonomy, type: :select, include_blank: true, raw_choices: true, choices: lambda { |context|
+      context[:component].available_root_taxonomies.map { |taxonomy| [translated_attribute(taxonomy.name), taxonomy.id] }
+    }
+  end
+
+  component.register_stat :results_count,
+                          primary: true,
+                          priority: Decidim::StatsRegistry::MEDIUM_PRIORITY,
+                          icon_name: "briefcase-2-line",
+                          tooltip_key: "results_count_tooltip" do |components, _start_at, _end_at|
+    Decidim::Accountability::Result.where(component: components).count
   end
 
-  component.register_stat :results_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, _start_at, _end_at|
+  component.register_stat :comments_count,
+                          priority: Decidim::StatsRegistry::HIGH_PRIORITY,
+                          icon_name: "chat-1-line",
+                          tooltip_key: "comments_count",
+                          tag: :comments do |components, _start_at, _end_at|
     Decidim::Accountability::Result.where(component: components).count
   end
 

data/lib/decidim/accountability/engine.rb

@@ -13,6 +13,10 @@ module Decidim
       routes do
         resources :results, only: [:index, :show] do
           resources :versions, only: [:show]
+
+          collection do
+            get :home
+          end
         end
         root to: "results#home"
       end
@@ -38,19 +42,7 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Accountability::Engine.root}/app/views")
       end
 
-      initializer "decidim_accountability.register_metrics" do
-        Decidim.metrics_registry.register(:results) do |metric_registry|
-          metric_registry.manager_class = "Decidim::Accountability::Metrics::ResultsMetricManage"
-
-          metric_registry.settings do |settings|
-            settings.attribute :highlighted, type: :boolean, default: false
-            settings.attribute :scopes, type: :array, default: %w(home)
-            settings.attribute :weight, type: :integer, default: 4
-          end
-        end
-      end
-
-      initializer "decidim_accountability.webpacker.assets_path" do
+      initializer "decidim_accountability.shakapacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
     end

data/lib/decidim/accountability/seeds.rb

@@ -16,7 +16,7 @@ module Decidim
 
         create_statuses!(component:)
 
-        3.times do
+        number_of_records.times do
           taxonomies = create_taxonomies!
 
           taxonomies.each do |taxonomy|
@@ -27,7 +27,7 @@ module Decidim
 
       def create_component!
         params = {
-          name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :accountability).i18n_name,
+          name: Decidim::Components::Namer.new(organization.available_locales, :accountability).i18n_name,
           manifest_name: :accountability,
           published_at: Time.current,
           participatory_space:,
@@ -53,19 +53,19 @@ module Decidim
       end
 
       def root_taxonomy
-        @root_taxonomy ||= participatory_space.organization.taxonomies.roots.find_by("name->>'#{I18n.locale}'= ?",
-                                                                                     "Categories") || participatory_space.organization.taxonomies.roots.sample
+        @root_taxonomy ||= organization.taxonomies.roots.find_by("name->>'#{I18n.locale}'= ?",
+                                                                 "Categories") || organization.taxonomies.roots.sample
       end
 
       def create_taxonomies!
-        parent_taxonomy = root_taxonomy.children.sample || root_taxonomy.children.create!(name: Decidim::Faker::Localized.sentence(word_count: 5))
+        parent_taxonomy = root_taxonomy.children.sample || create_taxonomy!(name: ::Faker::Lorem.sentence(word_count: 5), parent: root_taxonomy)
         taxonomies = [parent_taxonomy]
 
         2.times do
           taxonomies << if parent_taxonomy.children.count > 1
                           parent_taxonomy.children.sample
                         else
-                          parent_taxonomy.children.create!(name: Decidim::Faker::Localized.sentence(word_count: 5))
+                          create_taxonomy!(name: ::Faker::Lorem.sentence(word_count: 5), parent: parent_taxonomy)
                         end
         end
 
@@ -96,7 +96,7 @@ module Decidim
 
         Decidim::Comments::Seed.comments_for(result)
 
-        3.times do
+        number_of_records.times do
           child_result = Decidim.traceability.create!(
             Decidim::Accountability::Result,
             admin_user,
@@ -115,8 +115,8 @@ module Decidim
             visibility: "all"
           )
 
-          rand(0..5).times do |i|
-            child_result.timeline_entries.create!(
+          number_of_records.times do |i|
+            child_result.milestones.create!(
               entry_date: child_result.start_date + i.days,
               title: Decidim::Faker::Localized.sentence(word_count: 2),
               description: Decidim::Faker::Localized.paragraph(sentence_count: 1)

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

@@ -50,13 +50,13 @@ FactoryBot.define do
     longitude { Faker::Address.longitude }
   end
 
-  factory :timeline_entry, class: "Decidim::Accountability::TimelineEntry" do
+  factory :milestone, class: "Decidim::Accountability::Milestone" do
     transient do
       skip_injection { false }
     end
     result { create(:result, skip_injection:) }
     entry_date { "12/7/2017" }
-    title { generate_localized_title(:timeline_entry_title, skip_injection:) }
-    description { generate_localized_title(:timeline_entry_description, skip_injection:) }
+    title { generate_localized_title(:milestone_title, skip_injection:) }
+    description { generate_localized_title(:milestone_description, skip_injection:) }
   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.30.2"
+      "0.31.0.rc1"
     end
   end
 end

data/lib/decidim/accountability.rb

@@ -10,12 +10,5 @@ module Decidim
   # Base module for this engine.
   module Accountability
     autoload :ResultSerializer, "decidim/accountability/result_serializer"
-
-    include ActiveSupport::Configurable
-
-    # Public Setting that defines whether proposals can be linked to meetings
-    config_accessor :enable_proposal_linking do
-      Decidim.const_defined?("Proposals")
-    end
   end
 end

data/lib/decidim/api/{timeline_entry_type.rb → milestone_type.rb}

@@ -2,16 +2,17 @@
 
 module Decidim
   module Accountability
-    class TimelineEntryType < Decidim::Api::Types::BaseObject
+    class MilestoneType < Decidim::Api::Types::BaseObject
       implements Decidim::Core::TimestampsInterface
+      implements Decidim::Core::TraceableInterface
 
-      description "A Timeline Entry"
+      description "A Milestone"
 
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this timeline entry", null: true
-      field :entry_date, Decidim::Core::DateType, "The entry date for this timeline entry", null: true
-      field :id, GraphQL::Types::ID, "The internal ID for this timeline entry", null: false
-      field :result, Decidim::Accountability::ResultType, "The result 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 milestone", null: true
+      field :entry_date, Decidim::Core::DateType, "The entry date for this milestone", null: true
+      field :id, GraphQL::Types::ID, "The internal ID for this milestone", null: false
+      field :result, Decidim::Accountability::ResultType, "The result for this milestone", null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this milestone", null: true
     end
   end
 end

data/lib/decidim/api/result_type.rb

@@ -3,9 +3,14 @@
 module Decidim
   module Accountability
     class ResultType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ReferableInterface
+      implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::AttachableInterface
+      implements Decidim::Core::AttachableCollectionInterface
+      implements Decidim::Core::LocalizableInterface
       implements Decidim::Core::TaxonomizableInterface
       implements Decidim::Core::TimestampsInterface
-      implements Decidim::Comments::CommentableInterface
+      implements Decidim::Core::TraceableInterface
 
       description "A result"
 
@@ -15,14 +20,23 @@ module Decidim
       field :end_date, Decidim::Core::DateType, "The end date for this result", null: true
       field :external_id, GraphQL::Types::String, "The external ID for this result", null: true
       field :id, GraphQL::Types::ID, "The internal ID for this result", null: false
+      field :milestones, [Decidim::Accountability::MilestoneType, { null: true }], "The milestones for this result", null: true
       field :parent, Decidim::Accountability::ResultType, "The parent result", null: true
       field :progress, GraphQL::Types::Float, "The progress for this result", null: true
-      field :reference, GraphQL::Types::String, "The reference for this result", null: true
+      field :proposals, [Decidim::Proposals::ProposalType, { null: true }], "The proposal URLs for this result", null: true
       field :start_date, Decidim::Core::DateType, "The start date for this result", null: true
       field :status, Decidim::Accountability::StatusType, "The status for this result", null: true
-      field :timeline_entries, [Decidim::Accountability::TimelineEntryType, { null: true }], "The timeline entries for this result", null: true
       field :title, Decidim::Core::TranslatedFieldType, "The title for this result", null: true
+      field :url, String, "The URL for this result", null: false
       field :weight, GraphQL::Types::Int, "The order of this result", null: false
+
+      def url
+        Decidim::ResourceLocatorPresenter.new(object).url
+      end
+
+      def proposals
+        object.linked_resources(:proposals, "included_proposals").sort_by(&:id)
+      end
     end
   end
 end

data/lib/decidim/api/status_type.rb

@@ -4,6 +4,7 @@ module Decidim
   module Accountability
     class StatusType < Decidim::Api::Types::BaseObject
       implements Decidim::Core::TimestampsInterface
+      implements Decidim::Core::TraceableInterface
 
       description "A status"