Merge pull request #237 from City-of-Helsinki/dev

Dev to main
City-of-Helsinki · Mar 22, 2022 · a4c021d · a4c021d
2 parents 925adfe + 8a1e726
commit a4c021d
Show file tree

Hide file tree

Showing 26 changed files with 193 additions and 133 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
@@ -26,7 +26,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-icon data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <span role aria-* class="">'
+      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <span role aria-* class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:

diff --git a/conf/cmi/filter.format.minimal.yml b/conf/cmi/filter.format.minimal.yml
@@ -42,7 +42,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-icon data-protocol class="">'
+      allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""><span role aria-* class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:

diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml
@@ -4,7 +4,7 @@ langcode: en
 site_settings:
   default_icon: star-fill
   theme_color: gold
-  koro: vibration
+  koro: basic
 footer_settings:
   footer_color: dark
   footer_top_title: 'Contact us'

diff --git a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
@@ -1,7 +1,6 @@
 site_settings:
   theme_color: gold
   default_icon: star-fill
-  koro: vibration
 footer_settings:
   footer_top_content:
     value: "<ul class=\"menu\">\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Kaupungin neuvonta – Helsinki-info\" data-protocol=\"false\" href=\"https://www.hel.fi/kanslia/neuvonta-fi/\">Kaupungin neuvonta – Helsinki-info</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Hae yhteystietoja ja numeroita\" data-protocol=\"false\" href=\"https://numerot.hel.fi/\">Hae yhteystietoja ja numeroita</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Anna palautetta\" data-protocol=\"false\" href=\"https://www.hel.fi/palaute\">Anna palautetta</a></li>\r\n</ul>\r\n"

diff --git a/conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml b/conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml
@@ -0,0 +1 @@
+label: Päivitä
diff --git a/conf/cmi/language/fi/views.view.locked_content.yml b/conf/cmi/language/fi/views.view.locked_content.yml
@@ -46,6 +46,8 @@ display:
             group_items:
               1:
                 title: Julkaistu
+              2:
+                title: Julkaisematon
         type:
           expose:
             label: Sisältötyyppi

diff --git a/conf/cmi/language/fi/views.view.locked_services.yml b/conf/cmi/language/fi/views.view.locked_services.yml
@@ -4,10 +4,6 @@ display:
     display_title: Oletus
     display_options:
       title: 'Lukitut palvelut'
-      pager:
-        options:
-          tags: {  }
-          expose: {  }
       exposed_form:
         options:
           submit_button: Käytä

diff --git a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
@@ -1,7 +1,6 @@
 site_settings:
   theme_color: gold
   default_icon: star-fill
-  koro: vibration
 footer_settings:
   footer_top_content:
     value: "<ul class=\"menu\">\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Helsingfors-info\" data-protocol=\"false\" href=\"https://www.hel.fi/kanslia/neuvonta-sv/\">Helsingfors-info</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Sök kontaktuppgifter och telefonnummer\" data-protocol=\"false\" href=\"https://numerot.hel.fi/\">Sök kontaktuppgifter och telefonnummer</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Ge respons\" data-protocol=\"false\" href=\"https://www.hel.fi/respons/\">Ge respons</a></li>\r\n</ul>\r\n"

diff --git a/conf/cmi/language/sv/system.action.tpr_errand_service_update_action.yml b/conf/cmi/language/sv/system.action.tpr_errand_service_update_action.yml
@@ -0,0 +1 @@
+label: Uppdatera
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml b/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.node.landing_page.yml b/conf/cmi/simple_sitemap.bundle_settings.default.node.landing_page.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.node.news_item.yml b/conf/cmi/simple_sitemap.bundle_settings.default.node.news_item.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.node.page.yml b/conf/cmi/simple_sitemap.bundle_settings.default.node.page.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.tpr_service.tpr_service.yml b/conf/cmi/simple_sitemap.bundle_settings.default.tpr_service.tpr_service.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.tpr_unit.tpr_unit.yml b/conf/cmi/simple_sitemap.bundle_settings.default.tpr_unit.tpr_unit.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.custom_links.default.yml b/conf/cmi/simple_sitemap.custom_links.default.yml
diff --git a/conf/cmi/simple_sitemap.settings.yml b/conf/cmi/simple_sitemap.settings.yml
@@ -1,18 +1,20 @@
 _core:
   default_config_hash: fFCOUWimqdj2E7qYCcYmI2LH7rwpaLEUOfi69hUFuXk
-max_links: 2000
+max_links: 10000
 cron_generate: true
