decidim-accountability 0.28.2 → 0.29.0.rc2

data/config/locales/zh-TW.yml

@@ -219,15 +219,7 @@ zh-TW:
           search: 搜尋操作
         show:
           stats:
-            attendees: 與會者
             back_to_resource: 返回至結果
-            comments: 評論
-            contributions: 貢獻
-            last_edited_by: 最後編輯者
-            last_updated_at: 更新時間
-            meetings: 會議
-            proposals: 提案
-            votes: 支援
         timeline:
           title: 專案評估
     admin:
@@ -246,16 +238,12 @@ zh-TW:
         name: 問責
         settings:
           global:
-            categories_label: 類別名稱
             comments_enabled: 已啟用留言
             comments_max_length: 留言字數上限 (0 表示使用預設)
             display_progress_enabled: 顯示進度
-            heading_leaf_level_results: 專案名稱
-            heading_parent_level_results: 結果名稱
             intro: 介紹
             scope_id: 範圍
             scopes_enabled: 啟用的範圍
-            subcategories_label: 子類別名稱
           step:
             comments_blocked: 留言已封鎖
     events:

data/decidim-accountability.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-accountability"
   s.summary = "Decidim accountability module"

data/lib/decidim/accountability/component.rb

@@ -30,10 +30,6 @@ Decidim.register_component(:accountability) do |component|
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: true
     settings.attribute :intro, type: :text, translated: true, editor: true
-    settings.attribute :categories_label, type: :string, translated: true, editor: true
-    settings.attribute :subcategories_label, type: :string, translated: true, editor: true
-    settings.attribute :heading_parent_level_results, type: :string, translated: true, editor: true
-    settings.attribute :heading_leaf_level_results, type: :string, translated: true, editor: true
     settings.attribute :display_progress_enabled, type: :boolean, default: true
   end
 

data/lib/decidim/accountability/seeds.rb

@@ -4,7 +4,7 @@ require "decidim/components/namer"
 
 module Decidim
   module Accountability
-    class Seeds
+    class Seeds < Decidim::Seeds
       attr_reader :participatory_space
 
       def initialize(participatory_space:)
@@ -12,11 +12,20 @@ module Decidim
       end
 
       def call
-        admin_user = Decidim::User.find_by(
-          organization: participatory_space.organization,
-          email: "admin@example.org"
-        )
+        component = create_component!
+
+        create_statuses!(component:)
+
+        3.times do
+          categories = create_categories!
+
+          categories.each do |category|
+            create_result!(component:, category:)
+          end
+        end
+      end
 
+      def create_component!
         params = {
           name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :accountability).i18n_name,
           manifest_name: :accountability,
@@ -24,19 +33,17 @@ module Decidim
           participatory_space:,
           settings: {
             intro: Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(word_count: 4) },
-            categories_label: Decidim::Faker::Localized.word,
-            subcategories_label: Decidim::Faker::Localized.word,
-            heading_parent_level_results: Decidim::Faker::Localized.word,
-            heading_leaf_level_results: Decidim::Faker::Localized.word,
             scopes_enabled: true,
             scope_id: participatory_space.scope&.id
           }
         }
 
-        component = Decidim.traceability.perform_action!("publish", Decidim::Component, admin_user, visibility: "all") do
+        Decidim.traceability.perform_action!("publish", Decidim::Component, admin_user, visibility: "all") do
           Decidim::Component.create!(params)
         end
+      end
 
+      def create_statuses!(component:)
         5.times do |i|
           Decidim::Accountability::Status.create!(
             component:,
@@ -44,70 +51,72 @@ module Decidim
             key: "status_#{i}"
           )
         end
+      end
 
-        3.times do
-          parent_category = participatory_space.categories.sample
-          categories = [parent_category]
+      def create_categories!
+        parent_category = participatory_space.categories.sample
+        categories = [parent_category]
 
-          2.times do
-            categories << Decidim::Category.create!(
-              name: Decidim::Faker::Localized.sentence(word_count: 5),
-              description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-                Decidim::Faker::Localized.paragraph(sentence_count: 3)
-              end,
-              parent: parent_category,
-              participatory_space:
-            )
-          end
+        2.times do
+          categories << Decidim::Category.create!(
+            name: Decidim::Faker::Localized.sentence(word_count: 5),
+            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+              Decidim::Faker::Localized.paragraph(sentence_count: 3)
+            end,
+            parent: parent_category,
+            participatory_space:
+          )
+        end
 
-          categories.each do |category|
-            result = Decidim.traceability.create!(
-              Decidim::Accountability::Result,
-              admin_user,
-              {
-                component:,
-                scope: participatory_space.organization.scopes.sample,
-                category:,
-                title: Decidim::Faker::Localized.sentence(word_count: 2),
-                description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-                  Decidim::Faker::Localized.paragraph(sentence_count: 3)
-                end
-              },
-              visibility: "all"
-            )
+        categories
+      end
+
+      def create_result!(component:, category:)
+        result = Decidim.traceability.create!(
+          Decidim::Accountability::Result,
+          admin_user,
+          {
+            component:,
+            scope: participatory_space.organization.scopes.sample,
+            category:,
+            title: Decidim::Faker::Localized.sentence(word_count: 2),
+            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+              Decidim::Faker::Localized.paragraph(sentence_count: 3)
+            end
+          },
+          visibility: "all"
+        )
 
