Skip to content

Commit aa4451e

Browse files
edmund-dunndsasserndouglas
authored
D10 upgrade PR (#14876)
* VACMS-12453: refactoring fro samlauth module * VACMS-12453: more refacotring for samlauth module * VACMS-12252: latest d10, merged main into d10 branch * VACMS-12453: config split setup for samlauth * VACMS-12453: removed simplesamlphp config files * VACMS-00000: remove drupal/flysystem modules * VACMS-12252: merged latest from main * VACMS-12252: additional updates, added simplasamlphp shell modules * VACMS-12252: more contrib patches * VACMS-12252: updated composer.lock * VACMS-12252: update to ckeditor5 config * VACMS-12252: update nodejs to v18 for core, commiting updated patch file * VACMS-12252: removed imports in stroybook from core claro * VACMS-12252: changes for theme d10 compatibility * VACMS-12252: added samlauth config for tugboat * VACMS-12453: samlauth config for tugboat * VACMS-12252: commiting patch for storage * VACMS-12252: replaced jquery.once in va_gov_backend with once * VACMS-12252: needed dependencies for testing, added explicitly * VACMS-12453: samlauth config for local * ACMS-12252: fix for accesCheck in phpunit test * VACMS-12453: fix for user import, this is handle by samlauth module now * VACMS-12252: enable password compatibility module * VACMS-12252: updates for graphqlv3 module * VACMS-12252: updates to cypress for ckeditor5 * VACMS-12252: fixed dependencies * VACMS-12252: updates for js once to fix cypress tests * VACMS-12453: fix for cypress test of user login scren * VACMS-12252: updated accessibility.js to disabled aria-allowed-attr * VACMS-12252: js updates for vanilla once * VACMS-14359: Replaces deprecated code in PdfCheckValidator.php. * VACMS-0000: Removes unnecessary property definition which is now defined in the parent class. This was throwing a php error during site rebuild. * VACMS-0000: Updates encode() method signature to match parent class method signature. * VACMS-12252: update or textfield_counter module * VACMS-12252: fix for cypress tests * VACMS-12453: fixed config to remove simplesamlphp_auth * VACMS-12453: fix for user.login test and reenable va_gov_multilingual * VACMS-12252: fix for multilingual * VACMS-12252: fix for step_definitions cypress test * VACMS-12252: fix for person_profile cypress test * VACMS-14434: Resolves 'The element must be an instance of Element'. * VACMS-12252: fix for tooltip, added popperjs library * VACMS-12252: fix for gtm * VACMS-12252: fix for media and step_definition cypress tests * VACMS-12252: patch for paragraphs_browser to use once library * VACMS-14480: removed GTM * VACMS-12453: certificate updates * VACMS-12252: fix for cypress test * VACMS-14481: Some tweaks to build-frontend.sh script. * VACMS-14550: WIP updated guzzle client * VACMS-12252: removed gtm from va_gov_backend.libraries.yml * VACMS-12252: updated composer.lock * VACMS-12252: patch for vbo for access failure * VACMS-12252: updated composer.lock * VACMS-12252: missed a few accessChecks * VACMS-12252: updated composer.lock * VACMS-14591: fixed va logo in the toolbar * VACMS-14550: Makes ContentReleaseStatusControllerTest D10-compatible. * VACMS-12573: fix for widget form alter syntax change * VACMS-14538: fix for js once syntax change * VACMS-12252: fix to classy library change * VACMS-14489: fix for link autocomplete * VACMS-14556: fix for vbo Apply button styling * VACMS-11003: ifx syntax of .info.yml file * VACMS-14556: fix for vbo form * VACMS-12252: type in composer.json * VACMS-12252: fix for cypress test * VACMS-14556: vbo module update * VACMS-14635: fix for contacts selection para * VACMS-12252: updated composer.lock * VACMS-12252: added accessCheck * VACMS-12252: fix for cypress test * VACMS-14725: simplasamlphp upgrade and config * VACMS-12252: fix for cypress test * VACMS-14725: config fix * VACMS-14725: removed shell module, i'm an idiot * VACMS-14725: symlink updated for simplesamlphp * VACMS-14725: updated simplesamlphp config * VACMS-14725: updated simplesamlphp * VACVMS-12252: updatd to 10.1.2 * VACMS-14725: config update * VACMS-14725: another update for simplesamlphp * VACMS-14725: update 3 simplesamlphp * VACMS-14725: update to simplesamlphp_auth module * VACMS-14725: trying to fix css/js * VACMS-14725: turn off aggregation * VACMS-14725: trying to fix css/js * VACMS-14725: turn off aggregation * VACMS-12252: updated composer.lock * VACMS-12252: patch for entity_reference_hierarchy * VACMS-12252: updated composer.lock * VACMS-14556: styling new vbo bulk edit form * VACMS-12252: fixes from linting * VACMS-12252: temp ignore vamc operating status and alerts test * VACMS-14556: fix for vbo form styling * VACMS-14556: fix for VBO form styling * VACMS-12252: updated composer.lock * VACMS-12252: syntax fix for dependencies * VACMS-12561: fix for ckeditor5 toolbar sticky z-index * VACMS-12252: updated composer.lock * VACMS-12252: minor syntax changes and updtes * VACMS-12252: updated composer.lock * VACMS-12252: fix for syntax booboos * VACMS-12252: updated composer.lock, fixed another syntax booboo * VACMS-12252: updated composer.lock * VACMS-12252: updated composer.lock * VACMS-12634: fix for smart date field in events * VACMS-12252: smart_date to 4.0.3 * VACMS-14725: updates * VACMS-14725: updates to composer.lock * VACMS-14725: fix for simplesamlphp * VACMS-14725: updated composer.lock * VACMS-14725: updated composer.lock * Revert "VACMS-14725: fix for simplesamlphp" This reverts commit 95ebfae. * VCMS-14725: updated composer.lock * VACMS-12252: update composer.lock * VACMS-14725: updates for simplesamplphp * VACMS-12252: updated composer.lock * VACMS-12252: core and contrib module updates * VACMS-12634: fix for smart date field on add new event * VACMS-15135: remove button styles from ckeditor5 * VACMS-12634: fix manual editable tags * VACMS-12252: updated composer.lock * VACMS-12252: updated composer.lock * VACMS-12252: upgrade to core 10.1.4 * VACMS-12252: updated composer.lock * VACMS-14725: update simplesamlphp to rc1 * VACMS-12252: updated composer.lock * VACMS-15112: fixed ckeditor styling * VACMS-12252: updated composer.lock * VACMS-12252: update nodejs version to 18 in theme build script * VACMS-12252: update nodejs version to 18 in theme build script * VACMS-14725: updated simmplesaml_auth to rc1 * VACMS-14725: adjust settings for simplesamlphp * VACMS-14725: remove unneeded patch * VACMS-14725: remove unneeded patch * VACMS-12252: fix for csv_serialization update * VACMS-14725: updated composer.lock * VACMS-12252: update for modules * VACMS-12252: updated composer.lock * VACMS-12252: updates to composer.json to remove merged patches * VACMS-16017: removed deprecation * VACMS-12252: updated composer.lock * VACMS-12252: fix for views_data_export version * VACMS-12252: updated composer.lock * VACMS-12252: patch for views_conditional modules * VACMS-12252: enable intl php extension * VACMS-12252: install php ext intl * VACMS-12252: remove patch for views_conditional * VACMS14643: fix ckeditor5 height * VACMS-16098: fix for ckediotr width * VACMS-12252: updated composer.lock * VACMS-12252: fix for composer.json * VACMS-16107: workaround for styling links in ckeditor5 not working * VACMS-16111: fix for theming of abbreviations in ckeditor * VACMS-16126: fixed alignment of calendar checkbox * VACMS-16139: fix for block content route * VACMS-16123: added IDs back into ckeditor5 config * VACMS-16119: fis for LSBE field showing on content section on KB article * VACMS-12252: updated composer.lock * VACMS-16119: final fix for LSBE field in KB articles * Adds '::save' in custom submission handler for nodes. * VACMS-12252: updated composer.lock * VACMS-12252: update simplesamlphp_auth, remove outdated patch * ACMS-12252: update to sitewide_alert patch * VACMS-12252: updated composer.lock * VACMS-12252: fix for RequestStack, changed to Symfony * VACMS-12252: updated composer.lock * VACMS-12252: fix for stylelint error --------- Co-authored-by: Daniel Sasser <[email protected]> Co-authored-by: Nathan Douglas <[email protected]>
1 parent 639d214 commit aa4451e

File tree

127 files changed

+5589
-5025
lines changed

Some content is hidden

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

127 files changed

+5589
-5025
lines changed

.tugboat/config.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,15 @@ services:
4242

4343
# Ensure GD has support for JPEG.
4444
- apt-get install libjpeg-dev
45-
- docker-php-ext-configure gd --with-jpeg --with-freetype && docker-php-ext-install gd
45+
- docker-php-ext-configure gd --with-jpeg --with-webp --with-freetype && docker-php-ext-install gd
4646

4747
# Install php ZIP extension (drush 10 requires it).
4848
- apt-get install libzip-dev zip
4949
- docker-php-ext-install zip
5050

51+
# Enable php intl extension
52+
- docker-php-ext-install intl
53+
5154
# Install opcache, and Apache modules
5255
- docker-php-ext-install opcache
5356
- a2enmod headers rewrite vhost_alias proxy proxy_http

composer.json

+54-50
Large diffs are not rendered by default.

composer.lock

+2,651-3,781
Large diffs are not rendered by default.

config/dev/simplesamlphp_auth.settings.yml

-35
This file was deleted.

config/sync/admin_feedback.settings.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ no_button: 'No'
77
no_response: 'Thanks for your feedback.'
88
feedback_prompt_on_yes: false
99
feedback_prompt_on_no: false
10-
feedback_prompt: 'If you''d like, give us more feedback.'
10+
feedback_prompt: "If you'd like, give us more feedback."
1111
submit_text: 'Send feedback'
1212
final_response: 'Thank you!'
1313
custom_text_response_on_no:

config/sync/config_split.config_split.prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ weight: 0
99
folder: ../config/prod
1010
module:
1111
fast404: 0
12-
raven: 0
1312
simplesamlphp_auth: 0
13+
raven: 0
1414
syslog: 0
1515
theme: { }
1616
blacklist: { }

config/sync/config_split.config_split.stg.yml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ module:
1111
fast404: 0
1212
raven: 0
1313
syslog: 0
14+
simplesamlphp_auth: 0
1415
theme: { }
1516
blacklist: { }
1617
graylist:

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ langcode: en
33
status: true
44
dependencies:
55
config:
6+
- core.base_field_override.node.documentation_page.changed
67
- field.field.node.documentation_page.field_administration
78
- field.field.node.documentation_page.field_content_block
89
- field.field.node.documentation_page.field_intro_text
@@ -112,6 +113,15 @@ third_party_settings:
112113
date_format: custom
113114
custom_date_format: '\L\a\s\t \u\p\d\a\t\e\d \o\n F j, Y \a\t g:i a'
114115
timezone: ''
116+
tooltip:
117+
date_format: ''
118+
custom_date_format: ''
119+
time_diff:
120+
enabled: false
121+
future_format: '@interval hence'
122+
past_format: '@interval ago'
123+
granularity: 2
124+
refresh: 60
115125
third_party_settings: { }
116126
weight: 2
117127
additional: { }
@@ -137,16 +147,6 @@ content:
137147
third_party_settings: { }
138148
weight: 0
139149
region: content
140-
field_last_saved_by_an_editor:
141-
type: timestamp
142-
label: above
143-
settings:
144-
date_format: custom
145-
custom_date_format: 'F j Y g:ia'
146-
timezone: ''
147-
third_party_settings: { }
148-
weight: 4
149-
region: content
150150
field_products:
151151
type: entity_reference_label
152152
label: above

config/sync/core.extension.yml

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ module:
2424
cer: 0
2525
change_labels: 0
2626
ckeditor: 0
27+
ckeditor5: 0
28+
ckeditor_abbreviation: 0
2729
components: 0
2830
computed_breadcrumbs: 0
2931
config: 0
@@ -185,6 +187,7 @@ module:
185187
path_redirect_import: 0
186188
pathologic: 0
187189
pfm: 0
190+
phpass: 0
188191
post_api: 0
189192
preprocess_event_dispatcher: 0
190193
prometheus_exporter: 0
@@ -278,6 +281,7 @@ module:
278281
va_gov_vamc: 0
279282
va_gov_vba_facility: 0
280283
va_gov_vet_center: 0
284+
va_gov_views: 0
281285
va_gov_workflow: 0
282286
va_gov_workflow_assignments: 0
283287
video_embed_field: 0

config/sync/editor.editor.rich_text.yml

+53-35
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,70 @@
1-
uuid: f95e6861-ad94-47ee-847c-2bfdf3f3d4e7
1+
uuid: 16118084-684f-4186-8c8c-88c0a5fcd4f2
22
langcode: en
33
status: true
44
dependencies:
55
config:
66
- filter.format.rich_text
77
module:
8-
- ckeditor
9-
_core:
10-
default_config_hash: 0bVELtfx9sXhjZ6s6W-dJo8SW-IR9jiEIEylzm-2Cro
8+
- ckeditor5
119
format: rich_text
12-
editor: ckeditor
10+
editor: ckeditor5
1311
settings:
1412
toolbar:
15-
rows:
16-
-
17-
-
18-
name: Formatting
19-
items:
20-
- Bold
21-
- Italic
22-
- '-'
23-
-
24-
name: Linking
25-
items:
26-
- DrupalLink
27-
- DrupalUnlink
13+
items:
14+
- bold
15+
- '|'
16+
- link
17+
- '|'
18+
- bulletedList
19+
- numberedList
20+
- '|'
21+
- horizontalLine
22+
- sourceEditing
23+
- '|'
24+
- blockQuote
25+
- heading
26+
- style
27+
- abbreviation
28+
plugins:
29+
ckeditor5_heading:
30+
enabled_headings:
31+
- heading2
32+
- heading3
33+
- heading4
34+
- heading5
35+
- heading6
36+
ckeditor5_list:
37+
reversed: false
38+
startIndex: true
39+
ckeditor5_sourceEditing:
40+
allowed_tags:
41+
- '<b>'
42+
- '<cite>'
43+
- '<drupal-entity data-* title alt>'
44+
- '<blockquote cite>'
45+
- '<ul type>'
46+
- '<ol type>'
47+
- '<h2 id>'
48+
- '<h3 id>'
49+
- '<h4 id>'
50+
- '<h5 id>'
51+
- '<h6 id>'
52+
- '<p id class="block-va-gov-text">'
53+
- '<a hreflang aria-label data-entity-substitution data-entity-type data-entity-uuid target title class="button button-action button--primary login-required block-vet-center-facility-button usa-button usa-button-primary usa-button-secondary va-button-primary" href>'
54+
ckeditor5_style:
55+
styles:
2856
-
29-
name: Lists
30-
items:
31-
- BulletedList
32-
- NumberedList
57+
label: 'Address Block'
58+
element: '<p class="va-address-block">'
3359
-
34-
name: Media
35-
items:
36-
- HorizontalRule
37-
- Source
60+
label: 'Primary action link'
61+
element: '<a class="vads-c-action-link--green">'
3862
-
39-
name: 'Block Formatting'
40-
items:
41-
- Blockquote
42-
- Format
43-
- Styles
44-
plugins:
45-
drupallink:
63+
label: 'Secondary action link'
64+
element: '<a class="vads-c-action-link--blue">'
65+
linkit_extension:
4666
linkit_enabled: true
4767
linkit_profile: default
48-
stylescombo:
49-
styles: "p.va-address-block|Address Block\r\na.usa-button|Default link button\r\na.usa-button-primary.va-button-primary|Primary link button\r\na.usa-button.usa-button-secondary|Secondary link button\r\na.vads-c-action-link--green|Primary action link\r\na.vads-c-action-link--blue|Secondary action link"
5068
image_upload:
5169
status: true
5270
scheme: public

config/sync/editor.editor.rich_text_limited.yml

+22-26
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
1-
uuid: 82d49673-a0b5-4c5a-ada7-1762fc50cba3
1+
uuid: 253ac8d2-0d48-46ea-a8fc-21a12221ab19
22
langcode: en
33
status: true
44
dependencies:
55
config:
66
- filter.format.rich_text_limited
77
module:
8-
- ckeditor
8+
- ckeditor5
99
format: rich_text_limited
10-
editor: ckeditor
10+
editor: ckeditor5
1111
settings:
1212
toolbar:
13-
rows:
14-
-
15-
-
16-
name: Formatting
17-
items:
18-
- Bold
19-
- Italic
20-
-
21-
name: Links
22-
items:
23-
- DrupalLink
24-
- DrupalUnlink
25-
-
26-
name: Lists
27-
items:
28-
- NumberedList
29-
- BulletedList
30-
-
31-
name: Other
32-
items:
33-
- Source
34-
- Blockquote
13+
items:
14+
- bold
15+
- '|'
16+
- link
17+
- '|'
18+
- numberedList
19+
- bulletedList
20+
- '|'
21+
- sourceEditing
22+
- blockQuote
23+
- abbreviation
3524
plugins:
36-
drupallink:
25+
ckeditor5_list:
26+
reversed: false
27+
startIndex: false
28+
ckeditor5_sourceEditing:
29+
allowed_tags:
30+
- '<a hreflang aria-label data-entity-substitution data-entity-type data-entity-uuid title>'
31+
- '<abbr title>'
32+
linkit_extension:
3733
linkit_enabled: true
3834
linkit_profile: default
3935
image_upload:

config/sync/filter.format.rich_text.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ langcode: en
33
status: true
44
dependencies:
55
module:
6-
1: editor
7-
2: linkit
8-
3: linky
9-
4: media
10-
5: pathologic
11-
6: va_gov_backend
6+
- editor
7+
- linkit
8+
- linky
9+
- media
10+
- pathologic
11+
- va_gov_backend
1212
_core:
1313
default_config_hash: Mc8Hl-Ya14lrbMXaUx7Ybmv-18vtqE4lw2DpgNHPj-s
1414
name: 'Rich Text'
@@ -45,7 +45,7 @@ filters:
4545
status: true
4646
weight: -50
4747
settings:
48-
allowed_html: '<em> <strong> <b> <cite> <blockquote cite> <ul type> <ol type start> <li> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <hr> <br> <p id class="va-address-block block-va-gov-text"> <drupal-entity data-* title alt data-entity-type data-entity-uuid data-align data-caption data-langcode> <a href hreflang aria-label data-entity-substitution data-entity-type data-entity-uuid target title class="button button-action button--primary usa-button usa-button-primary usa-button-secondary va-button-primary login-required block-vet-center-facility-button vads-c-action-link--green vads-c-action-link--blue">'
48+
allowed_html: '<br> <p class="va-address-block block-va-gov-text" id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <a class="vads-c-action-link--green vads-c-action-link--blue button button-action button--primary login-required block-vet-center-facility-button usa-button usa-button-primary usa-button-secondary va-button-primary" hreflang aria-label data-entity-substitution data-entity-type data-entity-uuid target title href> <b> <cite> <drupal-entity data-* title alt> <blockquote cite> <ul type> <ol type start> <strong> <li> <hr> <abbr title>'
4949
filter_html_help: true
5050
filter_html_nofollow: false
5151
filter_autop:

config/sync/filter.format.rich_text_limited.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ langcode: en
33
status: true
44
dependencies:
55
module:
6-
1: editor
7-
2: linkit
8-
3: linky
9-
4: media
10-
5: pathologic
11-
6: va_gov_backend
6+
- editor
7+
- linkit
8+
- linky
9+
- media
10+
- pathologic
11+
- va_gov_backend
1212
_core:
1313
default_config_hash: Mc8Hl-Ya14lrbMXaUx7Ybmv-18vtqE4lw2DpgNHPj-s
1414
name: 'Rich Text Limited'
@@ -45,7 +45,7 @@ filters:
4545
status: true
4646
weight: -50
4747
settings:
48-
allowed_html: '<em> <strong> <br> <p> <a href hreflang aria-label data-entity-substitution data-entity-type data-entity-uuid title> <ol> <li> <ul> <blockquote>'
48+
allowed_html: '<br> <p> <a hreflang aria-label data-entity-substitution data-entity-type data-entity-uuid title href> <strong> <blockquote> <ul> <ol> <li> <abbr title>'
4949
filter_html_help: true
5050
filter_html_nofollow: false
5151
filter_autop:

config/sync/pathauto.pattern.banner.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
1010
pattern: 'banner/[node:title]'
1111
selection_criteria:
1212
902a7364-2a9c-4c3e-bf21-d6e68b7c0b17:
13-
id: node_type
13+
id: 'entity_bundle:node'
1414
negate: false
1515
uuid: 902a7364-2a9c-4c3e-bf21-d6e68b7c0b17
1616
context_mapping:

config/sync/pathauto.pattern.campaign_landing_page.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
1010
pattern: 'initiatives/[node:title]'
1111
selection_criteria:
1212
3130bf6c-efba-434c-8292-09f48dea028d:
13-
id: node_type
13+
id: 'entity_bundle:node'
1414
negate: false
1515
uuid: 3130bf6c-efba-434c-8292-09f48dea028d
1616
context_mapping:

config/sync/pathauto.pattern.centralized_content.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
1010
pattern: 'centralized-content/[node:title]'
1111
selection_criteria:
1212
df261074-07a9-46c5-8190-69b17040a3da:
13-
id: node_type
13+
id: 'entity_bundle:node'
1414
negate: false
1515
uuid: df261074-07a9-46c5-8190-69b17040a3da
1616
context_mapping:

0 commit comments

Comments
 (0)