-cron_generate_interval: 0
+cron_generate_interval: 24
 generate_duration: 10000
 remove_duplicates: true
 skip_untranslated: true
-xsl: true
+disable_language_hreflang: false
+xsl: false
 base_url: ''
 default_variant: default
 custom_links_include_images: false
 excluded_languages: {  }
 enabled_entity_types:
   - node
-  - taxonomy_term
   - menu_link_content
-entities_per_queue_item: 50
+  - tpr_service
+  - tpr_unit
+entities_per_queue_item: 100
diff --git a/conf/cmi/simple_sitemap.sitemap.default.yml b/conf/cmi/simple_sitemap.sitemap.default.yml
@@ -0,0 +1,11 @@
+uuid: d1ace091-0157-4d87-949a-ab4154d3ee48
+langcode: fi
+status: true
+dependencies:
+  config:
+    - simple_sitemap.type.default_hreflang
+id: default
+label: Default
+description: null
+type: default_hreflang
+weight: 0
diff --git a/conf/cmi/simple_sitemap.type.default_hreflang.yml b/conf/cmi/simple_sitemap.type.default_hreflang.yml
@@ -0,0 +1,13 @@
+uuid: b9c88e0d-b915-421f-ae9e-ac221120b5d5
+langcode: fi
+status: true
+dependencies: {  }
+id: default_hreflang
+label: 'Default hreflang'
+description: 'The default hreflang sitemap type.'
+sitemap_generator: default
+url_generators:
+  - custom
+  - entity
+  - entity_menu_link_content
+  - arbitrary
diff --git a/conf/cmi/simple_sitemap.variants.default_hreflang.yml b/conf/cmi/simple_sitemap.variants.default_hreflang.yml
diff --git a/conf/cmi/system.action.tpr_errand_service_update_action.yml b/conf/cmi/system.action.tpr_errand_service_update_action.yml
@@ -0,0 +1,12 @@
+uuid: e21004c6-6044-4c59-ae34-205cf44ff9ac
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_tpr
+    - helfi_api_base
+id: tpr_errand_service_update_action
+label: Update
+type: tpr_errand_service
+plugin: 'remote_entity:migration_update:tpr_errand_service'
+configuration: {  }
diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml
@@ -514,7 +514,7 @@ display:
       filter_groups:
         operator: AND
         groups:
-          1: AND
+          - AND
       style:
         type: table
         options:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,6 +22,7 @@ services:
       # permission issues.
       SIMPLETEST_BASE_URL: "http://127.0.0.1:8888"
       SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
+      BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}"
       DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish"
       DRUPAL_VARNISH_PORT: 6081
       REDIS_HOST: redis

diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -189,6 +189,15 @@
   $config['stage_file_proxy.settings']['use_imagecache_root'] = FALSE;
 }
 
+// Override session suffix when present.
+if ($session_suffix = getenv('DRUPAL_SESSION_SUFFIX')) {
+  $config['helfi_proxy.settings']['session_suffix'] = $session_suffix;
+}
+
+if ($robots_header_enabled = getenv('DRUPAL_X_ROBOTS_TAG_HEADER')) {
+  $config['helfi_proxy.settings']['robots_header_enabled'] = (bool) $robots_header_enabled;
+}
+
 if (
   ($redis_host = getenv('REDIS_HOST')) &&
   file_exists('modules/contrib/redis/example.services.yml') &&

diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
@@ -1,11 +1,9 @@
-ifeq ($(DRUPAL_VERSION),8)
-	ifeq ($(DRUPAL_CONF_EXISTS),yes)
-	    DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-uli
-	else
-	    DRUPAL_NEW_TARGETS := up build drush-si drush-enable-modules drush-locale-update drush-uli
-	endif
-    DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-uli
+ifeq ($(DRUPAL_CONF_EXISTS),yes)
+	DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-uli
+else
+	DRUPAL_NEW_TARGETS := up build drush-si helfi-drush-enable-modules drush-locale-update drush-uli
 endif
+DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-uli
 
 OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token')
 SYNC_TARGETS := oc-login oc-sync
@@ -23,8 +21,8 @@ oc-sync:
 	$(call drush,cim -y)
 	$(call drush,cr)
 
-PHONY += drush-enable-modules
-drush-enable-modules: ## Enable modules and base configurations.
+PHONY += helfi-drush-enable-modules
+helfi-drush-enable-modules: ## Enable modules and base configurations.
 	$(call step,Install base configurations...)
 	$(call drush,cr)
 	$(call drush,en -y helfi_platform_config helfi_base_config)