decidim-decidim_awesome 0.7.2 → 0.8.0

data/lib/decidim/decidim_awesome/config.rb

@@ -115,6 +115,7 @@ module Decidim
       #    collect_sub_configs_values("scoped_style") { true }
       def collect_sub_configs_values(singular_key)
         plural_key = singular_key.pluralize.to_sym
+        return [] unless config[plural_key].respond_to?(:filter)
 
         fields = config[plural_key]&.filter do |key, _value|
           subconfig = sub_configs_for(singular_key)[key]

data/lib/decidim/decidim_awesome/content_parsers/editor_images_parser.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module ContentParsers
+      # A parser that searches for editor images from CarrierWave in html
+      # contents and replaces them with migrated images to ActiveStorage
+      #
+      # @see BaseParser Examples of how to use a content parser
+      class EditorImagesParser < Decidim::ContentParsers::BaseParser
+        # @return [String] the content with the CarrierWave images replaced.
+        def rewrite
+          return content if editor_images.blank?
+
+          replace_editor_images
+          parsed_content.to_html
+        end
+
+        def editor_images
+          @editor_images ||= parsed_content.search(:img).index_with do |image|
+            context[:routes_mappings].find { |mapping| image.attr(:src).end_with?(mapping[:origin_path]) }
+          end.compact
+        end
+
+        private
+
+        def parsed_content
+          @parsed_content ||= Nokogiri::HTML(content)
+        end
+
+        def replace_editor_images
+          editor_images.each do |image, mapping|
+            image.set_attribute(:src, mapping[:instance].attached_uploader(:file).path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/decidim/decidim_awesome/engine.rb

@@ -16,79 +16,51 @@ module Decidim
         post :editor_images, to: "editor_images#create"
       end
 
-      initializer "decidim.middleware" do |app|
-        app.config.middleware.insert_after Decidim::CurrentOrganization, Decidim::DecidimAwesome::CurrentConfig
-      end
-
       # Prepare a zone to create overrides
       # https://edgeguides.rubyonrails.org/engines.html#overriding-models-and-controllers
       # overrides
       config.to_prepare do
-        if DecidimAwesome.config[:scoped_admins] != :disabled
-          # override user's admin property
-          Decidim::User.include(UserOverride)
-          # redirect unauthorized scoped admins to allowed places
-          Decidim::ErrorsController.include(AdminNotFoundRedirect)
+        # activate Decidim LayoutHelper for the overriden views
+        ActiveSupport.on_load :action_controller do
+          helper Decidim::LayoutHelper if respond_to?(:helper)
+        end
+        # Include additional helpers globally
+        ActionView::Base.include(Decidim::DecidimAwesome::AwesomeHelpers)
+
+        # override user's admin property
+        Decidim::User.include(Decidim::DecidimAwesome::UserOverride) if DecidimAwesome.enabled?(:scoped_admins)
+
+        # redirect unauthorized scoped admins to allowed places or custom redirects if configured
+        Decidim::ErrorsController.include(Decidim::DecidimAwesome::NotFoundRedirect) if DecidimAwesome.enabled?([:scoped_admins, :custom_redirects])
+
+        # Custom fields need to deal with several places
+        if DecidimAwesome.enabled?(:proposal_custom_fields)
+          Decidim::Proposals::ApplicationHelper.include(Decidim::DecidimAwesome::Proposals::ApplicationHelperOverride)
+          Decidim::Proposals::ProposalWizardCreateStepForm.include(Decidim::DecidimAwesome::Proposals::ProposalWizardCreateStepFormOverride)
+          Decidim::AmendmentsHelper.include(Decidim::DecidimAwesome::AmendmentsHelperOverride)
         end
 
-        Decidim::Proposals::ApplicationHelper.include(Decidim::DecidimAwesome::Proposals::ApplicationHelperOverride)
-        Decidim::AmendmentsHelper.include(Decidim::DecidimAwesome::AmendmentsHelperOverride)
+        Decidim::MenuPresenter.include(Decidim::DecidimAwesome::MenuPresenterOverride)
+        Decidim::MenuItemPresenter.include(Decidim::DecidimAwesome::MenuItemPresenterOverride)
 
-        # TODO: move to include overrides
-        Dir.glob("#{Engine.root}/app/awesome_overrides/**/*_override.rb").each do |override|
-          require_dependency override
+        # Late registering of components to take into account initializer values
+        DecidimAwesome.registered_components.each do |manifest, block|
+          Decidim.register_component(manifest, &block) unless DecidimAwesome.disabled_components.include?(manifest)
         end
       end
 
-      initializer "decidim_awesome.view_helpers" do
-        ActionView::Base.include AwesomeHelpers
+      initializer "decidim.middleware" do |app|
+        app.config.middleware.insert_after Decidim::Middleware::CurrentOrganization, Decidim::DecidimAwesome::CurrentConfig
       end
 
-      initializer "decidim_decidim_awesome.assets" do |app|
-        app.config.assets.precompile += if version_prefix == "v0.23"
-                                          %w(legacy_decidim_decidim_awesome_manifest.js decidim_decidim_awesome_manifest.css)
-                                        else
-                                          %w(decidim_decidim_awesome_manifest.js decidim_decidim_awesome_manifest.css)
-                                        end
-        # add to precompile any present theme asset
-        Dir.glob(Rails.root.join("app/assets/themes/*.*")).each do |path|
-          app.config.assets.precompile << path
-        end
+      initializer "decidim_decidim_awesome.webpacker.assets_path" do
+        Decidim.register_assets_path File.expand_path("app/packs", root)
       end
 
       initializer "decidim_decidim_awesome.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::DecidimAwesome::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::DecidimAwesome::Engine.root}/app/views")
       end
