decidim-core 0.29.2 → 0.30.0.rc2

data/app/models/decidim/user_moderation.rb

@@ -6,6 +6,7 @@ module Decidim
     include Loggable
 
     belongs_to :user, foreign_key: :decidim_user_id, class_name: "Decidim::UserBaseEntity"
+    has_one :blocking, through: :user
     has_many :reports, class_name: "Decidim::UserReport", dependent: :destroy
 
     scope :blocked, -> { joins(:user).where(decidim_users: { blocked: true }) }
@@ -16,5 +17,13 @@ module Decidim
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::UserModerationPresenter
     end
+
+    def self.ransackable_attributes(_auth_object = nil)
+      []
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w(reports user)
+    end
   end
 end

data/app/models/decidim/user_report.rb

@@ -19,6 +19,10 @@ module Decidim
       # Decidim::DownloadYourDataSerializers::DownloadYourDataReportSerializer
     end
 
+    def self.ransackable_attributes(_auth_object = nil)
+      %w(reason)
+    end
+
     private
 
     # Private: check if the moderation and the user have the same organization

data/app/packs/entrypoints/decidim_core.js

@@ -6,6 +6,7 @@ import "src/decidim/decidim_application"
 
 // CSS
 import "entrypoints/decidim_core.scss"
+import "stylesheets/decidim/resource_history.scss"
 
 // Images
 require.context("../images", true)

data/app/packs/entrypoints/decidim_geocoding.js

@@ -0,0 +1,2 @@
+import "src/decidim/geocoding/reverse_geocoding.js"
+import "stylesheets/decidim/geocoding_addons.scss";

data/app/packs/images/decidim/brands/facebook.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_29214_25190)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 12.0707C24 5.40424 18.6274 0 12 0C5.37258 0 0 5.40424 0 12.0707C0 18.0956 4.38823 23.0893 10.125 23.9948V15.5599H7.07812V12.0707H10.125V9.41139C10.125 6.38617 11.9165 4.71513 14.6576 4.71513C15.9705 4.71513 17.3438 4.95088 17.3438 4.95088V7.92141H15.8306C14.3399 7.92141 13.875 8.85187 13.875 9.80645V12.0707H17.2031L16.6711 15.5599H13.875V23.9948C19.6118 23.0893 24 18.0956 24 12.0707Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_29214_25190">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>

data/app/packs/images/decidim/brands/google.svg

@@ -1 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="42" height="42" viewBox="2 -2 42 42"><defs><filter id="b" width="2" height="2" x="-.5" y="-.5" filterUnits="objectBoundingBox"><feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation=".5"/><feColorMatrix in="shadowBlurOuter1" result="shadowMatrixOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.168 0"/><feOffset in="SourceAlpha" result="shadowOffsetOuter2"/><feGaussianBlur in="shadowOffsetOuter2" result="shadowBlurOuter2" stdDeviation=".5"/><feColorMatrix in="shadowBlurOuter2" result="shadowMatrixOuter2" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.084 0"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="shadowMatrixOuter2"/><feMergeNode in="SourceGraphic"/></feMerge></filter><rect id="a" width="40" height="40" x="0" y="0" rx="2"/></defs><use width="100%" height="100%" fill="#fff" fill-rule="evenodd" filter="url(#b)" transform="translate(3 -1)" xlink:href="#a"/><use width="100%" height="100%" fill="none" fill-rule="evenodd" filter="url(#b)" transform="translate(3 -1)" xlink:href="#a"/><use width="100%" height="100%" fill="none" fill-rule="evenodd" filter="url(#b)" transform="translate(3 -1)" xlink:href="#a"/><use width="100%" height="100%" fill="none" fill-rule="evenodd" filter="url(#b)" transform="translate(3 -1)" xlink:href="#a"/><path fill="#4285f4" fill-rule="evenodd" d="M31.64 19.205c0-.639-.057-1.252-.164-1.841H23v3.481h4.844a4.14 4.14 0 01-1.796 2.716v2.259h2.908c1.702-1.567 2.684-3.875 2.684-6.615z"/><path fill="#34a853" fill-rule="evenodd" d="M23 28c2.43 0 4.467-.806 5.956-2.18l-2.908-2.259c-.806.54-1.837.86-3.048.86-2.344 0-4.328-1.584-5.036-3.711h-3.007v2.332A8.997 8.997 0 0023 28z"/><path fill="#fbbc05" fill-rule="evenodd" d="M17.964 20.71a5.41 5.41 0 01-.282-1.71c0-.593.102-1.17.282-1.71v-2.332h-3.007A8.996 8.996 0 0014 19c0 1.452.348 2.827.957 4.042z"/><path fill="#ea4335" fill-rule="evenodd" d="M23 13.58c1.321 0 2.508.454 3.44 1.345l2.582-2.58C27.463 10.891 25.426 10 23 10a8.997 8.997 0 00-8.043 4.958l3.007 2.332c.708-2.127 2.692-3.71 5.036-3.71z"/><path fill="none" d="M14 10h18v18H14z"/></svg>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" xmlns:xlink="http://www.w3.org/1999/xlink" style="display: block;">
+        <path fill="#EA4335" d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"></path>
+        <path fill="#4285F4" d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"></path>
+        <path fill="#FBBC05" d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"></path>
+        <path fill="#34A853" d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"></path>
+        <path fill="none" d="M0 0h48v48H0z"></path>
+      </svg>

data/app/packs/images/decidim/brands/twitter-x.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-twitter-x" viewBox="0 0 16 16">
+  <path d="M12.6.75h2.454l-5.36 6.142L16 15.25h-4.937l-3.867-5.07-4.425 5.07H.316l5.733-6.57L0 .75h5.063l3.495 4.633L12.601.75Zm-.86 13.028h1.36L4.323 2.145H2.865z"/>
+</svg>

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

