Skip to content

Commit

Permalink
D10 upgrade PR (#14876)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
3 people authored Nov 29, 2023
1 parent 639d214 commit aa4451e
Show file tree
Hide file tree
Showing 127 changed files with 5,589 additions and 5,025 deletions.
5 changes: 4 additions & 1 deletion .tugboat/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,15 @@ services:

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

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

# Enable php intl extension
- docker-php-ext-install intl

# Install opcache, and Apache modules
- docker-php-ext-install opcache
- a2enmod headers rewrite vhost_alias proxy proxy_http
Expand Down
104 changes: 54 additions & 50 deletions composer.json

Large diffs are not rendered by default.

6,432 changes: 2,651 additions & 3,781 deletions composer.lock

Large diffs are not rendered by default.

35 changes: 0 additions & 35 deletions config/dev/simplesamlphp_auth.settings.yml

This file was deleted.

2 changes: 1 addition & 1 deletion config/sync/admin_feedback.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ no_button: 'No'
no_response: 'Thanks for your feedback.'
feedback_prompt_on_yes: false
feedback_prompt_on_no: false
feedback_prompt: 'If you''d like, give us more feedback.'
feedback_prompt: "If you'd like, give us more feedback."
submit_text: 'Send feedback'
final_response: 'Thank you!'
custom_text_response_on_no:
Expand Down
2 changes: 1 addition & 1 deletion config/sync/config_split.config_split.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ weight: 0
folder: ../config/prod
module:
fast404: 0
raven: 0
simplesamlphp_auth: 0
raven: 0
syslog: 0
theme: { }
blacklist: { }
Expand Down
1 change: 1 addition & 0 deletions config/sync/config_split.config_split.stg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module:
fast404: 0
raven: 0
syslog: 0
simplesamlphp_auth: 0
theme: { }
blacklist: { }
graylist:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ langcode: en
status: true
dependencies:
config:
- core.base_field_override.node.documentation_page.changed
- field.field.node.documentation_page.field_administration
- field.field.node.documentation_page.field_content_block
- field.field.node.documentation_page.field_intro_text
Expand Down Expand Up @@ -112,6 +113,15 @@ third_party_settings:
date_format: custom
custom_date_format: '\L\a\s\t \u\p\d\a\t\e\d \o\n F j, Y \a\t g:i a'
timezone: ''
tooltip:
date_format: ''
custom_date_format: ''
time_diff:
enabled: false
future_format: '@interval hence'
past_format: '@interval ago'
granularity: 2
refresh: 60
third_party_settings: { }
weight: 2
additional: { }
Expand All @@ -137,16 +147,6 @@ content:
third_party_settings: { }
weight: 0
region: content
field_last_saved_by_an_editor:
type: timestamp
label: above
settings:
date_format: custom
custom_date_format: 'F j Y g:ia'
timezone: ''
third_party_settings: { }
weight: 4
region: content
field_products:
type: entity_reference_label
label: above
Expand Down
4 changes: 4 additions & 0 deletions config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ module:
cer: 0
change_labels: 0
ckeditor: 0
ckeditor5: 0
ckeditor_abbreviation: 0
components: 0
computed_breadcrumbs: 0
config: 0
Expand Down Expand Up @@ -185,6 +187,7 @@ module:
path_redirect_import: 0
pathologic: 0
pfm: 0
phpass: 0
post_api: 0
preprocess_event_dispatcher: 0
prometheus_exporter: 0
Expand Down Expand Up @@ -278,6 +281,7 @@ module:
va_gov_vamc: 0
va_gov_vba_facility: 0
va_gov_vet_center: 0
va_gov_views: 0
va_gov_workflow: 0
va_gov_workflow_assignments: 0
video_embed_field: 0
Expand Down
88 changes: 53 additions & 35 deletions config/sync/editor.editor.rich_text.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,70 @@
uuid: f95e6861-ad94-47ee-847c-2bfdf3f3d4e7
uuid: 16118084-684f-4186-8c8c-88c0a5fcd4f2
langcode: en
status: true
dependencies:
config:
- filter.format.rich_text
module:
- ckeditor
_core:
default_config_hash: 0bVELtfx9sXhjZ6s6W-dJo8SW-IR9jiEIEylzm-2Cro
- ckeditor5
format: rich_text
editor: ckeditor
editor: ckeditor5
settings:
toolbar:
rows:
-
-
name: Formatting
items:
- Bold
- Italic
- '-'
-
name: Linking
items:
- DrupalLink
- DrupalUnlink
items:
- bold
- '|'
- link
- '|'
- bulletedList
- numberedList
- '|'
- horizontalLine
- sourceEditing
- '|'
- blockQuote
- heading
- style
- abbreviation
plugins:
ckeditor5_heading:
enabled_headings:
- heading2
- heading3
- heading4
- heading5
- heading6
ckeditor5_list:
reversed: false
startIndex: true
ckeditor5_sourceEditing:
allowed_tags:
- '<b>'
- '<cite>'
- '<drupal-entity data-* title alt>'
- '<blockquote cite>'
- '<ul type>'
- '<ol type>'
- '<h2 id>'
- '<h3 id>'
- '<h4 id>'
- '<h5 id>'
- '<h6 id>'
- '<p id class="block-va-gov-text">'
- '<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>'
ckeditor5_style:
styles:
-
name: Lists
items:
- BulletedList
- NumberedList
label: 'Address Block'
element: '<p class="va-address-block">'
-
name: Media
items:
- HorizontalRule
- Source
label: 'Primary action link'
element: '<a class="vads-c-action-link--green">'
-
name: 'Block Formatting'
items:
- Blockquote
- Format
- Styles
plugins:
drupallink:
label: 'Secondary action link'
element: '<a class="vads-c-action-link--blue">'
linkit_extension:
linkit_enabled: true
linkit_profile: default
stylescombo:
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"
image_upload:
status: true
scheme: public
Expand Down
48 changes: 22 additions & 26 deletions config/sync/editor.editor.rich_text_limited.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,35 @@
uuid: 82d49673-a0b5-4c5a-ada7-1762fc50cba3
uuid: 253ac8d2-0d48-46ea-a8fc-21a12221ab19
langcode: en
status: true
dependencies:
config:
- filter.format.rich_text_limited
module:
- ckeditor
- ckeditor5
format: rich_text_limited
editor: ckeditor
editor: ckeditor5
settings:
toolbar:
rows:
-
-
name: Formatting
items:
- Bold
- Italic
-
name: Links
items:
- DrupalLink
- DrupalUnlink
-
name: Lists
items:
- NumberedList
- BulletedList
-
name: Other
items:
- Source
- Blockquote
items:
- bold
- '|'
- link
- '|'
- numberedList
- bulletedList
- '|'
- sourceEditing
- blockQuote
- abbreviation
plugins:
drupallink:
ckeditor5_list:
reversed: false
startIndex: false
ckeditor5_sourceEditing:
allowed_tags:
- '<a hreflang aria-label data-entity-substitution data-entity-type data-entity-uuid title>'
- '<abbr title>'
linkit_extension:
linkit_enabled: true
linkit_profile: default
image_upload:
Expand Down
14 changes: 7 additions & 7 deletions config/sync/filter.format.rich_text.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ langcode: en
status: true
dependencies:
module:
1: editor
2: linkit
3: linky
4: media
5: pathologic
6: va_gov_backend
- editor
- linkit
- linky
- media
- pathologic
- va_gov_backend
_core:
default_config_hash: Mc8Hl-Ya14lrbMXaUx7Ybmv-18vtqE4lw2DpgNHPj-s
name: 'Rich Text'
Expand Down Expand Up @@ -45,7 +45,7 @@ filters:
status: true
weight: -50
settings:
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">'
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>'
filter_html_help: true
filter_html_nofollow: false
filter_autop:
Expand Down
14 changes: 7 additions & 7 deletions config/sync/filter.format.rich_text_limited.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ langcode: en
status: true
dependencies:
module:
1: editor
2: linkit
3: linky
4: media
5: pathologic
6: va_gov_backend
- editor
- linkit
- linky
- media
- pathologic
- va_gov_backend
_core:
default_config_hash: Mc8Hl-Ya14lrbMXaUx7Ybmv-18vtqE4lw2DpgNHPj-s
name: 'Rich Text Limited'
Expand Down Expand Up @@ -45,7 +45,7 @@ filters:
status: true
weight: -50
settings:
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>'
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>'
filter_html_help: true
filter_html_nofollow: false
filter_autop:
Expand Down
2 changes: 1 addition & 1 deletion config/sync/pathauto.pattern.banner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type: 'canonical_entities:node'
pattern: 'banner/[node:title]'
selection_criteria:
902a7364-2a9c-4c3e-bf21-d6e68b7c0b17:
id: node_type
id: 'entity_bundle:node'
negate: false
uuid: 902a7364-2a9c-4c3e-bf21-d6e68b7c0b17
context_mapping:
Expand Down
2 changes: 1 addition & 1 deletion config/sync/pathauto.pattern.campaign_landing_page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type: 'canonical_entities:node'
pattern: 'initiatives/[node:title]'
selection_criteria:
3130bf6c-efba-434c-8292-09f48dea028d:
id: node_type
id: 'entity_bundle:node'
negate: false
uuid: 3130bf6c-efba-434c-8292-09f48dea028d
context_mapping:
Expand Down
2 changes: 1 addition & 1 deletion config/sync/pathauto.pattern.centralized_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type: 'canonical_entities:node'
pattern: 'centralized-content/[node:title]'
selection_criteria:
df261074-07a9-46c5-8190-69b17040a3da:
id: node_type
id: 'entity_bundle:node'
negate: false
uuid: df261074-07a9-46c5-8190-69b17040a3da
context_mapping:
Expand Down
Loading

0 comments on commit aa4451e

Please sign in to comment.