decidim-core 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3954eab5e8c5ee4b45ae1e256719d74d26ac2a1aa259a22a9561ec7c6d5a5c96
-  data.tar.gz: caa3bba2c9079440cd0981ebdd914d6a799398cebe6d055c7fb45ff0a43989a2
+  metadata.gz: bd45e8b19642518cb5cdc256a688f47b2befb549b73c3edf9445120aca24e3ff
+  data.tar.gz: 883849819fefaf6d0b74d0b33d22698c9c87ec596bfd64a1dcc5a7237b4df914
 SHA512:
-  metadata.gz: 51cfa35708bdb0ae9a945920c9179a13cc36ce3e763af13910d6f435e1723aea1aa172e8befc79bbe7ad65686369a2cb43ba9a74acb70fae8de6e756db4f0870
-  data.tar.gz: 1767af1ec45afb37861d7e15e94710ade93f7e1b99b24ad330dc59f0d21c5949559cbf1fbb0c8a2b3f9a4d2b8f23051ae757712f57b71c1449de9676a71e0580
+  metadata.gz: d19e5e70f36cd10e18b26bfde95d1feab778c9b100c5ba79a3fdb35c3259e6868c51b51a91746c3cec8199d6fa66659729fb8887947430c5b0a9434692c4fa72
+  data.tar.gz: 5e2cf574f4b32a3e83fb0b92c616dba9b14bd96462f06dbcca3a3a0e5b57aa98c422b98e98d9c887af9692ad420ad2addee87a8d714c55808069312651b8c927

data/README.md

