Skip to content

Commit 3145db9

Browse files
committed
Merge branch '11.x' of https://github.com/SU-SWS/stanford_profile into SWSDEVOPS-150-trustee-project-update
2 parents a202b46 + 9529fa6 commit 3145db9

File tree

43 files changed

+303
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+303
-67
lines changed

composer.json

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,21 @@
3333
"reference": "master"
3434
}
3535
}
36+
},
37+
{
38+
"type": "package",
39+
"package": {
40+
"name": "noli42/chosen",
41+
"version": "3.0.0",
42+
"type": "drupal-library",
43+
"extra": {
44+
"installer-name": "chosen"
45+
},
46+
"dist": {
47+
"url": "https://github.com/noli42/chosen/releases/download/3.0.0/chosen-assets-v3.0.0.zip",
48+
"type": "zip"
49+
}
50+
}
3651
}
3752
],
3853
"require": {
@@ -45,8 +60,9 @@
4560
"drupal/admin_toolbar": "^3.1",
4661
"drupal/allowed_formats": "^3.0",
4762
"drupal/auto_entitylabel": "^3.0@beta",
63+
"drupal/book": "^2.0",
4864
"drupal/change_labels": "^1.0",
49-
"drupal/chosen": "^4.0",
65+
"drupal/chosen": "^5.0",
5066
"drupal/ckeditor5_icons": "^1.1",
5167
"drupal/colorbox": "^2.0",
5268
"drupal/components": "^3.0",
@@ -69,17 +85,17 @@
6985
"drupal/element_class_formatter": "^2.0@beta",
7086
"drupal/encrypt": "^3.0",
7187
"drupal/environment_indicator": "^4.0",
72-
"drupal/extlink": "^1.3",
88+
"drupal/extlink": "^2.0",
7389
"drupal/fast_404_generator": "^1.0",
7490
"drupal/field_encrypt": "^3.0",
7591
"drupal/field_formatter_class": "^1.5",
7692
"drupal/field_group": "^3.0@rc",
7793
"drupal/field_label": "^1.4",
7894
"drupal/field_permissions": "^1.0@RC",
79-
"drupal/field_validation": "^1.0-alpha",
95+
"drupal/field_validation": "^3.0",
8096
"drupal/file_mdm": "^2.4 || ^3.0",
8197
"drupal/flat_taxonomy": "^2.0",
82-
"drupal/fontawesome": "^2.19",
98+
"drupal/fontawesome": "^3.0",
8399
"drupal/google_analytics": "^4.0",
84100
"drupal/google_tag": "^2.0",
85101
"drupal/graphql_compose": "^2.0",
@@ -109,6 +125,7 @@
109125
"drupal/menu_block": "^1.10",
110126
"drupal/menu_link_weight": "^2.0@alpha",
111127
"drupal/metatag": "^2.0",
128+
"drupal/migrate_file": "^3.0",
112129
"drupal/name": "^1.0@RC",
113130
"drupal/next": "^1.6",
114131
"drupal/nobots": "^1.0",
@@ -130,13 +147,16 @@
130147
"drupal/search_api": "^1.19",
131148
"drupal/search_api_algolia": "^3.0@beta",
132149
"drupal/seckit": "^2.0",
150+
"drupal/shield": "^1.8",
133151
"drupal/shs": "^2.0@RC",
152+
"drupal/simple_oauth": "^6.0",
134153
"drupal/smart_date": "^4.0",
135154
"drupal/smart_trim": "^2.0",
136155
"drupal/stage_file_proxy": "^2.1",
137156
"drupal/taxonomy_entity_index": "^1.8",
138157
"drupal/taxonomy_menu": "^3.5",
139158
"drupal/token_or": "^2.0",
159+
"drupal/trash": "^3.0",
140160
"drupal/ui_patterns": "^1.0",
141161
"drupal/ultimate_cron": "^2.0@beta",
142162
"drupal/view_unpublished": "^1.0",
@@ -148,16 +168,16 @@
148168
"drupal/views_infinite_scroll": "^2.0",
149169
"drupal/views_taxonomy_term_name_depth": "^7.0",
150170
"drupal/webp": "^1.0@beta",
151-
"drupal/xmlsitemap": "^1.0",
152-
"harvesthq/chosen": "^1.8",
171+
"drupal/xmlsitemap": "^2.0",
172+
"noli42/chosen": "3.0.0",
153173
"onlyextart/colorbox": "dev-master#e58476becbc89dc671093d1bcd9f99b2167fa8f7",
154174
"sainsburys/guzzle-oauth2-plugin": "^3.0",
155175
"seboettg/citeproc-php": "2.4.1",
156176
"su-sws/ckeditor5_plugins": "^1.0",
157177
"su-sws/drupal-patches": "^10.0",
158178
"su-sws/react_paragraphs": "^8.2",
159179
"su-sws/stanford_actions": "^8.2",
160-
"su-sws/stanford_fields": "^8.2",
180+
"su-sws/stanford_fields": "^8.4",
161181
"su-sws/stanford_media": "^11.0",
162182
"su-sws/stanford_migrate": "^8.3",
163183
"su-sws/stanford_profile_helper": "^9.8",
@@ -191,6 +211,9 @@
191211
},
192212
"drupal/menu_link_weight": {
193213
"https://www.drupal.org/project/menu_link_weight/issues/2875984": "https://git.drupalcode.org/project/menu_link_weight/-/merge_requests/2.diff"
214+
},
215+
"drupal/trash": {
216+
"Trash module delete condition group": "https://sws-devguide.stanford.edu/sites/g/files/sbiybj17516/files/trash-delete_condition.patch"
194217
}
195218
}
196219
}

