Merged in feature/BKL-73-RefactorSearchComponent (pull request #61)

Feature/BKL-73 RefactorSearchComponent

Author: AndreasEngelmark

config/sync/language/da/field.field.comment.os2loop_post_comment.os2loop_post_comment.yml

@@ -0,0 +1 @@
+label: Kommentar

config/sync/language/da/field.field.comment.os2loop_post_comment.os2loop_post_comment_media.yml

@@ -0,0 +1 @@
+label: Vedhæft

config/sync/language/da/field.field.comment.os2loop_question_answer.os2loop_question_answer.yml

@@ -0,0 +1 @@
+label: Svar

config/sync/language/da/field.field.comment.os2loop_question_answer.os2loop_question_answer_media.yml

@@ -0,0 +1 @@
+label: Vedhæft

config/sync/language/da/views.view.os2loop_search_db.yml

@@ -11,6 +11,7 @@ display:
       filters:
         search_api_fulltext:
           expose:
+            label: 'Søg'
             placeholder: 'Søg efter indhold eller emner'
       title: Søg
       header:

config/sync/system.site.yml

@@ -3,7 +3,7 @@ name: OS2Loop
 mail: [email protected]
 slogan: ''
 page:
-  front: /front-page
+  front: /node/1
   403: ''
   404: ''
 admin_compact_mode: false

config/sync/views.view.os2loop_search_db.yml

@@ -153,7 +153,7 @@ display:
           exposed: true
           expose:
             operator_id: search_api_fulltext_op
-            label: 'Fulltext search'
+            label: 'Search'
             description: ''
             use_operator: false
             operator: search_api_fulltext_op

web/profiles/custom/os2loop/modules/os2loop_post/src/Helper/Helper.php

@@ -5,11 +5,14 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\os2loop_post\Form\SettingsForm;
 use Drupal\os2loop_settings\Settings;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Helper for posts.
  */
 class Helper {
+  use StringTranslationTrait;
+
   /**
    * The config.
    *
@@ -48,6 +51,7 @@ public function alterForm(array &$form, FormStateInterface $form_state, string $
    *   The id of the the form.
    */
   private function alterCommentForm(array &$form, FormStateInterface $form_state, string $form_id) {
+    $form['actions']['submit']['#value'] = $this->t('Add');
     $form['actions']['preview']['#access'] = FALSE;
     $form['os2loop_post_comment']['widget']['#after_build'][] =
       [$this, 'fieldAfterBuild'];

web/profiles/custom/os2loop/modules/os2loop_question/src/Helper/Helper.php

@@ -5,11 +5,13 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\os2loop_question\Form\SettingsForm;
 use Drupal\os2loop_settings\Settings;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Helper for questions.
  */
 class Helper {
+  use StringTranslationTrait;
   public const MODULE = 'os2loop_question';
 
   /**
@@ -129,6 +131,7 @@ private function hideMetadata(array &$form, FormStateInterface $form_state, stri
    *   The id of the the form.
    */
   private function alterCommentForm(array &$form, FormStateInterface $form_state, string $form_id) {
+    $form['actions']['submit']['#value'] = $this->t('Add');
     $form['actions']['preview']['#access'] = FALSE;
     $form['os2loop_question_answer']['widget']['#after_build'][] =
         [$this, 'fieldAfterBuild'];

web/profiles/custom/os2loop/modules/os2loop_user/src/Helper/Helper.php

@@ -5,6 +5,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\views\ViewExecutable;
+use Drupal\views\Plugin\views\query\QueryPluginBase;
 use Drupal\views\Plugin\views\query\Sql;
 
 /**
@@ -27,19 +28,10 @@ public function __construct(AccountInterface $currentUser) {
 
   /**
    * Implements hook_views_query_alter().
-   *
-   * Change the order of the tables in a LEFT JOIN to preserve NULLs from
-   * content type.
    */
-  public function queryAlter(ViewExecutable $view, Sql $query) {
+  public function queryAlter(ViewExecutable $view, QueryPluginBase $query) {
     if ($view->id() === 'os2loop_user_answers') {
-      $node_table = $query->getTableInfo('node_field_data_comment_field_data');
-
-      if (isset($node_table) && $node_table['join']->type === 'LEFT') {
-        $node_table['join']->type = 'RIGHT';
-        $query->where[0]['type'] = 'OR';
-        $query->addWhereExpression(0, 'comment_field_data.uid IS NULL');
-      }
+      $this->sqlQueryAlter($view, $query);
     }
   }
 
@@ -61,4 +53,20 @@ public function alterForm(array &$form, FormStateInterface $form_state, string $
     }
   }
 
+  /**
+   * Helper function for SQL queries.
+   *
+   * Change the order of the tables in a LEFT JOIN to preserve NULLs from
+   * content type.
+   */
+  private function sqlQueryAlter(ViewExecutable $view, Sql $query) {
+    $node_table = $query->getTableInfo('node_field_data_comment_field_data');
+
+    if (isset($node_table) && $node_table['join']->type === 'LEFT') {
+      $node_table['join']->type = 'RIGHT';
+      $query->where[0]['type'] = 'OR';
+      $query->addWhereExpression(0, 'comment_field_data.uid IS NULL');
+    }
+  }
+
 }