@@ -20,6 +20,10 @@ And then execute:
 bundle
 ```
 
+## Users
+
+User authentication is set up with [`Devise`](https://github.com/plataformatec/devise) with its modules, see the [`Decidim::User`](https://github.com/decidim/decidim/blob/master/decidim-core/app/models/decidim/user.rb) model configuration and its setup [initializer](https://github.com/decidim/decidim/blob/master/decidim-core/config/initializers/devise.rb).
+
 ## Amendments
 
 Core implements an Amendment feature that can be activated in the components. As of now, it's only implemented in the proposal component.
@@ -47,8 +51,23 @@ This module also includes the following models to Decidim's Global Search:
 - `Searchable` module: A concern with the features needed when you want a model to be searchable.
 - `SearchableResource` class: The ActiveRecord that finally includes PgSearch and maps the indexed documents into a model.
 
+### Adding an artifact to Global Search
+
 Models that want to be indexed must include `Searchable` and declare `Searchable.searchable_fields`.
 
+They should be registered as resources. In their manifest, in the `register_resource` section, the artifact should be declared searchable.
+This can be done in an initializer (like user does), in a participatory_space manifest, or in a component manifest. i.e.:
+
+```ruby
+      initializer "decidim.core.register_resources" do
+        Decidim.register_resource(:user) do |resource|
+          resource.model_class_name = "Decidim::User"
+          resource.card = "decidim/user_profile"
+          resource.searchable = true
+        end
+        ...
+```
+
 ## Metrics docs
 
 Core adds an implementation to show APP metrics within some pages. You can see specific documentation at [Metrics](https://github.com/decidim/decidim/tree/master/docs/advanced/metrics.md)

data/app/assets/javascripts/decidim.js.es6

@@ -1,5 +1,5 @@
 // = require decidim/core/bundle.js
-// = require jquery
+// = require jquery3
 // = require rails-ujs
 // = require decidim/foundation
 // = require modernizr
@@ -18,6 +18,7 @@
 // = require decidim/editor
 // = require decidim/input_tags
 // = require decidim/input_hashtags
+// = require decidim/input_mentions
 // = require decidim/ajax_modals
 // = require decidim/conferences
 // = require decidim/tooltip_keep_on_hover

data/app/assets/javascripts/decidim/input_hashtags.js.es6

@@ -25,7 +25,7 @@ $(() => {
 
   /* eslint no-use-before-define: ["error", { "variables": false }]*/
   let remoteSearch = function(text, cb) {
-    $.post("/api", {query: `{hashtags(name:${text}) {name}}`}).
+    $.post("/api", {query: `{hashtags(name:"${text}") {name}}`}).
 
       then((response) => {
         let data = response.data.hashtags || {};

data/app/assets/javascripts/decidim/input_mentions.js.es6

@@ -3,46 +3,73 @@
 $(() => {
   const $mentionContainer = $(".js-mentions");
   const nodatafound = $mentionContainer.attr("data-noresults");
-  const sources = [];
 
-  // EXAMPLE DATA
-  // tag & name properties are mandatory
-  //
-  // const sources = [{
-  //     "tag": "barrera",
-  //     "name": "Collins Franklin",
-  //   },
-  //   {
-  //     "tag": "woods",
-  //     "name": "Nadine Buck",
-  //   }]
+  let noMatchTemplate = null
+  if (nodatafound) {
+    noMatchTemplate = () => `<li>${nodatafound}</li>`;
+  }
 
   // Listener for the event triggered by quilljs
   let cursor = "";
-  $mentionContainer.on("quill-position", function(event) {
-    cursor = event.detail.index;
+  $mentionContainer.on("quill-position", (event) => {
+    if (event.detail !== null) {
+      // When replacing the text content after selecting a hashtag, we only need
+      // to know the hashtag's start position as that is the point which we want
+      // to replace.
+      let quill = event.target.__quill;
+      if (quill.getText(event.detail.index - 1, 1) === "@") {
+        cursor = event.detail.index;
+      }
+    }
   });
 
+  /* eslint no-use-before-define: ["error", { "variables": false }]*/
+  let remoteSearch = function(text, cb) {
+    $.post("/api", {query: `{users(wildcard:"${text}") {nickname,name}}`}).
+
+      then((response) => {
+        let data = response.data.users || {};
+        cb(data)
+      }).fail(function() {
+        cb([])
+      }).always(() => {
+      // This function runs Tribute every single time you type something
+      // So we must evalute DOM properties after each
+        const $parent = $(tribute.current.element).parent();
+        $parent.addClass("is-active");
+
+        // We need to move the container to the wrapper selected
+        const $tribute = $parent.find(".tribute-container");
+        // Remove the inline styles, relative to absolute positioning
+        $tribute.removeAttr("style");
+      })
+  };
+
   // tribute.js docs - http://github.com/zurb/tribute
   /* global Tribute*/
   let tribute = new Tribute({
-    values: sources,
-    positionMenu: false,
+    trigger: "@",
+    values: function (text, cb) {
+      remoteSearch(text, (users) => cb(users));
+    },
+    positionMenu: true,
     menuContainer: null,
-    fillAttr: "tag",
-    noMatchTemplate: () => `<li>${nodatafound}</li>`,
-    lookup: (item) => item.tag + item.name,
+    menuItemLimit: 5,
+    fillAttr: "nickname",
+    noMatchTemplate: noMatchTemplate,
+    lookup: (item) => item.nickname + item.name,
     selectTemplate: function(item) {
       if (typeof item === "undefined") {
         return null;
       }
       if (this.range.isContentEditable(this.current.element)) {
         // Check quill.js
-        if ($(this.current.element).hasClass("editor-container")) {
-          let quill = this.current.element.__quill;
-          quill.insertText(cursor - 1, `@${item.original.tag} `, Quill.sources.API);
+        if ($(this.current.element).hasClass("ql-editor")) {
+          let editorContainer = $(this.current.element).parent().get(0);
+          let quill = editorContainer.__quill;
+          quill.insertText(cursor - 1, `${item.original.nickname} `, Quill.sources.API);
           // cursor position + nickname length + "@" sign + space
-          let position = cursor + item.original.tag.length + 2;
+          let position = cursor + item.original.nickname.length + 2
 
           let next = 0;
           if (quill.getLength() > position) {
@@ -57,43 +84,78 @@ $(() => {
 
           return ""
         }
-        return `<span contenteditable="false">@${item.original.tag}</span>`;
+        return `<span contenteditable="false">${item.original.nickname}</span>`;
       }
-      return `@${item.original.tag}`;
+      return item.original.nickname;
     },
     menuItemTemplate: function(item) {
-      let tpl = `<strong>${item.original.tag}</strong>&nbsp;<small>${item.original.name}</small>`;
+      let tpl = `<strong>${item.original.nickname}</strong>&nbsp;<small>${item.original.name}</small>`;
       return tpl;
     }
   });
 
-  tribute.attach($mentionContainer);
+  let setupEvents = function($element) {
+    // DOM manipulation
+    $element.on("focusin", (event) => {
+      // Set the parent container relative to the current element
+      tribute.menuContainer = event.target.parentNode;
+    });
+    $element.on("focusout", (event) => {
+      let $parent = $(event.target).parent();
 
-  // DOM manipulation
-  $mentionContainer.on("focusin", (event) => {
-    // Set the parent container relative to the current element
-    tribute.menuContainer = event.target.parentNode;
-  });
-  $mentionContainer.on("focusout", (event) => {
-    let $parent = $(event.target).parent();
+      if ($parent.hasClass("is-active")) {
+        $parent.removeClass("is-active");
+      }
+    });
+    $element.on("input", (event) => {
+      let $parent = $(event.target).parent();
 
-    if ($parent.hasClass("is-active")) {
-      $parent.removeClass("is-active");
+      if (tribute.isActive) {
+        // We need to move the container to the wrapper selected
+        let $tribute = $(".tribute-container");
+        $tribute.appendTo($parent);
+        // // Remove the inline styles, relative to absolute positioning
+        $tribute.removeAttr("style");
+        // Parent adaptation
+        $parent.addClass("is-active");
+      } else {
+        $parent.removeClass("is-active");
+      }
+    });
+
+  };
+
+  setupEvents($mentionContainer);
+
+  // This allows external libraries (like React) to use the component
+  // by simply firing and event targeting the element where to attach Tribute
+  $(document).on("attach-mentions-element", (event, element) => {
+    if (!element) {
+      return;
     }
-  });
-  $mentionContainer.on("input", (event) => {
-    let $parent = $(event.target).parent();
-
-    if (tribute.isActive) {
-      // We need to move the container to the wrapper selected
-      let $tribute = $(".tribute-container");
-      $tribute.appendTo($parent);
-      // Remove the inline styles, relative to absolute positioning
-      $tribute.removeAttr("style");
-      // Parent adaptation
-      $parent.addClass("is-active");
-    } else {
-      $parent.removeClass("is-active");
+    tribute.attach(element);
+    // Due a bug in Tribute, re-add menu to DOM if it has been removed
+    // See https://github.com/zurb/tribute/issues/140
+    if (tribute.menu && !document.body.contains(tribute.menu)) {
+      tribute.range.getDocument().body.appendChild(tribute.menu);
     }
+    setupEvents($(element));
   });
+
+  // tribute.attach($mentionContainer);
+  // Tribute needs to be attached to the `.ql-editor` element as said at:
+  // https://github.com/quilljs/quill/issues/1816
+  //
+  // For this reason we need to wait a bit for quill to initialize itself.
+  setTimeout(function() {
+    $mentionContainer.each((index, item) => {
+      let $qlEditor = $(".ql-editor", item);
+      if ($qlEditor.length > 0) {
+        tribute.attach($qlEditor);
+      } else {
+        tribute.attach(item);
+      }
+    });
+  }, 1000);
 });
+

data/app/assets/stylesheets/decidim/modules/_signup.scss

@@ -58,3 +58,60 @@
     text-align: center;
   }
 }
+
+.user-nickname{
+  label .row{
+    div:first-of-type{
+      // this is the prefix div
+      @extend .input-group-label;
+
+      border-#{$global-right}: 0;
+      width: 8%;
+      height: 3rem;
+      border-top-left-radius: $input-radius;
+      border-bottom-left-radius: $input-radius;
+
+      .prefix{
+        display: inline-block;
+        height: 2.9rem;
+        padding-top: .8rem;
+      }
+    }
+
+    div:last-of-type{
+      // this is the input div
+      @extend .input-group-field;
+
+      width: 92%;
+      height: 3rem;
+
+      input{
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+      }
+    }
+  }
+
+  label.is-invalid-label .row{
+    margin-bottom: $form-spacing;
+
+    div:first-of-type{
+      // this is the prefix div
+      background-color: mix($input-background-invalid, $light-gray, 8%);
+      border-color: $input-error-color;
+    }
+
+    div:last-of-type{
+      // this is the input div
+      height: 4.2rem;
+
+      .form-error.is-visible{
+        margin-left: -8%;
+      }
+    }
+  }
+
+  .help-text{
+    margin-top: 1rem;
+  }
+}

data/app/cells/decidim/coauthorships_cell.rb

@@ -53,12 +53,8 @@ module Decidim
     def presenter_for_author(authorable)
       if official?
         "#{model.class.parent}::OfficialAuthorPresenter".constantize.new
-      elsif authorable.user_group
-        Decidim::UserGroupPresenter.new(authorable.user_group)
-      elsif authorable.author.is_a?(Decidim::User)
-        Decidim::UserPresenter.new(authorable.author)
-      elsif authorable.author.is_a?(Decidim::Meeting)
-        Decidim::MeetingPresenter.new(authorable.author)
+      else
+        authorable.user_group&.presenter || authorable.author.presenter
       end
     end
 

data/app/cells/decidim/diff_cell.rb

@@ -51,11 +51,9 @@ module Decidim
     #
     # Returns an HTML-safe string.
     def output_unified_diff(data)
-      return unless data && data[:new_value].present?
-
       Diffy::Diff.new(
         data[:old_value].to_s,
-        data[:new_value],
+        data[:new_value].to_s,
         allow_empty_diff: false,
         include_plus_and_minus_in_html: true
       ).to_s(:html).html_safe
@@ -67,11 +65,9 @@ module Decidim
     #
     # Returns an HTML-safe string.
     def output_split_diff(data, direction)
-      return unless direction && data && data[:new_value].present?
-
       Diffy::SplitDiff.new(
-        data[:old_value],
-        data[:new_value],
+        data[:old_value].to_s,
+        data[:new_value].to_s,
         allow_empty_diff: false,
         format: :html,
         include_plus_and_minus_in_html: true

data/app/controllers/decidim/application_controller.rb

@@ -42,8 +42,6 @@ module Decidim
 
     skip_before_action :disable_http_caching, unless: :user_signed_in?
 
-    before_action :track_continuity_badge
-
     private
 
     # Stores the url where the user will be redirected after login.
@@ -90,11 +88,5 @@ module Decidim
     def add_vary_header
       response.headers["Vary"] = "Accept"
     end
-
-    def track_continuity_badge
-      return unless current_user
-
-      Decidim::ContinuityBadgeTracker.new(current_user).track!(Time.zone.today)
-    end
   end
 end

data/app/controllers/decidim/devise/unlocks_controller.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Devise
+    # Custom Devise UnlocksController to avoid namespace problems.
+    class UnlocksController < ::Devise::UnlocksController
+      include Decidim::DeviseControllers
+
+      private
+
+      # Since we're using a single Devise installation for multiple
+      # organizations, and user emails can be repeated across organizations,
+      # we need to identify the user by both the email and the organization.
+      # Setting the organization ID here will be used by Devise internally to
+      # find the correct user.
+      #
+      # Note that in order for this to work we need to define the `reset_password_keys`
+      # Devise attribute in the `Decidim::User` model to include the
+      # `decidim_organization_id` attribute.
+      def resource_params
+        super.merge(decidim_organization_id: current_organization.id)
+      end
+    end
+  end
+end

data/app/controllers/decidim/searches_controller.rb

@@ -13,7 +13,6 @@ module Decidim
     def index
       Search.call(term, current_organization, filters, page_params) do
         on(:ok) do |results|
-          # results.page(params[:page]).per(params[:per_page])
           results_count = results.sum { |results_by_type| results_by_type.last[:count] }
           expose(sections: results, results_count: results_count)
         end

data/app/jobs/decidim/export_participatory_space_job.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ExportParticipatorySpaceJob < ApplicationJob
+    queue_as :default
+
+    def perform(user, participatory_space, name, format)
+      export_manifest = participatory_space.manifest.export_manifests.find do |manifest|
+        manifest.name == name.to_sym
+      end
+
+      collection = export_manifest.collection.call(participatory_space)
+      serializer = export_manifest.serializer
+
+      export_data = Decidim::Exporters.find_exporter(format).new(collection, serializer).export
+
+      Decidim::ExportMailer.export(user, name, export_data).deliver_now
+    end
+  end
+end