decidim-core 0.25.0.rc1 → 0.25.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 439b8a5979b3c9f5853b9cb3720dc06126e02b0ff35d035f805e55e949f2538d
-  data.tar.gz: 4254bb83ac96d7e010637444e314053530d795443141f35359a8fe4185db6d86
+  metadata.gz: 4f79ffb8df1322e287abbc21fa43fae864cd76b7505c56ef58fcca6832e24d65
+  data.tar.gz: ac09f979e6e0594e05e591b4d8ca6524301d9ee445fdebb0e76be572f04e6a32
 SHA512:
-  metadata.gz: 214ed5e5165e86efe8919bf98301c5cc2a6107299dc94aa30aa37fad64b6511276f8a81bf387527b7ecda013d064ad536d5a2db76fa2fdbc8818433b33ad369d
-  data.tar.gz: ab54e8cd03bf5c383f4993a52c491fb061b1a5422551640680aaa713c5960b6263446720d1c9f6e284bc03eefc41aba7619603ad444cfe3c7eb5558fc2901cf7
+  metadata.gz: 4afd6c6ecfadff2d1237451bd8e112053f20f55ac42e3035a7557d8d4a667060ffb82d098c6134ffacc0b4736ab40896ab03b596664188510bff859b878b07db
+  data.tar.gz: c3d2ff88bdcef9ebe353035eba87992f236dd45496c68f274bbf945dddf3197e760bb5d249facd71b5003865a729b27f0c7d87f1d345ca6cfea9f6ff98bb8480

data/app/packs/src/decidim/external_link.js

@@ -37,7 +37,12 @@ export default class ExternalLink {
     }
 
     this.$link.addClass("external-link-container");
