decidim-core 0.28.0.rc4 → 0.28.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bbd75ffde3e5d911a23282dd17dbf7d7c89892afe0559dd88d427e864ae2f14
-  data.tar.gz: 7e794b245545ba6ab7f46f7c22d271d723bcd398c2f0149c37ecba577add235c
+  metadata.gz: 37cc684e07696370976c603c95bf458a7e14bceacce01065075d41ee7ca4c78a
+  data.tar.gz: 5ceaf46c0590d312dc3aca2845e6fe5e52ef72fd7de7bd23d9ad682d989d1f9c
 SHA512:
-  metadata.gz: f28d4b6445a5492d52528e6add707d7fb57cabddc4132bfac229a04c6fa231f9867642b974996605850b5992a1ea652dcb87855524167d4f2673af6df26a7074
-  data.tar.gz: e00c4df62dcaf1595cbc02e4d82bac24410dcbd86b81b6f6fb55d5827d96bb8197c919240608a6ea8284ad2929b637ee6d772278456438255bdec20f292c072c
+  metadata.gz: 7157ee30b55025f8eea0f6c18cae1463598ffa781a27f112b954d32104e93d50483de4798007f062f271c1a473986160904e19e13b9c403ec62561b5a6efc73b
+  data.tar.gz: 4691aeec84e9ef8ae1d91b24bc19c6b2573972ca73d87aba9e874daa5fbfb8342118516fb887274eb46d3fb0589ef61cb879df0f48a3791536a9af4b43eeae6e

data/app/helpers/concerns/decidim/flash_helper_extensions.rb

@@ -106,7 +106,7 @@ module Decidim
       end
 
       def message(value)
-        return content_tag(:span, value, class: "flash__message") unless value.is_a?(Hash)
+        return content_tag(:span, value, class: "flash__message flex items-center") unless value.is_a?(Hash)
 
         content_tag(:span, class: "flash__message") do
           concat value[:title]

data/app/packs/stylesheets/decidim/_flash.scss

@@ -1,5 +1,5 @@
 .flash {
-  @apply flex justify-start items-center gap-4 rounded border-2 border-secondary my-4 p-4 bg-secondary/5;
+  @apply flex justify-start gap-4 border-l-4 border-secondary my-4 p-4 bg-secondary/5;
 
   &__icon {
     svg {
@@ -8,14 +8,30 @@
   }
 
   &__title {
-    @apply font-semibold text-2xl;
+    @apply font-semibold text-lg;
   }
 
   &__message {
-    @apply gap-2 text-black font-semibold text-lg;
+    @apply text-black font-semibold text-md;
 
     a {
-      @apply underline;
+      @apply underline text-secondary;
+
+      svg {
+        @apply text-secondary;
+      }
+    }
+
+    p {
+      @apply font-normal text-md leading-6;
+    }
+
+    ul {
+      @apply ml-4;
+
+      li {
+        @apply list-disc;
+      }
     }
 
     &-body {
@@ -31,10 +47,23 @@
     }
   }
 
+  &.primary {
+    svg {
+      @apply text-secondary;
+    }
+  }
+
+  &.secondary,
+  &.info {
+    .flash__icon {
+      @apply text-secondary;
+    }
+  }
+
   &.success {
     @apply border-success bg-success/5;
 
-    svg {
+    .flash__icon {
       @apply text-success;
     }
   }
@@ -42,7 +71,7 @@
   &.alert {
     @apply border-alert bg-alert/5;
 
-    svg {
+    .flash__icon {
       @apply text-alert;
     }
   }
@@ -50,7 +79,7 @@
   &.warning {
     @apply border-warning bg-warning/5;
 
-    svg {
+    .flash__icon {
       @apply text-warning;
     }
   }

data/app/packs/stylesheets/decidim/_layout.scss

@@ -31,7 +31,7 @@
 }
 
 .layout-2col {
-  @apply md:grid grid-cols-12 container grow;
+  @apply md:grid grid-cols-12 container grow min-h-[60vh];
 
   &__aside {
     @apply col-span-4 lg:col-span-3 md:pr-16 py-6 md:py-12 gap-6 md:gap-12 flex flex-col justify-between items-start md:justify-start before:content-[''] before:absolute before:top-0 before:left-0 before:h-full before:w-1/2 before:-z-10 md:before:bg-background;

data/config/environment.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+# Empty line for playing nice with tpope/vim-rails

data/lib/decidim/acts_as_tree.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
+  # Adapted from https://hashrocket.com/blog/posts/recursive-sql-in-activerecord
   module ActsAsTree
     extend ActiveSupport::Concern
 
@@ -15,10 +16,22 @@ module Decidim
         @parent_item_foreign_key = name
       end
 
+      def parent_item_polymorphic_type_key(name = nil)
+        return @parent_item_polymorphic_type_key unless name
+
+        @parent_item_polymorphic_type_key = name
+      end
+
       def tree_for(item)
         where(Arel.sql("#{table_name}.id IN (#{tree_sql_for(item)})")).order("#{table_name}.id")
       end
 
+      def polymorphic_condition(item)
+        return "" if parent_item_polymorphic_type_key.blank?
+
+        "AND #{table_name}.#{parent_item_polymorphic_type_key} = '#{item.class.name}'"
+      end
+
       def tree_sql_for(item)
         <<-SQL.squish
         WITH RECURSIVE search_tree(id, path) AS (
@@ -28,7 +41,7 @@ module Decidim
             UNION ALL
           SELECT #{table_name}.id, path || #{table_name}.id
             FROM search_tree
-          JOIN #{table_name} ON #{table_name}.#{parent_item_foreign_key} = search_tree.id
+          JOIN #{table_name} ON #{table_name}.#{parent_item_foreign_key} = search_tree.id #{polymorphic_condition(item)}
             WHERE NOT #{table_name}.id = ANY(path)
         )
         SELECT id FROM search_tree ORDER BY path

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

@@ -3,6 +3,7 @@
 require "decidim/faker/localized"
 require "decidim/faker/internet"
 require "decidim/dev"
+require "decidim/dev/test/factories"
 
 require "decidim/participatory_processes/test/factories"
 require "decidim/assemblies/test/factories"
@@ -524,54 +525,6 @@ FactoryBot.define do
     author { create(:user, :confirmed, organization:) }
   end
 
-  factory :dummy_resource, class: "Decidim::DummyResources::DummyResource" do
-    transient do
-      users { nil }
-      # user_groups correspondence to users is by sorting order
-      user_groups { [] }
-    end
-    title { Decidim::Faker::Localized.localized { generate(:name) } }
-    component { create(:component, manifest_name: "dummy") }
-    author { create(:user, :confirmed, organization: component.organization) }
-    scope { create(:scope, organization: component.organization) }
-
-    trait :published do
-      published_at { Time.current }
-    end
-
-    trait :with_endorsements do
-      after :create do |resource|
-        5.times.collect do
-          create(:endorsement, resource:, author: build(:user, organization: resource.component.organization))
-        end
-      end
-    end
-  end
-
-  factory :nested_dummy_resource, class: "Decidim::DummyResources::NestedDummyResource" do
-    title { generate(:name) }
-    dummy_resource { create(:dummy_resource) }
-  end
-
-  factory :coauthorable_dummy_resource, class: "Decidim::DummyResources::CoauthorableDummyResource" do
-    title { generate(:name) }
-    component { create(:component, manifest_name: "dummy") }
-
-    transient do
-      authors_list { [create(:user, organization: component.organization)] }
-    end
-
-    after :build do |resource, evaluator|
-      evaluator.authors_list.each do |coauthor|
-        resource.coauthorships << if coauthor.is_a?(Decidim::UserGroup)
-                                    build(:coauthorship, author: coauthor.users.first, user_group: coauthor, coauthorable: resource, organization: evaluator.component.organization)
-                                  else
-                                    build(:coauthorship, author: coauthor, coauthorable: resource, organization: evaluator.component.organization)
-                                  end
-      end
-    end
-  end
-
   factory :resource_link, class: "Decidim::ResourceLink" do
     name { generate(:slug) }
     to { build(:dummy_resource) }
@@ -644,7 +597,7 @@ FactoryBot.define do
     end
     resource { build(:dummy_resource) }
     event_name { resource.class.name.underscore.tr("/", ".") }
-    event_class { "Decidim::DummyResources::DummyResourceEvent" }
+    event_class { "Decidim::Dev::DummyResourceEvent" }
     extra do
       {
         some_extra_data: "1"

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

@@ -44,6 +44,38 @@ shared_examples "comments" do
     expect(page).to have_css(".comments > div:nth-child(2)", text: "Most Rated Comment")
   end
 
+  context "when there are comments and replies" do
+    let!(:single_comment) { create(:comment, commentable:) }
+    let!(:reply) { create(:comment, commentable: single_comment, root_commentable: commentable) }
+
+    it "displays the show replies link on comment with reply" do
+      visit resource_path
+      expect(page).not_to have_content("Comments are disabled at this time")
+      expect(page).to have_css(".comment", minimum: 1)
+
+      within("#accordion-#{single_comment.id}") do
+        expect(page).to have_content "Hide replies"
+      end
+    end
+
+    context "when there is a comment with the same parent id but different type with replies" do
+      let!(:other_component) { create(:component, manifest_name: :dummy, organization:) }
+      let!(:other_commentable) { create(:dummy_resource, component: other_component, author: user, id: single_comment.id) }
+      let!(:reply) { create(:comment, commentable: other_commentable, root_commentable: other_commentable) }
+      let!(:other_reply) { create(:comment, commentable: reply, root_commentable: other_commentable) }
+
+      it "displays the show replies link on comment with reply" do
+        visit resource_path
+        expect(page).not_to have_content("Comments are disabled at this time")
+        expect(page).to have_css(".comment", minimum: 1)
+
+        within("#accordion-#{single_comment.id}") do
+          expect(page).not_to have_content "Hide replies"
+        end
+      end
+    end
+  end
+
   context "when there are deleted comments" do
     let(:deleted_comment) { comments[0] }
 

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

@@ -23,10 +23,10 @@ shared_examples_for "participatory space dropdown metadata cell" do
 
     before do
       allow(Decidim::ActionLog).to receive(:public_resource_types).and_return(
-        %w(Decidim::DummyResources::DummyResource)
+        %w(Decidim::Dev::DummyResource)
       )
       allow(Decidim::ActionLog).to receive(:publicable_public_resource_types).and_return(
-        %w(Decidim::DummyResources::DummyResource)
+        %w(Decidim::Dev::DummyResource)
       )
     end
 

data/lib/decidim/core/version.rb

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

data/lib/decidim/icon_registry.rb

@@ -49,6 +49,8 @@ module Decidim
 
       ActiveSupport::Deprecation.warn(message)
       raise message if Rails.env.development? || Rails.env.test?
+
+      @icons["other"]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.28.0.rc4
+  version: 0.28.0.rc5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -74,14 +74,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.5
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.5
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: cells-erb
   requirement: !ruby/object:Gem::Requirement
@@ -772,28 +778,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0.rc4
+        version: 0.28.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0.rc4
+        version: 0.28.0.rc5
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0.rc4
+        version: 0.28.0.rc5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0.rc4
+        version: 0.28.0.rc5
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -2125,6 +2131,7 @@ files:
 - app/views/layouts/decidim/user_profile.html.erb
 - config/assets.rb
 - config/brakeman.ignore
+- config/environment.rb
 - config/initializers/active_support.rb
 - config/initializers/browser.rb
 - config/initializers/carrierwave.rb
@@ -2879,7 +2886,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: The core of the Decidim framework.