-
-      initializer "decidim_decidim_awesome.content_blocks" do |_app|
-        # === Home Map block ===
-        Decidim.content_blocks.register(:homepage, :awesome_map) do |content_block|
-          content_block.cell = "decidim/decidim_awesome/content_blocks/map"
-          content_block.settings_form_cell = "decidim/decidim_awesome/content_blocks/map_form"
-          content_block.public_name_key = "decidim.decidim_awesome.content_blocks.map.name"
-
-          content_block.settings do |settings|
-            settings.attribute :title, type: :text, translated: true
-
-            settings.attribute :map_height, type: :integer, default: 500
-            settings.attribute :map_center, type: :string, default: ""
-            settings.attribute :map_zoom, type: :integer, default: 8
-            settings.attribute :truncate, type: :integer, default: 255
-            settings.attribute :collapse, type: :boolean, default: false
-            settings.attribute :menu_amendments, type: :boolean, default: true
-            settings.attribute :menu_meetings, type: :boolean, default: true
-            settings.attribute :menu_hashtags, type: :boolean, default: true
-
-            settings.attribute :show_not_answered, type: :boolean, default: true
-            settings.attribute :show_accepted, type: :boolean, default: true
-            settings.attribute :show_withdrawn, type: :boolean, default: false
-            settings.attribute :show_evaluating, type: :boolean, default: true
-            settings.attribute :show_rejected, type: :boolean, default: false
-          end
-        end
-        # === TODO: processes groups map block ===
-      end
     end
   end
 end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "rails"
+require "decidim/core"
+
+module Decidim
+  module DecidimAwesome
+    module IframeComponent
+      # This is the engine is used to create the component Map.
+      class AdminEngine < ::Rails::Engine
+        isolate_namespace Decidim::DecidimAwesome::IframeComponent
+
+        routes do
+          root to: "iframe#settings"
+        end
+
+        def load_seed
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/components/namer"
+require "decidim/components/namer"
 
-Decidim.register_component(:awesome_iframe) do |component|
+Decidim::DecidimAwesome.register_component(:awesome_iframe) do |component|
   component.engine = Decidim::DecidimAwesome::IframeComponent::Engine
-  # component.admin_engine = Decidim::DecidimAwesome::AdminIframeEngine
+  component.admin_engine = Decidim::DecidimAwesome::IframeComponent::AdminEngine
   component.icon = "decidim/meetings/icon.svg" # TODO: create a Icon
   component.permissions_class_name = "Decidim::DecidimAwesome::Permissions"
 
@@ -15,7 +15,7 @@ Decidim.register_component(:awesome_iframe) do |component|
     # Add your global settings
     # Available types: :integer, :boolean
     settings.attribute :announcement, type: :text, translated: true, editor: true
