decidim-core 0.30.2 → 0.31.0.rc1

data/app/presenters/decidim/user_presenter.rb

@@ -73,12 +73,6 @@ module Decidim
       true
     end
 
-    def has_tooltip?
-      return if respond_to?(:deleted?) && deleted?
-
-      true
-    end
-
     private
 
     def decidim

data/app/queries/decidim/authorized_users.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This query counts registered users from a collection of organizations
+  # in an optional interval of time.
+  class AuthorizedUsers < Decidim::Query
+    def initialize(organization:, handlers: [], strict: false)
+      @organization = organization
+      @valid_types = organization.available_authorizations
+      @handlers = strict ? handlers : handlers&.select { |type| @valid_types.include?(type) } || []
+      @users = organization.users.not_deleted.not_blocked.confirmed
+    end
+
+    def query
+      return @users if @handlers.blank?
+
+      verified_users = Decidim::Authorization.select(:decidim_user_id)
+                                             .where(decidim_user_id: @users.select(:id))
+                                             .where.not(granted_at: nil)
+                                             .where(name: @handlers)
+                                             .group(:decidim_user_id)
+                                             .having("COUNT(distinct name) = ?", @handlers.count)
+      @users = @users.where(id: verified_users)
+    end
+  end
+end

data/app/queries/decidim/inactive_users_query.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  class InactiveUsersQuery < Decidim::Query
+    attr_reader :scope
+
+    def initialize(scope = Decidim::User.not_deleted)
+      @scope = scope
+    end
+
+    def for_first_warning(cutoff_date)
+      scope
+        .where("(current_sign_in_at <= :cutoff OR current_sign_in_at IS NULL) AND created_at <= :cutoff", cutoff: cutoff_date)
+        .where.not("extended_data ? 'inactivity_notification'")
+    end
+
+    def for_last_warning(cutoff_date)
+      scope
+        .where("(extended_data->'inactivity_notification'->>'notification_type') = 'first'")
+        .where("(extended_data->'inactivity_notification'->>'sent_at')::timestamp <= ?", cutoff_date)
+        .where("current_sign_in_at IS NULL OR current_sign_in_at <= (extended_data->'inactivity_notification'->>'sent_at')::timestamp")
+    end
+
+    def for_removal(cutoff_date)
+      scope
+        .where("(extended_data->'inactivity_notification'->>'notification_type') = 'second'")
+        .where("(extended_data->'inactivity_notification'->>'sent_at')::timestamp <= ?", cutoff_date)
+        .where("current_sign_in_at IS NULL OR current_sign_in_at <= (extended_data->'inactivity_notification'->>'sent_at')::timestamp")
+    end
+  end
+end

data/app/queries/decidim/public_activities.rb

@@ -32,7 +32,7 @@ module Decidim
     def query
       query = base_query
 
-      query = query.where(user:) if user
+      query = query.where(user_id: user.id, user_type: user.class.name) if user
       query = query.where(resource_type: resource_name) if resource_name.present?
 
       query = filter_follows(query)
@@ -71,7 +71,7 @@ module Decidim
       followed_users = follows.where(decidim_followable_type: "Decidim::UserBaseEntity")
       return [] if followed_users.empty?
 
-      [Decidim::ActionLog.arel_table[:decidim_user_id].in(followed_users.map(&:decidim_followable_id))]
+      [Decidim::ActionLog.arel_table[:user_id].in(followed_users.map(&:decidim_followable_id))]
     end
 
     def followed_spaces_conditions(follows)

data/app/queries/decidim/stats_followers_count.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  class StatsFollowersCount < Decidim::Query
+    def initialize(participatory_space)
+      @participatory_space = participatory_space
+    end
+
+    def query
+      space_query + components_query
+    end
+
+    private
+
+    attr_reader :participatory_space
+
+    def components_query
+      Decidim.component_manifests.sum do |component|
+        component.stats
+                 .filter(tag: :followers)
+                 .with_context(space_components)
+                 .map { |_name, value| value }
+                 .compact_blank
+                 .sum
+      end
+    end
+
+    def space_query
+      Decidim.participatory_space_manifests.sum do |space|
+        space.stats
+             .filter(tag: :followers)
+             .with_context(participatory_space_items)
+             .map { |_name, value| value }
+             .compact_blank
+             .sum
+      end
+    end
+
+    def space_components
+      @space_components ||= Decidim::Component.where(participatory_space:).published
+    end
+  end
+end

data/app/queries/decidim/stats_participants_count.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+module Decidim
+  class StatsParticipantsCount < Decidim::Query
+    def initialize(participatory_space)
+      @participatory_space = participatory_space
+    end
+
+    def query
+      [
+        comments_query,
+        debates_query,
+        meetings_query,
+        likes_query,
+        project_votes_query,
+        proposals_query,
+        proposal_votes_query,
+        survey_response_query
+      ].flatten.uniq.count
+    end
+
+    private
+
+    attr_reader :participatory_space
+
+    def comments_query
+      return [] unless Decidim.module_installed?(:comments)
+
+      Decidim::Comments::Comment
+        .where(participatory_space:)
+        .pluck(:decidim_author_id)
+        .uniq
+    end
+
+    def debates_query
+      return [] unless Decidim.module_installed?(:debates)
+
+      Decidim::Debates::Debate
+        .where(component: space_components, decidim_author_type: Decidim::UserBaseEntity.name)
+        .not_hidden
+        .pluck(:decidim_author_id)
+        .uniq
+    end
+
+    def meetings_query
+      return [] unless Decidim.module_installed?(:meetings)
+
+      meetings = Decidim::Meetings::Meeting.where(component: space_components).not_hidden
+      registrations = Decidim::Meetings::Registration.where(decidim_meeting_id: meetings).pluck(:decidim_user_id)
+      organizers = meetings.where(decidim_author_type: Decidim::UserBaseEntity.name).pluck(:decidim_author_id)
+
+      [registrations, organizers].flatten.uniq
+    end
+
+    def likes_query
+      Decidim::Like
+        .where(resource: space_components)
+        .pluck(:decidim_author_id)
+        .uniq
+    end
+
+    def proposals_query
+      return [] unless Decidim.module_installed?(:proposals)
+
+      Decidim::Coauthorship
+        .where(coauthorable: proposals_components, decidim_author_type: Decidim::UserBaseEntity.name)
+        .pluck(:decidim_author_id)
+        .uniq
+    end
+
+    def proposal_votes_query
+      return [] unless Decidim.module_installed?(:proposals)
+
+      Decidim::Proposals::ProposalVote
+        .where(proposal: proposals_components)
+        .final
+        .pluck(:decidim_author_id)
+        .uniq
+    end
+
+    def project_votes_query
+      return [] unless Decidim.module_installed?(:budgets)
+
+      Decidim::Budgets::Order.joins(budget: [:component])
+                             .where(budget: { decidim_components: { id: space_components.pluck(:id) } })
+                             .pluck(:decidim_user_id)
+                             .uniq
+    end
+
+    def survey_response_query
+      Decidim::Forms::Response.newsletter_participant_ids(space_components)
+    end
+
+    def space_components
+      @space_components ||= Decidim::Component.where(participatory_space:).published
+    end
+
+    def proposals_components
+      @proposals_components ||= Decidim::Proposals::FilteredProposals.for(space_components).published.not_hidden
+    end
+  end
+end

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

@@ -19,11 +19,7 @@ module Decidim
           profile_url: presented.profile_url,
           direct_messages_enabled: (resource.direct_message_types != "followed-only"),
           deleted: presented.deleted?,
-          badge: presented.badge,
-          groups: {
-            id: resource.accepted_user_groups.collect(&:id),
-            name: resource.accepted_user_groups.collect(&:name)
-          }
+          badge: presented.badge
         }
       end
 

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

@@ -25,7 +25,6 @@ module Decidim
           updated_at: resource.updated_at,
           published_at: resource.published_at,
           follows_count: resource.follows_count,
-          hashtag: resource.hashtag,
           short_description: resource.short_description,
           description: resource.description,
           promoted: resource.promoted

data/app/services/decidim/action_logger.rb

