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

Dev to main
City-of-Helsinki · Sep 10, 2024 · 13fa997 · 13fa997
2 parents 1260b31 + cc2d454
commit 13fa997
Show file tree

Hide file tree

Showing 10 changed files with 242 additions and 279 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml
@@ -40,8 +40,8 @@ content:
     weight: 1
     region: content
     settings:
-      linkit_auto_link_text: false
       linkit_profile: helfi
+      linkit_auto_link_text: false
     third_party_settings: {  }
 hidden:
   created: true

diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml
@@ -31,9 +31,9 @@ content:
     weight: 0
     region: content
   list:
-    weight: 100
     settings: {  }
     third_party_settings: {  }
+    weight: 100
     region: content
 hidden:
   search_api_excerpt: true
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
@@ -8,8 +8,8 @@ id: helfi_hearings
 label: 'Helfi: Hearing'
 label_plural: 'Helfi: Hearing'
 description: 'Helfi hearings from hearing api.'
-generate_aliases: false
 read_only: true
+generate_aliases: false
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml
@@ -23,6 +23,7 @@ dependencies:
     - paragraphs.paragraphs_type.service_list
     - paragraphs.paragraphs_type.service_list_search
     - paragraphs.paragraphs_type.target_group_links
+    - paragraphs.paragraphs_type.unit_contact_card
     - paragraphs.paragraphs_type.unit_search
   module:
     - entity_reference_revisions
@@ -61,6 +62,7 @@ settings:
       service_list: service_list
       service_list_search: service_list_search
       unit_search: unit_search
+      unit_contact_card: unit_contact_card
     negate: 0
     target_bundles_drag_drop:
       banner:
@@ -117,6 +119,9 @@ settings:
       target_group_links:
         weight: 12
         enabled: true
+      unit_contact_card:
+        weight: 18
+        enabled: true
       unit_search:
         weight: 17
         enabled: true

diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml
@@ -22,6 +22,7 @@ dependencies:
     - paragraphs.paragraphs_type.remote_video
     - paragraphs.paragraphs_type.service_list_search
     - paragraphs.paragraphs_type.text
+    - paragraphs.paragraphs_type.unit_contact_card
     - paragraphs.paragraphs_type.unit_search
   module:
     - entity_reference_revisions
@@ -59,6 +60,7 @@ settings:
       content_liftup: content_liftup
       service_list_search: service_list_search
       unit_search: unit_search
+      unit_contact_card: unit_contact_card
     negate: 0
     target_bundles_drag_drop:
       accordion:
@@ -112,6 +114,9 @@ settings:
       text:
         weight: 0
         enabled: true
+      unit_contact_card:
+        weight: 18
+        enabled: true
       unit_search:
         weight: 17
         enabled: true

diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml
@@ -22,6 +22,7 @@ dependencies:
     - paragraphs.paragraphs_type.remote_video
     - paragraphs.paragraphs_type.service_list_search
     - paragraphs.paragraphs_type.text
+    - paragraphs.paragraphs_type.unit_contact_card
     - paragraphs.paragraphs_type.unit_search
   module:
     - entity_reference_revisions
@@ -59,6 +60,7 @@ settings:
       content_liftup: content_liftup
       service_list_search: service_list_search
       unit_search: unit_search
+      unit_contact_card: unit_contact_card
     negate: 0
     target_bundles_drag_drop:
       accordion:
@@ -112,6 +114,9 @@ settings:
       text:
         weight: 2
         enabled: true
+      unit_contact_card:
+        weight: 18
+        enabled: true
       unit_search:
         weight: 17
         enabled: true

diff --git a/tools/make/docker.mk b/tools/make/docker.mk
@@ -3,11 +3,16 @@ CLI_SHELL := sh
 # Note: specification says this file would be compose.yaml
 DOCKER_COMPOSE_YML_PATH ?= compose.yaml
 DOCKER_COMPOSE_YML_EXISTS := $(shell test -f $(DOCKER_COMPOSE_YML_PATH) && echo yes || echo no)
