decidim-decidim_awesome 0.10.3 → 0.11.1

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-welcome_text = "Welcome to the Admin Panel."
-welcome_text = "Welcome to the Decidim Admin Panel." if legacy_version?
+welcome_text = "Dashboard"
 
 shared_examples "redirects to index" do |_link|
   it "display index page" do
@@ -88,7 +87,7 @@ shared_examples "allows external accesses" do
 
   it "shows participants access" do
     visit decidim_admin.users_path
-    expect(page).to have_content(legacy_version? ? "New user" : "New admin")
+    expect(page).to have_content("New admin")
   end
 
   it "shows pages access" do
@@ -110,6 +109,10 @@ end
 shared_examples "allows all admin routes" do
   before do
     visit decidim_admin.root_path
+    # this is a workaround to wait for the page to load
+    # it seems that the test might fail randomly otherwise
+    # underlaying issue is unknown, maybe capybara is faster clicking than ruby is at storing class variables?
+    sleep 0.1
   end
 
   it "allows the admin root page" do
@@ -123,6 +126,7 @@ shared_examples "allows all admin routes" do
 
   it "allows the processes page" do
     click_link_or_button "Processes"
+
     expect(page).to have_content("New process")
   end
 end
@@ -130,6 +134,7 @@ end
 shared_examples "allows scoped admin routes" do
   before do
     visit decidim_admin.root_path
+    sleep 0.1
   end
 
   it "allows the admin root page" do
@@ -137,14 +142,14 @@ shared_examples "allows scoped admin routes" do
   end
 
   it "allows the assemblies page" do
-    click_link "Assemblies"
+    click_link_or_button "Assemblies"
 
     expect(page).to have_content("New assembly")
   end
 
   describe "forbids processes" do
     before do
-      click_link "Processes"
+      click_link_or_button "Processes"
     end
 
     it_behaves_like "redirects to index"
@@ -157,16 +162,16 @@ end
 
 shared_examples "has admin link" do
   it "has menu link" do
-    within ".topbar__dropmenu.topbar__user__logged" do
-      expect(page).to have_selector("#user-menu li", text: "Admin dashboard", visible: :hidden)
+    within "header" do
+      expect(page).to have_css("#admin-bar", text: "Admin dashboard")
     end
   end
 end
 
 shared_examples "has no admin link" do
-  it "has menu link" do
-    within ".topbar__dropmenu.topbar__user__logged" do
-      expect(page).not_to have_selector("#user-menu li", text: "Admin dashboard", visible: :hidden)
+  it "has no menu link" do
+    within "header" do
+      expect(page).not_to have_css("#admin-bar", text: "Admin dashboard")
     end
   end
 end
@@ -214,7 +219,7 @@ shared_examples "can edit assembly" do
       ca: "Assamblea editada",
       es: "Asamblea editada"
     )
-    find("*[type=submit]").click
+    click_link_or_button "Update"
     expect(page).to have_admin_callout("successfully")
   end
 end
@@ -263,7 +268,7 @@ shared_examples "can manage component" do
     expect(page).to have_content("Title")
     expect(page).to have_content(proposal.title["en"])
 
-    click_link "Edit proposal"
+    click_link_or_button "Edit proposal"
     expect(page).to have_content("Update proposal")
     fill_in_i18n(
       :proposal_title,
@@ -272,14 +277,14 @@ shared_examples "can manage component" do
       ca: "Proposta editada",
       es: "Propuesta editada"
     )
-    find("*[type=submit]").click
+    click_link_or_button "Update"
     expect(page).to have_admin_callout("successfully")
   end
 
   it "can create a proposal" do
     visit manage_component_path(component)
 
-    click_link "New proposal"
+    click_link_or_button "New proposal"
     expect(page).to have_content("Create proposal")
     fill_in_i18n(
       :proposal_title,
@@ -295,7 +300,7 @@ shared_examples "can manage component" do
       ca: "Body creat",
       es: "Body creat"
     )
-    find("*[type=submit]").click
+    click_link_or_button "Create"
     expect(page).to have_admin_callout("successfully")
   end
 end
@@ -303,6 +308,7 @@ end
 shared_examples "edits allowed components" do
   before do
     visit decidim_admin.root_path
+    sleep 0.1
   end
 
   it_behaves_like "can manage component"
@@ -363,8 +369,10 @@ shared_examples "allows access to group processes" do
   end
 
   it "shows the list of processes" do
-    expect(page).to have_content("Participatory processes")
-    expect(page).to have_content(participatory_process.title["en"])
+    within("[data-content]") do
+      expect(page).to have_content("Processes")
+      expect(page).to have_content(participatory_process.title["en"])
+    end
   end
 
   describe "forbids editing processes" do
