decidim-accountability 0.23.6 → 0.24.0.rc1

data/lib/decidim/api/status_type.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    class StatusType < Decidim::Api::Types::BaseObject
+      description "A status"
+
+      field :id, GraphQL::Types::ID, "The internal ID for this status", null: false
+      field :key, GraphQL::Types::String, "The key for this status", null: true
+      field :name, Decidim::Core::TranslatedFieldType, "The name for this status", null: true
+      field :created_at, Decidim::Core::DateType, "When this status was created", null: true
+      field :updated_at, Decidim::Core::DateType, "When this status was updated", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this status", null: true
+      field :progress, GraphQL::Types::Int, "The progress for this status", null: true
+
+      field :results, [Decidim::Accountability::ResultType, { null: true }], "The results for this status", null: true
+    end
+  end
+end

data/lib/decidim/api/timeline_entry_type.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    class TimelineEntryType < Decidim::Api::Types::BaseObject
+      description "A Timeline Entry"
+
+      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 :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
+
+      field :result, Decidim::Accountability::ResultType, "The result for this timeline entry", null: true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.23.6
+  version: 0.24.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -80,98 +80,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -194,11 +194,19 @@ files:
 - app/assets/stylesheets/decidim/accountability/accountability/_categories.scss
 - app/assets/stylesheets/decidim/accountability/accountability/_lines_breadcrumb.scss
 - app/assets/stylesheets/decidim/accountability/accountability/_results.scss
+- app/cells/decidim/accountability/content_blocks/highlighted_results/elements.erb
+- app/cells/decidim/accountability/content_blocks/highlighted_results/heading.erb
+- app/cells/decidim/accountability/content_blocks/highlighted_results_cell.rb
 - app/cells/decidim/accountability/highlighted_results/show.erb
 - app/cells/decidim/accountability/highlighted_results_cell.rb
 - app/cells/decidim/accountability/highlighted_results_for_component/show.erb
 - app/cells/decidim/accountability/highlighted_results_for_component_cell.rb
 - app/cells/decidim/accountability/result_activity_cell.rb
+- app/cells/decidim/accountability/result_cell.rb
+- app/cells/decidim/accountability/result_m/data.erb
+- app/cells/decidim/accountability/result_m/footer.erb
+- app/cells/decidim/accountability/result_m/tags.erb
+- app/cells/decidim/accountability/result_m_cell.rb
 - app/commands/decidim/accountability/admin/create_imported_result.rb
 - app/commands/decidim/accountability/admin/create_result.rb
 - app/commands/decidim/accountability/admin/create_status.rb
@@ -208,7 +216,10 @@ files:
 - app/commands/decidim/accountability/admin/update_result.rb
 - app/commands/decidim/accountability/admin/update_status.rb
 - app/commands/decidim/accountability/admin/update_timeline_entry.rb
+- app/controllers/concerns/decidim/accountability/admin/filterable.rb
 - app/controllers/decidim/accountability/admin/application_controller.rb
+- app/controllers/decidim/accountability/admin/attachment_collections_controller.rb
+- app/controllers/decidim/accountability/admin/attachments_controller.rb
 - app/controllers/decidim/accountability/admin/import_results_controller.rb
 - app/controllers/decidim/accountability/admin/results_controller.rb
 - app/controllers/decidim/accountability/admin/statuses_controller.rb
@@ -222,6 +233,7 @@ files:
 - app/forms/decidim/accountability/admin/status_form.rb
 - app/forms/decidim/accountability/admin/timeline_entry_form.rb
 - app/helpers/decidim/accountability/admin/application_helper.rb
+- app/helpers/decidim/accountability/admin/filterable_helper.rb
 - app/helpers/decidim/accountability/application_helper.rb
 - app/helpers/decidim/accountability/breadcrumb_helper.rb
 - app/jobs/application_job.rb
@@ -241,10 +253,6 @@ files:
 - app/services/decidim/accountability/result_stats_calculator.rb
 - app/services/decidim/accountability/results_calculator.rb
 - app/services/decidim/accountability/results_csv_importer.rb
-- app/types/decidim/accountability/accountability_type.rb
-- app/types/decidim/accountability/result_type.rb
-- app/types/decidim/accountability/status_type.rb
-- app/types/decidim/accountability/timeline_entry_type.rb
 - app/views/decidim/accountability/admin/import_results/new.html.erb
 - app/views/decidim/accountability/admin/results/_form.html.erb
 - app/views/decidim/accountability/admin/results/edit.html.erb
@@ -281,8 +289,6 @@ files:
 - app/views/decidim/accountability/results/show.html.erb
 - app/views/decidim/accountability/versions/index.html.erb
 - app/views/decidim/accountability/versions/show.html.erb
-- app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_results.html.erb
-- app/views/decidim/participatory_processes/participatory_process_groups/_result.html.erb
 - app/views/decidim/participatory_spaces/_result.html.erb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
@@ -367,11 +373,16 @@ files:
 - lib/decidim/accountability.rb
 - lib/decidim/accountability/admin.rb
 - lib/decidim/accountability/admin_engine.rb
+- lib/decidim/accountability/api.rb
 - lib/decidim/accountability/component.rb
 - lib/decidim/accountability/engine.rb
 - lib/decidim/accountability/result_serializer.rb
 - lib/decidim/accountability/test/factories.rb
 - lib/decidim/accountability/version.rb
