From 56d6a2d042ad0129ed1be5908c526021d57fa86c Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 15 Dec 2023 15:12:46 -0700 Subject: [PATCH 01/31] config: match_engagment disable preview d8-1934 --- web/sites/default/config/default/node.type.match_engagement.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/sites/default/config/default/node.type.match_engagement.yml b/web/sites/default/config/default/node.type.match_engagement.yml index 9c22cfa01..f17a0a863 100644 --- a/web/sites/default/config/default/node.type.match_engagement.yml +++ b/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 From 9c999116c304afa3c342c23526207b2cd18b7a53 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 15 Dec 2023 15:15:40 -0700 Subject: [PATCH 02/31] access: 3.0.x-dev e2f35ac => dev-d8-1934 9a2610e --- composer.json | 2 +- composer.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 626c1234c..93b318efb 100755 --- a/composer.json +++ b/composer.json @@ -64,7 +64,7 @@ "access/operations_cider": "dev-main", "acquia/blt": "^13.7", "acquia/blt-behat": "^1.3", - "amp/access": "3.0.x-dev", + "amp/access": "d8-1934-dev", "composer/installers": "^1.2", "cweagans/composer-patches": "^1.6", "drupal/access_by_ref": "^3.0", diff --git a/composer.lock b/composer.lock index 994c8b323..1bc14f65e 100644 --- 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": "07cebafb6998b0fd951e624044fa40df", + "content-hash": "8aae8a4ec6758997e949d55534ea872b", "packages": [ { "name": "access/drupal_seamless_cilogon", @@ -291,13 +291,12 @@ }, { "name": "amp/access", - "version": "3.0.x-dev", + "version": "dev-d8-1934", "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "e2f35ac8c8610501452224c618773b3d85d2abfd" + "reference": "9a2610eeb76028293d1d7d8cc65b0b571a1064ca" }, - "default-branch": true, "type": "drupal-custom-module", "license": [ "GPL-2.0+" @@ -313,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2023-12-13T21:12:31+00:00" + "time": "2023-12-15T22:14:23+00:00" }, { "name": "arthurkushman/query-path", From eb4984d9586e03f2edd7390455771c429372d6a0 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 15 Dec 2023 15:20:54 -0700 Subject: [PATCH 03/31] asp-theme: dev-main 38cd77c => dev-d8-1934 289b260 --- composer.json | 2 +- composer.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 93b318efb..b8c93e9ea 100755 --- a/composer.json +++ b/composer.json @@ -168,7 +168,7 @@ "drupal_fork/cilogon_auth": "main-dev", "drupal_fork/domain_adv": "main-dev", "drush/drush": "^12.1", - "necyberteam/asp-theme": "main-dev", + "necyberteam/asp-theme": "d8-1934-dev", "necyberteam/campus-champions-theme": "dev-main", "npm-asset/select2": "^4.0", "oomphinc/composer-installers-extender": "^2.0", diff --git a/composer.lock b/composer.lock index 1bc14f65e..1310e508f 100644 --- 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": "8aae8a4ec6758997e949d55534ea872b", + "content-hash": "33bcc3360176141839a2f1c13e702766", "packages": [ { "name": "access/drupal_seamless_cilogon", @@ -11274,13 +11274,12 @@ }, { "name": "necyberteam/asp-theme", - "version": "dev-main", + "version": "dev-d8-1934", "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "38cd77c2c03a04dc31c30323b50d213ab0215885" + "reference": "289b260e4747378b23931142ce7c5fcd2c33876a" }, - "default-branch": true, "type": "drupal-theme", "license": [ "MIT" @@ -11296,7 +11295,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2023-12-14T21:32:15+00:00" + "time": "2023-12-15T22:18:07+00:00" }, { "name": "necyberteam/campus-champions-theme", From de4b618fcd3337865d6d4a5601d0f19f8d3eda87 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 15 Dec 2023 16:13:52 -0700 Subject: [PATCH 04/31] asp-theme: dev-d8-1934 289b260 => dev-d8-1934 bfce86f --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 1310e508f..c254b7310 100644 --- a/composer.lock +++ b/composer.lock @@ -11278,7 +11278,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "289b260e4747378b23931142ce7c5fcd2c33876a" + "reference": "bfce86f2a87efc21ba2e1b8f3a5d50249a8cb417" }, "type": "drupal-theme", "license": [ @@ -11295,7 +11295,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2023-12-15T22:18:07+00:00" + "time": "2023-12-15T23:12:11+00:00" }, { "name": "necyberteam/campus-champions-theme", From a6da32170a66c4394985231186ba69b01d64914e Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 15 Dec 2023 16:14:11 -0700 Subject: [PATCH 05/31] access: dev-d8-1934 9a2610e => dev-d8-1934 6364805 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index c254b7310..161529eac 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "9a2610eeb76028293d1d7d8cc65b0b571a1064ca" + "reference": "6364805c77339ee443e2e95eebccb37423d3759f" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2023-12-15T22:14:23+00:00" + "time": "2023-12-15T23:13:32+00:00" }, { "name": "arthurkushman/query-path", From f145acc3f5b5a4867fd156ca58e3cfd2b40539e4 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 15 Dec 2023 17:50:25 -0700 Subject: [PATCH 06/31] access: dev-d8-1934 6364805 => dev-d8-1934 addf700 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 161529eac..783fa964e 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "6364805c77339ee443e2e95eebccb37423d3759f" + "reference": "addf700c6056591da3e024632f336d0af9ca324f" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2023-12-15T23:13:32+00:00" + "time": "2023-12-16T00:49:43+00:00" }, { "name": "arthurkushman/query-path", From 8f39dbb7e24808fd3a5f60bf4a72e0c401768b94 Mon Sep 17 00:00:00 2001 From: protitude Date: Sat, 16 Dec 2023 11:39:25 -0700 Subject: [PATCH 07/31] asp-theme: dev-d8-1934 bfce86f => dev-d8-1934 d1b35ea --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 783fa964e..82dfc642c 100644 --- a/composer.lock +++ b/composer.lock @@ -11278,7 +11278,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "bfce86f2a87efc21ba2e1b8f3a5d50249a8cb417" + "reference": "d1b35eaf563cc7d31b0111d23623ca68b61dd5b0" }, "type": "drupal-theme", "license": [ @@ -11295,7 +11295,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2023-12-15T23:12:11+00:00" + "time": "2023-12-16T18:37:47+00:00" }, { "name": "necyberteam/campus-champions-theme", From b54a8c8cd4f8bfab375e7567dd02cde5c94a725f Mon Sep 17 00:00:00 2001 From: protitude Date: Sat, 16 Dec 2023 15:22:30 -0700 Subject: [PATCH 08/31] access: dev-d8-1934 addf700 => dev-d8-1934 4b95397 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 82dfc642c..e13931600 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "addf700c6056591da3e024632f336d0af9ca324f" + "reference": "4b953979211b8bc6c1bd66682984badfd699e466" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2023-12-16T00:49:43+00:00" + "time": "2023-12-16T22:21:35+00:00" }, { "name": "arthurkushman/query-path", From 27a6792e526fc1ea20b21cf8817fc87f06f079a9 Mon Sep 17 00:00:00 2001 From: protitude Date: Sat, 16 Dec 2023 16:53:41 -0700 Subject: [PATCH 09/31] Set domain --- blt/md/md-1934 | 1 + 1 file changed, 1 insertion(+) create mode 100644 blt/md/md-1934 diff --git a/blt/md/md-1934 b/blt/md/md-1934 new file mode 100644 index 000000000..d7db02ba2 --- /dev/null +++ b/blt/md/md-1934 @@ -0,0 +1 @@ +amp_cyberinfrastructure_org From 2cbbc11e7deff32faef0247c327745d14517f535 Mon Sep 17 00:00:00 2001 From: protitude Date: Mon, 18 Dec 2023 19:53:31 +0000 Subject: [PATCH 10/31] Fix name of php_mail --- web/sites/default/config/default/mailsystem.settings.yml | 7 +------ web/sites/default/config/local/mailsystem.settings.yml | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/web/sites/default/config/default/mailsystem.settings.yml b/web/sites/default/config/default/mailsystem.settings.yml index edd95f9af..b40f538d5 100644 --- a/web/sites/default/config/default/mailsystem.settings.yml +++ b/web/sites/default/config/default/mailsystem.settings.yml @@ -3,9 +3,4 @@ _core: theme: current defaults: sender: maillog - formatter: swiftmailer -modules: - swiftmailer: - none: - sender: swiftmailer - formatter: swiftmailer + formatter: php_mail diff --git a/web/sites/default/config/local/mailsystem.settings.yml b/web/sites/default/config/local/mailsystem.settings.yml index edd95f9af..b40f538d5 100644 --- a/web/sites/default/config/local/mailsystem.settings.yml +++ b/web/sites/default/config/local/mailsystem.settings.yml @@ -3,9 +3,4 @@ _core: theme: current defaults: sender: maillog - formatter: swiftmailer -modules: - swiftmailer: - none: - sender: swiftmailer - formatter: swiftmailer + formatter: php_mail From 8dd1b223e824058ece8e6451e77442ab9ec16c70 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 21 Dec 2023 19:29:52 -0700 Subject: [PATCH 11/31] asp-theme: dev-d8-1934 d1b35ea => dev-d8-1934 9ceb606 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index e13931600..1d82d833d 100644 --- a/composer.lock +++ b/composer.lock @@ -11278,7 +11278,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "d1b35eaf563cc7d31b0111d23623ca68b61dd5b0" + "reference": "9ceb606c05d3823947d16166644b904dbff709f2" }, "type": "drupal-theme", "license": [ @@ -11295,7 +11295,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2023-12-16T18:37:47+00:00" + "time": "2023-12-22T02:28:50+00:00" }, { "name": "necyberteam/campus-champions-theme", From 80a977ae8a69f438098f9442b47c648a46887b33 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 21 Dec 2023 19:31:43 -0700 Subject: [PATCH 12/31] access: dev-d8-1934 4b95397 => dev-d8-1934 055f823 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 1d82d833d..3913924b9 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "4b953979211b8bc6c1bd66682984badfd699e466" + "reference": "055f823911d4ec70b7ece9361e57c024a389022b" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2023-12-16T22:21:35+00:00" + "time": "2023-12-22T02:31:08+00:00" }, { "name": "arthurkushman/query-path", From 5977c2754e249e9053434359c90998d2a535f4b4 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 22 Dec 2023 15:56:48 +0000 Subject: [PATCH 13/31] Default mailer should not be maillog --- web/sites/default/config/default/system.mail.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/sites/default/config/default/system.mail.yml b/web/sites/default/config/default/system.mail.yml index 6af73a918..419e77e58 100644 --- 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 From 72ee4a197c3cd893c331cc08a8948e69803b6857 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 22 Dec 2023 17:07:26 +0000 Subject: [PATCH 14/31] Fix ask.ci tests --- .../asp/affinity-groups/affinity_groups-individual.feature | 2 +- .../features/templates/affinity_groups/affinity_group.feature | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/behat/features/asp/affinity-groups/affinity_groups-individual.feature b/tests/behat/features/asp/affinity-groups/affinity_groups-individual.feature index 0299b8353..e7ea94ed8 100644 --- 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/templates/affinity_groups/affinity_group.feature b/tests/behat/features/templates/affinity_groups/affinity_group.feature index 1caf2dcf7..0fc6abb76 100644 --- 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" From ea77fdcf44a2eaaab4dd78c8b4fc08d3a6940a21 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 22 Dec 2023 11:27:53 -0700 Subject: [PATCH 15/31] asp-theme: dev-d8-1934 9ceb606 => dev-d8-1934 57aa45d --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 3913924b9..8e9e58072 100644 --- a/composer.lock +++ b/composer.lock @@ -11278,7 +11278,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "9ceb606c05d3823947d16166644b904dbff709f2" + "reference": "57aa45d922780eb3c27ff2a11c59ea453490726e" }, "type": "drupal-theme", "license": [ @@ -11295,7 +11295,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2023-12-22T02:28:50+00:00" + "time": "2023-12-22T18:26:57+00:00" }, { "name": "necyberteam/campus-champions-theme", From 397e78bd2a5794b39fc7335ab48fb504cf0374aa Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 26 Dec 2023 13:15:37 -0500 Subject: [PATCH 16/31] Use "Send for Review" button --- .../match-plus-engagement-form.cy.js | 22 ++++++++++--------- .../match-premier-engagement-form.cy.js | 22 ++++++++++--------- .../tags/tag-individual-engagements.cy.js | 2 +- 3 files changed, 25 insertions(+), 21 deletions(-) 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 index b29da4721..ea7d02e14 100644 --- 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 @@ -14,24 +14,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(); }); }); diff --git a/tests/cypress/cypress/e2e/accessmatch/match-services/match-premier-engagement-form.cy.js b/tests/cypress/cypress/e2e/accessmatch/match-services/match-premier-engagement-form.cy.js index 3cb653402..54be18e91 100644 --- a/tests/cypress/cypress/e2e/accessmatch/match-services/match-premier-engagement-form.cy.js +++ b/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(); }); }); diff --git a/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js b/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js index 7e998d27e..57dd0ff92 100644 --- a/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js @@ -55,7 +55,7 @@ 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(); - cy.get('#edit-moderation-state-0-state').select('Submitted'); + // Send for Review cy.get('#edit-submit').click(); cy.contains('Thank you for submitting your project.'); From 731379776fe0f766a31516874fec41c15fcdfd36 Mon Sep 17 00:00:00 2001 From: protitude Date: Tue, 26 Dec 2023 11:41:22 -0700 Subject: [PATCH 17/31] asp-theme: dev-d8-1934 57aa45d => dev-d8-1934 8236a55 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 8e9e58072..a8e132575 100644 --- a/composer.lock +++ b/composer.lock @@ -11278,7 +11278,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "57aa45d922780eb3c27ff2a11c59ea453490726e" + "reference": "8236a55edcd1ac1aa3834bdf90bda504ca346a39" }, "type": "drupal-theme", "license": [ @@ -11295,7 +11295,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2023-12-22T18:26:57+00:00" + "time": "2023-12-26T18:39:02+00:00" }, { "name": "necyberteam/campus-champions-theme", From 11671268959268fdcbb1476d307fcbdb01f40fec Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 28 Dec 2023 11:22:03 -0700 Subject: [PATCH 18/31] access: dev-d8-1934 055f823 => dev-d8-1934 1ce1978 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index a8e132575..df4110eaf 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "055f823911d4ec70b7ece9361e57c024a389022b" + "reference": "1ce1978bbecdf6327477e0c62cbc1de93f9cda37" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2023-12-22T02:31:08+00:00" + "time": "2023-12-28T18:20:53+00:00" }, { "name": "arthurkushman/query-path", From 2004db8b1e09de417d0587fd9e9043fe0f25ab75 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 29 Dec 2023 12:04:06 -0700 Subject: [PATCH 19/31] access: dev-d8-1934 1ce1978 => dev-d8-1934 4cdf91b --- composer.json | 3 ++- composer.lock | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index b8c93e9ea..2a971cdf1 100755 --- a/composer.json +++ b/composer.json @@ -203,7 +203,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": { diff --git a/composer.lock b/composer.lock index df4110eaf..39bff04f9 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "1ce1978bbecdf6327477e0c62cbc1de93f9cda37" + "reference": "4cdf91b2300f135f1336bbdef478206d082d1fcc" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2023-12-28T18:20:53+00:00" + "time": "2023-12-29T19:03:26+00:00" }, { "name": "arthurkushman/query-path", From 6ced4a277d59f6268d6efebe90627043930a91fb Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 4 Jan 2024 11:47:32 -0700 Subject: [PATCH 20/31] access: dev-d8-1934 4cdf91b => dev-d8-1934 0dec5a5 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 39bff04f9..49af9e4fc 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "4cdf91b2300f135f1336bbdef478206d082d1fcc" + "reference": "0dec5a5b6a7d8db7761d89a54ea6e3289a5de0d3" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2023-12-29T19:03:26+00:00" + "time": "2024-01-04T18:46:19+00:00" }, { "name": "arthurkushman/query-path", From e0f6444cf48053046a6d7815d79d3f47c9109e8b Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 4 Jan 2024 12:24:21 -0700 Subject: [PATCH 21/31] access: dev-d8-1934 0dec5a5 => dev-d8-1934 0aa861e --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 49af9e4fc..9a7cc3a89 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "0dec5a5b6a7d8db7761d89a54ea6e3289a5de0d3" + "reference": "0aa861e26f470a0801d2a4f627323e52edecc38e" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-01-04T18:46:19+00:00" + "time": "2024-01-04T19:23:15+00:00" }, { "name": "arthurkushman/query-path", From 1959acb63ad77afc6bba65ac964a130f64612cea Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 4 Jan 2024 13:52:50 -0700 Subject: [PATCH 22/31] asp-theme: dev-d8-1934 8236a55 => dev-d8-1934 ae5a029 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 9a7cc3a89..18fbd13f6 100644 --- a/composer.lock +++ b/composer.lock @@ -11278,7 +11278,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "8236a55edcd1ac1aa3834bdf90bda504ca346a39" + "reference": "ae5a0299c329f2f79c9cb2ebccb33dcc12b106c3" }, "type": "drupal-theme", "license": [ @@ -11295,7 +11295,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2023-12-26T18:39:02+00:00" + "time": "2024-01-04T20:50:00+00:00" }, { "name": "necyberteam/campus-champions-theme", From 2f22b373fae494d8ca737f79b1120812a6abb3b8 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 4 Jan 2024 17:14:57 -0700 Subject: [PATCH 23/31] asp-theme: dev-d8-1934 ae5a029 => dev-d8-1934 1505328 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 18fbd13f6..567b784bf 100644 --- a/composer.lock +++ b/composer.lock @@ -11278,7 +11278,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "ae5a0299c329f2f79c9cb2ebccb33dcc12b106c3" + "reference": "15053284211b442eab367bfc3226c792b4e38fed" }, "type": "drupal-theme", "license": [ @@ -11295,7 +11295,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-01-04T20:50:00+00:00" + "time": "2024-01-05T00:13:48+00:00" }, { "name": "necyberteam/campus-champions-theme", From a44c68bc05e58c76b189c172a6290b7e6ffbdcc1 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 4 Jan 2024 17:16:42 -0700 Subject: [PATCH 24/31] config: match fieldsets to details d8-1934 --- ...form_display.node.match_engagement.default.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/web/sites/default/config/default/core.entity_form_display.node.match_engagement.default.yml b/web/sites/default/config/default/core.entity_form_display.node.match_engagement.default.yml index 5b53e7775..2059c2348 100644 --- a/web/sites/default/config/default/core.entity_form_display.node.match_engagement.default.yml +++ b/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: "

Please enter as many as five milestones for this engagement. Only the first milestone is required.

\r\n\r\n

Example of a first milestone (see more example milestones in the MATCH FAQ):

\r\n\r\n
    \r\n
  • Ramp Up
    • \r\n
  • Discuss meeting schedules (weekly, monthly, etc.)
    • \r\n
  • Tutorials (Intro to GPU computing)
    • \r\n
  • Jetstream accounts setup, access/navigation
    • \r\n
  • Test run ice sheet flow simulations on GPUs, view results
    • \r\n
" required_fields: true id: node.match_engagement.default targetEntityType: node From 510671bb6b189e325132fed9ac7ac4ed3845a0b1 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 4 Jan 2024 17:20:02 -0700 Subject: [PATCH 25/31] access: dev-d8-1934 0aa861e => dev-d8-1934 6433280 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 567b784bf..f198077a0 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "0aa861e26f470a0801d2a4f627323e52edecc38e" + "reference": "64332803c7edc43a74a0e45ea884e136e71bc68a" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-01-04T19:23:15+00:00" + "time": "2024-01-05T00:19:15+00:00" }, { "name": "arthurkushman/query-path", From c1b66ec2efd58959403f982dbd07e4e61304ec6e Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 5 Jan 2024 15:21:01 +0000 Subject: [PATCH 26/31] Update access module --- composer.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.lock b/composer.lock index 2757d9b78..ef2f33fab 100644 --- 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": "33bcc3360176141839a2f1c13e702766", + "content-hash": "7180a56a396865b6d51c79ede0f04046", "packages": [ { "name": "access/drupal_seamless_cilogon", @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "64332803c7edc43a74a0e45ea884e136e71bc68a" + "reference": "4eb32d900d7e79e337747dbeed507cee817d6aa6" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-01-05T00:19:15+00:00" + "time": "2024-01-05T15:11:58+00:00" }, { "name": "arthurkushman/query-path", From c690764e6649439258d2b5fbd8c3a746abdc5d24 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Fri, 5 Jan 2024 10:26:40 -0500 Subject: [PATCH 27/31] Fix language for engagement test --- .../e2e/accessmatch/tags/tag-individual-engagements.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js b/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js index 57dd0ff92..6972bab99 100644 --- a/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js @@ -57,7 +57,7 @@ describe("Verify a tag's page list of engagements", () => { cy.get(".tags-select").contains("community-outreach").click(); // Send for Review 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') From 58c48d0f930396ee5ffa2f45c590e3c52d8fb11d Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Fri, 5 Jan 2024 10:55:57 -0500 Subject: [PATCH 28/31] Selected state from dropdown --- .../e2e/accessmatch/tags/tag-individual-engagements.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js b/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js index 6972bab99..8355bbde0 100644 --- a/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual-engagements.cy.js @@ -56,6 +56,7 @@ describe("Verify a tag's page list of engagements", () => { // 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 sending your project for review.'); @@ -65,7 +66,6 @@ describe("Verify a tag's page list of engagements", () => { .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') From 3bc1252b376ba2793e2470c89dc8f7bc8a37ed7c Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Fri, 5 Jan 2024 10:57:55 -0500 Subject: [PATCH 29/31] Fix spelling --- .../e2e/accessmatch/announcements/announcement-form.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress/cypress/e2e/accessmatch/announcements/announcement-form.cy.js b/tests/cypress/cypress/e2e/accessmatch/announcements/announcement-form.cy.js index 5f8fcd3f6..18e669019 100644 --- a/tests/cypress/cypress/e2e/accessmatch/announcements/announcement-form.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/announcements/announcement-form.cy.js @@ -23,7 +23,7 @@ describe("Authenticated user tests the Announcement Form without adding an Affin cy.get(".page-title").contains("Create ACCESS Announcements"); //Form Title Field - cy.get("#edit-title-0-value").type("Cypress-Created-Annoucement"); + cy.get("#edit-title-0-value").type("Cypress-Created-Announcement"); //Form Image Field cy.get("#ajax-wrapper > .claro-details").contains("Featured Image"); From 34f1af18d4267385f7561a7aecd9aae92fc8657e Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 5 Jan 2024 16:07:09 +0000 Subject: [PATCH 30/31] Update access module --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index ef2f33fab..3270901a1 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "4eb32d900d7e79e337747dbeed507cee817d6aa6" + "reference": "8d0b984378580929ef6c6d8558596c6a6a8ab256" }, "type": "drupal-custom-module", "license": [ @@ -312,7 +312,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-01-05T15:11:58+00:00" + "time": "2024-01-05T16:06:30+00:00" }, { "name": "arthurkushman/query-path", From 6c20e2e09e767625db143872db8dd61d40e5f2dd Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 5 Jan 2024 16:30:07 +0000 Subject: [PATCH 31/31] Update access module and theme --- composer.json | 4 ++-- composer.lock | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 18ecc4fc1..4021d7dd4 100755 --- a/composer.json +++ b/composer.json @@ -64,7 +64,7 @@ "access/operations_cider": "dev-main", "acquia/blt": "^13.7", "acquia/blt-behat": "^1.3", - "amp/access": "d8-1934-dev", + "amp/access": "3.0.x-dev", "composer/installers": "^1.2", "cweagans/composer-patches": "^1.6", "drupal/access_by_ref": "^3.0", @@ -167,7 +167,7 @@ "drupal_fork/cilogon_auth": "main-dev", "drupal_fork/domain_adv": "main-dev", "drush/drush": "^12.1", - "necyberteam/asp-theme": "d8-1934-dev", + "necyberteam/asp-theme": "main-dev", "necyberteam/campus-champions-theme": "dev-main", "npm-asset/select2": "^4.0", "oomphinc/composer-installers-extender": "^2.0", diff --git a/composer.lock b/composer.lock index df5c49f2c..b6c25b32b 100644 --- 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": "7180a56a396865b6d51c79ede0f04046", + "content-hash": "7e06033ca5352f7bc0abefd667ea08d5", "packages": [ { "name": "access/drupal_seamless_cilogon", @@ -291,12 +291,13 @@ }, { "name": "amp/access", - "version": "dev-d8-1934", + "version": "3.0.x-dev", "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "8d0b984378580929ef6c6d8558596c6a6a8ab256" + "reference": "349fec95fe37430c80bb1fa275405763c28e818f" }, + "default-branch": true, "type": "drupal-custom-module", "license": [ "GPL-2.0+" @@ -312,7 +313,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-01-05T16:06:30+00:00" + "time": "2024-01-05T16:27:37+00:00" }, { "name": "arthurkushman/query-path", @@ -11333,12 +11334,13 @@ }, { "name": "necyberteam/asp-theme", - "version": "dev-d8-1934", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "15053284211b442eab367bfc3226c792b4e38fed" + "reference": "afaaed79def3208dd75b6d47017a16b30c26cd4e" }, + "default-branch": true, "type": "drupal-theme", "license": [ "MIT" @@ -11354,7 +11356,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-01-05T00:13:48+00:00" + "time": "2024-01-05T16:29:13+00:00" }, { "name": "necyberteam/campus-champions-theme", @@ -11362,7 +11364,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/campus-champions-theme.git", - "reference": "a754e502f8bebc632fc825b590c5a38826601a8e" + "reference": "acf7243377991516fa6ac6a21ec77ed44a41504b" }, "default-branch": true, "type": "drupal-theme", @@ -11380,7 +11382,7 @@ "issues": "https://github.com/necyberteam/campus-champions-theme/issues", "source": "https://github.com/necyberteam/campus-champions-theme" }, - "time": "2023-11-30T21:24:11+00:00" + "time": "2024-01-05T16:19:53+00:00" }, { "name": "nikic/php-parser",