@@ -381,8 +389,10 @@ shared_examples "allows access to group processes" do
     end
 
     it "shows the list of groups" do
-      expect(page).to have_content("Participatory process groups")
-      expect(page).to have_content(process_group.title["en"])
+      within("[data-content]") do
+        expect(page).to have_content("Process groups")
+        expect(page).to have_content(process_group.title["en"])
+      end
     end
   end
 end
@@ -401,7 +411,7 @@ shared_examples "allows edit any group process" do
       ca: "Proces grup editat",
       es: "Grupo de procesos editado"
     )
-    find("*[type=submit]").click
+    click_link_or_button "Update"
     expect(page).to have_admin_callout("successfully")
   end
 end

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

@@ -26,6 +26,8 @@ shared_examples "activated concerns" do |enabled|
   it "common concerns are registered" do
     expect(ActionView::Base.included_modules).to include(Decidim::DecidimAwesome::AwesomeHelpers)
     expect(Decidim::ViewModel.included_modules).to include(Decidim::DecidimAwesome::AwesomeHelpers)
+    expect(Decidim::ApplicationController.included_modules).to include(Decidim::DecidimAwesome::ContentSecurityPolicy)
+    expect(Decidim::Admin::ApplicationController.included_modules).to include(Decidim::DecidimAwesome::ContentSecurityPolicy)
   end
 
   if enabled
@@ -43,8 +45,12 @@ shared_examples "activated concerns" do |enabled|
       expect(Decidim::Proposals::ProposalVote.included_modules).to include(Decidim::DecidimAwesome::HasVoteWeight)
       expect(Decidim::Proposals::ProposalType.included_modules).to include(Decidim::DecidimAwesome::AddProposalTypeVoteWeights)
       expect(Decidim::Proposals::ProposalType.included_modules).to include(Decidim::DecidimAwesome::AddProposalTypeCustomFields)
+      expect(Decidim::Proposals::ProposalLCell.included_modules).to include(Decidim::DecidimAwesome::ProposalLCellOverride)
       expect(Decidim::Proposals::Proposal.included_modules).to include(Decidim::DecidimAwesome::HasProposalExtraFields)
       expect(Decidim::Proposals::CollaborativeDraft.included_modules).to include(Decidim::DecidimAwesome::HasProposalExtraFields)
+      expect(Decidim::ContentBlocks::GlobalMenuCell.included_modules).to include(Decidim::DecidimAwesome::GlobalMenuCellOverride)
+      expect(Decidim::BreadcrumbHelper.included_modules).to include(Decidim::DecidimAwesome::BreadcrumbHelperOverride)
+      expect(Decidim::BreadcrumbRootMenuItemPresenter.included_modules).to include(Decidim::DecidimAwesome::BreadcrumbRootMenuItemPresenterOverride)
       expect(Decidim::Proposals::ProposalSerializer.included_modules).to include(Decidim::DecidimAwesome::Proposals::ProposalSerializerOverride)
       expect(Decidim::Proposals::ProposalVotesController.included_modules).to include(Decidim::DecidimAwesome::Proposals::ProposalVotesControllerOverride)
       expect(Decidim::AmendmentsController.included_modules).to include(Decidim::DecidimAwesome::LimitPendingAmendments)
@@ -67,8 +73,12 @@ shared_examples "activated concerns" do |enabled|
       expect(Decidim::Proposals::ProposalVote.included_modules).not_to include(Decidim::DecidimAwesome::HasVoteWeight)
       expect(Decidim::Proposals::ProposalType.included_modules).not_to include(Decidim::DecidimAwesome::AddProposalTypeVoteWeights)
       expect(Decidim::Proposals::ProposalType.included_modules).not_to include(Decidim::DecidimAwesome::AddProposalTypeCustomFields)
+      expect(Decidim::Proposals::ProposalLCell.included_modules).not_to include(Decidim::DecidimAwesome::ProposalLCellOverride)
       expect(Decidim::Proposals::Proposal.included_modules).not_to include(Decidim::DecidimAwesome::HasProposalExtraFields)
       expect(Decidim::Proposals::CollaborativeDraft.included_modules).not_to include(Decidim::DecidimAwesome::HasProposalExtraFields)
+      expect(Decidim::ContentBlocks::GlobalMenuCell.included_modules).not_to include(Decidim::DecidimAwesome::GlobalMenuCellOverride)
+      expect(Decidim::BreadcrumbHelper.included_modules).not_to include(Decidim::DecidimAwesome::BreadcrumbHelperOverride)
+      expect(Decidim::BreadcrumbRootMenuItemPresenter.included_modules).not_to include(Decidim::DecidimAwesome::BreadcrumbRootMenuItemPresenterOverride)
       expect(Decidim::Proposals::ProposalSerializer.included_modules).not_to include(Decidim::DecidimAwesome::Proposals::ProposalSerializerOverride)
       expect(Decidim::Proposals::ProposalVotesController.included_modules).not_to include(Decidim::DecidimAwesome::Proposals::ProposalVotesControllerOverride)
       expect(Decidim::AmendmentsController.included_modules).not_to include(Decidim::DecidimAwesome::LimitPendingAmendments)
