decidim-decidim_awesome 0.6.4 → 0.6.5

data/config/locales/sv.yml

@@ -24,6 +24,12 @@ sv:
         component_manifest: Only in components of type
         participatory_space_manifest: Apply to participatory spaces of type
         participatory_space_slug: Only in
+      menu:
+        position: Position
+        raw_label: Label
+        target: Opens in
+        url: URL
+        visibility: Visibility
   decidim:
     admin:
       menu:
@@ -78,10 +84,10 @@ sv:
             title: 'Applicable only in these cases:'
           create_scoped_style:
             error: Error creating a new CSS box! %{error}
-            success: CSS box %{key} created successfully!
+            success: CSS box %{key} created successfully
           destroy_scoped_style:
             error: Error removing CSS box! %{error}
-            success: CSS box %{key} removed successfully!
+            success: CSS box %{key} removed successfully
           experimental: Experimental options
           form:
             help:
@@ -107,7 +113,7 @@ sv:
           system: Everywhere except participatory spaces
           update:
             error: Error updating configuration! %{error}
-            success: Configuration updated successfully!
+            success: Configuration updated successfully
         constraints:
           create:
             error: Error creating condition case
@@ -132,9 +138,44 @@ sv:
           checks: System compatibility
           editors: Editor hacks
           livechat: Live Chat
+          menu_hacks: Menu tweaks
           proposals: Proposals hacks
           styles: Custom styles
           surveys: Surveys & forms
+        menu_hacks:
+          create:
+            error: Error creating menu item! %{error}
+            success: Menu item created successfully
+          destroy:
+            error: Error removing menu item! %{error}
+            success: Menu item removed successfully
+          edit:
+            save: Save
+            title: Edit menu item
+          form:
+            label_help: Translations aren't automatically detected, be sure to fill in all the fields!
+            target:
+              blank: New window
+              self: Same window
+            visibility:
+              default: Visible
+              hidden: Always hidden
+              logged: Only visible for logged users
+              non_logged: Only visible for non-logged users
+          index:
+            confirm_destroy: Are you sure to remove this customization?
+            edit: Edit
+            new: New item
+            remove: Remove addition
+            remove_hack: Remove customization
+            title: Main menu
+          new:
+            save: Save
+            title: New menu item
+          update:
+            error: Error updating menu item! %{error}
+            success: Menu item updated successfully
+          url_exists: The same URL is already configured, please edit that instead of creating it again.
       config:
         intergram:
           auto_no_response: It seems that no one is available to answer right now. Please tell us how we can contact you, and we will get back to you as soon as we can.
@@ -146,7 +187,7 @@ sv:
       editor_images:
         create:
           error: Error uploading image!
-          success: Image uploaded successfully!
+          success: Image uploaded successfully
       map_component:
         map:
           error:

data/lib/decidim/decidim_awesome.rb

@@ -18,6 +18,7 @@ module Decidim
     autoload :SystemChecker, "decidim/decidim_awesome/system_checker"
     autoload :ContentRenderes, "decidim/decidim_awesome/content_renderers"
     autoload :ContextAnalyzers, "decidim/decidim_awesome/context_analyzers"
+    autoload :MenuHacker, "decidim/decidim_awesome/menu_hacker"
 
     # Boolean configuration options
     #
@@ -71,6 +72,20 @@ module Decidim
       {}
     end
 
+    # allows to keep modifications for the main menu
+    # can return :disabled to completly remove this feature
+    # otherwise it should be an array (some overrides can be specified by default):
+    # [
+    #    {
+    #       url: "/a-new-link",
+    #       label: { "en" => "The label to show in the menu" },
+    #       position: 10
+    #    }
+    # ]
+    config_accessor :menu do
+      []
+    end
+
     # these settings do not follow the :disabled convention but
     # depends on the previous intergram configurations
     config_accessor :intergram_url do

data/lib/decidim/decidim_awesome/admin_engine.rb

@@ -12,6 +12,7 @@ module Decidim
       routes do
         # Add admin engine routes here
         resources :constraints
+        resources :menu_hacks, except: [:show]
         resources :config, param: :var, only: [:show, :update]
         post :new_scoped_style, to: "config#new_scoped_style"
         post :destroy_scoped_style, param: :key, to: "config#destroy_scoped_style"

data/lib/decidim/decidim_awesome/checksums.yml

@@ -10,6 +10,12 @@ decidim-core:
     decidim-0.22: 797d0ec1c9e79453cf6718f82d2fdd27
     decidim-0.23: cb059b8ff0ffc62c67eb99d8d7a6637b
     decidim-0.23.1: 4787f73f0f33661e3897404f10019d26
+  /app/presenters/decidim/menu_presenter.rb:
+    decidim-0.22: 042743c44a2aff284b493c7bebbccbb3
+    decidim-0.23: 042743c44a2aff284b493c7bebbccbb3
+  /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

data/lib/decidim/decidim_awesome/engine.rb