-            Decidim::Comments::Seed.comments_for(result)
-
-            3.times do
-              child_result = Decidim.traceability.create!(
-                Decidim::Accountability::Result,
-                admin_user,
-                {
-                  component:,
-                  parent: result,
-                  start_date: Time.zone.today,
-                  end_date: Time.zone.today + 10,
-                  status: Decidim::Accountability::Status.all.sample,
-                  progress: rand(1..100),
-                  title: Decidim::Faker::Localized.sentence(word_count: 2),
-                  description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-                    Decidim::Faker::Localized.paragraph(sentence_count: 3)
-                  end
-                },
-                visibility: "all"
-              )
-
-              rand(0..5).times do |i|
-                child_result.timeline_entries.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)
-                )
+        Decidim::Comments::Seed.comments_for(result)
+
+        3.times do
+          child_result = Decidim.traceability.create!(
+            Decidim::Accountability::Result,
+            admin_user,
+            {
+              component:,
+              parent: result,
+              start_date: Time.zone.today,
+              end_date: Time.zone.today + 10,
+              status: Decidim::Accountability::Status.all.sample,
+              progress: rand(1..100),
+              title: Decidim::Faker::Localized.sentence(word_count: 2),
+              description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+                Decidim::Faker::Localized.paragraph(sentence_count: 3)
               end
+            },
+            visibility: "all"
+          )
 
-              Decidim::Comments::Seed.comments_for(child_result)
-            end
+          rand(0..5).times do |i|
+            child_result.timeline_entries.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)
+            )
           end
+
+          Decidim::Comments::Seed.comments_for(child_result)
         end
       end
     end

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

@@ -18,10 +18,6 @@ FactoryBot.define do
     settings do
       {
         intro: generate_localized_description(:accountability_component_intro, skip_injection:),
-        categories_label: generate_localized_word(:accountability_component_categories_label, skip_injection:),
-        subcategories_label: generate_localized_word(:accountability_component_subcategories_label, skip_injection:),
-        heading_parent_level_results: generate_localized_word(:accountability_component_heading_parent_level_results, skip_injection:),
-        heading_leaf_level_results: generate_localized_word(:accountability_component_heading_leaf_level_results, skip_injection:),
         scopes_enabled: true,
         scope_id: participatory_space.scope&.id
       }

data/lib/decidim/accountability/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.28.2"
+      "0.29.0.rc2"
     end
   end
 end

data/lib/decidim/api/result_type.rb

@@ -22,7 +22,7 @@ module Decidim
       field :weight, GraphQL::Types::Int, "The order of this result", null: false
       field :external_id, GraphQL::Types::String, "The external ID for this result", null: true
 
-      field :children, [Decidim::Accountability::ResultType, { null: true }], "The childrens results", null: true
+      field :children, [Decidim::Accountability::ResultType, { null: true }], "The children's results", null: true
       field :parent, Decidim::Accountability::ResultType, "The parent 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.29.0.rc2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -18,126 +18,126 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0.rc2
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -175,7 +175,7 @@ files:
 - app/commands/decidim/accountability/admin/create_result.rb
 - app/commands/decidim/accountability/admin/create_status.rb
 - app/commands/decidim/accountability/admin/create_timeline_entry.rb
-- app/commands/decidim/accountability/admin/destroy_result.rb
+- app/commands/decidim/accountability/admin/has_result_command.rb
 - app/commands/decidim/accountability/admin/import_projects_to_accountability.rb
 - app/commands/decidim/accountability/admin/update_imported_result.rb
 - app/commands/decidim/accountability/admin/update_result.rb
@@ -232,7 +232,6 @@ files:
 - 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_stats_calculator.rb
 - app/services/decidim/accountability/results_calculator.rb
 - app/services/decidim/accountability/results_csv_importer.rb
 - app/views/decidim/accountability/admin/import_results/new.html.erb
@@ -259,7 +258,6 @@ files:
 - app/views/decidim/accountability/results/_projects_aside.html.erb
 - app/views/decidim/accountability/results/_scope_filters.html.erb
 - app/views/decidim/accountability/results/_search.html.erb
-- app/views/decidim/accountability/results/_stats_box.html.erb
 - app/views/decidim/accountability/results/home.html.erb
 - app/views/decidim/accountability/results/index.html.erb
 - app/views/decidim/accountability/results/index.js.erb
@@ -393,14 +391,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim accountability module

