City-of-Helsinki · hyrsky · Jan 21, 2025 · Jan 21, 2025
diff --git a/.platform/schema b/.platform/schema
@@ -1 +1 @@
-14
+15
diff --git a/Makefile b/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)
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml b/conf/cmi/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml
@@ -2,8 +2,6 @@ uuid: b95230b8-fb95-4373-b877-6117cf4d0f46
 langcode: en
 status: true
 dependencies:
-  config:
-    - external_entities.external_entity_type.helfi_news_groups
   module:
     - external_entities
 _core:

diff --git a/.../core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/.../core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml
@@ -2,8 +2,6 @@ uuid: d13089ef-9704-4770-90a9-fd9fedc50405
 langcode: en
 status: true
 dependencies:
-  config:
-    - external_entities.external_entity_type.helfi_news_neighbourhoods
   module:
     - external_entities
 _core:

diff --git a/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml b/conf/cmi/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml
@@ -2,8 +2,6 @@ uuid: 972acdae-8e71-4d12-a335-bc91828f4851
 langcode: en
 status: true
 dependencies:
-  config:
-    - external_entities.external_entity_type.helfi_news_tags
   module:
     - external_entities
 _core:

diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml
@@ -2,8 +2,6 @@ uuid: 8cdbdb79-0afd-4c2a-9eac-286984c02eff
 langcode: en
 status: true
 dependencies:
-  config:
-    - external_entities.external_entity_type.helfi_news
   module:
     - external_entities
 _core:
@@ -28,6 +26,7 @@ hidden:
   neighbourhoods_uuid: true
   node_url: true
   published_at: true
+  search_api_excerpt: true
   short_title: true
   tags: true
   tags_uuid: true
diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml
@@ -4,7 +4,6 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.helfi_news.medium_teaser
-    - external_entities.external_entity_type.helfi_news
   module:
     - external_entities
   enforced:
@@ -32,6 +31,7 @@ hidden:
   neighbourhoods_uuid: true
   node_url: true
   published_at: true
+  search_api_excerpt: true
   short_title: true
   tags: true
   tags_uuid: true
diff --git a/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml b/conf/cmi/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml
@@ -2,8 +2,6 @@ uuid: 045f335b-7059-4d6a-9240-43909f3c1704
 langcode: en
 status: true
 dependencies:
-  config:
-    - external_entities.external_entity_type.helfi_news_groups
   module:
     - external_entities
 _core:

diff --git a/.../core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/.../core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml
@@ -2,8 +2,6 @@ uuid: f8d0f0da-4aff-436c-a4b8-4df8c6ee82f8
 langcode: en
 status: true
 dependencies:
-  config:
-    - external_entities.external_entity_type.helfi_news_neighbourhoods
   module:
     - external_entities
 _core:

diff --git a/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml b/conf/cmi/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml
@@ -2,8 +2,6 @@ uuid: 7060dc64-5f95-4fa5-8046-bf0ad5e265c4
 langcode: en
 status: true
 dependencies:
-  config:
-    - external_entities.external_entity_type.helfi_news_tags
   module:
     - external_entities
 _core:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/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:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/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: