decidim-decidim_awesome 0.6.6 → 0.6.7

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

@@ -0,0 +1,56 @@
+// = require jsrender.min
+// = require decidim/decidim_awesome/awesome_map/layers
+// = require decidim/decidim_awesome/awesome_map/categories
+
+((exports) => {
+  const { getCategory, layers } = exports.AwesomeMap;
+
+  const popupMeetingTemplateId = "marker-meeting-popup";
+  const popupProposalTemplateId = "marker-proposal-popup";
+  const allMarkers = [];
+
+  const drawMarker = (element, marker, component) => {
+    let tmpl = component.type === "proposals" ? popupProposalTemplateId : popupMeetingTemplateId,
+        node = document.createElement("div");
+
+    $($.templates(`#${tmpl}`).render(element)).appendTo(node);
+
+    marker.bindPopup(node, {
+      maxwidth: 640,
+      minWidth: 500,
+      keepInView: true,
+      className: "map-info"
+    }).openPopup();
+
+    allMarkers.push({
+      marker: marker,
+      component: component,
+      element: element
+    });
+
+    // Add to category layer
+    let cat = getCategory(element.category);
+    if(layers[cat.id]) {
+      $('#awesome_map-categories-control').show();
+      marker.addTo(layers[cat.id].group);
+      // show category if hidden
+      const $label = $(`label.awesome_map-category-${cat.id}`);
+      const $parent = $(`label.awesome_map-category-${cat.parent}`);
+      $label.show();
+      // update number of items
+      $label.attr("title", (parseInt($label.attr("title") || 0) + 1) + " " +  window.DecidimAwesome.texts.items);
+      // show parent if apply
+      $parent.show();
+      $parent.attr("title", (parseInt($parent.attr("title") || 0) + 1) + " " +  window.DecidimAwesome.texts.items);
+    }
+
+    // update component stats
+    const $component = $(`#awesome_map-component_${component.id}`);
+    $component.attr("title", parseInt($component.attr("title") || 0) + 1);
+
+    return marker;
+  };
+
+  exports.AwesomeMap.allMarkers = allMarkers;
+  exports.AwesomeMap.drawMarker = drawMarker;
+})(window);

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

@@ -1,8 +1,9 @@
 // = require decidim/decidim_awesome/awesome_map/api_fetcher
 // = require decidim/decidim_awesome/awesome_map/categories
