decidim-decidim_awesome 0.8.3 → 0.9.1

data/lib/decidim/decidim_awesome/config.rb

@@ -53,18 +53,18 @@ module Decidim
 
       # config processed for the organization config, without context
       def organization_config
-        @organization_config ||= unfiltered_config.map do |key, value|
+        @organization_config ||= unfiltered_config.to_h do |key, value|
           value = defaults[key] unless enabled_for_organization? key
           [key, value]
-        end.to_h
+        end
       end
 
       # config normalized according default values, without context, without organization config
       def unfiltered_config
-        valid = @vars.map { |v| [v.var.to_sym, v.value] }.to_h
+        valid = @vars.to_h { |v| [v.var.to_sym, v.value] }
 
-        map_defaults do |key|
-          valid[key].presence
+        map_defaults do |key, val|
+          valid.has_key?(key) ? valid[key] : val
         end
       end
 
@@ -135,31 +135,31 @@ module Decidim
         plural_key = singular_key.pluralize.to_sym
         return {} unless config[plural_key]
 
-        @sub_configs[singular_key] = config[plural_key].map do |key, _value|
+        @sub_configs[singular_key] = config[plural_key].to_h do |key, _value|
           [key, AwesomeConfig.find_by(var: "#{singular_key}_#{key}", organization: @organization)]
-        end.to_h
+        end
       end
 
       private
 
       def map_defaults
-        defaults.map do |key, val|
+        defaults.to_h do |key, val|
           value = false
           unless val == :disabled
-            value = yield(key) || val
-            value = val.merge(value.transform_keys(&:to_sym)) if val.is_a? Hash
+            value = yield(key, val)
+            value = val.merge(value.transform_keys(&:to_sym)) if val.is_a?(Hash) && value.is_a?(Hash)
           end
           [key, value]
-        end.to_h
+        end
       end
 
       def calculate_config
         # filter vars compliant with current context
         valid = @vars.filter { |item| enabled_for_organization?(item.var) && valid_in_context?(item.all_constraints) }
-                     .map { |v| [v.var.to_sym, v.value] }.to_h
+                     .to_h { |v| [v.var.to_sym, v.value] }
 
-        map_defaults do |key|
-          valid[key].presence
+        map_defaults do |key, val|
+          valid.has_key?(key) ? valid[key] : val
         end
       end
 

data/lib/decidim/decidim_awesome/context_analyzers/request_analyzer.rb

@@ -16,7 +16,7 @@ module Decidim
           def participatory_spaces_routes
             spaces = Decidim.participatory_space_manifests \
                             .filter { |space| !DecidimAwesome.config.participatory_spaces_routes_context.has_key?(space.name) } \
-                            .map { |space| [space.name.to_s, space.name.to_s] }.to_h
+                            .to_h { |space| [space.name.to_s, space.name.to_s] }
             DecidimAwesome.config.participatory_spaces_routes_context.each do |manifest, routes|
               routes.each do |route|
                 spaces[route.to_s] = manifest.to_s

data/lib/decidim/decidim_awesome/engine.rb

@@ -27,25 +27,52 @@ module Decidim
         # 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])
+        # Override EtiquetteValidator
+        EtiquetteValidator.include(Decidim::DecidimAwesome::EtiquetteValidatorOverride) if DecidimAwesome.enabled?([:validate_title_max_caps_percent,
+                                                                                                                    :validate_title_max_marks_together,
+                                                                                                                    :validate_title_start_with_caps,
+                                                                                                                    :validate_body_max_caps_percent,
+                                                                                                                    :validate_body_max_marks_together,
+                                                                                                                    :validate_body_start_with_caps])
 
         # Custom fields need to deal with several places
-        if DecidimAwesome.enabled?(:proposal_custom_fields)
-          Decidim::Proposals::ApplicationHelper.include(Decidim::DecidimAwesome::Proposals::ApplicationHelperOverride)
+        if DecidimAwesome.enabled?([:proposal_custom_fields,
+                                    :validate_title_min_length,
+                                    :validate_title_max_caps_percent,
+                                    :validate_title_max_marks_together,
+                                    :validate_title_start_with_caps,
+                                    :validate_body_min_length,
+                                    :validate_body_max_caps_percent,
+                                    :validate_body_max_marks_together,
+                                    :validate_body_start_with_caps])
           Decidim::Proposals::ProposalWizardCreateStepForm.include(Decidim::DecidimAwesome::Proposals::ProposalWizardCreateStepFormOverride)
