decidim-decidim_awesome 0.11.2 → 0.11.4

data/lib/decidim/decidim_awesome/engine.rb

@@ -15,6 +15,7 @@ module Decidim
       isolate_namespace Decidim::DecidimAwesome
 
       routes do
+        get :required_authorizations, to: "required_authorizations#index"
         post :editor_images, to: "editor_images#create"
       end
 
@@ -22,10 +23,6 @@ module Decidim
       # https://edgeguides.rubyonrails.org/engines.html#overriding-models-and-controllers
       # overrides
       config.to_prepare do
-        # 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
         ActiveSupport.on_load(:action_view) { include Decidim::DecidimAwesome::AwesomeHelpers }
         # Also for cells
@@ -66,12 +63,24 @@ module Decidim
           Decidim::Proposals::ProposalType.include(Decidim::DecidimAwesome::AddProposalTypeCustomFields)
         end
 
+        if DecidimAwesome.enabled?(:admins_available_authorizations)
+          Decidim::System::RegisterOrganizationForm.include(Decidim::DecidimAwesome::System::OrganizationFormOverride)
+          Decidim::System::UpdateOrganizationForm.include(Decidim::DecidimAwesome::System::OrganizationFormOverride)
+          Decidim::System::UpdateOrganization.include(Decidim::DecidimAwesome::System::UpdateOrganizationOverride)
+          Decidim::System::RegisterOrganization.include(Decidim::DecidimAwesome::System::RegisterOrganizationOverride)
+        end
+
         if DecidimAwesome.enabled?(:proposal_custom_fields, :proposal_private_custom_fields, :weighted_proposal_voting)
           # add vote weight/private_body to proposals
           Decidim::Proposals::Proposal.include(Decidim::DecidimAwesome::HasProposalExtraFields)
           Decidim::Proposals::CollaborativeDraft.include(Decidim::DecidimAwesome::HasProposalExtraFields)
         end
 
+        if Decidim::DecidimAwesome.enabled?(:user_timezone)
+          Decidim::AccountForm.include(Decidim::DecidimAwesome::AccountFormOverride)
+          Decidim::UpdateAccount.include(Decidim::DecidimAwesome::UpdateAccountOverride)
+        end
+
         if DecidimAwesome.enabled?(:weighted_proposal_voting)
           # add vote weight to proposal vote
           Decidim::Proposals::ProposalVote.include(Decidim::DecidimAwesome::HasVoteWeight)
@@ -101,6 +110,9 @@ module Decidim
 
       initializer "decidim_decidim_awesome.overrides", after: "decidim.action_controller" do
         config.to_prepare do
+          Decidim::ApplicationController.include(Decidim::DecidimAwesome::CheckLoginAuthorizations) if DecidimAwesome.enabled?(:force_authorization_after_login)
+          Decidim::ApplicationController.include(Decidim::DecidimAwesome::UseUserTimeZone) if Decidim::DecidimAwesome.enabled?(:user_timezone)
+
           # Auto-insert some csp directives
           Decidim::ApplicationController.include(Decidim::DecidimAwesome::ContentSecurityPolicy)
           Decidim::Admin::ApplicationController.include(Decidim::DecidimAwesome::ContentSecurityPolicy)
@@ -119,9 +131,12 @@ module Decidim
           end
 
           if DecidimAwesome.enabled?(:weighted_proposal_voting)
+            Decidim::Proposals::ProposalsController.include(Decidim::DecidimAwesome::Proposals::MemoizeExtraFields)
             Decidim::Proposals::ProposalVotesController.include(Decidim::DecidimAwesome::Proposals::ProposalVotesControllerOverride)
           end
 
