decidim-decidim_awesome 0.10.2 → 0.10.3

data/app/models/concerns/decidim/decidim_awesome/has_proposal_extra_fields.rb

@@ -6,10 +6,31 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        has_one :extra_fields, foreign_key: "decidim_proposal_id", class_name: "Decidim::DecidimAwesome::ProposalExtraField", dependent: :destroy
+        has_one :extra_fields, as: :proposal, foreign_key: "decidim_proposal_id", foreign_type: "decidim_proposal_type", class_name: "Decidim::DecidimAwesome::ProposalExtraField",
+                               dependent: :destroy
+
+        after_save do |proposal|
+          if proposal.extra_fields && proposal.extra_fields.changed?
+            proposal.extra_fields.save
+            proposal.update_vote_weights
+            proposal.reload
+          end
+        end
+
+        delegate :private_body=, to: :safe_extra_fields
+
+        def private_body
+          extra_fields.private_body if extra_fields
+        end
+
+        def update_private_body!(private_body)
+          safe_extra_fields.private_body = private_body
+          safe_extra_fields.save!
+          self.extra_fields = safe_extra_fields
+        end
 
         def weight_count(weight)
-          (extra_fields && extra_fields.vote_weight_totals[weight.to_s]) || 0
+          safe_extra_fields.vote_weight_totals[weight.to_s] || 0
         end
 
         def vote_weights
@@ -24,19 +45,27 @@ module Decidim
           @all_vote_weights ||= self.class.all_vote_weights_for(component)
         end
 
-        def update_vote_weights!
-          extra_fields ||= Decidim::DecidimAwesome::ProposalExtraField.find_or_initialize_by(proposal: self)
-          extra_fields.vote_weight_totals = {}
+        def update_vote_weights
+          votes = Decidim::Proposals::ProposalVote.where(proposal: self)
+          safe_extra_fields.vote_weight_totals = {}
           votes.each do |vote|
-            extra_fields.vote_weight_totals[vote.weight] ||= 0
-            extra_fields.vote_weight_totals[vote.weight] += 1
+            safe_extra_fields.vote_weight_totals[vote.weight] ||= 0
+            safe_extra_fields.vote_weight_totals[vote.weight] += 1
           end
-          extra_fields.save!
-          self.extra_fields = extra_fields
           @vote_weights = nil
           @all_vote_weights = nil
         end
 
