fix conflict

department-of-veterans-affairs · Nov 2, 2023 · a281059 · a281059
2 parents ac52c8b + 28bb09d
commit a281059
Show file tree

Hide file tree

Showing 21 changed files with 285 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -383,7 +383,7 @@
                 "3047110 - Add workflow to taxonomy" : "https://www.drupal.org/files/issues/2023-04-14/3047110-45.patch",
                 "3106205 - Length of menu_tree.url and menu_tree.route_param_key are too short (255 characters)": "https://www.drupal.org/files/issues/2023-05-24/3106205-length-menu-tree-too-short.patch",
                 "3274419 - Make BaseFieldOverride inherit internal property from the base field": "https://www.drupal.org/files/issues/2023-03-13/3274419-45.patch",
-                "3333401 - Pager h4 cause accessibility flag on many pages": "https://www.drupal.org/files/issues/2023-07-27/3333401-56-configurable-heading-pager.patch",
+                "3333401 - Pager h4 cause accessibility flag on many pages": "https://www.drupal.org/files/issues/2023-11-01/3333401-64.patch",
                 "3382759 - Add multiple workflow content moderation filter to Views.": "https://www.drupal.org/files/issues/2023-08-24/3382759-8.patch"
             },
             "drupal/danse": {

diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9e5e2f2bfc18ba6d13b3947245066b49",
+    "content-hash": "6e4c15c31d64e3479e8c7bef49129d53",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -190,7 +190,7 @@
             "version": "v4.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fengyuanchen/cropper.git",
+                "url": "git@github.com:fengyuanchen/cropper.git",
                 "reference": "617d9bdb8688cc4edb3b03bc49a04b83c7facbe7"
             },
             "dist": {

diff --git a/config/sync/system.action.user_add_role_action.content_creator_vba.yml b/config/sync/system.action.user_add_role_action.content_creator_vba.yml
@@ -0,0 +1,14 @@
+uuid: 598ff07d-2137-4b9e-b42b-bcb12ee8ce73
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.content_creator_vba
+  module:
+    - user
+id: user_add_role_action.content_creator_vba
+label: 'Add the Content creator - VBA role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: content_creator_vba
diff --git a/config/sync/system.action.user_remove_role_action.content_creator_vba.yml b/config/sync/system.action.user_remove_role_action.content_creator_vba.yml
@@ -0,0 +1,14 @@
+uuid: 848547ae-a62b-46e4-a6c8-36389c9cc754
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.content_creator_vba
+  module:
+    - user
+id: user_remove_role_action.content_creator_vba
+label: 'Remove the Content creator - VBA role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: content_creator_vba
diff --git a/config/sync/user.role.administrator.yml b/config/sync/user.role.administrator.yml
@@ -11,6 +11,6 @@ _core:
   default_config_hash: 2EL4nOaSWrCYL11npXSGwLjX_DJoj2riIUqGaNyZFWU
 id: administrator
 label: Administrator
-weight: 4
+weight: 5
 is_admin: true
 permissions: {  }
diff --git a/config/sync/user.role.admnistrator_users.yml b/config/sync/user.role.admnistrator_users.yml
@@ -22,14 +22,15 @@ third_party_settings:
     vgb_description: 'Can create and manage users, roles, and access to sections of content.'
 id: admnistrator_users
 label: 'CMS account admin'
-weight: 3
+weight: 4
 is_admin: null
 permissions:
   - 'administer users'
   - 'assign content_admin role'
   - 'assign content_api_consumer role'
   - 'assign content_creator_benefits_hubs role'
   - 'assign content_creator_resources_and_support role'
+  - 'assign content_creator_vba role'
   - 'assign content_creator_vet_center role'
   - 'assign content_editor role'
   - 'assign content_publisher role'

diff --git a/config/sync/user.role.content_admin.yml b/config/sync/user.role.content_admin.yml
@@ -13,6 +13,7 @@ dependencies:
     - node.type.vamc_system_medical_records_offi
     - node.type.vamc_system_register_for_care
     - workflows.workflow.editorial
+    - workflows.workflow.restricted_archive
   module:
     - actions_permissions
     - block_content_permissions
@@ -48,7 +49,7 @@ third_party_settings:
     vgb_description: 'For members of the Global UX team, and other content users who have permissions beyond those of Content Publisher. '
 id: content_admin
 label: 'Content admin'
-weight: 1
+weight: 2
 is_admin: null
 permissions:
   - 'accept translation jobs'
@@ -144,6 +145,13 @@ permissions:
   - 'use editorial transition create_new_draft'
   - 'use editorial transition publish'
   - 'use editorial transition review'
+  - 'use restricted_archive transition approve'
+  - 'use restricted_archive transition archive'
+  - 'use restricted_archive transition archived_draft'
+  - 'use restricted_archive transition archived_published'
+  - 'use restricted_archive transition create_new_draft'
+  - 'use restricted_archive transition publish'
+  - 'use restricted_archive transition review'
   - 'use text format rich_text'
   - 'use text format rich_text_limited'
   - 'use workbench access'

diff --git a/config/sync/user.role.content_creator_vba.yml b/config/sync/user.role.content_creator_vba.yml
@@ -0,0 +1,19 @@
+uuid: 26f626ef-6627-482e-b730-ff8545f36081
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.vba_facility_service
+  module:
+    - node
+    - va_gov_backend
+third_party_settings:
+  va_gov_backend:
+    vgb_description: 'Can create VBA facility services'
+id: content_creator_vba
+label: 'Content creator - VBA'
+weight: -3
+is_admin: null
+permissions:
+  - 'create vba_facility_service content'
+  - 'view node link report'
diff --git a/config/sync/user.role.content_creator_vet_center.yml b/config/sync/user.role.content_creator_vet_center.yml
@@ -14,7 +14,7 @@ third_party_settings:
     vgb_description: 'Can create Vet Center Health Services and CAPs.'
 id: content_creator_vet_center
 label: 'Content creator - Vet Center'
-weight: -3
+weight: -2
 is_admin: null
 permissions:
   - 'create vet_center_cap content'

diff --git a/config/sync/user.role.content_editor.yml b/config/sync/user.role.content_editor.yml
@@ -41,6 +41,7 @@ dependencies:
     - node.type.publication_listing
     - node.type.q_a
     - node.type.regional_health_care_service_des
+    - node.type.service_region
     - node.type.step_by_step
     - node.type.story_listing
     - node.type.support_resources_detail_page
@@ -52,13 +53,16 @@ dependencies:
     - node.type.vamc_system_policies_page
     - node.type.vamc_system_register_for_care
     - node.type.vba_facility
+    - node.type.vba_facility_service
     - node.type.vet_center
     - node.type.vet_center_cap
     - node.type.vet_center_facility_health_servi
     - node.type.vet_center_locations_list
     - node.type.vet_center_mobile_vet_center
     - node.type.vet_center_outstation
+    - node.type.vha_facility_nonclinical_service
     - workflows.workflow.editorial
+    - workflows.workflow.restricted_archive
   module:
     - actions_permissions
     - block_content_permissions
@@ -73,6 +77,7 @@ dependencies:
     - node_link_report
     - paragraphs
     - pathauto
+    - smart_date_recur
     - system
     - tablefield
     - toolbar_menu
@@ -83,7 +88,7 @@ third_party_settings:
     vgb_description: 'Can create and edit content, but can''t review or publish it. '
 id: content_editor
 label: 'Content editor'
-weight: -2
+weight: -1
 is_admin: null
 permissions:
   - 'access administration pages'
@@ -136,6 +141,7 @@ permissions:
   - 'edit any publication_listing content'
   - 'edit any q_a content'
   - 'edit any regional_health_care_service_des content'
+  - 'edit any service_region content'
   - 'edit any step_by_step content'
   - 'edit any story_listing content'
   - 'edit any support_resources_detail_page content'
@@ -147,6 +153,7 @@ permissions:
   - 'edit any vamc_system_policies_page content'
   - 'edit any vamc_system_register_for_care content'
   - 'edit any vba_facility content'
+  - 'edit any vba_facility_service content'
   - 'edit any vet_center content'
   - 'edit any vet_center_cap content'
   - 'edit any vet_center_facility_health_servi content'
@@ -172,6 +179,8 @@ permissions:
   - 'update media'
   - 'use editorial transition create_new_draft'
   - 'use editorial transition review'
+  - 'use restricted_archive transition create_new_draft'
+  - 'use restricted_archive transition review'
   - 'use text format rich_text'
   - 'use text format rich_text_limited'
   - 'use workbench access'
@@ -218,6 +227,7 @@ permissions:
   - 'view q_a revisions'
   - 'view regional_health_care_service_des revisions'
   - 'view sections in toolbar'
+  - 'view service_region revisions'
   - 'view step_by_step revisions'
   - 'view story_listing revisions'
   - 'view support_resources_detail_page revisions'
@@ -231,6 +241,7 @@ permissions:
   - 'view vamc_system_policies_page revisions'
   - 'view vamc_system_register_for_care revisions'
   - 'view vba_facility revisions'
+  - 'view vba_facility_service revisions'
   - 'view vet_center revisions'
   - 'view vet_center_cap revisions'
   - 'view vet_center_facility_health_servi revisions'

diff --git a/config/sync/user.role.content_publisher.yml b/config/sync/user.role.content_publisher.yml
@@ -41,6 +41,7 @@ dependencies:
     - node.type.publication_listing
     - node.type.q_a
     - node.type.regional_health_care_service_des
+    - node.type.service_region
     - node.type.step_by_step
     - node.type.story_listing
     - node.type.support_resources_detail_page
@@ -52,6 +53,7 @@ dependencies:
     - node.type.vamc_system_policies_page
     - node.type.vamc_system_register_for_care
     - node.type.vba_facility
+    - node.type.vba_facility_service
     - node.type.vet_center
     - node.type.vet_center_cap
     - node.type.vet_center_facility_health_servi
@@ -60,6 +62,7 @@ dependencies:
     - node.type.vet_center_outstation
     - node.type.vha_facility_nonclinical_service
     - workflows.workflow.editorial
+    - workflows.workflow.restricted_archive
   module:
     - actions_permissions
     - block_content_permissions
@@ -86,7 +89,7 @@ third_party_settings:
     vgb_description: 'Can publish content.'
 id: content_publisher
 label: 'Content publisher'
-weight: 0
+weight: 1
 is_admin: null
 permissions:
   - 'access administration pages'
@@ -139,6 +142,7 @@ permissions:
   - 'edit any publication_listing content'
   - 'edit any q_a content'
   - 'edit any regional_health_care_service_des content'
+  - 'edit any service_region content'
   - 'edit any step_by_step content'
   - 'edit any story_listing content'
   - 'edit any support_resources_detail_page content'
@@ -150,6 +154,7 @@ permissions:
   - 'edit any vamc_system_policies_page content'
   - 'edit any vamc_system_register_for_care content'
   - 'edit any vba_facility content'
+  - 'edit any vba_facility_service content'
   - 'edit any vet_center content'
   - 'edit any vet_center_cap content'
   - 'edit any vet_center_facility_health_servi content'
@@ -204,6 +209,7 @@ permissions:
   - 'revert publication_listing revisions'
   - 'revert q_a revisions'
   - 'revert regional_health_care_service_des revisions'
+  - 'revert service_region revisions'
   - 'revert step_by_step revisions'
   - 'revert story_listing revisions'
   - 'revert support_resources_detail_page revisions'
@@ -215,6 +221,7 @@ permissions:
   - 'revert vamc_system_policies_page revisions'
   - 'revert vamc_system_register_for_care revisions'
   - 'revert vba_facility revisions'
+  - 'revert vba_facility_service revisions'
   - 'revert vet_center revisions'
   - 'revert vet_center_cap revisions'
   - 'revert vet_center_facility_health_servi revisions'
@@ -240,6 +247,10 @@ permissions:
   - 'use editorial transition create_new_draft'
   - 'use editorial transition publish'
   - 'use editorial transition review'
+  - 'use restricted_archive transition approve'
+  - 'use restricted_archive transition create_new_draft'
+  - 'use restricted_archive transition publish'
+  - 'use restricted_archive transition review'
   - 'use text format rich_text'
   - 'use text format rich_text_limited'
   - 'use workbench access'
@@ -286,6 +297,7 @@ permissions:
   - 'view q_a revisions'
   - 'view regional_health_care_service_des revisions'
   - 'view sections in toolbar'
+  - 'view service_region revisions'
   - 'view step_by_step revisions'
   - 'view story_listing revisions'
   - 'view support_resources_detail_page revisions'
@@ -299,6 +311,7 @@ permissions:
   - 'view vamc_system_policies_page revisions'
   - 'view vamc_system_register_for_care revisions'
   - 'view vba_facility revisions'
+  - 'view vba_facility_service revisions'
   - 'view vet_center revisions'
   - 'view vet_center_cap revisions'
   - 'view vet_center_facility_health_servi revisions'

diff --git a/config/sync/user.role.content_reviewer.yml b/config/sync/user.role.content_reviewer.yml
@@ -41,21 +41,28 @@ dependencies:
     - node.type.publication_listing
     - node.type.q_a
     - node.type.regional_health_care_service_des
+    - node.type.service_region
     - node.type.step_by_step
     - node.type.story_listing
     - node.type.support_resources_detail_page
     - node.type.support_service
     - node.type.va_form
     - node.type.vamc_operating_status_and_alerts
+    - node.type.vamc_system_billing_insurance
+    - node.type.vamc_system_medical_records_offi
     - node.type.vamc_system_policies_page
+    - node.type.vamc_system_register_for_care
     - node.type.vba_facility
+    - node.type.vba_facility_service
     - node.type.vet_center
     - node.type.vet_center_cap
     - node.type.vet_center_facility_health_servi
     - node.type.vet_center_locations_list
     - node.type.vet_center_mobile_vet_center
     - node.type.vet_center_outstation
+    - node.type.vha_facility_nonclinical_service
     - workflows.workflow.editorial
+    - workflows.workflow.restricted_archive
   module:
     - actions_permissions
     - block_content_permissions
@@ -80,7 +87,7 @@ third_party_settings:
     vgb_description: 'Can approve content changes for publishing, but can''t publish it.'
 id: content_reviewer
 label: 'Content reviewer'
-weight: -1
+weight: 0
 is_admin: null
 permissions:
   - 'access administration pages'
@@ -131,6 +138,7 @@ permissions:
   - 'edit any publication_listing content'
   - 'edit any q_a content'
   - 'edit any regional_health_care_service_des content'
+  - 'edit any service_region content'
   - 'edit any step_by_step content'
   - 'edit any story_listing content'
   - 'edit any support_resources_detail_page content'
@@ -142,6 +150,7 @@ permissions:
   - 'edit any vamc_system_policies_page content'
   - 'edit any vamc_system_register_for_care content'
   - 'edit any vba_facility content'
+  - 'edit any vba_facility_service content'
   - 'edit any vet_center content'
   - 'edit any vet_center_cap content'
   - 'edit any vet_center_facility_health_servi content'
@@ -160,6 +169,9 @@ permissions:
   - 'use editorial transition approve'
   - 'use editorial transition create_new_draft'
   - 'use editorial transition review'
+  - 'use restricted_archive transition approve'
+  - 'use restricted_archive transition create_new_draft'
+  - 'use restricted_archive transition review'
   - 'use text format rich_text'
   - 'use text format rich_text_limited'
   - 'use workbench access'
@@ -206,6 +218,7 @@ permissions:
   - 'view q_a revisions'
   - 'view regional_health_care_service_des revisions'
   - 'view sections in toolbar'
+  - 'view service_region revisions'
   - 'view step_by_step revisions'
   - 'view story_listing revisions'
   - 'view support_resources_detail_page revisions'
@@ -219,6 +232,7 @@ permissions:
   - 'view vamc_system_policies_page revisions'
   - 'view vamc_system_register_for_care revisions'
   - 'view vba_facility revisions'
+  - 'view vba_facility_service revisions'
   - 'view vet_center revisions'
   - 'view vet_center_cap revisions'
   - 'view vet_center_facility_health_servi revisions'