@@ -148,11 +158,9 @@ shared_examples "basic rendering" do |enabled|
     let(:image_vars) do
       [
         :allow_images_in_proposals,
-        :allow_images_in_small_editor,
-        :allow_images_in_full_editor,
+        :allow_videos_in_editors,
+        :allow_images_in_editors,
         :allow_images_in_proposals,
-        :use_markdown_editor,
-        :allow_images_in_markdown_editor,
         :auto_save_forms,
         :intergram_for_admins,
         :intergram_for_public
@@ -165,7 +173,7 @@ shared_examples "basic rendering" do |enabled|
     end
 
     it "renders the home page" do
-      expect(page).to have_content("Home")
+      expect(page).to have_css(".home")
     end
 
     it "has DecidimAwesome object" do
@@ -185,7 +193,7 @@ shared_examples "basic rendering" do |enabled|
       end
 
       it "has custom fields javascript" do
-        expect(page).to have_xpath("//script[contains(@src,'decidim_decidim_awesome_proposals_custom_fields')]", visible: :all)
+        expect(page).to have_xpath("//script[contains(@src,'decidim_decidim_awesome_custom_fields')]", visible: :all)
       end
 
       it "has custom styles CSS" do
@@ -199,7 +207,7 @@ shared_examples "basic rendering" do |enabled|
       end
 
       it "do not have custom fields javascript" do
-        expect(page).not_to have_xpath("//script[contains(@src,'decidim_decidim_awesome_proposals_custom_fields')]", visible: :all)
+        expect(page).not_to have_xpath("//script[contains(@src,'decidim_decidim_awesome_custom_fields')]", visible: :all)
       end
 
       it "do not have custom styles CSS" do
@@ -217,7 +225,8 @@ shared_examples "basic rendering" do |enabled|
         "config/styles",
         "config/proposal_custom_fields",
         "config/admins",
-        "menu_hacks",
+        "menus/menu/hacks",
+        "menus/home_content_block_menu/hacks",
         "custom_redirects",
         "config/livechat"
       ]
@@ -246,7 +255,7 @@ shared_examples "basic rendering" do |enabled|
 
       it "has all admin menus" do
         menus.each do |menu|
-          within ".secondary-nav" do
+          within ".sidebar-menu" do
             expect(page).to have_link(href: "/admin/decidim_awesome/#{menu}")
           end
         end
@@ -258,7 +267,7 @@ shared_examples "basic rendering" do |enabled|
 
       it "has no admin menus" do
         menus.each do |menu|
-          within ".secondary-nav" do
+          within ".sidebar-menu" do
             expect(page).not_to have_link(href: "/admin/decidim_awesome/#{menu}")
           end
         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.10.3"
-    COMPAT_DECIDIM_VERSION = [">= 0.26.0", "< 0.28"].freeze
+    VERSION = "0.11.1"
+    COMPAT_DECIDIM_VERSION = [">= 0.28.0", "< 0.29"].freeze
   end
 end

data/lib/decidim/decidim_awesome/voting_manifest.rb

@@ -4,12 +4,7 @@ module Decidim
   module DecidimAwesome
     class VotingManifest
       include ActiveModel::Model
-      # From 0.27 onwards, Virtus is deprecated
-      if defined? Decidim::AttributeObject::Model
-        include Decidim::AttributeObject::Model
-      else
-        include Virtus.model
-      end
+      include Decidim::AttributeObject::Model
 
       attribute :name, Symbol
 
@@ -17,12 +12,12 @@ module Decidim
       # not defining it will use the original view from Decidim
       # setting it to an empty string will hide the original content
 
-      # original is decidim-proposals/app/views/proposals/proposals/_vote_button.html.erb
+      # original is decidim-proposals/app/views/decidim/proposals/proposals/_vote_button.html.erb
       attribute :show_vote_button_view, String
-      # original is decidim-proposals/app/views/proposals/proposals/_votes_count.html.erb
+      # original is decidim-proposals/app/views/decidim/proposals/proposals/_votes_count.html.erb
       attribute :show_votes_count_view, String
-      # original is decidim-proposals/app/cells/proposals/proposal_m/footer.erb
-      attribute :proposal_m_cell_footer, String
+      # original is from decidim-proposals/app/cells/decidim/proposals/proposal_metadata_cell.rb
+      attribute :proposal_metadata_cell, String
 
       # a callback that will be called by the method valid_weight?
       # Do not access this parameter directly, use the weight_validator method to register a block