-          Decidim::AmendmentsHelper.include(Decidim::DecidimAwesome::AmendmentsHelperOverride)
         end
 
+        # override user's admin property
+        Decidim::User.include(Decidim::DecidimAwesome::UserOverride) if DecidimAwesome.enabled?(:scoped_admins)
+
         Decidim::MenuPresenter.include(Decidim::DecidimAwesome::MenuPresenterOverride)
         Decidim::MenuItemPresenter.include(Decidim::DecidimAwesome::MenuItemPresenterOverride)
 
         # 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)
+          next if DecidimAwesome.disabled_components.include?(manifest)
+          next if Decidim.find_component_manifest(manifest)
+
+          Decidim.register_component(manifest, &block)
+        end
+      end
+
+      initializer "decidim_decidim_awesome.overrides", after: "decidim.action_controller" do
+        config.to_prepare do
+          # 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::AmendmentsHelper.include(Decidim::DecidimAwesome::AmendmentsHelperOverride)
+          end
         end
       end
 

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

@@ -43,7 +43,8 @@ Decidim::DecidimAwesome.register_component(:awesome_iframe) do |component|
       published_at: Time.current,
       participatory_space: participatory_space,
       settings: {
-        announcement: { en: Faker::Lorem.paragraphs(number: 2).join("\n") }
+        announcement: { en: Faker::Lorem.paragraphs(number: 2).join("\n") },
+        iframe: '<iframe src="https://picsum.photos/800/600" width="100%" height="700" frameborder="0"></iframe>'
       }
     }
 

data/lib/decidim/decidim_awesome/menu_hacker.rb

@@ -48,6 +48,7 @@ module Decidim
         menu
       end
 
+      # rubocop:disable Style/OpenStructUse
       def menu_overrides
         @menu_overrides ||= current_config.map do |item|
           OpenStruct.new(
@@ -64,6 +65,7 @@ module Decidim
           )
         end
       end
+      # rubocop:enable Style/OpenStructUse
 
       def activate?(url, view)
         urls = @items.map(&:url).sort_by(&:length).reverse
@@ -78,6 +80,10 @@ module Decidim
           user.present?
         when "non_logged"
           user.blank?
+        when "verified_user"
+          # the cleaner version should be user.authorizations.any?
+          # but there is not relationship between users and authorizations
+          Decidim::Authorization.where(user: user).any? { |auth| auth.granted? && !auth.expired? }
         else
           true
         end

data/lib/decidim/decidim_awesome/system_checker.rb

@@ -54,9 +54,11 @@ module Decidim
           Digest::MD5.hexdigest(File.read(file))
         end
 
+        # rubocop:disable Style/OpenStructUse
         def to_struct(obj)
           OpenStruct.new obj
         end
+        # rubocop:enable Style/OpenStructUse
       end
     end
   end

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

@@ -23,6 +23,13 @@ FactoryBot.define do
     organization { create :organization }
   end
 