-    settings.attribute :iframe, type: :text
+    settings.attribute :iframe, type: :text, default: ""
     settings.attribute :viewport_width, type: :boolean, default: false
     settings.attribute :no_margins, type: :boolean, default: false
   end
@@ -23,7 +23,7 @@ Decidim.register_component(:awesome_iframe) do |component|
   component.settings(:step) do |settings|
     # Add your settings per step
     settings.attribute :announcement, type: :text, translated: true, editor: true
-    settings.attribute :iframe, type: :text
+    settings.attribute :iframe, type: :text, default: ""
   end
 
   # component.register_stat :some_stat do |context, start_at, end_at|

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "rails"
+require "decidim/core"
+
+module Decidim
+  module DecidimAwesome
+    module MapComponent
+      # This is the engine is used to create the component Map.
+      class AdminEngine < ::Rails::Engine
+        isolate_namespace Decidim::DecidimAwesome::MapComponent
+
+        routes do
+          root to: "map#settings"
+        end
+
+        def load_seed
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/components/namer"
+require "decidim/components/namer"
 
-Decidim.register_component(:awesome_map) do |component|
+Decidim::DecidimAwesome.register_component(:awesome_map) do |component|
   component.engine = Decidim::DecidimAwesome::MapComponent::Engine
-  # component.admin_engine = Decidim::DecidimAwesome::AdminMapEngine
+  component.admin_engine = Decidim::DecidimAwesome::MapComponent::AdminEngine
   component.icon = "decidim/meetings/icon.svg" # TODO: create a Icon
   component.permissions_class_name = "Decidim::DecidimAwesome::Permissions"
 
@@ -22,7 +22,9 @@ Decidim.register_component(:awesome_map) do |component|
     settings.attribute :collapse, type: :boolean, default: false
     settings.attribute :menu_amendments, type: :boolean, default: true
     settings.attribute :menu_meetings, type: :boolean, default: true
+    settings.attribute :menu_categories, type: :boolean, default: true
     settings.attribute :menu_hashtags, type: :boolean, default: true
+    settings.attribute :menu_merge_components, type: :boolean, default: false
   end
 
   component.settings(:step) do |settings|
@@ -31,7 +33,6 @@ Decidim.register_component(:awesome_map) do |component|
     settings.attribute :show_not_answered, type: :boolean, default: true
     settings.attribute :show_evaluating, type: :boolean, default: true
     settings.attribute :show_accepted, type: :boolean, default: true
-    # Not possible yet (needs graphql update):
     settings.attribute :show_rejected, type: :boolean, default: false
     settings.attribute :show_withdrawn, type: :boolean, default: false
   end

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

@@ -14,6 +14,40 @@ module Decidim
           root to: "map#show"
         end
 
+        initializer "decidim_decidim_awesome.content_blocks" do |_app|
+          # do not register this if awesome_map is disabled
+          next if DecidimAwesome.disabled_components.include?(:awesome_map)
+
+          # === Home Map block ===
+          Decidim.content_blocks.register(:homepage, :awesome_map) do |content_block|
+            content_block.cell = "decidim/decidim_awesome/content_blocks/map"
+            content_block.settings_form_cell = "decidim/decidim_awesome/content_blocks/map_form"
+            content_block.public_name_key = "decidim.decidim_awesome.content_blocks.map.name"
+
+            content_block.settings do |settings|
+              settings.attribute :title, type: :text, translated: true
+
+              settings.attribute :map_height, type: :integer, default: 500
+              settings.attribute :map_center, type: :string, default: ""
+              settings.attribute :map_zoom, type: :integer, default: 8
+              settings.attribute :truncate, type: :integer, default: 255
+              settings.attribute :collapse, type: :boolean, default: false
+              settings.attribute :menu_amendments, type: :boolean, default: true
+              settings.attribute :menu_meetings, type: :boolean, default: true
+              settings.attribute :menu_hashtags, type: :boolean, default: true
+              settings.attribute :menu_categories, type: :boolean, default: true
+              settings.attribute :menu_merge_components, type: :boolean, default: true
+
+              settings.attribute :show_not_answered, type: :boolean, default: true
+              settings.attribute :show_accepted, type: :boolean, default: true
+              settings.attribute :show_withdrawn, type: :boolean, default: false
+              settings.attribute :show_evaluating, type: :boolean, default: true
+              settings.attribute :show_rejected, type: :boolean, default: false
+            end
+          end
+          # === TODO: processes groups map block ===
+        end
+
         def load_seed
           nil
         end

