From 8e327dd43cdae6e845c89298466444988a801b97 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 2 May 2024 12:20:49 -0600 Subject: [PATCH 01/39] access: 3.0.x-dev 94e25ea => dev-d8-2119 c1181a0 --- composer.json | 2 +- composer.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7652b28ab..815a1db5b 100755 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "access/operations_cider": "dev-main", "acquia/blt": "^13.7", "acquia/blt-behat": "^1.3", - "amp/access": "3.0.x-dev", + "amp/access": "d8-2119-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 a9f9ff7d4..11fbf79e6 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": "0c0cdc708713c2ce3f63d44fc2fd0a4e", + "content-hash": "37da4ebcb81c5bfced0fc731563af529", "packages": [ { "name": "access/drupal_seamless_cilogon", @@ -291,17 +291,16 @@ }, { "name": "amp/access", - "version": "3.0.x-dev", + "version": "dev-d8-2119", "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "94e25eaa0ee38eac510e50a26cbc0c8adbb14bd5" + "reference": "c1181a0fc1f3284afc8efb0ddb62c51e26146293" }, "require": { "gioni06/gpt3-tokenizer": "^1.2", "openai-php/client": "^0.4.1" }, - "default-branch": true, "type": "drupal-custom-module", "license": [ "GPL-2.0+" @@ -317,7 +316,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-04-30T21:43:56+00:00" + "time": "2024-05-02T18:18:42+00:00" }, { "name": "arthurkushman/query-path", From 3eda01f3221a22a0028a9347c13cd85a326e3652 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 2 May 2024 14:28:15 -0600 Subject: [PATCH 02/39] access: dev-d8-2119 c1181a0 => dev-d8-2119 22f26c6 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 11fbf79e6..d889861ce 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "c1181a0fc1f3284afc8efb0ddb62c51e26146293" + "reference": "22f26c654714c4e142585487bb698698666969d0" }, "require": { "gioni06/gpt3-tokenizer": "^1.2", @@ -316,7 +316,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-05-02T18:18:42+00:00" + "time": "2024-05-02T20:26:34+00:00" }, { "name": "arthurkushman/query-path", From ed2fbb8350c34d235b305c965e0923c959f83224 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 3 May 2024 11:10:56 -0600 Subject: [PATCH 03/39] config: update careers button d8-2118 --- web/sites/default/config/default/nect.settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/sites/default/config/default/nect.settings.yml b/web/sites/default/config/default/nect.settings.yml index 9b32e8236..93fc77a09 100644 --- a/web/sites/default/config/default/nect.settings.yml +++ b/web/sites/default/config/default/nect.settings.yml @@ -10,7 +10,7 @@ favicon: nect_front_text: 'Advanced Computing Resources for Researchers at Small and Medium Sized Institutions in Northern New England' gpct_front_text: 'The Great Plains CyberTeam is a distributed mentor-mentee workforce development program that works with institutions within the region that have growing Cyberinfrastructure needs; participants work together to determine the institution’s research computing needs and work through the process from identification to implementation, developing best practices along the way, to enhance campus capabilities that enable research.' rmacc_front_text: 'Advanced Computing Resources for Researchers and Educators at Small and Medium Sized Institutions in the Rocky Mountain Advanced Computing Consortium' -careers_front_text: "CAREERS: Bringing Computing Support to Small to Mid-Size Institutions in the Northeast U.S.\r\n
Learn more about how CAREERS can benefit your research
\r\n
About Us
" +careers_front_text: "CAREERS: Bringing Computing Support to Small to Mid-Size Institutions in the Northeast U.S.\r\n
Learn more about how CAREERS can benefit your research
\r\n
About Us
" kentucky_front_text: 'Advanced Computing Resources for Researchers and Educators at Small and Medium Sized Institutions in Kentucky and Surrounding States' sweeter_front_text: 'CC* Team: SWEETER -- SouthWest Expertise in Expanding, Training, Education and Research' mines_front_text: 'Helping Scientists Do Their Science' From 884d0d8a48cba22bca1c47967ab73a30dbb793e8 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 9 May 2024 13:58:04 -0600 Subject: [PATCH 04/39] asp-theme: dev-main 402eaf2 => dev-d8-2050 425e4ee --- composer.json | 2 +- composer.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7652b28ab..494f2b85c 100755 --- a/composer.json +++ b/composer.json @@ -174,7 +174,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-2050-dev", "necyberteam/campus-champions-theme": "main-dev", "necyberteam/webform_submission_search_api": "main-dev", "npm-asset/select2": "^4.0", diff --git a/composer.lock b/composer.lock index 4e0243668..082c97ea1 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": "0c0cdc708713c2ce3f63d44fc2fd0a4e", + "content-hash": "99bde283f7da39d2fbd916f836daefe6", "packages": [ { "name": "access/drupal_seamless_cilogon", @@ -11651,13 +11651,12 @@ }, { "name": "necyberteam/asp-theme", - "version": "dev-main", + "version": "dev-d8-2050", "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "402eaf2126021eb03ef86f5afc8154ddc4426675" + "reference": "425e4eee93202c74a1c555704e999579ea4fadf7" }, - "default-branch": true, "type": "drupal-theme", "license": [ "MIT" @@ -11673,7 +11672,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-02T20:41:39+00:00" + "time": "2024-05-09T19:55:48+00:00" }, { "name": "necyberteam/campus-champions-theme", From d3089e84539d186a5ba41c23a8db1fb71d547e4d Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 9 May 2024 13:59:30 -0600 Subject: [PATCH 05/39] config: breadcrumb block show on front d8-2050 --- .../default/config/default/block.block.breadcrumbs.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/web/sites/default/config/default/block.block.breadcrumbs.yml b/web/sites/default/config/default/block.block.breadcrumbs.yml index e74bd8cc3..dc24c73a7 100644 --- a/web/sites/default/config/default/block.block.breadcrumbs.yml +++ b/web/sites/default/config/default/block.block.breadcrumbs.yml @@ -17,8 +17,4 @@ settings: label: Breadcrumbs label_display: '0' provider: system -visibility: - request_path: - id: request_path - negate: true - pages: '' +visibility: { } From be627117727f517ba1778c304d815ebefa57a4c7 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 9 May 2024 15:00:48 -0600 Subject: [PATCH 06/39] asp-theme: dev-d8-2050 425e4ee => dev-d8-2050 4efce67 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 082c97ea1..a585a0678 100644 --- a/composer.lock +++ b/composer.lock @@ -11655,7 +11655,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "425e4eee93202c74a1c555704e999579ea4fadf7" + "reference": "4efce67c8a931afd6591623e278b1a5f7ebfac8e" }, "type": "drupal-theme", "license": [ @@ -11672,7 +11672,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-09T19:55:48+00:00" + "time": "2024-05-09T20:59:54+00:00" }, { "name": "necyberteam/campus-champions-theme", From 26210d25f4751de4cd37c7f06f78fdb9db9c301a Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 9 May 2024 15:15:29 -0600 Subject: [PATCH 07/39] set domain #nobuild --- blt/md/md-2050 | 1 + 1 file changed, 1 insertion(+) create mode 100644 blt/md/md-2050 diff --git a/blt/md/md-2050 b/blt/md/md-2050 new file mode 100644 index 000000000..d7db02ba2 --- /dev/null +++ b/blt/md/md-2050 @@ -0,0 +1 @@ +amp_cyberinfrastructure_org From 9f2208e1f2de0f80361bf15c89ceeb59d3ccd7cf Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 9 May 2024 17:27:40 -0600 Subject: [PATCH 08/39] access: dev-d8-2119 22f26c6 => dev-d8-2119 ef5ae2a --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index dc78e9c85..adf295c6d 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "22f26c654714c4e142585487bb698698666969d0" + "reference": "ef5ae2a417f611d2e4f573d19a7330a10da5c76a" }, "require": { "gioni06/gpt3-tokenizer": "^1.2", @@ -316,7 +316,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-05-02T20:26:34+00:00" + "time": "2024-05-09T23:26:25+00:00" }, { "name": "arthurkushman/query-path", From b06052ec425db9b69b407b95bc3c763f3a5284cc Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 10 May 2024 09:47:22 -0600 Subject: [PATCH 09/39] nect: community persona - update layout d8-2120 --- .../nect-theme/templates/page--community-persona.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/themes/nect-theme/templates/page--community-persona.html.twig b/web/themes/nect-theme/templates/page--community-persona.html.twig index 322fbc7f1..7656497d7 100755 --- a/web/themes/nect-theme/templates/page--community-persona.html.twig +++ b/web/themes/nect-theme/templates/page--community-persona.html.twig @@ -1,6 +1,6 @@ {% extends "page.html.twig" %} {% block main_wrapper_classes %} - {% set sidebar_first_classes = "order-1 col-lg-4 col-12 mx-auto" %} - {% set main_wrapper_classes = "order-2 col-lg-8 col-12 mx-auto" %} + {% set sidebar_first_classes = "order-1 col-lg-3 col-12 mx-auto" %} + {% set main_wrapper_classes = "order-2 col-lg-9 col-12 mx-auto" %} {{ parent() }} {% endblock %} From 7a351c7561c00bff85aa22ebdbb8bcce86abb903 Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 10 May 2024 12:25:00 -0600 Subject: [PATCH 10/39] asp-theme: dev-d8-2050 4efce67 => dev-d8-2050 233671b --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index a585a0678..673de3379 100644 --- a/composer.lock +++ b/composer.lock @@ -11655,7 +11655,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "4efce67c8a931afd6591623e278b1a5f7ebfac8e" + "reference": "233671bbb6e1fc9b6bcb36eaa78721ef98c48ec5" }, "type": "drupal-theme", "license": [ @@ -11672,7 +11672,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-09T20:59:54+00:00" + "time": "2024-05-10T18:23:50+00:00" }, { "name": "necyberteam/campus-champions-theme", From 97612ff70e5253287bffeffda2f449f7e2d32e3b Mon Sep 17 00:00:00 2001 From: protitude Date: Fri, 10 May 2024 16:27:53 -0600 Subject: [PATCH 11/39] asp-theme: dev-d8-2050 233671b => dev-d8-2050 24da383 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 673de3379..6d1213c47 100644 --- a/composer.lock +++ b/composer.lock @@ -11655,7 +11655,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "233671bbb6e1fc9b6bcb36eaa78721ef98c48ec5" + "reference": "24da383cac106b4048b254192a25fbc5bef4694f" }, "type": "drupal-theme", "license": [ @@ -11672,7 +11672,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-10T18:23:50+00:00" + "time": "2024-05-10T22:24:48+00:00" }, { "name": "necyberteam/campus-champions-theme", From 190c84bbea4713c4bdb3d4cf2c4b3a04fe13c278 Mon Sep 17 00:00:00 2001 From: protitude Date: Tue, 14 May 2024 09:55:11 -0600 Subject: [PATCH 12/39] asp-theme: dev-d8-2050 24da383 => dev-d8-2050 7896172 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 6d1213c47..14307ff86 100644 --- a/composer.lock +++ b/composer.lock @@ -11655,7 +11655,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "24da383cac106b4048b254192a25fbc5bef4694f" + "reference": "7896172b6b06d05a4a4b574aa9ee97a71a656930" }, "type": "drupal-theme", "license": [ @@ -11672,7 +11672,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-10T22:24:48+00:00" + "time": "2024-05-14T15:53:49+00:00" }, { "name": "necyberteam/campus-champions-theme", From 3124252948b9326f7117e0983745b574a69d072c Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 16 May 2024 12:34:40 -0600 Subject: [PATCH 13/39] config: views text updates d8-2130 --- web/sites/default/config/default/views.view.access_news.yml | 2 +- .../default/views.view.recurring_events_event_instances.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/sites/default/config/default/views.view.access_news.yml b/web/sites/default/config/default/views.view.access_news.yml index 51ba886f1..f24cbbd28 100644 --- a/web/sites/default/config/default/views.view.access_news.yml +++ b/web/sites/default/config/default/views.view.access_news.yml @@ -2181,7 +2181,7 @@ display: plugin_id: text empty: false content: - value: 'See all announcements' + value: 'See all' format: full_html tokenize: false display_extenders: { } diff --git a/web/sites/default/config/default/views.view.recurring_events_event_instances.yml b/web/sites/default/config/default/views.view.recurring_events_event_instances.yml index 8c295209f..d078bc1b6 100644 --- a/web/sites/default/config/default/views.view.recurring_events_event_instances.yml +++ b/web/sites/default/config/default/views.view.recurring_events_event_instances.yml @@ -1319,7 +1319,7 @@ display: admin_label: '' plugin_id: text_custom empty: false - content: '

Upcoming Events

' + content: '

Training and Events

' tokenize: false footer: area: @@ -1332,7 +1332,7 @@ display: plugin_id: text empty: false content: - value: 'See all events' + value: 'See all' format: full_html tokenize: false display_extenders: { } From d2d770ace53adf33096ab2c05a35b763bd5a071d Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Thu, 16 May 2024 18:46:59 +0000 Subject: [PATCH 14/39] Update access module --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 4e0243668..5aa07dc68 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "58cfcdcccfd5158c82b4f4c98f5391632f9fdd9d" + "reference": "6fab5a6eba4e8f7fd53fa518f8363e44365f70b8" }, "require": { "gioni06/gpt3-tokenizer": "^1.2", @@ -317,7 +317,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-05-02T20:25:11+00:00" + "time": "2024-05-16T15:08:22+00:00" }, { "name": "arthurkushman/query-path", From ff25de2b3452a13c64766e4c1e99f0b66c7a5c92 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 16 May 2024 13:24:24 -0600 Subject: [PATCH 15/39] composer: add recaptcha_v3 - settings: ignore recaptcha_v3 --- composer.json | 3 +- composer.lock | 72 +++++++++++++++++++++++++++++++--- web/sites/default/settings.php | 1 + 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7652b28ab..7be876991 100755 --- a/composer.json +++ b/composer.json @@ -130,7 +130,8 @@ "drupal/readonlymode": "^1.1", "drupal/real_aes": "^2.3", "drupal/realname": "^2.0@beta", - "drupal/recaptcha": "^3.0", + "drupal/recaptcha": "^3.2", + "drupal/recaptcha_v3": "^2.0", "drupal/recurring_events": "^2.0@RC", "drupal/redirect": "^1.8", "drupal/rel_to_abs": "^2.2", diff --git a/composer.lock b/composer.lock index 4e0243668..a422d7f9f 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": "0c0cdc708713c2ce3f63d44fc2fd0a4e", + "content-hash": "49cd6baa9f2a207c05cad4704907f14a", "packages": [ { "name": "access/drupal_seamless_cilogon", @@ -7243,6 +7243,10 @@ "name": "See other contributors", "homepage": "https://www.drupal.org/node/147903/committers" }, + { + "name": "diolan", + "homepage": "https://www.drupal.org/user/2336786" + }, { "name": "hass", "homepage": "https://www.drupal.org/user/85918" @@ -7255,6 +7259,10 @@ "name": "kim.pepper", "homepage": "https://www.drupal.org/user/370574" }, + { + "name": "larowlan", + "homepage": "https://www.drupal.org/user/395439" + }, { "name": "Liam Morland", "homepage": "https://www.drupal.org/user/493050" @@ -7267,13 +7275,13 @@ "name": "RobLoach", "homepage": "https://www.drupal.org/user/61114" }, - { - "name": "soxofaan", - "homepage": "https://www.drupal.org/user/41478" - }, { "name": "wundo", "homepage": "https://www.drupal.org/user/25523" + }, + { + "name": "yuriseki", + "homepage": "https://www.drupal.org/user/1523064" } ], "description": "Protect your website from spam and abuse while letting real people pass through with ease.", @@ -7283,6 +7291,60 @@ "issues": "https://www.drupal.org/project/issues/recaptcha" } }, + { + "name": "drupal/recaptcha_v3", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/recaptcha_v3.git", + "reference": "2.0.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/recaptcha_v3-2.0.1.zip", + "reference": "2.0.1", + "shasum": "f2226e4227d146df17d584b5307316da182f4e2a" + }, + "require": { + "drupal/captcha": "*", + "drupal/core": "^9.5 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.1", + "datestamp": "1692375692", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "B-Prod", + "homepage": "https://www.drupal.org/user/407852" + }, + { + "name": "dench0", + "homepage": "https://www.drupal.org/user/896504" + }, + { + "name": "majid.ali", + "homepage": "https://www.drupal.org/user/1271330" + } + ], + "description": "The reCaptcha V3 module provides integration with Google reCaptcha V3 and CAPTCHA module.", + "homepage": "https://www.drupal.org/project/recaptcha_v3", + "support": { + "source": "https://git.drupalcode.org/project/recaptcha_v3", + "error": "require.drupal/captcha : invalid version constraint (Could not parse version constraint ^2.0': Invalid version string \"^2.0'\")" + } + }, { "name": "drupal/recurring_events", "version": "2.0.1", diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php index c89888830..2705e7e4b 100755 --- a/web/sites/default/settings.php +++ b/web/sites/default/settings.php @@ -82,4 +82,5 @@ 'recaptcha', 'upgrade_status', 'symfony_mailer', + 'recaptcha_v3', ]; From 2f98d7e71852cb3414d7940711cb6a72a0f35f07 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Thu, 16 May 2024 19:40:06 +0000 Subject: [PATCH 16/39] Fix test for announcements and events blocks --- tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js b/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js index 36a74b631..79b46a19f 100644 --- a/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js @@ -13,19 +13,19 @@ describe("Unauthenticated user tests the ASP Homepage", () => { //Announcements block section cy.get(".block-views-blockaccess-news-latest-news-block").contains( - "announcements" + "Announcements" ); cy.get(".block-views-blockaccess-news-latest-news-block").contains( - "See all announcements" + "See all" ); //Events block section cy.get( ".block-views-blockrecurring-events-event-instances-latest-events-block" - ).contains("Upcoming Events"); + ).contains("Training and Events"); cy.get( ".block-views-blockrecurring-events-event-instances-latest-events-block" - ).contains("See all events"); + ).contains("See all"); //Search Access block section and button destination cy.get(":nth-child(1) > .mt-0").contains("Search ACCESS"); From a5135e881a79d43ed52eb2332ff796eda43a4125 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Thu, 16 May 2024 19:40:06 +0000 Subject: [PATCH 17/39] Fix test for announcements and events blocks --- tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js b/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js index 36a74b631..79b46a19f 100644 --- a/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js @@ -13,19 +13,19 @@ describe("Unauthenticated user tests the ASP Homepage", () => { //Announcements block section cy.get(".block-views-blockaccess-news-latest-news-block").contains( - "announcements" + "Announcements" ); cy.get(".block-views-blockaccess-news-latest-news-block").contains( - "See all announcements" + "See all" ); //Events block section cy.get( ".block-views-blockrecurring-events-event-instances-latest-events-block" - ).contains("Upcoming Events"); + ).contains("Training and Events"); cy.get( ".block-views-blockrecurring-events-event-instances-latest-events-block" - ).contains("See all events"); + ).contains("See all"); //Search Access block section and button destination cy.get(":nth-child(1) > .mt-0").contains("Search ACCESS"); From 0a50db7c8944d790afb1b80c5a0765f787a65c79 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Thu, 16 May 2024 19:49:20 +0000 Subject: [PATCH 18/39] Behat tests for KB Resources --- tests/behat/features/Jasper/wip.feature | 4 ++-- tests/behat/features/champ/champ-homepage.feature | 2 +- .../templates/affinity_groups/affinity_group.feature | 2 +- .../templates/ci-links/ci-links-1-add-admin.feature | 4 ++-- .../features/templates/ci-links/ci-links-add-auth.feature | 2 +- .../behat/features/templates/ci-links/ci-links-auth.feature | 2 +- .../features/templates/ci-links/ci-links-unauth.feature | 6 +++--- .../templates/homepage/homepage_quick-links-auth.feature | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/behat/features/Jasper/wip.feature b/tests/behat/features/Jasper/wip.feature index 33cbfad40..b172476ec 100644 --- a/tests/behat/features/Jasper/wip.feature +++ b/tests/behat/features/Jasper/wip.feature @@ -23,7 +23,7 @@ Feature: test individual Affinity Group page When I go to "node/327/edit" Then I should see "Edit Affinity Group ACCESS Support" # this CI link is created by amp_dev.install - When I fill in "Display CI Links on your Affinity Group" with "ci-link-for-user-200" + When I fill in "Display Knowledge Base Resources on your Affinity Group" with "ci-link-for-user-200" And I wait 1 seconds When I press "Save" And I wait 2 seconds @@ -33,7 +33,7 @@ Feature: test individual Affinity Group page Then I should see "ci-link-for-user-200" - #Scenario: Administrator user creates CI Link and adds it to an affinity group + #Scenario: Administrator user creates KB Resource and adds it to an affinity group Given I am logged in as a user with the "administrator" role When I go to "/form/resource" Then I should see "Knowledge Base Resources" diff --git a/tests/behat/features/champ/champ-homepage.feature b/tests/behat/features/champ/champ-homepage.feature index bd6b69035..fdcd03b13 100644 --- a/tests/behat/features/champ/champ-homepage.feature +++ b/tests/behat/features/champ/champ-homepage.feature @@ -28,7 +28,7 @@ Feature: For non-authenticated users, Campus Champions Specific Tests encompass Then I should see "About Us" Then I should see "Find Champions" Then I should see "Affinity Groups" - Then I should see "CI Links" + Then I should see "Resources" Then I should see "Advancing Science" Then I should see "Creating Community" Then I should see "Building Knowledge" diff --git a/tests/behat/features/templates/affinity_groups/affinity_group.feature b/tests/behat/features/templates/affinity_groups/affinity_group.feature index e8f1aeb44..552f1b6e2 100644 --- a/tests/behat/features/templates/affinity_groups/affinity_group.feature +++ b/tests/behat/features/templates/affinity_groups/affinity_group.feature @@ -75,7 +75,7 @@ Feature: Feature: test an Affinity Group page # TODO need a future event for the following # Then I should see "[4/04/2023 7:00 PM EDT]" # 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 + # TODO - once able to add a KB Resource to this AG, uncomment the following #Then I should see "ci-link-for-user-200" 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" diff --git a/tests/behat/features/templates/ci-links/ci-links-1-add-admin.feature b/tests/behat/features/templates/ci-links/ci-links-1-add-admin.feature index 457ebdb22..0f3c4309a 100644 --- a/tests/behat/features/templates/ci-links/ci-links-1-add-admin.feature +++ b/tests/behat/features/templates/ci-links/ci-links-1-add-admin.feature @@ -14,7 +14,7 @@ Feature: test KB Resources form When I click the "#edit-submit" element When I go to "/knowledge-base/resources" - When I follow "Add a CI Link" + When I follow "Add a Resource" Then I should be on "/form/resource" And I should see "Title" And I should see "Category" @@ -68,7 +68,7 @@ Feature: test KB Resources form Given I am logged in as a user with the "administrator" role When I go to homepage When I go to "/knowledge-base/resources" - When I follow "Add a CI Link" + When I follow "Add a Resource" Then I should be on "form/resource" Then I should see "Add" When I fill in "title" with "test-login-resource" diff --git a/tests/behat/features/templates/ci-links/ci-links-add-auth.feature b/tests/behat/features/templates/ci-links/ci-links-add-auth.feature index 99ebd9cbd..77a17a372 100644 --- a/tests/behat/features/templates/ci-links/ci-links-add-auth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-add-auth.feature @@ -11,7 +11,7 @@ Resource with Link Title and Link URL (must include https). Scenario: Authenticated user fills out the resource form Given I am logged in as a user with the "authenticated" role When I go to "/knowledge-base/resources" - When I follow "Add a CI Link" + When I follow "Add a Resource" Then I should be on "form/resource" And I should see "Title" And I should see "Category" diff --git a/tests/behat/features/templates/ci-links/ci-links-auth.feature b/tests/behat/features/templates/ci-links/ci-links-auth.feature index a007b4d25..4dd5d987f 100644 --- a/tests/behat/features/templates/ci-links/ci-links-auth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-auth.feature @@ -10,7 +10,7 @@ descriptions, categories, tags (first 3 linked), skill levels, and affinity grou Scenario: Authenticated user Test the resource page Given I am logged in as a user with the "authenticated" role When I go to "/knowledge-base/resources" - Then I should see "Add a CI Link" + Then I should see "Add a Resourcek" Then I should see "Use these links “vetted” by the community" Then I should see "Test CI Link Title" diff --git a/tests/behat/features/templates/ci-links/ci-links-unauth.feature b/tests/behat/features/templates/ci-links/ci-links-unauth.feature index 6fb6fc81b..c4f0edde6 100644 --- a/tests/behat/features/templates/ci-links/ci-links-unauth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-unauth.feature @@ -3,7 +3,7 @@ @javascript Feature: This Behat test goes over the KB Resources Page, when accessed by an -unauthenticated user, this page does not display the "Add a CI Links" button. The search +unauthenticated user, this page does not display the "Add a Resource" button. The search function works on approved KB Resources' titles only, is case-insensitive, and shows a special message if no results are found. There is also a text description at the top of the page. @@ -13,7 +13,7 @@ a special message if no results are found. When I go to "/knowledge-base/resources" Then I should see "Knowledge Base Resources" Then I should see "Use these links “vetted” by the community" - Then I should see "Add a CI Link" + Then I should see "Add a Resource" Then I should see "Test CI Link Title" - When I click "Add a CI Link" + When I click "Add a Resource" Then I should be on "/user/login?destination=/form/resource" diff --git a/tests/behat/features/templates/homepage/homepage_quick-links-auth.feature b/tests/behat/features/templates/homepage/homepage_quick-links-auth.feature index 3dd616a12..867b22e4e 100644 --- a/tests/behat/features/templates/homepage/homepage_quick-links-auth.feature +++ b/tests/behat/features/templates/homepage/homepage_quick-links-auth.feature @@ -26,7 +26,7 @@ Feature: The Front Page includes a site slogan, which is region-specific, When I click "Ask the Community" Then I should be on "https://ask.cyberinfrastructure.org/" When I am on the homepage - When I click "Find CI Links" + When I click "Find Knowledge Base Resources" Then I should be on "/knowledge-base/resources" When I am on the homepage Then I should see the link "Project Submission Form" From 92ac4f962d89306400a58d76e5c630fb3200e431 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Thu, 16 May 2024 19:52:56 +0000 Subject: [PATCH 19/39] Update access module --- composer.json | 2 +- composer.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 815a1db5b..7652b28ab 100755 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "access/operations_cider": "dev-main", "acquia/blt": "^13.7", "acquia/blt-behat": "^1.3", - "amp/access": "d8-2119-dev", + "amp/access": "3.0.x-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 adf295c6d..39eef9842 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": "37da4ebcb81c5bfced0fc731563af529", + "content-hash": "0c0cdc708713c2ce3f63d44fc2fd0a4e", "packages": [ { "name": "access/drupal_seamless_cilogon", @@ -291,16 +291,17 @@ }, { "name": "amp/access", - "version": "dev-d8-2119", + "version": "3.0.x-dev", "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "ef5ae2a417f611d2e4f573d19a7330a10da5c76a" + "reference": "a99b8188bc94e3333b196ced44c7307db519df11" }, "require": { "gioni06/gpt3-tokenizer": "^1.2", "openai-php/client": "^0.4.1" }, + "default-branch": true, "type": "drupal-custom-module", "license": [ "GPL-2.0+" @@ -316,7 +317,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-05-09T23:26:25+00:00" + "time": "2024-05-16T19:36:27+00:00" }, { "name": "arthurkushman/query-path", From b77b8aec34d3db89015dda04a0bcd514716ac923 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Thu, 16 May 2024 20:01:18 +0000 Subject: [PATCH 20/39] Cypress ci-links to resources fixes --- tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js | 2 +- .../e2e/accessmatch/knowledge-base/knowledge-base.cy.js | 2 +- .../cypress/cypress/e2e/accessmatch/tags/tag-individual.cy.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js b/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js index 79b46a19f..665483616 100644 --- a/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/asp-homepage.cy.js @@ -38,7 +38,7 @@ describe("Unauthenticated user tests the ASP Homepage", () => { cy.verifyCallToActionBlock( "/", "Find useful resources now", - "/knowledge-base/ci-links" + "/knowledge-base/resources" ); }); }); diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/knowledge-base.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/knowledge-base.cy.js index d0ad32feb..d10fb93df 100644 --- a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/knowledge-base.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/knowledge-base.cy.js @@ -64,7 +64,7 @@ describe("Tests of the knowledge-base page", () => { .should('have.attr', 'href', '/knowledge-base/resources'); cy.get('.field--type-text-with-summary') - .contains('Popular CI Links'); + .contains('Popular Resources'); // verify count of ask-ci links is 10 cy.get('.block-top-tags-from-askci > .flex-wrap') diff --git a/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual.cy.js b/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual.cy.js index 7e7c849de..4f7d86131 100644 --- a/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/tags/tag-individual.cy.js @@ -43,7 +43,7 @@ describe("Verify the the community-outreach tag page", () => { cy.wrap(row).find('.view-field-published-date-table-column') .should('not.be.empty'); }); - } + } }) } @@ -132,7 +132,7 @@ describe("Verify the the community-outreach tag page", () => { // check more button cy.get('.view-resources') - .contains('All CI Links with this tag') + .contains('All Resources with this tag') .should('have.attr', 'href', '/tags/340/resources'); } From 975cd7a2833eb8b43c8c282fe1cffe370f1acdad Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 16 May 2024 14:42:36 -0600 Subject: [PATCH 21/39] config: hide breadcrumb front d8-2050 --- .../default/config/default/block.block.breadcrumbs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/sites/default/config/default/block.block.breadcrumbs.yml b/web/sites/default/config/default/block.block.breadcrumbs.yml index dc24c73a7..e74bd8cc3 100644 --- a/web/sites/default/config/default/block.block.breadcrumbs.yml +++ b/web/sites/default/config/default/block.block.breadcrumbs.yml @@ -17,4 +17,8 @@ settings: label: Breadcrumbs label_display: '0' provider: system -visibility: { } +visibility: + request_path: + id: request_path + negate: true + pages: '' From 1372449dadbac8a213d321dd8d87cdb5cfdb323c Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 16 May 2024 15:28:49 -0600 Subject: [PATCH 22/39] asp-theme: dev-d8-2050 7896172 => dev-d8-2050 78bca86 --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 14307ff86..3bde812f4 100644 --- a/composer.lock +++ b/composer.lock @@ -11655,7 +11655,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "7896172b6b06d05a4a4b574aa9ee97a71a656930" + "reference": "78bca868f40de3a9dc21c92ba5980115ff912cc4" }, "type": "drupal-theme", "license": [ @@ -11672,7 +11672,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-14T15:53:49+00:00" + "time": "2024-05-16T21:26:10+00:00" }, { "name": "necyberteam/campus-champions-theme", From 98add9d260744f23a9da0bc654999702982a6f41 Mon Sep 17 00:00:00 2001 From: protitude Date: Thu, 16 May 2024 15:34:06 -0600 Subject: [PATCH 23/39] asp-theme: dev-d8-2050 78bca86 => dev-d8-2050 f2f0d9b --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 3bde812f4..2dcaf9c42 100644 --- a/composer.lock +++ b/composer.lock @@ -11655,7 +11655,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "78bca868f40de3a9dc21c92ba5980115ff912cc4" + "reference": "f2f0d9b84a16a8a590ba9c9acdd262c74040e336" }, "type": "drupal-theme", "license": [ @@ -11672,7 +11672,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-16T21:26:10+00:00" + "time": "2024-05-16T21:33:10+00:00" }, { "name": "necyberteam/campus-champions-theme", From 955096bae02afa217e0468d1e36f1d4d682f8a0f Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Mon, 20 May 2024 18:54:08 +0000 Subject: [PATCH 24/39] Update access module and campus champions theme --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 996a9be06..87bc23edb 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "a99b8188bc94e3333b196ced44c7307db519df11" + "reference": "204627f138718e7a59ae94c14b3fd6171b3b7690" }, "require": { "gioni06/gpt3-tokenizer": "^1.2", @@ -317,7 +317,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-05-16T19:36:27+00:00" + "time": "2024-05-20T18:49:21+00:00" }, { "name": "arthurkushman/query-path", @@ -11743,7 +11743,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/campus-champions-theme.git", - "reference": "3b245f51a6f9f2119b237ae11eb2d0311782afc3" + "reference": "4cfcfbd40000ea69b939620cf33312c21c21b364" }, "default-branch": true, "type": "drupal-theme", @@ -11761,7 +11761,7 @@ "issues": "https://github.com/necyberteam/campus-champions-theme/issues", "source": "https://github.com/necyberteam/campus-champions-theme" }, - "time": "2024-05-02T20:41:04+00:00" + "time": "2024-05-20T18:50:03+00:00" }, { "name": "necyberteam/webform_submission_search_api", From 2973647013e4ee4fa676a87429728f6ade23ec22 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Mon, 20 May 2024 20:27:11 +0000 Subject: [PATCH 25/39] Adjust column widths --- web/themes/nect-theme/templates/page.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/themes/nect-theme/templates/page.html.twig b/web/themes/nect-theme/templates/page.html.twig index 2106954cf..ebd5a9b09 100755 --- a/web/themes/nect-theme/templates/page.html.twig +++ b/web/themes/nect-theme/templates/page.html.twig @@ -245,10 +245,10 @@ {% endif %} {% block main_wrapper_classes %} {% if sidebar_first_classes is null %} - {% set sidebar_first_classes = "order-2 order-lg-1 col-lg-4 col-12 mx-auto" %} + {% set sidebar_first_classes = "order-2 order-lg-1 col-lg-3 col-12 mx-auto" %} {% endif %} {% if main_wrapper_classes is null %} - {% set main_wrapper_classes = "order-1 order-lg-2 col-lg-8 col-12 mx-auto" %} + {% set main_wrapper_classes = "order-1 order-lg-2 col-lg-9 col-12 mx-auto" %} {% endif %} {% if domain_name != "ccmnet" %}
From e939ffe73b2da5ac4ef554dcf5dd9ddd73382f1d Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Mon, 20 May 2024 20:39:46 +0000 Subject: [PATCH 26/39] Fix typo in behat test --- tests/behat/features/templates/ci-links/ci-links-auth.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/behat/features/templates/ci-links/ci-links-auth.feature b/tests/behat/features/templates/ci-links/ci-links-auth.feature index 4dd5d987f..b5c1fdbff 100644 --- a/tests/behat/features/templates/ci-links/ci-links-auth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-auth.feature @@ -10,7 +10,7 @@ descriptions, categories, tags (first 3 linked), skill levels, and affinity grou Scenario: Authenticated user Test the resource page Given I am logged in as a user with the "authenticated" role When I go to "/knowledge-base/resources" - Then I should see "Add a Resourcek" + Then I should see "Add a Resource" Then I should see "Use these links “vetted” by the community" Then I should see "Test CI Link Title" From 890c1c21931a1d29abb26f186db50ad70371ad42 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Mon, 20 May 2024 20:47:27 +0000 Subject: [PATCH 27/39] Fix Affinity Group tests --- tests/behat/features/champ/champ-affinity-auth.feature | 2 +- .../behat/features/champ/champ-affinity-unauth.feature | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/behat/features/champ/champ-affinity-auth.feature b/tests/behat/features/champ/champ-affinity-auth.feature index 7240adb06..97cbdae9c 100644 --- a/tests/behat/features/champ/champ-affinity-auth.feature +++ b/tests/behat/features/champ/champ-affinity-auth.feature @@ -47,6 +47,6 @@ Affinity Group Request page for authenticated users. Then I should see "Email" Then I should see "Coordinators" Then I should see "Events" - Then I should see "Knowledge Base Resources" + #Then I should see "Knowledge Base Resources" Then I should see "People" #Then I should see "Masquerade" diff --git a/tests/behat/features/champ/champ-affinity-unauth.feature b/tests/behat/features/champ/champ-affinity-unauth.feature index 1823d7a84..e8ca53a2c 100644 --- a/tests/behat/features/champ/champ-affinity-unauth.feature +++ b/tests/behat/features/champ/champ-affinity-unauth.feature @@ -17,16 +17,16 @@ people are listed, along with constant "Join" functionality and additional butto Then I should see "Affinity Group" #Then I should see "Join" Then I should see "Request An Affinity Group" - When I go to "/affinity-groups/cloud-computing" + When I go to "/affinity-groups/access-support" And I wait for the page to be loaded Then I should see "Members get updates" - Then I should see "Cloud Computing" - Then I should see "cloud-commercial" - Then I should see "People who use or are considering" + Then I should see "ACCESS Support" + Then I should see "ACCESS-website" + Then I should see "Become an ACCESS Support insider by joining our affinity group." Then I should see "Join" Then I should see "Slack" Then I should see "Q&A" - Then I should see "Email" + #Then I should see "Email" Then I should see "Events" Then I should see "Knowledge Base Resources" Then I should see "Announcements" From 4fb849885ebee0246be306599cfae0970d53ccb1 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Mon, 20 May 2024 21:00:25 +0000 Subject: [PATCH 28/39] Avoid quotes in behat test --- tests/behat/features/templates/ci-links/ci-links-auth.feature | 2 +- tests/behat/features/templates/ci-links/ci-links-unauth.feature | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/behat/features/templates/ci-links/ci-links-auth.feature b/tests/behat/features/templates/ci-links/ci-links-auth.feature index b5c1fdbff..a1b81b710 100644 --- a/tests/behat/features/templates/ci-links/ci-links-auth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-auth.feature @@ -11,6 +11,6 @@ descriptions, categories, tags (first 3 linked), skill levels, and affinity grou Given I am logged in as a user with the "authenticated" role When I go to "/knowledge-base/resources" Then I should see "Add a Resource" - Then I should see "Use these links “vetted” by the community" + Then I should see "Use these links" Then I should see "Test CI Link Title" diff --git a/tests/behat/features/templates/ci-links/ci-links-unauth.feature b/tests/behat/features/templates/ci-links/ci-links-unauth.feature index c4f0edde6..e6a7d9d2c 100644 --- a/tests/behat/features/templates/ci-links/ci-links-unauth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-unauth.feature @@ -12,7 +12,7 @@ a special message if no results are found. Given I am not logged in When I go to "/knowledge-base/resources" Then I should see "Knowledge Base Resources" - Then I should see "Use these links “vetted” by the community" + Then I should see "Use these links" Then I should see "Add a Resource" Then I should see "Test CI Link Title" When I click "Add a Resource" From 7a41220fcaa85f26cabde8a7b454a62a73f36323 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 21 May 2024 15:54:16 +0000 Subject: [PATCH 29/39] KB Resources text fix --- tests/behat/features/templates/ci-links/ci-links-auth.feature | 2 +- tests/behat/features/templates/ci-links/ci-links-unauth.feature | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/behat/features/templates/ci-links/ci-links-auth.feature b/tests/behat/features/templates/ci-links/ci-links-auth.feature index a1b81b710..9673c8bf6 100644 --- a/tests/behat/features/templates/ci-links/ci-links-auth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-auth.feature @@ -11,6 +11,6 @@ descriptions, categories, tags (first 3 linked), skill levels, and affinity grou Given I am logged in as a user with the "authenticated" role When I go to "/knowledge-base/resources" Then I should see "Add a Resource" - Then I should see "Use these links" + Then I should see "Cyberinfrastructure professionals" Then I should see "Test CI Link Title" diff --git a/tests/behat/features/templates/ci-links/ci-links-unauth.feature b/tests/behat/features/templates/ci-links/ci-links-unauth.feature index e6a7d9d2c..14659b907 100644 --- a/tests/behat/features/templates/ci-links/ci-links-unauth.feature +++ b/tests/behat/features/templates/ci-links/ci-links-unauth.feature @@ -12,7 +12,7 @@ a special message if no results are found. Given I am not logged in When I go to "/knowledge-base/resources" Then I should see "Knowledge Base Resources" - Then I should see "Use these links" + Then I should see "Cyberinfrastructure professionals" Then I should see "Add a Resource" Then I should see "Test CI Link Title" When I click "Add a Resource" From 7d47c944d7e6aa80e45f19aada871d3f917cd62c Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 21 May 2024 12:21:11 -0400 Subject: [PATCH 30/39] Rename tests from ci-links to resources --- .../resource-auth.cy.js} | 4 ++-- .../resource-unauth.cy.js} | 18 +++++++++--------- .../resources.cy.js} | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) rename tests/cypress/cypress/e2e/accessmatch/knowledge-base/{ci-links/ci-link-indie-auth.cy.js => resources/resource-auth.cy.js} (96%) rename tests/cypress/cypress/e2e/accessmatch/knowledge-base/{ci-links/ci-link.cy.js => resources/resource-unauth.cy.js} (76%) rename tests/cypress/cypress/e2e/accessmatch/knowledge-base/{ci-links/ci-links.cy.js => resources/resources.cy.js} (87%) diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link-indie-auth.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js similarity index 96% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link-indie-auth.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js index c1216e9b3..6a84c48a5 100644 --- a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link-indie-auth.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js @@ -8,7 +8,7 @@ describe("Authenticated user tests a ci link", () => { // login user with the "authenticated" role cy.loginAs("authenticated@amptesting.com", "6%l7iF}6(4tI"); //Navigating to cypress created ci link - cy.visit("/knowledge-base/resources"); + cy.visit("/knowledge-base/ci-links"); cy.get('.view-search-ci-links details summary > div') .contains("dummy-ci-link-for-testing-knowledge-base") .click() @@ -34,7 +34,7 @@ function create_dummy_ci_link() { cy.get("#edit-clear").click() cy.get("#edit-submit").click() - cy.visit("/form/resource"); + cy.visit("/form/ci-link"); cy.get("#edit-approved").check(); cy.get("#edit-title").type("dummy-ci-link-for-testing-knowledge-base"); cy.get("#edit-category").select("Learning"); diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js similarity index 76% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js index 545ec6a91..d482aa950 100644 --- a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js @@ -1,20 +1,20 @@ /* - This test is specifically focused on an individual KB Resource page tested for an unauthenticated user. + This test is specifically focused on an individual CI Links page tested for an unauthenticated user. This test checks for major functions like: - Title, - Description, + CI link title, + CI link description, Attached Affinity Group, Tags, User engagement information ("0 People found this useful"), - Category, - Skill Level, + CI link category, + CI link Skill Level, verifying images and links load in, and "Login to vote" functionality */ -describe("Unauthenticated user tests the Individual KB Resource Page", () => { - it("Should test Individual KB Resource page for unauthenticated user", () => { +describe("Unauthenticated user tests the Individual CI Link Page", () => { + it("Should test Individual CI Link page for unauthenticated user", () => { //Naviagting To Indie CI Link - cy.visit("/knowledge-base/resources"); + cy.visit("/knowledge-base/ci-links"); cy.contains("dummy-ci-link-for-testing-knowledge-base") .click() .then(() => { @@ -41,7 +41,7 @@ describe("Unauthenticated user tests the Individual KB Resource Page", () => { cy.get(".bg-light-teal") .contains("Login to like") .should("have.attr", "href") - .and("contain", "/user/login?destination=/knowledge-base/resources"); + .and("contain", "/user/login?destination=/knowledge-base/ci-links"); }); }); }); diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-links.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resources.cy.js similarity index 87% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-links.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resources.cy.js index 468e3732e..a979c9ff0 100644 --- a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-links.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resources.cy.js @@ -8,9 +8,9 @@ Verifying links load in, And CI Links go to the correct page */ -describe("Unauthenticated user tests the KB Resources Page", () => { - it("Should test the KB Resources page for unauthenticated user", () => { - cy.visit("/knowledge-base/resources"); +describe("Unauthenticated user tests the CI Links Page", () => { + it("Should test the CI Links page for unauthenticated user", () => { + cy.visit("/knowledge-base/ci-links"); //Likes should be an integer value cy.get(".view-search-ci-links details summary .linkcount") .invoke('val') From 7a502e48f36f8896835aba0b56b1975d62394dd6 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 21 May 2024 12:26:23 -0400 Subject: [PATCH 31/39] Revert "Rename tests from ci-links to resources" This reverts commit 7d47c944d7e6aa80e45f19aada871d3f917cd62c. --- .../ci-link-indie-auth.cy.js} | 4 ++-- .../ci-link.cy.js} | 18 +++++++++--------- .../ci-links.cy.js} | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) rename tests/cypress/cypress/e2e/accessmatch/knowledge-base/{resources/resource-auth.cy.js => ci-links/ci-link-indie-auth.cy.js} (96%) rename tests/cypress/cypress/e2e/accessmatch/knowledge-base/{resources/resource-unauth.cy.js => ci-links/ci-link.cy.js} (76%) rename tests/cypress/cypress/e2e/accessmatch/knowledge-base/{resources/resources.cy.js => ci-links/ci-links.cy.js} (87%) diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link-indie-auth.cy.js similarity index 96% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link-indie-auth.cy.js index 6a84c48a5..c1216e9b3 100644 --- a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link-indie-auth.cy.js @@ -8,7 +8,7 @@ describe("Authenticated user tests a ci link", () => { // login user with the "authenticated" role cy.loginAs("authenticated@amptesting.com", "6%l7iF}6(4tI"); //Navigating to cypress created ci link - cy.visit("/knowledge-base/ci-links"); + cy.visit("/knowledge-base/resources"); cy.get('.view-search-ci-links details summary > div') .contains("dummy-ci-link-for-testing-knowledge-base") .click() @@ -34,7 +34,7 @@ function create_dummy_ci_link() { cy.get("#edit-clear").click() cy.get("#edit-submit").click() - cy.visit("/form/ci-link"); + cy.visit("/form/resource"); cy.get("#edit-approved").check(); cy.get("#edit-title").type("dummy-ci-link-for-testing-knowledge-base"); cy.get("#edit-category").select("Learning"); diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link.cy.js similarity index 76% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link.cy.js index d482aa950..545ec6a91 100644 --- a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link.cy.js @@ -1,20 +1,20 @@ /* - This test is specifically focused on an individual CI Links page tested for an unauthenticated user. + This test is specifically focused on an individual KB Resource page tested for an unauthenticated user. This test checks for major functions like: - CI link title, - CI link description, + Title, + Description, Attached Affinity Group, Tags, User engagement information ("0 People found this useful"), - CI link category, - CI link Skill Level, + Category, + Skill Level, verifying images and links load in, and "Login to vote" functionality */ -describe("Unauthenticated user tests the Individual CI Link Page", () => { - it("Should test Individual CI Link page for unauthenticated user", () => { +describe("Unauthenticated user tests the Individual KB Resource Page", () => { + it("Should test Individual KB Resource page for unauthenticated user", () => { //Naviagting To Indie CI Link - cy.visit("/knowledge-base/ci-links"); + cy.visit("/knowledge-base/resources"); cy.contains("dummy-ci-link-for-testing-knowledge-base") .click() .then(() => { @@ -41,7 +41,7 @@ describe("Unauthenticated user tests the Individual CI Link Page", () => { cy.get(".bg-light-teal") .contains("Login to like") .should("have.attr", "href") - .and("contain", "/user/login?destination=/knowledge-base/ci-links"); + .and("contain", "/user/login?destination=/knowledge-base/resources"); }); }); }); diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resources.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-links.cy.js similarity index 87% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resources.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-links.cy.js index a979c9ff0..468e3732e 100644 --- a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resources.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-links.cy.js @@ -8,9 +8,9 @@ Verifying links load in, And CI Links go to the correct page */ -describe("Unauthenticated user tests the CI Links Page", () => { - it("Should test the CI Links page for unauthenticated user", () => { - cy.visit("/knowledge-base/ci-links"); +describe("Unauthenticated user tests the KB Resources Page", () => { + it("Should test the KB Resources page for unauthenticated user", () => { + cy.visit("/knowledge-base/resources"); //Likes should be an integer value cy.get(".view-search-ci-links details summary .linkcount") .invoke('val') From 3fdb3aab2bf9779220d003bcac7753fde014ba49 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 21 May 2024 12:27:58 -0400 Subject: [PATCH 32/39] Rename tests from ci-links to resources --- .../ci-link-indie-auth.cy.js => resources/resource-auth.cy.js} | 0 .../{ci-links/ci-link.cy.js => resources/resource-unauth.cy.js} | 0 .../{ci-links/ci-links.cy.js => resources/resources.cy.js} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename tests/cypress/cypress/e2e/accessmatch/knowledge-base/{ci-links/ci-link-indie-auth.cy.js => resources/resource-auth.cy.js} (100%) rename tests/cypress/cypress/e2e/accessmatch/knowledge-base/{ci-links/ci-link.cy.js => resources/resource-unauth.cy.js} (100%) rename tests/cypress/cypress/e2e/accessmatch/knowledge-base/{ci-links/ci-links.cy.js => resources/resources.cy.js} (100%) diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link-indie-auth.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js similarity index 100% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link-indie-auth.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-auth.cy.js diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js similarity index 100% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-link.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resource-unauth.cy.js diff --git a/tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-links.cy.js b/tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resources.cy.js similarity index 100% rename from tests/cypress/cypress/e2e/accessmatch/knowledge-base/ci-links/ci-links.cy.js rename to tests/cypress/cypress/e2e/accessmatch/knowledge-base/resources/resources.cy.js From dea2a542499efef86623ce59a6821ef5c0d7eb7a Mon Sep 17 00:00:00 2001 From: protitude Date: Tue, 21 May 2024 11:57:24 -0600 Subject: [PATCH 33/39] asp-theme: dev-d8-2050 f2f0d9b => dev-d8-2050 58403ce --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 2dcaf9c42..174147eb5 100644 --- a/composer.lock +++ b/composer.lock @@ -11655,7 +11655,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "f2f0d9b84a16a8a590ba9c9acdd262c74040e336" + "reference": "58403cedec7aa1c9500d7557a3d2c9aca8be0ad1" }, "type": "drupal-theme", "license": [ @@ -11672,7 +11672,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-16T21:33:10+00:00" + "time": "2024-05-21T17:55:40+00:00" }, { "name": "necyberteam/campus-champions-theme", From d7b99aee8f4461408f9aa856853c999525ce411b Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 21 May 2024 15:16:56 -0400 Subject: [PATCH 34/39] Cypress tests for CSSN Direcory --- .../community/cssn/directory.cy.js | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js diff --git a/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js b/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js new file mode 100644 index 000000000..ed44ec6a4 --- /dev/null +++ b/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js @@ -0,0 +1,83 @@ +/* + CSSN Directory page. + + The CSSN Directory has two columns: + - left column with a search form, and facets for roles, skills, and organizations. + - right column with a list of users displaying name, role, organization, and skills. +*/ + +describe('Tests the CSSN Directory Page', () => { + it('Test CSSN Directory for anonymous user', () => { + cy.visit('/community/cssn/directory') + + const crumbs = [ + ['Support', '/'], + ['Community', '/community/overview'], + ['CSSN', '/community/cssn'], + ['Directory', null] + ]; + cy.checkBreadcrumbs(crumbs); + + // Page Title + cy.get('.page-title').contains('CSSN Directory') + + // Search form + cy.get('#edit-search-api-fulltext--2') + .type('Pasquale') + + cy.get('.cssn-directory-item').as('item') + cy.get('@item').should('have.length', 1) // Only one user with the name Pasquale + cy.get('@item').find('.cssn-photo img').verifyImage() + + // Card should link to the community persona page. + cy.get('@item') + .find('a.stretched-link') + .should('contain', 'Andrew Pasquale') + .should("have.attr", "href") + .and("contain", '/community-persona/1373'); + + // Organization should be displayed. + cy.get('@item') + .find('.leading-5 a') + .should('contain', 'Massachusetts Green High Performance Computing Center') + + // Tags should be displayed. + cy.get('@item') + .find('.square-tags ul li') + .should('have.length.at.least', 1) + .find('a') + .should('have.attr', 'href') + .and('contain', '/tags/') + + // Check roles facet. + cy.get('#edit-search-api-fulltext--2').clear() + cy.get('#roles-cip').click() + cy.get('.cssn-directory-item').as('item') + cy.get('@item').then(($item) => { + // There are at least 14 CIPs + expect($item.length).to.be.at.least(14) + + // add the c++ facet; should reduce the number of users. + cy.get('#skills-c').click() + cy.get('.cssn-directory-item').as('item') + cy.get('@item') + .should('have.length.at.least', 1) + .should('have.length.lessThan', $item.length) + }) + + // Reset facets + cy.get('#roles-cip').click() + cy.get('#skills-reset-all').click() + + // Check the "Show more" link for Organizations facet. + cy.get('.block-facet-blockaccess-organization .facets-soft-limit-link').click() + + // Check the organizations facet. + cy.get('#access-organization-4191').click() // Massachusetts Green High Performance Computing Center + cy.get('.cssn-directory-item').as('item') + cy.get('@item') + .should('have.length.at.least', 1) + + // todo: '+ X more' tags text is not currently displaying in Cypress tests. + }) +}) \ No newline at end of file From e01ebb0df70f43e33e9f99e5a23e420a839cc2e0 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 21 May 2024 19:18:04 +0000 Subject: [PATCH 35/39] update access module --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 87bc23edb..3e513e3fb 100644 --- a/composer.lock +++ b/composer.lock @@ -295,7 +295,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/access.git", - "reference": "204627f138718e7a59ae94c14b3fd6171b3b7690" + "reference": "28a8f4d8ccc19db96b3f09f3273fa5b12c22d21f" }, "require": { "gioni06/gpt3-tokenizer": "^1.2", @@ -317,7 +317,7 @@ "issues": "https://github.com/necyberteam/access/issues", "source": "https://github.com/necyberteam/access" }, - "time": "2024-05-20T18:49:21+00:00" + "time": "2024-05-21T19:17:25+00:00" }, { "name": "arthurkushman/query-path", From b9fddf60910f85bcae4a669b82a3aa602716a4b3 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 21 May 2024 15:39:08 -0400 Subject: [PATCH 36/39] Cypress test for anonymized name --- .../cypress/e2e/accessmatch/community/cssn/directory.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js b/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js index ed44ec6a4..ccaa776c6 100644 --- a/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js @@ -32,7 +32,7 @@ describe('Tests the CSSN Directory Page', () => { // Card should link to the community persona page. cy.get('@item') .find('a.stretched-link') - .should('contain', 'Andrew Pasquale') + .should('contain', 'Abico duis interdico') .should("have.attr", "href") .and("contain", '/community-persona/1373'); From d60c2cb0c015a68370042a36966bb0f03853e2c4 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 21 May 2024 20:06:39 +0000 Subject: [PATCH 37/39] Update access theme --- composer.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 174147eb5..20a93406f 100644 --- a/composer.lock +++ b/composer.lock @@ -11655,7 +11655,7 @@ "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "58403cedec7aa1c9500d7557a3d2c9aca8be0ad1" + "reference": "aed9e86ab032ab2cb1400a402dc96115fe3dba7c" }, "type": "drupal-theme", "license": [ @@ -11672,7 +11672,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-21T17:55:40+00:00" + "time": "2024-05-21T20:05:45+00:00" }, { "name": "necyberteam/campus-champions-theme", From 76378eb17e2ad6781156f115891e785804ff58f8 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 21 May 2024 16:09:51 -0400 Subject: [PATCH 38/39] Fix for anonymized name --- .../cypress/e2e/accessmatch/community/cssn/directory.cy.js | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js b/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js index ccaa776c6..c65a036b1 100644 --- a/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js +++ b/tests/cypress/cypress/e2e/accessmatch/community/cssn/directory.cy.js @@ -32,7 +32,6 @@ describe('Tests the CSSN Directory Page', () => { // Card should link to the community persona page. cy.get('@item') .find('a.stretched-link') - .should('contain', 'Abico duis interdico') .should("have.attr", "href") .and("contain", '/community-persona/1373'); From f7ba2dbb39d2659bc5f0724088b7249c2594ca06 Mon Sep 17 00:00:00 2001 From: Andrew Pasquale Date: Tue, 21 May 2024 20:22:31 +0000 Subject: [PATCH 39/39] Update access theme --- composer.json | 2 +- composer.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 494f2b85c..7652b28ab 100755 --- a/composer.json +++ b/composer.json @@ -174,7 +174,7 @@ "drupal_fork/cilogon_auth": "main-dev", "drupal_fork/domain_adv": "main-dev", "drush/drush": "^12.1", - "necyberteam/asp-theme": "d8-2050-dev", + "necyberteam/asp-theme": "main-dev", "necyberteam/campus-champions-theme": "main-dev", "necyberteam/webform_submission_search_api": "main-dev", "npm-asset/select2": "^4.0", diff --git a/composer.lock b/composer.lock index 20a93406f..2918920b5 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": "99bde283f7da39d2fbd916f836daefe6", + "content-hash": "0c0cdc708713c2ce3f63d44fc2fd0a4e", "packages": [ { "name": "access/drupal_seamless_cilogon", @@ -11651,12 +11651,13 @@ }, { "name": "necyberteam/asp-theme", - "version": "dev-d8-2050", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/necyberteam/aspTheme.git", - "reference": "aed9e86ab032ab2cb1400a402dc96115fe3dba7c" + "reference": "7b7516b930e327c89adbdd1e1da03ba7708eda4f" }, + "default-branch": true, "type": "drupal-theme", "license": [ "MIT" @@ -11672,7 +11673,7 @@ "issues": "https://github.com/necyberteam/aspTheme/issues", "source": "https://github.com/necyberteam/aspTheme" }, - "time": "2024-05-21T20:05:45+00:00" + "time": "2024-05-21T20:21:53+00:00" }, { "name": "necyberteam/campus-champions-theme",