data/app/commands/decidim/accountability/admin/destroy_result.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    module Admin
-      # This command is executed when the user destroys a Result from the admin
-      # panel.
-      class DestroyResult < Decidim::Command
-        # Initializes an UpdateResult Command.
-        #
-        # result - The current instance of the result to be destroyed.
-        # current_user - the user performing the action
-        def initialize(result, current_user)
-          @result = result
-          @current_user = current_user
-        end
-
-        # Destroys the result.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          destroy_result
-
-          broadcast(:ok)
-        end
-
-        private
-
-        attr_reader :result, :current_user
-
-        def destroy_result
-          Decidim.traceability.perform_action!(
-            :delete,
-            result,
-            current_user
-          ) do
-            result.destroy!
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    # This class handles statistics of results. Needs a `result` in
-    # order to find the stats.
-    class ResultStatsCalculator
-      # Public: Initializes the service.
-      # result - The result from which to calculate the stats.
-      def initialize(result)
-        @result = result
-      end
-
-      delegate :count, to: :proposals, prefix: true
-
-      def votes_count
-        return 0 unless proposals
-
-        proposals.sum { |proposal| proposal.votes.size }
-      end
-
-      def comments_count
-        proposals.sum(:comments_count)
-      end
-
-      def attendees_count
-        meetings.where("attendees_count > 0").sum(:attendees_count)
-      end
-
-      def contributions_count
-        meetings.where("contributions_count > 0").sum(:contributions_count)
-      end
-
-      delegate :count, to: :meetings, prefix: true
-
-      private
-
-      attr_reader :result
-
-      def proposals
-        @proposals ||= result.linked_resources(:proposals, "included_proposals")
-      end
-
-      def meetings
-        @meetings ||= result.linked_resources(:meetings, "meetings_through_proposals")
-      end
-    end
-  end
-end

data/app/views/decidim/accountability/results/_stats_box.html.erb

@@ -1,79 +0,0 @@
-<div class="columns section mediumlarge-4 large-3">
-
-  <% if result.children.any? && component_settings.display_progress_enabled? && result.progress.present? %>
-    <div class="progress-level section">
-      <div class="progress-label">
-        <span class="progress-text"><%= t("models.result.fields.progress", scope: "decidim.accountability") %>:</span>
-        <span class="progress-figure">
-          <%= display_percentage result.progress %>
-        </span>
-      </div>
-
-      <div class="progress">
-        <div class="progress-meter" style="width:<%= result.progress %>%"></div>
-      </div>
-    </div>
-  <% end %>
-
-  <% if result.versions.any? || result.linked_resources(:proposals, "included_proposals").any? %>
-    <div class="card extra line-stats">
-      <div class="definition-data">
-        <% if result.versions.any? %>
-          <div class="definition-data__item versions_count">
-            <div>
-              <%= resource_version_number(result.versions_count) %>
-              <small>
-                <%= resource_version_of(result.versions_count) %>
-              </small>
-            </div>
-
-            <div>
-              <span>
-                <%= link_to_other_resource_versions(result_versions_path(result)) %>
-              </span>
-            </div>
-          </div>
-          <% if result.last_editor.present? %>
-            <div class="definition-data__item last_revision_by">
-              <span class="definition-data__title"><%= t("results.show.stats.last_edited_by", scope: "decidim.accountability") %></span>
-              <%= render_resource_last_editor(result) %>
-            </div>
-          <% end %>
-          <div class="definition-data__item last_updated_at">
-            <span class="definition-data__title"><%= t("results.show.stats.last_updated_at", scope: "decidim.accountability") %></span>
-            <%= l result.versions.last.created_at, format: :decidim_short %>
-          </div>
-        <% end %>
-        <% if result.linked_resources(:proposals, "included_proposals").any? %>
-          <div class="definition-data__item definition-data__item--double">
-            <span class="definition-data__title"><%= t("results.show.stats.proposals", scope: "decidim.accountability") %></span>
-            <span class="definition-data__number"><%= stats_calculator.proposals_count %></span>
-          </div>
-          <div class="definition-data__item definition-data__item--double">
-            <span class="definition-data__title"><%= t("results.show.stats.meetings", scope: "decidim.accountability") %></span>
-            <span class="definition-data__number"><%= stats_calculator.meetings_count %></span>
-          </div>
-          <div class="definition-data__item definition-data__item--double">
-            <span class="definition-data__title"><%= t("results.show.stats.comments", scope: "decidim.accountability") %></span>
-            <span class="definition-data__number"><%= stats_calculator.comments_count %></span>
-          </div>
-          <div class="definition-data__item definition-data__item--double">
-            <span class="definition-data__title"><%= t("results.show.stats.attendees", scope: "decidim.accountability") %></span>
-            <span class="definition-data__number"><%= stats_calculator.attendees_count %></span>
-          </div>
-          <div class="definition-data__item definition-data__item--double">
-            <span class="definition-data__title"><%= t("results.show.stats.votes", scope: "decidim.accountability") %></span>
-            <span class="definition-data__number"><%= stats_calculator.votes_count %></span>
-          </div>
-          <div class="definition-data__item definition-data__item--double">
-            <span class="definition-data__title"><%= t("results.show.stats.contributions", scope: "decidim.accountability") %></span>
-            <span class="definition-data__number"><%= stats_calculator.contributions_count %></span>
-          </div>
-        <% end %>
-      </div>
-    </div>
-  <% end %>
-
-  <%= resource_reference(result) %>
-  <%= render partial: "decidim/shared/share_modal" %>
-</div>