Merge branch 'feature/ISTWCMS-6804-ibiki-dashboard_webform_list_builder' into '1.0.x'

Feature/istwcms 6804 ibiki dashboard webform list builder

See merge request !34

src/Handler/UWWebformEntityListBuilder.php

+<?php
+
+namespace Drupal\uw_dashboard\Handler;
+
+use Drupal\webform\WebformEntityListBuilder;
+
+/**
+ * Class UWWebformEntityListBuilder.
+ *
+ * Extends functionality by updating one method.
+ */
+class UWWebformEntityListBuilder extends WebformEntityListBuilder {
+
+  /**
+   * New function that modifies output of parent render.
+   *
+   * Only usage is on uw_dashboard, when webform filter autocomplete
+   * matches one webform. This update will remove webform id, and
+   * use filter to display one result, which creates redirect otherwise.
+   */
+  public function uwRender() {
+    if ($this->keys && preg_match('#\(([^)]+)\)$#', $this->keys, $match) && !empty($match[0])) {
+      $this->keys = trim(preg_replace('#\(([^)]+)\)$#', '', $this->keys));
+    }
+
+    return $this->render();
+  }
+
+}

src/Plugin/Block/FormsListBlock.php

@@ -99,13 +99,13 @@ class FormsListBlock extends BlockBase implements ContainerFactoryPluginInterfac
       }
 
       // Get the render array from the entity list.
-      $render = $entity_type_list->render();
+      $render = $entity_type_list->uwRender();
 
       // Remove the category filer.
       unset($render['filter_form']['filter']['category']);
     }
     else {
-      $render = $entity_type_list->render();
+      $render = $entity_type_list->uwRender();
     }
 
     // Render the entity list.

uw_dashboard.module

@@ -7,6 +7,7 @@
 
 use Drupal\Core\Url;
 use Drupal\user\Entity\User;
+use Drupal\uw_dashboard\Handler\UWWebformEntityListBuilder;
 use Drupal\views\ViewExecutable;
 
 /**
@@ -112,3 +113,12 @@ function uw_dashboard_preprocess_block(&$variables) {
     }
   }
 }
+
+/**
+ * Implements hook_entity_type_alter().
+ */
+function uw_dashboard_entity_type_alter(array &$entity_types) {
+  // Replacing webform's default entity list builder with new child class.
+  // This should ensure all works as before, except is new function is called.
+  $entity_types['webform']->setHandlerClass('list_builder', UWWebformEntityListBuilder::class);
+}