Merge pull request #551 from City-of-Helsinki/UHF-8006_remove_brandin…

…g_navigation UHF-8006: Removed branding navigation configuration and mentions from code
City-of-Helsinki · Aug 3, 2023 · 7e25a55 · 7e25a55
2 parents d9d437d + adc603b
commit 7e25a55
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 45 deletions.
diff --git a/modules/hdbt_admin_tools/hdbt_admin_tools.links.menu.yml b/modules/hdbt_admin_tools/hdbt_admin_tools.links.menu.yml
@@ -36,13 +36,6 @@ hdbt_admin_tools.header_top_menu:
   route_parameters: { menu: 'header-top-navigation' }
   weight: 0
 
-hdbt_admin_tools.header_branding_menu:
-  title: 'Header branding navigation menu links'
-  parent: hdbt_admin_tools.menus
-  route_name: entity.menu.edit_form
-  route_parameters: { menu: 'branding-navigation' }
-  weight: 1
-
 hdbt_admin_tools.main_menu:
   title: 'Main menu'
   parent: hdbt_admin_tools.menus

diff --git a/modules/helfi_base_content/config/install/system.menu.branding-navigation.yml b/modules/helfi_base_content/config/install/system.menu.branding-navigation.yml
diff --git a/modules/helfi_base_content/helfi_base_content.install b/modules/helfi_base_content/helfi_base_content.install
@@ -254,3 +254,15 @@ function helfi_base_content_update_9003() : void {
     ->set('selected_langcode', 'site_default')
     ->save();
 }
+
+/**
+ * Implements hook_install().
+ */
+function helfi_base_content_update_9004() : void {
+  $config_factory = Drupal::configFactory();
+
+  // Remove the branding navigation and blocks related to it.
+  $config_factory->getEditable('system.menu.branding-navigation')->delete();
+  $config_factory->getEditable('block.block.brandingnavigation')->delete();
+  $config_factory->getEditable('block.block.hdbt_subtheme_brandingnavigation')->delete();
+}
diff --git a/modules/helfi_base_content/helfi_base_content.module b/modules/helfi_base_content/helfi_base_content.module
@@ -53,36 +53,6 @@ function helfi_base_content_themes_installed($theme_list) {
  */
 function helfi_base_content_get_block_configurations(string $theme) : array {
   return [
-    'brandingnavigation' => [
-      'block' => [
-        'id' => 'brandingnavigation',
-        'plugin' => 'menu_block_current_language:branding-navigation',
-        'provider' => 'helfi_base_content',
-        'settings' => [
-          'id' => 'menu_block_current_language:branding-navigation',
-          'label' => 'Branding - Navigation',
-          'depth' => 1,
-          'level' => 1,
-          'expand_all_items' => FALSE,
-          'translation_providers' => [
-            'views' => 'views',
-            'menu_link_content' => 'menu_link_content',
-            'default' => '0',
-          ],
-          'provider' => 'helfi_base_content',
-        ],
-      ],
-      'variations' => [
-        [
-          'theme' => $theme,
-          'region' => 'header_branding',
-        ],
-        [
-          'theme' => 'stark',
-          'region' => 'content',
-        ],
-      ],
-    ],
     'breadcrumbs' => [
       'block' => [
         'id' => 'breadcrumbs',

diff --git a/src/Menu/FilterByLanguage.php b/src/Menu/FilterByLanguage.php
@@ -21,7 +21,6 @@ final class FilterByLanguage implements EventSubscriberInterface {
    * @var string[]
    */
   protected array $menuNames = [
-    'branding-navigation',
     'footer-bottom-navigation',
     'footer-top-navigation',
     'footer-top-navigation-2',