decidim-core 0.31.7 → 0.31.8

data/app/packs/src/decidim/datepicker/datepicker_functions.js

@@ -50,10 +50,7 @@ export const setMinute = (value) => {
 };
 
 export const formatInputDate = (date, formats) => {
-  const dateList = date.split("-");
-  const year = dateList[0];
-  const month = dateList[1];
-  const day = dateList[2];
+  const [year, month, day] = date.split("-");
 
   if (formats.order === "m-d-y") {
     return `${month}${formats.separator}${day}${formats.separator}${year}`;
@@ -63,10 +60,34 @@ export const formatInputDate = (date, formats) => {
   return `${day}${formats.separator}${month}${formats.separator}${year}`;
 };
 
+/**
+ * Splits a time string into two elements: hours and minutes. Ensures a returned
+ * array of size 2 for any kind of strings or `null` values.
+ *
+ * Examples:
+ * splitTime("") => ["00", "00"]
+ * splitTime(null) => ["00", "00"]
+ * splitTime("12") => ["12", "00"]
+ * splitTime("12:30") => ["12", "30"]
+ * splitTime("2:4") => ["02", "04"]
+ * splitTime("12:30:45") => ["12", "30"]
+ *
+ * @param {String} value The original time string, typically hh:ss.
+ * @returns {Array} An array with two elements where the first element is the
+ *   hour part and the second element is the minute part.
+ */
+const splitTime = (value) => {
+  return [...(value || "").split(":"), "00"].splice(0, 2).map((part) => part.padStart(2, "0"));
+};
+
 export const formatInputTime = (time, format, input) => {
-  const timeList = time.split(":");
-  let hour = timeList[0];
-  const minute = timeList[1];
+  if (!time) {
+    return "";
+  } else if (time.length < 1) {
+    return time;
+  }
+
+  let [hour, minute] = splitTime(time);
 
   if (format === 12) {
     if (Number(hour) === 12) {
@@ -80,11 +101,9 @@ export const formatInputTime = (time, format, input) => {
     } else if (Number(hour) === 0) {
       hour = "12";
     }
-
-    return `${hour}:${minute}`;
   };
 
-  return time;
+  return `${hour}:${minute}`;
 };
 
 export const changeHourDisplay = (change, hour, format) => {
@@ -199,29 +218,21 @@ export const formatDate = (value, formats) => {
 };
 
 export const formatTime = (value, format, inputname) => {
+  let [hour, minute] = splitTime(value);
+
   if (format === 12) {
-    const splitValue = value.split(":");
-    let hour = splitValue[0];
-    const minute = splitValue[1];
     if (document.getElementById(`period_am_${inputname}`).checked) {
-      switch (hour) {
-      case "12":
+      if (hour === "12") {
         hour = "00";
-
-        return `${hour}:${minute}`;
-      default:
-        return value;
-      };
+      }
     } else if (document.getElementById(`period_pm_${inputname}`).checked) {
       if (Number(hour) > 0 && Number(hour) < 12) {
         hour = `${Number(hour) + 12}`;
       };
-
-      return `${hour}:${minute}`
     };
   };
 
-  return value;
+  return `${hour}:${minute}`;
 };
 
 export const updateInputValue = (input, formats, time) => {

data/app/packs/src/decidim/datepicker/generate_datepicker.js

@@ -58,7 +58,7 @@ export default function generateDatePicker(input, row, formats) {
   dateColumn.appendChild(datePickerContainer);
 
   let prevDate = null;
-  let defaultTime = input.getAttribute("default_time") || "00:00"
+  let defaultTime = input.dataset.defaultTime || "00:00"
 
   const datePickerDisplay = (event) => {
     if (!dateColumn.contains(event.target)) {
@@ -79,7 +79,7 @@ export default function generateDatePicker(input, row, formats) {
       if (input.type === "date") {
         input.value = `${formatDate(date.value, formats)}`;
       } else if (input.type === "datetime-local") {
-        input.value = `${formatDate(date.value, formats)}T${formatTime(document.querySelector(`#${input.id}_time`).value, formats.time, input.id) || defaultTime}`;
+        input.value = `${formatDate(date.value, formats)}T${formatTime(document.querySelector(`#${input.id}_time`).value || defaultTime, formats.time, input.id)}`;
       };
     };
   });
@@ -95,7 +95,7 @@ export default function generateDatePicker(input, row, formats) {
       if (input.type === "date") {
         input.value = `${formatDate(date.value, formats)}`;
       } else if (input.type === "datetime-local") {
-        input.value = `${formatDate(date.value, formats)}T${formatTime(document.querySelector(`#${input.id}_time`).value, formats.time, input.id) || defaultTime}`;
+        input.value = `${formatDate(date.value, formats)}T${formatTime(document.querySelector(`#${input.id}_time`).value || defaultTime, formats.time, input.id)}`;
       };
     };
   });
@@ -115,7 +115,7 @@ export default function generateDatePicker(input, row, formats) {
     if (input.type === "date") {
       input.value = `${pickedDate}`;
     } else if (input.type === "datetime-local") {
-      input.value = `${pickedDate}T${formatTime(document.querySelector(`#${input.id}_time`).value, formats.time, input.id) || defaultTime}`;
+      input.value = `${pickedDate}T${formatTime(document.querySelector(`#${input.id}_time`).value || defaultTime, formats.time, input.id)}`;
     };
     datePickerContainer.style.display = "none";
   });

data/app/packs/src/decidim/datepicker/test/time.test.js

@@ -49,34 +49,42 @@ describe("setMinute", () => {
 });
 
 describe("formatInputTime", () => {
-  const setupDOM = () => {
-    document.body.innerHTML = `
-      <input type="radio" id="period_am_exampleInput" name="period">
-      <input type="radio" id="period_pm_exampleInput" name="period">
-    `;
-  };
-
   describe("24-hour format", () => {
+    const format = 24;
+    const input = { id: "exampleInput" };
+
     it("returns the value in correct format", () => {
-      setupDOM();
-      const time = "15:30";
-      const format = 24;
-      const input = { id: "exampleInput" };
+      const result = formatInputTime("15:30", format, input);
 
-      const result = formatInputTime(time, format, input);
+      expect(result).toBe("15:30");
+    });
+
+    it("returns the value in correct format if seconds are provided", () => {
+      const result = formatInputTime("15:30:04", format, input);
 
       expect(result).toBe("15:30");
     });
+
+    it("returns an empty string if an empty string is provided", () => {
+      const result = formatInputTime("", 24, { id: "exampleInput" });
+
+      expect(result).toBe("");
+    });
   })
 
   describe("12-hour format", () => {
-    it("returns the value in correct format and checks the PM radio-button", () => {
-      setupDOM();
-      const time = "12:45";
-      const format = 12;
-      const input = { id: "exampleInput" };
+    beforeEach(() => {
+      document.body.innerHTML = `
+        <input type="radio" id="period_am_exampleInput" name="period">
+        <input type="radio" id="period_pm_exampleInput" name="period">
+      `;
+    });
+
+    const format = 12;
+    const input = { id: "exampleInput" };
 
-      const result = formatInputTime(time, format, input);
+    it("returns the value in correct format and checks the PM radio-button", () => {
+      const result = formatInputTime("12:45", format, input);
 
       expect(result).toBe("12:45");
       expect(document.getElementById("period_pm_exampleInput").checked).toBeTruthy();
@@ -84,17 +92,24 @@ describe("formatInputTime", () => {
     });
 
     it("returns the value in correct format", () => {
-      setupDOM();
-      const time = "00:25";
-      const format = 12;
-      const input = { id: "exampleInput" };
-
-      const result = formatInputTime(time, format, input);
+      const result = formatInputTime("00:25", format, input);
 
       expect(result).toBe("12:25");
       // We are not expecting a radio button to be selected here since in a real environment the selected button is not
       // handled by this method for values < 12
     });
+
+    it("returns the value in correct format if seconds are provided", () => {
+      const result = formatInputTime("00:25:04", format, input);
+
+      expect(result).toBe("12:25");
+    });
+
+    it("returns an empty string if an empty string is provided", () => {
+      const result = formatInputTime("", 24, { id: "exampleInput" });
+
+      expect(result).toBe("");
+    });
   })
 });
 

data/app/packs/src/decidim/utilities/dom.js

@@ -77,7 +77,7 @@ const createUnloadPreventer = () => {
     ev.preventDefault();
     ev.stopPropagation();
 
-    confirmAction(confirmMessage, link).then((answer) => {
+    confirmAction(confirmMessage, link, { iconName: "alert-line" }).then((answer) => {
       if (!answer) {
         return;
       }
@@ -109,7 +109,7 @@ const createUnloadPreventer = () => {
     ev.stopImmediatePropagation();
     ev.stopPropagation();
 
-    confirmAction(confirmMessage, button).then((answer) => {
+    confirmAction(confirmMessage, button, { iconName: "alert-line" }).then((answer) => {
       if (!answer) {
         return;
       }

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

@@ -13,18 +13,12 @@
         @apply block max-h-40 overflow-hidden relative first:[&_*]:mt-0 before:content-[''] before:absolute before:inset-0 before:h-full before:w-full before:bg-gradient-to-b before:from-transparent before:to-white after:content-[''] after:absolute after:inset-0 after:h-full after:w-full after:bg-gradient-to-b after:from-transparent after:to-white;
       }
 
-      [aria-expanded="false"] > svg:last-of-type,
-      [aria-expanded="false"] > span:last-of-type,
-      [aria-expanded="true"] > span:first-of-type,
-      [aria-expanded="true"] > svg:first-of-type {
-        @apply hidden;
+      [aria-expanded] > svg {
+        @apply transition-transform;
       }
 
-      [aria-expanded="true"] > svg:last-of-type,
-      [aria-expanded="true"] > span:last-of-type,
-      [aria-expanded="false"] > span:first-of-type,
-      [aria-expanded="false"] > svg:first-of-type {
-        @apply block;
+      [aria-expanded="true"] > svg {
+        @apply rotate-180;
       }
     }
 

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/_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

@@ -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/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/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

@@ -66,9 +66,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/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