+// = require decidim/decidim_awesome/awesome_map/utilities
 
 ((exports) => {
-  const { getCategory } = exports.AwesomeMap;
+  const { getCategory, truncate } = exports.AwesomeMap;
   const query = `query ($id: ID!, $after: String!) {
     component(id: $id) {
         id
@@ -59,7 +60,7 @@
   const MeetingIcon = L.DivIcon.SVGIcon.extend({
     options: {
       fillColor: "#ef604d",
-      iconSize: {x: 300, y:150},
+      iconSize: { x: 300, y: 150 },
       opacity: 0
     },
     _createPathDescription: function() {
@@ -93,7 +94,7 @@
     });
 
     element.title.translation = ApiFetcher.findTranslation(element.title.translations);
-    element.description.translation = ApiFetcher.findTranslation(element.description.translations).replace(/\n/g, "<br>");;
+    element.description.translation = truncate(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);

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

@@ -1,8 +1,10 @@
 // = require decidim/decidim_awesome/awesome_map/api_fetcher
 // = require decidim/decidim_awesome/awesome_map/categories
+// = require decidim/decidim_awesome/awesome_map/hashtags
+// = require decidim/decidim_awesome/awesome_map/utilities
 
 ((exports) => {
-  const { getCategory } = exports.AwesomeMap;
+  const { getCategory, truncate, collectHashtags, removeHashtags, appendHtmlHashtags } = exports.AwesomeMap;
   const query = `query ($id: ID!, $after: String!) {
     component(id: $id) {
         id
@@ -14,7 +16,7 @@
               endCursor
             }
             edges {
-              node {  
+              node {
                 id
                 state
                 title {
@@ -49,6 +51,7 @@
       }
     }`;
 
+  let amendments = [];
   const ProposalIcon = L.DivIcon.SVGIcon.DecidimIcon;
 
   const createMarker = (element, callback) => {
@@ -59,7 +62,9 @@
     });
 
     element.title.translation = ApiFetcher.findTranslation(element.title.translations);
-    element.body.translation = ApiFetcher.findTranslation(element.body.translations).replace(/\n/g, "<br>");
+    const body = ApiFetcher.findTranslation(element.body.translations);
+    element.hashtags = collectHashtags(body);
+    element.body.translation = appendHtmlHashtags(truncate(removeHashtags(body)).replace(/\n/g, "<br>"), element.hashtags);
 
     callback(element, marker);
   };
@@ -74,11 +79,18 @@
       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);
           }
+
+          // Check if it has amendments, add it to a list
+          if(element.node.amendments && element.node.amendments.length) {
+            element.node.amendments.forEach((amendment) => {
+              amendments.push(amendment.emendation.id);
+            });
+          }
         });
         if (result.component.proposals.pageInfo.hasNextPage) {
           fetchProposals(component, result.component.proposals.pageInfo.endCursor, callback, finalCall);
@@ -91,4 +103,5 @@
 
   exports.AwesomeMap = exports.AwesomeMap || {};
   exports.AwesomeMap.fetchProposals = fetchProposals;
+  exports.AwesomeMap.amendments = amendments;
 })(window);

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

@@ -0,0 +1,48 @@
+//= require jquery.truncate
+
+((exports) => {
+  const sanitizeCenter = (string) => {
+    const parts = string.split(",")
+    if (parts.length >= 2) {
+      const lat = parseFloat(parts[0]);
+      const lng = parseFloat(parts[1]);
+      if(lat && lng) {
+        return [lat, lng];
+      }
+    }
+    return null
+  };
+
+  const options = {
+    length: $("#awesome-map").data("truncate") || 255,
+    center: sanitizeCenter($("#awesome-map").data("map-center")),
+    zoom: $("#awesome-map").data("map-zoom"),
+    menu: {
+      amendments: $("#awesome-map").data("menu-amendments"),
+      meetings: $("#awesome-map").data("menu-meetings"),
+      hashtags: $("#awesome-map").data("menu-hashtags")
+    }
+  };
+
+  const truncate = (string) => {
+    return $.truncate(string, options);
+  };
+
+  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 collapsedMenu = $("#awesome-map").data("collapsed");
+  const components = $("#awesome-map").data("components");
+
+  exports.AwesomeMap = exports.AwesomeMap || {};
+  exports.AwesomeMap.truncate = truncate;
+  exports.AwesomeMap.options = options;
+  exports.AwesomeMap.show = show;
+  exports.AwesomeMap.collapsedMenu = collapsedMenu;
+  exports.AwesomeMap.components = components;
+})(window);

data/app/assets/stylesheets/decidim/decidim_awesome/admin.scss

@@ -1,4 +1,5 @@
 //= require github.min
+//= require codemirror
 //= require inscrybmde.min
 //= require_self
 
@@ -6,6 +7,7 @@
 @import "decidim/utils/settings";
 @import "decidim/utils/mixins";
 @import "./admin/constraints";
+@import "./admin/codemirror";
 @import "./editors/quill_editor";
 @import "./editors/markdown_editor";
 
@@ -17,7 +19,7 @@
   font-size: .8em;
 }
 
-.decidim_awesome {
+.decidim_awesome{
   &.modal{
     .spinner{
       @include spinner(25px, #aaa, var(--secondary), 800ms);
@@ -33,17 +35,18 @@
     }
   }
 
-  &-form {
+  &-form{
     margin-bottom: 2em;
     border-bottom: 1px solid #999;
     padding-bottom: 1.5em;
   }
-  &-form:last-child {
+
+  &-form:last-child{
     border-bottom: none;
     padding-bottom: 0;
   }
 }
 
-tbody tr.menu_hack-addition {
+tbody tr.menu_hack-addition{
   background: rgb(255, 248, 222);
 }

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

@@ -0,0 +1,16 @@
+.awesome-edit-config{
+  .scoped-style{
+    .form-error {
+      margin: 0;
+    }
+    >.CodeMirror{
+      border-top: .5em solid #f6f6f6;
+      border-right: .5em solid #f6f6f6;
+      min-height: 6em;
+      height: auto;
+      max-height: 40em;
+      resize: vertical;
+      overflow: vertical !important;
+    }
+  }
+}

data/app/assets/stylesheets/decidim/decidim_awesome/awesome_map/leaflet.scss.erb

@@ -7,3 +7,12 @@
 .leaflet-default-icon-path {
   background-image: url(<%= asset_path "marker-icon.png" %>);
 }
+.leaflet-container {
+  font: inherit;
+
+  #bodyContent .description {
+    img, iframe {
+      max-height: 5em;
+    }
+  }
+}

data/app/assets/stylesheets/decidim/decidim_awesome/awesome_map/map.scss

@@ -63,4 +63,99 @@
     border: 2px solid #bbb;
     border-radius: 4px;
   }
+
+  .awesome_map-title-control{
+    display: block;
+    cursor: pointer;
+
+    &::after{
+      content: '';
+      width: 0;
+      height: 0;
+      border-left: 5px solid transparent;
+      border-right: 5px solid transparent;
+      border-top: 5px solid black;
+      border-bottom: 0;
+      display: inline-block;
+      margin: 0 0 2px 5px;
+    }
+  }
+
+  .active{
+    .awesome_map-title-control::after{
+      border-top: 0;
+      border-bottom: 5px solid black;
+    }
+  }
+
+  #awesome_map-{
+    &categories-control{
+      display: none;
+
+      label{
+        margin-left: .5rem;
+        display: none;
+
+        i{
+          display: inline-block;
+          width: .8rem;
+          height: .8rem;
+          border-radius: 50%;
+          background-color: var(-- primary);
+        }
+
+        &.subcategory{
+          padding-left: 1em;
+        }
+      }
+
+      .categories-container{
+        display: none;
+      }
+
+      &.active{
+        .categories-container{
+          display: block;
+        }
+      }
+    }
+
+    &hashtags-control{
+      display: none;
+
+      label{
+        display: inline-block;
+        line-height: 1;
+        background-color: #f0f0f0;
+        border-radius: 5px;
+        margin: .5rem;
+        padding: .5rem;
+
+        span{
+          margin: 0 .5rem 2px 0;
+        }
+
+        input{
+          vertical-align: top;
+        }
+      }
+
+      .awesome_map-toggle_all_tags{
+        margin: .5rem 1rem;
+        font-size: .875rem;
+      }
+
+      .hashtags-container,
+      .awesome_map-toggle_all_tags{
+        display: none;
+      }
+
+      &.active{
+        .hashtags-container,
+        .awesome_map-toggle_all_tags{
+          display: block;
+        }
+      }
+    }
+  }
 }

data/app/assets/stylesheets/decidim/decidim_awesome/editors/markdown_editor.scss

@@ -1,6 +1,6 @@
 // editor tweaks
 //
-.CodeMirror{
+.editor .CodeMirror{
   color: #333;
   font-weight: normal;
   line-height: 1.45;

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

@@ -18,7 +18,10 @@ module Decidim
         #
         # Returns nothing.
         def call
-          return broadcast(:invalid) if form.invalid?
+          if form.invalid?
+            message = form.errors[:scoped_styles].join("; ") if @form.errors[:scoped_styles].any?
+            return broadcast(:invalid, message, form.errors)
+          end
 
           begin
             form.attributes.each do |key, val|

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

@@ -28,9 +28,9 @@ module Decidim
               redirect_to decidim_admin_decidim_awesome.config_path
             end
 
-            on(:invalid) do |message|
+            on(:invalid) do |message, err|
               flash.now[:alert] = I18n.t("config.update.error", error: message, scope: "decidim.decidim_awesome.admin")
-              render :show
+              render :show, locals: { errors: err.presence }
             end
           end
         end

data/app/forms/decidim/decidim_awesome/admin/config_form.rb

@@ -20,11 +20,22 @@ module Decidim
         # collect all keys anything not specified in the params (UpdateConfig command ignores it)
         attr_accessor :valid_keys
 
+        validate :css_syntax, if: ->(form) { form.scoped_styles.present? }
+
         def self.from_params(params, additional_params = {})
           instance = super(params, additional_params)
           instance.valid_keys = params.keys.map(&:to_sym) || []
           instance
         end
+
+        def css_syntax
+          scoped_styles.each do |key, code|
+            SassC::Engine.new(code).render
+          rescue SassC::SyntaxError => e
+            errors.add(:scoped_styles, I18n.t("config.form.errors.incorrect_css", key: key, scope: "decidim.decidim_awesome.admin"))
+            errors.add(key.to_sym, e.message)
+          end
+        end
       end
     end
   end

data/app/helpers/decidim/decidim_awesome/map_helper.rb

@@ -24,11 +24,17 @@ module Decidim
                                  }
                                end.to_json,
           "data-collapsed" => current_component.settings.collapse,
+          "data-truncate" => current_component.settings.truncate,
+          "data-map-center" => current_component.settings.map_center,
+          "data-map-zoom" => current_component.settings.map_zoom,
+          "data-menu-amendments" => current_component.settings.menu_amendments,
+          "data-menu-meetings" => current_component.settings.menu_meetings,
+          "data-menu-hashtags" => current_component.settings.menu_hashtags,
           "data-show-not-answered" => current_component.current_settings.show_not_answered,
           "data-show-accepted" => current_component.current_settings.show_accepted,
           "data-show-withdrawn" => current_component.current_settings.show_withdrawn,
-          "data-show-evaluating" => current_component.current_settings.show_evaluating
-          # "data-show-rejected" => current_component.current_settings.show_rejected
+          "data-show-evaluating" => current_component.current_settings.show_evaluating,
+          "data-show-rejected" => current_component.current_settings.show_rejected
         }
         content_tag(:div, map, map_html_options)
       end
@@ -54,7 +60,7 @@ module Decidim
           "data-show-accepted" => current_component.current_settings.show_accepted,
           "data-show-withdrawn" => current_component.current_settings.show_withdrawn,
           "data-show-evaluating" => current_component.current_settings.show_evaluating,
-          # "data-show-rejected" => current_component.current_settings.show_rejected,
+          "data-show-rejected" => current_component.current_settings.show_rejected,
           "data-markers-data" => [].to_json
         }