+          Decidim::AdminLog::UserPresenter.include(Decidim::DecidimAwesome::AdminLog::UserPresenterOverride) if DecidimAwesome.enabled?(:admins_available_authorizations)
+
           Decidim::AmendmentsController.include(Decidim::DecidimAwesome::LimitPendingAmendments) if DecidimAwesome.enabled?(:allow_limiting_amendments)
 
           Decidim::Proposals::ProposalsController.include(Decidim::DecidimAwesome::Proposals::OrderableOverride) if DecidimAwesome.enabled?(:additional_proposal_sortings)
@@ -274,6 +289,7 @@ module Decidim
         Decidim.icons.register(name: "line-chart-line", icon: "line-chart-line", category: "system", description: "", engine: :decidim_awesome)
         Decidim.icons.register(name: "spy", icon: "spy-fill", category: "system", description: "", engine: :decidim_awesome)
         Decidim.icons.register(name: "forbid-line", icon: "forbid-line", category: "system", description: "", engine: :decidim_awesome)
+        Decidim.icons.register(name: "file-settings-line", icon: "file-settings-line", category: "system", description: "", engine: :decidim_awesome)
       end
     end
   end

data/lib/decidim/decidim_awesome/menu.rb

@@ -29,17 +29,20 @@ module Decidim
 
             menu.add_item :styles,
                           I18n.t("menu.styles", scope: "decidim.decidim_awesome.admin"),
-                          decidim_admin_decidim_awesome.config_path(:styles),
+                          decidim_admin_decidim_awesome.config_path(:scoped_styles),
                           position: 4,
                           icon_name: "brush",
-                          if: menus[:styles]
+                          if: menus[:styles],
+                          submenu: { target_menu: :custom_styles_submenu }
 
-            menu.add_item :proposal_custom_fields,
+            menu.add_item :custom_fields,
                           I18n.t("menu.proposal_custom_fields", scope: "decidim.decidim_awesome.admin"),
-                          decidim_admin_decidim_awesome.config_path(:proposal_custom_fields),
+                          decidim_admin_decidim_awesome.config_path(menus[:proposal_custom_fields] ? :proposal_custom_fields : :proposal_private_custom_fields),
                           position: 5,
                           icon_name: "layers",
-                          if: menus[:proposal_custom_fields],
+                          active: is_active_link?(decidim_admin_decidim_awesome.config_path(:proposal_custom_fields)) ||
+                                  is_active_link?(decidim_admin_decidim_awesome.config_path(:proposal_private_custom_fields)),
+                          if: menus[:custom_fields],
                           submenu: { target_menu: :custom_fields_submenu }
 
             menu.add_item :admins,
@@ -55,6 +58,8 @@ module Decidim
                           position: 7,
                           icon_name: "menu-line",
                           if: menus[:menu_hacks],
+                          active: is_active_link?(decidim_admin_decidim_awesome.menu_hacks_path(:menu)) ||
+                                  is_active_link?(decidim_admin_decidim_awesome.menu_hacks_path(:home_content_block_menu)),
                           submenu: { target_menu: :menu_hacks_submenu }
 
             menu.add_item :custom_redirects,
@@ -71,11 +76,20 @@ module Decidim
                           icon_name: "chat-1-line",
                           if: menus[:livechat]
 
+            menu.add_item :verifications,
+                          I18n.t("menu.verifications", scope: "decidim.decidim_awesome.admin"),
+                          decidim_admin_decidim_awesome.config_path(:verifications),
+                          position: 10,
+                          icon_name: "fingerprint-line",
+                          if: menus[:verifications]
+
             menu.add_item :maintenance,
                           I18n.t("maintenance", scope: "decidim.decidim_awesome.admin.menu.maintenance"),
                           decidim_admin_decidim_awesome.maintenance_path(:private_data),
-                          position: 10,
+                          position: 11,
                           icon_name: "tools-line",
+                          active: is_active_link?(decidim_admin_decidim_awesome.maintenance_path(:private_data)) ||
+                                  is_active_link?(decidim_admin_decidim_awesome.checks_maintenance_index_path),
                           submenu: { target_menu: :maintenance_submenu }
           end
         end
