decidim-core 0.26.4 → 0.26.7

data/lib/decidim/api/types/localized_string_type.rb

@@ -8,6 +8,15 @@ module Decidim
 
       field :locale, GraphQL::Types::String, "The standard locale of this translation.", null: false
       field :text, GraphQL::Types::String, "The content of this translation.", null: true
+      field :machine_translated, GraphQL::Types::Boolean, "Whether this string is machine translated or not.", null: false
+
+      def machine_translated
+        if object.respond_to?(:machine_translated)
+          object.machine_translated.present?
+        else
+          false
+        end
+      end
     end
   end
 end

data/lib/decidim/api/types/translated_field_type.rb

@@ -17,19 +17,34 @@ module Decidim
       end
 
       def locales
-        object.keys
+        (defined_translations.keys + machine_translations.keys).uniq
       end
 
       def translation(locale: "")
-        translations = object.stringify_keys
-        translations[locale]
+        display_translations[locale]
       end
 
       def translations(locales: [])
-        translations = object.stringify_keys
+        translations = display_translations
         translations = translations.slice(*locales) unless locales.empty?
 
-        translations.map { |locale, text| OpenStruct.new(locale: locale, text: text) }
+        translations.map { |locale, text| OpenStruct.new(locale: locale, text: text, machine_translated: defined_translations[locale].blank?) }
+      end
+
+      private
+
+      def display_translations
+        @display_translations ||= locales.index_with do |locale|
+          defined_translations[locale].presence || machine_translations[locale]
+        end
+      end
+
+      def defined_translations
+        object.stringify_keys.except("machine_translations")
+      end
+
+      def machine_translations
+        object.stringify_keys["machine_translations"]&.stringify_keys || {}
       end
     end
   end

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

@@ -226,13 +226,20 @@ FactoryBot.define do
       confirmed_at { Time.current }
     end
 
+    trait :blocked do
+      blocked { true }
+      blocked_at { Time.current }
+      extended_data { { user_name: generate(:name) } }
+      name { "Blocked user group" }
+    end
+
     after(:build) do |user_group, evaluator|
-      user_group.extended_data = {
-        document_number: evaluator.document_number,
-        phone: evaluator.phone,
-        rejected_at: evaluator.rejected_at,
-        verified_at: evaluator.verified_at
-      }
+      user_group.extended_data = user_group.extended_data.merge({
+                                                                  document_number: evaluator.document_number,
+                                                                  phone: evaluator.phone,
+                                                                  rejected_at: evaluator.rejected_at,
+                                                                  verified_at: evaluator.verified_at
+                                                                })
     end
 
     after(:create) do |user_group, evaluator|

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

@@ -213,6 +213,42 @@ shared_examples "comments" do
         )
       end
 
+      context "when user can hide replies on a thread" do
+        let(:thread) { comments.first }
+        let(:new_reply_body) { "Hey, I just jumped inside the thread!" }
+        let!(:new_reply) { create(:comment, commentable: thread, root_commentable: commentable, body: new_reply_body) }
+
+        it "displays the hide button" do
+          visit current_path
+          within "#comment_#{thread.id}" do
+            expect(page).to have_content("Hide replies")
+            expect(page).to have_content(new_reply_body)
+          end
+        end
+
+        it "displays the show button" do
+          visit current_path
+          within "#comment_#{thread.id}" do
+            click_button "Hide replies"
+            expect(page).to have_content("Show reply")
+            expect(page).not_to have_content(new_reply_body)
+          end
+        end
+
+        context "when are more replies" do
+          let!(:new_replies) { create_list(:comment, 2, commentable: thread, root_commentable: commentable, body: new_reply_body) }
+
+          it "displays the show button" do
+            visit current_path
+            within "#comment_#{thread.id}" do
+              click_button "Hide replies"
+              expect(page).to have_content("Show 3 replies")
+              expect(page).not_to have_content(new_reply_body)
+            end
+          end
+        end
+      end
+
       context "when inside a thread reply form" do
         let(:thread) { comments.first }
         let(:new_reply_body) { "Hey, I just jumped inside the thread!" }

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+shared_examples_for "has embedded video in description" do |description_attribute_name, count: 1|
+  let(description_attribute_name) { { en: %(Description <iframe class="ql-video" allowfullscreen="true" src="#{iframe_src}" frameborder="0"></iframe>) } }
+  let(:iframe_src) { "http://www.example.org" }
+
+  it "shows iframe" do
+    expect(page).to have_selector("iframe", count: count)
+  end
+end

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

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
-shared_examples "having a rich text editor" do |css, toolbar|
-  it "has a form with a rich text editor" do
-    within "form.#{css}" do
+shared_examples "having a rich text editor for field" do |selector, toolbar|
+  it "has a rich text editor" do
+    within selector do
       expect(page).to have_selector("div.editor-container[data-toolbar='#{toolbar}']", visible: :all)
     end
   end
 end
 
