Merge pull request #727 from UN-OCHA/develop

Deploy 16-11-2022
UN-OCHA · Nov 16, 2022 · 84666c7 · 84666c7
2 parents 472d3e2 + db1c6a5
commit 84666c7
Show file tree

Hide file tree

Showing 18 changed files with 249 additions and 97 deletions.
diff --git a/composer.json b/composer.json
@@ -83,6 +83,7 @@
         "drupal/views_data_export": "^1.1",
         "drupal/viewsreference": "^2.0.0-beta3",
         "drupal/webform": "^6.1.2",
+        "drupal/xmlsitemap": "^1.4",
         "drush/drush": "^10.0.0",
         "npm-asset/select2": "^4.0",
         "oomphinc/composer-installers-extender": "^2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -17,6 +17,9 @@
     "drupal/search_api": {
       "https://www.drupal.org/project/search_api/issues/3130004 - Facets query part is lost in views": "https://git.drupalcode.org/project/search_api/-/merge_requests/8.diff"
     },
+    "drupal/search_api_attachments": {
+      "#3084967-41: Don't store full extracted file content data in the database": "https://www.drupal.org/files/issues/2021-08-10/search_api_attachments_files_cache-3084967-41.patch"
+    },
     "drupal/search_api_solr": {
       "#3314711-21: empty specific languages": "https://www.drupal.org/files/issues/2022-10-24/search_api_solr-empty-specific-languages-3314711-21.patch"
     },

diff --git a/config/core.extension.yml b/config/core.extension.yml
@@ -121,6 +121,7 @@ module:
   webform_ui: 0
   menu_link_content: 1
   pathauto: 1
+  xmlsitemap: 1
   views: 10
   paragraphs: 11
   minimal: 1000

diff --git a/config/search_api_attachments.admin_config.yml b/config/search_api_attachments.admin_config.yml
@@ -1,6 +1,7 @@
 _core:
   default_config_hash: 9o2nyVLLLeuFsboLJzHBTA0DoHb4TmUj6rGPG_cLXHY
 extraction_method: solr_extractor
+cache_backend: search_api_attachments.cache_files
 tika_extractor_configuration:
   java_path: java
   tika_path: ''
@@ -19,3 +20,4 @@ python_pdf2txt_extractor_configuration:
 pdftotext_extractor_configuration:
   pdftotext_path: pdftotext
 preserve_cache: true
+read_text_files_directly: false
diff --git a/config/xmlsitemap.settings.group.iasc_group.yml b/config/xmlsitemap.settings.group.iasc_group.yml
@@ -0,0 +1,3 @@
+status: true
+priority: 0.7
+changefreq: 60
diff --git a/config/xmlsitemap.settings.group.iasc_space.yml b/config/xmlsitemap.settings.group.iasc_space.yml
@@ -0,0 +1,3 @@
+status: true
+priority: 0.7
+changefreq: 60
diff --git a/config/xmlsitemap.settings.menu_link_content.menu_link_content.yml b/config/xmlsitemap.settings.menu_link_content.menu_link_content.yml
@@ -0,0 +1,3 @@
+status: true
+priority: 0.6
+changefreq: 60
diff --git a/config/xmlsitemap.settings.node.announcement.yml b/config/xmlsitemap.settings.node.announcement.yml
@@ -0,0 +1,3 @@
+status: true
+priority: 0.5
+changefreq: 60
diff --git a/config/xmlsitemap.settings.node.oa_event.yml b/config/xmlsitemap.settings.node.oa_event.yml
@@ -0,0 +1,3 @@
+status: true
+priority: 0.5
+changefreq: 60
diff --git a/config/xmlsitemap.settings.node.oa_section.yml b/config/xmlsitemap.settings.node.oa_section.yml
@@ -0,0 +1,3 @@
+status: true
+priority: 0.5
+changefreq: 60
diff --git a/config/xmlsitemap.settings.node.oa_wiki_page.yml b/config/xmlsitemap.settings.node.oa_wiki_page.yml
@@ -0,0 +1,3 @@
+status: true
+priority: 0.5
+changefreq: 60
diff --git a/config/xmlsitemap.settings.node.panopoly_landing_page.yml b/config/xmlsitemap.settings.node.panopoly_landing_page.yml
@@ -0,0 +1,3 @@
+status: true
+priority: 0.5
+changefreq: 60
diff --git a/config/xmlsitemap.settings.node.panopoly_page.yml b/config/xmlsitemap.settings.node.panopoly_page.yml
@@ -0,0 +1,3 @@
+status: true
+priority: 0.5
+changefreq: 60
diff --git a/config/xmlsitemap.settings.node.service.yml b/config/xmlsitemap.settings.node.service.yml
@@ -0,0 +1,3 @@
+status: true
+priority: 0.5
+changefreq: 60
diff --git a/config/xmlsitemap.settings.yml b/config/xmlsitemap.settings.yml
@@ -0,0 +1,16 @@
+_core:
+  default_config_hash: 58nI4vVTGv677fB42ySkQN9iTenfZvvW-xJlXODHdV4
+minimum_lifetime: 0
+xsl: 1
+prefetch_aliases: 1
+chunk_size: auto
+batch_limit: 100
+path: xmlsitemap
+frontpage_priority: !!float 1
+frontpage_changefreq: 86400
+lastmod_format: 'Y-m-d\TH:i\Z'
+gz: false
+clean_url: 0
+disable_cron_regeneration: false
+i18n_selection_mode: simple
+metatag_exclude_noindex: true
diff --git a/config/xmlsitemap.xmlsitemap.g3XYqcXbSKPVBDODwnT6pq7oqhCFkPryj4vVqrl_Kfc.yml b/config/xmlsitemap.xmlsitemap.g3XYqcXbSKPVBDODwnT6pq7oqhCFkPryj4vVqrl_Kfc.yml
@@ -0,0 +1,8 @@
+uuid: 1a239bd9-073e-4787-9a5d-5b4a52814681
+langcode: en
+status: true
+dependencies: {  }
+id: g3XYqcXbSKPVBDODwnT6pq7oqhCFkPryj4vVqrl_Kfc
+label: IASC
+context:
+  language: en
diff --git a/html/modules/custom/iasc_service/src/Controller/IascServicesSearch.php b/html/modules/custom/iasc_service/src/Controller/IascServicesSearch.php
@@ -16,17 +16,20 @@ class IascServicesSearch extends ControllerBase {
    * {@inheritdoc}
    */
   public static function execute(Request $request) {
-    $active_facets = iasc_service_landing_block_facets();
+    $active_facets = array_keys(iasc_service_landing_block_facets());
     $filters = [];
 
     foreach ($active_facets as $facet_name) {
-      $facets = $request->get($facet_name);
+      $facets = $request->get($facet_name, []);
+
       if (!is_array($facets)) {
         $facets = [$facets];
       }
 
       foreach ($facets as $facet) {
-        $filters[] = $facet;
+        if (!empty($facet)) {
+          $filters[] = $facet;
+        }
       }
     }