data/lib/decidim/decidim_awesome/menu_hacker.rb

@@ -4,6 +4,7 @@ module Decidim
   module DecidimAwesome
     class MenuHacker
       include Decidim::TranslatableAttributes
+
       def initialize(name, view)
         @name = name
         @organization = view.try(:current_organization)

data/lib/decidim/decidim_awesome/test/factories.rb

@@ -15,8 +15,8 @@ FactoryBot.define do
     awesome_config { create :awesome_config }
   end
 
-  factory :editor_image, class: "Decidim::DecidimAwesome::EditorImage" do
-    image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
+  factory :awesome_editor_image, class: "Decidim::DecidimAwesome::EditorImage" do
+    file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     path { Faker::Internet.url(host: "", scheme: "") }
     author { create :user }
     organization { create :organization }

data/lib/decidim/decidim_awesome/test/initializer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+Decidim::DecidimAwesome.configure do |config|
+  if ENV["FEATURES"] == "disabled"
+    [
+      :allow_images_in_full_editor,
+      :allow_images_in_small_editor,
+      :allow_images_in_proposals,
+      :use_markdown_editor,
+      :allow_images_in_markdown_editor,
+      :auto_save_forms,
+      :intergram_for_admins,
+      :intergram_for_public,
+      :scoped_styles,
+      :proposal_custom_fields,
+      :menu,
+      :scoped_admins,
+      :custom_redirects
+    ].each do |conf|
+      config.send("#{conf}=", :disabled)
+    end
+
+    config.disabled_components = [:awesome_map, :awesome_iframe]
+  end
+end

data/lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb

@@ -1,2 +1,30 @@
-<%= stylesheet_link_tag    "application", media: "all" %>
-<%= javascript_include_tag "application" %>
+<%= csrf_meta_tags %>
+
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<% available_locales.each do |locale| %>
+  <link rel="alternate" href="<%= url_for(request.parameters.merge(locale: locale)) %>" hreflang="<%= locale %>">
+<% end %>
+
+<meta name="twitter:card" content="summary_large_image">
+<meta name="twitter:site" content="@<%= decidim_meta_twitter_handler %>">
+<meta name="twitter:title" content="<%= decidim_page_title %>">
+<meta name="twitter:description" content="<%= decidim_meta_description %>">
+<meta name="twitter:image" content="<%= decidim_meta_image_url %>">
+
+<meta property="og:url" content="<%= decidim_meta_url %>">
+<meta property="og:type" content="article">
+<meta property="og:title" content="<%= decidim_page_title %>">
+<meta property="og:description" content="<%= decidim_meta_description %>">
+<meta property="og:image" content="<%= decidim_meta_image_url %>">
+
+<%= favicon %>
+<%= stylesheet_pack_tag "decidim_core", media: "all" %>
+<%= invisible_captcha_styles %>
+
+<%= organization_colors %>
+<%= javascript_pack_tag "decidim_core", defer: false %>
+
+<%= render partial: "layouts/decidim/head_extra" %>
+<%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>
+<%= snippets.display(:head) %>
+<%= content_for :header_snippets %>

data/lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb

@@ -1,3 +1,8 @@
-<%= stylesheet_link_tag    "decidim/admin/application", media: "all" %>
-<%= javascript_include_tag "decidim/admin/application" %>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<%= csrf_meta_tags %>
+<%= organization_colors %>
 
+<%= stylesheet_pack_tag "decidim_admin", media: "all" %>
+<%= javascript_pack_tag "decidim_admin", defer: false %>
+
+<%= snippets.display(:head) %>

data/lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb

@@ -3,6 +3,7 @@
 shared_examples "javascript config vars" do
   it "has DecidimAwesome object" do
     expect(page.body).to have_content("window.DecidimAwesome")
+    expect(page.body).to have_content("window.DecidimAwesome.version")
     expect(page.body).to have_content("window.DecidimAwesome.editor_uploader_path")
     expect(page.body).to have_content("window.DecidimAwesome.texts")
   end
@@ -25,3 +26,20 @@ shared_examples "do not have menu link" do |item|
     end
   end
 end
