decidim-core 0.26.8 → 0.27.0.rc1

data/app/controllers/decidim/cookie_policy_controller.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # This controller allows the user to accept the cookie policy.
-  class CookiePolicyController < Decidim::ApplicationController
-    skip_before_action :store_current_location
-
-    def accept
-      response.set_cookie(
-        Decidim.config.consent_cookie_name,
-        value: "true",
-        path: "/",
-        httponly: true,
-        secure: request.session_options[:secure],
-        expires: 1.year.from_now.utc
-      )
-
-      respond_to do |format|
-        format.js
-        format.html { redirect_back fallback_location: root_path }
-      end
-    end
-  end
-end

data/app/helpers/decidim/cookies_helper.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # This module includes helpers to verify the acceptance of the cookie policy
-  module CookiesHelper
-    # Public: Returns true if the cookie policy has been accepted
-    def cookies_accepted?
-      cookies[Decidim.config.consent_cookie_name].present?
-    end
-  end
-end

data/app/helpers/decidim/layout_helper.rb.orig

@@ -1,225 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # View helpers related to the layout.
-  module LayoutHelper
-    include Decidim::ModalHelper
-    include Decidim::TooltipHelper
-
-    # Public: Generates a set of meta tags that generate the different favicon
-    # versions for an organization.
-    #
-    # Returns a safe String with the versions.
-    def favicon
-      return if current_organization.favicon.blank?
-
-      safe_join(Decidim::OrganizationFaviconUploader::SIZES.map do |version, size|
-        favicon_link_tag(current_organization.attached_uploader(:favicon).variant_url(version, host: current_organization.host), sizes: "#{size}x#{size}")
-      end)
-    end
-
-    def apple_favicon
-      icon_image = current_organization.attached_uploader(:favicon).variant_url(:medium, host: current_organization.host)
-      return unless icon_image
-
-      favicon_link_tag(icon_image, rel: "apple-touch-icon", type: "image/png")
-    end
-
-    def legacy_favicon
-      variant = :favicon if current_organization.favicon.content_type != "image/vnd.microsoft.icon"
-      icon_image = current_organization.attached_uploader(:favicon).variant_url(variant, host: current_organization.host)
-      return unless icon_image
-
-      favicon_link_tag(icon_image, rel: "icon", sizes: "any", type: nil)
-    end
-
-    # Outputs an SVG-based icon.
-    #
-    # name    - The String with the icon name.
-    # options - The Hash options used to customize the icon (default {}):
-    #             :width  - The Number of width in pixels (optional).
-    #             :height - The Number of height in pixels (optional).
-    #             :title - The title for the SVG element (optional, similar to alt for img)
-    #             :aria_label - The String to set as aria label (optional).
-    #             :aria_hidden - The Truthy value to enable aria_hidden (optional).
-    #             :role - The String to set as the role (optional).
-    #             :class - The String to add as a CSS class (optional).
-    #
-    # Returns a String.
-    def redesigned_icon(name, options = {})
-      default_html_properties = {
-        "width" => "1em",
-        "height" => "1em",
-        "role" => "img",
-        "aria-hidden" => "true"
-      }
-
-      html_properties = options.with_indifferent_access.transform_keys(&:dasherize).slice("width", "height", "aria-label", "role", "aria-hidden", "class", "style")
-      html_properties = default_html_properties.merge(html_properties)
-
-      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg")
-
-      content_tag :svg, html_properties do
-        content_tag :use, nil, "href" => "#{href}#ri-#{name}", tabindex: -1
-      end
-    end
-
-    def legacy_icon(name, options = {})
-      options = options.with_indifferent_access
-      html_properties = {}
-
-      html_properties["width"] = options[:width]
-      html_properties["height"] = options[:height]
-      html_properties["aria-label"] = options[:aria_label] || options[:"aria-label"]
-      html_properties["role"] = options[:role] || "img"
-      html_properties["aria-hidden"] = options[:aria_hidden] || options[:"aria-hidden"]
-
-      html_properties["class"] = (["icon--#{name}"] + _icon_classes(options)).join(" ")
-
-      title = options["title"] || html_properties["aria-label"]
-      if title.blank? && html_properties["role"] == "img"
-        # This will make the accessibility audit tools happy as with the "img"
-        # role, the alternative text (aria-label) and title are required for the
-        # element. This will also force the SVG to be hidden because otherwise
-        # the screen reader would announce the icon name which can be in
-        # different language (English) than the page language which is not
-        # allowed.
-        title = name
-        html_properties["aria-label"] = title
-        html_properties["aria-hidden"] = true
-      end
-
-      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg")
-
-      content_tag :svg, html_properties do
-        inner = content_tag :title, title
-        inner += content_tag :use, nil, "href" => "#{href}#icon-#{name}"
-
-        inner
-      end
-    end
-
-    def icon(*args)
-      redesign_enabled? ? redesigned_icon(*args) : legacy_icon(*args)
-    end
-
-    # Outputs a SVG icon from an external file. It apparently renders an image
-    # tag, but then a JS script kicks in and replaces it with an inlined SVG
-    # version.
-    #
-    # path    - The asset's path
-    #
-    # Returns an <img /> tag with the SVG icon.
-    def external_icon(path, options = {})
-      classes = _icon_classes(options) + ["external-icon"]
-
-      if path.split(".").last == "svg"
-        icon_path = application_path(path)
-        return unless icon_path
-
-        attributes = { class: classes.join(" ") }.merge(options)
-        asset = File.read(icon_path)
-        asset.gsub("<svg ", "<svg#{tag_builder.tag_options(attributes)} ").html_safe
-      else
-        image_pack_tag(path, class: classes.join(" "), style: "display: none")
-      end
-    end
-
-    def application_path(path)
-      # Force the path to be returned without the protocol and host even when a
-      # custom asset host has been defined. The host parameter needs to be a
-      # non-nil because otherwise it will be set to the asset host at
-      # ActionView::Helpers::AssetUrlHelper#compute_asset_host.
-      img_path = asset_pack_path(path, host: "", protocol: :relative)
-      path = Rails.public_path.join(img_path.sub(%r{^/}, ""))
-      return unless File.exist?(path)
-
-      path
-    rescue ::Webpacker::Manifest::MissingEntryError
-      nil
-    end
-
-    # Allows to create role attribute according to accessibility rules
-    #
-    # Returns role attribute string if role option is specified
-    def role(options = {})
-      "role=\"#{options[:role]}\" " if options[:role]
-    end
-
-    def _icon_classes(options = {})
-      classes = options[:remove_icon_class] ? [] : ["icon"]
-      classes += [options[:class]]
-      classes.compact
-    end
-
-    def extended_navigation_bar(items, max_items: 5)
-      return unless items.any?
-
-      extra_items = items.slice((max_items + 1)..-1) || []
-      active_item = items.find { |item| item[:active] }
-
-      controller.view_context.render partial: "decidim/shared/extended_navigation_bar", locals: {
-        items:,
-        extra_items:,
-        active_item:,
-        max_items:
-      }
-    end
-
-    # Renders a view with the customizable CSS variables in two flavours:
-    # 1. as a hexadecimal valid CSS color (ie: #ff0000)
-    # 2. as a disassembled RGB components (ie: 255 0 0)
-    #
-    # Example:
-    #
-    # --primary: #ff0000;
-    # --primary-rgb: 255,0,0
-    #
-    # Hexadecimal variables can be used as a normal CSS color:
-    #
-    # color: var(--primary)
-    #
-    # While the disassembled variant can be used where you need to manipulate
-    # the color somehow (ie: adding a background transparency):
-    #
-    # background-color: rgba(var(--primary-rgb), 0.5)
-    def organization_colors
-      css = current_organization.colors.each.map { |k, v| "--#{k}: #{v};--#{k}-rgb: #{v[1..2].hex} #{v[3..4].hex} #{v[5..6].hex};" }.join
-      render partial: "layouts/decidim/organization_colors", locals: { css: }
-    end
-
-<<<<<<< HEAD
-    def current_user_unread_data
-      return {} if current_user.blank?
-
-      {}.tap do |d|
-        d.merge!(unread_notifications: true) if current_user.notifications.any?
-        d.merge!(unread_conversations: true) if current_user.unread_conversations.any?
-        d.merge!(unread_items: d.present?)
-      end
-    end
-
-||||||| parent of 53b6893e5c (Use local emojibase data instead of CDN)
-=======
-    # Public: Gets the name of the webpacker entrypoint that will be used
-    # for the locale of the Emojibase NPM package, used with @picmo/popup-picker
-    #
-    # Returns a string with the entrypoint name
-    def emojibase_entrypoint_locale
-      entrypoint = Decidim::Webpacker.configuration.entrypoints.keys.select do |entry|
-        entry == "decidim_emojibase_#{I18n.locale}"
-      end
-
-      return "decidim_emojibase_en" if entrypoint.empty?
-
-      entrypoint.first
-    end
-
->>>>>>> 53b6893e5c (Use local emojibase data instead of CDN)
-    private
-
-    def tag_builder
-      @tag_builder ||= ActionView::Helpers::TagHelper::TagBuilder.new(self)
-    end
-  end
-end

data/app/packs/src/decidim/editor/clipboard_override.js

@@ -1,147 +0,0 @@
-/* eslint max-lines: ["error", 350] */
-
-/**
- * Quill clipboard utilities
- *
- * Copyright (c) 2017, Slab
- * Copyright (c) 2014, Jason Chen
- * Copyright (c) 2013, salesforce.com
- * BSD 3-Clause "New" or "Revised" License
- *
- * Extends the original version from https://github.com/quilljs/quill
- * Relevant parts converted from TypeScript to JavaScript
- */
-
-import CodeBlock from "quill/formats/code";
-import { matchNewline, matchBreak, deltaEndsWith, traverse } from "src/decidim/editor/clipboard_utilities";
-
-const Delta = Quill.import("delta");
-const Clipboard = Quill.import("modules/clipboard");
-
-/**
- * Pasting bold text is broken in Quill as described at:
- * https://github.com/quilljs/quill/issues/306
- *
- * The reason is that the `<strong>` nodes are not recognized as bold types.
- * This override fixes the issue by introducing parts of the newer Quill code
- * at GitHub and defining the `<strong>` tags as bold tags.
- */
-export default class ClipboardOverride extends Clipboard {
-  constructor(quill, options) {
-    super(quill, options);
-    this.overrideMatcher("b", "b, strong");
-    this.overrideMatcher("br", "br", matchBreak);
-
-    // Change the matchNewLine matchers to the newer version
-    this.matchers[1][1] = matchNewline;
-    this.matchers[3][1] = matchNewline;
-
-    // Remove `matchSpacing` as that is also removed in the newer versions.
-    this.removeMatcher(Node.ELEMENT_NODE, "matchSpacing");
-  }
-
-  overrideMatcher(originalSelector, newSelector, newMatcher = null) {
-    const idx = this.matchers.findIndex((item) => item[0] === originalSelector);
-    if (idx >= 0) {
-      this.matchers[idx][0] = newSelector;
-      if (newMatcher) {
-        this.matchers[idx][1] = newMatcher;
-      }
-    }
-  }
-
-  removeMatcher(selector, matcherName) {
-    const idx = this.matchers.findIndex((item) => item[0] === selector && item[1].name === matcherName);
-    if (idx >= 0) {
-      this.matchers.splice(idx, 1);
-    }
-  }
-
-  onPaste(ev) {
-    if (ev.defaultPrevented || !this.quill.isEnabled()) {
-      return;
-    }
-    ev.preventDefault();
-    const range = this.quill.getSelection(true);
-    if (range === null) {
-      return;
-    }
-    const html = ev.clipboardData.getData("text/html");
-    const text = ev.clipboardData.getData("text/plain");
-    const files = Array.from(ev.clipboardData.files || []);
-    if (!html && files.length > 0) {
-      if (typeof this.quill.uploader !== "undefined") {
-        this.quill.uploader.upload(range, files);
-      }
-      return;
-    }
-    if (html && files.length > 0) {
-      const doc = new DOMParser().parseFromString(html, "text/html");
-      if (
-        doc.body.childElementCount === 1 &&
-        doc.body.firstElementChild.tagName === "IMG"
-      ) {
-        if (typeof this.quill.uploader !== "undefined") {
-          this.quill.uploader.upload(range, files);
-        }
-        return;
-      }
-    }
-    this.onPasteRange(range, { html, text });
-  }
-
-  onPasteRange(range, { text, html }) {
-    const formats = this.quill.getFormat(range.index);
-    const pastedDelta = this.convertPaste({ text, html }, formats);
-    // debug.log('onPaste", pastedDelta, { text, html });
-    const delta = new Delta().retain(range.index).delete(range.length).concat(pastedDelta);
-    this.quill.updateContents(delta, Quill.sources.USER);
-    // range.length contributes to delta.length()
-    this.quill.setSelection(
-      delta.length() - range.length,
-      Quill.sources.SILENT,
-    );
-    this.quill.scrollIntoView();
-  }
-
-  convertPaste({ html, text }, formats = {}) {
-    if (formats[CodeBlock.blotName]) {
-      return new Delta().insert(text, {
-        [CodeBlock.blotName]: formats[CodeBlock.blotName]
-      });
-    }
-    if (!html) {
-      return new Delta().insert(text || "");
-    }
-    const delta = this.convertPasteHTML(html);
-    // Remove trailing newline
-    if (
-      deltaEndsWith(delta, "\n") &&
-      (delta.ops[delta.ops.length - 1].attributes === null || formats.table)
-    ) {
-      return delta.compose(new Delta().retain(delta.length() - 1).delete(1));
-    }
-    return delta;
-  }
-
-  convertPasteHTML(html) {
-    const doc = new DOMParser().parseFromString(html, "text/html");
-    const container = doc.body;
-    const nodeMatches = new WeakMap();
-    const [elementMatchers, textMatchers] = this.prepareMatching(
-      container,
-      nodeMatches
-    );
-    return traverse(
-      this.quill.scroll,
-      container,
-      elementMatchers,
-      textMatchers,
-      nodeMatches
-    );
-  }
-}
-
-// Disable warning messages from overwritting modules
-Quill.debug("error");
-Quill.register({"modules/clipboard": ClipboardOverride}, true);

