Merge pull request #1048 from necyberteam/md-dev

Md dev
necyberteam · Jan 3, 2024 · 5055227 · 5055227
2 parents 598d0b3 + cb62e0a
commit 5055227
Show file tree

Hide file tree

Showing 75 changed files with 1,695 additions and 848 deletions.
diff --git a/blt/md/md-1014 b/blt/md/md-1014
@@ -0,0 +1 @@
+connectcidev_wpi_edu
diff --git a/blt/md/md-1941 b/blt/md/md-1941
@@ -0,0 +1 @@
+amp_cyberinfrastructure_org
diff --git a/composer.json b/composer.json
@@ -76,9 +76,9 @@
     "drupal/coffee": "^1.2",
     "drupal/config_split": "^1.9",
     "drupal/content_moderation_notifications": "^3.4",
-    "drupal/core-composer-scaffold": "^10.0",
-    "drupal/core-project-message": "^10.0",
-    "drupal/core-recommended": "^10.0",
+    "drupal/core-composer-scaffold": "^10.1",
+    "drupal/core-project-message": "^10.1",
+    "drupal/core-recommended": "^10.1",
     "drupal/csv_serialization": "^3.0",
     "drupal/ctools": "^3.4",
     "drupal/datalayer": "^2.0@RC",
@@ -113,7 +113,7 @@
     "drupal/menu_item_extras": "^3.0",
     "drupal/menu_item_role_access": "^2.0",
     "drupal/menu_link_attributes": "^1.0",
-    "drupal/menu_per_role": "^1.2",
+    "drupal/menu_per_role": "1.x-dev",
     "drupal/mgv": "^2.2",
     "drupal/multiple_registration": "^3.0",
     "drupal/nocurrent_pass": "^1.0",
