decidim-decidim_awesome 0.5.1 → 0.6.4

data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/map.js.es6

@@ -1,4 +1,4 @@
-// = require decidim/map
+// = require jsrender.min
 // = require leaflet.featuregroup.subgroup
 // = require decidim/decidim_awesome/awesome_map/categories
 // = require decidim/decidim_awesome/awesome_map/proposals
@@ -8,8 +8,15 @@
 ((exports) => {
   const { fetchProposals, fetchMeetings, getCategory } = exports.AwesomeMap;
 
-  const collapsedMenu = $("#map").data("collapsed");
-  const components = $("#map").data("components");
+  const collapsedMenu = $("#awesome-map").data("collapsed");
+  const show = {
+    withdrawn: $("#awesome-map").data("show-withdrawn"),
+    accepted: $("#awesome-map").data("show-accepted"),
+    evaluating: $("#awesome-map").data("show-evaluating"),
+    notAnswered: $("#awesome-map").data("show-not-answered"),
+    rejected: $("#awesome-map").data("show-rejected")
+  };
+  const components = $("#awesome-map").data("components");
   const popupMeetingTemplateId = "marker-meeting-popup";
   const popupProposalTemplateId = "marker-proposal-popup";
 
@@ -30,7 +37,7 @@
     let tmpl = component.type === "proposals" ? popupProposalTemplateId : popupMeetingTemplateId,
         node = document.createElement("div");
 
-    $.tmpl($(`#${tmpl}`), element).appendTo(node);
+    $($.templates(`#${tmpl}`).render(element)).appendTo(node);
     
     marker.bindPopup(node, {
       maxwidth: 640,
@@ -91,7 +98,7 @@
         // add control layer for amendments if any
         if(component.amendments) {
           layers.amendments = {
-            label: `<span id="awesome_map-component-${component.d}" title="0">${window.DecidimAwesome.texts.amendment}/span>`,
+            label: `<span id="awesome_map-component-${component.d}" title="0">${window.DecidimAwesome.texts.amendments}</span>`,
             group: L.featureGroup.subGroup(cluster)
           }
           control.addOverlay(layers.amendments.group, layers.amendments.label);
@@ -99,7 +106,10 @@
         }
 
         fetchProposals(component, '', (element, marker) => {
-            drawMarker(element, marker, component).addTo(layers.proposals.group);
+            console.log(element.state, show[element.state || 'notAnswered'], show, element);
+            if(show[element.state || 'notAnswered']) {
+              drawMarker(element, marker, component).addTo(layers.proposals.group)   
+            }
           }, () => {
             // finall call
             map.fitBounds(cluster.getBounds(), { padding: [50, 50] });
@@ -116,7 +126,7 @@
       if(component.type == "meetings") {
         // add control layer for meetings
         layers.meetings = {
-          label: `<span id="awesome_map-component-${component.id}" title="0">${component.name || window.DecidimAwesome.texts.meetings}/span>`,
+          label: `<span id="awesome_map-component-${component.id}" title="0">${component.name || window.DecidimAwesome.texts.meetings}</span>`,
           group: L.featureGroup.subGroup(cluster)
         };
         control.addOverlay(layers.meetings.group, layers.meetings.label);
@@ -198,18 +208,8 @@
 
   };
 
-  // currentMap might not be loaded yet so let's delay a bit
-  // TODO: improve this
-  const waitMap = () => {
-    if(exports.Decidim && exports.Decidim.currentMap) {
-      loadElements(exports.Decidim.currentMap);
-    } else {
-      setTimeout(() => {
-        waitMap();
-      }, 100);
-    }
-  };
-
-  waitMap();
+  $("#map").on("ready.decidim", (ev, map) => {
+    loadElements(map);
+  });
 
 })(window);

data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/meetings.js.es6

@@ -93,7 +93,7 @@
     });
 
     element.title.translation = ApiFetcher.findTranslation(element.title.translations);
-    element.description.translation = ApiFetcher.findTranslation(element.description.translations);
+    element.description.translation = ApiFetcher.findTranslation(element.description.translations).replace(/\n/g, "<br>");;
     element.location.translation = ApiFetcher.findTranslation(element.location.translations);
     element.locationHints.translation = ApiFetcher.findTranslation(element.locationHints.translations);
     callback(element, marker);
@@ -107,19 +107,21 @@
     };
     const api = new ApiFetcher(query, variables);
     api.fetchAll((result) => {
-      result.component.meetings.edges.forEach((element) => {
-        if(!element.node) return;
-        
-        if(element.node.coordinates) {
-          element.node.link = component.url + '/meetings/' + element.node.id;
-          createMarker(element.node, callback);
-        }
-      });
+      if(result) {
+        result.component.meetings.edges.forEach((element) => {
+          if(!element.node) return;
+          
+          if(element.node.coordinates) {
+            element.node.link = component.url + '/meetings/' + element.node.id;
+            createMarker(element.node, callback);
+          }
+        });
 
-      if (result.component.meetings.pageInfo.hasNextPage) {
-        fetchMeetings(component, result.component.meetings.pageInfo.endCursor, callback, finalCall);
-      } else {
-        finalCall();
+        if (result.component.meetings.pageInfo.hasNextPage) {
+          fetchMeetings(component, result.component.meetings.pageInfo.endCursor, callback, finalCall);
+        } else {
+          finalCall();
+        }
       }
     });
   };

data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/proposals.js.es6

@@ -16,8 +16,19 @@
             edges {
               node {  
                 id
-                title
-                body
+                state
+                title {
+                  translations {
+                    text
+                    locale
+                  }
+                }
+                body {
+                  translations {
+                    text
+                    locale
+                  }
+                }
                 address
                 coordinates {
                   latitude
@@ -47,6 +58,9 @@
       })
     });
 