+shared_examples "having a rich text editor" do |css, toolbar|
+  it_behaves_like "having a rich text editor for field", "form.#{css}", toolbar
+end
+
 shared_context "with rich text editor content" do
   let(:content) { "<p>#{safe_tags}</p>#{script}" }
   let(:safe_tags) { em + u + strong }

data/lib/decidim/core/test.rb

@@ -4,6 +4,7 @@ require "decidim/core/test/shared_examples/acts_as_author_examples"
 require "decidim/core/test/shared_examples/admin_log_presenter_examples"
 require "decidim/core/test/shared_examples/authorable"
 require "decidim/core/test/shared_examples/coauthorable"
+require "decidim/core/test/shared_examples/editor_shared_examples"
 require "decidim/core/test/shared_examples/endorsable"
 require "decidim/core/test/shared_examples/publicable"
 require "decidim/core/test/shared_examples/localised_email"

data/lib/decidim/core/version.rb

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

data/lib/decidim/form_builder.rb

@@ -47,7 +47,7 @@ module Decidim
     # rubocop:enable Metrics/ParameterLists
 
     def create_language_selector(locales, tabs_id, name)
-      if Decidim.available_locales.count > 4
+      if locales.count > 4
         language_selector_select(locales, tabs_id, name)
       else
         language_tabs(locales, tabs_id, name)
@@ -913,7 +913,6 @@ module Decidim
       return {} unless options[:editor_images]
 
       {
-        editor_images: true,
         upload_images_path: Decidim::Core::Engine.routes.url_helpers.editor_images_path,
         drag_and_drop_help_text: I18n.t("drag_and_drop_help", scope: "decidim.editor_images")
       }

data/lib/decidim/participatory_space_resourceable.rb

@@ -47,7 +47,13 @@ module Decidim
              .joins(:participatory_space_resource_links_to)
              .where(decidim_participatory_space_links: { name: link_name, from_id: id, from_type: self.class.name })
 
-        klass.where(id: from).or(klass.where(id: to))
+        query = klass.where(id: from).or(klass.where(id: to)).published
+
+        if klass.column_names.include?("weight")
+          query.order(:weight)
+        else
+          query.order(created_at: :desc)
+        end
       end
 
       def participatory_space_sibling_scope(participatory_space_name)

data/lib/decidim/publicable.rb

@@ -45,5 +45,9 @@ module Decidim
     def unpublish!
       update!(published_at: nil)
     end
+
+    def previously_published?
+      respond_to?(:versions) && versions.where(event: "update").where("object ->> 'published_at' IS NOT NULL").any?
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.26.4
+  version: 0.26.7
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -754,28 +754,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.4
+        version: 0.26.7
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1679,6 +1679,7 @@ files:
 - app/queries/decidim/user_groups/member_memberships.rb
 - app/resolvers/decidim/core/metric_resolver.rb
 - app/resolvers/decidim/hashtags_resolver.rb
+- app/scrubbers/decidim/admin_input_scrubber.rb
 - app/scrubbers/decidim/newsletter_scrubber.rb
 - app/scrubbers/decidim/user_input_scrubber.rb
 - app/serializers/decidim/exporters/participatory_space_components_serializer.rb
@@ -1801,8 +1802,10 @@ files:
 - app/views/decidim/last_activities/_activities.html.erb
 - app/views/decidim/last_activities/index.html.erb
 - app/views/decidim/last_activities/index.js.erb
+- app/views/decidim/links/_invalid_url_modal.html.erb
 - app/views/decidim/links/_modal.html.erb
 - app/views/decidim/links/_warning.html.erb
+- app/views/decidim/links/invalid_url.js.erb
 - app/views/decidim/links/new.html.erb
 - app/views/decidim/links/new.js.erb
 - app/views/decidim/messaging/conversation_mailer/comanagers_new_conversation.html.erb
@@ -1967,6 +1970,7 @@ files:
 - config/locales/et-EE.yml
 - config/locales/et.yml
 - config/locales/eu.yml
+- config/locales/fa-IR.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
@@ -1984,6 +1988,8 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
+- config/locales/ka-GE.yml
+- config/locales/kaa.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
@@ -2362,6 +2368,7 @@ files:
 - lib/decidim/core/test/shared_examples/conversations_examples.rb
 - lib/decidim/core/test/shared_examples/counts_commentators_as_newsletter_participants.rb
 - lib/decidim/core/test/shared_examples/edit_link_shared_examples.rb
+- lib/decidim/core/test/shared_examples/editor_shared_examples.rb
 - lib/decidim/core/test/shared_examples/embed_resource_examples.rb
 - lib/decidim/core/test/shared_examples/endorsable.rb
 - lib/decidim/core/test/shared_examples/endorsable_interface_examples.rb