decidim-participatory_processes 0.24.3 → 0.25.0.rc1

data/lib/decidim/participatory_processes/engine.rb

@@ -46,10 +46,6 @@ module Decidim
         end
       end
 
-      initializer "decidim_participatory_processes.assets" do |app|
-        app.config.assets.precompile += %w(decidim_participatory_processes_manifest.js)
-      end
-
       initializer "decidim_participatory_processes.query_extensions" do
         Decidim::Api::QueryType.include Decidim::ParticipatoryProcesses::QueryExtensions
       end
@@ -61,11 +57,12 @@ module Decidim
 
       initializer "decidim_participatory_processes.menu" do
         Decidim.menu :menu do |menu|
-          menu.item I18n.t("menu.processes", scope: "decidim"),
-                    decidim_participatory_processes.participatory_processes_path,
-                    position: 2,
-                    if: Decidim::ParticipatoryProcess.where(organization: current_organization).published.any?,
-                    active: %r{^/process(es|_groups)}
+          menu.add_item :participatory_processes,
+                        I18n.t("menu.processes", scope: "decidim"),
+                        decidim_participatory_processes.participatory_processes_path,
+                        position: 2,
+                        if: Decidim::ParticipatoryProcess.where(organization: current_organization).published.any?,
+                        active: %r{^/process(es|_groups)}
         end
       end
 
@@ -153,7 +150,7 @@ module Decidim
         end
 
         Decidim.content_blocks.register(:participatory_process_group_homepage, :stats) do |content_block|
-          content_block.cell = "decidim/participatory_process_groups/content_blocks/stats"
+          content_block.cell = "decidim/participatory_process_groups/content_blocks/statistics"
           content_block.public_name_key = "decidim.participatory_process_groups.content_blocks.stats.name"
           content_block.default!
         end

data/lib/decidim/participatory_processes/participatory_space.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:participatory_processes) do |participatory_space|
-  participatory_space.icon = "decidim/participatory_processes/process.svg"
+  participatory_space.icon = "media/images/decidim_participatory_processes.svg"
   participatory_space.model_class_name = "Decidim::ParticipatoryProcess"
 
   participatory_space.participatory_spaces do |organization|
@@ -74,7 +74,12 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         hashtag: Faker::Internet.slug,
         group_url: Faker::Internet.url,
         organization: organization,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
+        hero_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city.jpeg")),
+          filename: "hero_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
         developer_group: Decidim::Faker::Localized.sentence(word_count: 1),
         local_area: Decidim::Faker::Localized.sentence(word_count: 2),
         meta_scope: Decidim::Faker::Localized.word,
@@ -112,8 +117,18 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
+        hero_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city.jpeg")),
+          filename: "hero_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
+        banner_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city2.jpeg")),
+          filename: "banner_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
         promoted: true,
         published_at: 2.weeks.ago,
         meta_scope: Decidim::Faker::Localized.word,
@@ -183,22 +198,40 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attachment_collection: attachment_collection,
+        content_type: "application/pdf",
         attached_to: process,
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
+          filename: "Exampledocument.pdf",
+          content_type: "application/pdf",
+          metadata: nil
+        ) # Keep after attached_to
       )
 
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: process,
-        file: File.new(File.join(seeds_root, "city.jpeg")) # Keep after attached_to
+        content_type: "image/jpeg",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city.jpeg")),
+          filename: "city.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ) # Keep after attached_to
       )
 
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: process,
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
+        content_type: "application/pdf",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
+          filename: "Exampledocument.pdf",
+          content_type: "application/pdf",
+          metadata: nil
+        ) # Keep after attached_to
       )
 
       2.times do

data/lib/decidim/participatory_processes/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.24.3"
+      "0.25.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-participatory_processes
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
+- !ruby/object:Gem::Dependency
+  name: decidim-meetings
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.25.0.rc1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.25.0.rc1
 description: Participatory processes component for decidim.
 email:
 - josepjaume@gmail.com
@@ -65,11 +79,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/admin/decidim_participatory_processes_manifest.js
-- app/assets/config/decidim_participatory_processes_manifest.js
-- app/assets/images/decidim/participatory_processes/process.svg
-- app/assets/javascripts/decidim/participatory_processes/admin/participatory_processes.js.es6
-- app/assets/javascripts/decidim/participatory_processes/filters.js.es6
 - app/cells/decidim/participatory_process_activity_cell.rb
 - app/cells/decidim/participatory_process_groups/content_block_cell.rb
 - app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/filters.erb