+  factory :paper_trail_version, class: Decidim::DecidimAwesome::PaperTrailVersion do
+    item_id { user.id }
+    item_type { "Decidim::ParticipatoryProcessUserRole" }
+    event { "create" }
+    created_at { 1.hour.ago }
+  end
+
   factory :map_component, parent: :component do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :proposals).i18n_name }
     manifest_name { :awesome_map }

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Decidim::DecidimAwesome.configure do |config|
-  if ENV["FEATURES"] == "disabled"
+  if ENV.fetch("FEATURES", nil) == "disabled"
     [
       :allow_images_in_full_editor,
       :allow_images_in_small_editor,
@@ -15,7 +15,15 @@ Decidim::DecidimAwesome.configure do |config|
       :proposal_custom_fields,
       :menu,
       :scoped_admins,
-      :custom_redirects
+      :custom_redirects,
+      :validate_title_min_length,
+      :validate_title_max_caps_percent,
+      :validate_title_max_marks_together,
+      :validate_title_start_with_caps,
+      :validate_body_min_length,
+      :validate_body_max_caps_percent,
+      :validate_body_max_marks_together,
+      :validate_body_start_with_caps
     ].each do |conf|
       config.send("#{conf}=", :disabled)
     end

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+shared_examples "a user presenter" do
+  describe "#last_sign_in_date" do
+    it "returns never logged in yet" do
+      expect(subject.last_sign_in_date).to eq("<span class=\"muted\">Never logged yet</span>")
+    end
+
+    context "when no html" do
+      let(:html) { false }
+
+      it "returns never logged in yet" do
+        expect(subject.last_sign_in_date).to eq("Never logged yet")
+      end
+    end
+
+    context "when user has logged before" do
+      let(:last_sign_in_at) { 1.day.ago }
+
+      it "returns the last sign in date" do
+        expect(subject.last_sign_in_date).to eq(1.day.ago.strftime("%d/%m/%Y %H:%M"))
+      end
+    end
+  end
+
+  describe "#user" do
+    it "returns the user" do
+      expect(subject.user).to eq(user)
+    end
+
+    it "returns email" do
+      expect(subject.user_email).to eq(user.email)
+    end
+
+    it "returns user name" do
+      expect(subject.user_name).to eq(user.name)
+    end
+  end
+
+  describe "#removal_date" do
+    it "returns currently active" do
+      expect(subject.removal_date).to eq("<span class=\"text-success\">Currently active</span>")
+    end
+
+    context "when html is disabled" do
+      let(:html) { false }
+
+      it "returns currently active" do
+        expect(subject.removal_date).to eq("Currently active")
+      end
+    end
+
+    context "when the role was removed" do
+      include_context "with role destroyed"
+
+      it "returns the removal date" do
+        expect(subject.removal_date).to eq(destroyed_at.strftime("%d/%m/%Y %H:%M"))
+      end
+    end
+  end
+end

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

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+welcome_text = "Welcome to the Admin Panel."
+welcome_text = "Welcome to the Decidim Admin Panel." if legacy_version?
+
 shared_examples "redirects to index" do |_link|
   it "display index page" do
     expect(page).to have_content("You are not authorized to perform this action")
-    expect(page).to have_content("Welcome to the Decidim Admin Panel.")
+    expect(page).to have_content(welcome_text)
     expect(page).to have_current_path(decidim_admin.root_path, ignore_query: true)
   end
 end
@@ -85,7 +88,7 @@ shared_examples "allows external accesses" do
 
   it "shows participants access" do
     visit decidim_admin.users_path
-    expect(page).to have_content("New user")
+    expect(page).to have_content(legacy_version? ? "New user" : "New admin")
   end
 
   it "shows pages access" do
@@ -110,7 +113,7 @@ shared_examples "allows all admin routes" do
   end
 
   it "allows the admin root page" do
-    expect(page).to have_content("Welcome to the Decidim Admin Panel.")
+    expect(page).to have_content(welcome_text)
   end
 
   it "allows the assemblies page" do
@@ -132,7 +135,7 @@ shared_examples "allows scoped admin routes" do
   end
 
   it "allows the admin root page" do
-    expect(page).to have_content("Welcome to the Decidim Admin Panel.")
+    expect(page).to have_content(welcome_text)
   end
 
   it "allows the assemblies page" do

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

@@ -36,6 +36,7 @@ shared_examples "activated concerns" do |enabled|
       expect(Decidim::Proposals::ApplicationHelper.included_modules).to include(Decidim::DecidimAwesome::Proposals::ApplicationHelperOverride)
       expect(Decidim::Proposals::ProposalWizardCreateStepForm.included_modules).to include(Decidim::DecidimAwesome::Proposals::ProposalWizardCreateStepFormOverride)
       expect(Decidim::AmendmentsHelper.included_modules).to include(Decidim::DecidimAwesome::AmendmentsHelperOverride)
+      expect(EtiquetteValidator.included_modules).to include(Decidim::DecidimAwesome::EtiquetteValidatorOverride)
     end
   else
     it "concerns are not registered" do
@@ -44,12 +45,12 @@ shared_examples "activated concerns" do |enabled|
       expect(Decidim::Proposals::ApplicationHelper.included_modules).not_to include(Decidim::DecidimAwesome::Proposals::ApplicationHelperOverride)
       expect(Decidim::Proposals::ProposalWizardCreateStepForm.included_modules).not_to include(Decidim::DecidimAwesome::Proposals::ProposalWizardCreateStepFormOverride)
       expect(Decidim::AmendmentsHelper.included_modules).not_to include(Decidim::DecidimAwesome::AmendmentsHelperOverride)
+      expect(EtiquetteValidator.included_modules).not_to include(Decidim::DecidimAwesome::EtiquetteValidatorOverride)
     end
   end
 end
 
 shared_examples "custom menus" do |enabled|
-  # rubocop:disable RSpec/EmptyExampleGroup
   describe Decidim::MenuPresenter, type: :helper do
     before do
       allow(view).to receive(:current_organization).and_return(organization)
@@ -66,7 +67,6 @@ shared_examples "custom menus" do |enabled|
       end
     end
   end
-  # rubocop:enable RSpec/EmptyExampleGroup
 end
 
 shared_examples "basic rendering" do |enabled|

data/lib/decidim/decidim_awesome/version.rb

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

data/lib/tasks/decidim_awesome_active_storage_migrations_tasks.rake

@@ -15,9 +15,7 @@ namespace :decidim_awesome do
         path = Rails.root.join("tmp/decidim_awesome_editor_images_mappings.csv")
         dirname = File.dirname(path)
         FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
-        File.open(path, "wb") do |file|
-          file.write(Decidim::Exporters::CSV.new(routes_mappings).export.read)
-        end
+        File.binwrite(path, Decidim::Exporters::CSV.new(routes_mappings).export.read)
       end
     end
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decidim-module-decidim_awesome",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Mods and tweaks for Decidim",
   "main": "index.js",
   "directories": {
@@ -16,7 +16,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Platoniq/decidim-module-decidim_awesome.git"
+    "url": "git+https://github.com/decidim-ice/decidim-module-decidim_awesome.git"
   },
   "keywords": [
     "decidim"
@@ -24,176 +24,33 @@
   "author": "ivan@platoniq.net",
   "license": "AGPL-3.0-or-later",
   "bugs": {
-    "url": "https://github.com/Platoniq/decidim-module-decidim_awesome/issues"
+    "url": "https://github.com/decidim-ice/decidim-module-decidim_awesome/issues"
   },
-  "homepage": "https://github.com/Platoniq/decidim-module-decidim_awesome#readme",
+  "homepage": "https://github.com/decidim-ice/decidim-module-decidim_awesome#readme",
   "stylelint": {
-    "rules": {
-      "at-rule-empty-line-before": [
-        "always",
-        {
-          "except": [
-            "blockless-after-same-name-blockless",
-            "first-nested"
-          ],
-          "ignore": [
-            "after-comment"
-          ],
-          "ignoreAtRules": [
-            "else"
-          ]
-        }
-      ],
-      "at-rule-name-case": "lower",
-      "at-rule-semicolon-newline-after": "always",
-      "block-closing-brace-empty-line-before": "never",
-      "block-closing-brace-newline-after": "always",
-      "block-closing-brace-newline-before": "always-multi-line",
-      "block-closing-brace-space-before": "always-single-line",
-      "block-no-empty": true,
-      "block-opening-brace-newline-after": "always-multi-line",
-      "block-opening-brace-space-after": "always-single-line",
-      "block-opening-brace-space-before": "always",
-      "color-hex-case": "lower",
-      "color-hex-length": "short",
-      "color-no-invalid-hex": true,
-      "comment-empty-line-before": [
-        "always",
-        {
-          "except": [
-            "first-nested"
-          ],
-          "ignore": [
-            "stylelint-commands"
-          ]
-        }
-      ],
-      "comment-no-empty": true,
-      "comment-whitespace-inside": "always",
-      "custom-property-empty-line-before": [
-        "always",
-        {
-          "except": [
-            "after-custom-property",
-            "first-nested"
-          ],
-          "ignore": [
-            "after-comment",
-            "inside-single-line-block"
-          ]
-        }
-      ],
-      "declaration-bang-space-after": "never",
-      "declaration-bang-space-before": "always",
-      "declaration-block-no-duplicate-properties": [
-        true,
-        {
-          "ignore": [
-            "consecutive-duplicates-with-different-values"
-          ]
-        }
-      ],
-      "declaration-block-no-redundant-longhand-properties": true,
-      "declaration-block-no-shorthand-property-overrides": true,
-      "declaration-block-semicolon-newline-after": "always-multi-line",
-      "declaration-block-semicolon-space-after": "always-single-line",
-      "declaration-block-semicolon-space-before": "never",
-      "declaration-block-single-line-max-declarations": 1,
-      "declaration-block-trailing-semicolon": "always",
-      "declaration-colon-newline-after": "always-multi-line",
-      "declaration-colon-space-after": "always-single-line",
-      "declaration-colon-space-before": "never",
-      "declaration-empty-line-before": [
-        "always",
-        {
-          "except": [
-            "after-declaration",
-            "first-nested"
-          ],
-          "ignore": [
-            "after-comment",
-            "inside-single-line-block"
-          ]
-        }
-      ],
-      "function-calc-no-unspaced-operator": true,
-      "function-comma-newline-after": "always-multi-line",
-      "function-comma-space-after": "always-single-line",
-      "function-comma-space-before": "never",
-      "function-linear-gradient-no-nonstandard-direction": true,
-      "function-max-empty-lines": 0,
-      "function-name-case": "lower",
-      "function-parentheses-newline-inside": "always-multi-line",
-      "function-parentheses-space-inside": "never-single-line",
-      "function-whitespace-after": "always",
-      "indentation": 2,
-      "keyframe-declaration-no-important": true,
-      "length-zero-no-unit": true,
-      "max-empty-lines": 1,
-      "media-feature-colon-space-after": "always",
-      "media-feature-colon-space-before": "never",
-      "media-feature-name-case": "lower",
-      "media-feature-name-no-unknown": true,
-      "media-feature-parentheses-space-inside": "never",
-      "media-feature-range-operator-space-after": "always",
-      "media-feature-range-operator-space-before": "always",
-      "media-query-list-comma-newline-after": "always-multi-line",
-      "media-query-list-comma-space-after": "always-single-line",
-      "media-query-list-comma-space-before": "never",
-      "no-empty-source": true,
-      "no-eol-whitespace": true,
-      "no-extra-semicolons": true,
-      "no-invalid-double-slash-comments": true,
-      "no-missing-end-of-source-newline": true,
-      "number-leading-zero": "never",
-      "number-no-trailing-zeros": true,
-      "property-case": "lower",
-      "property-no-unknown": true,
-      "rule-empty-line-before": [
-        "always-multi-line",
-        {
-          "except": [
-            "first-nested"
-          ],
-          "ignore": [
-            "after-comment"
-          ]
-        }
-      ],
-      "selector-attribute-brackets-space-inside": "never",
-      "selector-attribute-operator-space-after": "never",
-      "selector-attribute-operator-space-before": "never",
-      "selector-combinator-space-after": "always",
-      "selector-combinator-space-before": "always",
-      "selector-descendant-combinator-no-non-space": true,
-      "selector-list-comma-newline-after": "always",
-      "selector-list-comma-space-before": "never",
-      "selector-max-empty-lines": 0,
-      "selector-pseudo-class-case": "lower",
-      "selector-pseudo-class-no-unknown": true,
-      "selector-pseudo-class-parentheses-space-inside": "never",
-      "selector-pseudo-element-case": "lower",
-      "selector-pseudo-element-colon-notation": "double",
-      "selector-pseudo-element-no-unknown": true,
-      "selector-type-case": "lower",
-      "selector-type-no-unknown": true,
-      "shorthand-property-no-redundant-values": true,
-      "string-no-newline": true,
-      "unit-case": "lower",
-      "unit-no-unknown": true,
-      "value-list-comma-newline-after": "always-multi-line",
-      "value-list-comma-space-after": "always-single-line",
-      "value-list-comma-space-before": "never",
-      "value-list-max-empty-lines": 0
+    "extends": "@decidim/stylelint-config",
+    "rules" : {
+      "block-opening-brace-space-before": "always"
     }
   },
   "devDependencies": {
-    "eslint": "^7.32.0",
-    "eslint": "^7.25.0",
+    "@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.20.5",
+    "@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.1",
+    "@decidim/eslint-config": "0.27.1",
+    "@decidim/stylelint-config": "0.27.1",
     "eslint-config-prettier": "^8.2.0",
     "eslint-config-standard": "^11.0.0",
     "eslint-plugin-import": "^2.22.0",
-    "stylelint": "13.11.0"
+    "eslint-plugin-standard": "^3.1.0",
+    "sass-embedded": "~1.57.1"
   },
   "dependencies": {
     "codemirror": "^5.65.0",