@@ -98,6 +112,24 @@ module Decidim
           end
         end
 
+        def register_custom_styles_submenu!
+          Decidim.menu :custom_styles_submenu do |menu|
+            menu.add_item :scoped_styles,
+                          I18n.t("menu.title", scope: "decidim.decidim_awesome.admin.scoped_styles"),
+                          decidim_admin_decidim_awesome.config_path(:scoped_styles),
+                          position: 4.1,
+                          icon_name: "computer-line",
+                          if: config_enabled?(:scoped_styles)
+
+            menu.add_item :scoped_admin_styles,
+                          I18n.t("menu.title", scope: "decidim.decidim_awesome.admin.scoped_admin_styles"),
+                          decidim_admin_decidim_awesome.config_path(:scoped_admin_styles),
+                          position: 4.2,
+                          icon_name: "file-settings-line",
+                          if: config_enabled?(:scoped_admin_styles)
+          end
+        end
+
         def register_menu_hacks_submenu!
           Decidim.menu :menu_hacks_submenu do |menu|
             menu.add_item :main_menu,
@@ -142,8 +174,11 @@ module Decidim
               :validate_body_min_length, :validate_body_max_caps_percent,
               :validate_body_max_marks_together, :validate_body_start_with_caps
             ),
-            surveys: config_enabled?(:auto_save_forms),
-            styles: config_enabled?(:scoped_styles),
+            surveys: config_enabled?(:auto_save_forms, :user_timezone),
+            styles: config_enabled?(:scoped_styles, :scoped_admin_styles),
+            scoped_styles: config_enabled?(:scoped_styles),
+            scoped_admin_styles: config_enabled?(:scoped_admin_styles),
+            custom_fields: config_enabled?(:proposal_custom_fields, :proposal_private_custom_fields),
             proposal_custom_fields: config_enabled?(:proposal_custom_fields),
             proposal_private_custom_fields: config_enabled?(:proposal_private_custom_fields),
             admins: config_enabled?(:scoped_admins),
@@ -151,7 +186,8 @@ module Decidim
             menu_hacks_menu: config_enabled?(:menu),
             menu_hacks_home_content_block_menu: config_enabled?(:home_content_block_menu),
             custom_redirects: config_enabled?(:custom_redirects),
-            livechat: config_enabled?(:intergram_for_admins, :intergram_for_public)
+            livechat: config_enabled?(:intergram_for_admins, :intergram_for_public),
+            verifications: config_enabled?(:force_authorization_after_login)
           }
         end
 

data/lib/decidim/decidim_awesome/request_memoizer.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module RequestMemoizer
+      # memoize a piece of code in the global request instead of the helper instance (helpers are initialized for each view)
+      def memoize(key)
+        if defined?(request) && request.env["decidim.current_organization"]&.id
+          request.env["decidim_awesome.#{key}"] ||= block_given? ? yield : nil
+        elsif block_given?
+          yield
+        end
+      end
+    end
+  end
+end

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "decidim/core/test/factories"
-require "decidim/proposals/test/factories"
-require "decidim/surveys/test/factories"
-
 FactoryBot.define do
   factory :awesome_config, class: "Decidim::DecidimAwesome::AwesomeConfig" do
     var { Faker::Hacker.noun }

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

@@ -7,9 +7,13 @@ Decidim::DecidimAwesome.configure do |config|
       :allow_videos_in_editors,
       :allow_images_in_proposals,
       :auto_save_forms,
+      :user_timezone,
+      :force_authorization_after_login,
+      :admins_available_authorizations,
       :intergram_for_admins,
       :intergram_for_public,
       :scoped_styles,
+      :scoped_admin_styles,
       :proposal_custom_fields,
       :proposal_private_custom_fields,
       :menu,

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

@@ -40,7 +40,7 @@ shared_examples "forbids disabled feature without redirect" do
   it "fails with error" do
     action
 