+        def update_vote_weights!
+          update_vote_weights
+          safe_extra_fields.save!
+          self.extra_fields = safe_extra_fields
+        end
+
+        def safe_extra_fields
+          @safe_extra_fields ||= (persisted? && reload.extra_fields) || build_extra_fields(vote_weight_totals: {})
+        end
+
         # collects all different weights stored along the different proposals in a different component
         def self.all_vote_weights_for(component)
           Decidim::DecidimAwesome::VoteWeight.where(

data/app/models/decidim/decidim_awesome/paper_trail_version.rb

@@ -9,6 +9,10 @@ module Decidim
         DecidimAwesome.participatory_space_roles.filter(&:safe_constantize)
       end
 
+      def self.safe_admin_role_type(admin_role)
+        Decidim.user_roles.find { |role| role == admin_role }
+      end
+
       scope :space_role_actions, lambda { |organization|
         role_changes = where(item_type: PaperTrailVersion.safe_user_roles, event: "create")
         user_ids_from_object_changes = role_changes.pluck(:object_changes).map { |change| change.match(/decidim_user_id:\n- ?\n- (\d+)/)[1].to_i }
@@ -33,7 +37,7 @@ module Decidim
         when "admin"
           base.where("object_changes LIKE '%\nadmin:\n- false\n- true%'")
         else
-          base.where(Arel.sql("object_changes LIKE '%\nroles:\n- []\n- - #{filter}\n%'"))
+          base.where("object_changes LIKE ?", "%\nroles:\n- []\n- - #{filter}\n%")
         end
       end
 

data/app/models/decidim/decidim_awesome/proposal_extra_field.rb

@@ -2,10 +2,44 @@
 
 module Decidim
   module DecidimAwesome
+    # This class adds some attributes to the proposal model in a different table
+    # in particular, it adds a private_body field that should be encrypted
+    # private_body is not translatable, nor is intended to be as it won't be shown to the public
     class ProposalExtraField < ApplicationRecord
+      include Decidim::RecordEncryptor
+
       self.table_name = "decidim_awesome_proposal_extra_fields"
 
-      belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal"
+      belongs_to :proposal, foreign_key: "decidim_proposal_id", foreign_type: "decidim_proposal_type", polymorphic: true
+
+      encrypt_attribute :private_body, type: :string
+
+      after_initialize :store_private_body
+      before_save :update_private_body_updated_at
+
+      # validate not more than one extra field can be associated to a proposal
+      # validates :proposal, uniqueness: true
+      validate :no_more_than_one_extra_field
+
+      private
+
+      def store_private_body
+        @initial_private_body = private_body
+      end
+
+      # using private_body_changed? does not sufice as the encrypted value is always updated on saving
+      def update_private_body_updated_at
+        if private_body != @initial_private_body
+          self.private_body_updated_at = Time.current
+          @initial_private_body = private_body
+        end
+      end
+
+      def no_more_than_one_extra_field
+        return unless ProposalExtraField.where(proposal: proposal).where.not(id: id).exists?
+
+        errors.add(:proposal, :invalid)
+      end
     end
   end
 end

data/app/overrides/decidim/proposals/admin/proposals/show/add_private_body.html.erb.deface

@@ -0,0 +1,7 @@
+<!-- replace "erb[loud]:contains('simple_format(present(proposal).body(strip_tags: true))')" -->
+
+<% if awesome_proposal_custom_fields.blank? %>
+  <%= simple_format(present(proposal).body(strip_tags: true)) %>
+<% else %>
+  <%= render_proposal_body(proposal) %>
+<% end %>

data/app/overrides/decidim/proposals/admin/proposals/show/replace_body.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_before "erb[silent]:contains('presented_endorsers = endorsers_presenters_for(proposal)')" -->
+
+<% unless awesome_proposal_private_custom_fields.blank? %>
+  <%= render partial: "decidim/decidim_awesome/admin/proposals/private_body", locals: { proposal: proposal } %>
+<% end %>

data/app/overrides/decidim/proposals/proposals/show/limit_amendments_modal.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- replace "erb[loud]:contains('amend_button_for @proposal')" -->
+
+<%= amend_button_for @proposal %>
+
+<%= render "decidim/decidim_awesome/amendments/modal" if @proposal.emendations.not_hidden.where(decidim_amendments: { state: :evaluating }).count.positive? && @proposal.amendable? %>

data/app/packs/entrypoints/decidim_decidim_awesome_map.scss

@@ -1 +1 @@
-@import "stylesheets/decidim/decidim_awesome/awesome_map/map"
+@import "stylesheets/decidim/decidim_awesome/awesome_map/map";

data/app/packs/src/decidim/decidim_awesome/admin/auto_edit.js

@@ -15,7 +15,7 @@ $(() => {
     const attribute = $target.data("var");
     const $hidden = $(`[name="config[${attribute}][${key}]"]`);
     const $multiple = $(`[name="config[${attribute}][${key}][]"]`);
-    const $container = $(`.${attribute}_container[data-key="${key}"]`);
+    const $container = $(`.js-box-container[data-key="${key}"]`);
     const $delete = $(".delete-box", $container);
 
     const rebuildLabel = (text, withScope) => {
@@ -34,12 +34,14 @@ $(() => {
     const rebuildHmtl = (result) => {
       rebuildLabel(result.key, result.scope);
       $constraints.replaceWith(result.html);
-      // update hidden input if exists
       $hidden.attr("name", `config[${attribute}][${result.key}]`);
       $multiple.attr("name", `config[${attribute}][${result.key}][]`);
       $container.data("key", result.key);
       $container.attr("data-key", result.key);
-      $delete.attr("href", $delete.attr("href").replace(`key=${key}`, `key=${result.key}`))
+      if ($delete.length > 0) {
+        $delete.attr("href", $delete.attr("href").replace(`key=${key}`, `key=${result.key}`));
+      }
+
       CustomFieldsBuilders.forEach((builder) => {
         if (builder.key === key) {
           builder.key = result.key;

data/app/packs/src/decidim/decidim_awesome/admin/constraints.js

@@ -7,7 +7,7 @@ $(() => {
   $(".decidim_awesome-form").on("click", ".constraints-editor .add-condition,.constraints-editor .edit-condition", (evt) => {
     evt.preventDefault();
     const $this = $(evt.target)
-    const url = $this.attr("href");
+    const url = $this.attr("href") || $this.data("constraints-url");
     const $callout = $this.closest(".constraints-editor").find(".callout");
     $callout.hide();
     $callout.removeClass("alert success");

data/app/packs/src/decidim/decidim_awesome/admin/custom_fields_builder.js

@@ -6,16 +6,18 @@ window.CustomFieldsBuilders = window.CustomFieldsBuilders || [];
 $(() => {
   $(".awesome-edit-config .proposal_custom_fields_editor").each((_idx, el) => {
     const key = $(el).closest(".proposal_custom_fields_container").data("key");
+    const configVar = $(el).closest(".proposal_custom_fields_container").data("var");
     // DOCS: https://formbuilder.online/docs
     window.CustomFieldsBuilders.push({
       el: el,
       key: key,
+      var: configVar,
       config: {
         i18n: {
           locale: "en-US",
           location: "https://cdn.jsdelivr.net/npm/formbuilder-languages@1.1.0/"
         },
-        formData: $(`input[name="config[proposal_custom_fields][${key}]"]`).val(),
+        formData: $(`input[name="config[${configVar}][${key}]"]`).val(),
         disableFields: ["button", "file"],
         disabledActionButtons: ["save", "data", "clear"],
         disabledAttrs: [
@@ -37,7 +39,7 @@ $(() => {
         ],
         disabledSubtypes: {
           // default color as it generate hashtags in decidim (TODO: fix hashtag generator with this)
-          text: ["color"], 
+          text: ["color"],
           // disable default wysiwyg editors as they present problems
           textarea: ["tinymce", "quill"]
         }
@@ -71,8 +73,7 @@ $(() => {
 
   $("form.awesome-edit-config").on("submit", () => {
     window.CustomFieldsBuilders.forEach((builder) => {
-      $(`input[name="config[proposal_custom_fields][${builder.key}]"]`).val(builder.instance.actions.getData("json"));
+      $(`input[name="config[${builder.var}][${builder.key}]"]`).val(builder.instance.actions.getData("json"));
     });
   });
 });
-

data/app/packs/src/decidim/decidim_awesome/amendments/show_modal_on_limits.js

@@ -0,0 +1,30 @@
+$(() => {
+  const $modal = $("#LimitAmendmentsModal");
+  if ($modal.length === 0 || $(".sign-out-link").length === 0) {
+    return;
+  }
+
+  const showModal = () => {
+    if ($modal.is(":visible")) {
+      return false;
+    }
+
+    if ($modal.data("limitAmendments")) {
+      return true;
+    }
+
+    return false;
+  };
+
+  $modal.find("a").on("click", () => {
+    $modal.foundation("close");
+  });
+
+  $(".card__amend-button").on("click", ".amend_button_card_cell", (evt) => {
+    if (showModal())  {
+      evt.preventDefault();
+      evt.stopPropagation();
+      $modal.foundation("open");
+    }
+  });
+});

data/app/packs/src/decidim/decidim_awesome/awesome_application.js

@@ -1,6 +1,7 @@
 import "src/decidim/decidim_awesome/proposals/images"
 import "src/decidim/decidim_awesome/forms/autosave"
 import "src/decidim/decidim_awesome/voting/voting_cards"
+import "src/decidim/decidim_awesome/amendments/show_modal_on_limits"
 import {destroyQuillEditor, createQuillEditor, createMarkdownEditor} from "src/decidim/decidim_awesome/editors/editor"
 
 $(() => {

data/app/packs/src/decidim/decidim_awesome/editors/editor.js

@@ -41,7 +41,7 @@ export function destroyQuillEditor(container) {
 export function createQuillEditor(container) {
   const toolbar = $(container).data("toolbar");
   const disabled = $(container).data("disabled");
-  const allowedEmptyContentSelector = "iframe";
+  const allowedEmptyContentSelector = "iframe,img";
 
   let quillToolbar = [
     ["bold", "italic", "underline", "linebreak"],
@@ -144,11 +144,6 @@ export function createQuillEditor(container) {
     });
     container.dispatchEvent(event);
 
-    if (text === "\n" || text === "\n\n") {
-      $input.val("");
-    } else {
-      $input.val(quill.root.innerHTML);
-    }
     if ((text === "\n" || text === "\n\n") && quill.root.querySelectorAll(allowedEmptyContentSelector).length === 0) {
       $input.val("");
     } else {

data/app/packs/src/decidim/decidim_awesome/editors/tabs_focus.js

@@ -2,21 +2,30 @@
  * When switching tabs in i18n fields, autofocus on the markdown if exists
  */
 $(() => {
-  // Event launched by foundation
+  const reloadCustomFields = ($input) => {
+    // saves current data to the hidden field for the lang
+    window.DecidimAwesome.CustomFieldsRenderer.storeData();
+    // init the current language
+    window.DecidimAwesome.CustomFieldsRenderer.init($input);
+  };
+
+  // Event launched by foundation using jQuery (still used in the admin in v0.28, probably removed in the future)
   $("[data-tabs]").on("change.zf.tabs", (event) => {
     const $container = $(event.target).closest(".label--tabs").next(".tabs-content").find(".tabs-panel.is-active");
-    // fix inscrybmde if present
-    let $input = $container.find('[name="faker-inscrybmde"]');
+    // fix custom fields if present
+    const $input = $container.find(".proposal_custom_field:first");
     if ($input.length > 0) {
-      $input[0].InscrybMDE.codemirror.refresh();
+      reloadCustomFields($input);
     }
+  });
+
+  // if more than 3 languages, a select is used
+  $("#proposal-body-tabs").on("change", (event) => {
+    const $container = $($(event.target).val());
     // fix custom fields if present
-    $input = $container.find(".proposal_custom_field:first");
+    const $input = $container.find(".proposal_custom_field:first");
     if ($input.length > 0) {
-      // saves current data to the hidden field for the lang
-      window.DecidimAwesome.CustomFieldsRenderer.storeData();
-      // init the current language
-      window.DecidimAwesome.CustomFieldsRenderer.init($input);
+      reloadCustomFields($input);
     }
   });
 });

data/app/packs/src/decidim/decidim_awesome/forms/custom_fields_renderer.js

@@ -1,4 +1,4 @@
-require("formBuilder/dist/form-render.min.js")
+import "formBuilder/dist/form-render.min.js";
 import "src/decidim/decidim_awesome/forms/rich_text_plugin"
 
 export default class CustomFieldsRenderer { // eslint-disable-line no-unused-vars
@@ -56,13 +56,13 @@ export default class CustomFieldsRenderer { // eslint-disable-line no-unused-var
   */
   dataToXML(data) {
     const $dl = $("<dl/>");
-    let $dd = null, 
-        $div = null, 
-        $dt = null, 
-        datum = null, 
-        key = null, 
-        label = null, 
-        text = null, 
+    let $dd = null,
+        $div = null,
+        $dt = null,
+        datum = null,
+        key = null,
+        label = null,
+        text = null,
         val = null;
     $dl.attr("class", "decidim_awesome-custom_fields");
     $dl.attr("data-generator", "decidim_awesome");
@@ -117,17 +117,18 @@ export default class CustomFieldsRenderer { // eslint-disable-line no-unused-var
   }
 
   fixBuggyFields() {
-    if (!this.$container) {
+    if (!this.$element) {
       return false;
     }
 
     /**
-    * Hack to fix required checkboxes being reset
-    * Issue: https://github.com/Platoniq/decidim-module-decidim_awesome/issues/82
-    */
-    this.$container.find(".formbuilder-checkbox-group").each((_key, group) => {
+     * Hack to fix required checkboxes being reset
+     * Issue: https://github.com/decidim-ice/decidim-module-decidim_awesome/issues/82
+     */
+    this.$element.find(".formbuilder-checkbox-group").each((_key, group) => {
       const inputs = $(".formbuilder-checkbox input", group);
-      const data = this.spec.find((obj) => obj.type === "checkbox-group");
+      const $label = $(group).find("label");
+      const data = this.spec.find((obj) => obj.type === "checkbox-group" && obj.name === $label.attr("for"));
       let values = data.userData;
       if (!inputs.length || !data || !values) {
         return;
@@ -163,10 +164,10 @@ export default class CustomFieldsRenderer { // eslint-disable-line no-unused-var
     });
 
     /**
-    * Hack to fix required radio buttons "other" value
-    * Issue: https://github.com/Platoniq/decidim-module-decidim_awesome/issues/133
-    */
-    this.$container.find(".formbuilder-radio input.other-val").on("input", (input) => {
+     * Hack to fix required radio buttons "other" value
+     * Issue: https://github.com/decidim-ice/decidim-module-decidim_awesome/issues/133
+     */
+    this.$element.find(".formbuilder-radio input.other-val").on("input", (input) => {
       const $input = $(input.currentTarget);
       const $group = $input.closest(".formbuilder-radio-group");
       $group.find("input").each((_key, radio) => {
@@ -181,13 +182,14 @@ export default class CustomFieldsRenderer { // eslint-disable-line no-unused-var
 
   // Saves xml to the hidden input
   storeData() {
-    if (!this.$container) {
+    if (!this.$element) {
       return false;
     }
-    const $form = this.$container.closest("form");
+    const $form = this.$element.closest("form");
     const $body = $form.find(`input[name="${this.$element.data("name")}"]`);
     if ($body.length && this.instance) {
       this.spec = this.instance.userData;
+      console.log("Spec data:", this.spec);
       $body.val(this.dataToXML(this.spec));
       this.$element.data("spec", this.spec);
     }
@@ -196,20 +198,27 @@ export default class CustomFieldsRenderer { // eslint-disable-line no-unused-var
   }
 
   init($element) {
+    console.log("CustomFieldsRenderer init");
     this.$element = $element;
+    console.log("Element for rendering:", $element);
+
     this.spec = $element.data("spec");
-    if (!this.$container) {
-      this.$container = $(this.containerSelector);
-    }
+    console.log("Spec data:", this.spec);
     // console.log("init", $element, "this", this)
-    // always use the last field (in case of multilang tabs we only render one form due a limitation of the library to handle several instances)
-    this.instance = this.$container.formRender({
+    // in case of multilang tabs we only render one form due a limitation in the library for handling several instances
+    this.instance = $element.formRender({
       i18n: {
         locale: this.lang,
         location: "https://cdn.jsdelivr.net/npm/formbuilder-languages@1.1.0/"
       },
       formData: this.spec,
-      render: true
+      render: true,
+      disableInjectedStyle: true,
+      controlConfig: {
+        "textarea.richtext": {
+          editorOptions: $element.data("editorOptions")
+        }
+      }
     });
     this.fixBuggyFields();
   }

data/app/packs/src/decidim/decidim_awesome/proposals/custom_fields.js

@@ -1,22 +1,38 @@
 import CustomFieldsRenderer from "src/decidim/decidim_awesome/forms/custom_fields_renderer"
 
-window.DecidimAwesome.CustomFieldsRenderer = window.DecidimAwesome.CustomFieldsRenderer || new CustomFieldsRenderer();
-
 $(() => {
+  window.DecidimAwesome.CustomFieldsRenderer = window.DecidimAwesome.CustomFieldsRenderer || new CustomFieldsRenderer();
+  window.DecidimAwesome.PrivateCustomFieldsRenderer = window.DecidimAwesome.PrivateCustomFieldsRenderer || new CustomFieldsRenderer();
+
   // use admin multilang specs if exists
-  let $el = $("proposal_custom_field:first", ".tabs-title.is-active");
-  if (!$el.length) {
-    $el = $(".proposal_custom_field:first");
+  const $public = $(".proposal_custom_field:first");
+  const $private = $(".proposal_custom_field.proposal_custom_field--private_body:first");
+  let $form = null;
+  if ($public.length) {
+    window.DecidimAwesome.CustomFieldsRenderer.init($public);
+    $form = window.DecidimAwesome.CustomFieldsRenderer.$element.closest("form");
   }
-  window.DecidimAwesome.CustomFieldsRenderer.init($el);
-
-  window.DecidimAwesome.CustomFieldsRenderer.$container.closest("form").on("submit", (evt) => {
-    if (evt.target.checkValidity()) {
-      // save current editor
-      window.DecidimAwesome.CustomFieldsRenderer.storeData();
-    } else {
-      evt.preventDefault();
-      evt.target.reportValidity();
+  if ($private.length) {
+    window.DecidimAwesome.PrivateCustomFieldsRenderer.init($private);
+    if (!$form) {
+      $form = window.DecidimAwesome.PrivateCustomFieldsRenderer.$element.closest("form");
     }
-  });
+  }
+
+  if ($form) {
+    $form.on("submit", (evt) => {
+      if (evt.target.checkValidity()) {
+        // save current editors
+        if ($public.length) {
+          window.DecidimAwesome.CustomFieldsRenderer.storeData();
+        }
+        if ($private.length) {
+          window.DecidimAwesome.PrivateCustomFieldsRenderer.storeData();
+        }
+      } else {
+        evt.preventDefault();
+        evt.target.reportValidity();
+      }
+    });
+  }
 });

data/app/packs/stylesheets/decidim/decidim_awesome/admin/codemirror.scss

@@ -3,24 +3,29 @@
 .awesome-edit-config {
   .scoped_styles_container,
   .proposal_custom_fields_container {
+    &.private {
+      outline: #fca5a5 dotted 2px;
+    }
+
     .form-error {
       margin: 0;
     }
 
-    >.CodeMirror {
+    > .CodeMirror {
       border-top-left-radius: 5px;
       border-top-right-radius: 5px;
-      border-top: .5em solid #e0e0e0;
-      border-right: .5em solid #e0e0e0;
-      border-bottom: .5em solid #e0e0e0;
+      border-top: 0.5em solid #e0e0e0;
+      border-right: 0.5em solid #e0e0e0;
+      border-bottom: 0.5em solid #e0e0e0;
       min-height: 6em;
-      height: auto;
+      height: 8em;
+      padding: 0;
       max-height: 40em;
       resize: vertical;
       overflow: vertical !important;
 
-      >.CodeMirror-scroll {
-        >.CodeMirror-gutters {
+      > .CodeMirror-scroll {
+        > .CodeMirror-gutters {
           background: #e0e0e0;
         }
       }