@@ -20,7 +20,7 @@ module Decidim
 
       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
+        # add to precompile any present theme asset
         Dir.glob(Rails.root.join("app", "assets", "themes", "*.*")).each do |path|
           app.config.assets.precompile << path
         end

data/lib/decidim/decidim_awesome/menu_hacker.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    class MenuHacker
+      include Decidim::TranslatableAttributes
+      def initialize(name, view)
+        @name = name
+        @organization = view.try(:current_organization)
+        @user = view.try(:current_user)
+        @view = view
+      end
+
+      # returns a combined array of the Decidim defined menu and the hacked stored as config vars
+      def items(include_invisible = false)
+        return @items if @items
+
+        @items = default_items
+        menu_overrides.each do |item|
+          default = default_items.find { |i| i.url.gsub(/\?.*/, "") == item.url }
+          if default
+            item.send("overrided?=", true)
+            @items.reject! { |i| i.url.gsub(/\?.*/, "") == item.url }
+          end
+          @items << item if include_invisible || visible?(item)
+        end
+
+        @items.sort_by!(&:position)
+      end
+
+      private
+
+      attr_accessor :organization, :user
+      attr_reader :name, :view
+
+      def visible?(item)
+        case item.visibility
+        when "hidden"
+          false
+        when "logged"
+          user.present?
+        when "non_logged"
+          user.blank?
+        else
+          true
+        end
+      end
+
+      def default_items
+        @default_items ||= build_menu.instance_variable_get(:@items).map do |item|
+          item.instance_variable_set(:@active, method(:activate?)) unless item.active == :exact
+          item
+        end
+      end
+
+      def build_menu
+        menu = Decidim::Menu.new(name)
+        menu.build_for(view)
+        menu
+      end
+
+      def menu_overrides
+        @menu_overrides ||= current_config.map do |item|
+          OpenStruct.new(
+            label: translated_attribute(item["label"], organization),
+            raw_label: item["label"],
+            url: item["url"],
+            position: item["position"] || 1,
+            # see options in https://github.com/comfy/active_link_to
+            active: method(:activate?),
+            visibility: item["visibility"],
+            target: item["target"],
+            overrided?: false
+          )
+        end
+      end
+
+      def activate?(url, view)
+        urls = @items.map(&:url).sort_by(&:length).reverse
+        url == urls.find { |u| view.request.original_fullpath.start_with?(u) }
+      end
+
+      def current_config
+        @current_config ||= (AwesomeConfig.find_by(var: name, organization: organization)&.value || []).filter { |i| i.is_a? Hash }
+      end
+    end
+  end
+end

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

@@ -9,17 +9,19 @@ shared_examples "javascript config vars" do
 end
 
 shared_examples "has menu link" do |item|
+  let(:prefix) { "config/" }
   it "shows the feature link" do
     within ".secondary-nav" do
-      expect(page).to have_link(href: "/admin/decidim_awesome/config/#{item}")
+      expect(page).to have_link(href: "/admin/decidim_awesome/#{prefix}#{item}")
     end
   end
 end
 
 shared_examples "do not have menu link" do |item|
+  let(:prefix) { "config/" }
   it "do not show the feature link" do
     within ".secondary-nav" do
-      expect(page).not_to have_link(href: "/admin/decidim_awesome/config/#{item}")
+      expect(page).not_to have_link(href: "/admin/decidim_awesome/#{prefix}#{item}")
     end
   end
 end

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

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+shared_context "with menu hacks params" do
+  let(:organization) { create(:organization) }
+  let(:context) do
+    {
+      current_user: create(:user, organization: organization),
+      current_organization: organization
+    }
+  end
+  let(:params) do
+    {
+      raw_label: label,
+      url: url,
+      position: position,
+      target: target,
+      visibility: visibility
+    }
+  end
+  let(:attributes) do
+    {
+      "label" => label,
+      "url" => url,
+      "position" => position,
+      "target" => target,
+      "visibility" => visibility
+    }
+  end
+  let(:label) do
+    {
+      "en" => "Menu english",
+      "ca" => "Menu catalan"
+    }
+  end
+  let(:url) { "/some-path" }
+  let(:position) { 2 }
+  let(:target) { "_blank" }
+  let(:visibility) { "hidden" }
+  let(:menu_name) { "menu" }
+
+  let(:another_params) do
+    {
+      allow_images_in_full_editor: true,
+      allow_images_in_small_editor: true
+    }
+  end
+  let(:form) do
+    Decidim::DecidimAwesome::Admin::MenuForm.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
+
+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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-decidim_awesome
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -139,19 +139,24 @@ files:
 - app/assets/stylesheets/decidim/decidim_awesome/editors/markdown_view.scss
 - app/assets/stylesheets/decidim/decidim_awesome/editors/quill_editor.scss
 - app/assets/stylesheets/decidim/decidim_awesome/forms/autosave.scss