+
+shared_examples "forbids disabled feature" do
+  let(:feature) { :menu }
+  let(:features) { [feature] }
+  before do
+    features.each do |feat|
+      allow(Decidim::DecidimAwesome.config).to receive(feat).and_return(:disabled)
+    end
+  end
+
+  it "redirects with error" do
+    action
+
+    expect(flash[:alert]).not_to be_empty
+    expect(response).to redirect_to("/admin/")
+  end
+end

data/lib/decidim/decidim_awesome/test/shared_examples/controller_examples.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+shared_examples "a blank component" do |engine|
+  routes { engine.routes }
+
+  describe "GET settings" do
+    it "redirects to settings" do
+      get :settings, params: { component_id: component }
+      expect(response).to have_http_status(:redirect)
+      expect(response.location).to include("#{component.id}/edit")
+    end
+  end
+end

data/lib/decidim/decidim_awesome/test/shared_examples/custom_redirects_contexts.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+shared_context "with custom redirects params" do
+  let(:organization) { create(:organization) }
+  let(:context) do
+    {
+      current_user: create(:user, organization: organization),
+      current_organization: organization
+    }
+  end
+  let(:params) do
+    {
+      origin: origin,
+      destination: destination,
+      active: active,
+      pass_query: pass_query
+    }
+  end
+  let(:attributes) do
+    [
+      origin,
+      {
+        "destination" => destination,
+        "active" => active,
+        "pass_query" => pass_query
+      }
+    ]
+  end
+  let(:origin) { "/origin" }
+  let(:destination) { "/processes" }
+  let(:active) { true }
+  let(:pass_query) { true }
+
+  let(:another_params) do
+    {
+      allow_images_in_full_editor: true,
+      allow_images_in_small_editor: true
+    }
+  end
+  let(:form) do
+    Decidim::DecidimAwesome::Admin::CustomRedirectForm.from_params(params).with_context(context)
+  end
+  let(:another_form) do
+    Decidim::DecidimAwesome::Admin::ConfigForm.from_params(another_params).with_context(context)
+  end
+  let(:another_config) { Decidim::DecidimAwesome::Admin::UpdateConfig.new(another_form) }
+end

data/lib/decidim/decidim_awesome/test/shared_examples/menu_hack_contexts.rb

@@ -52,20 +52,3 @@ shared_context "with menu hacks params" do
   end
   let(:another_config) { Decidim::DecidimAwesome::Admin::UpdateConfig.new(another_form) }
 end
-
-shared_examples "forbids disabled feature" do
-  let(:feature) { :menu }
-  let(:features) { [feature] }
-  before do
-    features.each do |feat|
-      allow(Decidim::DecidimAwesome.config).to receive(feat).and_return(:disabled)
-    end
-  end
-
-  it "redirects with error" do
-    action
-
-    expect(flash[:alert]).not_to be_empty
-    expect(response).to redirect_to("/admin/")
-  end
-end

data/lib/decidim/decidim_awesome/test/shared_examples/scoped_admins_examples.rb

@@ -60,14 +60,12 @@ shared_examples "forbids external accesses" do
     it_behaves_like "redirects to index"
   end
 
-  unless legacy_version?
-    describe "forbids moderation access" do
-      before do
-        visit decidim_admin.moderations_path
-      end
-
-      it_behaves_like "redirects to index"
+  describe "forbids moderation access" do
+    before do
+      visit decidim_admin.moderations_path
     end
+
+    it_behaves_like "redirects to index"
   end
 
   describe "forbids organization access" do
@@ -87,11 +85,7 @@ shared_examples "allows external accesses" do
 
   it "shows participants access" do
     visit decidim_admin.users_path
-    if legacy_version?
-      expect(page).to have_content("New Participant")
-    else
-      expect(page).to have_content("New user")
-    end
+    expect(page).to have_content("New user")
   end
 
   it "shows pages access" do
@@ -99,11 +93,9 @@ shared_examples "allows external accesses" do
     expect(page).to have_content("Pages without topic")
   end
 
-  unless legacy_version?
-    it "shows moderation access" do
-      visit decidim_admin.moderations_path
-      expect(page).to have_content("Reported content URL")
-    end
+  it "shows moderation access" do
+    visit decidim_admin.moderations_path
+    expect(page).to have_content("Reported content URL")
   end
 
   it "shows organization access" do