config/sync/book.settings.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ _core:
22
default_config_hash: i-_2TVi6FUEAqBgNRJkt6aaYmiw1k_LTrXzJS6wlZ4U
33
allowed_types:
44
- stanford_policy
5-
block:
6-
navigation:
7-
mode: 'all pages'
85
child_type: stanford_policy
6+
book_sort: weight

config/sync/config_split.config_split.dev.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ no_patching: false
1111
storage: folder
1212
folder: ../config/envs/dev
1313
module:
14+
shield: 0
1415
acquia_purge: 0
16+
purge_queuer_coretags: 0
17+
purge_processor_lateruntime: 0
1518
paranoia: 0
1619
purge: 0
17-
purge_drush: 0
1820
purge_processor_cron: 0
19-
purge_processor_lateruntime: 0
20-
purge_queuer_coretags: 0
21+
purge_drush: 0
2122
purge_tokens: 0
2223
update: 0
2324
stage_file_proxy: 0

config/sync/config_split.config_split.local.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ no_patching: false
1111
storage: folder
1212
folder: ../config/envs/local
1313
module:
14+
config_inspector: 0
1415
dblog: 0
1516
devel: 0
1617
devel_php: 0

config/sync/config_split.config_split.stage.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ no_patching: false
1111
storage: folder
1212
folder: ../config/envs/stage
1313
module:
14+
shield: 0
1415
acquia_purge: 0
16+
purge_queuer_coretags: 0
17+
purge_processor_lateruntime: 0
1518
paranoia: 0
1619
purge: 0
17-
purge_drush: 0
1820
purge_processor_cron: 0
19-
purge_processor_lateruntime: 0
20-
purge_queuer_coretags: 0
21+
purge_drush: 0
2122
purge_tokens: 0
2223
stage_file_proxy: 0
2324
theme: { }

config/sync/core.entity_form_display.config_pages.stanford_basic_site_settings.default.yml

