decidim-core 0.25.0.rc1 → 0.25.0

data/config/locales/ro-RO.yml

@@ -71,7 +71,6 @@ ro:
     'true': 'Da'
   carrierwave:
     errors:
-      general: Eroare la procesarea imaginii
       image_too_big: Imaginea este prea mare
       not_inside_organization: Fișierul nu este atașat niciunei organizații
   date:
@@ -731,11 +730,11 @@ ro:
         file:
           explanation: 'Orientări pentru fișier:'
           message_1: Are o imagine sau un document.
-          message_2: Pentru imagini, utilizați preferabil imagini de peisaj, serviciul decupează imaginea. Pentru fisierele CSV, separatorul dintre coloane trebuie sa fie o virgula (",")
+          message_2: Pentru imagini, utilizați preferabil formatul landscape, serviciul va decupa imaginea. Pentru fișierele CSV, separatorul de coloane trebuie să fie virgula
         image:
           explanation: 'Orientări pentru imagine:'
-          message_1: Recomandat o imagine peisaj care nu are nici un text.
-          message_2: Serviciul recoltează imaginea.
+          message_1: De preferință o imagine landscape care să nu conțină vreun text.
+          message_2: Serviciul decupează imaginea.
       file_validation:
         allowed_file_extensions: 'Extensii de fișiere permise: %{extensions}'
         max_file_size: 'Dimensiunea maximă a fișierului: %{megabytes}MB'
@@ -1098,7 +1097,7 @@ ro:
           participate: Participă
           welcome: Bine ai venit la %{organization}!
         metrics:
-          headline: Valori
+          headline: Indicatori
         statistics:
           headline: Starea curentă a %{organization}
         sub_hero:
@@ -1111,7 +1110,7 @@ ro:
         topics: Subiecte
       participatory_space:
         metrics:
-          headline: Valori
+          headline: Indicatori
           link: Arată toate măsurătorile
       terms_and_conditions:
         accept:

data/config/locales/sk.yml

@@ -68,7 +68,6 @@ sk:
     'true': 'Áno'
   carrierwave:
     errors:
-      general: Chyba spracovania obrázku
       image_too_big: Obrázok je príliš veľký
   date:
     formats:

data/config/locales/sr-CS.yml

@@ -5,9 +5,6 @@ sr:
         one: Podržavanje
         few: Podržavanja
         other: Podržavanja
-  carrierwave:
-    errors:
-      general: Greška pri obradi slike
   decidim:
     accessibility:
       logo: "Zvanični logo %{organization}"

data/config/locales/sv.yml

@@ -67,7 +67,6 @@ sv:
     'true': 'Ja'
   carrierwave:
     errors:
-      general: Fel vid bearbetning av bild
       image_too_big: Bilden är för stor
       not_inside_organization: Den här filen är inte bifogad till någon organisation
   date:
@@ -846,6 +845,10 @@ sv:
       index:
         last_activity: Senaste aktivitet
         resource_type: Typ
+    links:
+      invalid_url: Ogiltig URL
+      warning:
+        close_modal: Stäng fönster
     log:
       base_presenter:
         create: "%{user_name} skapade %{resource_name}"

data/config/locales/tr-TR.yml

@@ -62,7 +62,6 @@ tr:
     'true': 'Evet'
   carrierwave:
     errors:
-      general: İsteği işlerken bir hata oluştu
       image_too_big: Görüntü çok büyük
       not_inside_organization: Dosya herhangi bir kuruluşa eklenmemiş
   date:

data/config/locales/zh-CN.yml

@@ -58,7 +58,6 @@ zh-CN:
     'true': '否'
   carrierwave:
     errors:
-      general: 处理图像出错
       image_too_big: 图片过大
       not_inside_organization: 该文件没有附加到任何组织
   date:

data/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -143,9 +143,10 @@ shared_examples "comments" do
         end
       end
 
-      it "shows comment to the user and updates the comments counter" do
+      it "shows comment to the user, updates the comments counter and clears the comment textarea" do
         expect(page).to have_comment_from(user, "This is a new comment", wait: 20)
         expect(page).to have_selector("span.comments-count", text: "#{commentable.comments.count} COMMENTS")
+        expect(page).to have_field("add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "")
       end
     end
 
@@ -166,6 +167,55 @@ shared_examples "comments" do
       end
     end
 
+    context "when the user is writing a new comment while someone else comments" do
+      let(:new_comment_body) { "Hey, I just jumped in the conversation!" }
+      let(:new_comment) { build(:comment, commentable: commentable, body: new_comment_body) }
+
+      before do
+        within ".add-comment form" do
+          fill_in "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}", with: "This is a new comment"
+        end
+        new_comment.save!
+      end
+
+      it "does not clear the current user's comment" do
+        expect(page).to have_content(new_comment.body.values.first, wait: 20)
+        expect(page).to have_field(
+          "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}",
+          with: "This is a new comment"
+        )
+      end
+
+      context "when inside a thread reply form" do
+        let(:thread) { comments.first }
+        let(:new_reply_body) { "Hey, I just jumped inside the thread!" }
+        let(:new_reply) { build(:comment, commentable: thread, root_commentable: commentable, body: new_reply_body) }
+
+        before do
+          within "#comment_#{thread.id}" do
+            click_button "Reply"
+
+            within ".add-comment form" do
+              fill_in "add-comment-#{thread.commentable_type.demodulize}-#{thread.id}", with: "This is a new reply"
+            end
+          end
+          new_reply.save!
+        end
+
+        it "does not clear the current user's comment" do
+          expect(page).to have_content(new_reply.body.values.first, wait: 20)
+          expect(page).to have_field(
+            "add-comment-#{commentable.commentable_type.demodulize}-#{commentable.id}",
+            with: "This is a new comment"
+          )
+          expect(page).to have_field(
+            "add-comment-#{thread.commentable_type.demodulize}-#{thread.id}",
+            with: "This is a new reply"
+          )
+        end
+      end
+    end
+
     context "when the user has verified organizations" do
       let(:user_group) { create(:user_group, :verified) }
 

data/lib/decidim/core/test/shared_examples/map_examples.rb

@@ -68,7 +68,7 @@ shared_context "with frontend map elements" do
         <head>
           <title>Map Test</title>
           #{stylesheet_pack_tag "decidim_core"}
-          #{javascript_pack_tag "decidim_core"}
+          #{javascript_pack_tag "decidim_core", defer: false}
           #{builder.stylesheet_snippets}
           #{builder.javascript_snippets}
           #{head_extra}

data/lib/decidim/core/version.rb

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

data/lib/decidim/core.rb

@@ -157,7 +157,7 @@ module Decidim
 
   # Exposes a configuration option: The application available locales.
   config_accessor :available_locales do
-    %w(en bg ar ca cs da de el eo es es-MX es-PY et eu fi-pl fi fr fr-CA ga gl hr hu id is it ja ko lt lv mt nl no pl pt pt-BR ro ru sk sl sr sv tr uk vi zh-CN zh-TW)
+    %w(en bg ar ca cs da de el eo es es-MX es-PY et eu fi-pl fi fr fr-CA ga gl hr hu id is it ja ko lb lt lv mt nl no pl pt pt-BR ro ru sk sl sr sv tr uk vi zh-CN zh-TW)
   end
 
   # Exposes a configuration option: The application default locale.

data/lib/decidim/map/dynamic_map.rb

@@ -81,7 +81,7 @@ module Decidim
 
         # @see Decidim::Map::View::Builder#javascript_snippets
         def javascript_snippets
-          template.javascript_pack_tag("decidim_map_provider_default")
+          template.javascript_pack_tag("decidim_map_provider_default", defer: false)
         end
       end
     end

data/lib/decidim/map/provider/autocomplete/here.rb

@@ -10,7 +10,7 @@ module Decidim
           class Builder < Decidim::Map::Autocomplete::Builder
             # @see Decidim::Map::FrontendUtility::Builder#javascript_snippets
             def javascript_snippets
-              template.javascript_pack_tag("decidim_geocoding_provider_here")
+              template.javascript_pack_tag("decidim_geocoding_provider_here", defer: false)
             end
           end
         end

data/lib/decidim/map/provider/autocomplete/osm.rb

@@ -10,7 +10,7 @@ module Decidim
           class Builder < Decidim::Map::Autocomplete::Builder
             # @see Decidim::Map::FrontendUtility::Builder#javascript_snippets
             def javascript_snippets
-              template.javascript_pack_tag("decidim_geocoding_provider_photon")
+              template.javascript_pack_tag("decidim_geocoding_provider_photon", defer: false)
             end
           end
         end

data/lib/decidim/map/provider/dynamic_map/here.rb

@@ -41,7 +41,7 @@ module Decidim
           class Builder < Decidim::Map::DynamicMap::Builder
             # @see Decidim::Map::DynamicMap::Builder#javascript_snippets
             def javascript_snippets
-              template.javascript_pack_tag("decidim_map_provider_here")
+              template.javascript_pack_tag("decidim_map_provider_here", defer: false)
             end
           end
         end

data/lib/decidim/webpacker/webpacker.yml

@@ -29,29 +29,26 @@ development:
     # Notice that we use a different port (to prevent blocking the default one) as
     # there will be at least two webpack servers running
     port: 3035
-    public: localhost:3035
-    # Inject browserside javascript that required by both HMR and Live(full) reload
-    inject_client: true
     # Hot Module Replacement updates modules while the application is running without a full reload
     hmr: false
-    # Inline should be set to true if using HMR; it inserts a script to take care of live reloading
-    inline: true
-    # Should we show a full-screen overlay in the browser when there are compiler errors or warnings?
-    overlay: true
+    client:
+      # Should we show a full-screen overlay in the browser when there are compiler errors or warnings?
+      overlay: true
+      # May also be a string
+      # webSocketURL:
+      #  hostname: "0.0.0.0"
+      #  pathname: "/ws"
+      #  port: 8080
     # Should we use gzip compression?
     compress: true
     # Note that apps that do not check the host are vulnerable to DNS rebinding attacks
-    disable_host_check: true
-    # This option lets the browser open with your local IP
-    use_local_ip: false
-    # When enabled, nothing except the initial startup information will be written to the console.
-    # This also means that errors or warnings from webpack are not visible.
-    quiet: false
-    pretty: false
+    allowed_hosts: "all"
+    pretty: true
     headers:
       'Access-Control-Allow-Origin': '*'
-    watch_options:
-      ignored: '**/node_modules/**'
+    static:
+      watch:
+        ignored: '**/node_modules/**'
 
 test:
   <<: *default

data/lib/gem_overrides/rails/tasks/yarn.rake

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This is overridden because of a bug in Rails 6.0 which forces the yarn:install
+# task to the end of assets:precompile task which fails when bin/yarn has been
+# removed from Decidim applications. This should be fixed with Rails 6.1.
+#
+# See:
+# https://git.io/JEH9s (and the equivalent line in Rails 6.1)
+# https://github.com/rails/rails/commit/87e9ae053d661daa3b8549e1cc9ea5ecd3b8ad62

data/lib/tasks/decidim_webpacker_tasks.rake

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/gem_manager"
+
 namespace :decidim do
   namespace :webpacker do
     desc "Installs Decidim webpacker files in Rails instance application"
@@ -53,12 +55,8 @@ namespace :decidim do
     end
 
     def install_decidim_npm
-      decidim_npm_packages.each do |type, package|
-        if type == :dev
-          system! "npm i -D #{package}"
-        else
-          system! "npm i #{package}"
-        end
+      decidim_npm_packages.each do |type, packages|
+        system! "npm i --save-#{type} #{packages.join(" ")}"
       end
     end
 
@@ -71,32 +69,55 @@ namespace :decidim do
     end
 
     def decidim_npm_packages
+      gem_path = unreleased_gem_path
+
+      if gem_path
+        package_spec = "./packages/%s"
+
+        # The packages folder needs to be copied to the application folder
+        # because the linked dependencies are not installed when packages
+        # are installed using file references outside the application root
+        # where the `package.json` is located at. For more information, see:
+        # https://github.com/npm/cli/issues/2339
+        FileUtils.rm_rf(rails_app_path.join("packages"))
+        FileUtils.cp_r(gem_path.join("packages"), rails_app_path)
+      else
+        package_spec = "@decidim/%s@~#{Decidim::GemManager.semver_friendly_version(decidim_gemspec.version.to_s)}"
+      end
+
+      local_npm_dependencies.transform_values { |names| names.map { |name| format(package_spec, name) } }
+    end
+
+    def unreleased_gem_path
       if decidim_gemspec.source.is_a?(Bundler::Source::Rubygems)
-        if released_version?
-          return {
-            dev: "@decidim/dev@~#{decidim_gemspec.version}",
-            prod: "@decidim/all@~#{decidim_gemspec.version}"
-          }
-        else
-          gem_path = Pathname(decidim_gemspec.full_gem_path)
-        end
+        return if released_version?
+
+        gem_path = Pathname(decidim_gemspec.full_gem_path)
       else
         gem_path = decidim_gemspec.source.path
         gem_path = Pathname(ENV["BUNDLE_GEMFILE"]).dirname.join(gem_path) if gem_path.relative?
       end
 
-      # The packages folder needs to be copied to the application folder
-      # because the linked dependencies are not installed when packages
-      # are installed using file references outside the application root
-      # where the `package.json` is located at. For more information, see:
-      # https://github.com/npm/cli/issues/2339
-      FileUtils.rm_rf(rails_app_path.join("packages"))
-      FileUtils.cp_r(gem_path.join("packages"), rails_app_path)
+      gem_path
+    end
 
-      {
-        dev: "./packages/dev",
-        prod: "./packages/all"
-      }
+    def local_npm_dependencies
+      @local_npm_dependencies ||= begin
+        package_json = JSON.parse(File.read(decidim_path.join("package.json")))
+
+        {
+          prod: local_npm_dependencies_list(package_json["dependencies"]),
+          dev: local_npm_dependencies_list(package_json["devDependencies"])
+        }.freeze
+      end
+    end
+
+    def local_npm_dependencies_list(deps)
+      return [] unless deps
+
+      deps.values
+          .select { |ref| ref.starts_with?("file:packages/") }
+          .map { |ref| ref.delete_prefix("file:packages/") }
     end
 
     def decidim_path
@@ -149,8 +170,8 @@ namespace :decidim do
       File.write(file, contents)
     end
 
-    def system!(*args)
-      system(*args) || abort("\n== Command #{args} failed ==")
+    def system!(command)
+      system("cd #{rails_app_path} && #{command}") || abort("\n== Command #{command} failed ==")
     end
   end
 end
@@ -164,3 +185,10 @@ if (config_path = Decidim::Webpacker.configuration.configuration_file)
     config_path: Pathname.new(config_path)
   )
 end