-    expect(response.body).to eq("no permissions for #{feature}")
+    expect(response.body).to have_content("No permissions for #{feature}")
   end
 end
 

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

@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+shared_examples "creates a new box" do |name|
+  it "saves the content in the hash" do
+    click_on "Add a new \"#{name}\" CSS box"
+
+    expect(page).to have_admin_callout("created successfully")
+
+    sleep 1
+    page.execute_script('document.querySelector(".CodeMirror").CodeMirror.setValue("body {background: red;}");')
+
+    click_on "Update configuration"
+
+    expect(page).to have_admin_callout("updated successfully")
+    expect(page).to have_content("body {background: red;}")
+  end
+end
+
+shared_examples "saves content" do |key|
+  it "updates succesfully" do
+    expect(page).to have_content("body {background: red;}")
+    expect(page).to have_content("body {background: blue;}")
+
+    sleep 1
+    page.execute_script("document.querySelector(\"[data-key=#{key}] .CodeMirror\").CodeMirror.setValue(\"body {background: green;}\");")
+    click_link_or_button "Update configuration"
+
+    expect(page).to have_admin_callout("updated successfully")
+    expect(page).not_to have_content("body {background: red;}")
+    expect(page).to have_content("body {background: green;}")
+    expect(page).to have_content("body {background: blue;}")
+  end
+
+  it "shows error message if invalid" do
+    sleep 1
+    page.execute_script("document.querySelector(\"[data-key=#{key}] .CodeMirror\").CodeMirror.setValue(\"I am invalid CSS\");")
+    click_link_or_button "Update configuration"
+
+    expect(page).to have_admin_callout("Error updating configuration!")
+    expect(page).not_to have_content("body {background: red;}")
+    expect(page).to have_content("body {background: blue;}")
+    expect(page).to have_content("I am invalid CSS")
+  end
+end
+
+shared_examples "updates new box" do
+  it "updates the content in the hash" do
+    expect(page).to have_content("body {background: red;}")
+    expect(page).to have_content("body {background: blue;}")
+  end
+end
+
+shared_examples "removes a box" do
+  let(:styles) do
+    {
+      "foo" => "body {background: red;}",
+      "bar" => "body {background: blue;}"
+    }
+  end
+
+  it "updates the content in the hash" do
+    expect(page).to have_content("body {background: red;}")
+    expect(page).to have_content("body {background: blue;}")
+
+    within ".scoped_styles_container[data-key=\"foo\"]" do
+      accept_confirm { click_link_or_button "Remove this CSS box" }
+    end
+
+    expect(page).to have_admin_callout("removed successfully")
+    expect(page).to have_content("body {background: blue;}")
+    expect(page).not_to have_content("body {background: red;}")
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_foo")).not_to be_present
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar")).to be_present
+  end
+end
+
+shared_examples "adds a constraint" do |name|
+  let(:styles) do
+    {
+      "foo" => "body {background: red;}",
+      "bar" => "body {background: blue;}"
+    }
+  end
+
+  it "adds a new config helper var" do
+    click_on "Add a new \"#{name}\" CSS box"
+
+    expect(page).to have_content("Processes")
+
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar")).to be_present
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:,
+                                                          var: "#{var_name}_bar").constraints.first.settings).to eq("participatory_space_manifest" => "participatory_processes")
+  end
+end
+
+shared_examples "removes a constraint" do
+  let(:styles) do
+    {
+      "foo" => "body {background: red;}",
+      "bar" => "body {background: blue;}"
+    }
+  end
+
+  before do
+    visit decidim_admin_decidim_awesome.config_path("#{var_name}s")
+    click_on "Add case", id: "new-#{var_name}_bar"
+  end
+
+  it "removes the helper config var" do
+    within "#constraint-form-" do
+      select "Processes", from: "Apply to participatory spaces of type"
+    end
+    click_on "Save"
+
+    within ".scoped_styles_container[data-key=\"bar\"] .constraints-editor" do
+      expect(page).to have_content("Processes")
+    end
+
+    within ".scoped_styles_container[data-key=\"bar\"] .constraints-editor" do
+      click_on "Delete"
+    end
+
+    within ".scoped_styles_container[data-key=\"bar\"] .constraints-editor" do
+      expect(page).not_to have_content("Processes")
+    end
+
+    visit decidim_admin_decidim_awesome.config_path("#{var_name}s")
+
+    within ".scoped_styles_container[data-key=\"bar\"] .constraints-editor" do
+      expect(page).not_to have_content("Processes")
+    end
+
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar")).to be_present
+    expect(Decidim::DecidimAwesome::AwesomeConfig.find_by(organization:, var: "#{var_name}_bar").constraints).not_to be_present
+  end
+end
+
+shared_examples "extra css is added" do
+  it "css is present" do
+    expect(page.body).to have_content("body {background: red;}")
+  end
+
+  it "css is applied" do
+    expect(page.execute_script("return window.getComputedStyle($('body')[0]).backgroundColor")).to eq("rgb(255, 0, 0)")
+  end
+end
+
+shared_examples "no extra css is added" do
+  it "css is no present" do
+    expect(page.body).not_to have_content("body {background: red;}")
+  end
+
+  it "css is not applyied" do
+    expect(page.execute_script("return window.getComputedStyle($('body')[0]).backgroundColor")).to eq(default_background_color)
+  end
+end

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