-    this.$link.append(` ${this.generateElement()}`);
+    let spacer = " ";
+    if (this.$link.text().trim().length < 1) {
+      // Fixes image links extra space
+      spacer = "";
+    }
+    this.$link.append(`${spacer}${this.generateElement()}`);
   }
 
   generateElement() {

data/app/packs/src/decidim/foundation-datepicker/js/locales/foundation-datepicker.lb.js

@@ -0,0 +1,13 @@
+/**
+ * Luxembourgish localisation
+ */
+;(function(jQuery) {
+  jQuery.fn.fdatepicker.dates.lb = {
+    days: ["Sonndeg", "Méindeg", "Dënschdeg", "Mëttwoch", "Donneschdeg", "Freideg", "Samschdeg", "Sonndeg"],
+    daysShort: ["Son", "Méi", "Dën", "Mët", "Don", "Fre", "Sam", "Son"],
+    daysMin: ["So", "Mé", "Dë", "Më", "Do", "Fr", "Sa", "So"],
+    months: ["Januar", "Februar", "Mäerz", "Abrëll", "Mee", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"],
+    monthsShort: ["Jan", "Febr", "Mrz", "Abr", "Mee", "Jun", "Jul", "Aug", "Sept", "Okt", "Nov", "Dez"],
+    today: "Haut"
+  };
+}(jQuery));

data/app/packs/src/decidim/foundation_datepicker_locales.js

@@ -63,3 +63,5 @@ import "foundation-datepicker/js/locales/foundation-datepicker.vi"
 import "foundation-datepicker/js/locales/foundation-datepicker.zh-CN"
 import "foundation-datepicker/js/locales/foundation-datepicker.zh-TW"
 
+import "src/decidim/foundation-datepicker/js/locales/foundation-datepicker.lb"
+

data/app/packs/src/decidim/icon.js

@@ -13,7 +13,6 @@ const DEFAULT_ATTRIBUTES = {
  */
 export default function icon(iconKey, attributes = {}) {
   const iconAttributes = $.extend(DEFAULT_ATTRIBUTES, attributes);
-  const corsMode = window.Decidim.config.get("cors_enabled");
   const title = iconAttributes.title || iconAttributes.ariaLabel;
   Reflect.deleteProperty(iconAttributes, "title");
 
@@ -30,11 +29,7 @@ export default function icon(iconKey, attributes = {}) {
     }
   });
 
-  let iconsPath =  ""
-  if (corsMode === true) {
-    iconsPath = window.Decidim.config.get("icons_path");
-  }
-
+  const iconsPath =  window.Decidim.config.get("icons_path");
   const elHtml = `<svg><use href="${iconsPath}#icon-${iconKey}"></use></svg>`;
   const $el = $(elHtml);
   if (title) {

data/app/packs/src/decidim/input_mentions.js

@@ -110,12 +110,7 @@ $(() => {
     menuItemTemplate: function(item) {
       let svg = "";
       if (window.Decidim && item.original.__typename === "UserGroup") {
-        let corsMode = window.Decidim.config.get("cors_enabled");
-
-        let iconsPath =  ""
-        if (corsMode === true) {
-          iconsPath = window.Decidim.config.get("icons_path");
-        }
+        const iconsPath =  window.Decidim.config.get("icons_path");
 
         svg = `<span class="is-group">${item.original.membersCount}x <svg class="icon--members icon"><use href="${iconsPath}#icon-members"/></svg></span>`;
       }

data/app/packs/src/decidim/input_multiple_mentions.js

@@ -121,8 +121,7 @@ $(() => {
       let enabled = item.original.directMessagesEnabled === "true";
       if (window.Decidim && item.original.__typename === "UserGroup") {
         enabled = true;
-        let corsMode = window.Decidim.config.get("cors_enabled");
-        let iconsPath = corsMode ? "" : window.Decidim.config.get("icons_path");
+        const iconsPath = window.Decidim.config.get("icons_path");
         svg = `<span class="is-group">${item.original.membersCount}x <svg class="icon--members icon"><use href="${iconsPath}#icon-members"/></svg></span>`;
       }
       let disabledElementClass = enabled ? "" : "disabled-tribute-element";

data/app/presenters/decidim/resource_presenter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A presenter to render attributes for resources
+  class ResourcePresenter < SimpleDelegator
+    include Decidim::TranslatableAttributes
+    include Decidim::SanitizeHelper
+
+    def title(resource_title, links, html_escape, all_locales, extras: true)
+      handle_locales(resource_title, all_locales) do |content|
+        content = decidim_html_escape(content) if html_escape
+
+        renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+        renderer.render(links: links, extras: extras).html_safe
+      end
+    end
+
+    def handle_locales(content, all_locales, &block)
+      if all_locales
+        content.each_with_object({}) do |(key, value), parsed_content|
+          parsed_content[key] = if key == "machine_translations"
+                                  handle_locales(value, all_locales, &block)
+                                else
+                                  block.call(value)
+                                end
+        end
+      else
+        yield(translated_attribute(content))
+      end
+    end
+  end
+end

data/app/services/decidim/log/diff_changeset_calculator.rb

@@ -75,9 +75,14 @@ module Decidim
       #
       # Returns an array of hashes.
       def generate_i18n_changeset(attribute, values, type)
-        values.map! { |value| value.is_a?(String) ? JSON.parse(value) : value }
+        values.map! do |value|
+          value = value.is_a?(String) ? JSON.parse(value) : value
+          value.is_a?(Hash) ? value : { I18n.default_locale.to_s => value }
+        rescue JSON::ParserError
+          { I18n.default_locale.to_s => value }
+        end
 
-        locales = values[0].to_h.keys | values[1].to_h.keys
+        locales = values[0].keys | values[1].keys
         locales.flat_map do |locale|
           previous_value = values.first.try(:[], locale)
           new_value = values.last.try(:[], locale)

data/app/views/layouts/decidim/_head.html.erb

@@ -21,7 +21,7 @@
 <%= stylesheet_pack_tag "decidim_core", media: "all" %>
 <%= invisible_captcha_styles %>
 <%= organization_colors %>
-<%= javascript_pack_tag "decidim_core" %>
+<%= javascript_pack_tag "decidim_core", defer: false %>
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>

data/app/views/layouts/decidim/_js_configuration.html.erb

@@ -1,7 +1,6 @@
 <%
 js_configs = {
-  cors_enabled: Decidim.cors_enabled,
-  icons_path: asset_pack_path("media/images/icons.svg"),
+  icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg"),
   messages: {
     "selfxssWarning": {
       title: t("decidim.security.selfxss_warning.title"),
@@ -33,12 +32,4 @@ validator_messages = {
   Decidim.InputCharacterCounter.configureMessages(<%== character_messages.to_json %>);
   Decidim.ExternalLink.configureMessages(<%== external_link_messages.to_json %>);
   Decidim.FormValidator.configureMessages(<%== validator_messages.to_json %>);
-  DecidimComments = {
-    assets: {
-      'icons.svg': "<%= asset_pack_path "media/images/icons.svg" %>"
-    }
-  }
-  Decidim.assets = {
-    'icons.svg': "<%= asset_pack_path "media/images/icons.svg" %>"
-  }
 </script>

data/app/views/layouts/decidim/_mini_footer.html.erb

@@ -4,7 +4,7 @@
       <a rel="license noopener" class="cc-badge"
          href="http://creativecommons.org/licenses/by-sa/4.0/"
          target="_blank">
-        <%= image_pack_tag("cc-badge.png", alt: t("layouts.decidim.footer.cc_by_license")) %>
+        <%= image_pack_tag("media/images/cc-badge.png", alt: t("layouts.decidim.footer.cc_by_license")) %>
       </a>
       <%= t("layouts.decidim.footer.made_with_open_source").html_safe %>
     </div>
@@ -13,7 +13,7 @@
         <a rel="decidim noopener"
            href="https://decidim.org/"
            target="_blank">
-          <%= image_pack_tag("decidim-logo.svg", alt: t("layouts.decidim.footer.decidim_logo")) %>
+          <%= image_pack_tag("media/images/decidim-logo.svg", alt: t("layouts.decidim.footer.decidim_logo")) %>
         </a>
       </div>
     </div>

data/app/views/layouts/decidim/widget.html.erb

@@ -4,7 +4,7 @@
     <title><%= decidim_page_title %></title>
     <%= csrf_meta_tags %>
     <%= stylesheet_pack_tag "decidim_core" %>
-    <%= javascript_pack_tag "decidim_core" %>
+    <%= javascript_pack_tag "decidim_core", defer: false %>
   </head>
 
   <body class="widget">

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.rc2"
     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"
@@ -74,8 +76,8 @@ namespace :decidim do
       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}"
+            dev: "@decidim/dev@~#{Decidim::GemManager.semver_friendly_version(decidim_gemspec.version.to_s)}",
+            prod: "@decidim/all@~#{Decidim::GemManager.semver_friendly_version(decidim_gemspec.version.to_s)}"
           }
         else
           gem_path = Pathname(decidim_gemspec.full_gem_path)
@@ -164,3 +166,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.rc2
 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-09-13 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.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0.rc2
 - !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.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.0.rc1
+        version: 0.25.0.rc2
 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
@@ -2556,6 +2552,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
@@ -2584,7 +2581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: The core of the Decidim framework.