data/lib/decidim/decidim_awesome.rb

@@ -14,9 +14,8 @@ require "decidim/decidim_awesome/iframe_component/component"
 require "decidim/decidim_awesome/content_parsers/editor_images_parser"
 
 # Engines to handle logic unrelated to participatory spaces or components
-
 Decidim.register_global_engine(
   :decidim_decidim_awesome, # this is the name of the global method to access engine routes
-  ::Decidim::DecidimAwesome::Engine,
+  Decidim::DecidimAwesome::Engine,
   at: "/decidim_awesome"
 )

data/lib/tasks/decidim_awesome_active_storage_migrations_tasks.rake

@@ -28,7 +28,7 @@ namespace :decidim_awesome do
         cw_attribute: "image",
         cw_uploader: Decidim::Cw::DecidimAwesome::ImageUploader,
         as_attribute: "file",
-        logger: logger
+        logger:
       )
     end
   end

data/lib/tasks/decidim_awesome_upgrade_tasks.rake

@@ -4,6 +4,10 @@ Rake::Task["decidim:webpacker:install"].enhance do
   Rake::Task["decidim_decidim_awesome:webpacker:install"].invoke
 end
 
+Rake::Task["decidim:choose_target_plugins"].enhance do
+  ENV["FROM"] = "#{ENV.fetch("FROM", nil)},decidim_decidim_awesome"
+end
+
 Rake::Task["decidim:webpacker:upgrade"].enhance do
   Rake::Task["decidim_decidim_awesome:webpacker:install"].invoke
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim-module-decidim_awesome",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "description": "Mods and tweaks for Decidim",
   "main": "index.js",
   "directories": {
@@ -12,7 +12,9 @@
     "lint": "eslint -c .eslintrc.json --ext .js app/packs/",
     "lint-fix": "eslint -c .eslintrc.json --ext .js app/packs/ --fix",
     "stylelint": "stylelint **/*.scss",
-    "stylelint-fix": "stylelint **/*.scss --fix"
+    "stylelint-fix": "stylelint **/*.scss --fix",
+    "prettier": "prettier --check '**/*.scss'",
+    "prettify": "prettier --write '**/*.scss'"
   },
   "repository": {
     "type": "git",
@@ -28,43 +30,32 @@
   },
   "homepage": "https://github.com/decidim-ice/decidim-module-decidim_awesome#readme",
   "stylelint": {
-    "extends": "@decidim/stylelint-config",
-    "rules": {
-      "block-opening-brace-space-before": "always"
-    }
+    "extends": "@decidim/stylelint-config"
   },
+  "prettier": "@decidim/prettier-config",
   "devDependencies": {
-    "@babel/eslint-parser": "^7.19.1",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-private-methods": "^7.18.6",
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/plugin-transform-classes": "^7.20.7",
-    "@babel/plugin-transform-regenerator": "^7.20.5",
-    "@babel/plugin-transform-runtime": "^7.19.6",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.18.6",
-    "@decidim/dev": "0.27.4",
-    "@decidim/eslint-config": "0.27.4",
-    "@decidim/stylelint-config": "0.27.4",
-    "eslint-config-prettier": "^8.2.0",
-    "eslint-config-standard": "^11.0.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-standard": "^3.1.0",
+    "@babel/eslint-parser": "^7.23.10",
+    "@babel/plugin-transform-classes": "^7.23.8",
+    "@babel/plugin-transform-regenerator": "^7.23.3",
+    "@babel/plugin-transform-runtime": "^7.23.9",
+    "@babel/preset-env": "^7.23.9",
+    "@babel/preset-react": "^7.23.3",
+    "@decidim/dev": "0.28.0",
+    "@decidim/eslint-config": "0.28.0",
+    "@decidim/prettier-config": "0.28.0",
+    "@decidim/stylelint-config": "0.28.0",
+    "postcss-scss": "^4.0.9",
     "sass-embedded": "~1.57.1"
   },
   "dependencies": {
     "@rails/actioncable": "^6.1.7-6",
     "codemirror": "^5.65.0",
-    "europa": "^4.0.0",
     "form-storage": "^1.3.5",
     "formBuilder": "^3.19.12",
     "highlight.js": "^11.4.0",
-    "inline-attachment": "^2.0.3",
-    "inscrybmde": "^1.11.6",
-    "jquery-ui": "^1.13.0",
+    "inline-attacher": "^0.0.7",
     "jsrender": "^1.0.9",
     "leaflet.featuregroup.subgroup": "^1.0.2",
-    "marked": "^5.1.2",
-    "select2": "^4.1.0-rc.0"
+    "tom-select": "2.2.2"
   }
 }