Merge branch '8.x-3.x' of https://git.drupalcode.org/project/module_filter into 8.x-3.x

js/module_filter.modules_tabs.js

@@ -332,7 +332,7 @@
           $table.append($('thead', $originalTable));
           $table.append('<tbody></tbody>');
 
-          ModuleFilter.modulesWrapper.children('details').each(function() {
+          ModuleFilter.modulesWrapper.children('details', context).once('moduleTabs').each(function() {
             var $details = $(this);
             var packageName = $details.children('summary').text();
             var packageId = $details.children('summary').attr('aria-controls');

module_filter.module

@@ -41,7 +41,7 @@ function module_filter_form_system_modules_alter(&$form, FormStateInterface $for
   }
   $form['#attached']['library'][] = $config->get('tabs') ? 'module_filter/modules.tabs' : 'module_filter/modules.bare';
   unset($form['filters']['text']['#description']);
-  $form['filters']['text']['#placeholder'] = t('Filter by name');
+  $form['filters']['text']['#placeholder'] = t('Filter by module');
   if (!empty($_GET['filter'])) {
     $form['filters']['text']['#default_value'] = $_GET['filter'];
   }
@@ -92,14 +92,12 @@ function module_filter_form_system_modules_alter(&$form, FormStateInterface $for
   $modules = \Drupal::service('extension.list.module')->reset()->getList();
 
   foreach ($modules as $name => $module) {
-    if ($name == 'module_filter') {
-      $ctime = filectime($module->getPathname());
-      if (($ctime - strtotime('-1 week')) > 0) {
-        foreach (Element::children($form['modules']) as $package) {
-          if (isset($form['modules'][$package][$name])) {
-            $form['modules'][$package][$name]['#attributes']['class'][] = 'new';
-            break;
-          }
+    $ctime = filectime($module->getPathname());
+    if (($ctime - strtotime('-1 week')) > 0) {
+      foreach (Element::children($form['modules']) as $package) {
+        if (isset($form['modules'][$package][$name])) {
+          $form['modules'][$package][$name]['#attributes']['class'][] = 'new';
+          break;
         }
       }
     }
@@ -130,7 +128,7 @@ function module_filter_form_system_modules_uninstall_alter(&$form, FormStateInte
   }
   $form['#attached']['library'][] = 'module_filter/modules.uninstall';
   unset($form['filters']['text']['#description']);
-  $form['filters']['text']['#placeholder'] = t('Filter by name');
+  $form['filters']['text']['#placeholder'] = t('Filter by module');
   if (!empty($_GET['filter'])) {
     $form['filters']['text']['#default_value'] = $_GET['filter'];
   }
@@ -151,7 +149,7 @@ function module_filter_form_user_admin_permissions_alter(&$form, FormStateInterf
     '#title' => t('Filter modules'),
     '#title_display' => 'invisible',
     '#size' => 30,
-    '#placeholder' => t('Filter by name'),
+    '#placeholder' => t('Filter by module'),
     '#attributes' => [
       'class' => ['table-filter-text'],
       'data-table' => '#permissions',

src/Form/ModuleFilterUpdateStatusForm.php

@@ -33,7 +33,7 @@ class ModuleFilterUpdateStatusForm extends FormBase {
       '#title' => $this->t('Filter projects'),
       '#title_display' => 'invisible',
       '#size' => 30,
-      '#placeholder' => $this->t('Filter by name'),
+      '#placeholder' => $this->t('Filter by project'),
       '#attributes' => [
         'class' => ['table-filter-text'],
         'data-table' => '#update-status',

tests/src/Kernel/Form/ModuleFilterSettingsFormTest.php

+<?php
+
+namespace Drupal\Tests\module_filter\Kernel\Form;
+
+use Drupal\Core\Form\FormInterface;
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\module_filter\Form\ModuleFilterSettingsForm;
+
+/**
+ * Tests the Module Filter settings form.
+ *
+ * @group module_filter
+ */
+class ModuleFilterSettingsFormTest extends KernelTestBase {
+
+  /**
+   * The ModuleFilter form object under test.
+   *
+   * @var \Drupal\module_filter\Form\ModuleFilterSettingsForm
+   */
+  protected $moduleFilterSettingsForm;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $this->moduleFilterSettingsForm = new ModuleFilterSettingsForm(
+      $this->container->get('config.factory')
+    );
+  }
+
+  /**
+   * Tests for \Drupal\module_filter\Form\ModuleFilterSettingsForm.
+   */
+  public function testModuleFilterSettingsForm() {
+    $this->assertInstanceOf(FormInterface::class, $this->moduleFilterSettingsForm);
+
+    $id = $this->moduleFilterSettingsForm->getFormId();
+    $this->assertEquals('module_filter_settings_form', $id);
+
+    $method = new \ReflectionMethod(ModuleFilterSettingsForm::class, 'getEditableConfigNames');
+    $method->setAccessible(TRUE);
+
+    $name = $method->invoke($this->moduleFilterSettingsForm);
+    $this->assertEquals(['module_filter.settings'], $name);
+  }
+
+}