decidim-core 0.32.0 → 0.32.2

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

@@ -92,14 +92,6 @@
       [data-dialog-closable] {
         @apply top-6 right-6;
       }
-
-      [data-dialog-container] {
-        @apply inline grid-cols-none;
-      }
-
-      [data-dialog-title] {
-        @apply col-span-2 md:col-span-1 md:col-start-2 grid grid-cols-[auto_1fr] items-start md:items-center gap-2 pb-4 text-left text-xl text-gray-2 md:border-b md:border-gray-3;
-      }
     }
 
     &-results {

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

@@ -65,17 +65,25 @@
     &-panel {
       @apply divide-y divide-gray-3 [&>*]:py-4 [&>p]:text-gray-2;
 
-      &__tr {
-        @apply flex items-center justify-between rounded first-of-type:bg-background-4;
+      table {
+        @apply w-full border-collapse;
       }
 
-      &__th {
-        @apply w-1/4 p-2 bg-background-4 text-gray-2 font-bold text-sm;
+      thead tr {
+        @apply bg-background-4;
       }
 
-      &__td {
+      th {
+        @apply w-1/4 p-2 text-gray-2 font-bold text-sm text-left;
+      }
+
+      td {
         @apply w-1/4 p-2 text-gray-2 text-xs;
       }
+
+      tbody tr {
+        @apply border-b border-gray-3;
+      }
     }
 
     &-toggle {

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

@@ -3,7 +3,7 @@
     @apply divide-y divide-background [&>*]:py-4 first:[&>*]:pt-0 last:[&>*]:pb-0;
 
     > * {
-      @apply flex items-center justify-between gap-4;
+      @apply grid sm:flex items-center justify-between gap-4;
     }
   }
 

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

@@ -3,12 +3,44 @@ footer {
     @apply bg-gray-4;
 
     &__top {
-      @apply hidden lg:flex flex-row gap-8 container py-10;
+      @apply flex flex-col lg:flex-row gap-0 lg:gap-8 container py-10;
 
       .prose a,
       .prose strong {
         @apply text-white;
       }
+
+      .footer__nav {
+        @apply border-b border-white/20 lg:border-0;
+
+        ul {
+          @apply space-y-4 break-inside-avoid mb-4;
+
+          li a {
+            @apply font-semibold underline decoration-1 underline-offset-1;
+          }
+        }
+
+        > [data-controls] {
+          @apply flex items-center justify-between w-full py-4 lg:pointer-events-none lg:cursor-default text-left text-white font-semibold;
+
+          svg {
+            @apply w-4 h-4 fill-current transition-transform lg:hidden;
+          }
+
+          &[aria-expanded="true"] svg {
+            @apply rotate-180;
+          }
+        }
+
+        [id*="panel"][aria-hidden="true"] {
+          @apply hidden lg:block;
+        }
+
+        [id*="panel"][aria-hidden="false"] {
+          @apply block;
+        }
+      }
     }
 
     &__down {

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

@@ -22,19 +22,27 @@
   }
 
   [data-dialog-container] {
-    @apply grid grid-cols-[auto_1fr] items-start md:items-center gap-2 text-left;
+    @apply block text-left;
 
-    > svg {
-      @apply w-6 h-6 text-gray fill-current flex-none;
-    }
+    &:has(> svg) {
+      @apply grid grid-cols-[auto_1fr] items-start md:items-center gap-2;
+
+      > svg {
+        @apply w-6 h-6 text-gray fill-current flex-none mb-6;
+      }
 
-    > :last-child {
-      @apply col-span-2 md:col-span-1 md:col-start-2;
+      > :last-child {
+        @apply col-span-2 md:col-span-1 md:col-start-2;
+      }
     }
   }
 
   [data-dialog-title] {
-    @apply text-2xl text-black font-semibold focus:outline-none;
+    @apply flex items-center gap-2 text-xl text-gray-2 font-semibold focus:outline-none pb-2 mb-4 md:border-b md:border-gray-3;
+
+    > svg {
+      @apply w-6 h-6 text-gray fill-current flex-none;
+    }
   }
 
   [data-dialog-actions] {
@@ -59,7 +67,7 @@
     }
 
     [data-dialog-container] {
-      @apply grid-cols-none;
+      @apply grid grid-cols-none;
 
       &.layout-content {
         @apply bg-white;

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

@@ -1,21 +1,7 @@
 .qr-modal {
   @apply md:p-6 lg:p-8;
 
-  [data-dialog-title] {
-    @apply flex justify-start items-center text-2xl text-black font-semibold focus:outline-none;
-
-    > svg {
-      @apply w-10 h-10 text-gray fill-current flex-none;
-    }
-
-    > :last-child {
-      @apply ml-1;
-    }
-  }
-
   [data-dialog-container] {
-    @apply inline grid-cols-none;
-
     .content {
       @apply md:grid md:grid-cols-2 gap-5 md:py-4;
 
@@ -59,14 +45,6 @@
     @apply top-6 right-6;
   }
 
-  [data-dialog-container] {
-    @apply inline grid-cols-none;
-  }
-
-  [data-dialog-title] {
-    @apply col-span-2 md:col-span-1 md:col-start-2 grid grid-cols-[auto_1fr] items-start md:items-center gap-2 pb-4 text-left text-xl text-gray-2 md:border-b md:border-gray-3;
-  }
-
   &__list {
     @apply my-6 flex flex-wrap justify-center items-center md:grid grid-cols-4 md:grid-cols-5 gap-3 md:gap-6 max-w-96 mx-auto text-secondary;
 

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

@@ -49,7 +49,7 @@
         }
 
         &__collection-content {
-          @apply w-auto ml-6 my-4 pl-4 lg:pl-8 border-l border-[#D3D5D9];
+          @apply w-auto sm:ml-6 sm:my-4 sm:pl-4 lg:pl-8 sm:border-l sm:border-[#D3D5D9];
 
           p {
             @apply pt-4;
@@ -111,7 +111,17 @@
     }
 
     &-item {
-      @apply flex items-center gap-1 text-white font-semibold hover:underline [&>svg]:fill-current;
+      @apply flex items-center gap-1 text-white font-semibold hover:underline;
+    }
+
+    &-label {
+      @apply flex-1 min-w-0 overflow-hidden text-ellipsis;
+
+      overflow-wrap: anywhere;
+    }
+
+    &-item > svg {
+      @apply shrink-0 fill-current;
     }
   }
 

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

@@ -7,18 +7,21 @@
   .editor-content-videoEmbed {
     @apply my-10 mx-auto;
   }
+}
 
-  .editor-mention {
-    @apply inline-flex items-center align-bottom font-semibold underline text-secondary;
+// Resource mentions are rendered both inside rich text (`.rich-text-display`)
+// and inside comments (`.editor-content`), so they cannot be scoped to one of
+// those wrappers.
+.editor-mention {
+  @apply inline-flex items-center align-bottom font-semibold underline text-secondary;
 
-    img,
-    svg {
-      @apply w-5 h-5 rounded-full;
-    }
+  img,
+  svg {
+    @apply w-5 h-5 m-0 rounded-full;
+  }
 
-    span {
-      @apply ml-1;
-    }
+  span {
+    @apply ml-1;
   }
 }
 

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

@@ -27,7 +27,10 @@
 }
 
 .title-decorator {
-  @apply h2 md:h1 decorator;
+  @apply h2 md:h1 decorator break-normal;
+
+  hyphens: auto;
+  overflow-wrap: anywhere;
 }
 
 .text-with-links {
@@ -38,7 +41,7 @@
 
 /* default styles for those dynamic text blocks */
 .editor-content {
-  @apply prose max-w-full text-gray-2 text-lg prose-a:text-secondary break-words prose-ul:pl-4;
+  @apply prose max-w-full text-gray-2 text-lg prose-a:text-secondary break-words prose-ul:pl-8 prose-ol:pl-8;
 
   iframe {
     @apply w-full block max-w-[600px] max-h-[70vh] h-[450px] my-10 mx-auto;

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

@@ -83,6 +83,7 @@
   @include meta.load-css("stylesheets/decidim/actions");
   @include meta.load-css("stylesheets/decidim/emoji");
   @include meta.load-css("stylesheets/decidim/success_image");
+  @include meta.load-css("stylesheets/decidim/editor_suggestions");
 }
 
 // This applies the custom style imports registered at the application.

data/app/packs/stylesheets/decidim/legacy/email.scss

@@ -1725,7 +1725,6 @@ body.outlook p {
 table.body th.decidim-bar,
 table.body td.decidim-bar {
   padding: 10px 0;
-  background-color: #1a181d;
 }
 
 table.body {
@@ -1742,10 +1741,6 @@ table.body {
   height: 30px;
 }
 
-.cityhall-bar {
-  background-color: #2c2930;
-}
-
 .cityhall-logo {
   width: 150px;
   margin-top: 16px;

data/app/permissions/decidim/permissions.rb

@@ -9,6 +9,7 @@ module Decidim
       locales_action?
       component_public_action?
       search_scope_action?
+      public_content_action?
 
       public_report_content_action?
 
@@ -66,6 +67,23 @@ module Decidim
       toggle_allow([:search, :pick].include?(permission_action.action))
     end
 
+    # Public, non-resource content that any visitor is allowed to reach. The
+    # controllers using these subjects enforce the actual data visibility
+    # themselves (profile publication, private download tokens, newsletter
+    # tokens, etc.).
+    def public_content_action?
+      case permission_action.subject
+      when :open_data, :search, :profile, :private_download, :short_link,
+           :calendar, :badges, :static_map, :qr_code, :homepage, :manifest,
+           :offline, :link, :authorization, :error, :timeout, :page
+        allow! if permission_action.action == :read
+      when :newsletter
+        allow! if [:read, :unsubscribe].include?(permission_action.action)
+      when :upload_validation
+        allow! if permission_action.action == :create
+      end
+    end
+
     def manage_self_user_action?
       return unless permission_action.subject == :user
 
@@ -78,6 +96,8 @@ module Decidim
       authorization = context.fetch(:authorization, nil)
 
       case permission_action.action
+      when :read
+        allow!
       when :create
         toggle_allow(authorization.user == user && not_already_active?(authorization))
       when :update, :destroy

data/app/presenters/decidim/admin_log/component_presenter.rb

@@ -29,7 +29,7 @@ module Decidim
 
       def action_string
         case action
-        when "export_component", "soft_delete", "restore"
+        when "export_component", "soft_delete", "restore", "menu_hidden"
           "decidim.admin_log.component.#{action}"
         when "create", "delete", "publish", "unpublish", "update_permissions", "update_filters"
           generate_action_string(action)

data/app/presenters/decidim/footer_menu_presenter.rb

@@ -3,10 +3,8 @@
 module Decidim
   # A presenter to render footer menu
   class FooterMenuPresenter < MenuPresenter
-    def render
-      content_tag(:nav, :role => "navigation", "aria-label" => @options[:label]) do
-        safe_join([content_tag(:h2, @options[:label], class: "h5 mb-4"), render_menu])
-      end
+    def render_menu_items
+      render_menu
     end
   end
 end

data/app/presenters/decidim/log/base_presenter.rb

@@ -111,9 +111,18 @@ module Decidim
       # Returns an HTML-safe String.
       def present_explanation
         h.content_tag(:div, class: "logs__log__explanation") do
+          escaped_params = i18n_params.transform_values do |value|
+            if value.is_a?(String) && !value.html_safe?
+              ERB::Util.html_escape(value)
+            else
+              value
+            end
+          end
+
           I18n.t(
             action_string,
-            **i18n_params
+            escape: false,
+            **escaped_params
           ).html_safe
         end
       end

data/app/presenters/decidim/log/user_presenter.rb

@@ -67,9 +67,9 @@ module Decidim
 
       # Private: Presents the nickname of the user performing the action.
       #
-      # Returns an HTML-safe String.
+      # Returns a String.
       def present_user_nickname
-        extra["nickname"].html_safe
+        extra["nickname"]
       end
 
       # Private: Calculates the path for the user. Returns the path of the

data/app/presenters/decidim/menu_item_presenter.rb

@@ -48,11 +48,7 @@ module Decidim
     private
 
     def link_options
-      if active?
-        { aria: { current: "page" } }
-      else
-        {}
-      end.merge({ class: link_classes, role: menuitem_role })
+      { class: link_classes, role: menuitem_role }
     end
 
     def composed_label

data/app/presenters/decidim/resource_presenter.rb

@@ -45,5 +45,16 @@ module Decidim
         content
       end
     end
+
+    # Prepares content for plain text areas (non-editor). Renders mentions
+    # to plain @nickname text instead of editor-specific HTML tags.
+    def plain_locales(data, all_locales)
+      handle_locales(data, all_locales) do |content|
+        content = Decidim::ContentRenderers::BlobRenderer.new(content).render
+        content = Decidim::ContentRenderers::UserRenderer.new(content).render(plain: true)
+        content = Decidim::ContentRenderers::MentionResourceRenderer.new(content).render(plain: true)
+        content.html_safe
+      end
+    end
   end
 end

data/app/resolvers/decidim/meta_image_url_resolver.rb

@@ -79,7 +79,10 @@ module Decidim
         image_url = image_element["src"]
         next if image_url.blank?
 
-        blob = find_blob_by_key(image_url.split("/").second_to_last)
+        blob = find_blob_by_id(image_url.split("/").last)
+        return blob if blob.present?
+
+        blob = find_blob_from_url(image_url)
         return blob if blob.present?
       end
 
@@ -116,10 +119,20 @@ module Decidim
       nil
     end
 
+    def find_blob_from_url(url)
+      return GlobalID::Locator.locate(url, only: ActiveStorage::Blob) if url.start_with?("gid://")
+
+      find_blob_by_key(url.split("/").second_to_last)
+    end
+
     def find_blob_by_key(blob_key)
       ActiveStorage::Blob.find_signed(blob_key) if blob_key.present?
     end
 
+    def find_blob_by_id(blob_id)
+      ActiveStorage::Blob.find_by(id: blob_id) if blob_id.present?
+    end
+
     def blob_from_attached_file(file)
       return unless file.respond_to?(:attached?) && file.attached?
 

data/app/serializers/decidim/exporters/open_data_blocked_user_serializer.rb

@@ -16,10 +16,19 @@ module Decidim
           about: resource.user.about,
           reasons: resource.reports.map(&:reason),
           details: resource.reports.map(&:details),
-          block_reasons: resource.blocking.justification,
-          blocking_user: resource.blocking.blocking_user.presenter.name
+          block_reasons: blocking&.justification,
+          blocking_user: blocking_user&.presenter&.name
         }
       end
+
+      private
+
+      # The collection filters on `decidim_users.blocked_at`, but this
+      # association is resolved through `decidim_users.block_id`. The two can
+      # disagree, in which case there is no block to read the details from.
+      def blocking = resource.blocking
+
+      def blocking_user = blocking&.blocking_user
     end
   end
 end

data/app/serializers/decidim/exporters/open_data_moderation_serializer.rb

@@ -14,7 +14,7 @@ module Decidim
           id: resource.id,
           hidden_at: resource.hidden_at,
           report_count: resource.report_count,
-          reported_url: resource.reportable.reported_content_url,
+          reported_url:,
           reportable_type: resource.decidim_reportable_type,
           reportable_id: resource.decidim_reportable_id,
           reported_content: resource.reported_content,
@@ -25,6 +25,30 @@ module Decidim
           }
         }
       end
+
+      private
+
+      # `Decidim::Moderation#reportable` is polymorphic, so the database cannot
+      # enforce the reference, and the moderation row outlives the resource it
+      # points at. Both of the cases below leave the moderation in the export
+      # collection with no URL to build.
+      def reported_url
+        reportable = resource.reportable
+
+        # The resource is gone. Reportables such as proposals and meetings are
+        # soft-deletable while `belongs_to :reportable` does not use
+        # `with_deleted`, so moving one to the trash is enough for this.
+        return if reportable.nil?
+
+        # The component is gone but the resource is not: trashing a component
+        # does not trash its contents. `ResourceLocatorPresenter#route_proxy`
+        # falls back to the resource itself when `component` is nil, and
+        # `EngineRouter.main_proxy` then calls `mounted_engine` on it, which
+        # only components and participatory spaces respond to.
+        return if reportable.is_a?(Decidim::HasComponent) && reportable.component.nil?
+
+        reportable.reported_content_url
+      end
     end
   end
 end