@@ -101,7 +101,6 @@ export default class CheckBoxesTree {
     const indeterminateSiblings = totalCheckSiblings.filter((checkbox) => checkbox.indeterminate)
 
     if (checkedSiblings.length === 0 && indeterminateSiblings.length === 0) {
-      parentCheck.checked = false;
       parentCheck.indeterminate = false;
     } else if (checkedSiblings.length === totalCheckSiblings.length && indeterminateSiblings.length === 0) {
       parentCheck.checked = true;

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

@@ -21,7 +21,9 @@ import select from "select";
  *
  * Options through data attributes:
  * - `data-clipboard-copy` = The jQuery selector for the target input element
- *   where text will be copied from.
+ *   where text will be copied from. If this element does not contain any visible text (for instance is an image),
+ *   the selector indicated in here will be used to place the confirmation message.
+ * - `data-clipboard-content` = The text that will be copied. If empty or not present, the target input element will be used.
  * - `data-clipboard-copy-label` = The label that will be shown in the button
  *   after a succesful copy.
  * - `data-clipboard-copy-message` = The text that will be announced to screen
@@ -40,12 +42,17 @@ $(() => {
     }
 
     const $input = $($el.data("clipboard-copy"));
-    if ($input.length < 1 || !$input.is("input, textarea, select")) {
-      return;
+
+    let selectedText = $el.data("clipboard-content") || "";
+    if (selectedText === "" && $input.is("input, textarea, select")) {
+      selectedText = select($input[0]);
     }
 
+    let $msgEl = $el;
+    if ($msgEl.text() === "") {
+      $msgEl = $input;
+    }
     // Get the available text to clipboard.
-    const selectedText = select($input[0]);
     if (!selectedText || selectedText.length < 1) {
       return;
     }
@@ -83,16 +90,18 @@ $(() => {
       }
 
       if (!$el.data("clipboard-copy-label-original")) {
-        $el.data("clipboard-copy-label-original", $el.html());
+        $el.data("clipboard-copy-label-original", $msgEl.html());
       }
 
-      $el.html(label);
+      $msgEl.html(label);
+
       to = setTimeout(() => {
-        $el.html($el.data("clipboard-copy-label-original"));
+        $msgEl.html($el.data("clipboard-copy-label-original"));
         $el.removeData("clipboard-copy-label-original");
         $el.removeData("clipboard-copy-label-timeout");
       }, CLIPBOARD_COPY_TIMEOUT);
-      $el.data("clipboard-copy-label-timeout", to)
+
+      $el.data("clipboard-copy-label-timeout", to);
     }
 
     // Alert the screen reader what just happened (the link was copied).
@@ -107,7 +116,7 @@ $(() => {
         }
       } else {
         $msg = $('<div aria-role="alert" aria-live="assertive" aria-atomic="true" class="sr-only"></div>');
-        $el.after($msg);
+        $msgEl.append($msg);
         $el.data("clipboard-message-element", $msg);
       }
 

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

@@ -5,12 +5,14 @@
  * it to gain control over the confirm events BEFORE rails-ujs is loaded.
  */
 
-import Rails from "@rails/ujs"
+const { Rails } = window;
 
 class ConfirmDialog {
   constructor(sourceElement) {
     this.$modal = $("#confirm-modal");
-    this.$source = sourceElement;
+    if (sourceElement) {
+      this.$source = $(sourceElement);
+    }
     this.$content = $("[data-confirm-modal-content]", this.$modal);
     this.$buttonConfirm = $("[data-confirm-ok]", this.$modal);
     this.$buttonCancel = $("[data-confirm-cancel]", this.$modal);
@@ -29,22 +31,37 @@ class ConfirmDialog {
       this.$buttonConfirm.on("click", (ev) => {
         ev.preventDefault();
 
-        window.Decidim.currentDialogs["confirm-modal"].close()
-        resolve(true);
-        this.$source.focus();
+        this.close(() => resolve(true));
       });
 
       this.$buttonCancel.on("click", (ev) => {
         ev.preventDefault();
 
-        window.Decidim.currentDialogs["confirm-modal"].close()
-        resolve(false);
-        this.$source.focus();
+        this.close(() => resolve(false));
       });
     });
   }
+
+  close(afterClose) {
+    window.Decidim.currentDialogs["confirm-modal"].close()
+    afterClose();
+    if (this.$source) {
+      this.$source.focus();
+    }
+  }
 }
 
+const runConfirm = (message, sourceElement = null) => new Promise((resolve) => {
+  const dialog = new ConfirmDialog(sourceElement);
+  dialog.confirm(message).then((answer) => {
+    let completed = true;
+    if (sourceElement) {
+      completed = Rails.fire(sourceElement, "confirm:complete", [answer]);
+    }
+    resolve(answer && completed);
+  });
+});
+
 // Override the default confirm dialog by Rails
 // See:
 // https://github.com/rails/rails/blob/fba1064153d8e2f4654df7762a7d3664b93e9fc8/actionview/app/assets/javascripts/rails-ujs/features/confirm.coffee
@@ -64,37 +81,35 @@ const allowAction = (ev, element) => {
     return false;
   }
 
-  const dialog = new ConfirmDialog(
-    $(element)
-  );
-  dialog.confirm(message).then((answer) => {
-    const completed = Rails.fire(element, "confirm:complete", [answer]);
-    if (answer && completed) {
-      // Allow the event to propagate normally and re-dispatch it without
-      // the confirm data attribute which the Rails internal method is
-      // checking.
-      $(element).data("confirm", null);
-      $(element).removeAttr("data-confirm");
-
-      // The submit button click events will not do anything if they are
-      // dispatched as is. In these cases, just submit the underlying form.
-      if (ev.type === "click" &&
-        (
-          $(element).is('button[type="submit"]') ||
-          $(element).is('input[type="submit"]')
-        )
-      ) {
-        $(element).parents("form").submit();
-      } else {
-        let origEv = ev.originalEvent || ev;
-        let newEv = origEv;
-        if (typeof Event === "function") {
-          // Clone the event because otherwise some click events may not
-          // work properly when re-dispatched.
-          newEv = new origEv.constructor(origEv.type, origEv);
-        }
-        ev.target.dispatchEvent(newEv);
+  runConfirm(message, element).then((answer) => {
+    if (!answer) {
+      return;
+    }
+
+    // Allow the event to propagate normally and re-dispatch it without
+    // the confirm data attribute which the Rails internal method is
+    // checking.
+    $(element).data("confirm", null);
+    $(element).removeAttr("data-confirm");
+
+    // The submit button click events will not do anything if they are
+    // dispatched as is. In these cases, just submit the underlying form.
+    if (ev.type === "click" &&
+      (
+        $(element).is('button[type="submit"]') ||
+        $(element).is('input[type="submit"]')
+      )
+    ) {
+      $(element).parents("form").submit();
+    } else {
+      let origEv = ev.originalEvent || ev;
+      let newEv = origEv;
+      if (typeof Event === "function") {
+        // Clone the event because otherwise some click events may not
+        // work properly when re-dispatched.
+        newEv = new origEv.constructor(origEv.type, origEv);
       }
+      ev.target.dispatchEvent(newEv);
     }
   });
 
@@ -129,26 +144,31 @@ const handleDocumentEvent = (ev, matchSelectors) => {
   });
 };
 
-document.addEventListener("click", (ev) => {
-  return handleDocumentEvent(ev, [
-    Rails.linkClickSelector,
-    Rails.buttonClickSelector,
-    Rails.formInputClickSelector
-  ]);
-});
-document.addEventListener("change", (ev) => {
-  return handleDocumentEvent(ev, [Rails.inputChangeSelector]);
-});
-document.addEventListener("submit", (ev) => {
-  return handleDocumentEvent(ev, [Rails.formSubmitSelector]);
-});
+// Note that this needs to be run **before** Rails.start()
+export const initializeConfirm = () => {
+  document.addEventListener("click", (ev) => {
+    return handleDocumentEvent(ev, [
+      Rails.linkClickSelector,
+      Rails.buttonClickSelector,
+      Rails.formInputClickSelector
+    ]);
+  });
+  document.addEventListener("change", (ev) => {
+    return handleDocumentEvent(ev, [Rails.inputChangeSelector]);
+  });
+  document.addEventListener("submit", (ev) => {
+    return handleDocumentEvent(ev, [Rails.formSubmitSelector]);
+  });
 
-// This is needed for the confirm dialog to work with Foundation Abide.
-// Abide registers its own submit click listeners since Foundation 5.6.x
-// which will be handled before the document listeners above. This would
-// break the custom confirm functionality when used with Foundation Abide.
-document.addEventListener("DOMContentLoaded", function() {
-  $(Rails.formInputClickSelector).on("click.confirm", (ev) => {
-    handleConfirm(ev, getMatchingEventTarget(ev, Rails.formInputClickSelector));
+  // This is needed for the confirm dialog to work with Foundation Abide.
+  // Abide registers its own submit click listeners since Foundation 5.6.x
+  // which will be handled before the document listeners above. This would
+  // break the custom confirm functionality when used with Foundation Abide.
+  document.addEventListener("DOMContentLoaded", function() {
+    $(Rails.formInputClickSelector).on("click.confirm", (ev) => {
+      handleConfirm(ev, getMatchingEventTarget(ev, Rails.formInputClickSelector));
+    });
   });
-});
+};
+
+export default runConfirm;

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

@@ -0,0 +1 @@
+// This file is intentionally empty, because is the place for the defidim applications will add their JavaScript code.

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

@@ -1,4 +1,4 @@
-import Rails from "@rails/ujs";
+const { Rails } = window;
 
 // Make the remote form submit buttons disabled when the form is being
 // submitted to avoid multiple submits.

data/app/packs/src/decidim/geocoding/reverse_geocoding.js

@@ -0,0 +1,60 @@
+document.addEventListener("DOMContentLoaded", () => {
+  const info = (target, msg) => {
+    const label = target.closest("label");
+    label.querySelectorAll(".form-error").forEach((el) => el.remove());
+    if (msg) {
+      const error = document.createElement("span");
+      error.className = "form-error";
+      error.textContent = msg;
+      label.appendChild(error);
+      error.style.display = "block";
+    }
+  };
+
+  const setLocating = (button, enable) => {
+    if (enable) {
+      button.setAttribute("disabled", true);
+    } else {
+      button.removeAttribute("disabled");
+    }
+  };
+
+  document.querySelectorAll(".user-device-location button").forEach((button) => {
+    button.addEventListener("click", (event) => {
+      const target = event.target;
+      if (target.disabled) {
+        return;
+      }
+
+      const input = document.getElementById(target.dataset.input);
+      const errorNoLocation = target.dataset.errorNoLocation;
+      const errorUnsupported = target.dataset.errorUnsupported;
+      const url = target.dataset.url;
+
+      if (navigator.geolocation) {
+        setLocating(target, true);
+        navigator.geolocation.getCurrentPosition((position) => {
+          const coordinates = [position.coords.latitude, position.coords.longitude];
+
+          // reverse geolocation
+          $.post(url, { latitude: coordinates[0], longitude: coordinates[1] }, (data) => {
+            input.value = data.address;
+            $(input).trigger("geocoder-suggest-coordinates.decidim", [coordinates]);
+          }).fail((xhr, status, error) => {
+            info(input, `${errorNoLocation} ${error}`);
+          });
+
+          setLocating(target, false);
+
+        }, (evt) => {
+          info(input, `${errorNoLocation} ${evt.message}`);
+          target.removeAttribute("disabled");
+        }, {
+          enableHighAccuracy: true
+        });
+      } else {
+        info(input, errorUnsupported);
+      }
+    });
+  });
+});

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

@@ -15,7 +15,7 @@ $(() => {
     }, 1000);
 
     // Prevent reload when page is already unloading, otherwise it may cause infinite reloads.
-    window.addEventListener("beforeunload", () => {
+    window.addEventListener("pagehide", () => {
       clearInterval(exitInterval);
       return;
     });

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

@@ -8,6 +8,7 @@
 import "core-js/stable";
 import "regenerator-runtime/runtime";
 import "jquery"
+import "chartkick/chart.js"
 
 // REDESIGN_PENDING: deprecated
 import "foundation-sites";
@@ -41,7 +42,6 @@ import "src/decidim/vizzs"
 import "src/decidim/responsive_horizontal_tabs"
 import "src/decidim/security/selfxss_warning"
 import "src/decidim/session_timeouter"
-import "src/decidim/confirm"
 import "src/decidim/results_listing"
 import "src/decidim/impersonation"
 import "src/decidim/gallery"
@@ -50,9 +50,11 @@ import "src/decidim/data_consent"
 import "src/decidim/abide_form_validator_fixer"
 import "src/decidim/sw"
 import "src/decidim/sticky_header"
+import "src/decidim/sticky_footer"
 import "src/decidim/attachments"
 
 // local deps that require initialization
+import ConfirmDialog, { initializeConfirm } from "src/decidim/confirm"
 import formDatePicker from "src/decidim/datepicker/form_datepicker"
 import Configuration from "src/decidim/configuration"
 import ExternalLink from "src/decidim/external_link"
@@ -79,6 +81,7 @@ import {
   Dialogs
 } from "src/decidim/a11y"
 import changeReportFormBehavior from "src/decidim/change_report_form_behavior"
+import setOnboardingAction from "src/decidim/onboarding_pending_action"
 
 // bad practice: window namespace should avoid be populated as much as possible
 // rails-translations could be referenced through a single Decidim.I18n object
@@ -90,6 +93,7 @@ window.Decidim = window.Decidim || {
   addInputEmoji,
   EmojiButton,
   Dialogs,
+  ConfirmDialog,
   announceForScreenReader
 };
 
@@ -122,6 +126,8 @@ window.initFoundation = (element) => {
   });
 };
 
+// Confirm initialization needs to happen before Rails.start()
+initializeConfirm();
 Rails.start()
 
 /**
@@ -199,6 +205,10 @@ const initializer = (element = document) => {
   element.querySelectorAll("[data-remote-tooltip]").forEach((elem) => fetchRemoteTooltip(elem))
 
   element.querySelectorAll(".new_report").forEach((elem) => changeReportFormBehavior(elem))
+
+  element.querySelectorAll("[data-onboarding-action]").forEach((elem) => setOnboardingAction(elem))
+
+  document.dispatchEvent(new CustomEvent("decidim:loaded", { detail: { element } }));
 }
 
 // If no jQuery is used the Tribute feature used in comments to autocomplete

data/app/packs/src/decidim/map/provider/here.js

@@ -1,5 +1,5 @@
 import "leaflet"
-import "src/decidim/vendor/leaflet-tilelayer-here"
+import "leaflet-tilelayer-here"
 
 /**
  * NOTE:

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

@@ -0,0 +1,24 @@
+import Cookies from "js-cookie";
+
+const ONBOARDING_COOKIE_EXPIRY = 365;
+
+// The same key is set in the Decidim::OnboardingManager class to retrieve the data from the cookie and store it in the extended data attribute
+const DATA_KEY = "onboarding";
+
+/**
+ * @param {DOMElement} element Element which provides the information for cookie about action to perform.
+ * @return {Void} Nothing
+ */
+export default function setOnboardingAction(element) {
+  // the dialog-open data attribute is stealing the click event
+  element.addEventListener("mousedown", () => {
+    const action = element.dataset.onboardingAction;
+    const model = element.dataset.onboardingModel;
+    const permissionsHolder = element.dataset.onboardingPermissionsHolder;
+    const redirectPath = element.dataset.onboardingRedirectPath;
+
+    Cookies.set(DATA_KEY, JSON.stringify({ action, model, permissionsHolder, redirectPath }), {
+      expires: ONBOARDING_COOKIE_EXPIRY
+    });
+  });
+}

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

@@ -127,7 +127,7 @@ $(() => {
     setTimer(timeoutInSeconds);
   });
 
-  window.addEventListener("beforeunload", () => {
+  window.addEventListener("pagehide", () => {
     clearInterval(exitInterval);
     return;
   });

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

@@ -0,0 +1,29 @@
+// This script add margin to the footer when the sticky CTA Buttons are shown on mobile devices,
+// so the footer is always visible.
+//
+// The sticky buttons show some of the main Call to Actions (CTAs) so that they remain accessible on the
+// screen as the participant scrolls through the detailed view of the Meetings, Proposals, Surveys, and Budgets
+// components.
+//
+
+const footer = document.querySelector("footer");
+const stickyButtons = document.querySelector("[data-sticky-buttons]");
+
+const adjustCtasButtons = () => {
+  if (!stickyButtons) {
+    return;
+  }
+
+  const marginBottom = stickyButtons.offsetHeight;
+  footer.style.marginBottom = `${marginBottom}px`;
+};
+
+if (stickyButtons) {
+  document.addEventListener("scroll", () => {
+    adjustCtasButtons();
+  });
+
+  document.addEventListener("on:toggle", () => {
+    adjustCtasButtons();
+  });
+}

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

@@ -1,33 +1,14 @@
-// This script implements the sticky header and the sticky buttons. The sticky header hides when participants scroll down and shows when they scroll up.
-// Sticky headers allow users to quickly access the navigation, search, and utility-navigation elements without scrolling up to the top of the page. They increase the discoverability of the elements in the header.
-// The sticky buttons in the other hand, those are some of the main Call to Actions (CTAs) that remain accessible on the screen as the user scrolls through the detailed view of the Meetings, Proposals, Surveys, and Budgets components.
+// This script implements the sticky header on mobile devices.
+//
+// The sticky header hides when participants scroll down and shows when they scroll up.
+// Sticky headers allow users to quickly access the navigation, search, and utility-navigation
+// elements without scrolling up to the top of the page. They increase the discoverability of the elements in the header.
+//
 
 import { screens } from "tailwindcss/defaultTheme"
 
 let prevScroll = window.scrollY;
 const stickyHeader = document.querySelector("[data-sticky-header]");
-const footer = document.querySelector("footer");
-const stickyButtons = document.querySelectorAll("[data-sticky-buttons]");
-
-const isElementInViewport = (element) => {
-  const rect = element.getBoundingClientRect();
-  return rect.top >= 0 && rect.bottom <= (window.innerHeight || document.documentElement.clientHeight);
-};
-
-const adjustCtasButtons = () => {
-  if (!stickyButtons || !stickyButtons.length) {
-    return;
-  }
-
-  let visibleButtons = Array.from(stickyButtons).filter(isElementInViewport);
-
-  if (visibleButtons.length > 0) {
-    const marginBottom = Math.max(...visibleButtons.map((ctasButton) => ctasButton.offsetHeight));
-    footer.style.marginBottom = `${marginBottom}px`;
-  } else {
-    footer.style.marginBottom = 0;
-  }
-};
 
 // Fix the menu bar container margin top when there are multiple elements in the sticky header
 // As there could be different heights and we cannot know beforehand, we need to adjust this in a dynamic way
@@ -76,12 +57,6 @@ if (stickyHeader) {
         }
         prevScroll = currentScroll;
       }
-
-      adjustCtasButtons();
     }
   });
-
-  document.addEventListener("on:toggle", () => {
-    adjustCtasButtons();
-  });
 };

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

@@ -2,6 +2,7 @@ import PasswordToggler from "src/decidim/password_toggler";
 
 $(() => {
   const $userRegistrationForm = $("#register-form");
+  const $userOmniauthRegistrationForm = $("#omniauth-register-form");
   const $userGroupFields      = $userRegistrationForm.find(".user-group-fields");
   const userPassword         =  document.querySelector(".user-password");
   const inputSelector         = 'input[name="user[sign_up_as]"]';
@@ -19,9 +20,11 @@ $(() => {
 
   const checkNewsletter = (check) => {
     $userRegistrationForm.find(newsletterSelector).prop("checked", check);
+    $userOmniauthRegistrationForm.find(newsletterSelector).prop("checked", check);
     $newsletterModal.data("continue", true);
     window.Decidim.currentDialogs["sign-up-newsletter-modal"].close()
     $userRegistrationForm.submit();
+    $userOmniauthRegistrationForm.submit();
   }
 
   setGroupFieldsVisibility($userRegistrationForm.find(`${inputSelector}:checked`).val());
@@ -42,6 +45,16 @@ $(() => {
     }
   });
 
+  $userOmniauthRegistrationForm.on("submit", (event) => {
+    const newsletterChecked = $userOmniauthRegistrationForm.find(newsletterSelector);
+    if (!$newsletterModal.data("continue")) {
+      if (!newsletterChecked.prop("checked")) {
+        event.preventDefault();
+        window.Decidim.currentDialogs["sign-up-newsletter-modal"].open()
+      }
+    }
+  });
+
   $newsletterModal.find("[data-check]").on("click", (event) => {
     checkNewsletter($(event.target).data("check"));
   });