decidim-decidim_awesome 0.6.7 → 0.8.1

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

@@ -1,106 +0,0 @@
-// = require leaflet.featuregroup.subgroup
-// = require decidim/decidim_awesome/awesome_map/utilities
-// = require decidim/decidim_awesome/awesome_map/categories
-// = require decidim/decidim_awesome/awesome_map/hashtags
-
-((exports) => {
-  const { collapsedMenu, options, categories } = exports.AwesomeMap;
-  const layers = {};
-  const cluster = L.markerClusterGroup();
-
-  const control = L.control.layers(null, null, {
-    position: 'topleft',
-    sortLayers: false,
-    collapsed: collapsedMenu,
-    // hideSingleBase: true
-  });
-
-  const addProposalsControls = (map, component) => {
-    // add control layer for proposals
-    layers.proposals = {
-      label: `<span class="awesome_map-component" id="awesome_map-component_${component.id}" title="0">${component.name || window.DecidimAwesome.texts.proposals}</span>`,
-      group: L.featureGroup.subGroup(cluster)
-    };
-    control.addOverlay(layers.proposals.group, layers.proposals.label);
-    layers.proposals.group.addTo(map);
-
-    // add control layer for amendments if any
-    if(options.menu.amendments && component.amendments) {
-      layers.amendments = {
-        label: `<span class="awesome_map-component" id="awesome_map-amendments_${component.id}" title="0">${window.DecidimAwesome.texts.amendments}</span>`,
-        group: L.featureGroup.subGroup(cluster)
-      }
-      control.addOverlay(layers.amendments.group, layers.amendments.label);
-      layers.amendments.group.addTo(map);
-    }
-  };
-
-  const addMeetingsControls = (map, component) => {
-    // add control layer for meetings
-    layers.meetings = {
-      label: `<span class="awesome_map-component" 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);
-    layers.meetings.group.addTo(map);
-  };
-
-  const addSearchControls = () => {
-    $(control.getContainer()).contents("form").after(`<div id="awesome_map-categories-control" class="active"><b class="awesome_map-title-control">${window.DecidimAwesome.texts.categories}</b><div class="categories-container"></div></div>
-    <div id="awesome_map-hashtags-control"><b class="awesome_map-title-control">${window.DecidimAwesome.texts.hashtags}</b><div class="hashtags-container"></div><a href="#" class="awesome_map-toggle_all_tags">${window.DecidimAwesome.texts.select_deselect_all}</a></div>`);
-  };
-
-  const addCategoriesControls = (map) => {
-    if(categories && categories.length) {
-      categories.forEach((category) => {
-        // add control layer for this category
-      const label = `<i class="awesome_map-category-${category.id}"></i> ${category.name}`;
-      layers[category.id] = {
-        label: label,
-        group: L.featureGroup.subGroup(cluster)
-      };
-      layers[category.id].group.addTo(map);
-      // In the next iteration to be sure layers are rendered
-      setTimeout(() => {
-        $('#awesome_map-categories-control .categories-container').append(`<label data-layer="${category.id}" class="awesome_map-category-${category.id}${category.parent?" subcategory":""}"><input type="checkbox" class="awesome_map-categories-selector" checked><span>${label}</span></label>`);
-      });
-    });
-  }
-  };
-
-  // Hashtags are collected directly from proposals (this is different than categories)
-  const addHashtagsControls = (map, hashtags, marker) => {
-     // show hashtag layer
-    if(hashtags && hashtags.length) {
-      $('#awesome_map-hashtags-control').show();
-      hashtags.forEach(hashtag => {
-        // Add layer if not exists, otherwise just add the marker to the group
-        if(!layers[hashtag.tag]) {
-          layers[hashtag.tag] = {
-            label: hashtag.name,
-            group: L.featureGroup.subGroup(cluster)
-          };
-          layers[hashtag.tag].group.addTo(map);
-          $('#awesome_map-hashtags-control .hashtags-container').append(`<label data-layer="${hashtag.tag}" class="awesome_map-hashtag-${hashtag.tag}"><input type="checkbox" class="awesome_map-hashtags-selector" checked><span>${hashtag.name}</span></label>`);
-          // Call a trigger, might be in service for customizations
-          exports.AwesomeMap.hashtagAdded(hashtag, $('#awesome_map-hashtags-control .hashtags-container'));
-        }
-        marker.addTo(layers[hashtag.tag].group);
-
-        const $label = $(`label.awesome_map-hashtag-${hashtag.tag}`);
-        // update number of items
-        $label.attr("title", (parseInt($label.attr("title") || 0) + 1) + " " +  window.DecidimAwesome.texts.items);
-      });
-    }
-  };
-
-  exports.AwesomeMap.layers = layers;
-  exports.AwesomeMap.control = control;
-  exports.AwesomeMap.cluster = cluster;
-  exports.AwesomeMap.addProposalsControls = addProposalsControls;
-  exports.AwesomeMap.addMeetingsControls = addMeetingsControls;
-  exports.AwesomeMap.addSearchControls = addSearchControls;
-  exports.AwesomeMap.addCategoriesControls = addCategoriesControls;
-  exports.AwesomeMap.addHashtagsControls = addHashtagsControls;
-  exports.AwesomeMap.hashtagAdded = $.noop;
-})(window);

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

@@ -1,218 +0,0 @@
-// = require jsrender.min
-// = require decidim/map
-// = require leaflet.featuregroup.subgroup
-// = require decidim/decidim_awesome/awesome_map/utilities
-// = require decidim/decidim_awesome/awesome_map/categories
-// = require decidim/decidim_awesome/awesome_map/legacy_proposals
-// = require decidim/decidim_awesome/awesome_map/meetings
-// = require_self
-
-((exports) => {
-  const { fetchProposals, fetchMeetings, getCategory, amendments } = 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 = "legacy-marker-proposal-popup";
-
-  const cluster = L.markerClusterGroup();
-  const layers = {};
-
-  const control = L.control.layers(null, null, {
-    position: 'topleft',
-    sortLayers: false,
-    collapsed: collapsedMenu,
-    // hideSingleBase: true
-  });
-  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]) {
-      marker.addTo(layers[cat.id].group);
-      // show category if hidden
-      const $label = $(`.awesome_map-category_${cat.id}`).closest("label");
-      const $parent = $(`.awesome_map-category_${cat.parent}`).closest("label");
-      $label.show();
-      // update number of items
-      $label.attr("title", parseInt($label.attr("title") || 0) + 1);
-      // show parent if apply
-      $parent.show();
-      $parent.attr("title", parseInt($parent.attr("title") || 0) + 1);
-      // update component stats
-      const $component = $(`#awesome_map-component-${component.id}`);
-      $component.attr("title", parseInt($component.attr("title") || 0) + 1);
-    }
-
-    return marker;
-  };
-
-  const loadElements = (map) => {
-    // legends
-    control.addTo(map);
-    cluster.addTo(map);
-
-    // Load markers
-    components.forEach((component) => {
-      if(component.type == "proposals") {
-        // add control layer for proposals
-        layers.proposals = {
-          label: `<span id="awesome_map-component-${component.id}" title="0">${component.name || window.DecidimAwesome.texts.proposals}</span>`,
-          group: L.featureGroup.subGroup(cluster)
-        };
-        control.addOverlay(layers.proposals.group, layers.proposals.label);
-        layers.proposals.group.addTo(map);
-
-        // 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.amendments}</span>`,
-            group: L.featureGroup.subGroup(cluster)
-          }
-          control.addOverlay(layers.amendments.group, layers.amendments.label);
-          layers.amendments.group.addTo(map);
-        }
-
-        fetchProposals(component, '', (element, marker) => {
-            if(show[element.state || 'notAnswered']) {
-              drawMarker(element, marker, component).addTo(layers.proposals.group)
-            }
-          }, () => {
-            // finall call
-            map.fitBounds(cluster.getBounds(), { padding: [50, 50] });
-            allMarkers.forEach((item) => {
-              // add marker to amendments layers if it's an amendment
-              if(amendments.find((a) => a == item.element.id)) {
-                item.marker.removeFrom(layers.proposals.group);
-                item.marker.addTo(layers.amendments.group);
-              }
-            });
-          });
-      }
-
-      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>`,
-          group: L.featureGroup.subGroup(cluster)
-        };
-        control.addOverlay(layers.meetings.group, layers.meetings.label);
-        layers.meetings.group.addTo(map);
-
-        fetchMeetings(component, '', (element, marker) => {
-            drawMarker(element, marker, component).addTo(layers.meetings.group);
-          }, () => {
-            map.fitBounds(cluster.getBounds(), { padding: [50, 50] });
-          });
-      }
-    });
-
-
-    // add categories control layers
-    if(window.AwesomeMap.categories.length) {
-      let lastLayer = layers[Object.keys(layers)[Object.keys(layers).length - 1]];
-      // Add Categories "title"
-      if(lastLayer) {
-        lastLayer.label = `${lastLayer.label}<hr><b>${window.DecidimAwesome.texts.categories}</b>`;
-        control.removeLayer(lastLayer.group);
-        control.addOverlay(lastLayer.group, lastLayer.label);
-      }
-
-      window.AwesomeMap.categories.forEach((category) => {
-        // add control layer for this category
-        layers[category.id] = {
-          label: `<i class="awesome_map-category_${category.id}"></i> ${category.name}`,
-          group: L.featureGroup.subGroup(cluster)
-        };
-        layers[category.id].group.addTo(map);
-        control.addOverlay(layers[category.id].group, layers[category.id].label);
-        // hide layer by default, it will be activated if there's any marker in it
-        setTimeout(() => {
-          $(`.awesome_map-category_${category.id}`).closest("label").hide();
-        });
-      });
-
-      // watch events for subcategories syncronitzation
-      const getCatFromClass = (name) => {
-        let id = name.match(/awesome_map-category_(\d+)/)
-        if(!id) return;
-        const cat = getCategory(id[1]);
-        if(!cat || !cat.name) return;
-
-        return cat;
-      };
-
-      const indeterminateInput = (id) => {
-        $('[class^="awesome_map-category_"]').parent().prev().prop("indeterminate", false);
-        if(id) {
-          let $input = $(`.awesome_map-category_${id}`).parent().prev();
-          if(!$input.prop("checked")) {
-            $input.prop("indeterminate", true);
-          }
-        }
-      };
-
-      map.on('overlayadd', (e) => {
-        const cat = getCatFromClass(e.name);
-        if(!cat) return;
-        // if it's a children, put the parent to indeterminate
-        indeterminateInput(cat.parent);
-      });
-
-      // on remove a parent category, remove all children
-      map.on('overlayremove', (e) => {
-        const cat = getCatFromClass(e.name);
-        if(!cat) return;
-        cat.children().forEach((c) => {
-          let $el = $(`.awesome_map-category_${c.id}`);
-          if($el.parent().prev().prop("checked")) {
-            $el.click();
-          }
-        });
-      });
-
-    }
-
-  };
-
-  // 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();
-
-})(window);

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

@@ -1,83 +0,0 @@
-// = 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, truncate } = 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 = truncate(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,211 +0,0 @@
-// = require decidim/decidim_awesome/awesome_map/layers
-// = require decidim/decidim_awesome/awesome_map/utilities
-// = require decidim/decidim_awesome/awesome_map/markers
-// = require decidim/decidim_awesome/awesome_map/categories
-// = require decidim/decidim_awesome/awesome_map/proposals
-// = require decidim/decidim_awesome/awesome_map/meetings
-// = require_self
-
-((exports) => {
-  const {
-    layers,
-    cluster,
-    control,
-    addProposalsControls,
-    addMeetingsControls,
-    addSearchControls,
-    addCategoriesControls,
-    addHashtagsControls,
-    fetchProposals,
-    fetchMeetings,
-    options,
-    show,
-    components,
-    amendments,
-    allMarkers,
-    drawMarker,
-    getCategory
-  } = exports.AwesomeMap;
-
-  exports.AwesomeMap.allMarkersLoaded = $.noop;
-
-  const autoResizeMap = (map) => {
-    // Setup center/zoom options if specified, otherwise fitbounds
-    if(options.center) {
-      map.setView(options.center, options.zoom);
-    } else {
-      map.fitBounds(cluster.getBounds(), { padding: [50, 50] });
-    }
-  };
-
-  const loadElements = (map) => {
-    // legends
-    control.addTo(map);
-    cluster.addTo(map);
-
-    // Load markers
-    components.forEach((component) => {
-      if(component.type == "proposals") {
-        addProposalsControls(map, component);
-
-        fetchProposals(component, '', (element, marker) => {
-            // console.log(element.state, show[element.state || 'notAnswered'], show, element);
-            if(show[element.state || 'notAnswered']) {
-              drawMarker(element, marker, component).addTo(layers.proposals.group);
-              // Add hashtags menu items here, only hashtags with proposals associated will be present
-              if(options.menu.hashtags) {
-                addHashtagsControls(map, element.hashtags, marker);
-              }
-            }
-          }, () => { // final call
-            // Setup center/zoom options if specified, otherwise fitbounds
-            autoResizeMap(map);
-
-            allMarkers.forEach((item) => {
-              // add marker to amendments layers if it's an amendment
-              if(amendments.find((a) => a == item.element.id)) {
-                item.marker.removeFrom(layers.proposals.group);
-                if(options.menu.amendments) {
-                  item.marker.addTo(layers.amendments.group);
-                }
-              }
-            });
-            // Call a trigger, might be useful for customizations
-            exports.AwesomeMap.allMarkersLoaded();
-          });
-        }
-
-        if(options.menu.meetings && component.type == "meetings") {
-          addMeetingsControls(map, component);
-
-          fetchMeetings(component, '', (element, marker) => {
-            drawMarker(element, marker, component).addTo(layers.meetings.group);
-          }, () => autoResizeMap(map) );
-        }
-      });
-
-    /*
-    * We add all categories and hide those that have no proposals
-    * This is done this way to ensure all parent categories are displayed
-    * even if the have not proposals associated
-    */
-    addSearchControls(map);
-    addCategoriesControls(map);
-
-    // category events
-    $("#awesome-map").on("change", ".awesome_map-categories-selector", (e) => {
-      e.preventDefault();
-      e.stopPropagation();
-      const id = $(e.target).closest("label").data("layer");
-      const cat = getCategory(id);
-      // console.log("changed, layer", id, "cat", cat, "checked", e.target.checked, e);
-      if(cat) {
-        const layer = layers[cat.id];
-        if(e.target.checked) {
-          // show group of markers
-          map.addLayer(layer.group);
-
-          // if it's a children, put the parent to indeterminate
-          indeterminateInput(cat.parent);
-        } else {
-          // hide group of markers
-          map.removeLayer(layer.group);
-          // if it's a children, put the parent to indeterminate
-          cat.children().forEach((c) => {
-            let $el = $(`.awesome_map-category-${c.id}`);
-            if($el.parent().prev().prop("checked")) {
-              $el.click();
-            }
-          });
-        }
-        // sync tags
-        updateHashtagLayers();
-      }
-    });
-
-    const indeterminateInput = (id) => {
-      $('[class^="awesome_map-category-"]').parent().prev().prop("indeterminate", false);
-      if(id) {
-        let $input = $(`.awesome_map-category-${id}`).parent().prev();
-        if(!$input.prop("checked")) {
-          $input.prop("indeterminate", true);
-        }
-      }
-    };
-
-    const updateHashtagLayers = () => {
-      // hide all
-      $(".awesome_map-hashtags-selector").each((_idx, el) => {
-        const layer = layers[$(el).closest("label").data("layer")];
-        if(layer) {
-          map.removeLayer(layer.group);
-        }
-      });
-      // show selected only
-      $(".awesome_map-hashtags-selector:checked").each((_idx, el) => {
-        const layer = layers[$(el).closest("label").data("layer")];
-        if(layer) {
-          map.addLayer(layer.group);
-        }
-      });
-      // hide non-selected categories
-      $(".awesome_map-categories-selector:not(:checked)").each((_idx, el) => {
-        const layer = layers[$(el).closest("label").data("layer")];
-        console.log(el, layer, map)
-        if(layer) {
-          map.addLayer(layer.group);
-          map.removeLayer(layer.group);
-        }
-      });
-    };
-
-    // hashtag events
-    $("#awesome-map").on("change", ".awesome_map-hashtags-selector", (e) => {
-      e.preventDefault();
-      e.stopPropagation();
-      const tag = $(e.target).closest("label").data("layer");
-      // console.log("changed, layer", tag, "checked", e.target.checked, e);
-      if(tag) {
-        updateHashtagLayers();
-      }
-    });
-
-    // select/deselect all tags
-    $("#awesome-map").on("click", ".awesome_map-toggle_all_tags", (e) => {
-      e.preventDefault();
-      e.stopPropagation();
-      $("#awesome-map .awesome_map-hashtags-selector").prop("checked", $("#awesome-map .awesome_map-hashtags-selector:checked").length < $("#awesome-map .awesome_map-hashtags-selector").length);
-      updateHashtagLayers();
-    });
-
-    // sub-layer hashtag title toggle
-    $("#awesome-map").on("click", ".awesome_map-title-control", (e) => {
-      e.preventDefault();
-      e.stopPropagation();
-      $("#awesome_map-hashtags-control").toggleClass("active");
-    });
-  };
-
-
-  $("#map").on("ready.decidim", (_e, map) => {
-    if(options.center) {
-      map.setView(options.center, options.zoom);
-    }
-    loadElements(map);
-
-    // order hashtags alphabetically
-    exports.AwesomeMap.hashtagAdded = (_hashtag, $div) => {
-      let $last = $div.contents("label:last");
-      if($last.prev("label").length) {
-        // move the label to order it alphabetically
-        $div.contents("label").each((_idx, el) => {
-          if($(el).text().localeCompare($last.text()) > 0) {
-            $(el).before($last);
-            return false;
-          }
-        });
-      }
-    };
-  });
-
-})(window);

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

@@ -1,56 +0,0 @@
-// = 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);