Skip to content

Commit 4c9cccf

Browse files
johangantjohangant
committed
Merge branch 'development'
2 parents 2daa709 + e349e68 commit 4c9cccf

24 files changed

+309
-172
lines changed

‎.circleci/config.yml

+9
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,15 @@ jobs:
316316
name: Trigger a data sync from master environment to nightly edge build.
317317
command: |
318318
/home/circleci/.platformsh/bin/platform sync data -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH -y
319+
- run:
320+
name: Force purge of Solr index
321+
command: /home/circleci/.platformsh/bin/platform ssh -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH "curl http://${PLATFORM_SOLR_HOST}/solr/default/update --data '<delete><query>*:*</query></delete>' -H 'Content-type:text/xml; charset=utf-8' && curl http://${PLATFORM_SOLR_HOST}/solr/default/update --data '<commit/>' -H 'Content-type:text/xml; charset=utf-8'"
322+
- run:
323+
name: Rebuild the Solr index
324+
command: |
325+
/home/circleci/.platformsh/bin/platform environment:drush sapi-c -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
326+
/home/circleci/.platformsh/bin/platform environment:drush sapi-r -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
327+
/home/circleci/.platformsh/bin/platform environment:drush sapi-i -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
319328
320329
workflows:
321330
version: 2

‎composer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
"require": {
3333
"composer/installers": "^1.2",
3434
"cweagans/composer-patches": "^1.6.5",
35-
"dof-dss/nicsdru_nidirect_theme": "^0.10.2",
35+
"dof-dss/nicsdru_nidirect_theme": "^0.11.1",
3636
"dof-dss/nicsdru_origins_modules": "^0.8.0",
3737
"dof-dss/nicsdru_origins_theme": "^0.3.1",
3838
"dof-dss/nidirect-d8-test-install-profile": "^0.2.2",
3939
"dof-dss/nidirect-migrations": "^0.10.0",
40-
"dof-dss/nidirect-site-modules": "^0.10.3",
40+
"dof-dss/nidirect-site-modules": "^0.11.1",
4141
"drupal/address": "^1.7",
4242
"drupal/admin_toolbar": "^2.0",
4343
"drupal/adminimal_theme": "^1.5",
@@ -144,6 +144,7 @@
144144
"drupal/core": {
145145
"Prevent leftover fields from causing errors like 'Call to a member function getLabel() after enabling layout_builder'": "https://www.drupal.org/files/issues/2020-01-20/2985882-53.patch",
146146
"When embedding media, don't let authors choose view modes that are not enabled for that media type": "https://www.drupal.org/files/issues/2020-01-31/3097416-ckeditor-view-modes-8.9-combined.patch",
147+
"Prevent error when saving unpublished content for users without manage book privileges": "https://www.drupal.org/files/issues/2918537-36.patch",
147148
"[PP-1] Provide options to sanitize filenames (transliterate, lowercase, replace whitespace, etc)": "https://www.drupal.org/files/issues/2019-12-06/2492171-294.patch"
148149
},
149150
"drupal/config_split": {

‎composer.lock

+17-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/sync/block_content.type.article_teasers_by_topic.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
uuid: 5266e909-c2d1-4aa1-83c9-d20a7b2897e4
2+
langcode: en
3+
status: true
4+
dependencies: { }
5+
id: article_teasers_by_topic
6+
label: 'Article Teasers by Topic'
7+
revision: 1
8+
description: ''

‎config/sync/chosen.settings.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
minimum_single: 3
1+
minimum_single: 20
22
minimum_multiple: 20
33
disable_search_threshold: 0
44
minimum_width: 0

‎config/sync/core.entity_form_display.block_content.article_teasers_by_topic.default.yml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
uuid: c3e876e5-fa9e-473f-ab39-b4da45b7af8a
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- block_content.type.article_teasers_by_topic
7+
- field.field.block_content.article_teasers_by_topic.field_article_teasers
8+
- field.field.block_content.article_teasers_by_topic.field_manually_control_listing
9+
module:
10+
- paragraphs
11+
id: block_content.article_teasers_by_topic.default
12+
targetEntityType: block_content
13+
bundle: article_teasers_by_topic
14+
mode: default
15+
content:
16+
field_article_teasers:
17+
type: entity_reference_paragraphs
18+
weight: 3
19+
settings:
20+
title: Paragraph
21+
title_plural: Paragraphs
22+
edit_mode: open
23+
add_mode: dropdown
24+
form_display_mode: default
25+
default_paragraph_type: ''
26+
third_party_settings: { }
27+
region: content
28+
field_manually_control_listing:
29+
weight: 2
30+
settings:
31+
display_label: true
32+
third_party_settings: { }
33+
type: boolean_checkbox
34+
region: content
35+
info:
36+
type: string_textfield
37+
weight: 0
38+
region: content
39+
settings:
40+
size: 60
41+
placeholder: ''
42+
third_party_settings: { }
43+
langcode:
44+
type: language_select
45+
weight: 1
46+
region: content
47+
settings:
48+
include_locked: true
49+
third_party_settings: { }
50+
hidden: { }

‎config/sync/core.entity_form_display.taxonomy_term.site_themes.default.yml

+21-39
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ dependencies:
1717
- taxonomy.vocabulary.site_themes
1818
module:
1919
- image
20-
- media_library
2120
- metatag
2221
- path
22+
- shs
2323
- text
2424
id: taxonomy_term.site_themes.default
2525
targetEntityType: taxonomy_term
@@ -28,14 +28,14 @@ mode: default
2828
content:
2929
description:
3030
type: text_textarea
31-
weight: 3
31+
weight: 4
3232
region: content
3333
settings:
3434
placeholder: ''
3535
rows: 5
3636
third_party_settings: { }
3737
field_additional_info:
38-
weight: 10
38+
weight: 6
3939
type: text_textarea
4040
settings:
4141
rows: 5
@@ -57,67 +57,46 @@ content:
5757
third_party_settings: { }
5858
type: metatag_firehose
5959
region: content
60-
field_photo:
61-
type: media_library_widget
62-
weight: 6
63-
region: content
64-
settings:
65-
media_types: { }
66-
third_party_settings: { }
6760
field_supplementary_parents:
68-
type: entity_reference_autocomplete
69-
weight: 11
61+
type: options_shs
62+
weight: 1
7063
region: content
7164
settings:
72-
match_operator: CONTAINS
73-
size: 60
74-
placeholder: ''
75-
match_limit: 10
76-
third_party_settings: { }
77-
field_taxonomy_rank:
78-
weight: 14
79-
type: number
80-
settings:
81-
placeholder: ''
65+
create_new_items: false
66+
create_new_levels: false
67+
force_deepest: false
68+
display_node_count: false
8269
third_party_settings: { }
83-
region: content
8470
field_teaser:
85-
weight: 1
71+
weight: 2
8672
type: string_textfield
8773
settings:
8874
size: 140
8975
placeholder: ''
9076
third_party_settings: { }
9177
region: content
9278
field_theme_summary:
93-
weight: 4
79+
weight: 6
9480
settings:
9581
rows: 5
9682
placeholder: ''
9783
third_party_settings: { }
98-
type: text_textarea
99-
region: content
100-
field_toc_enable:
101-
weight: 8
102-
type: boolean_checkbox
103-
settings:
104-
display_label: true
105-
third_party_settings: { }
84+
type: string_textarea
10685
region: content
10786
field_top_level_theme:
108-
weight: 13
87+
weight: 7
10988
type: options_select
11089
settings: { }
11190
third_party_settings: { }
11291
region: content
11392
flag:
114-
weight: 12
93+
weight: 8
11594
region: content
11695
settings: { }
11796
third_party_settings: { }
11897
langcode:
11998
type: language_select
120-
weight: 2
99+
weight: 10
121100
region: content
122101
settings:
123102
include_locked: true
@@ -132,15 +111,18 @@ content:
132111
third_party_settings: { }
133112
path:
134113
type: path
135-
weight: 7
114+
weight: 11
136115
region: content
137116
settings: { }
138117
third_party_settings: { }
139118
status:
140119
type: boolean_checkbox
141120
settings:
142121
display_label: true
143-
weight: 15
122+
weight: 12
144123
region: content
145124
third_party_settings: { }
146-
hidden: { }
125+
hidden:
126+
field_photo: true
127+
field_taxonomy_rank: true
128+
field_toc_enable: true

‎config/sync/core.entity_view_display.block_content.article_teasers_by_topic.default.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
uuid: b8cddf58-2e2e-4108-b225-e68526bf85ea
2+
langcode: en
3+
status: true
4+
dependencies:
5+
config:
6+
- block_content.type.article_teasers_by_topic
7+
- field.field.block_content.article_teasers_by_topic.field_article_teasers
8+
- field.field.block_content.article_teasers_by_topic.field_manually_control_listing
9+
module:
10+
- entity_reference_revisions
11+
id: block_content.article_teasers_by_topic.default
12+
targetEntityType: block_content
13+
bundle: article_teasers_by_topic
14+
mode: default
15+
content:
16+
field_article_teasers:
17+
type: entity_reference_revisions_entity_view
18+
weight: 1
19+
label: hidden
20+
settings:
21+
view_mode: default
22+
link: ''
23+
third_party_settings: { }
24+
region: content
25+
field_manually_control_listing:
26+
weight: 2
27+
label: above
28+
settings:
29+
format: default
30+
format_custom_false: ''
31+
format_custom_true: ''
32+
third_party_settings: { }
33+
type: boolean
34+
region: content
35+
hidden:
36+
langcode: true
37+
search_api_excerpt: true

0 commit comments

Comments
 (0)