+- lib/decidim/api/accountability_type.rb
+- lib/decidim/api/result_type.rb
+- lib/decidim/api/status_type.rb
+- lib/decidim/api/timeline_entry_type.rb
 - vendor/assets/javascripts/diff.js
 homepage: https://github.com/decidim/decidim
 licenses:
@@ -385,14 +396,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim accountability module

data/app/types/decidim/accountability/accountability_type.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    AccountabilityType = GraphQL::ObjectType.define do
-      interfaces [-> { Decidim::Core::ComponentInterface }]
-
-      name "Accountability"
-      description "An accountability component of a participatory space."
-
-      connection :results, ResultType.connection_type do
-        resolve ->(component, _args, _ctx) {
-                  ResultTypeHelper.base_scope(component).includes(:component)
-                }
-      end
-
-      field(:result, ResultType) do
-        argument :id, !types.ID
-
-        resolve ->(component, args, _ctx) {
-          ResultTypeHelper.base_scope(component).find_by(id: args[:id])
-        }
-      end
-    end
-
-    module ResultTypeHelper
-      def self.base_scope(component)
-        Result.where(component: component)
-      end
-    end
-  end
-end

data/app/types/decidim/accountability/result_type.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    ResultType = GraphQL::ObjectType.define do
-      interfaces [
-        -> { Decidim::Core::ComponentInterface },
-        -> { Decidim::Core::CategorizableInterface },
-        -> { Decidim::Comments::CommentableInterface },
-        -> { Decidim::Core::ScopableInterface }
-      ]
-
-      name "Result"
-      description "A result"
-
-      field :id, !types.ID, "The internal ID for this result"
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this result"
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this result"
-      field :reference, types.String, "The reference for this result"
-      field :startDate, Decidim::Core::DateType, "The start date for this result", property: :start_date
-      field :endDate, Decidim::Core::DateType, "The end date for this result", property: :end_date
-      field :progress, types.Float, "The progress for this result"
-      field :createdAt, Decidim::Core::DateTimeType, "When this result was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "When this result was updated", property: :updated_at
-      field :childrenCount, types.Int, "The number of children results", property: :children_count
-      field :weight, !types.Int, "The order of this result"
-      field :externalId, types.String, "The external ID for this result", property: :external_id
-
-      field :children, types[Decidim::Accountability::ResultType], "The childrens results"
-      field :parent, Decidim::Accountability::ResultType, "The parent result"
-      field :status, Decidim::Accountability::StatusType, "The status for this result"
-      field :timelineEntries, types[Decidim::Accountability::TimelineEntryType], "The timeline entries for this result", property: :timeline_entries
-    end
-  end
-end

data/app/types/decidim/accountability/status_type.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    StatusType = GraphQL::ObjectType.define do
-      name "Status"
-      description "A status"
-
-      field :id, !types.ID, "The internal ID for this status"
-      field :key, types.String, "The key for this status"
-      field :name, Decidim::Core::TranslatedFieldType, "The name for this status"
-      field :createdAt, Decidim::Core::DateType, "When this status was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateType, "When this status was updated", property: :updated_at
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this status"
-      field :progress, types.Int, "The progress for this status"
-
-      field :results, types[Decidim::Accountability::ResultType], "The results for this status"
-    end
-  end
-end

data/app/types/decidim/accountability/timeline_entry_type.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    TimelineEntryType = GraphQL::ObjectType.define do
-      name "TimelineEntry"
-      description "A Timeline Entry"
-
-      field :id, !types.ID, "The internal ID for this timeline entry"
-      field :entryDate, Decidim::Core::DateType, "The entry date for this timeline entry", property: :entry_date
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this timeline entry"
-      field :createdAt, Decidim::Core::DateTimeType, "When this timeline entry was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "When this timeline entry was updated", property: :updated_at
-
-      field :result, Decidim::Accountability::ResultType, "The result for this timeline entry"
-    end
-  end
-end

data/app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_results.html.erb

@@ -1,12 +0,0 @@
-<% if results.any? %>
-    <section class="section row collapse highlighted_results">
-      <h2 class="section-heading"><%= t(".results") %></h2>
-      <div class="row">
-        <div class="columns accountability">
-          <div class="card card--action card--list">
-            <%= render partial: "decidim/participatory_processes/participatory_process_groups/result", collection: results %>
-          </div>
-        </div>
-      </div>
-    </section>
-<% end %>

data/app/views/decidim/participatory_processes/participatory_process_groups/_result.html.erb

@@ -1,32 +0,0 @@
-<div class="card--list__item">
-  <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
-
-  <%= link_to resource_locator(result).path, class: "card--list__text card__link card__link--block" do %>
-      <h5 class="card--list__heading">
-        <%= translated_attribute(result.title) %>
-      </h5>
-
-      <div class="text-small card--meta">
-        <% if result.start_date %>
-            <strong><%= t("models.result.fields.start_date", scope: "decidim.accountability") %></strong>
-            <span><%= result.start_date %></span>
-        <% end %>
-
-        <% if result.end_date %>
-            <strong><%= t("models.result.fields.end_date", scope: "decidim.accountability") %></strong>
-            <span><%= result.end_date %></span>
-        <% end %>
-
-        <% if result.status %>
-            <strong><%= t("models.result.fields.status", scope: "decidim.accountability") %></strong>
-            <span><%= translated_attribute(result.status.name) %></span>
-        <% end %>
-      </div>
-  <% end %>
-
-  <% if result.progress.present? %>
-      <div class="card--list__data">
-        <span class="card--list__data__number"><%= display_percentage result.progress %></span>
-      </div>
-  <% end %>
-</div>