@@ -176,7 +176,7 @@
   },
   "require-dev": {
     "amp/amp_dev": "dev-main",
-    "drupal/core-dev": "^10.0",
+    "drupal/core-dev": "^10.1",
     "drupal/devel": "^5.1",
     "drupal/devel_kint_extras": "^1.0",
     "drupal/examples": "^4.0",

diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -1,7 +1,7 @@
 {
   "patches": {
     "drupal/core": {
-      "Views more link disappears": "https://www.drupal.org/files/issues/2023-06-05/views-more-link-disappears-1819538-79.patch"
+      "More link is missing in pager...": "https://www.drupal.org/files/issues/2023-08-25/3381979-8.patch"
     },
     "drupal/mgv": {
       "current domain name": "patches/currentdomainname.patch"

diff --git a/tests/behat/features/asp/affinity-groups/affinity_groups-individual.feature b/tests/behat/features/asp/affinity-groups/affinity_groups-individual.feature
@@ -74,7 +74,7 @@ Feature: Feature: test an Affinity Groups page
     # Then link "How to Write a Successful" should contain "/events/6593"
     # TODO - once able to add a CI Link to this AG, uncomment the following
     #Then I should see "ci-link-for-user-200"
-    Then link "Changing my user profile name on the" should contain "/t/changing-my-user-profile-name-on-the-access-support-portal/2479"
+    Then link "Who can get an allocation to use HPC resources through ACCESS?" should contain "/t/who-can-get-an-allocation-to-use-hpc-resources-through-access/3019"
     #When I click "How to Write a Successful"
     #Then I should be on "/events/6593"
 

diff --git a/tests/behat/features/cci/cci-homepage.feature b/tests/behat/features/cci/cci-homepage.feature
@@ -63,12 +63,12 @@ Feature: verify specific items on CCI homepage
     When I am on the homepage
     When I follow "Contact Us"
     Then I should be on "contact/connect_ci"
-    And I should see "Page not found"
+    And I should see "Your name"
 
   # TODO - currently broken
   Scenario: Authenticated User is on the homepage and follows contact us
     Given I am logged in as a user with the "authenticated" role
     When I am on the homepage
     When I follow "Contact Us"
     Then I should be on "contact/connect_ci"
-    And I should see "Page not found"
+    And I should see "Your name"
diff --git a/tests/behat/features/templates/affinity_groups/affinity_group.feature b/tests/behat/features/templates/affinity_groups/affinity_group.feature
@@ -2,7 +2,7 @@
 @api
 @javascript
 
-Feature: Feature: test an Affinity Groups page
+Feature: Feature: test an Affinity Group page
   An Affinity Group page should display the title, logo, description, and tags.
   Groups that have specified an optional Slack, Q&A, GitHub, or email link should
   display a button with the appropriate link.
@@ -76,7 +76,7 @@ Feature: Feature: test an Affinity Groups page
     # Then link "How to Write a Successful" should contain "/events/6593"
     # TODO - once able to add a CI Link to this AG, uncomment the following
     #Then I should see "ci-link-for-user-200"
-    Then link "Changing my user profile name on the" should contain "/t/changing-my-user-profile-name-on-the-access-support-portal/2479"
+    Then link "Who can get an allocation to use HPC resources through ACCESS?" should contain "/t/who-can-get-an-allocation-to-use-hpc-resources-through-access/3019"
     #When I click "How to Write a Successful"
     #Then I should be on "/events/6593"
 

diff --git a/tests/cypress/cypress/e2e/accessmatch/announcements/announcements-page.cy.js b/tests/cypress/cypress/e2e/accessmatch/announcements/announcements-page.cy.js
@@ -28,7 +28,7 @@ describe("Unauthenticated user tests the Announcements Page", () => {
 
     //Created announcement through cypress
     cy.get(".view-content > :nth-child(1)")
-      .contains("Cypress-Created-Annoucement")
+      .contains("Cypress-Created-Announcement")
       .click();
     cy.get(".field__item > .font-normal").contains("login");
     cy.get(".field__label").contains("Affiliation");

diff --git a/tests/cypress/cypress/e2e/accessmatch/match-services/match-plus-engagement-form.cy.js b/tests/cypress/cypress/e2e/accessmatch/match-services/match-plus-engagement-form.cy.js
@@ -1,10 +1,25 @@
 /*  
-    This test is specifically focused on the MATCH+ Engagement form tested for an authenticated user.
-    This test checks for major functions like:
-    Page Title, 
-    Header text,
-    Form Functionality 
+    This test is focused on the MATCH+ Engagement form tested for an authenticated user.
+
+    A MATCH Engagement can be submitted by any authenticated user.
+    Required fields for creating a MATCH Engagement are:
+    - Title, Description, Institution, Preferred Semester, and Tags.
+    The Engagement can be saved as a draft or sent for review.
+
+    Users with the MATCH PM role receive an email notification when a MATCH Engagement is submitted.
+    When a MATCH PM saves the engagement as "Received", the user who submitted 
+    the engagement receives an email notification and additional fields are displayed.
+    - todo: add tests for additional fields
     
+    The author adds additional information and saves the engagement as "In Review".
+
+    The MATCH SC receives an email notification when the engagement is saved as "In Review".
+    The MATCH SC reviews the engagement and saves it as "Recruiting".
+    When in "Recruiting" state, the engagement is displayed on the MATCH Engagements page
+    and potential participants can flag interest in the engagement.
+
+    Other states for the engagement include "Reviewing Applicants", "In Progress", 
+    "Finishing Up", "On Hold", "Halted", and "Complete".
 */
 
 describe("Authenticated user tests the MATCH+ Engagement Form", () => {

diff --git a/web/sites/default/config/default/contact.form.connect_ci.yml b/web/sites/default/config/default/contact.form.connect_ci.yml
@@ -0,0 +1,13 @@
+uuid: 9d19b3ce-9b23-4ad9-8a0b-2c8c8dc28369
+langcode: en
+status: true
+dependencies: {  }
+id: connect_ci
+label: 'Connect ci'
+recipients:
+  - [email protected]
+  - [email protected]
+reply: 'Thank you for submitting the attached guest ticket to the Connect Ci''s Help Desk. One of our team members will respond via email within 1 business day.  If this matter is urgent, please reply to this email with "- urgent" at the end of the subject line and we will do our best to expedite our response.'
+weight: 0
+message: 'Your message has been sent'
+redirect: ''
diff --git a/web/sites/default/config/default/core.entity_view_display.node.access_news.default.yml b/web/sites/default/config/default/core.entity_view_display.node.access_news.default.yml
@@ -31,8 +31,8 @@ third_party_settings:
         layout_id: layout_twocol_section
         layout_settings:
           label: ''
-          context_mapping: {  }
           column_widths: 75-25
+          context_mapping: {  }
           layout_builder_styles_style:
             mb_10_section: mb_10_section
             bg_light_teal_overflow_section: 0

diff --git a/web/sites/default/config/default/core.entity_view_display.node.affinity_group.default.yml b/web/sites/default/config/default/core.entity_view_display.node.affinity_group.default.yml
@@ -208,7 +208,7 @@ third_party_settings:
             region: first
             configuration:
               id: 'field_block:node:affinity_group:field_cider_resources'
-              label: 'Allocated Resources'
+              label: 'Associated Resources'
               label_display: visible
               provider: layout_builder
               context_mapping:

diff --git a/web/sites/default/config/default/core.entity_view_display.node.article.rss.yml b/web/sites/default/config/default/core.entity_view_display.node.article.rss.yml
@@ -6,7 +6,12 @@ dependencies:
     - core.entity_view_mode.node.rss
     - field.field.node.article.body
     - field.field.node.article.comment
+    - field.field.node.article.comment_node_article
+    - field.field.node.article.field_domain_access
+    - field.field.node.article.field_domain_all_affiliates
+    - field.field.node.article.field_domain_source
     - field.field.node.article.field_image
+    - field.field.node.article.field_region
     - field.field.node.article.field_tags
     - node.type.article
   module:
@@ -24,5 +29,10 @@ content:
 hidden:
   body: true
   comment: true
+  comment_node_article: true
+  field_domain_access: true
+  field_domain_all_affiliates: true
+  field_domain_source: true
   field_image: true
+  field_region: true
   field_tags: true
diff --git a/web/sites/default/config/default/core.entity_view_display.node.blog_post.teaser.yml b/web/sites/default/config/default/core.entity_view_display.node.blog_post.teaser.yml
@@ -5,6 +5,13 @@ dependencies:
   config:
     - core.entity_view_mode.node.teaser
     - field.field.node.blog_post.body
+    - field.field.node.blog_post.field_comments
+    - field.field.node.blog_post.field_domain_access
+    - field.field.node.blog_post.field_domain_all_affiliates
+    - field.field.node.blog_post.field_domain_source
+    - field.field.node.blog_post.field_image
+    - field.field.node.blog_post.field_project
+    - field.field.node.blog_post.field_tags
     - node.type.blog_post
   module:
     - text

diff --git a/web/sites/default/config/default/core.entity_view_display.node.page.default.yml b/web/sites/default/config/default/core.entity_view_display.node.page.default.yml
@@ -18,6 +18,7 @@ dependencies:
     - comment
     - image
     - layout_builder
+    - layout_discovery
     - text
     - user
 third_party_settings:

diff --git a/web/sites/default/config/default/core.entity_view_display.node.webform.default.yml b/web/sites/default/config/default/core.entity_view_display.node.webform.default.yml
@@ -4,6 +4,9 @@ status: true
 dependencies:
   config:
     - field.field.node.webform.body
+    - field.field.node.webform.field_domain_access
+    - field.field.node.webform.field_domain_all_affiliates
+    - field.field.node.webform.field_domain_source
     - field.field.node.webform.webform
     - node.type.webform
   module:

diff --git a/web/sites/default/config/default/core.entity_view_display.node.webform.teaser.yml b/web/sites/default/config/default/core.entity_view_display.node.webform.teaser.yml
@@ -5,6 +5,9 @@ dependencies:
   config:
     - core.entity_view_mode.node.teaser
     - field.field.node.webform.body
+    - field.field.node.webform.field_domain_access
+    - field.field.node.webform.field_domain_all_affiliates
+    - field.field.node.webform.field_domain_source
     - field.field.node.webform.webform
     - node.type.webform
   module:

diff --git a/web/sites/default/config/default/core.extension.yml b/web/sites/default/config/default/core.extension.yml
@@ -92,7 +92,6 @@ module:
   menu_item_extras: 0
   menu_item_role_access: 0
   menu_link_attributes: 0
-  menu_per_role: 0
   menu_ui: 0
   mgv: 0
   multiple_registration: 0
@@ -108,6 +107,7 @@ module:
   path: 0
   path_alias: 0
   pfdp: 0
+  phpass: 0
   r4032login: 0
   real_aes: 0
   realname: 0

diff --git a/web/sites/default/config/default/editor.editor.basic_html.yml b/web/sites/default/config/default/editor.editor.basic_html.yml
@@ -46,6 +46,50 @@ settings:
       startIndex: true
     ckeditor5_sourceEditing:
       allowed_tags: {  }
+    ckeditor5_codeBlock:
+      languages:
+        -
+          label: 'Plain text'
+          language: plaintext
+        -
+          label: C
+          language: c
+        -
+          label: 'C#'
+          language: cs
+        -
+          label: C++
+          language: cpp
+        -
+          label: CSS
+          language: css
+        -
+          label: Diff
+          language: diff
+        -
+          label: HTML
+          language: html
+        -
+          label: Java
+          language: java
+        -
+          label: JavaScript
+          language: javascript
+        -
+          label: PHP
+          language: php
+        -
+          label: Python
+          language: python
+        -
+          label: Ruby
+          language: ruby
+        -
+          label: TypeScript
+          language: typescript
+        -
+          label: XML
+          language: xml
 image_upload:
   status: true
   scheme: public

diff --git a/web/sites/default/config/default/editor.editor.full_html.yml b/web/sites/default/config/default/editor.editor.full_html.yml
@@ -46,6 +46,50 @@ settings:
       startIndex: true
     ckeditor5_sourceEditing:
       allowed_tags: {  }
+    ckeditor5_codeBlock:
+      languages:
+        -
+          label: 'Plain text'
+          language: plaintext
+        -
+          label: C
+          language: c
+        -
+          label: 'C#'
+          language: cs
+        -
+          label: C++
+          language: cpp
+        -
+          label: CSS
+          language: css
+        -
+          label: Diff
+          language: diff
+        -
+          label: HTML
+          language: html
+        -
+          label: Java
+          language: java
+        -
+          label: JavaScript
+          language: javascript
+        -
+          label: PHP
+          language: php
+        -
+          label: Python
+          language: python
+        -
+          label: Ruby
+          language: ruby
+        -
+          label: TypeScript
+          language: typescript
+        -
+          label: XML
+          language: xml
 image_upload:
   status: true
   scheme: public

diff --git a/web/sites/default/config/default/filter.format.basic_html.yml b/web/sites/default/config/default/filter.format.basic_html.yml
@@ -98,3 +98,9 @@ filters:
     weight: -39
     settings:
       icon_block: '1'
+  filter_image_lazy_load:
+    id: filter_image_lazy_load
+    provider: filter
+    status: true
+    weight: -44
+    settings: {  }
diff --git a/web/sites/default/config/default/filter.format.full_html.yml b/web/sites/default/config/default/filter.format.full_html.yml
@@ -100,3 +100,9 @@ filters:
     status: false
     weight: -40
     settings: {  }
+  filter_image_lazy_load:
+    id: filter_image_lazy_load
+    provider: filter
+    status: true
+    weight: -44
+    settings: {  }
diff --git a/web/sites/default/config/default/menu_per_role.settings.yml b/web/sites/default/config/default/menu_per_role.settings.yml
diff --git a/web/sites/default/config/default/system.feature_flags.yml b/web/sites/default/config/default/system.feature_flags.yml
@@ -0,0 +1 @@
+linkset_endpoint: false
diff --git a/web/sites/default/config/default/system.mail.yml b/web/sites/default/config/default/system.mail.yml
@@ -1,4 +1,4 @@
 _core:
   default_config_hash: rYgt7uhPafP2ngaN_ZUPFuyI4KdE0zU868zLNSlzKoE
 interface:
-  default: maillog
+  default: php_mail
diff --git a/web/sites/default/config/default/user.role.affinity_group_leader.yml b/web/sites/default/config/default/user.role.affinity_group_leader.yml
@@ -8,6 +8,7 @@ dependencies:
     - workflows.workflow.editorial
   module:
     - content_moderation
+    - file
     - node
     - recurring_events
 id: affinity_group_leader
@@ -22,6 +23,7 @@ permissions:
   - 'delete own access_news content'
   - 'delete own eventinstance entity'
   - 'delete own eventseries entity'
+  - 'delete own files'
   - 'edit own access_news content'
   - 'edit own affinity_group content'
   - 'edit own eventinstance entity'
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ dependencies: @@
         - comment
         - image
         - layout_builder
+        - layout_discovery
         - text
         - user
     third_party_settings:
@@ Expand Down @@