Skip to content

Commit

Permalink
Update configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
@hel-platta-automation @github-actions
hel-platta-automation authored and github-actions[bot] committed Sep 6, 2024
1 parent 03d8f3b commit d1040a2
Show file tree
Hide file tree
Showing 13 changed files with 139 additions and 121 deletions.
220 changes: 112 additions & 108 deletions composer.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_display.paragraph.hearings.default.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/views.view.er_tpr_unit.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ display:
type: mini
options:
offset: 0
pagination_heading_level: h4
items_per_page: 10
total_pages: null
id: 0
Expand All @@ -105,7 +106,6 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/views.view.locked_services.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -398,7 +399,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/views.view.locked_units.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 50
total_pages: null
id: 0
Expand All @@ -398,7 +399,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
4 changes: 2 additions & 2 deletions conf/cmi/views.view.service_list.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 4
total_pages: null
id: 0
Expand All @@ -126,7 +127,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down Expand Up @@ -646,6 +646,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 5
total_pages: null
id: 0
Expand All @@ -663,7 +664,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/views.view.service_units.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 8
total_pages: null
id: 0
Expand All @@ -110,7 +111,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/views.view.unit_search.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ display:
type: full
options:
offset: 0
pagination_heading_level: h4
items_per_page: 15
total_pages: null
id: 0
Expand All @@ -303,7 +304,6 @@ display:
offset: false
offset_label: Offset
quantity: 9
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
9 changes: 7 additions & 2 deletions tools/make/docker.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 9 additions & 0 deletions tools/make/drupal.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/make/utils.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit d1040a2

Please sign in to comment.