Merge pull request #1054 from necyberteam/md-dev

Md dev

blt/md/md-1934

@@ -0,0 +1 @@
+amp_cyberinfrastructure_org

composer.json

@@ -113,7 +113,6 @@
     "drupal/menu_item_extras": "^3.0",
     "drupal/menu_item_role_access": "^2.0",
     "drupal/menu_link_attributes": "^1.0",
-    "drupal/menu_per_role": "1.x-dev",
     "drupal/mgv": "^2.2",
     "drupal/multiple_registration": "^3.0",
     "drupal/nocurrent_pass": "^1.0",
@@ -169,7 +168,7 @@
     "drupal_fork/domain_adv": "main-dev",
     "drush/drush": "^12.1",
     "necyberteam/asp-theme": "main-dev",
-    "necyberteam/campus-champions-theme": "dev-main",
+    "necyberteam/campus-champions-theme": "main-dev",
     "npm-asset/select2": "^4.0",
     "oomphinc/composer-installers-extender": "^2.0",
     "pantheon-systems/quicksilver-pushback": "^2"
@@ -203,7 +202,8 @@
       "drupal/core-project-message": true,
       "oomphinc/composer-installers-extender": true,
       "acquia/blt": true,
-      "phpstan/extension-installer": true
+      "phpstan/extension-installer": true,
+      "php-http/discovery": true
     }
   },
   "extra": {

tests/cypress/cypress/e2e/accessmatch/announcements/announcements-page.cy.js

@@ -27,7 +27,7 @@ describe("Unauthenticated user tests the Announcements Page", () => {
     cy.get("#edit-submit-access-news--2").click(); //Filter button
 
     //Created announcement through cypress
-    cy.get(".view-content > :nth-child(1)")
+    cy.get(".view-content .views-field-title")
       .contains("Cypress-Created-Announcement")
       .click();
     cy.get(".field__item > .font-normal").contains("login");

tests/cypress/cypress/e2e/accessmatch/match-services/match-plus-engagement-form.cy.js

@@ -29,24 +29,26 @@ describe("Authenticated user tests the MATCH+ Engagement Form", () => {
     cy.visit("/node/add/match_engagement?type=plus");
 
     //Title Field
-    cy.get("#edit-title-0-value").type("http://example-0.com");
+    cy.get("#edit-title-0-value").type("Title of a Test Engagement");
 
     //Institution Field
     cy.get("#edit-field-institution-0-value").type("Example University");
 
-    //Description field does not actually type anything in (Below two lines are for the description field)
-    // cy.get("p").type("Testing");
-    // cy.get(".ck-editor__main > .ck").type("Testing");
+    //Description field
+    cy.get('.field--name-body .ck-content').then(el => {
+      const editor = el[0].ckeditorInstance
+      editor.setData('Typing some stuff')
+    })
 
-    //Trouble with selecting tags setcion
-    //cy.get("#edit-field-tags-wrapper").click();
-    //cy.get("Login").click();
-    //cy.get("#edit-title-0-value").type("http://example-0.com");
+    // Tags field
+    cy.get('.tags summary').click()
+    // tid 733 is the tag "access-account"
+    cy.get('.tags-select[data-tid=733]').click()
 
     //Preffered Semester Field
     cy.get('[name="field_preferred_semester"]').select("Summer");
 
-    //Save As Field
-    cy.get('[name="moderation_state[0][state]"]').select("Submitted");
+    // Send for Review
+    cy.get('#edit-submit').click();
   });
 });

tests/cypress/cypress/e2e/accessmatch/match-services/match-premier-engagement-form.cy.js

@@ -14,24 +14,26 @@ describe("Authenticated user tests the MATCH Premier Engagement Form", () => {
     cy.visit("/node/add/match_engagement?type=premier");
 
     //Title Field
-    cy.get("#edit-title-0-value").type("http://example-0.com");
+    cy.get("#edit-title-0-value").type("Title for a Test Premier Engagement");
 
     //Institution Field
     cy.get("#edit-field-institution-0-value").type("Example University");
 
-    //Description field does not actually type anything in (Below two lines are for the description field)
-    // cy.get("p").type("Testing");
-    // cy.get(".ck-editor__main > .ck").type("Testing");
+    //Description field
+    cy.get('.field--name-body .ck-content').then(el => {
+      const editor = el[0].ckeditorInstance
+      editor.setData('Typing some stuff')
+    })
 
-    //Trouble with selecting tags setcion
-    //cy.get("#edit-field-tags-wrapper").click();
-    //cy.get("Login").click();
-    //cy.get("#edit-title-0-value").type("http://example-0.com");
+    // Tags field
+    cy.get('.tags summary').click()
+    // tid 733 is the tag "access-account"
+    cy.get('.tags-select[data-tid=733]').click()
 
     //Preffered Semester Field
     cy.get('[name="field_preferred_semester"]').select("Summer");
 
-    //Save As Field
-    cy.get('[name="moderation_state[0][state]"]').select("Submitted");
+    // Send for Review
+    cy.get('#edit-submit').click();
   });
 });

tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js

@@ -55,17 +55,17 @@ describe("Verify a tag's page list of engagements", () => {
       cy.get(".tags").click();
       // select community-outreach tag
       cy.get(".tags-select").contains("community-outreach").click();
+      // Send for Review
       cy.get('#edit-moderation-state-0-state').select('Submitted');
       cy.get('#edit-submit').click();
-      cy.contains('Thank you for submitting your project.');
+      cy.contains('Thank you for sending your project for review.');
 
       // update to received
       cy.get('.tabs')
         .contains('Edit')
         .click();
       cy.get('#edit-moderation-state-0-state').select('Received');
       cy.get('#edit-submit').click();
-      cy.contains('has been updated.');
 
       // update to In Review
       cy.get('.tabs')

web/sites/default/config/default/core.entity_form_display.node.match_engagement.default.yml

@@ -92,6 +92,13 @@ third_party_settings:
         open: false
         description: ''
         required_fields: true
+        element: div
+        show_label: false
+        label_element: h3
+        label_element_classes: ''
+        attributes: ''
+        effect: none
+        speed: fast
     group_milestone_2:
       children:
         - field_milestone_description_2
@@ -246,11 +253,12 @@ third_party_settings:
       region: content
       parent_name: ''
       weight: 19
-      format_type: fieldset
+      format_type: details
       format_settings:
         classes: ''
         show_empty_fields: false
         id: milestones_fieldset
+        open: true
         description: ''
         required_fields: false
     group_first_milestone_fs:
@@ -262,12 +270,13 @@ third_party_settings:
       region: content
       parent_name: group_milestones_set
       weight: 41
-      format_type: fieldset
+      format_type: details
       format_settings:
         classes: ''
         show_empty_fields: false
         id: milestone1_fieldset
-        description: 'Please enter as many as five milestones for this engagement.  Only the first milestone is required.'
+        open: true
+        description: "<p>Please enter as many as five milestones for this engagement.  Only the first milestone is required.</p>\r\n\r\n<p>Example of a first milestone (see more example milestones in the <a href=\"/match/overview\">MATCH FAQ</a>):</p>\r\n\r\n<ul>\r\n<li>Ramp Up</li>\r\n<li>Discuss meeting schedules (weekly, monthly, etc.)</li>\r\n<li>Tutorials (Intro to GPU computing)</li>\r\n<li>Jetstream accounts setup, access/navigation</li>\r\n<li>Test run ice sheet flow simulations on GPUs, view results</li>\r\n</ul>"
         required_fields: true
 id: node.match_engagement.default
 targetEntityType: node

web/sites/default/config/default/node.type.match_engagement.yml

@@ -13,5 +13,5 @@ type: match_engagement
 description: ''
 help: ''
 new_revision: true
-preview_mode: 1
+preview_mode: 0
 display_submitted: false

web/sites/default/config/default/views.view.affinity_group.yml

@@ -3272,7 +3272,7 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: '<a class="btn-outline-dark btn cursor-default m-2" href="/affinity-groups/{{ tid_1 }}/users/{{ title }}?nid={{ raw_arguments.nid }}">View Members</a>'
+            text: '<a class="btn-outline-dark btn cursor-default mx-0 my-2 mb-3" href="/affinity-groups/{{ tid_1 }}/users/{{ title }}?nid={{ raw_arguments.nid }}">View Members</a>'
             make_link: false
             path: ''
             absolute: false
@@ -3801,7 +3801,7 @@ display:
           exclude: false
           alter:
             alter_text: true
-            text: "<div class=\"py-3 border-top border-bottom\">        \r\n<p>Members get updates about announcements, events, and outages.</p>\r\n  <div class=\"affinity-group-buttons d-flex justify-content-start flex-wrap flex\">\r\n        {% if flagged %}\r\n        <div class=\"bg-orange bg-orange-500 border-4 border-orange btn cursor-default text-white my-2 ms-0 me-4\">\r\n            <i class=\"fa-solid fa-badge-check\"></i> Member\r\n        </div>\r\n        {% endif %}\r\n        {% if link_flag %}\r\n        <div class=\"affinity-group-flag m-2 ms-0\">{{ link_flag }}</div>\r\n        {% else %}\r\n        <a href=\"/user\" class=\"btn btn-secondary disabled m-2 ms-0\" disabled>Join</a>\r\n        {% endif %}        \r\n        {% if field_slack %}\r\n        <a href=\"{{ field_slack }}\" target=\"_blank\" class=\"btn btn-primary m-2\">Slack</a>\r\n        {% endif %}\r\n        {% if field_ask_ci_locale %}\r\n        <a href=\"{{ field_ask_ci_locale }}\" target=\"_blank\" class=\"btn btn-primary m-2\">Q&amp;A</a>\r\n        {% endif %}\r\n        {% if field_github_organization %}\r\n        <a href=\"{{ field_github_organization }}\" target=\"_blank\" class=\"btn btn-primary m-2\" >GitHub</a>\r\n        {% endif %}\r\n        {% if field_mailing_list %}\r\n        <a href=\"{{ field_mailing_list }}\" target=\"_blank\" class=\"btn btn-primary m-2\"  style=\"width: fit-content\">Email</a>\r\n        {% endif %}\r\n      </div>\r\n</div>"
+            text: "<div class=\"py-3 border-top border-bottom\">        \r\n<p>Members get updates about announcements, events, and outages.</p>\r\n  <div class=\"affinity-group-buttons d-flex justify-content-start flex-wrap flex\">\r\n        {% if flagged %}\r\n        <div class=\"bg-orange bg-orange-500 border-4 border-orange btn cursor-default text-white my-2 ms-0 me-4 mr-4  ml-0\">\r\n            <i class=\"fa-solid fa-badge-check\"></i> Member\r\n        </div>\r\n        {% endif %}\r\n        {% if link_flag %}\r\n        <div class=\"affinity-group-flag my-2 ms-0 me-4 mr-4  ml-0 \">{{ link_flag }}</div>\r\n        {% else %}\r\n        <a href=\"/user\" class=\"btn btn-secondary disabled my-2 ms-0 me-4  mr-4  ml-0\" disabled>Join</a>\r\n        {% endif %}        \r\n        {% if field_slack %}\r\n        <a href=\"{{ field_slack }}\" target=\"_blank\" class=\"btn btn-primary my-2 ms-0 me-4 mr-4 ml-0\">Slack</a>\r\n        {% endif %}\r\n        {% if field_ask_ci_locale %}\r\n        <a href=\"{{ field_ask_ci_locale }}\" target=\"_blank\" class=\"btn btn-primary my-2 ms-0 me-4 mr-4 ml-0\">Q&amp;A</a>\r\n        {% endif %}\r\n        {% if field_github_organization %}\r\n        <a href=\"{{ field_github_organization }}\" target=\"_blank\" class=\"btn btn-primary my-2 ms-0 me-4 mr-4 ml-0\" >GitHub</a>\r\n        {% endif %}\r\n        {% if field_mailing_list %}\r\n        <a href=\"{{ field_mailing_list }}\" target=\"_blank\" class=\"btn btn-primary my-2 mx-0\"  style=\"width: fit-content\">Email</a>\r\n        {% endif %}\r\n      </div>\r\n</div>"
             make_link: false
             path: ''
             absolute: false