Merge remote-tracking branch 'origin/ISAICP-6415' into ISAICP-6765

composer.json

@@ -121,7 +121,7 @@
         "behat/gherkin": "^4.6.2",
         "behat/mink": "~1.8",
         "behat/mink-goutte-driver": "~1.2",
-        "behat/mink-selenium2-driver": "~1.4",
+        "behat/mink-selenium2-driver": "1.4.0",
         "boedah/robo-drush": "^4.2",
         "composer/composer": "^1.10.22",
         "drupal/admin_toolbar": "~2.4",

config/sync/block.block.exposed_search.yml → config/sync/block.block.globalsearch.yml

@@ -1,26 +1,24 @@
-uuid: 07af8993-33e3-4053-bbf7-324d21a6f1a2
+uuid: 1ef39009-13ab-424a-a4cf-50cca466b674
 langcode: en
 status: true
 dependencies:
-  config:
-    - views.view.search
   module:
+    - joinup_search
     - system
-    - views
   theme:
     - ventuno
-id: exposed_search
+id: globalsearch
 theme: ventuno
 region: featured
-weight: -25
+weight: -26
 provider: null
-plugin: 'views_exposed_filter_block:search-page_1'
+plugin: joinup_search_global_search
 settings:
-  id: 'views_exposed_filter_block:search-page_1'
-  label: ''
-  provider: views
+  id: joinup_search_global_search
+  label: 'Global search'
+  provider: joinup_search
   label_display: '0'
-  views_label: ''
+  template_suggestion: homepage
 visibility:
   request_path:
     id: request_path

config/sync/block.block.views_block__discover_topics_block.yml

@@ -12,7 +12,7 @@ dependencies:
 id: views_block__discover_topics_block
 theme: ventuno
 region: featured
-weight: -24
+weight: -25
 provider: null
 plugin: 'views_block:discover_topics-block'
 settings:

config/sync/views.view.search.yml

@@ -182,19 +182,17 @@ display:
             description: ''
             use_operator: false
             operator: search_api_fulltext_op
-            operator_limit_selection: false
-            operator_list: {  }
             identifier: keys
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-              licence_manager: '0'
               anonymous: '0'
               moderator: '0'
               administrator: '0'
-              rdf_graph_manager: '0'
+            operator_limit_selection: false
+            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''

web/modules/custom/joinup_core/joinup_core.install

@@ -91,3 +91,24 @@ function joinup_core_requirements($phase): array {
 
   return $requirements;
 }
+
+/**
+ * Fix 'password_policy.password_policy.generic_policy' config.
+ */
+function joinup_core_update_0107500(): void {
+  $db = \Drupal::database();
+  $config = unserialize(
+    $db->select('config')
+      ->fields('config', ['data'])
+      ->condition('collection', '')
+      ->condition('name', 'password_policy.password_policy.generic_policy')
+      ->execute()
+      ->fetchField()
+  );
+  $config['uuid'] = 'ce356128-8068-480c-b400-68e73bdb0d33';
+  $db->update('config')
+    ->fields(['data' => serialize($config)])
+    ->condition('collection', '')
+    ->condition('name', 'password_policy.password_policy.generic_policy')
+    ->execute();
+}

web/themes/ventuno/ventuno.theme

@@ -7,7 +7,6 @@
 
 declare(strict_types = 1);
 
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Menu\MenuLinkTreeElement;
 use Drupal\Core\Menu\MenuTreeParameters;
 use Drupal\Core\Url;
@@ -257,32 +256,3 @@ function ventuno_smart_trim(string $string, int $length, bool $ellipsis = TRUE):
   $truncate = new TruncateHTML();
   return $truncate->truncateChars($string, $length, $ellipsis ? '…' : '');
 }
-
-/**
- * Implements hook_theme_suggestions_HOOK_alter() for form-element.html.twig.
- */
-function ventuno_theme_suggestions_form_element_alter(array &$suggestions, array $variables): void {
-  if (isset($variables['element']['#joinup_parent'])) {
-    $suggestions[] = 'form_element__' . $variables['element']['#joinup_parent'];
-  }
-}
-
-/**
- * Implements hook_form_alter().
- */
-function ventuno_form_alter(&$form, FormStateInterface $form_state, $form_id): void {
-  // Check if the form contains exposed filter form element.
-  if ($form_id == 'views_exposed_form') {
-    // Here you can define the check for specific view so that
-    // it doesn't apply to all views.
-    $view = $form_state->get('view');
-    if ($view->id() === 'search') {
-      $form['keys']['#theme'] = 'input__search_expose_form';
-      $form['keys']['#title_display'] = 'invisible';
-      $form['keys']['#attributes']['id'] = 'search-bar__input';
-      $form['keys']['#attributes']['placeholder'] = t('Start typing to search…');
-      $form['keys']['#joinup_parent'] = $form_id . '_' . $view->id();
-      $form['sort_by']['#type'] = 'hidden';
-    }
-  }
-}