@@ -82,8 +91,7 @@ files:
 - app/cells/decidim/participatory_process_groups/content_blocks/html_cell.rb
 - app/cells/decidim/participatory_process_groups/content_blocks/metadata/show.erb
 - app/cells/decidim/participatory_process_groups/content_blocks/metadata_cell.rb
-- app/cells/decidim/participatory_process_groups/content_blocks/stats/show.erb
-- app/cells/decidim/participatory_process_groups/content_blocks/stats_cell.rb
+- app/cells/decidim/participatory_process_groups/content_blocks/statistics_cell.rb
 - app/cells/decidim/participatory_process_groups/content_blocks/title/show.erb
 - app/cells/decidim/participatory_process_groups/content_blocks/title_cell.rb
 - app/cells/decidim/participatory_process_groups/process_filters_cell.rb
@@ -112,10 +120,6 @@ files:
 - app/cells/decidim/participatory_processes/process_s/image.erb
 - app/cells/decidim/participatory_processes/process_s/show.erb
 - app/cells/decidim/participatory_processes/process_s_cell.rb
-- app/cells/decidim/participatory_processes/statistic/show.erb
-- app/cells/decidim/participatory_processes/statistic_cell.rb
-- app/cells/decidim/participatory_processes/statistics/show.erb
-- app/cells/decidim/participatory_processes/statistics_cell.rb
 - app/commands/decidim/participatory_processes/admin/activate_participatory_process_step.rb
 - app/commands/decidim/participatory_processes/admin/copy_participatory_process.rb
 - app/commands/decidim/participatory_processes/admin/create_participatory_process.rb
@@ -177,7 +181,6 @@ files:
 - app/forms/decidim/participatory_processes/admin/participatory_process_step_form.rb
 - app/forms/decidim/participatory_processes/admin/participatory_process_user_role_form.rb
 - app/helpers/decidim/participatory_processes/admin/participatory_process_helper.rb
-- app/helpers/decidim/participatory_processes/admin/participatory_processes_menu_helper.rb
 - app/helpers/decidim/participatory_processes/admin/process_groups_for_select_helper.rb
 - app/helpers/decidim/participatory_processes/admin/processes_for_select_helper.rb
 - app/helpers/decidim/participatory_processes/application_helper.rb
@@ -187,6 +190,11 @@ files:
 - app/models/decidim/participatory_process_group.rb
 - app/models/decidim/participatory_process_step.rb
 - app/models/decidim/participatory_process_user_role.rb
+- app/packs/entrypoints/decidim_participatory_processes.js
+- app/packs/entrypoints/decidim_participatory_processes_admin.js
+- app/packs/images/decidim/participatory_processes/decidim_participatory_processes.svg
+- app/packs/src/decidim/participatory_processes/admin/participatory_processes.js
+- app/packs/src/decidim/participatory_processes/filters.js
 - app/permissions/decidim/participatory_processes/permissions.rb
 - app/presenters/decidim/participatory_processes/admin_log/participatory_process_group_presenter.rb
 - app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb
@@ -249,7 +257,6 @@ files:
 - app/views/decidim/participatory_processes/admin/participatory_processes/edit.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_processes/new.html.erb
-- app/views/decidim/participatory_processes/admin/shared/_secondary_nav.html.erb
 - app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb
 - app/views/decidim/participatory_processes/participatory_process_groups/show.js.erb
 - app/views/decidim/participatory_processes/participatory_process_steps/_timeline.html.erb
@@ -272,6 +279,7 @@ files:
 - app/views/layouts/decidim/admin/participatory_process_groups.html.erb
 - app/views/layouts/decidim/admin/participatory_processes.html.erb
 - app/views/layouts/decidim/participatory_process.html.erb
+- config/assets.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -298,6 +306,7 @@ files:
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
 - config/locales/fr-CA.yml
+- config/locales/fr-LU.yml
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
@@ -308,10 +317,10 @@ files:
 - config/locales/is-IS.yml
 - config/locales/is.yml
 - config/locales/it.yml
-- config/locales/ja-JP.yml
 - config/locales/ja.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
+- config/locales/lb-LU.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -385,6 +394,7 @@ files:
 - db/migrate/20201030133444_add_promoted_flag_to_decidim_participatory_process_groups.rb
 - db/migrate/20210204154593_add_weight_field_to_participatory_processes.rb
 - db/migrate/20210310120750_add_followable_counter_cache_to_participatory_processes.rb
+- db/migrate/20210415163339_allow_null_file_column_in_decidim_attachments_table.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -418,11 +428,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Decidim participatory processes module

