Merge pull request #22 from ubc-web-services/develop

Develop
ubc-web-services · Jun 20, 2023 · ab1cceb · ab1cceb
2 parents 768bee6 + bc4394f
commit ab1cceb
Show file tree

Hide file tree

Showing 38 changed files with 35 additions and 75 deletions.
diff --git a/ubc_awards/ubc_awards.info.yml b/ubc_awards/ubc_awards.info.yml
@@ -7,5 +7,4 @@ dependencies:
   - drupal:pathauto
   - drupal:simple_sitemap
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_partner_organization/ubc_partner_organization.info.yml b/ubc_partner_organization/ubc_partner_organization.info.yml
@@ -7,5 +7,4 @@ dependencies:
   - drupal:pathauto
   - drupal:simple_sitemap
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_project/ubc_project.info.yml b/ubc_project/ubc_project.info.yml
@@ -7,5 +7,4 @@ dependencies:
   - drupal:pathauto
   - drupal:simple_sitemap
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_publication/ubc_publication.info.yml b/ubc_publication/ubc_publication.info.yml
@@ -8,5 +8,4 @@ dependencies:
   - drupal:simple_sitemap
   - ubc_research_project:ubc_research_project
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_research_project/ubc_research_project.info.yml b/ubc_research_project/ubc_research_project.info.yml
@@ -7,5 +7,4 @@ dependencies:
   - drupal:pathauto
   - drupal:simple_sitemap
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_vpr_announcement_extend/ubc_vpr_announcement_extend.info.yml b/ubc_vpr_announcement_extend/ubc_vpr_announcement_extend.info.yml
@@ -5,5 +5,4 @@ package: UBC Web Services
 dependencies:
   - ubc_announcement:ubc_announcement
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_vpr_event_extend/ubc_vpr_event_extend.info.yml b/ubc_vpr_event_extend/ubc_vpr_event_extend.info.yml
@@ -5,5 +5,4 @@ package: UBC Web Services
 dependencies:
   - ubc_event:ubc_event
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_vpr_homepage_extend/ubc_vpr_homepage_extend.info.yml b/ubc_vpr_homepage_extend/ubc_vpr_homepage_extend.info.yml
@@ -5,5 +5,4 @@ package: UBC Web Services
 dependencies:
   - ubc_homepage:ubc_homepage
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_vpr_landing_page_extend/ubc_vpr_landing_page_extend.info.yml b/ubc_vpr_landing_page_extend/ubc_vpr_landing_page_extend.info.yml
@@ -5,5 +5,4 @@ package: UBC Web Services
 dependencies:
   - ubc_landing_page:ubc_landing_page
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_vpr_page_extend/ubc_vpr_page_extend.info.yml b/ubc_vpr_page_extend/ubc_vpr_page_extend.info.yml
@@ -5,5 +5,4 @@ package: UBC Web Services
 dependencies:
   - ubc_page:ubc_page
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_vpr_page_extend/ubc_vpr_page_extend.install b/ubc_vpr_page_extend/ubc_vpr_page_extend.install
@@ -116,6 +116,7 @@ function ubc_vpr_page_extend_update_9002() {
   $config = \Drupal::service('config.factory');
   // update default form mode
   $config->getEditable('core.entity_form_display.node.ubc_page.default')
+    ->clear('hidden', 'field_page_custom_content_region')
     ->set('dependencies.config', [
       'field.field.node.ubc_page.body',
       'field.field.node.ubc_page.field_page_custom_content_region',

diff --git a/...r_profile_extend/config/install/field.field.node.ubc_profile.field_profile_affiliated.yml b/...r_profile_extend/config/install/field.field.node.ubc_profile.field_profile_affiliated.yml
@@ -5,8 +5,6 @@ dependencies:
     - field.storage.node.field_profile_affiliated
     - node.type.ubc_profile
     - taxonomy.vocabulary.profile_affiliated_institution
-_core:
-  default_config_hash: FLvOGeiB4JoOspUgOZjHTIteOX_w4aX178M0Mjslzkg
 id: node.ubc_profile.field_profile_affiliated
 field_name: field_profile_affiliated
 entity_type: node

diff --git a/...vpr_profile_extend/config/install/field.field.node.ubc_profile.field_profile_category.yml b/...vpr_profile_extend/config/install/field.field.node.ubc_profile.field_profile_category.yml
@@ -5,8 +5,6 @@ dependencies:
     - field.storage.node.field_profile_category
     - node.type.ubc_profile
     - taxonomy.vocabulary.profile_category
-_core:
-  default_config_hash: Qd04iWSQjrdfujKqtl3jCxbK9Ym6besK7DRU39T0sg8
 id: node.ubc_profile.field_profile_category
 field_name: field_profile_category
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.field.node.ubc_profile.field_profile_faculty.yml b/ubc_vpr_profile_extend/config/install/field.field.node.ubc_profile.field_profile_faculty.yml
@@ -5,8 +5,6 @@ dependencies:
     - field.storage.node.field_profile_faculty
     - node.type.ubc_profile
     - taxonomy.vocabulary.profile_faculty
-_core:
-  default_config_hash: XWM5IGxbPolLCoQYy27neE_qFDp5UydK2PW5NUUld3g
 id: node.ubc_profile.field_profile_faculty
 field_name: field_profile_faculty
 entity_type: node

diff --git a/...ofile_extend/config/install/field.field.node.ubc_profile.field_profile_google_scholar.yml b/...ofile_extend/config/install/field.field.node.ubc_profile.field_profile_google_scholar.yml
@@ -6,8 +6,6 @@ dependencies:
     - node.type.ubc_profile
   module:
     - link
-_core:
-  default_config_hash: LrWdo4BTxL5PQyjB6eRsE1iUmYO8yY7oETWQqimOibc
 id: node.ubc_profile.field_profile_google_scholar
 field_name: field_profile_google_scholar
 entity_type: node

diff --git a/..._profile_extend/config/install/field.field.node.ubc_profile.field_profile_name_prefix.yml b/..._profile_extend/config/install/field.field.node.ubc_profile.field_profile_name_prefix.yml
@@ -4,8 +4,6 @@ dependencies:
   config:
     - field.storage.node.field_profile_name_prefix
     - node.type.ubc_profile
-_core:
-  default_config_hash: 1GBta4qfdkD2RV6HUQVawUG0uMStVXlQkfUpYoVDCWI
 id: node.ubc_profile.field_profile_name_prefix
 field_name: field_profile_name_prefix
 entity_type: node

diff --git a/..._profile_extend/config/install/field.field.node.ubc_profile.field_profile_name_suffix.yml b/..._profile_extend/config/install/field.field.node.ubc_profile.field_profile_name_suffix.yml
@@ -4,8 +4,6 @@ dependencies:
   config:
     - field.storage.node.field_profile_name_suffix
     - node.type.ubc_profile
-_core:
-  default_config_hash: PTWEsgK46O_CkfHvTbre3X10eFNfwS5Z3UaOA6DeYDw
 id: node.ubc_profile.field_profile_name_suffix
 field_name: field_profile_name_suffix
 entity_type: node

diff --git a/...le_extend/config/install/field.field.node.ubc_profile.field_profile_preferred_website.yml b/...le_extend/config/install/field.field.node.ubc_profile.field_profile_preferred_website.yml
@@ -6,8 +6,6 @@ dependencies:
     - node.type.ubc_profile
   module:
     - link
-_core:
-  default_config_hash: W_jwR6LIcCtE6O3H2bgd_Vhm6OUsBrRCJojxP_QOio4
 id: node.ubc_profile.field_profile_preferred_website
 field_name: field_profile_preferred_website
 entity_type: node

diff --git a/...rofile_extend/config/install/field.field.node.ubc_profile.field_profile_research_area.yml b/...rofile_extend/config/install/field.field.node.ubc_profile.field_profile_research_area.yml
@@ -5,8 +5,6 @@ dependencies:
     - field.storage.node.field_profile_research_area
     - node.type.ubc_profile
     - taxonomy.vocabulary.research_theme
-_core:
-  default_config_hash: i3ANbceLkyqN3i6s1Hh2NhUUTCNbjrmug7qd2BfR_xQ
 id: node.ubc_profile.field_profile_research_area
 field_name: field_profile_research_area
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.field.node.ubc_profile.field_profile_role.yml b/ubc_vpr_profile_extend/config/install/field.field.node.ubc_profile.field_profile_role.yml
@@ -5,8 +5,6 @@ dependencies:
     - field.storage.node.field_profile_role
     - node.type.ubc_profile
     - taxonomy.vocabulary.profile_role
-_core:
-  default_config_hash: IeS8yVTKhrKSIYXo_JIndxXRDDlay91spiJsdBeIEmg
 id: node.ubc_profile.field_profile_role
 field_name: field_profile_role
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_affiliated.yml b/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_affiliated.yml
@@ -4,8 +4,6 @@ dependencies:
   module:
     - node
     - taxonomy
-_core:
-  default_config_hash: tZ9_iKX1n4QN_4QNR3l7vmk0xhONaLwK8RIZ7BUH-4Q
 id: node.field_profile_affiliated
 field_name: field_profile_affiliated
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_category.yml b/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_category.yml
@@ -4,8 +4,6 @@ dependencies:
   module:
     - node
     - taxonomy
-_core:
-  default_config_hash: Tb3udQHsOC1CWDfChDBGcEnor9ICz1FMjk-ekVBR8YQ
 id: node.field_profile_category
 field_name: field_profile_category
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_faculty.yml b/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_faculty.yml
@@ -4,8 +4,6 @@ dependencies:
   module:
     - node
     - taxonomy
-_core:
-  default_config_hash: QfPFCm4s1Dq6x8tx4MMGbwRrqHcti9OiDchw7nURRc4
 id: node.field_profile_faculty
 field_name: field_profile_faculty
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_google_scholar.yml b/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_google_scholar.yml
@@ -4,8 +4,6 @@ dependencies:
   module:
     - link
     - node
-_core:
-  default_config_hash: elPd2yVY3UcG__Glt9G5KJM2J089CdWnVAshrHUBeQI
 id: node.field_profile_google_scholar
 field_name: field_profile_google_scholar
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_name_prefix.yml b/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_name_prefix.yml
@@ -3,8 +3,6 @@ status: true
 dependencies:
   module:
     - node
-_core:
-  default_config_hash: 5rFKkjs_1OOKQ1QPyun-C6i3W1UBw9hVENrG72Cfd-g
 id: node.field_profile_name_prefix
 field_name: field_profile_name_prefix
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_name_suffix.yml b/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_name_suffix.yml
@@ -3,8 +3,6 @@ status: true
 dependencies:
   module:
     - node
-_core:
-  default_config_hash: mEHl93DAvNaBfxhoFpg-flp1LsLGY4fa6T2si5qmBy0
 id: node.field_profile_name_suffix
 field_name: field_profile_name_suffix
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_preferred_website.yml b/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_preferred_website.yml
@@ -4,8 +4,6 @@ dependencies:
   module:
     - link
     - node
-_core:
-  default_config_hash: 8BaIR2nQJyF31qSWofaDDDjiQ4e2NmpaXZucPkl296w
 id: node.field_profile_preferred_website
 field_name: field_profile_preferred_website
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_research_area.yml b/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_research_area.yml
@@ -4,8 +4,6 @@ dependencies:
   module:
     - node
     - taxonomy
-_core:
-  default_config_hash: 7juTf4G46lXiwTBaAFHz3rhln2uoyMp2LcBbRU8bXcg
 id: node.field_profile_research_area
 field_name: field_profile_research_area
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_role.yml b/ubc_vpr_profile_extend/config/install/field.storage.node.field_profile_role.yml
@@ -4,8 +4,6 @@ dependencies:
   module:
     - node
     - taxonomy
-_core:
-  default_config_hash: iOmRHoSUYdpdgjny8sf1B5kGCHrVi3vXa13TEgOqVKQ
 id: node.field_profile_role
 field_name: field_profile_role
 entity_type: node

diff --git a/ubc_vpr_profile_extend/config/install/taxonomy.vocabulary.profile_affiliated_institution.yml b/ubc_vpr_profile_extend/config/install/taxonomy.vocabulary.profile_affiliated_institution.yml
@@ -1,8 +1,6 @@
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: 91Q1vwKVyIK5KSxc0n-MqWA0Hv4-7nd9MplB4vkXt1A
 name: 'Affiliated Institution'
 vid: profile_affiliated_institution
 description: 'Relate a profile to an institution'

diff --git a/ubc_vpr_profile_extend/config/install/taxonomy.vocabulary.profile_category.yml b/ubc_vpr_profile_extend/config/install/taxonomy.vocabulary.profile_category.yml
@@ -1,8 +1,6 @@
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: bDj18PLaUJJVUPJ-4GcPk00oo_dsrt4p7vpdWxRmbAo
 name: 'Profile Category'
 vid: profile_category
 description: 'Identifies the profile by category'

diff --git a/ubc_vpr_profile_extend/config/install/taxonomy.vocabulary.profile_faculty.yml b/ubc_vpr_profile_extend/config/install/taxonomy.vocabulary.profile_faculty.yml
@@ -1,8 +1,6 @@
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: C-fjo-sqiWikBS2oWIloAZo4TKKNOVZIHIQ590LEsa4
 name: 'Profile Faculty'
 vid: profile_faculty
 description: 'Associates the profile with a faculty'

diff --git a/ubc_vpr_profile_extend/config/install/taxonomy.vocabulary.profile_role.yml b/ubc_vpr_profile_extend/config/install/taxonomy.vocabulary.profile_role.yml
@@ -1,8 +1,6 @@
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: Pt2F9tc7x8gJJF_aBS043Eiq6hLuvHG7KiRQ5Cww76g
 name: 'Profile Role'
 vid: profile_role
 description: 'Identifies the profile by role'

diff --git a/ubc_vpr_profile_extend/ubc_vpr_profile_extend.info.yml b/ubc_vpr_profile_extend/ubc_vpr_profile_extend.info.yml
@@ -5,5 +5,4 @@ package: UBC Web Services
 dependencies:
   - ubc_profile:ubc_profile
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_vpr_roles/ubc_vpr_roles.info.yml b/ubc_vpr_roles/ubc_vpr_roles.info.yml
@@ -11,5 +11,4 @@ dependencies:
   - ubc_vpr_profile_extend:ubc_vpr_profile_extend
   - ubc_vpr_webform_extend:ubc_vpr_webform_extend
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_vpr_shared_config/ubc_vpr_shared_config.info.yml b/ubc_vpr_shared_config/ubc_vpr_shared_config.info.yml
@@ -5,5 +5,4 @@ package: UBC Web Services
 dependencies:
   - ubc_general_shared_config:ubc_general_shared_config
   - ubc_paragraph_entities:ubc_paragraph_entities
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/ubc_vpr_shared_config/ubc_vpr_shared_config.install b/ubc_vpr_shared_config/ubc_vpr_shared_config.install
@@ -56,9 +56,6 @@ function ubc_vpr_shared_config_install() {
     ->set('display.default.display_options.header.area_text_custom.content', '<h3 class="uppercase h4 text-ubc-blue-sea">Announcements</h3>')
     ->set('display.block_2.display_options.header.area_text_custom.content', '<h3 class="uppercase h4 text-ubc-blue-sea">Announcements</h3>')
     ->save();
-  $config->getEditable('filter.format.filtered_text')
-    ->set('filters.editor_button_link_filter.settings.button_link_style_options', '|Default Style\r\nunit-button--light|Light Button\r\nunit-button--dark|Dark Button\r\nunit-button--simple|Simple Button\r\nunit-button--outline|Outline Button\r\nunit-button--transparent|Transparent Button')
-    ->save();
   $config->getEditable('filter.format.filtered_text')
     ->set('filters.editor_button_link_filter.settings', [
       'button_link_options' => '|No Style
@@ -399,4 +396,24 @@ function ubc_vpr_shared_config_update_9008() {
       ],
     ])
     ->save();
+}
+
+function ubc_vpr_shared_config_update_9009() {
+  $config = \Drupal::service('config.factory');
+  // reset the already present image styles
+  $config->getEditable('image.style.hero_focal_point_2600')
+    ->set('effects.d1f781ee-20b1-4f2e-ad88-c3ef3a609877.data.height', '813')
+    ->save();
+  $config->getEditable('image.style.hero_focal_point_1300')
+    ->set('effects.3bd36d37-80c9-47bb-a4fe-863e3a1811bd.data.height', '406')
+    ->save();
+  $config->getEditable('image.style.hero_focal_point_970')
+    ->set('effects.e66684e1-b274-464f-a1d9-a9aea42d1f2d.data.height', '303')
+    ->save();
+  $config->getEditable('image.style.hero_focal_point_650')
+    ->set('effects.43c9f282-4fd9-4324-b7fd-8a4f48a42f14.data.height', '203')
+    ->save();
+  $config->getEditable('image.style.hero_focal_point_325')
+    ->set('effects.205c78b7-fd87-4be5-a494-908dd2205e7f.data.height', '102')
+    ->save();
 }
diff --git a/ubc_vpr_webform_extend/ubc_vpr_webform_extend.info.yml b/ubc_vpr_webform_extend/ubc_vpr_webform_extend.info.yml
@@ -5,5 +5,4 @@ package: UBC Web Services
 dependencies:
   - drupal:webform_node
   - ubc_vpr_shared_config:ubc_vpr_shared_config
-core: '8.x'
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10