+- app/awesome_overrides/presenters/decidim/menu_presenter_override.rb
 - app/awesome_overrides/presenters/decidim/proposals/proposal_presenter_override.rb
 - app/commands/decidim/decidim_awesome/admin/create_constraint.rb
+- app/commands/decidim/decidim_awesome/admin/create_menu_hack.rb
 - app/commands/decidim/decidim_awesome/admin/create_scoped_style.rb
 - app/commands/decidim/decidim_awesome/admin/destroy_constraint.rb
+- app/commands/decidim/decidim_awesome/admin/destroy_menu_hack.rb
 - app/commands/decidim/decidim_awesome/admin/destroy_scoped_style.rb
 - app/commands/decidim/decidim_awesome/admin/update_config.rb
 - app/commands/decidim/decidim_awesome/admin/update_constraint.rb
+- app/commands/decidim/decidim_awesome/admin/update_menu_hack.rb
 - app/commands/decidim/decidim_awesome/create_editor_image.rb
 - app/controllers/concerns/decidim/decidim_awesome/needs_awesome_config.rb
 - app/controllers/decidim/decidim_awesome/admin/application_controller.rb
 - app/controllers/decidim/decidim_awesome/admin/checks_controller.rb
 - app/controllers/decidim/decidim_awesome/admin/config_controller.rb
 - app/controllers/decidim/decidim_awesome/admin/constraints_controller.rb
+- app/controllers/decidim/decidim_awesome/admin/menu_hacks_controller.rb
 - app/controllers/decidim/decidim_awesome/application_controller.rb
 - app/controllers/decidim/decidim_awesome/editor_images_controller.rb
 - app/controllers/decidim/decidim_awesome/iframe_component/application_controller.rb
@@ -161,6 +166,7 @@ files:
 - app/forms/decidim/decidim_awesome/admin/config_form.rb
 - app/forms/decidim/decidim_awesome/admin/constraint_form.rb
 - app/forms/decidim/decidim_awesome/admin/intergram_form.rb
+- app/forms/decidim/decidim_awesome/admin/menu_form.rb
 - app/forms/decidim/decidim_awesome/editor_image_form.rb
 - app/helpers/decidim/decidim_awesome/admin/config_constraints_helpers.rb
 - app/helpers/decidim/decidim_awesome/map_helper.rb
@@ -168,6 +174,7 @@ files:
 - app/models/decidim/decidim_awesome/awesome_config.rb
 - app/models/decidim/decidim_awesome/config_constraint.rb
 - app/models/decidim/decidim_awesome/editor_image.rb
+- app/permissions/decidim/decidim_awesome/admin/permissions.rb
 - app/permissions/decidim/decidim_awesome/permissions.rb
 - app/uploaders/decidim/decidim_awesome/image_uploader.rb
 - app/views/decidim/decidim_awesome/admin/checks/index.html.erb
@@ -182,6 +189,10 @@ files:
 - app/views/decidim/decidim_awesome/admin/constraints/_form.html.erb
 - app/views/decidim/decidim_awesome/admin/constraints/new.html.erb
 - app/views/decidim/decidim_awesome/admin/constraints/show.html.erb
+- app/views/decidim/decidim_awesome/admin/menu_hacks/_form.html.erb
+- app/views/decidim/decidim_awesome/admin/menu_hacks/edit.html.erb
+- app/views/decidim/decidim_awesome/admin/menu_hacks/index.html.erb
+- app/views/decidim/decidim_awesome/admin/menu_hacks/new.html.erb
 - app/views/decidim/decidim_awesome/iframe_component/iframe/show.html.erb
 - app/views/decidim/decidim_awesome/map_component/map/error.erb
 - app/views/decidim/decidim_awesome/map_component/map/show.html.erb
@@ -202,6 +213,7 @@ files:
 - config/locales/es.yml
 - config/locales/eu.yml
 - config/locales/fr.yml
+- config/locales/nl.yml
 - config/locales/sv.yml
 - db/migrate/20200324170000_create_decidim_awesome_config.rb
 - db/migrate/20200324230936_create_awesome_editor_images.rb
@@ -224,12 +236,14 @@ files:
 - lib/decidim/decidim_awesome/iframe_component/engine.rb
 - lib/decidim/decidim_awesome/map_component/component.rb
 - lib/decidim/decidim_awesome/map_component/engine.rb
+- lib/decidim/decidim_awesome/menu_hacker.rb
 - lib/decidim/decidim_awesome/system_checker.rb
 - lib/decidim/decidim_awesome/test/factories.rb
 - lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb
 - lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb
 - lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb
 - lib/decidim/decidim_awesome/test/shared_examples/editor_examples.rb
+- lib/decidim/decidim_awesome/test/shared_examples/menu_hack_contexts.rb
 - lib/decidim/decidim_awesome/test/themes/css.lvh.me.css
 - lib/decidim/decidim_awesome/test/themes/erb.lvh.me.scss.erb
 - lib/decidim/decidim_awesome/test/themes/scss.lvh.me.scss