Merge pull request #69 from itk-dev/develop

Release 2022-08-12

Author: rimi-itk

web/profiles/custom/os2loop/modules/os2loop_section_page/src/Helper/FormHelper.php

@@ -15,19 +15,29 @@ class FormHelper {
    * Hide section page paragraph block reference options.
    */
   public function alterForm(array &$form, FormStateInterface $formState, string $formId) {
-    if ($formId == 'node_os2loop_section_page_edit_form' || $formId == 'node_os2loop_section_page_form') {
+    $alterWidgetSettings = static function (array &$element) {
+      if (isset($element['os2loop_section_page_block']['widget'][0]['settings'])) {
+        $element['os2loop_section_page_block']['widget'][0]['settings']['views_label_checkbox']['#access'] = FALSE;
+        $element['os2loop_section_page_block']['widget'][0]['settings']['views_label_fieldset']['#access'] = FALSE;
+        $element['os2loop_section_page_block']['widget'][0]['settings']['views_label_field']['#access'] = FALSE;
+        $element['os2loop_section_page_block']['widget'][0]['settings']['label_display']['#access'] = FALSE;
+        // Don't show the view label.
+        $element['os2loop_section_page_block']['widget'][0]['settings']['label_display']['#default_value'] = FALSE;
+        $element['os2loop_section_page_block']['widget'][0]['settings']['label']['#access'] = FALSE;
+      }
+    };
+
+    if (preg_match('/node_os2loop_section_page(_edit)?_form/', $formId) && isset($form['os2loop_section_page_paragraph']['widget'])) {
       foreach ($form['os2loop_section_page_paragraph']['widget'] as $widget_key => $widget) {
         if (is_array($widget) && is_numeric($widget_key) && isset($widget['subform'])) {
-          $form['os2loop_section_page_paragraph']['widget'][$widget_key]['subform']['os2loop_section_page_block']['widget'][0]['settings']['views_label_checkbox']['#access'] = FALSE;
-          $form['os2loop_section_page_paragraph']['widget'][$widget_key]['subform']['os2loop_section_page_block']['widget'][0]['settings']['views_label_fieldset']['#access'] = FALSE;
-          $form['os2loop_section_page_paragraph']['widget'][$widget_key]['subform']['os2loop_section_page_block']['widget'][0]['settings']['views_label_field']['#access'] = FALSE;
-          $form['os2loop_section_page_paragraph']['widget'][$widget_key]['subform']['os2loop_section_page_block']['widget'][0]['settings']['label_display']['#access'] = FALSE;
-          // Don't show the view label.
-          $form['os2loop_section_page_paragraph']['widget'][$widget_key]['subform']['os2loop_section_page_block']['widget'][0]['settings']['label_display']['#default_value'] = FALSE;
-          $form['os2loop_section_page_paragraph']['widget'][$widget_key]['subform']['os2loop_section_page_block']['widget'][0]['settings']['label']['#access'] = FALSE;
+          $alterWidgetSettings($form['os2loop_section_page_paragraph']['widget'][$widget_key]['subform']);
         }
       }
     }
+
+    if (preg_match('/paragraph_os2loop_section_page_.+_form/', $formId)) {
+      $alterWidgetSettings($form);
+    }
   }
 
 }

web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/menu--main.html.twig

@@ -36,18 +36,18 @@
       {% if menu_level == 0 %}
         <ul{{ attributes.addClass(['navbar-nav mr-auto']) }}>
           {% for item in items %}
+            {% set route_name = item.url.routed ? item.url.routeName %}
             {% set classes_list_item = [
               'nav-item',
               item.below ? 'dropdown',
-            ] %}
+              ] %}
             {% set classes_link = [
               'nav-link',
-              item.is_expanded and item.url.routeName == '<nolink>' ? 'dropdown-toggle',
-              item.is_collapsed and item.url.routeName == '<nolink>' ? 'dropdown-toggle',
+              route_name == '<nolink>' ? 'dropdown-toggle',
               item.in_active_trail ? 'active',
             ] %}
             <li{{ item.attributes.addClass(classes_list_item) }}>
-              {% if item.url.routed and item.url.routeName == '<nolink>' %}
+              {% if route_name == '<nolink>' %}
                 <a class="{{ classes_link|join(' ') }}" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   {{ item.title }}
                 </a>
@@ -65,10 +65,11 @@
       {% endif %}
       {% if menu_level == 1 %}
         {% for item in items %}
+          {% set route_name = item.url.routed ? item.url.routeName %}
           {% set classes_link = [
-            item.url.routeName != '<nolink>' ? 'dropdown-item',
+            route_name != '<nolink>' ? 'dropdown-item',
             item.in_active_trail ? 'active',
-          ] %}
+            ] %}
           {{ link(item.title, item.url, {'class': classes_link}) }}
         {% endfor %}
       {% endif %}