@@ -45,7 +45,8 @@ module Decidim
     # Returns the newly created `Decidim::ActionLog` resource.
     def log!
       Decidim::ActionLog.create!(
-        user:,
+        user_id: user.id,
+        user_type: user.class.name,
         organization:,
         action:,
         resource:,

data/app/services/decidim/base_diff_renderer.rb

@@ -82,22 +82,6 @@ module Decidim
       diff
     end
 
-    def parse_user_group_changeset(attribute, values, type, diff)
-      return unless diff
-
-      old_user_group = Decidim::UserGroup.find_by(id: values[0])
-      new_user_group = Decidim::UserGroup.find_by(id: values[1])
-
-      diff.update(
-        attribute => {
-          type:,
-          label: I18n.t(attribute, scope: i18n_scope),
-          old_value: old_user_group ? translated_attribute(old_user_group.name) : "",
-          new_value: new_user_group ? translated_attribute(new_user_group.name) : ""
-        }
-      )
-    end
-
     def parse_scope_changeset(attribute, values, type, diff)
       return unless diff
 
@@ -118,7 +102,6 @@ module Decidim
       return parse_i18n_changeset(attribute, values, type, diff) if [:i18n, :i18n_html].include?(type)
 
       return parse_scope_changeset(attribute, values, type, diff) if type == :scope
-      return parse_user_group_changeset(attribute, values, type, diff) if type == :user_group
 
       diff.update(
         attribute => {

data/app/services/decidim/onboarding_manager.rb

@@ -171,6 +171,10 @@ module Decidim
       EngineRouter.main_proxy(component).root_path
     end
 
+    def authorization_path
+      @authorization_path ||= onboarding_data["authorization_path"].presence
+    end
+
     def expired?
       return unless ephemeral?
 

data/app/services/decidim/open_data_exporter.rb

@@ -60,7 +60,7 @@ module Decidim
       collection = export_manifest.collection.call(organization)
       exporter = Decidim::Exporters::CSV.new(collection, export_manifest.serializer)
 
-      get_help_definition(:core, exporter, export_manifest) unless collection.empty?
+      get_help_definition(:core, exporter, export_manifest, collection.count) unless collection.empty?
 
       exporter.export
     end
@@ -98,7 +98,8 @@ module Decidim
 
             collection.push(filename)
 
-            get_help_definition(:components, exporter, export_manifest) unless collection.empty?
+            collection_count = exported.read.split("\n").count - 1
+            get_help_definition(:components, exporter, export_manifest, collection_count) unless collection.empty?
           end
         end
       end
@@ -121,22 +122,26 @@ module Decidim
       end
       serializer = export_manifest.open_data_serializer.nil? ? export_manifest.serializer : export_manifest.open_data_serializer
       exporter = Decidim::Exporters::CSV.new(collection, serializer)
-      get_help_definition(:spaces, exporter, export_manifest) unless collection.empty?
+      get_help_definition(:spaces, exporter, export_manifest, collection.count) unless collection.empty?
 
       exporter.export
     end
 
-    def get_help_definition(manifest_type, exporter, export_manifest)
+    def get_help_definition(manifest_type, exporter, export_manifest, collection_count)
       help_definition[manifest_type] = {} if help_definition[manifest_type].nil?
       help_definition[manifest_type][export_manifest.name] = {} if help_definition[manifest_type][export_manifest.name].blank?
+      help_definition[manifest_type][export_manifest.name][:headers] = {} if help_definition[manifest_type][export_manifest.name][:headers].blank?
       exporter.headers_without_locales.each do |header|
-        help_definition[manifest_type][export_manifest.name][header] = I18n.t("decidim.open_data.help.#{export_manifest.name}.#{header}")
+        help_definition[manifest_type][export_manifest.name][:headers][header] = I18n.t("decidim.open_data.help.#{export_manifest.name}.#{header}")
       end
+      help_definition[manifest_type][export_manifest.name][:collection_count] = 0 if help_definition[manifest_type][export_manifest.name][:collection_count].nil?
+      help_definition[manifest_type][export_manifest.name][:collection_count] += collection_count
     end
 
     def readme
       "# #{I18n.t("decidim.open_data.help.core.title", organization: translated_attribute(organization.name))}\n\n
 #{I18n.t("decidim.open_data.help.core.description")}\n\n
+#{I18n.t("decidim.open_data.help.core.generated_on_date", date: I18n.l(Time.current, format: :decidim_short))}\n\n
 #{core_readme}
 #{space_readme}
 #{component_readme}
@@ -147,8 +152,9 @@ module Decidim
       return unless help_definition.fetch(:core, false)
 
       readme_file = "## #{I18n.t("decidim.open_data.help.core.main")}\n\n"
-      help_definition.fetch(:core, []).each do |element, headers|
-        readme_file << "### #{element}\n\n"
+      help_definition.fetch(:core, []).each do |element, metadata|
+        headers = metadata[:headers]
+        readme_file << "### #{element} (#{I18n.t("decidim.open_data.help.core.resources", count: metadata[:collection_count])})\n\n"
 
         headers.each do |header, help_value|
           readme_file << "* #{header}: #{help_value}\n"
@@ -164,8 +170,9 @@ module Decidim
 
       readme_file = "## #{I18n.t("decidim.open_data.help.core.spaces")}\n\n"
 
-      help_definition.fetch(:spaces, []).each do |space, headers|
-        readme_file << "### #{space}\n\n"
+      help_definition.fetch(:spaces, []).each do |space, metadata|
+        headers = metadata[:headers]
+        readme_file << "### #{space} (#{I18n.t("decidim.open_data.help.core.resources", count: metadata[:collection_count])})\n\n"
 
         headers.each do |header, help_value|
           readme_file << "* #{header}: #{help_value}\n"
@@ -181,8 +188,9 @@ module Decidim
 
       readme_file = "## #{I18n.t("decidim.open_data.help.core.components")}\n\n"
 
-      help_definition.fetch(:components, []).each do |component, headers|
-        readme_file << "### #{component}\n\n"
+      help_definition.fetch(:components, []).each do |component, metadata|
+        headers = metadata[:headers]
+        readme_file << "### #{component} (#{I18n.t("decidim.open_data.help.core.resources", count: metadata[:collection_count])})\n\n"
 
         headers.each do |header, help_value|
           readme_file << "* #{header}: #{help_value}\n"

data/app/services/decidim/send_push_notification.rb

@@ -19,7 +19,8 @@ module Decidim
     #
     # @return [Array<Net::HTTPCreated>, nil] the result of the dispatch or nil if user or subscription are empty
     def perform(notification, title = nil)
-      return unless Rails.application.secrets.dig(:vapid, :enabled)
+      return if Decidim.vapid_public_key.blank?
+
       raise ArgumentError, "Need to provide a title if the notification is a PushNotificationMessage" if notification.is_a?(Decidim::PushNotificationMessage) && title.nil?
 
       user = notification.user
@@ -66,8 +67,8 @@ module Decidim
         p256dh: subscription["p256dh"],
         auth: subscription["auth"],
         vapid: {
-          public_key: Rails.application.secrets.vapid[:public_key],
-          private_key: Rails.application.secrets.vapid[:private_key]
+          public_key: Decidim.vapid_public_key,
+          private_key: Decidim.vapid_private_key
         }
       }
     end

data/app/services/decidim/traceability.rb

@@ -127,7 +127,7 @@ module Decidim
     end
 
     def log(action, user, resource, extra_log_info = {})
-      return unless user.is_a?(Decidim::User)
+      return unless user.is_a?(Decidim::UserBaseEntity)
       # If the record is not valid, it may not yet have an ID causing an
       # exception when trying to save the log record.
       return if resource.nil?

data/app/validators/etiquette_validator.rb

@@ -12,6 +12,7 @@ class EtiquetteValidator < ActiveModel::EachValidator
     # remove HTML tags, from WYSIWYG editor
     text_value = clean_value(value)
 
+    validate_empty(record, attribute, text_value)
     validate_caps(record, attribute, text_value)
     validate_marks(record, attribute, text_value)
     validate_caps_first(record, attribute, text_value)
@@ -23,6 +24,12 @@ class EtiquetteValidator < ActiveModel::EachValidator
     ActionController::Base.helpers.strip_tags(value).to_s.strip
   end
 
+  def validate_empty(record, attribute, value)
+    return if value.present?
+
+    record.errors.add(attribute, options[:message] || :blank)
+  end
+
   def validate_caps(record, attribute, value)
     number_of_caps = value.scan(/[A-Z]/).length
     return if number_of_caps.zero? || number_of_caps < value.length / 2 # 50%

data/app/validators/translated_etiquette_validator.rb

@@ -14,6 +14,7 @@ class TranslatedEtiquetteValidator < EtiquetteValidator
 
     text_value = strip_tags(translated_value)
 
+    validate_empty(record, translated_attr, text_value)
     validate_caps(record, translated_attr, text_value)
     validate_marks(record, translated_attr, text_value)
     validate_caps_first(record, translated_attr, text_value)

data/app/views/decidim/account/_old_password_field.html.erb

@@ -1,4 +1,4 @@
-<div class="old-user-password"
+<div data-controller="password-toggler" class="old-user-password"
   data-show-password="<%= t "show_password", scope: "decidim.devise.shared.password_fields" %>"
   data-hide-password="<%= t "hide_password", scope: "decidim.devise.shared.password_fields" %>"
   data-hidden-password="<%= t "hidden_password", scope: "decidim.devise.shared.password_fields" %>"

data/app/views/decidim/account/_password_fields.html.erb

@@ -1,4 +1,4 @@
-<div class="user-password"
+<div data-controller="password-toggler" class="user-password"
   data-show-password="<%= t "show_password", scope: "decidim.devise.shared.password_fields" %>"
   data-hide-password="<%= t "hide_password", scope: "decidim.devise.shared.password_fields" %>"
   data-hidden-password="<%= t "hidden_password", scope: "decidim.devise.shared.password_fields" %>"

data/app/views/decidim/account/delete.html.erb

@@ -10,7 +10,7 @@
   <p class="help-text">
     <%= t("explanation", scope:"decidim.account.delete") %>
   </p>
-  <%= decidim_form_for(@form, url: account_path, method: :delete, namespace: "delete_user", html: { class: "form-defaults delete-account" }) do |f| %>
+  <%= decidim_form_for(@form, url: account_path, method: :delete, namespace: "delete_user", data: { controller: "delete-account-form" }, html: { class: "form-defaults delete-account" }) do |f| %>
     <div class="form__wrapper">
       <label>
         <%= f.text_area :delete_reason, rows: 2, label: false, help_text: t("activemodel.attributes.account.delete_reason") %>

data/app/views/decidim/account/show.html.erb

@@ -22,14 +22,14 @@
     </div>
   <% end %>
 
-  <%= decidim_form_for(@account, url: account_path, method: :put, html: { autocomplete: "on", class: "form-defaults edit_user" }) do |f| %>
+  <%= decidim_form_for(@account, url: account_path, method: :put, data: { controller: "account-form" }, html: { autocomplete: "on", class: "form-defaults edit_user" }) do |f| %>
     <div class="form__wrapper pt-0">
       <%= f.upload :avatar, button_class: "button button__lg button__transparent-secondary w-full" %>
 
       <%= form_required_explanation %>
 
       <%= f.text_field :name, autocomplete: "name" %>
-      <%= f.text_field :nickname, autocomplete: "nickname" %>
+      <%= f.text_field :nickname, autocomplete: "nickname", data: { controller: "character-counter" } %>
       <%= f.email_field :email, disabled: current_user.unconfirmed_email.present?, autocomplete: "email", data: { original: current_user.email } %>
       <%= f.url_field :personal_url, autocomplete: "url" %>
       <%= f.text_area :about, rows: 5 %>
@@ -45,7 +45,7 @@
         <%= render partial: "password_fields", locals: { form: f, user: current_user } %>
         <%= render partial: "old_password_field", locals: { form: f, show_help_text: true } %>
       <% elsif current_organization.sign_in_enabled? %>
-        <div data-component="accordion" id="accordion-password">
+        <div data-controller="accordion" id="accordion-password">
           <%= button_tag(
             class: "text-lg font-semibold text-secondary underline block cursor-pointer",
             id: "accordion-trigger-panel-password",

data/app/views/decidim/amendments/edit_draft.html.erb

@@ -5,10 +5,6 @@
   <%= decidim_form_for(@form, url: update_draft_amend_path(amendment), method: :patch) do |form| %>
     <div class="form__wrapper">
       <%= render partial: "edit_form_fields", locals: { form:, original: :emendation } %>
-
-      <% if current_organization.user_groups_enabled? && current_user.user_groups.verified.any? %>
-        <%= user_group_select_field form, :user_group_id, label: t("new.amendment_author", scope: "decidim.amendments") %>
-      <% end %>
     </div>
 
     <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">

data/app/views/decidim/amendments/new.html.erb

@@ -7,10 +7,6 @@
 
     <div class="form__wrapper">
       <%= render partial: "edit_form_fields", locals: { form:, original: :amendable } %>
-
-      <% if current_organization.user_groups_enabled? && current_user.user_groups.verified.any? %>
-        <%= user_group_select_field form, :user_group_id, label: t("new.amendment_author", scope: "decidim.amendments") %>
-      <% end %>
     </div>
 
     <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">

data/app/views/decidim/amendments/preview_draft.html.erb

@@ -3,7 +3,7 @@
   <%= render partial: "wizard_header" %>
 
   <div class="space-y-8 my-10">
-    <h2 class="h3 text-secondary"><%= present(emendation).title(links: true, html_escape: true) %></h2>
+    <h2 class="h3 text-secondary"><%= present(emendation).title(html_escape: true) %></h2>
 
     <%= cell "decidim/coauthorships", emendation %>
 

data/app/views/decidim/application/_accordion_section.html.erb

@@ -1,4 +1,4 @@
-<div class="card-accordion" data-component="accordion">
+<div class="card-accordion" data-controller="accordion">
   <div class="card-accordion-divider">
     <button class="card-accordion-divider-button" data-open="<%= open_accordion ||= false %>" data-controls="panel-title--<%= panel_id %>" type="button">
       <h2 class="card-accordion-title" id="title">

data/app/views/decidim/application/_collection.html.erb

@@ -1,6 +1,6 @@
 <% unless attachment_collection.unused? %>
 <div class="documents__dropdown-container">
-  <button id="dropdown-documents-trigger-<%= attachment_collection.id %>" class="documents__collection-trigger" data-component="dropdown" data-target="dropdown-menu-documents-<%= attachment_collection.id %>" aria-expanded="false">
+  <button id="dropdown-documents-trigger-<%= attachment_collection.id %>" class="documents__collection-trigger" data-controller="dropdown" data-target="dropdown-menu-documents-<%= attachment_collection.id %>" aria-expanded="false">
    <div class="documents-details">
       <span>
         <span class="documents__collection-trigger__icon">

data/app/views/decidim/application/_radio_accordion.html.erb

@@ -0,0 +1,30 @@
+<div class="radio-accordion" id="radio-accordion-<%= panel_id %>">
+  <label class="radio-accordion-divider">
+    <input
+      class="radio-accordion-radio reset-defaults"
+      type="radio"
+      name="<%= input_radio_name %>"
+      value="<%= input_radio_value %>"
+      <%= disabled ? 'disabled aria-disabled="true"' : "" %>>
+    <h2 class="radio-accordion-title" id="title">
+      <%= title %>
+    </h2>
+  </label>
+
+  <div data-controller="accordion" class="radio-accordion-section content-block__description editor-content">
+    <div id="panel-title--<%= panel_id %>" aria-hidden="true">
+      <%= yield %>
+    </div>
+
+    <button class="button button__sm button__text-secondary mt-6" data-controls="panel-title--<%= panel_id %>" aria-expanded="false">
+      <span>
+        <%= show_more_text %>
+      </span>
+      <%= icon "arrow-down-s-line" %>
+      <span>
+        <%= show_less_text %>
+      </span>
+      <%= icon "arrow-up-s-line" %>
+    </button>
+  </div>
+</div>

data/app/views/decidim/devise/omniauth_registrations/new.html.erb

@@ -13,7 +13,7 @@
     <%= form_required_explanation %>
   </div>
 
-  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: decidim.omniauth_registrations_path(resource_name), html: { id: "omniauth-register-form" }) do |f| %>
+  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: decidim.omniauth_registrations_path(resource_name), html: { id: "omniauth-register-form" }, data: { controller: "user-registration-form" }) do |f| %>
 
     <div class="form__wrapper">
       <%= f.text_field :name, help_text: t("decidim.devise.omniauth_registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>

data/app/views/decidim/devise/omniauth_registrations/new_tos_fields.html.erb

@@ -3,7 +3,7 @@
     <h1 class="title-decorator my-12"><%= t("decidim.devise.omniauth_registrations.new_tos_fields.sign_up_title") %></h1>
   </div>
 
-  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: decidim.omniauth_registrations_path(resource_name), html: { id: "omniauth-register-form" }) do |f| %>
+  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: decidim.omniauth_registrations_path(resource_name), html: { id: "omniauth-register-form" }, data: { controller: "user-registration-form" } ) do |f| %>
 
     <div class="form__wrapper">
       <%= f.hidden_field :name %>

data/app/views/decidim/devise/registrations/new.html.erb

@@ -27,7 +27,7 @@
     <%= render "decidim/devise/shared/omniauth_buttons" %>
   <% end %>
 
-  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { id: "register-form" }) do |f| %>
+  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), id: "register-form", data: { controller: "user-registration-form" }) do |f| %>
     <%= invisible_captcha %>
 
     <div class="form__wrapper pb-12">

data/app/views/decidim/devise/shared/_links.html.erb

@@ -1,4 +1,4 @@
-<%- if controller_name != "sessions" && resource_class != Decidim::UserGroup %>
+<%- if controller_name != "sessions" %>
   <%= link_to t("devise.shared.links.log_in"), new_session_path(resource_name) %>
 <% end -%>