@@ -56,6 +56,15 @@ shared_examples "activated concerns" do |enabled|
       expect(Decidim::AmendmentsController.included_modules).to include(Decidim::DecidimAwesome::LimitPendingAmendments)
       expect(Decidim::Proposals::ProposalsController.included_modules).to include(Decidim::DecidimAwesome::Proposals::OrderableOverride)
       expect(Decidim::AdminLog::ComponentPresenter.included_modules).to include(Decidim::DecidimAwesome::AdminLog::ComponentPresenterOverride)
+      expect(Decidim::ApplicationController.included_modules).to include(Decidim::DecidimAwesome::CheckLoginAuthorizations)
+      expect(Decidim::ApplicationController.included_modules).to include(Decidim::DecidimAwesome::UseUserTimeZone)
+      expect(Decidim::AccountForm.included_modules).to include(Decidim::DecidimAwesome::AccountFormOverride)
+      expect(Decidim::UpdateAccount.included_modules).to include(Decidim::DecidimAwesome::UpdateAccountOverride)
+      expect(Decidim::System::RegisterOrganizationForm.included_modules).to include(Decidim::DecidimAwesome::System::OrganizationFormOverride)
+      expect(Decidim::System::UpdateOrganizationForm.included_modules).to include(Decidim::DecidimAwesome::System::OrganizationFormOverride)
+      expect(Decidim::System::UpdateOrganization.included_modules).to include(Decidim::DecidimAwesome::System::UpdateOrganizationOverride)
+      expect(Decidim::System::RegisterOrganization.included_modules).to include(Decidim::DecidimAwesome::System::RegisterOrganizationOverride)
+      expect(Decidim::AdminLog::UserPresenter.included_modules).to include(Decidim::DecidimAwesome::AdminLog::UserPresenterOverride)
     end
 
   else
@@ -84,6 +93,16 @@ shared_examples "activated concerns" do |enabled|
       expect(Decidim::AmendmentsController.included_modules).not_to include(Decidim::DecidimAwesome::LimitPendingAmendments)
       expect(Decidim::Proposals::ProposalsController.included_modules).not_to include(Decidim::DecidimAwesome::Proposals::OrderableOverride)
       expect(Decidim::AdminLog::ComponentPresenter.included_modules).not_to include(Decidim::DecidimAwesome::AdminLog::ComponentPresenterOverride)
