Merge pull request #1023 from City-of-Helsinki/update-configuration

Automatic update

.sonarcloud.properties

@@ -0,0 +1 @@
+sonar.exclusions=public/modules/custom/**/tests/**

conf/cmi/external_entities.external_entity_type.helfi_news.yml

@@ -8,8 +8,8 @@ id: helfi_news
 label: 'Helfi: News'
 label_plural: 'Helfi: News'
 description: ''
-read_only: true
 generate_aliases: false
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml

@@ -8,8 +8,8 @@ id: helfi_news_groups
 label: 'Helfi: News groups'
 label_plural: 'Helfi: News groups'
 description: 'Retrieves news groups taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml

@@ -3,13 +3,13 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 5s8g-adBsUuIIMte5BCEwSFlQjxwFJ_Gq2Do7EEwq2E
+  default_config_hash: 09-lIa9cl9PNPVIBXCVIR8yBfofPifSwhAsD0QVh8l8
 id: helfi_news_neighbourhoods
 label: 'Helfi: News neighbourhoods'
 label_plural: 'Helfi: News neighbourhoods'
 description: 'Retrieves news neighbourhoods taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:
@@ -21,6 +21,8 @@ field_mapper_config:
       value: '$._source.name[0]'
     tid:
       value: '$._source.tid[0]'
+    location:
+      value: $._source.field_location
 storage_client_id: helfi_news_neighbourhoods
 storage_client_config: {  }
 persistent_cache_max_age: 86400

conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml

@@ -8,8 +8,8 @@ id: helfi_news_tags
 label: 'Helfi: News tags'
 label_plural: 'Helfi: News tags'
 description: 'Retrieves news tags taxonomy terms from Helfi'
-read_only: true
 generate_aliases: null
+read_only: true
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

tools/make/drupal.mk

@@ -4,6 +4,8 @@ DRUPAL_CONF_EXISTS := $(shell test -f conf/cmi/core.extension.yml && echo yes ||
 DRUPAL_CREATE_FOLDERS := /app/public/sites/default/files/private
 DRUPAL_CREATE_FOLDERS += /app/public/sites/default/files/translations
 
+DRUPAL_PROFILE ?= minimal
+
 PHONY += drupal-create-folders
 drupal-create-folders:
 	$(call step,Create folders for Drupal...\n)
@@ -50,6 +52,12 @@ drush-si: ## Site install
 	$(call step,Do Drush site:install...\n)
 	$(call drush,si ${DRUSH_SI})
 
+PHONY += drush-helfi-enable-modules
+drush-helfi-enable-modules: ## Enable modules and base configurations.
+	$(call step,Install base configurations...)
+	$(call drush,cr)
+	$(call drush,en -y helfi_platform_config helfi_platform_config_base)
+
 PHONY += drush-deploy
 drush-deploy: ## Run Drush deploy
 	$(call step,Run Drush deploy...\n)
@@ -87,13 +95,13 @@ DRUPAL_FRESH_TARGETS := up drupal-create-folders composer-install drush-import-d
 PHONY += fresh
 fresh: $(DRUPAL_FRESH_TARGETS) ## Build fresh development environment and sync
 
-DRUPAL_NEW_TARGETS := up drupal-create-folders composer-install drush-si $(DRUPAL_POST_INSTALL_TARGETS)
+DRUPAL_NEW_TARGETS := up drupal-create-folders composer-install drush-si drush-helfi-enable-modules drush-cr drush-unblock drush-uli
 PHONY += new
 new: $(DRUPAL_NEW_TARGETS) ## Create a new empty Drupal installation from configuration
 
 dump.sql:
 	@touch /tmp/kube-config
-	@docker run --network host --env-file .env -it --rm -v /tmp/kube-config:/root/.kube/config -v $(shell pwd):/app --name helfi-oc ghcr.io/city-of-helsinki/drupal-oc-cli:latest sh -c "db-sync"
+	@docker run --pull=always --env-file .env -it --rm -v /tmp/kube-config:/root/.kube/config -v $(shell pwd):/app --name helfi-oc ghcr.io/city-of-helsinki/drupal-oc-cli:latest sh -c "db-sync"
 	$(call docker_compose_exec,gunzip dump.sql.gz)
 
 PHONY += drush-import-dump

tools/make/git.mk

@@ -1,3 +1,3 @@
 PHONY += copy-commit-message-script
 copy-commit-message-script:
-	@$(foreach name,$(shell find . -type d -name ".git" -exec dirname {} \; 2> /dev/null ),cp tools/commit-msg $(name)/.git/hooks;)
+	@$(foreach name,$(shell find . -type d -name ".git" -exec dirname {} \; 2> /dev/null ),cp tools/commit-msg $(name)/.git/hooks && chmod +x $(name)/.git/hooks/commit-msg;)