decidim-decidim_awesome 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04e8fa0ca3025c7bdd3f21508e1bcf3046546483782fd0f9348f804e6f6b137
-  data.tar.gz: 400190dfe91cf0bd6e06ec4c58594c11981191a7b8b63d83b6f9e0aee220d61c
+  metadata.gz: b4110437605bf9896fee1a5becc6c16f6b91ece51cb3721efe261b7db6c14c88
+  data.tar.gz: 7175bbc19bddc7a8fd674a19d340836a13e09afbd64f6256430695fe49460b91
 SHA512:
-  metadata.gz: 0e06d6ae9a8698e51dfc11d16349e4c6906c9a8037d6bb53cbf700ed7b39c7550e6ad0c923f9675fd3f2bd28729e22e24dcdcb085a1f168511e41be0f88fee56
-  data.tar.gz: 769c204652bf08908913b06f834e4eef814b08b07e7c7869f7ea2a2d4741a57a6e86fb8bbf355b2066ecbba32bb7dbda57e57ae614b58b56413ccff95bab778b
+  metadata.gz: 3a0aca02ca09a39d27444e9650c804817c47b7fbaf902dc7c0e546b28301705287da973ae72ed7a64a8dfa5d3a84baa039393e4b313e1394ace09cef61d28307
+  data.tar.gz: c2e343284fdc6e1062e465ecf88724b86bb6a8e68ab759abc4c23353473cb45ee9a855d3e52431b46ae97f916800eb083f73b2c7073d79c26b317dd6f03fc152

data/README.md

@@ -183,7 +183,6 @@ Or check your migration status with:
 RAILS_ENV=production bin/rails decidim_awesome:active_storage_migrations:check_migration_from_carrierwave
 ```
 
-
 The correct version of Decidim Awesome should resolved automatically by the Bundler.
 However you can force some specific version using `gem "decidim-decidim_awesome", "~> 0.8.0"` in the Gemfile.
 

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

@@ -10,6 +10,7 @@ module Decidim
         include NeedsAwesomeConfig
         helper ConfigConstraintsHelpers
         helper SystemCheckerHelpers
+        helper CookiesHelper
 
         layout "decidim/admin/decidim_awesome"
 
@@ -24,11 +25,11 @@ module Decidim
         private
 
         def head
-          @head ||= Nokogiri::HTML(render_to_string(partial: "layouts/decidim/head"))
+          @head ||= Nokogiri::HTML(render_template("layouts/decidim/head"))
         end
 
         def admin_head
-          @admin_head = Nokogiri::HTML(render_to_string(partial: "layouts/decidim/admin/header"))
+          @admin_head = Nokogiri::HTML(render_template("layouts/decidim/admin/header"))
         end
 
         def head_addons(part)
@@ -52,6 +53,12 @@ module Decidim
              '<%= javascript_pack_tag "decidim_decidim_awesome_custom_fields" if awesome_proposal_custom_fields %>'].join("\n")
           end
         end
+
+        def render_template(partial)
+          render_to_string(partial: partial)
+        rescue ActionView::Template::Error => e
+          flash.now[:alert] = "Partial [#{partial}] has thrown an error: #{e.message}"
+        end
       end
     end
   end

data/app/packs/src/decidim/decidim_awesome/awesome_map/api/fetcher.js

@@ -8,6 +8,7 @@ export default class Fetcher {
     };
     this.onFinished = () => {};
     this.onNode = () => {};
+    this.onCollection = () => {};
     this.hashtags = [];
 
     this.collection = this.controller.component.type;
@@ -43,6 +44,8 @@ export default class Fetcher {
           }
         });
 
+        this.onCollection(collection);
+
         if (collection.pageInfo.hasNextPage) {
           this.fetch(collection.pageInfo.endCursor);
         } else {
@@ -80,7 +83,7 @@ export default class Fetcher {
   collectHashtags(text) {
     let tags = [];
     if (text) {
-      const gids = text.match(/gid:\/\/[^\s<]+/g)
+      const gids = text.match(/gid:\/\/[^\s<&]+/g)
       if (gids) {
         tags = gids.filter((gid) => gid.indexOf("/Decidim::Hashtag/") != -1).map((gid) => {
           const parts = gid.split("/");
@@ -115,7 +118,7 @@ export default class Fetcher {
   }
 
   removeHashtags(text) {
-    return text.replace(/gid:\/\/[^\s<]+/g, "");
+    return text.replace(/gid:\/\/[^\s<&]+/g, "");
   }
 
   appendHtmlHashtags(text, tags) {

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

@@ -40,7 +40,6 @@ export default class AwesomeMap {
     this.cluster = new L.MarkerClusterGroup();
     this.map.addLayer(this.cluster);
     this.controls = new ControlsUI(this);
-    this.allMarkers = [];
     this.onFinished = () => {};
     this.controllers = {};
     this.loading = [];

data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/controller.js

@@ -10,8 +10,7 @@ export default class Controller {
       group: new L.FeatureGroup.SubGroup(this.awesomeMap.cluster)
     };
     this.onFinished = () => {};
-    this.allMarkers = [];
-
+    this.allNodes = [];
   }
 
   getLabel() {
@@ -27,6 +26,21 @@ export default class Controller {
       // console.log(`all ${this.component.type} loaded`, this)
       this._onFinished();
     };
+    this.fetcher.onCollection = (collection) =>  {
+      if (collection && collection.edges)  { 
+        // Add markers to the main cluster group
+        try {
+          this.awesomeMap.cluster.addLayers(collection.edges.map((item) => item.node.marker));
+        } catch (e) {
+          console.error("Failed marker collection assignation", collection);
+        }
+        // subgroups don't have th addLayers utility
+        collection.edges.forEach((item) => {
+          this.addMarkerCategory(item.node.marker, item.node.category);
+          this.addMarkerHashtags(item.node.marker, item.node.hashtags);
+        });
+      }
+    };
   }
 
   addControls() {
@@ -40,16 +54,20 @@ export default class Controller {
 
   addMarker(marker, node) {
 
-    /* theorically, this should be enough to create popups on markers but looks that there is som bug in leaflet that sometimes prevents this to work
-    let node = document.createElement("div");
-    // console.log("addMarker", marker, "node", node)
-    node.innerHTML = $.templates(`#${this.templateId}`).render(node);
-    marker.bindPopup(node, {
+    /* 
+    theorically, this should be enough to create popups on markers but it looks that
+    there is some bug in leaflet that sometimes prevents this to work
+    */
+    /*
+    let dom = document.createElement("div");
+    // console.log("addMarker", marker, "dom", dom)
+    dom.innerHTML = $.templates(`#${this.templateId}`).render(node);
+    marker.bindPopup(dom, {
       maxwidth: 640,
       minWidth: 500,
       keepInView: true,
       className: "map-info"
-    }); */
+    }); //*/
 
     marker.on("click", () => {
       let dom = document.createElement("div");
@@ -62,40 +80,40 @@ export default class Controller {
         className: "map-info"
 
       }).setLatLng(marker.getLatLng()).setContent(dom);
-      this.awesomeMap.map.addlayer(pop);
-    });
-
-    this.controls.group.addLayer(marker);
-
-    this.allMarkers.push({
-      marker: marker,
-      component: this.component,
-      node: node
+      this.awesomeMap.map.addLayer(pop);
     });
-
-    this.addMarkerCategory(marker, node.category);
-    this.addMarkerHashtags(marker, node.hashtags);
+    node.marker = marker;
+    node.component = this.component;
+    this.allNodes.push(node);
   }
 
   addMarkerCategory(marker, category) {
     // Add to category layer
     const cat = this.awesomeMap.getCategory(category);
     if (this.awesomeMap.layers[cat.id]) {
-      marker.addTo(this.awesomeMap.layers[cat.id].group);
-      this.awesomeMap.controls.showCategory(cat);
+      try {
+        this.awesomeMap.layers[cat.id].group.addLayer(marker);
+        this.awesomeMap.controls.showCategory(cat);
+      } catch (e) {
+        console.error("Failed category marker assignation", marker, e.message);
+      }
     }   
   }
 
   addMarkerHashtags(marker, hashtags) {
     // Add hashtag layer
     if (this.awesomeMap.config.menu.hashtags) {
-      this.awesomeMap.controls.addHashtagsControls(hashtags, marker);
+      try {
+        this.awesomeMap.controls.addHashtagsControls(hashtags, marker);
+      } catch (e) {
+        console.error("Failed hashtags marker assignation", marker, e.message);
+      }
     }
   }
 
   // Override if needed (call this.onFinished() at the end!)
   _onFinished() {
-    this.awesomeMap.controls.updateStats(`component_${this.component.id}`, this.allMarkers.length);
+    this.awesomeMap.controls.updateStats(`component_${this.component.id}`, this.allNodes.length);
     this.onFinished();
   }
 