Lines changed: 58 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies:
3030
- field.field.config_pages.stanford_basic_site_settings.su_site_org
3131
- field.field.config_pages.stanford_basic_site_settings.su_site_owner_contact
3232
- field.field.config_pages.stanford_basic_site_settings.su_site_renewal_due
33+
- field.field.config_pages.stanford_basic_site_settings.su_site_sunetid
3334
- field.field.config_pages.stanford_basic_site_settings.su_site_tech_contact
3435
- field.field.config_pages.stanford_basic_site_settings.su_site_type
3536
- field.field.config_pages.stanford_basic_site_settings.su_site_url
@@ -108,6 +109,7 @@ third_party_settings:
108109
- su_site_a11y_contact
109110
- su_site_org
110111
- su_site_type
112+
- su_site_sunetid
111113
label: 'Site Contacts'
112114
region: content
113115
parent_name: group_tabs
@@ -202,7 +204,7 @@ content:
202204
third_party_settings: { }
203205
su_site_algolia:
204206
type: boolean_checkbox
205-
weight: 17
207+
weight: 18
206208
region: content
207209
settings:
208210
display_label: true
@@ -227,7 +229,7 @@ content:
227229
selector: ''
228230
su_site_algolia_file:
229231
type: file_generic
230-
weight: 23
232+
weight: 24
231233
region: content
232234
settings:
233235
progress_indicator: throbber
@@ -252,7 +254,7 @@ content:
252254
selector: ''
253255
su_site_algolia_id:
254256
type: string_textfield
255-
weight: 19
257+
weight: 20
256258
region: content
257259
settings:
258260
size: 60
@@ -278,7 +280,7 @@ content:
278280
selector: ''
279281
su_site_algolia_index:
280282
type: string_textfield
281-
weight: 22
283+
weight: 23
282284
region: content
283285
settings:
284286
size: 60
@@ -304,7 +306,7 @@ content:
304306
selector: ''
305307
su_site_algolia_key:
306308
type: string_textfield
307-
weight: 20
309+
weight: 21
308310
region: content
309311
settings:
310312
size: 60
@@ -330,7 +332,7 @@ content:
330332
selector: ''
331333
su_site_algolia_search:
332334
type: string_textfield
333-
weight: 21
335+
weight: 22
334336
region: content
335337
settings:
336338
size: 60
@@ -356,14 +358,14 @@ content:
356358
selector: ''
357359
su_site_algolia_terms:
358360
type: boolean_checkbox
359-
weight: 16
361+
weight: 17
360362
region: content
361363
settings:
362364
display_label: true
363365
third_party_settings: { }
364366
su_site_algolia_ui:
365367
type: boolean_checkbox
366-
weight: 18
368+
weight: 19
367369
region: content
368370
settings:
369371
display_label: true
@@ -504,6 +506,54 @@ content:
504506
placeholder: ''
505507
size: 60
506508
third_party_settings: { }
509+
su_site_sunetid:
510+
type: string_textfield
511+
weight: 9
512+
region: content
513+
settings:
514+
size: 60
515+
placeholder: ''
516+
third_party_settings:
517+
conditional_fields:
518+
bb90b2cd-657c-44e9-917e-b96db953a6d4:
519+
entity_type: config_pages
520+
bundle: stanford_basic_site_settings
521+
dependee: su_site_type
522+
settings:
523+
state: required
524+
reset: false
525+
condition: value
526+
grouping: AND
527+
values_set: 1
528+
value: ''
529+
values: { }
530+
value_form:
531+
-
532+
value: personal
533+
effect: fill
534+
effect_options:
535+
fill:
536+
value: ''
537+
reset: 1
538+
selector: ''
539+
e85299d6-8b92-44cc-9340-a25daaca8201:
540+
entity_type: config_pages
541+
bundle: stanford_basic_site_settings
542+
dependee: su_site_type
543+
settings:
544+
state: visible
545+
reset: false
546+
condition: value
547+
grouping: AND
548+
values_set: 1
549+
value: ''
550+
values: { }
551+
value_form:
552+
-
553+
value: personal
554+
effect: show
555+
effect_options: { }
556+
selector: ''
507557
su_site_tech_contact:
508558
type: email_default
509559
weight: 5

config/sync/core.entity_view_display.config_pages.stanford_basic_site_settings.default.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies:
3030
- field.field.config_pages.stanford_basic_site_settings.su_site_org
3131
- field.field.config_pages.stanford_basic_site_settings.su_site_owner_contact
3232
- field.field.config_pages.stanford_basic_site_settings.su_site_renewal_due
33+
- field.field.config_pages.stanford_basic_site_settings.su_site_sunetid
3334
- field.field.config_pages.stanford_basic_site_settings.su_site_tech_contact
3435
- field.field.config_pages.stanford_basic_site_settings.su_site_type
3536
- field.field.config_pages.stanford_basic_site_settings.su_site_url
@@ -267,6 +268,14 @@ content:
267268
third_party_settings: { }
268269
weight: 15
269270
region: content
271+
su_site_sunetid:
272+
type: string
273+
label: above
274+
settings:
275+
link_to_entity: false
276+
third_party_settings: { }
277+
weight: 28
278+
region: content
270279
su_site_tech_contact:
271280
type: basic_string
272281
label: above

config/sync/core.entity_view_display.node.stanford_policy.default.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ mode: default
416416
content: { }
417417
hidden:
418418
body: true
419+
book_navigation: true
419420
field_menulink: true
420421
layout_builder__layout: true
421422
links: true

config/sync/core.entity_view_display.node.stanford_policy.printable.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ content:
225225
weight: 2
226226
region: ds_content
227227
hidden:
228+
book_navigation: true
228229
field_menulink: true
229230
layout_builder__layout: true
230231
links: true

config/sync/core.entity_view_display.node.stanford_policy.search_indexing.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ content:
176176
weight: 2
177177
region: content
178178
hidden:
179+
book_navigation: true
179180
field_menulink: true
180181
layout_builder__layout: true
181182
links: true

0 commit comments

Comments
 (0)