+DOCKER_ENV := $(shell test -f /.dockerenv && echo yes || echo no)
 DOCKER_PROJECT_ROOT ?= /app
 DOCKER_WARNING_INSIDE := You are inside the Docker container!
 
-# If docker-compose.yml exists
-ifeq ($(DOCKER_COMPOSE_YML_EXISTS),yes)
+ifeq ($(DOCKER_ENV),yes)
+	RUN_ON := host
+endif
+
+# If compose.yaml exists
+ifeq ($(DOCKER_ENV)-$(DOCKER_COMPOSE_YML_EXISTS),no-yes)
 	RUN_ON := docker
 endif
 

diff --git a/tools/make/drupal.mk b/tools/make/drupal.mk
@@ -14,6 +14,7 @@ DRUSH_RSYNC_MODE ?= Pakzu
 DRUSH_RSYNC_OPTS ?=  -- --omit-dir-times --no-perms --no-group --no-owner --chmod=ugo=rwX
 DRUSH_RSYNC_EXCLUDE ?= css:ctools:js:php:tmp:tmp_php
 SYNC_TARGETS += drush-sync
+SYNC_FROM_REMOTE ?= no
 CS_EXTS := inc,php,module,install,profile,theme
 CS_STANDARD_PATHS := vendor/drupal/coder/coder_sniffer,vendor/slevomat/coding-standard
 CS_STANDARDS := Drupal,DrupalPractice
@@ -27,6 +28,10 @@ FIX_TARGETS += fix-drupal
 DRUPAL_CREATE_FOLDERS := $(WEBROOT)/sites/default/files/private
 DRUPAL_CREATE_FOLDERS += $(WEBROOT)/sites/default/files/translations
 
+ifeq ($(LAGOON),yes)
+	SYNC_FROM_REMOTE := yes
+endif
+
 ifeq ($(GH_DUMP_ARTIFACT),yes)
 	DRUPAL_FRESH_TARGETS := gh-download-dump $(DRUPAL_FRESH_TARGETS)
 endif
@@ -148,16 +153,20 @@ ifeq ($(DUMP_SQL_EXISTS),yes)
 	$(call step,Import local SQL dump...)
 	$(call drush,sql-query --file=${DOCKER_PROJECT_ROOT}/$(DUMP_SQL_FILENAME) && echo 'SQL dump imported')
 else
+ifeq ($(SYNC_FROM_REMOTE),yes)
 	$(call step,Sync database from @$(DRUPAL_SYNC_SOURCE)...)
 	$(call drush,sql-sync -y --structure-tables-key=common @$(DRUPAL_SYNC_SOURCE) @self)
 endif
+endif
 
 PHONY += drush-sync-files
 drush-sync-files: ## Sync files
 ifeq ($(DRUPAL_SYNC_FILES),yes)
+ifeq ($(SYNC_FROM_REMOTE),yes)
 	$(call step,Sync files from @$(DRUPAL_SYNC_SOURCE)...)
 	$(call drush,-y rsync --exclude-paths=$(DRUSH_RSYNC_EXCLUDE) --mode=$(DRUSH_RSYNC_MODE) @$(DRUPAL_SYNC_SOURCE):%files @self:%files $(DRUSH_RSYNC_OPTS))
 endif
+endif
 
 PHONY += drush-create-dump
 drush-create-dump: FLAGS := --structure-tables-key=common --extra-dump=--no-tablespaces

diff --git a/tools/make/utils.mk b/tools/make/utils.mk
@@ -70,5 +70,5 @@ define remove_string
 endef
 
 define run
-	@${1} && printf "${2}\n" || printf "${RED}${3}${NO_COLOR}\n"
+	@${1} && printf "${2}\n" || (printf "${RED}${3}${NO_COLOR}\n" && exit 1)
 endef