data/app/packs/src/decidim/editor/clipboard_utilities.js

@@ -1,119 +0,0 @@
-import { BlockEmbed } from "quill/blots/block";
-
-const Delta = Quill.import("delta");
-const Parchment = Quill.import("parchment");
-
-// Newer version used only for the pasting, not compatible with the version of
-// Quill in use.
-const traverse = (scroll, node, elementMatchers, textMatchers, nodeMatches) => { // eslint-disable-line max-params
-  // Post-order
-  if (node.nodeType === node.TEXT_NODE) {
-    return textMatchers.reduce((delta, matcher) => {
-      return matcher(node, delta, scroll);
-    }, new Delta());
-  }
-  if (node.nodeType === node.ELEMENT_NODE) {
-    return Array.from(node.childNodes || []).reduce((delta, childNode) => {
-      let childrenDelta = traverse(
-        scroll,
-        childNode,
-        elementMatchers,
-        textMatchers,
-        nodeMatches,
-      );
-      if (childNode.nodeType === node.ELEMENT_NODE) {
-        childrenDelta = elementMatchers.reduce((reducedDelta, matcher) => {
-          return matcher(childNode, reducedDelta, scroll);
-        }, childrenDelta);
-        childrenDelta = (nodeMatches.get(childNode) || []).reduce(
-          (reducedDelta, matcher) => {
-            return matcher(childNode, reducedDelta, scroll);
-          },
-          childrenDelta,
-        );
-      }
-      return delta.concat(childrenDelta);
-    }, new Delta());
-  }
-  return new Delta();
-}
-
-const deltaEndsWith = (delta, text) => {
-  let endText = "";
-  for (let idx = delta.ops.length - 1; idx >= 0 && endText.length < text.length; idx -= 1) {
-    const op = delta.ops[idx];
-    if (typeof op.insert !== "string") {
-      break;
-    }
-    endText = op.insert + endText;
-  }
-  return endText.slice(-1 * text.length) === text;
-}
-
-const isLine = (node) => {
-  if (node.childNodes.length === 0) {
-    // Exclude embed blocks
-    return false;
-  }
-  return [
-    "address", "article", "blockquote", "canvas", "dd", "div", "dl", "dt",
-    "fieldset", "figcaption", "figure", "footer", "form", "h1", "h2", "h3",
-    "h4", "h5", "h6", "header", "iframe", "li", "main", "nav", "ol", "output",
-    "p", "pre", "section", "table", "td", "tr", "ul", "video"
-  ].includes(node.tagName.toLowerCase());
-}
-
-const matchNewLineScroll = (nextSibling, delta, scroll) => {
-  if (!scroll) {
-    return null;
-  }
-
-  const match = Parchment.query(nextSibling)
-  if (match && match.prototype instanceof BlockEmbed) {
-    return delta.insert("\n");
-  }
-  return null;
-}
-
-const matchNewline = (node, delta, scroll) => {
-  if (!deltaEndsWith(delta, "\n")) {
-    // When scroll is defined, it was initiated from the paste event. Otherwise
-    // it is a normal Quill initiated traversal which handles adding the line
-    // breaks already.
-    if (scroll && node.nodeType === node.ELEMENT_NODE && node.tagName === "BR") {
-      return delta.insert({"break": ""});
-    }
-    if (isLine(node)) {
-      return delta.insert("\n");
-    }
-    if (delta.length() > 0 && node.nextSibling) {
-      let { nextSibling } = node;
-      while (nextSibling !== null) {
-        if (isLine(nextSibling)) {
-          return delta.insert("\n");
-        }
-        const scrollMatch = matchNewLineScroll(nextSibling, delta, scroll);
-        if (scrollMatch) {
-          return scrollMatch;
-        }
-        nextSibling = nextSibling.firstChild;
-      }
-    }
-  }
-  return delta;
-}
-
-const matchBreak = (node, delta) => {
-  if (!deltaEndsWith(delta, "\n")) {
-    delta.insert({"break": ""});
-  }
-  return delta;
-}
-
-export {
-  traverse,
-  deltaEndsWith,
-  isLine,
-  matchNewline,
-  matchBreak
-}

data/app/packs/src/decidim/vizzs/renders.js

@@ -1,9 +0,0 @@
-/* eslint-disable require-jsdoc */
-// renderChart receives a chart function as argument and renders it
-// Also captures change.zf.tabs event and re-renders the chart
-export default function renderChart(chart) {
-  chart()
-  $(document).on("change.zf.tabs", () => {
-    chart()
-  });
-}

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

@@ -1 +0,0 @@
-import "src/decidim/vizzs/metrics"

data/app/packs/stylesheets/decidim/modules/_cookie-bar.scss

@@ -1,26 +0,0 @@
-.cookie-warning{
-  background: $medium-gray;
-  padding: .5em 1em;
-  text-align: center;
-
-  a{
-    color: darken($anchor-color, 10%);
-  }
-}
-
-.cookie-warning__action{
-  text-align: center;
-
-  .button{
-    margin: .5em 0;
-  }
-
-  @include breakpoint(mediumlarge){
-    vertical-align: baseline;
-    display: inline-block;
-
-    .button{
-      margin: 0 0 0 1em;
-    }
-  }
-}

data/app/packs/stylesheets/decidim/modules/_dropdown_menu.scss

@@ -1,9 +0,0 @@
-.dropdown.menu > li {
-  &.is-active > a {
-    color: var(--secondary);
-  }
-
-  &.is-dropdown-submenu-parent > a::after {
-    border-color: var(--secondary) transparent transparent;
-  }
-}

data/app/scrubbers/decidim/admin_input_scrubber.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # Use this class as a scrubber to sanitize admin user input. The default
-  # scrubbed provided by Rails does not allow `iframe`s, and we are using
-  # them to embed videos, so we need to provide a whole new scrubber.
-  #
-  # Example:
-  #
-  #    sanitize(@page.body, scrubber: Decidim::AdminInputScrubber.new)
-  #
-  # Lists of default tags and attributes are extracted from
-  # https://stackoverflow.com/a/35073814/2110884.
-  class AdminInputScrubber < UserInputScrubber
-    private
-
-    DECIDIM_ALLOWED_TAGS = %w(img video audio source comment iframe).freeze
-
-    def custom_allowed_attributes
-      super + %w(frameborder allowfullscreen) - %w(onerror)
-    end
-
-    def custom_allowed_tags
-      super + DECIDIM_ALLOWED_TAGS
-    end
-  end
-end

data/app/services/decidim/home_activity_search.rb

@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # A class to search for recent activity performed in a Decidim Organization.
-  # It will only return the `Decidim::ActionLog` rows that have an action as
-  # `created` or `published`.
-  #
-  # This class is thought to be used in the `LastActivityCell` uniquely.
-  class HomeActivitySearch < Searchlight::Search
-    # Needed by Searchlight, this is the base query that will be used to
-    # append other criteria to the search.
-    def base_query
-      ActionLog
-        .where(visibility: %w(public-only all))
-        .where(organization: options.fetch(:organization))
-    end
-
-    # Overwrites the default Searchlight run method since we want to return
-    # activities in an specific order but we need to set it at the end of the chain.
-    def run
-      super.order(created_at: :desc)
-    end
-
-    # Adds a constrain to filter by resource type(s).
-    def search_resource_type
-      if resource_types.include?(resource_type)
-        scope_for(resource_type)
-      else
-        all_resources_scope
-      end
-    end
-
-    # All the resource types that are eligible to be included as an activity.
-    def resource_types
-      @resource_types ||= %w(
-        Decidim::Accountability::Result
-        Decidim::Blogs::Post
-        Decidim::Comments::Comment
-        Decidim::Consultations::Question
-        Decidim::Debates::Debate
-        Decidim::Meetings::Meeting
-        Decidim::Proposals::Proposal
-        Decidim::Surveys::Survey
-        Decidim::Assembly
-        Decidim::Consultation
-        Decidim::Initiative
-        Decidim::ParticipatoryProcess
-      ).select do |klass|
-        klass.safe_constantize.present?
-      end
-    end
-
-    private
-
-    def publicable_resource_types
-      @publicable_resource_types ||= resource_types.select { |klass| klass.constantize.column_names.include?("published_at") }
-    end
-
-    def scope_for(resource_type)
-      action = if publicable_resource_types.include?(resource_type)
-                 "publish"
-               else
-                 "create"
-               end
-
-      query.where(resource_type: resource_type, action: action)
-    end
-
-    def all_resources_scope
-      query
-        .where(
-          "(action = ? AND resource_type IN (?)) OR (action = ? AND resource_type IN (?))",
-          "publish",
-          publicable_resource_types,
-          "create",
-          (resource_types - publicable_resource_types)
-        )
-    end
-  end
-end