+    element.title.translation = ApiFetcher.findTranslation(element.title.translations);
+    element.body.translation = ApiFetcher.findTranslation(element.body.translations).replace(/\n/g, "<br>");
+
     callback(element, marker);
   };
 
@@ -57,18 +71,20 @@
     };
     const api = new ApiFetcher(query, variables);
     api.fetchAll((result) => {
-      result.component.proposals.edges.forEach((element) => {
-        if(!element.node) return;
-        
-        if(element.node.coordinates) {
-          element.node.link = component.url + '/proposals/' + element.node.id;
-          createMarker(element.node, callback);
+      if(result) {
+        result.component.proposals.edges.forEach((element) => {
+          if(!element.node) return;
+          
+          if(element.node.coordinates) {
+            element.node.link = component.url + '/proposals/' + element.node.id;
+            createMarker(element.node, callback);
+          }
+        });
+        if (result.component.proposals.pageInfo.hasNextPage) {
+          fetchProposals(component, result.component.proposals.pageInfo.endCursor, callback, finalCall);
+        } else {
+          finalCall();
         }
-      });
-      if (result.component.proposals.pageInfo.hasNextPage) {
-        fetchProposals(component, result.component.proposals.pageInfo.endCursor, callback, finalCall);
-      } else {
-        finalCall();
       }
     });
   };

data/app/assets/javascripts/decidim/decidim_awesome/editors/quill_editor.js.es6

@@ -1,4 +1,3 @@
-// = require quill.min
 // = require image-upload.min
 // = require image-resize.min
 // = require inscrybmde.min.js
@@ -11,9 +10,9 @@
   exports.DecidimAwesome = exports.DecidimAwesome || {};
 
   // Redefines Quill editor with images
-  if(exports.DecidimAwesome.allow_images_in_full_editor  || exports.DecidimAwesome.allow_images_in_small_editor) {
+  if(exports.DecidimAwesome.allow_images_in_full_editor  || exports.DecidimAwesome.allow_images_in_small_editor || exports.DecidimAwesome.use_markdown_editor) {
 
-    const quillFormats = ["bold", "italic", "link", "underline", "header", "list", "video", "image"];
+    const quillFormats = ["bold", "italic", "link", "underline", "header", "list", "video", "image", "alt"];
 
     const createQuillEditor = (container) => {
       const toolbar = $(container).data("toolbar");
@@ -54,7 +53,6 @@
         toolbar: quillToolbar
       };
       const $input = $(container).siblings('input[type="hidden"]');
-      // https://github.com/decidim/decidim/pull/6422
       container.innerHTML = $input.val() || "";
       const token = $( 'meta[name="csrf-token"]' ).attr( 'content' );
 

data/app/awesome_overrides/presenters/decidim/proposals/proposal_presenter_override.rb

@@ -2,17 +2,44 @@
 
 # Tune Proposal presenter to use markdown if configured
 Decidim::Proposals::ProposalPresenter.class_eval do
-  def body(links: false, extras: true, strip_tags: false)
-    text = proposal.body
-    text = strip_tags(text) if strip_tags
+  # rubocop:disable Metrics/CyclomaticComplexity
+  # rubocop:disable Metrics/PerceivedComplexity
+  def body(links: false, extras: true, strip_tags: false, all_locales: false)
+    return unless proposal
+
+    if defined? handle_locales
+      return handle_locales(proposal.body, all_locales) do |content|
+        content = strip_tags(sanitize_text(content)) if strip_tags
+
+        renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+        content = renderer.render(links: links, extras: extras).html_safe
+
+        if use_markdown?(proposal) && !all_locales # avoid rendering in editors
+          content = render_markdown(content)
+        elsif links
+          content = Decidim::ContentRenderers::LinkRenderer.new(content).render
+        end
+        content
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
+
+    if defined? translated_attribute
+      text = translated_attribute(proposal.body)
+
+      text = strip_tags(sanitize_text(text)) if strip_tags
+    else
+      # TODO: remove when 0.22 is diched
+      text = proposal.body
+      text = strip_tags(text) if strip_tags
+    end
 
     renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
     text = renderer.render(links: links, extras: extras).html_safe
 
     if use_markdown? proposal
-      text = Decidim::DecidimAwesome::ContentRenderers::MarkdownRenderer.new(text).render
-      # HACK: to avoid the replacement of lines to <br> that simple_format does
-      text = text.gsub(">\n", ">").gsub("\n<", "<")
+      text = render_markdown(text)
     elsif links
       text = Decidim::ContentRenderers::LinkRenderer.new(text).render
     end
@@ -28,4 +55,10 @@ Decidim::Proposals::ProposalPresenter.class_eval do
     config.context_from_component proposal
     config.enabled_for? :use_markdown_editor
   end
+
+  def render_markdown(content)
+    content = Decidim::DecidimAwesome::ContentRenderers::MarkdownRenderer.new(content).render
+    # HACK: to avoid the replacement of lines to <br> that simple_format does
+    content.gsub(">\n", ">").gsub("\n<", "<")
+  end
 end

data/app/commands/decidim/decidim_awesome/admin/create_scoped_style.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class CreateScopedStyle < Rectify::Command
+        # Public: Initializes the command.
+        #
+        def initialize(organization)
+          @organization = organization
+          @ident = rand(36**8).to_s(36)
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          styles = AwesomeConfig.find_or_initialize_by(var: :scoped_styles, organization: @organization)
+          styles.value = {} unless styles.value.is_a? Hash
+          # TODO: prevent (unlikely) colisions with exisiting values
+          styles.value[@ident] = ""
+          styles.save!
+
+          broadcast(:ok, @ident)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/decidim_awesome/admin/destroy_scoped_style.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class DestroyScopedStyle < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # key - the key to destroy inise scoped_styles
+        # organization
+        def initialize(key, organization)
+          @key = key
+          @organization = organization
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          styles = AwesomeConfig.find_by(var: :scoped_styles, organization: @organization)
+          return broadcast(:invalid, "Not a hash") unless styles&.value.is_a? Hash
+          return broadcast(:invalid, "#{key} key invalid") unless styles.value.has_key?(@key)
+
+          styles.value.except!(@key)
+          styles.save!
+          # remove constrains associated (a new config var is generated automatically, by removing it, it will trigger destroy on dependents)
+          constraint = AwesomeConfig.find_by(var: "scoped_style_#{@key}", organization: @organization)
+          constraint.destroy! if constraint.present?
+
+          broadcast(:ok, @key)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/decidim_awesome/create_editor_image.rb

@@ -19,12 +19,14 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        image = EditorImage.create!(
-          image: form.image,
+        image = EditorImage.new(
           path: form.path,
           decidim_author_id: form.current_user.id,
-          organization: form.current_organization
+          organization: form.organization,
+          image: form.image
         )
+
+        image.save!
         broadcast(:ok, image)
       end
 

data/app/controllers/decidim/decidim_awesome/admin/checks_controller.rb

@@ -12,10 +12,18 @@ module Decidim
 
         layout "decidim/admin/decidim_awesome"
 
-        helper_method :overrides, :valid?, :decidim_version, :decidim_version_valid?
+        helper_method :overrides, :valid?, :decidim_version, :decidim_version_valid?, :head, :admin_head, :head_addons, :admin_addons
 
         private
 
+        def head
+          @head ||= Nokogiri::HTML(render_to_string(partial: "layouts/decidim/head"))
+        end
+
+        def admin_head
+          @admin_head = Nokogiri::HTML(render_to_string(partial: "layouts/decidim/admin/header"))
+        end
+
         def overrides
           SystemChecker.to_h
         end
@@ -31,6 +39,26 @@ module Decidim
         def decidim_version_valid?
           Gem::Dependency.new("", DecidimAwesome::COMPAT_DECIDIM_VERSION).match?("", decidim_version)
         end
+
+        def head_addons(part)
+          case part
+          when :CSS
+            ['<%= stylesheet_link_tag "decidim/decidim_awesome/application", media: "all" %>',
+             '<%= stylesheet_link_tag(tenant_stylesheets, media: "all") if tenant_stylesheets %>'].join("\n")
+          when :JavaScript
+            ['<%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>',
+             '<%= javascript_include_tag "decidim/decidim_awesome/application" %>'].join("\n")
+          end
+        end
+
+        def admin_addons(part)
+          case part
+          when :CSS
+            '<%= stylesheet_link_tag "decidim/decidim_awesome/admin", media: "all" %>'
+          when :JavaScript
+            '<%= javascript_include_tag "decidim/decidim_awesome/admin" %>'
+          end
+        end
       end
     end
   end

data/app/controllers/decidim/decidim_awesome/admin/config_controller.rb

@@ -18,8 +18,7 @@ module Decidim
         end
 
         def update
-          @form = form(ConfigForm).from_params(params)
-
+          @form = form(ConfigForm).from_params(params[:config])
           UpdateConfig.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("config.update.success", scope: "decidim.decidim_awesome.admin")
@@ -33,6 +32,34 @@ module Decidim
           end
         end
 
+        def new_scoped_style
+          CreateScopedStyle.call(current_organization) do
+            on(:ok) do |key|
+              flash[:notice] = I18n.t("config.create_scoped_style.success", key: key, scope: "decidim.decidim_awesome.admin")
+            end
+
+            on(:invalid) do |message|
+              flash[:alert] = I18n.t("config.create_scoped_style.error", error: message, scope: "decidim.decidim_awesome.admin")
+            end
+          end
+
+          redirect_to decidim_admin_decidim_awesome.config_path(:styles)
+        end
+
+        def destroy_scoped_style
+          DestroyScopedStyle.call(params[:key], current_organization) do
+            on(:ok) do |key|
+              flash[:notice] = I18n.t("config.destroy_scoped_style.success", key: key, scope: "decidim.decidim_awesome.admin")
+            end
+
+            on(:invalid) do |message|
+              flash[:alert] = I18n.t("config.destroy_scoped_style.error", error: message, scope: "decidim.decidim_awesome.admin")
+            end
+          end
+
+          redirect_to decidim_admin_decidim_awesome.config_path(:styles)
+        end
+
         private
 
         def constraints_for(key)