data/app/assets/config/admin/decidim_participatory_processes_manifest.js

@@ -1 +0,0 @@
-//= link decidim/participatory_processes/admin/participatory_processes.js

data/app/assets/config/decidim_participatory_processes_manifest.js

@@ -1,2 +0,0 @@
-//= link_directory ../images/decidim/participatory_processes
-//= link decidim/participatory_processes/filters.js

data/app/assets/javascripts/decidim/participatory_processes/admin/participatory_processes.js.es6

@@ -1,20 +0,0 @@
-$(() => {
-  ((exports) => {
-    const $participatoryProcessScopeEnabled = $("#participatory_process_scopes_enabled");
-    const $participatoryProcessScopeId = $("#participatory_process_scope_id");
-    const $participatoryProcessScopeTypeId = $("#participatory_process_scope_type_max_depth_id");
-
-    if ($(".edit_participatory_process, .new_participatory_process").length > 0) {
-      $participatoryProcessScopeEnabled.on("change", (event) => {
-        const checked = event.target.checked;
-        exports.theDataPicker.enabled($participatoryProcessScopeId, checked);
-        if (checked === true) {
-          $participatoryProcessScopeTypeId.removeAttr("disabled");
-        } else {
-          $participatoryProcessScopeTypeId.attr("disabled", true)
-        }
-      })
-      exports.theDataPicker.enabled($participatoryProcessScopeId, $participatoryProcessScopeEnabled.prop("checked"));
-    }
-  })(window);
-});

data/app/assets/javascripts/decidim/participatory_processes/filters.js.es6

@@ -1,31 +0,0 @@
-$(() => {
-  ((exports) => {
-    const $processesGrid = $("#processes-grid");
-    const $loading = $processesGrid.find(".loading");
-    const filterLinksSelector = ".order-by__tabs a"
-
-    $loading.hide();
-
-    $processesGrid.on("click", filterLinksSelector, (event) => {
-      const $processesGridCards = $processesGrid.find(".card-grid .column");
-      let $target = $(event.target);
-
-      // IE11 matches the <strong> element inside the filtering anchor element
-      // as the `event.target` breaking the functionality below.
-      if (!$target.is("a")) {
-        $target = $target.parents("a");
-      }
-
-      $(filterLinksSelector).removeClass("is-active");
-      $target.addClass("is-active");
-
-      $processesGridCards.hide();
-      $loading.show();
-
-      if (exports.history) {
-        exports.history.pushState(null, null, $target.attr("href"));
-      }
-    });
-  })(window);
-
-});

data/app/cells/decidim/participatory_process_groups/content_blocks/stats/show.erb

@@ -1,13 +0,0 @@
-<section class="section" id="participatory_process_group-statistics">
-  <h2 class="section-heading">
-    <%= t("decidim.participatory_process_groups.content_blocks.stats.name") %>
-  </h2>
-
-  <div class="space-stats">
-    <% if stats.collection.present? %>
-      <%= cell("decidim/participatory_processes/statistic", collection: stats.collection) %>
-    <% else %>
-      <span class="muted"><%= t("decidim.participatory_processes.statistics.no_stats") %></span>
-    <% end %>
-  </div>
-</section>

data/app/cells/decidim/participatory_process_groups/content_blocks/stats_cell.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcessGroups
-    module ContentBlocks
-      class StatsCell < Decidim::ViewModel
-        def stats
-          @stats ||= Decidim::ParticipatoryProcesses::ParticipatoryProcessGroupStatsPresenter.new(participatory_process_group: participatory_process_group)
-        end
-
-        def participatory_process_group
-          @participatory_process_group ||= Decidim::ParticipatoryProcessGroup.find(model.scoped_resource_id)
-        end
-      end
-    end
-  end
-end

data/app/cells/decidim/participatory_processes/statistic/show.erb

@@ -1,9 +0,0 @@
-<div class="space-stats__data">
-  <span class="space-stats__number">
-    <%= stat_number %>
-  </span>
-
-  <h4 class="space-stats__title">
-    <%= stat_title %>
-  </h4>
-</div>

data/app/cells/decidim/participatory_processes/statistic_cell.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    # This cell renders a Statistic of a ParticipatoryProcesses
-    class StatisticCell < Decidim::ViewModel
-      include ActionView::Helpers::NumberHelper
-
-      private
-
-      def stat_number
-        number_with_delimiter(model[:stat_number])
-      end
-
-      def stat_title
-        t(model[:stat_title], scope: "decidim.participatory_processes.statistics")
-      end
-    end
-  end
-end