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

Automatic update
City-of-Helsinki · Oct 19, 2023 · 019ebbb · 019ebbb
2 parents c9faa46 + 7b9fa55
commit 019ebbb
Show file tree

Hide file tree

Showing 9 changed files with 158 additions and 77 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -0,0 +1 @@
+2
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -84,8 +84,8 @@ content:
     third_party_settings: {  }
   contacts:
     type: readonly_field_widget
-    region: content
     weight: 36
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -176,8 +176,8 @@ content:
     third_party_settings: {  }
   highlights:
     type: readonly_field_widget
-    region: content
     weight: 33
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -203,8 +203,8 @@ content:
     third_party_settings: {  }
   links:
     type: readonly_field_widget
-    region: content
     weight: 31
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -241,8 +241,8 @@ content:
     third_party_settings: {  }
   opening_hours:
     type: readonly_field_widget
-    region: content
     weight: 32
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -251,8 +251,8 @@ content:
     third_party_settings: {  }
   other_info:
     type: readonly_field_widget
-    region: content
     weight: 34
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -294,8 +294,8 @@ content:
     third_party_settings: {  }
   price_info:
     type: readonly_field_widget
-    region: content
     weight: 35
+    region: content
     settings:
       label: above
       formatter_type: null
@@ -356,8 +356,8 @@ content:
     third_party_settings: {  }
   topical:
     type: readonly_field_widget
-    region: content
     weight: 31
+    region: content
     settings:
       label: above
       formatter_type: null

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -8,8 +8,8 @@ id: helfi_announcements
 label: 'Helfi: Announcements'
 label_plural: 'Helfi: Announcements'
 description: ''
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/views.view.editoria11y_dismissals.yml b/conf/cmi/views.view.editoria11y_dismissals.yml
@@ -1,3 +1,4 @@
+uuid: f94e4fc7-77b1-4524-aa58-ec4c2de13863
 langcode: en
 status: true
 dependencies:

diff --git a/conf/cmi/views.view.editoria11y_results.yml b/conf/cmi/views.view.editoria11y_results.yml
@@ -1,3 +1,4 @@
+uuid: d77eb62e-e4a8-4dbb-bd44-0411494e598f
 langcode: en
 status: true
 dependencies:

diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
@@ -360,13 +360,13 @@ display:
     display_plugin: block
     position: 1
     display_options:
-      display_extenders: {  }
       pager:
         type: none
         options:
           offset: 0
       defaults:
         pager: false
+      display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,6 +21,8 @@ services:
       # Optionally, you can add this to your default environments variables to enable or disable
       # xdebug by default (like /etc/environments, ~/.bashrc, or ~/.zshrc).
       XDEBUG_ENABLE: "${XDEBUG_ENABLE:-false}"
+      XDEBUG_CONFIG: "${XDEBUG_CONFIG:-}"
+      PHP_IDE_CONFIG: "${PHP_IDE_CONFIG:-serverName=${DRUPAL_HOSTNAME}}"
       # DOCKERHOST: host.docker.internal
       # Use drush server to run functional tests, so we don't have to care about
       # permission or SSL issues.
@@ -121,7 +123,7 @@ services:
     container_name: "${COMPOSE_PROJECT_NAME}-artemis"
     image: quay.io/artemiscloud/activemq-artemis-broker
     environment:
-      AMQ_EXTRA_ARGS: "--nio --user admin --password admin"
+      AMQ_EXTRA_ARGS: "--user admin --password admin"
     depends_on:
       - app
     networks:

diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
@@ -6,7 +6,12 @@ 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 := drush-sync-db
+
+ifneq ($(DUMP_SQL_EXISTS),yes)
 SYNC_TARGETS := oc-login oc-sync
+endif
 
 PHONY += oc-login
 oc-login: