From 6d5333fc7a59e17fc8cbb8946c0f05f08c260f14 Mon Sep 17 00:00:00 2001 From: taitus Date: Mon, 14 Dec 2020 10:12:35 +0100 Subject: [PATCH] Add generic method for header Unify Header to be able to use it from the admin as from the seg_management. --- app/components/admin/header.rb | 13 ------------- .../admin/sdg/managers/index_component.rb | 2 +- .../{sdg_management => concerns}/header.rb | 10 ++++++++-- .../sdg_management/goals/index_component.rb | 2 +- .../sdg_management/local_targets/form_component.rb | 2 +- .../sdg_management/local_targets/index_component.rb | 2 +- .../sdg_management/targets/index_component.rb | 2 +- 7 files changed, 13 insertions(+), 20 deletions(-) delete mode 100644 app/components/admin/header.rb rename app/components/{sdg_management => concerns}/header.rb (61%) diff --git a/app/components/admin/header.rb b/app/components/admin/header.rb deleted file mode 100644 index 015af44b0..000000000 --- a/app/components/admin/header.rb +++ /dev/null @@ -1,13 +0,0 @@ -module Admin::Header - extend ActiveSupport::Concern - - def header(options: {}) - provide(:title) do - title - end - - tag.h2 options do - title - end - end -end diff --git a/app/components/admin/sdg/managers/index_component.rb b/app/components/admin/sdg/managers/index_component.rb index d935f43e8..213707fa4 100644 --- a/app/components/admin/sdg/managers/index_component.rb +++ b/app/components/admin/sdg/managers/index_component.rb @@ -1,5 +1,5 @@ class Admin::SDG::Managers::IndexComponent < ApplicationComponent - include Admin::Header + include Header attr_reader :users diff --git a/app/components/sdg_management/header.rb b/app/components/concerns/header.rb similarity index 61% rename from app/components/sdg_management/header.rb rename to app/components/concerns/header.rb index c9cb60d6e..bc90818b3 100644 --- a/app/components/sdg_management/header.rb +++ b/app/components/concerns/header.rb @@ -1,9 +1,9 @@ -module SDGManagement::Header +module Header extend ActiveSupport::Concern def header(&block) provide(:title) do - "#{t("sdg_management.header.title")} - #{title}" + "#{t("#{namespace}.header.title")} - #{title}" end tag.header do @@ -14,4 +14,10 @@ module SDGManagement::Header end end end + + private + + def namespace + controller_path.split("/").first + end end diff --git a/app/components/sdg_management/goals/index_component.rb b/app/components/sdg_management/goals/index_component.rb index 7413be712..de34e1e64 100644 --- a/app/components/sdg_management/goals/index_component.rb +++ b/app/components/sdg_management/goals/index_component.rb @@ -1,5 +1,5 @@ class SDGManagement::Goals::IndexComponent < ApplicationComponent - include SDGManagement::Header + include Header attr_reader :goals diff --git a/app/components/sdg_management/local_targets/form_component.rb b/app/components/sdg_management/local_targets/form_component.rb index 933e70bd1..6deadbb6e 100644 --- a/app/components/sdg_management/local_targets/form_component.rb +++ b/app/components/sdg_management/local_targets/form_component.rb @@ -1,6 +1,6 @@ class SDGManagement::LocalTargets::FormComponent < ApplicationComponent delegate :back_link_to, to: :helpers - include SDGManagement::Header + include Header include TranslatableFormHelper include GlobalizeHelper diff --git a/app/components/sdg_management/local_targets/index_component.rb b/app/components/sdg_management/local_targets/index_component.rb index 882836409..1d4a435f9 100644 --- a/app/components/sdg_management/local_targets/index_component.rb +++ b/app/components/sdg_management/local_targets/index_component.rb @@ -1,5 +1,5 @@ class SDGManagement::LocalTargets::IndexComponent < ApplicationComponent - include SDGManagement::Header + include Header attr_reader :local_targets diff --git a/app/components/sdg_management/targets/index_component.rb b/app/components/sdg_management/targets/index_component.rb index 35bd5815d..4e78fc396 100644 --- a/app/components/sdg_management/targets/index_component.rb +++ b/app/components/sdg_management/targets/index_component.rb @@ -1,5 +1,5 @@ class SDGManagement::Targets::IndexComponent < ApplicationComponent - include SDGManagement::Header + include Header attr_reader :targets