decidim-decidim_awesome 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32cc1fc0147bd8a5daf75a5deab25f18ede902f0ceb8c9a4a0073528dec97568
-  data.tar.gz: 2ed32bdc25c0e2ab7b5b8b7362adad7a191634290b896e6f3e0f630687ba0824
+  metadata.gz: 431402f5979263fb5886d2285f64cb81bea75efd183e461d87cc3fff5a5f31fd
+  data.tar.gz: 8b842985079085bd7ed837287e051572a6bbe51de233f8b1ccb5b0df63d35316
 SHA512:
-  metadata.gz: df2b4b28994f8ad2f11e87080c683edb9fc8f215c76a7b6e15ebd27df018317fb64daf5f1c9b3910d2bd6c676d746caadec6defdaeb57716509cb9b3b33b67d8
-  data.tar.gz: 95a51e3cf9e87c8b2c9756ad6ab11ab1ee90d252b16f99740a20e190742bb0017e88bb36357ac2031d588bcf792b86d1337fe0685c7dfb309789beb4a7aa6797
+  metadata.gz: 99427312051b0d7f486ba7070cd8eaab79f370cdc8c200e7b0f38de3f90236399fa6c44d86204d2e90d97cda0f15ab62b42a778bbfa8114126df4e70b86b9605
+  data.tar.gz: 31cab4d0be0fc9d3add07cf9e33976cf6708ed96771d55c57415b9d0fcd060f09a8f1b2275fbeca284c7e9e168494849c40bc02bd1db6fedc0b03bbf2eb78100

data/README.md

@@ -1,6 +1,7 @@
 # Decidim::DecidimAwesome
 
-[![Build](https://github.com/Platoniq/decidim-module-decidim_awesome/workflows/Build/badge.svg)](https://github.com/Platoniq/decidim-module-decidim_awesome/actions)
+[![[CI] Test 0.24](https://github.com/Platoniq/decidim-module-decidim_awesome/actions/workflows/test%20-24.yml/badge.svg)](https://github.com/Platoniq/decidim-module-decidim_awesome/actions/workflows/test%20-24.yml)
+[![[CI] Test 0.23](https://github.com/Platoniq/decidim-module-decidim_awesome/actions/workflows/test%20-23.yml/badge.svg)](https://github.com/Platoniq/decidim-module-decidim_awesome/actions/workflows/test%20-23.yml)
 [![Maintainability](https://api.codeclimate.com/v1/badges/2dada53525dd5a944089/maintainability)](https://codeclimate.com/github/Platoniq/decidim-module-decidim_awesome/maintainability)
 [![Test Coverage](https://codecov.io/gh/Platoniq/decidim-module-decidim_awesome/branch/master/graph/badge.svg?token=TFBMCLLZJG)](undefined)
 
@@ -135,7 +136,7 @@ Some things in the road-map:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "decidim-decidim_awesome", "~> 0.6.6"
+gem "decidim-decidim_awesome", "~> 0.7.0"
 ```
 
 And then execute:
@@ -152,6 +153,7 @@ Depending on your Decidim version, choose the corresponding Awesome version to e
 |---|---|
 | 0.5.x | 0.21.x, 0.22.x |
 | 0.6.x | 0.22.x, 0.23.x |
+| 0.7.x | 0.23.x, 0.24.x |
 
 ## Configuration
 

data/app/assets/config/decidim_admin_decidim_awesome_manifest.js

@@ -1,2 +1,3 @@
 // = link decidim/decidim_awesome/admin.js
+// = link decidim/decidim_awesome/legacy_admin.js
 // = link decidim/decidim_awesome/admin/form_exit_warn.js

data/app/assets/config/decidim_decidim_awesome_manifest.js

@@ -1,3 +1,3 @@
+// = link decidim/decidim_awesome/legacy_application.js
 // = link decidim/decidim_awesome/application.js
-// = link decidim/decidim_awesome/awesome_map/legacy_map.js
 // = link decidim/decidim_awesome/awesome_map/map.js

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

@@ -101,7 +101,7 @@
   };
 
   const fetchMeetings = (component, after, callback, finalCall = () => {}) => {
-    
+
     const variables = {
       "id": component.id,
       "after": after
@@ -111,7 +111,7 @@
       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);

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

@@ -0,0 +1,160 @@
+// = require image-upload.min
+// = require image-resize.min
+// = require inscrybmde.min.js
+// = require inline-attachment.js
+// = require codemirror-4.inline-attachment.js
+// = require jquery.inline-attachment.js
+// = require_self
+
+((exports) => {
+  exports.DecidimAwesome = exports.DecidimAwesome || {};
+
+  // Redefines Quill editor with images
+  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", "alt"];
+
+    const createQuillEditor = (container) => {
+      const toolbar = $(container).data("toolbar");
+      const disabled = $(container).data("disabled");
+
+      let quillToolbar = [
+        ["bold", "italic", "underline"],
+        [{ list: "ordered" }, { list: "bullet" }],
+        ["link", "clean"]
+      ];
+
+      let addImage = false;
+
+      if (toolbar === "full") {
+        quillToolbar = [
+          [{ header: [1, 2, 3, 4, 5, 6, false] }],
+          ...quillToolbar
+        ];
+          if(exports.DecidimAwesome.allow_images_in_full_editor) {
+            quillToolbar.push(["video", "image"]);
+            addImage = true;
+          } else {
+            quillToolbar.push(["video"]);
+          }
+      } else if (toolbar === "basic") {
+          if(exports.DecidimAwesome.allow_images_in_small_editor) {
+            quillToolbar.push(["video", "image"]);
+            addImage = true;
+          } else {
+            quillToolbar.push(["video"]);
+          }
+      } else if(exports.DecidimAwesome.allow_images_in_small_editor) {
+        quillToolbar.push(["image"]);
+        addImage = true;
+      }
+
+      let modules = {
+        toolbar: quillToolbar
+      };
+      const $input = $(container).siblings('input[type="hidden"]');
+      container.innerHTML = $input.val() || "";
+      const token = $( 'meta[name="csrf-token"]' ).attr( 'content' );
+
+      if(addImage) {
+        modules.imageResize = {
+          modules: ["Resize", "DisplaySize"]
+        }
+        modules.imageUpload = {
+          url: exports.DecidimAwesome.editor_uploader_path, // server url. If the url is empty then the base64 returns
+          method: 'POST', // change query method, default 'POST'
+          name: 'image', // custom form name
+          withCredentials: false, // withCredentials
+          headers: { 'X-CSRF-Token': token }, // add custom headers, example { token: 'your-token'}
+          // personalize successful callback and call next function to insert new url to the editor
+          callbackOK: (serverResponse, next) => {
+            $(quill.getModule("toolbar").container).last().removeClass('editor-loading')
+            next(serverResponse.url);
+          },
+          // personalize failed callback
+          callbackKO: serverError => {
+            $(quill.getModule("toolbar").container).last().removeClass('editor-loading')
+            alert(serverError.message);
+          },
+          checkBeforeSend: (file, next) => {
+            $(quill.getModule("toolbar").container).last().addClass('editor-loading')
+            next(file); // go back to component and send to the server
+          }
+        }
+      }
+
+      const quill = new Quill(container, {
+        modules: modules,
+        formats: quillFormats,
+        theme: "snow"
+      });
+
+      if (disabled) {
+        quill.disable();
+      }
+
+      quill.on("text-change", () => {
+        const text = quill.getText();
+
+        // Triggers CustomEvent with the cursor position
+        // It is required in input_mentions.js
+        let event = new CustomEvent("quill-position", {
+          detail: quill.getSelection()
+        });
+        container.dispatchEvent(event);
+
+        if (text === "\n") {
+          $input.val("");
+        } else {
+          $input.val(quill.root.innerHTML);
+        }
+      });
+
+      if(addImage) {
+        const t = window.DecidimAwesome.texts["drag_and_drop_image"];
+        $(container).after(`<p class="help-text" style="margin-top:-1.5rem;">${t}</p>`);
+      }
+    };
+
+    const createMarkdownEditor = (container) => {
+      $(container).hide();
+      const t = window.DecidimAwesome.texts["drag_and_drop_image"];
+      const token = $( 'meta[name="csrf-token"]' ).attr( 'content' );
+      const $input = $(container).siblings('input[type="hidden"]');
+      const inscrybmde = new InscrybMDE({
+        element: $input[0],
+        spellChecker: false,
+        renderingConfig: {
+          codeSyntaxHighlighting: true
+        }
+      });
+
+      // Allow image upload
+      if(window.DecidimAwesome.allow_images_in_markdown_editor) {
+        $(inscrybmde.gui.statusbar).prepend(`<span class="help-text" style="float:left;margin:0;text-align:left;">${t}</span>`);
+        inlineAttachment.editors.codemirror4.attach(inscrybmde.codemirror, {
+          uploadUrl: window.DecidimAwesome.editor_uploader_path,
+          uploadFieldName: "image",
+          jsonFieldName: "url",
+          extraHeaders: { "X-CSRF-Token": token }
+        });
+      }
+    };
+
+    const quillEditor = () => {
+      $(".editor-container").each((idx, container) => {
+        if(exports.DecidimAwesome.use_markdown_editor) {
+          createMarkdownEditor(container);
+        } else {
+          createQuillEditor(container);
+        }
+      });
+    };
+
+    exports.Decidim = exports.Decidim || {};
+    exports.Decidim.quillEditor = quillEditor;
+    exports.Decidim.createQuillEditor = createQuillEditor;
+    exports.Decidim.createMarkdownEditor = createMarkdownEditor;
+
+  }
+})(window);

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

@@ -12,14 +12,14 @@
   // Redefines Quill editor with images
   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", "alt"];
+    const quillFormats = ["bold", "italic", "link", "underline", "header", "list", "video", "image", "alt", "break"];
 
     const createQuillEditor = (container) => {
       const toolbar = $(container).data("toolbar");
       const disabled = $(container).data("disabled");
 
       let quillToolbar = [
-        ["bold", "italic", "underline"],
+        ["bold", "italic", "underline", "linebreak"],
         [{ list: "ordered" }, { list: "bullet" }],
         ["link", "clean"]
       ];
@@ -50,7 +50,13 @@
       }
 
       let modules = {
-        toolbar: quillToolbar
+        linebreak: {},
+        toolbar: {
+          container: quillToolbar,
+          handlers: {
+            "linebreak": exports.Decidim.Editor.lineBreakButtonHandler
+          }
+        }
       };
       const $input = $(container).siblings('input[type="hidden"]');
       container.innerHTML = $input.val() || "";
@@ -109,11 +115,16 @@
           $input.val(quill.root.innerHTML);
         }
       });
-     
+
       if(addImage) {
         const t = window.DecidimAwesome.texts["drag_and_drop_image"];
         $(container).after(`<p class="help-text" style="margin-top:-1.5rem;">${t}</p>`);
       }
+
+      // After editor is ready, linebreak_module deletes two extraneous new lines
+      quill.emitter.emit("editor-ready");
+
+      return quill;
     };
 
     const createMarkdownEditor = (container) => {
@@ -157,4 +168,4 @@
     exports.Decidim.createMarkdownEditor = createMarkdownEditor;
 
   }
-})(window);
+})(window);

data/app/assets/javascripts/decidim/decidim_awesome/legacy_admin.js

@@ -0,0 +1,3 @@
+// = require decidim/decidim_awesome/admin/constraints
+// = require decidim/decidim_awesome/admin/codemirror
+// = require decidim/decidim_awesome/editors/legacy_quill_editor

data/app/assets/javascripts/decidim/decidim_awesome/legacy_application.js

@@ -0,0 +1,4 @@
+// = require decidim/decidim_awesome/proposals/images
+// = require decidim/decidim_awesome/editors/legacy_quill_editor
+// = require decidim/decidim_awesome/editors/markdown_view
+// = require decidim/decidim_awesome/forms/autosave

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

@@ -25,15 +25,9 @@ Decidim::Proposals::ProposalPresenter.class_eval do
     # 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
+    # TODO: remove when 0.23 is ditched
+    text = translated_attribute(proposal.body)
+    text = strip_tags(sanitize_text(text)) if strip_tags
 
     renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
     text = renderer.render(links: links, extras: extras).html_safe

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

@@ -37,7 +37,7 @@ module Decidim
         end
 
         def decidim_version_valid?
-          Gem::Dependency.new("", DecidimAwesome::COMPAT_DECIDIM_VERSION).match?("", decidim_version)
+          Gem::Dependency.new("", DecidimAwesome::COMPAT_DECIDIM_VERSION).match?("", decidim_version, true)
         end
 
         def head_addons(part)

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

@@ -85,7 +85,7 @@ module Decidim
         end
 
         def current_items
-          @current_items ||= current_menu.items(true)
+          @current_items ||= current_menu.items(include_invisible: true)
         end
 
         def current_menu
@@ -101,7 +101,7 @@ module Decidim
         end
 
         def visibility_options
-          MenuForm::VISIBILITY_STATES.map { |key| [I18n.t(".menu_hacks.form.visibility.#{key}", scope: "decidim.decidim_awesome.admin"), key] }.to_h
+          MenuForm::VISIBILITY_STATES.index_by { |key| I18n.t(".menu_hacks.form.visibility.#{key}", scope: "decidim.decidim_awesome.admin") }
         end
 
         def target_options

data/app/controllers/decidim/decidim_awesome/map_component/map_controller.rb

@@ -14,10 +14,7 @@ module Decidim
         private
 
         def maps_enabled?
-          return Decidim::Map.configured? if defined?(Decidim::Map)
-
-          # TODO: remove when 0.22 support is diched
-          Decidim.geocoder.present?
+          Decidim::Map.configured?
         end
 
         def map_components

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

@@ -6,8 +6,6 @@ module Decidim
       include Decidim::MapHelper
 
       def awesome_map_for(components, &block)
-        return legacy_map_for(components, &block) unless defined?(Decidim::Map)
-
         map = dynamic_map_for({}, {}, &block)
         return unless map
 
@@ -39,50 +37,6 @@ module Decidim
         content_tag(:div, map, map_html_options)
       end
 
-      # TODO: remove when 0.22 support is diched
-      def legacy_map_for(components)
-        return if Decidim.geocoder.blank?
-
-        map_html_options = {
-          class: "google-map",
-          id: "map",
-          "data-components" => components.map do |component|
-                                 {
-                                   id: component.id,
-                                   type: component.manifest.name,
-                                   name: translated_attribute(component.name),
-                                   url: Decidim::EngineRouter.main_proxy(component).root_path,
-                                   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-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
-        }
-
-        if Decidim.geocoder[:here_api_key]
-          map_html_options["data-here-api-key"] = Decidim.geocoder[:here_api_key]
-        else
-          # Compatibility mode for old api_id/app_code configurations
-          map_html_options["data-here-app-id"] = Decidim.geocoder[:here_app_id]
-          map_html_options["data-here-app-code"] = Decidim.geocoder[:here_app_code]
-        end
-
-        content = capture { yield }.html_safe
-        help = content_tag(:div, class: "map__help") do
-          content_tag(:p, I18n.t("screen_reader_explanation", scope: "decidim.map.dynamic"), class: "show-for-sr")
-        end
-        content_tag :div, class: "awesome-map" do
-          map = content_tag(:div, "", map_html_options)
-
-          help + map + content
-        end
-      end
-
       # rubocop:disable Rails/HelperInstanceVariable
       def current_categories
         return @current_categories if @current_categories
@@ -102,6 +56,7 @@ module Decidim
 
       private
 
+      # rubocop:disable Style/FormatStringToken
       def append_category(category)
         @h += @golden_ratio_conjugate
         @h %= 1
@@ -114,11 +69,12 @@ module Decidim
           color: format("#%02x%02x%02x", r, g, b)
         )
       end
+      # rubocop:enable Style/FormatStringToken
       # rubocop:enable Rails/HelperInstanceVariable
 
-      # rubocop:disable Naming/UncommunicativeMethodParamName
       # HSV values in [0..1[
       # returns [r, g, b] values from 0 to 255
+      # rubocop:disable Naming/MethodParameterName
       def hsv_to_rgb(h, s, v)
         h_i = (h * 6).to_i
         f = h * 6 - h_i
@@ -157,7 +113,7 @@ module Decidim
         end
         [(r * 256).to_i, (g * 256).to_i, (b * 256).to_i]
       end
-      # rubocop:enable Naming/UncommunicativeMethodParamName
     end
+    # rubocop:enable Naming/MethodParameterName
   end
 end

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

@@ -10,11 +10,6 @@ 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

data/app/views/decidim/decidim_awesome/admin/checks/index.html.erb

@@ -57,7 +57,7 @@
         <ul class="vertical menu">
         <% {
           CSS: "//link[@rel='stylesheet'][contains(@href,'decidim_awesome/admin')]",
-          JavaScript: "//script[contains(@src,'decidim_awesome/admin')]"
+          JavaScript: "//script[contains(@src,'decidim_awesome')]"
           }.each do |part, xpath| %>
           <li>
             <%= part %>

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

@@ -2,28 +2,6 @@
 
 <%= awesome_map_for map_components do %>
 
-  <script id="legacy-marker-proposal-popup" type="text/x-jsrender">
-    <div class="map-info__content">
-      <h3>{{>title}}</h3>
-      <div id="bodyContent">
-        <div class="description">{{:body}}</div>
-        <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>
-
   <script id="marker-proposal-popup" type="text/x-jsrender">
     <div class="map-info__content">
       <h3>{{>title.translation}}</h3>
@@ -82,11 +60,7 @@
       height: <%= current_component.settings.map_height %>px;
     }
     <% current_categories.each do |category| %>
-      /* TODO: remove when diching 0.22 */
-      i.awesome_map-category_<%= category[:id] %> {
-        margin-left: <%= category[:parent] ? "1" : "0" %>em;
-      }
-      .awesome_map-category-<%= category[:id] %> i {
+      .awesome_map-category_<%= category[:id] %> {
         background-color: <%= category[:color] %> !important;
       }
     <% end %>
@@ -95,9 +69,5 @@
     window.AwesomeMap = window.AwesomeMap || {};
     window.AwesomeMap.categories = <%= current_categories.to_json.html_safe %>;
   </script>
-  <% if version_prefix == "v0.23" %>
-    <%= javascript_include_tag "decidim/decidim_awesome/awesome_map/map" %>
-  <% else %>
-    <%= javascript_include_tag "decidim/decidim_awesome/awesome_map/legacy_map" %>
-  <% end %>
+  <%= javascript_include_tag "decidim/decidim_awesome/awesome_map/map" %>
 <% end %>

data/app/views/v0.23/layouts/decidim/_head.html.erb

@@ -36,4 +36,4 @@
 <%= content_for :header_snippets %>
 
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
-<%= javascript_include_tag "decidim/decidim_awesome/application" %>
+<%= javascript_include_tag "decidim/decidim_awesome/legacy_application" %>

data/app/views/v0.23/layouts/decidim/admin/_header.html.erb

@@ -9,4 +9,4 @@
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
 
 <%= stylesheet_link_tag    "decidim/decidim_awesome/admin", media: "all" %>
-<%= javascript_include_tag "decidim/decidim_awesome/admin" %>
+<%= javascript_include_tag "decidim/decidim_awesome/legacy_admin" %>

data/app/views/{v0.22 → v0.24}/layouts/decidim/_head.html.erb

@@ -32,6 +32,8 @@
 
 <%= render partial: "layouts/decidim/head_extra" %>
 <%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>
+<%= snippets.display(:head) %>
+<%= content_for :header_snippets %>
 
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
 <%= javascript_include_tag "decidim/decidim_awesome/application" %>

data/app/views/{v0.22 → v0.24}/layouts/decidim/admin/_header.html.erb

@@ -4,6 +4,7 @@
 <%= javascript_include_tag "decidim/confirm" %>
 <%= javascript_include_tag "decidim/admin/application" %>
 <%= organization_colors %>
+<%= snippets.display(:head) %>
 
 <%= render partial: "layouts/decidim/decidim_awesome/awesome_config" %>
 

data/lib/decidim/decidim_awesome/checksums.yml

@@ -1,23 +1,20 @@
 decidim-admin:
   /app/views/layouts/decidim/admin/_header.html.erb:
-    decidim-0.22: 6af51ec6b8a760b0ee6e00a7834f5f9a
     decidim-0.23: 45f0e15f1b02a1c1a73b1a2184fd55af
 decidim-core:
   /app/views/layouts/decidim/_head.html.erb:
-    decidim-0.22: bf16a58cd9e6d3f73e6875ff3d0b1e48
     decidim-0.23: e7f5eea07e884665474948ea750fc720
   /app/assets/javascripts/decidim/editor.js.es6:
-    decidim-0.22: 797d0ec1c9e79453cf6718f82d2fdd27
     decidim-0.23: cb059b8ff0ffc62c67eb99d8d7a6637b
     decidim-0.23.1: 4787f73f0f33661e3897404f10019d26
+    decidim-0.24: 35262835144421baa700a34ca0939396
   /app/presenters/decidim/menu_presenter.rb:
-    decidim-0.22: 042743c44a2aff284b493c7bebbccbb3
     decidim-0.23: 042743c44a2aff284b493c7bebbccbb3
+    decidim-0.24: 284c96f19cd98df091d8178d6db5a8b3
   /app/presenters/decidim/menu_item_presenter.rb:
-    decidim-0.22: 70db39954b5840924530bf94d2a0a73a
     decidim-0.23: 70db39954b5840924530bf94d2a0a73a
 decidim-proposals:
   /app/presenters/decidim/proposals/proposal_presenter.rb:
-    decidim-0.22: 7d60c8310d7fa4e38d9a27080c22b12c
     decidim-0.23: 437c0c25151f605401a4f14d090ba5ea
     decidim-0.23.1: 892021b2ce9ac10c2e1b738e6948cde0
+    decidim-0.24: 0b6717a3eeecad03277cea5ed6ba1fb7

data/lib/decidim/decidim_awesome/config.rb

@@ -119,9 +119,7 @@ module Decidim
       def enabled_for_organization?(key)
         case key.to_sym
         when :allow_images_in_proposals
-          if @organization.respond_to? :rich_text_editor_in_public_views
-            return false if @organization.rich_text_editor_in_public_views
-          end
+          return false if @organization.rich_text_editor_in_public_views
         end
         true
       end

data/lib/decidim/decidim_awesome/engine.rb

@@ -15,13 +15,13 @@ module Decidim
       end
 
       initializer "decidim_awesome.view_helpers" do
-        ActionView::Base.send :include, AwesomeHelpers
+        ActionView::Base.include AwesomeHelpers
       end
 
       initializer "decidim_decidim_awesome.assets" do |app|
         app.config.assets.precompile += %w(decidim_decidim_awesome_manifest.js decidim_decidim_awesome_manifest.css)
         # add to precompile any present theme asset
-        Dir.glob(Rails.root.join("app", "assets", "themes", "*.*")).each do |path|
+        Dir.glob(Rails.root.join("app/assets/themes/*.*")).each do |path|
           app.config.assets.precompile << path
         end
       end

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

@@ -43,7 +43,7 @@ Decidim.register_component(:awesome_iframe) do |component|
       published_at: Time.current,
       participatory_space: participatory_space,
       settings: {
-        announcement: { en: Faker::Lorem.paragraphs(2).join("\n") }
+        announcement: { en: Faker::Lorem.paragraphs(number: 2).join("\n") }
       }
     }
 

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

@@ -53,7 +53,7 @@ Decidim.register_component(:awesome_map) do |component|
       published_at: Time.current,
       participatory_space: participatory_space,
       settings: {
-        announcement: { en: Faker::Lorem.paragraphs(2).join("\n") }
+        announcement: { en: Faker::Lorem.paragraphs(number: 2).join("\n") }
       }
     }
 

data/lib/decidim/decidim_awesome/menu_hacker.rb

@@ -12,7 +12,7 @@ module Decidim
       end
 
       # returns a combined array of the Decidim defined menu and the hacked stored as config vars
-      def items(include_invisible = false)
+      def items(include_invisible: false)
         return @items if @items
 
         @items = default_items

data/lib/decidim/decidim_awesome/system_checker.rb

@@ -14,7 +14,7 @@ module Decidim
           @overrides = checksums.map do |package, files|
             props = {
               spec: ::Gem::Specification.find_by_name(package),
-              files: files.map { |file, signatures| [file, signatures.values] }.to_h
+              files: files.transform_values(&:values)
             }
             [package, to_struct(props)]
           end

data/lib/decidim/decidim_awesome/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.6.7"
-    COMPAT_DECIDIM_VERSION = [">= 0.22.0", "< 0.24"].freeze
+    VERSION = "0.7.0"
+    COMPAT_DECIDIM_VERSION = [">= 0.23.0", "< 0.25"].freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-decidim_awesome
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Ivan Vergés
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -98,20 +98,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
 description: Some usability and UX tweaks for Decidim.
 email:
 - ivan@platoniq.net
@@ -137,16 +137,17 @@ files:
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/categories.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/hashtags.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/layers.js.es6
-- app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_map.js.es6
-- app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_proposals.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/map.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/markers.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/meetings.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/proposals.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/awesome_map/utilities.js.es6
+- app/assets/javascripts/decidim/decidim_awesome/editors/legacy_quill_editor.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/editors/markdown_view.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/editors/quill_editor.js.es6
 - app/assets/javascripts/decidim/decidim_awesome/forms/autosave.js.es6
+- app/assets/javascripts/decidim/decidim_awesome/legacy_admin.js
+- app/assets/javascripts/decidim/decidim_awesome/legacy_application.js
 - app/assets/javascripts/decidim/decidim_awesome/proposals/images.js.es6
 - app/assets/stylesheets/decidim/decidim_awesome/admin.scss
 - app/assets/stylesheets/decidim/decidim_awesome/admin/codemirror.scss
@@ -222,10 +223,10 @@ files:
 - app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb
 - app/views/layouts/decidim/decidim_awesome/_custom_styles.html.erb
 - app/views/layouts/decidim/decidim_awesome/_intergram_widget.html.erb
-- app/views/v0.22/layouts/decidim/_head.html.erb
-- app/views/v0.22/layouts/decidim/admin/_header.html.erb
 - app/views/v0.23/layouts/decidim/_head.html.erb
 - app/views/v0.23/layouts/decidim/admin/_header.html.erb
+- app/views/v0.24/layouts/decidim/_head.html.erb
+- app/views/v0.24/layouts/decidim/admin/_header.html.erb
 - config/i18n-tasks.yml
 - config/locales/ca.yml
 - config/locales/cs.yml
@@ -303,7 +304,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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);