data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/proposals_controller.js

@@ -57,12 +57,12 @@ export default class ProposalsController extends Controller {
 
   _onFinished() {
     const iterableAmendments = Object.entries(this.amendments);
-    this.awesomeMap.controls.updateStats(`component_${this.component.id}`, this.allMarkers.length - iterableAmendments.length);
+    this.awesomeMap.controls.updateStats(`component_${this.component.id}`, this.allNodes.length - iterableAmendments.length);
     this.awesomeMap.controls.updateStats(`amendments_${this.component.id}`, iterableAmendments.length);
 
     // Process all amendments
     iterableAmendments.forEach((amendment) => {
-      const marker = this.allMarkers.find((item) => item.node.id == amendment[0]);
+      const marker = this.allNodes.find((node) => node.id == amendment[0]);
       const parent = amendment[1];
       // console.log("marker", marker, "parent proposal", parent)
       // add marker to amendments layers and remove it from proposals

data/app/packs/src/decidim/decidim_awesome/awesome_map/controls_ui.js

@@ -71,7 +71,7 @@ export default class ControlsUI {
       const label = `<i class="awesome_map-category_${category.id}"></i> ${category.name}`;
       this.awesomeMap.layers[category.id] = {
         label: label,
-        group: L.featureGroup.subGroup(this.awesomeMap.cluster)
+        group: new L.FeatureGroup.SubGroup(this.awesomeMap.cluster)
       };
       this.awesomeMap.layers[category.id].group.addTo(this.awesomeMap.map);
       $("#awesome_map-categories-control .categories-container").append(`<label data-layer="${category.id}" class="awesome_map-category-${category.id}${category.parent
@@ -122,12 +122,12 @@ export default class ControlsUI {
             label: hashtag.name,
             group: new L.FeatureGroup.SubGroup(this.awesomeMap.cluster)
           };
-          this.awesomeMap.layers[hashtag.tag].group.addTo(this.awesomeMap.map);
+          this.awesomeMap.map.addLayer(this.awesomeMap.layers[hashtag.tag].group);
           $("#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
           this.onHashtag(hashtag, $("#awesome_map-hashtags-control .hashtags-container"));
         }
-        marker.addTo(this.awesomeMap.layers[hashtag.tag].group);
+        this.awesomeMap.layers[hashtag.tag].group.addLayer(marker);
 
         const $label = $(`label.awesome_map-hashtag-${hashtag.tag}`);
         // update number of items

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

@@ -84,6 +84,7 @@ export function createQuillEditor(container) {
       }
     }
   };
+
   const $input = $(container).siblings('input[type="hidden"]');
   container.innerHTML = $input.val() || "";
   const token = $('meta[name="csrf-token"]').attr("content");

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

@@ -68,8 +68,9 @@ window.fbControls.push(function(controlClass, allControlClasses) {
         `,
         { type: "text/css" }
       );
-      // console.log("build value", value, "userData", userData, "attrs", attrs, attrs.id);
-      this.wrapper = this.markup("div", null, attrs);
+      const wrapper_attrs = {...attrs, "data-toolbar": "full" };
+      // console.log("build value", value, "userData", userData, "attrs", attrs, attrs.id, "wrapper_attrs", wrapper_attrs);
+      this.wrapper = this.markup("div", null, wrapper_attrs);
       return this.markup("div", [css, this.input, this.wrapper], attrs);
     }
 

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

@@ -56,7 +56,7 @@
     label {
       line-height: 1;
       font-size: .8rem;
-      margin: 0 0 .5em;
+      margin: 0 .5em .5em;
 
       i {
         display: inline-block;

data/config/locales/ca.yml

@@ -313,14 +313,16 @@ ca:
           success: Imatge pujada correctament
       map_component:
         map:
-          api_not_ready: |
+          api_not_ready: |2
             <b>Avís:</b> aquesta instal·lació de Decidim té l'API configurada amb una complexitat màxima de <b>%{current_complexity}</b>.
             Aquest component probablement no funcionarà amb aquesta configuració. Us recomanem que la configureu en un inicialitzador
             (per exemple, al final de <code>config/initializers/decidim.rb</code>) hi poseu les línies següents:<br>
             <br>
             <pre># Configuració de l'API
-            Decidim::Api::Schema.max_complexity = 5000
-            Decidim::Api::Schema.max_depth = 50</pre>
+            Rails.application.config.to_prepare do
+              Decidim::Api::Schema.max_complexity = 5000
+              Decidim::Api::Schema.max_depth = 50
+            end</pre>
           error:
             unavailable: El mapa no està disponible. SI us plau, configureu la geolocalització en aquesta instal·lació per activar aquest component.
           show:

data/config/locales/cs.yml

@@ -313,14 +313,16 @@ cs:
           success: Obrázek byl úspěšně nahrán
       map_component:
         map:
-          api_not_ready: |
+          api_not_ready: |2
             <b>Upozornění:</b> Tato instalace Decidim má API nastaveno na maximální složitost <b>%{current_complexity}</b>.
             Tato komponenta pravděpodobně nebude fungovat v této konfiguraci. Doporučujeme nastavit v inicializátoru
             (například na konci <code>config/initializers/decidim.rb</code>) následující řádky:<br>
             <br>
             <pre># Konfigurace Api
-            Decidim::Api::Schema.max_complexity = 5000
-            Decidim::Api::Schema.max_depth = 50</pre>
+            Rails.application.config.to_prepare do
+              Decidim::Api::Schema.max_complexity = 5000
+              Decidim::Api::Schema.max_depth = 50
+            end</pre>
           error:
             unavailable: Mapa není dostupná. Pro povolení této komponenty nakonfigurujte geocoding.
           show:

data/config/locales/en.yml

@@ -378,8 +378,10 @@ en:
             (for instance at the end of the <code>config/initializers/decidim.rb</code>) the following lines:<br>
             <br>
             <pre># Api configuration
-            Decidim::Api::Schema.max_complexity = 5000
-            Decidim::Api::Schema.max_depth = 50</pre>
+            Rails.application.config.to_prepare do
+              Decidim::Api::Schema.max_complexity = 5000
+              Decidim::Api::Schema.max_depth = 50
+            end</pre>
           error:
             unavailable: The map is unavailable. Please configure geocoding to enable
               this component.

data/config/locales/es.yml

@@ -313,14 +313,16 @@ es:
           success: Imagen subida correctamente
       map_component:
         map:
-          api_not_ready: |
+          api_not_ready: |2
             <b>Advertencia:</b> Esta instalación de Decidim tiene la API configurada a una complejidad máxima de <b>%{current_complexity}</b>.
             Este componente probablemente no funcione correctament bajo esta configuración. Es recomendado configurar en un inicializador
             (por ejemplo al final de <code>config/initializers/decidim. b</code>) añadir las siguientes líneas:<br>
             <br>
             <pre># Configuración de Api
-            Decidim::Api::Schema. ax_complexity = 5000
-            Decidim::Api::Schema.max_depth = 50</pre>
+            Rails.application.config.to_prepare do
+              Decidim::Api::Schema. ax_complexity = 5000
+              Decidim::Api::Schema.max_depth = 50
+            end</pre>
           error:
             unavailable: El mapa no está disponible. Por favor, configure la geocodificación para habilitar este componente.
           show:

data/config/locales/fr.yml

@@ -313,14 +313,16 @@ fr:
           success: Image ajoutée avec succès
       map_component:
         map:
-          api_not_ready: |
+          api_not_ready: |2
             <b>Attention :</b> Cette installation de Decidim a l'API configurée à une complexité maximale de <b>%{current_complexity}</b>.
             Ce composant ne fonctionnera probablement pas avec cette configuration. Nous vous recommandons de configurer dans un initialiseur
             (par exemple à la fin de <code>config/initializers/decidim.rb</code>) les lignes suivantes :<br>
             <br>
             <pre># Configuration Api
-            Decidim::Api::Schema.max_complexity = 5000
-            Decidim::Api::Schema.max_depth = 50</pre>
+            Rails.application.config.to_prepare do
+              Decidim::Api::Schema.max_complexity = 5000
+              Decidim::Api::Schema.max_depth = 50
+            end</pre>
           error:
             unavailable: La carte n'est pas disponible. Veuillez configurer le géocodage pour activer ce composant.
           show:

data/config/locales/it.yml

@@ -313,14 +313,16 @@ it:
           success: Immagine caricata correttamente
       map_component:
         map:
-          api_not_ready: |
+          api_not_ready: |2
             <b>Attenzione:</b> Questa installazione di Decidim ha configurato l'API ad una complessità massima di <b>%{current_complexity}</b>.
             Questo componente probabilmente non funzionerà con questa configurazione, Si consiglia di impostare in un initializer
             (per esempio alla fine del <code>config/initializers/decidim.rb</code>) con il seguente contenuti:<br>
             <br>
             <pre># Configurazione API
-            Decidim::Api::Schema.max_complexity = 5000
-            Decidim::Api::Schema.max_depth = 50</pre>
+            Rails.application.config.to_prepare do
+              Decidim::Api::Schema.max_complexity = 5000
+              Decidim::Api::Schema.max_depth = 50
+            end</pre>
           error:
             unavailable: La mappa non è disponibile. Configura la geocodifica per abilitare questo componente.
           show:

data/config/locales/ja.yml

@@ -314,12 +314,14 @@ ja:
           success: 画像は正常にアップロードされました
       map_component:
         map:
-          api_not_ready: |
+          api_not_ready: |2
             <b>警告:</b> この Decidim のインストールでは、APIの最大複雑度が <b>%{current_complexity}</b> に設定されています。このコンポーネントは、この設定では動作しないかもしれません。初期化の設定を (例えば<code>config/initializers/decidim.rb</code>の末尾で) 以下のようにすることを推奨します:<br>
             <br>
             <pre># Api configuration
-            Decidim::Api::Schema.max_complexity = 5000
-            Decidim::Api::Schema.max_depth = 50</pre>
+            Rails.application.config.to_prepare do
+              Decidim::Api::Schema.max_complexity = 5000
+              Decidim::Api::Schema.max_depth = 50
+            end</pre>
           error:
             unavailable: マップは利用できません。このコンポーネントを有効にするにはジオコーディングを設定してください。
           show:

data/config/locales/pt-BR.yml

@@ -313,14 +313,16 @@ pt-BR:
           success: Imagem enviada com sucesso
       map_component:
         map:
-          api_not_ready: |
+          api_not_ready: |2
             <b>Aviso:</b> Esta instalação Decidim tem a API configurada para uma complexidade máxima de <b>%{current_complexity}</b>.
             Este componente provavelmente não funcionará sob esta configuração. Recomendamos que você configure em um inicializador
             (por exemplo, no final do <code>config/initializers/decidim. b</code>) as seguintes linhas:<br>
             <br>
             <pre># Configuração de Api
-            Decidim::Api::Schema. ax_complexidade = 5000
-            Decidim::Api::Schema.max_depth = 50</pre>
+            Rails.application.config.to_prepare do
+              Decidim::Api::Schema. ax_complexidade = 5000
+              Decidim::Api::Schema.max_depth = 50
+            end</pre>
           error:
             unavailable: O mapa está indisponível. Por favor configure a geocodificação para habilitar este componente.
           show:

data/lib/decidim/decidim_awesome/iframe_component/component.rb

@@ -5,7 +5,7 @@ require "decidim/components/namer"
 Decidim::DecidimAwesome.register_component(:awesome_iframe) do |component|
   component.engine = Decidim::DecidimAwesome::IframeComponent::Engine
   component.admin_engine = Decidim::DecidimAwesome::IframeComponent::AdminEngine
-  component.icon = "decidim/meetings/icon.svg" # TODO: create a Icon
+  component.icon = "media/images/decidim_meetings.svg" # TODO: create a Icon
   component.permissions_class_name = "Decidim::DecidimAwesome::Permissions"
 
   # These actions permissions can be configured in the admin panel

data/lib/decidim/decidim_awesome/map_component/component.rb

@@ -5,7 +5,7 @@ require "decidim/components/namer"
 Decidim::DecidimAwesome.register_component(:awesome_map) do |component|
   component.engine = Decidim::DecidimAwesome::MapComponent::Engine
   component.admin_engine = Decidim::DecidimAwesome::MapComponent::AdminEngine
-  component.icon = "decidim/meetings/icon.svg" # TODO: create a Icon
+  component.icon = "media/images/decidim_meetings.svg" # TODO: create a Icon
   component.permissions_class_name = "Decidim::DecidimAwesome::Permissions"
 
   # These actions permissions can be configured in the admin panel

data/lib/decidim/decidim_awesome/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
     COMPAT_DECIDIM_VERSION = [">= 0.25.0", "< 0.27"].freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-decidim_awesome
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin