Merge pull request #1706 from acquia/stage

Merge branch `stage` into `main`
acquia · Dec 14, 2023 · 00af5c1 · 00af5c1
2 parents a17bf03 + 084fe17
commit 00af5c1
Show file tree

Hide file tree

Showing 320 changed files with 1,085 additions and 1,036 deletions.
diff --git a/acms-run-tests.sh b/acms-run-tests.sh
@@ -31,7 +31,7 @@ installchromedriver() {
         unzip chromedriver-linux64.zip
         chmod +x chromedriver-linux64/chromedriver
         mv -f chromedriver-linux64/chromedriver ./vendor/bin
-        rm chromedriver-linux64
+        rm -rf chromedriver-linux64
         rm chromedriver-linux64.zip
         ;;
       "darwin"*)
@@ -40,7 +40,7 @@ installchromedriver() {
         unzip chromedriver-mac-x64.zip
         chmod +x chromedriver-mac-x64/chromedriver
         mv -f chromedriver-mac-x64/chromedriver ./vendor/bin
-        rm chromedriver-mac-x64
+        rm -rf chromedriver-mac-x64
         rm chromedriver-mac-x64.zip
         ;;
     esac

diff --git a/composer.json b/composer.json
@@ -129,9 +129,6 @@
             "drupal/core": "-p2"
         },
         "patches": {
-            "acquia/cohesion": {
-                "ACO-2515 - Fix schema type mismatch error for global js settings": "https://gist.githubusercontent.com/rajeshreeputra/5648d31dafbf66d8a1895bb6964ed99a/raw/f5860cbfb7e5886bc7c0652c102cab337cb59e5a/sitestudio-7.3.1-schema-errors-for-cohesion.frontend.globaljs_setting.patch"
-            },
             "drupal/core": {
                 "3328187 - PHP Deprecated: strpos(): Passing null to parameter #1 ($haystack) of type string is deprecated in docroot/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php on line 112": "https://git.drupalcode.org/project/drupal/-/merge_requests/3142.patch",
                 "Fix failing test for site studio due to missing file": "https://gist.githubusercontent.com/chandan-singh7929/978c8c3c8b6f1e2de23492e7e562c0c3/raw/f0e7770d94be862e5495ca25662a0a0d5672b785/bypass-library-version-core.patch"

diff --git a/composer.lock b/composer.lock
diff --git a/...nfig/pack_acquia_cms_article/cohesion_elements.cohesion_component.cpt_articles_slider.yml b/...nfig/pack_acquia_cms_article/cohesion_elements.cohesion_component.cpt_articles_slider.yml
@@ -2490,7 +2490,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 locked: false
 modified: true
 selectable: true

diff --git a/...g/pack_acquia_cms_article/cohesion_sync.cohesion_sync_package.pack_acquia_cms_article.yml b/...g/pack_acquia_cms_article/cohesion_sync.cohesion_sync_package.pack_acquia_cms_article.yml
@@ -10,7 +10,7 @@ _core:
   default_config_hash: uaNr8pjt0eHtXMunemG6g1GvlpJCwf3KJ6fnvSmfE3Y
 id: pack_acquia_cms_article
 label: 'Acquia CMS Article'
-description: ''
+description: 'Acquia CMS Article related templates and styles.'
 excluded_entity_types: '{"cohesion_base_styles":true,"cohesion_color":true,"cohesion_custom_style":true,"cohesion_font_library":true,"cohesion_font_stack":true,"cohesion_helper":true,"cohesion_helper_category":true,"cohesion_icon_library":true,"cohesion_master_templates":true,"cohesion_menu_templates":true,"cohesion_scss_variable":true,"cohesion_style_guide":true,"cohesion_style_guide_manager":true,"cohesion_style_helper":true,"cohesion_website_settings":true,"image_style":true,"view":true,"cohesion_component_category":true}'
 settings: |
   {

diff --git a/...ck_acquia_cms_article/cohesion_templates.cohesion_content_templates.node_article_card.yml b/...ck_acquia_cms_article/cohesion_templates.cohesion_content_templates.node_article_card.yml
@@ -2843,7 +2843,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ck_acquia_cms_article/cohesion_templates.cohesion_content_templates.node_article_full.yml b/...ck_acquia_cms_article/cohesion_templates.cohesion_content_templates.node_article_full.yml
@@ -4318,7 +4318,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: true
 custom: false

diff --git a/...ms_article/cohesion_templates.cohesion_content_templates.node_article_horizontal_card.yml b/...ms_article/cohesion_templates.cohesion_content_templates.node_article_horizontal_card.yml
@@ -3137,7 +3137,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...cms_article/cohesion_templates.cohesion_content_templates.node_article_search_results.yml b/...cms_article/cohesion_templates.cohesion_content_templates.node_article_search_results.yml
@@ -2978,7 +2978,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/..._acquia_cms_article/cohesion_templates.cohesion_content_templates.node_article_teaser.yml b/..._acquia_cms_article/cohesion_templates.cohesion_content_templates.node_article_teaser.yml
@@ -2881,7 +2881,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/..._cms_article/cohesion_templates.cohesion_view_templates.view_tpl_article_cards_slider.yml b/..._cms_article/cohesion_templates.cohesion_view_templates.view_tpl_article_cards_slider.yml
@@ -981,7 +981,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 locked: false
 modified: true
 selectable: true

diff --git a/...pack_acquia_cms_article/sitestudio_file_metadata.9d23085d-2799-4b73-947c-af21184090ef.yml b/...pack_acquia_cms_article/sitestudio_file_metadata.9d23085d-2799-4b73-947c-af21184090ef.yml
@@ -6,4 +6,4 @@ filemime: application/octet-stream
 filesize: '51338'
 status: '1'
 created: '1659012010'
-changed: '1659012010'
+changed: '1701244874'
diff --git a/...cquia_cms_article_search/cohesion_templates.cohesion_view_templates.view_tpl_articles.yml b/...cquia_cms_article_search/cohesion_templates.cohesion_view_templates.view_tpl_articles.yml
@@ -2195,7 +2195,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 locked: false
 modified: true
 selectable: true

diff --git a/..._article_search/cohesion_templates.cohesion_view_templates.view_tpl_articles_fallback.yml b/..._article_search/cohesion_templates.cohesion_view_templates.view_tpl_articles_fallback.yml
@@ -891,7 +891,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 locked: false
 modified: true
 selectable: true

diff --git a/..._cms_article_search/cohesion_templates.cohesion_view_templates.view_tpl_articles_grid.yml b/..._cms_article_search/cohesion_templates.cohesion_view_templates.view_tpl_articles_grid.yml
@@ -2493,7 +2493,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 locked: false
 modified: true
 selectable: true

diff --git a/...cms_audio/config/pack_acquia_cms_audio/cohesion_elements.cohesion_component.cpt_audio.yml b/...cms_audio/config/pack_acquia_cms_audio/cohesion_elements.cohesion_component.cpt_audio.yml
@@ -628,7 +628,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 locked: false
 modified: true
 selectable: true

diff --git a/...onfig/pack_acquia_cms_audio/cohesion_sync.cohesion_sync_package.pack_acquia_cms_audio.yml b/...onfig/pack_acquia_cms_audio/cohesion_sync.cohesion_sync_package.pack_acquia_cms_audio.yml
@@ -4,7 +4,7 @@ status: true
 dependencies: {  }
 id: pack_acquia_cms_audio
 label: 'Acquia CMS Audio'
-description: ''
+description: 'Acquia CMS Audio related templates and styles.'
 excluded_entity_types: '[]'
 settings: |
   {

diff --git a/modules/acquia_cms_common/composer.json b/modules/acquia_cms_common/composer.json
@@ -30,7 +30,7 @@
         "drupal/smart_trim": "^2.0",
         "drupal/social_media_links": "^2.9",
         "drupal/username_enumeration_prevention": "^1.3",
-        "drupal/workbench_email": "^3.0",
+        "drupal/workbench_email": "3.0.2",
         "nnnick/chartjs": "^3.9"
     },
     "conflict": {
@@ -78,6 +78,9 @@
             "drupal/core": {
                 "3301692 - Passing null to parameter to mb_strtolower() is deprecated with PHP 8.1": "https://git.drupalcode.org/project/drupal/-/merge_requests/2598.patch",
                 "3370946 - Page title should contextualize the local navigation": "https://www.drupal.org/files/issues/2023-11-30/3370946-pagetitle-backport-10-2-x.patch"
+            },
+            "drupal/workbench_email": {
+                "3408131 - Route 'entity.workbench_email_template.canonical' does not exist.": "https://git.drupalcode.org/project/workbench_email/-/merge_requests/17.patch"
             }
         }
     },

diff --git a/...am/config/pack_acquia_cms_dam/cohesion_sync.cohesion_sync_package.pack_acquia_cms_dam.yml b/...am/config/pack_acquia_cms_dam/cohesion_sync.cohesion_sync_package.pack_acquia_cms_dam.yml
@@ -8,7 +8,7 @@ dependencies:
       - acquia_cms_site_studio
 id: pack_acquia_cms_dam
 label: 'Acquia CMS DAM'
-description: 'DAM related templates and image styles under this package.'
+description: 'Acquia CMS DAM related templates and styles.'
 excluded_entity_types: '{"cohesion_custom_style":true,"cohesion_base_styles":true,"cohesion_color":true,"cohesion_component":true,"cohesion_component_category":true,"cohesion_font_library":true,"cohesion_font_stack":true,"cohesion_helper":true,"cohesion_helper_category":true,"cohesion_icon_library":true,"cohesion_master_templates":true,"cohesion_menu_templates":true,"cohesion_scss_variable":true,"cohesion_style_guide":true,"cohesion_style_guide_manager":true,"cohesion_style_helper":true,"cohesion_view_templates":true,"cohesion_website_settings":true,"view":true}'
 settings: |
   {

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_emb.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_emb.yml
@@ -212,7 +212,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_ful.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_ful.yml
@@ -220,7 +220,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: true
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_l_0.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_l_0.yml
@@ -213,7 +213,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_l_1.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_l_1.yml
@@ -225,7 +225,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_lar.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_lar.yml
@@ -213,7 +213,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_m_0.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_m_0.yml
@@ -206,7 +206,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_m_1.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_m_1.yml
@@ -206,7 +206,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_s_0.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_s_0.yml
@@ -189,7 +189,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_sma.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_sma.yml
@@ -189,7 +189,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_tea.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_tea.yml
@@ -201,7 +201,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_x_s.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_image_asset_x_s.yml
@@ -189,7 +189,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_video_asset_emb.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_video_asset_emb.yml
@@ -110,7 +110,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_video_asset_ful.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_video_asset_ful.yml
@@ -109,7 +109,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: true
 custom: false

diff --git a/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_video_asset_vid.yml b/...ms_dam/cohesion_templates.cohesion_content_templates.media_acquia_dam_video_asset_vid.yml
@@ -258,7 +258,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...t/config/pack_acquia_cms_event/cohesion_elements.cohesion_component.cpt_events_slider.yml b/...t/config/pack_acquia_cms_event/cohesion_elements.cohesion_component.cpt_events_slider.yml
@@ -2581,7 +2581,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 locked: false
 modified: true
 selectable: true

diff --git a/...onfig/pack_acquia_cms_event/cohesion_sync.cohesion_sync_package.pack_acquia_cms_event.yml b/...onfig/pack_acquia_cms_event/cohesion_sync.cohesion_sync_package.pack_acquia_cms_event.yml
@@ -10,7 +10,7 @@ _core:
   default_config_hash: glv3RXA4hMwxR-LAmZ58xGkp2rBt8l6qdxLTcPqOTWg
 id: pack_acquia_cms_event
 label: 'Acquia CMS Event'
-description: ''
+description: 'Acquia CMS Event related templates and styles.'
 excluded_entity_types: '{"cohesion_base_styles":true,"cohesion_color":true,"cohesion_component_category":true,"cohesion_custom_style":true,"cohesion_font_library":true,"cohesion_font_stack":true,"cohesion_helper":true,"cohesion_helper_category":true,"cohesion_icon_library":true,"cohesion_master_templates":true,"cohesion_menu_templates":true,"cohesion_scss_variable":true,"cohesion_style_guide":true,"cohesion_style_guide_manager":true,"cohesion_style_helper":true,"cohesion_website_settings":true,"image_style":true,"view":true}'
 settings: |
   {

diff --git a/...g/pack_acquia_cms_event/cohesion_templates.cohesion_content_templates.node_event_card.yml b/...g/pack_acquia_cms_event/cohesion_templates.cohesion_content_templates.node_event_card.yml
@@ -2979,7 +2979,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...g/pack_acquia_cms_event/cohesion_templates.cohesion_content_templates.node_event_full.yml b/...g/pack_acquia_cms_event/cohesion_templates.cohesion_content_templates.node_event_full.yml
@@ -6599,7 +6599,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: true
 custom: false

diff --git a/...ia_cms_event/cohesion_templates.cohesion_content_templates.node_event_horizontal_card.yml b/...ia_cms_event/cohesion_templates.cohesion_content_templates.node_event_horizontal_card.yml
@@ -3072,7 +3072,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...uia_cms_event/cohesion_templates.cohesion_content_templates.node_event_search_results.yml b/...uia_cms_event/cohesion_templates.cohesion_content_templates.node_event_search_results.yml
@@ -3075,7 +3075,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...pack_acquia_cms_event/cohesion_templates.cohesion_content_templates.node_event_teaser.yml b/...pack_acquia_cms_event/cohesion_templates.cohesion_content_templates.node_event_teaser.yml
@@ -3023,7 +3023,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 modified: true
 selectable: false
 custom: false

diff --git a/...quia_cms_event/cohesion_templates.cohesion_view_templates.view_tpl_event_cards_slider.yml b/...quia_cms_event/cohesion_templates.cohesion_view_templates.view_tpl_event_cards_slider.yml
@@ -981,7 +981,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 locked: false
 modified: true
 selectable: true

diff --git a/...g/pack_acquia_cms_event/sitestudio_file_metadata.9d23085d-2799-4b73-947c-af21184090ef.yml b/...g/pack_acquia_cms_event/sitestudio_file_metadata.9d23085d-2799-4b73-947c-af21184090ef.yml
@@ -6,4 +6,4 @@ filemime: application/octet-stream
 filesize: '51338'
 status: '1'
 created: '1659012010'
-changed: '1659012010'
+changed: '1701244874'
diff --git a/...ck_acquia_cms_event_search/cohesion_templates.cohesion_view_templates.view_tpl_events.yml b/...ck_acquia_cms_event_search/cohesion_templates.cohesion_view_templates.view_tpl_events.yml
@@ -2274,7 +2274,7 @@ json_values: |
       }
   }
 json_mapper: '{}'
-last_entity_update: entityupdate_0036
+last_entity_update: entityupdate_0042
 locked: false
 modified: true
 selectable: true