+      expect(Decidim::ApplicationController.included_modules).not_to include(Decidim::DecidimAwesome::CheckLoginAuthorizations)
+      expect(Decidim::ApplicationController.included_modules).not_to include(Decidim::DecidimAwesome::UseUserTimeZone)
+      expect(Decidim::AccountForm.included_modules).not_to include(Decidim::DecidimAwesome::AccountFormOverride)
+      expect(Decidim::UpdateAccount.included_modules).not_to include(Decidim::DecidimAwesome::UpdateAccountOverride)
+      expect(Decidim::System::RegisterOrganizationForm.included_modules).not_to include(Decidim::DecidimAwesome::System::OrganizationFormOverride)
+      expect(Decidim::System::UpdateOrganizationForm.included_modules).not_to include(Decidim::DecidimAwesome::System::OrganizationFormOverride)
+      expect(Decidim::System::UpdateOrganization.included_modules).not_to include(Decidim::DecidimAwesome::System::UpdateOrganizationOverride)
+      expect(Decidim::DecidimAwesome::AwesomeHelpers.included_modules).not_to include(Decidim::DecidimAwesome::AwesomeHelpers)
+      expect(Decidim::DecidimAwesome::ContentSecurityPolicy.included_modules).not_to include(Decidim::DecidimAwesome::ContentSecurityPolicy)
+      expect(Decidim::DecidimAwesome::UserOverride.included_modules).not_to include(Decidim::DecidimAwesome::UserOverride)
     end
   end
 end
@@ -155,15 +174,12 @@ end
 
 shared_examples "basic rendering" do |enabled|
   describe "shows public pages", type: :system do
-    let(:image_vars) do
+    let(:boolean_vars) do
       [
         :allow_images_in_proposals,
         :allow_videos_in_editors,
         :allow_images_in_editors,
-        :allow_images_in_proposals,
-        :auto_save_forms,
-        :intergram_for_admins,
-        :intergram_for_public
+        :auto_save_forms
       ]
     end
 
@@ -186,8 +202,8 @@ shared_examples "basic rendering" do |enabled|
     end
 
     if enabled
-      it "has editor images configs enabled" do
-        image_vars.each do |var|
+      it "has boolean configs enabled" do
+        boolean_vars.each do |var|
           expect(page.body).to have_content("\"#{var}\":true")
         end
       end
@@ -200,8 +216,8 @@ shared_examples "basic rendering" do |enabled|
         expect(page.body).to have_content(styles)
       end
     else
-      it "has editor images configs disabled" do
-        image_vars.each do |var|
+      it "has boolean configs disabled" do
+        boolean_vars.each do |var|
           expect(page.body).to have_content("\"#{var}\":false")
         end
       end
@@ -222,7 +238,7 @@ shared_examples "basic rendering" do |enabled|
         "config/editors",
         "config/proposals",
         "config/surveys",
-        "config/styles",
+        "config/scoped_styles",
         "config/proposal_custom_fields",
         "config/admins",
         "menus/menu/hacks",

data/lib/decidim/decidim_awesome/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-decidim_awesome version.
   module DecidimAwesome
-    VERSION = "0.11.2"
+    VERSION = "0.11.4"
     COMPAT_DECIDIM_VERSION = [">= 0.28.0", "< 0.29"].freeze
   end
 end

data/package.json

@@ -40,12 +40,13 @@
     "@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",
+    "@decidim/dev": "0.28.4",
+    "@decidim/eslint-config": "0.28.4",
+    "@decidim/prettier-config": "0.28.4",
+    "@decidim/stylelint-config": "0.28.4",
     "postcss-scss": "^4.0.9",
-    "sass-embedded": "~1.57.1"
+    "sass-embedded": "~1.57.1",
+    "@tarekraafat/autocomplete.js": "10.2.7"
   },
   "dependencies": {
     "@rails/actioncable": "^6.1.7-6",