+
+# Remove the yarn install prerequisity from assets:precompile
+Rake::Task["assets:precompile"].prerequisites.delete("webpacker:yarn_install")
+
+# Add gem overrides path to the beginning in order to override rake tasks
+# Needed because of a bug in Rails 6.0 (see the overridden task for details)
+$LOAD_PATH.unshift "#{Gem.loaded_specs["decidim-core"].full_gem_path}/lib/gem_overrides"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.25.0.rc1
+  version: 0.25.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -762,20 +762,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.0.0.c
+        version: 6.0.0.rc.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta.7
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 6.0.0.c
+        version: 6.0.0.rc.5
 - !ruby/object:Gem::Dependency
   name: wisper
   requirement: !ruby/object:Gem::Requirement
@@ -796,28 +790,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1444,6 +1438,7 @@ files:
 - app/packs/src/decidim/form_filter.component_for_testing.js
 - app/packs/src/decidim/form_filter.js
 - app/packs/src/decidim/form_validator.js
+- app/packs/src/decidim/foundation-datepicker/js/locales/foundation-datepicker.lb.js
 - app/packs/src/decidim/foundation_datepicker_locales.js
 - app/packs/src/decidim/gallery.js
 - app/packs/src/decidim/geocoding.js
@@ -1675,6 +1670,7 @@ files:
 - app/presenters/decidim/nil_presenter.rb
 - app/presenters/decidim/official_author_presenter.rb
 - app/presenters/decidim/resource_locator_presenter.rb
+- app/presenters/decidim/resource_presenter.rb
 - app/presenters/decidim/stats_presenter.rb
 - app/presenters/decidim/user_group_presenter.rb
 - app/presenters/decidim/user_presenter.rb
@@ -2004,6 +2000,7 @@ files:
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
+- config/locales/lb.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -2556,6 +2553,7 @@ files:
 - lib/decidim/webpacker/webpacker.yml
 - lib/devise/models/decidim_newsletterable.rb
 - lib/devise/models/decidim_validatable.rb
+- lib/gem_overrides/rails/tasks/yarn.rake
 - lib/gem_overrides/webpacker/runner.rb
 - lib/premailer/adapter/decidim.rb
 - lib/tasks/decidim_active_storage_migration_tasks.rake
@@ -2580,11 +2578,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: The core of the Decidim framework.