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

Automatic update

.platform/schema

@@ -1 +1 @@
-14
+15

Makefile

@@ -1,17 +1,36 @@
 PHONY :=
 PROJECT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
+# Colors
+NO_COLOR=\033[0m
+CYAN=\033[36m
+GREEN=\033[0;32m
+RED=\033[0;31m
+YELLOW=\033[0;33m
+
+ENV := local
+
 # Include project env vars (if exists)
 -include .env
 -include .env.local
 
-# Include druidfi/tools config
-include $(PROJECT_DIR)/tools/make/Makefile
+define step
+	@printf "\n⭐ ${YELLOW}${1}${NO_COLOR}\n"
+endef
+
+PHONY += help
+help: ## List all make commands
+	$(call step,Available make commands:\n)
+	@cat $(MAKEFILE_LIST) | grep -e "^[a-zA-Z_\-]*: *.*## *" | awk 'BEGIN {FS = ":.*?## "}; {printf "${CYAN}%-30s${NO_COLOR} %s\n", $$1, $$2}'
 
-# Include project specific make files (if they exist)
--include $(PROJECT_DIR)/tools/make/project/*.mk
+# Allow projects to specify makefiles.
+-include tools/make/project/*.mk
 
-# Project specific overrides for variables (if they exist)
--include $(PROJECT_DIR)/tools/make/override.mk
+include tools/make/docker.mk
+include tools/make/composer.mk
+include tools/make/drupal.mk
+include tools/make/git.mk
+include tools/make/theme.mk
+include tools/make/qa.mk
 
 .PHONY: $(PHONY)

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: