decidim-decidim_awesome 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3401b18b924106ad65b4545904014b5c853485f897dc194affaa00665b07fe40
-  data.tar.gz: 68f73b33b0b31dc4addbd5f3f6dfa68b90ee5cd5ef56fa6f0ed91ee58c96fb73
+  metadata.gz: 3eed88558d87e79b6943a0fafa5e482129482f29d60de45cb30dabeb696a726d
+  data.tar.gz: 3818b75fbfa54b2517e75c2873f443262afeb684735a348f4e4a110a4979fe30
 SHA512:
-  metadata.gz: 770a318ee4b9e08018709b7526cad4365ec373b75b2083d92e851a6f2eeb8eeee0e7ef51ed515a44a247b4129a4c929313434f99927f1eaa398cd25350151ca4
-  data.tar.gz: 5d3085dab5205c222eb52c57258b9cbdef9dfea5f1fa8a946700b40da53dea3d8514311672a48976def5a59408d52fd429f8864713361bbd68a97f5146e451db
+  metadata.gz: 1036da296077cd339bc14428b2c3bdcd8e47ebbc881ede6d96fe0f74c513d78f5e8691aff184754932c7e071d942d1d9c2dbb93bcbf5b32c6d2b1627f4c2bb60
+  data.tar.gz: a0b3b5476eef71ab74b45bee55366bcd9c90918daa7e3aa043dd85aaa9adca6518b2984fe46d5d5567f72fadbfc3c72d653c99cea07f13e1f0a8fe220226daaf

data/README.md

@@ -121,7 +121,7 @@ Some things in the road-map:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "decidim-decidim_awesome", "~> 0.6.0"
+gem "decidim-decidim_awesome", "~> 0.6.1"
 ```
 
 And then execute:

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

@@ -1,7 +1,8 @@
+// = require jsrender.min
 // = require decidim/map
 // = require leaflet.featuregroup.subgroup
 // = require decidim/decidim_awesome/awesome_map/categories
-// = require decidim/decidim_awesome/awesome_map/proposals
+// = require decidim/decidim_awesome/awesome_map/legacy_proposals
 // = require decidim/decidim_awesome/awesome_map/meetings
 // = require_self
 
@@ -9,9 +10,16 @@
   const { fetchProposals, fetchMeetings, getCategory } = exports.AwesomeMap;
 
   const collapsedMenu = $("#map").data("collapsed");
+  const show = {
+    withdrawn: $("#map").data("show-withdrawn"),
+    accepted: $("#map").data("show-accepted"),
+    evaluating: $("#map").data("show-evaluating"),
+    notAnswered: $("#map").data("show-not-answered"),
+    rejected: $("#map").data("show-rejected")
+  };
   const components = $("#map").data("components");
   const popupMeetingTemplateId = "marker-meeting-popup";
-  const popupProposalTemplateId = "marker-proposal-popup";
+  const popupProposalTemplateId = "legacy-marker-proposal-popup";
 
   const cluster = L.markerClusterGroup();
   const amendments = [];
@@ -30,7 +38,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,
@@ -99,7 +107,9 @@
         }
 
         fetchProposals(component, '', (element, marker) => {
-            drawMarker(element, marker, component).addTo(layers.proposals.group);
+            if(show[element.state || 'notAnswered']) {
+              drawMarker(element, marker, component).addTo(layers.proposals.group)   
+            }
           }, () => {
             // finall call
             map.fitBounds(cluster.getBounds(), { padding: [50, 50] });

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

@@ -0,0 +1,82 @@
+// = require decidim/decidim_awesome/awesome_map/api_fetcher
+// = require decidim/decidim_awesome/awesome_map/categories
+
+((exports) => {
+  const { getCategory } = exports.AwesomeMap;
+  const query = `query ($id: ID!, $after: String!) {
+    component(id: $id) {
+        id
+        __typename
+        ... on Proposals {
+          proposals(first: 50, after: $after){
+            pageInfo {
+              hasNextPage
+              endCursor
+            }
+            edges {
+              node {  
+                id
+                state
+                title
+                body
+                address
+                coordinates {
+                  latitude
+                  longitude
+                }
+                amendments {
+                  emendation {
+                    id
+                  }
+                }
+                category {
+                  id
+                }
+              }
+            }
+          }
+        }
+      }
+    }`;
+
+  const ProposalIcon = L.DivIcon.SVGIcon.DecidimIcon;
+
+  const createMarker = (element, callback) => {
+    const marker = L.marker([element.coordinates.latitude, element.coordinates.longitude], {
+      icon: new ProposalIcon({
+        fillColor: getCategory(element.category).color
+      })
+    });
+
+    element.body = element.body.replace(/\n/g, "<br>");
+    callback(element, marker);
+  };
+
+  const fetchProposals = (component, after, callback, finalCall = () => {}) => {
+    const variables = {
+      "id": component.id,
+      "after": after
+    };
+    const api = new ApiFetcher(query, variables);
+    api.fetchAll((result) => {
+      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();
+        }
+      }
+    });
+  };
+
+  exports.AwesomeMap = exports.AwesomeMap || {};
+  exports.AwesomeMap.fetchProposals = fetchProposals;
+})(window);

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

@@ -1,3 +1,4 @@
+// = require jsrender.min
 // = require leaflet.featuregroup.subgroup
 // = require decidim/decidim_awesome/awesome_map/categories
 // = require decidim/decidim_awesome/awesome_map/proposals
@@ -8,6 +9,13 @@
   const { fetchProposals, fetchMeetings, getCategory } = exports.AwesomeMap;
 
   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";
@@ -29,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,
@@ -98,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] });

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/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/editor_images_controller.rb

@@ -42,7 +42,7 @@ module Decidim
         {
           image: params[:image],
           author_id: current_user.id,
-          path: request.original_fullpath
+          path: request.referer
         }
       end
     end

data/app/forms/decidim/decidim_awesome/editor_image_form.rb

@@ -11,6 +11,8 @@ module Decidim
 
       validates :author_id, presence: true
       validates :image, presence: true
+
+      alias organization current_organization
     end
   end
 end

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

@@ -23,7 +23,12 @@ module Decidim
                                    amendments: component.manifest.name == :proposals ? Decidim::Proposals::Proposal.where(component: component).only_emendations.count : 0
                                  }
                                end.to_json,
-          "data-collapsed" => current_component.settings.collapse
+          "data-collapsed" => current_component.settings.collapse,
+          "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
         }
         content_tag(:div, map, map_html_options)
       end
@@ -45,6 +50,11 @@ module Decidim
                                  }
                                end.to_json,
           "data-collapsed" => current_component.settings.collapse,
+          "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-markers-data" => [].to_json
         }
 

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

@@ -11,9 +11,10 @@ module Decidim
       validates :organization, presence: true
       validates :author, presence: true
 
-      validates :image,
-                file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                file_content_type: { allow: ["image/jpeg", "image/png"] }
+      validates :image, presence: true
+      # validates :image,
+      #           file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
+      #           file_content_type: { allow: ["image/jpeg", "image/png"] }
 
       mount_uploader :image, Decidim::DecidimAwesome::ImageUploader
 

data/app/uploaders/decidim/decidim_awesome/image_uploader.rb

@@ -10,10 +10,19 @@ module Decidim
         process resize_to_fit: [nil, 237]
       end
 
+      # TODO: remove when diching 0.22 support
       def extension_white_list
         %w(jpg jpeg png)
       end
 
+      def extension_whitelist
+        %w(jpg jpeg png)
+      end
+
+      def content_type_whitelist
+        %w(image/jpeg image/png)
+      end
+
       def max_image_height_or_width
         8000
       end

data/app/views/decidim/decidim_awesome/iframe_component/iframe/show.html.erb

@@ -1,7 +1,12 @@
+<%= announcement = render(partial: "decidim/shared/component_announcement") %>
+
 <%= stylesheet_link_tag "decidim/decidim_awesome/awesome_iframe/iframe" %>
 
 <style rel="stylesheet" type="text/css">
-<%= ".wrapper { padding: 0; }" if remove_margins? %>
+<% if remove_margins? %>
+  <%= ".wrapper { padding-left: 0;padding-right: 0;padding-bottom: 0; }" %>
+  <%= ".wrapper { padding-top: 0; }" unless announcement.present? %>
+<% end %>
 </style>
 
 <div class="awesome-iframe<%= " row" if viewport_width? %>">

data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb

@@ -2,57 +2,79 @@
 
 <%= awesome_map_for map_components do %>
 
-  <template id="marker-proposal-popup">
+  <script id="legacy-marker-proposal-popup" type="text/x-jsrender">
     <div class="map-info__content">
-      <h3>${title}</h3>
+      <h3>{{>title}}</h3>
       <div id="bodyContent">
-        <p>{{html body}}</p>
+        <p>{{:body}}</p>
         <div class="map__date-adress">
           <div class="address card__extra">
-            <div class="address__icon">{{html icon}}</div>
+            <div class="address__icon">{{:icon}}</div>
             <div class="address__details">
-              <span>${address}</span><br>
+              <span>{{>address}}</span><br>
             </div>
           </div>
         </div>
         <div class="map-info__button">
-          <a href="${link}" class="button button--sc">
+          <a href="{{>link}}" class="button button--sc">
             <%= t(".view_proposal") %>
           </a>
         </div>
       </div>
     </div>
-  </template>
+  </script>
+
+  <script id="marker-proposal-popup" type="text/x-jsrender">
+    <div class="map-info__content">
+      <h3>{{>title.translation}}</h3>
+      <div id="bodyContent">
+        <p>{{:body.translation}}</p>
+        <div class="map__date-adress">
+          <div class="address card__extra">
+            <div class="address__icon">{{:icon}}</div>
+            <div class="address__details">
+              <span>{{>address}}</span><br>
+            </div>
+          </div>
+        </div>
+        <div class="map-info__button">
+          <a href="{{>link}}" class="button button--sc">
+            <%= t(".view_proposal") %>
+          </a>
+        </div>
+      </div>
+    </div>
+  </script>
 
-  <template id="marker-meeting-popup">
+  <script id="marker-meeting-popup" type="text/x-jsrender">
     <div class="map-info__content">
-      <h3>${title.translation}</h3>
+      <h3>{{>title.translation}}</h3>
       <div id="bodyContent">
-        <p>{{html description.translation}}</p>
+        <p>{{:description.translation}}</p>
         <div class="map__date-adress">
           <div class="card__datetime">
             <div class="card__datetime__date">
-              ${startTimeDay} <span class="card__datetime__month">${startTimeMonth} ${startTimeYear}</span>
+              {{>startTimeDay}} <span class="card__datetime__month">{{>startTimeMonth}} {{>startTimeYear}}</span>
             </div>
-            <div class="card__datetime__time">${starTime}</div>
+            <div class="card__datetime__time">{{>starTime}}</div>
           </div>
           <div class="address card__extra">
-            <div class="address__icon">{{html icon}}</div>
+            <div class="address__icon">{{:icon}}</div>
             <div class="address__details">
-              <strong>{{html location.translation}}</strong><br>
-              <span>${address}</span><br>
-              <span>{{html locationHints.translation}}</span>
+              <strong>{{:location.translation}}</strong><br>
+              <span>{{>address}}</span><br>
+              <span>{{:locationHints.translation}}</span>
             </div>
           </div>
         </div>
         <div class="map-info__button">
-          <a href="${link}" class="button button--sc">
+          <a href="{{>link}}" class="button button--sc">
             <%= t("decidim.meetings.meetings_map.view_meeting") %>
           </a>
         </div>
       </div>
     </div>
-  </template>
+  </script>
 
   <%= stylesheet_link_tag "decidim/decidim_awesome/awesome_map/map" %>
   <style type="text/css">