Merge pull request #1312 from necyberteam/md-dev

Md dev
necyberteam · Jan 21, 2025 · 5373f7b · 5373f7b
2 parents 8a0e9f6 + e452a8c
commit 5373f7b
Show file tree

Hide file tree

Showing 57 changed files with 5,176 additions and 130 deletions.
diff --git a/blt/md/md-2211 b/blt/md/md-2211
@@ -0,0 +1 @@
+amp_cyberinfrastructure_org
diff --git a/composer.json b/composer.json
@@ -74,6 +74,7 @@
     "drupal/access_by_ref": "^3.0",
     "drupal/advanced_cors": "^1.5",
     "drupal/auditfiles": "^4.1@beta",
+    "drupal/autoban": "^1.10",
     "drupal/better_exposed_filters": "^6.0",
     "drupal/block_exclude_pages": "^2.0",
     "drupal/bootstrap5": "^3.0",
@@ -236,7 +237,10 @@
         "[web-root]/modules/README.txt": false,
         "[web-root]/profiles/README.txt": false,
         "[web-root]/themes/README.txt": false,
-        "[web-root]/INSTALL.txt": false
+        "[web-root]/INSTALL.txt": false,
+        "[web-root]/robots.txt": {
+            "append": "robo/assets/robots-additions.txt"
+        }
       }
     },
     "patches-file": "composer.patches.json",

diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -14,6 +14,9 @@
     },
     "drupal/views_data_export": {
       "Attach views_data_export JavaScript library": "https://www.drupal.org/files/issues/2023-06-01/views_data_export-3189760-22.patch"
+    },
+    "drupal/recurring_events": {
+      "Registration contact page custom permissions": "patches/recurring_events-registration-route-perm.patch"
     }
   }
 }
diff --git a/patches/recurring_events-registration-route-perm.patch b/patches/recurring_events-registration-route-perm.patch
@@ -0,0 +1,40 @@
+diff --git a/modules/recurring_events_registration/recurring_events_registration.links.task.yml b/modules/recurring_events_registration/recurring_events_registration.links.task.yml
+index 95e3694..7f8f908 100644
+--- a/modules/recurring_events_registration/recurring_events_registration.links.task.yml
++++ b/modules/recurring_events_registration/recurring_events_registration.links.task.yml
+@@ -25,20 +25,6 @@ entity.registrant.delete_form:
+   title: Delete
+   weight: 10
+
+-# Registrant add tab.
+-entity.registrant.add_form:
+-  route_name: entity.registrant.add_form
+-  base_route: entity.eventinstance.canonical
+-  title: 'Register'
+-  weight: 11
+-
+-# Registrant instance listing tab.
+-entity.registrant.instance_listing:
+-  route_name: entity.registrant.instance_listing
+-  base_route: entity.eventinstance.canonical
+-  title: 'Registrations'
+-  weight: 12
+-
+ # Registrant user listing tab.
+ entity.user.registrations:
+   route_name: registrations.user_tab
+diff --git a/modules/recurring_events_registration/recurring_events_registration.routing.yml b/modules/recurring_events_registration/recurring_events_registration.routing.yml
+index d5379ef..77af023 100644
+--- a/modules/recurring_events_registration/recurring_events_registration.routing.yml
++++ b/modules/recurring_events_registration/recurring_events_registration.routing.yml
+@@ -174,8 +174,7 @@ entity.registrant.instance_contact:
+     _form: '\Drupal\recurring_events_registration\Form\ContactForm'
+     _title: 'Contact Registrants'
+   requirements:
+-    _permission: 'access registrant overview'
+-    _custom_access:  '\Drupal\recurring_events_registration\Controller\RegistrantController::canContactRegistrants'
++    _custom_access:  '\Drupal\access_misc\Controller\EventWaitlist::isAuthor'
+   options:
+     parameters:
+       eventinstance:
+
diff --git a/robo/assets/robots-additions.txt b/robo/assets/robots-additions.txt
@@ -0,0 +1,10 @@
+# Facets pages
+Disallow: /affinity-groups
+Disallow: /events
+Disallow: /events/past
+Disallow: /mentorships
+Disallow: /members
+Disallow: /community/cssn/directory
+Disallow: /people
+Disallow: /knowledge-base/resources
+
diff --git a/web/sites/default/config/default/block.block.aspquicklinks.yml b/web/sites/default/config/default/block.block.aspquicklinks.yml
@@ -12,7 +12,7 @@ dependencies:
 id: aspquicklinks
 theme: aspTheme
 region: content
-weight: -21
+weight: -31
 provider: null
 plugin: 'block_content:47c986bb-ebab-4f2b-bccf-134e395af61b'
 settings:

diff --git a/web/sites/default/config/default/block.block.asptheme_exposedformcssn_directorypage_2.yml b/web/sites/default/config/default/block.block.asptheme_exposedformcssn_directorypage_2.yml
@@ -12,7 +12,7 @@ dependencies:
 id: asptheme_exposedformcssn_directorypage_2
 theme: aspTheme
 region: content
-weight: 0
+weight: -15
 provider: null
 plugin: 'views_exposed_filter_block:cssn_directory-page_1'
 settings:

diff --git a/...lt/config/default/block.block.asptheme_exposedformrecurring_events_event_seriespage_1.yml b/...lt/config/default/block.block.asptheme_exposedformrecurring_events_event_seriespage_1.yml
@@ -12,7 +12,7 @@ dependencies:
 id: asptheme_exposedformrecurring_events_event_seriespage_1
 theme: aspTheme
 region: content
-weight: -9
+weight: -21
 provider: null
 plugin: 'views_exposed_filter_block:recurring_events_event_series-page_1'
 settings:

diff --git a/web/sites/default/config/default/block.block.asptheme_qatool.yml b/web/sites/default/config/default/block.block.asptheme_qatool.yml
@@ -11,7 +11,7 @@ dependencies:
 id: asptheme_qatool
 theme: aspTheme
 region: content
-weight: 0
+weight: -14
 provider: null
 plugin: 'block_content:0a0568d0-efd1-471a-bc30-5969605a7728'
 settings:

diff --git a/web/sites/default/config/default/block.block.asptheme_registrationslistinglink.yml b/web/sites/default/config/default/block.block.asptheme_registrationslistinglink.yml
@@ -0,0 +1,25 @@
+uuid: 3579d5b5-59a5-4ff5-978b-73a389e172e3
+langcode: en
+status: true
+dependencies:
+  module:
+    - access_misc
+    - system
+  theme:
+    - aspTheme
+id: asptheme_registrationslistinglink
+theme: aspTheme
+region: content
+weight: -32
+provider: null
+plugin: registrations_listing_link
+settings:
+  id: registrations_listing_link
+  label: 'Registrations Listing Link'
+  label_display: '0'
+  provider: access_misc
+visibility:
+  request_path:
+    id: request_path
+    negate: false
+    pages: "/events/*\r\n!/events/*/*\r\n!/events/past\r\n!/events/mine"
diff --git a/web/sites/default/config/default/block.block.asptheme_tagssubtitle.yml b/web/sites/default/config/default/block.block.asptheme_tagssubtitle.yml
@@ -12,7 +12,7 @@ dependencies:
 id: asptheme_tagssubtitle
 theme: aspTheme
 region: content
-weight: -12
+weight: -24
 provider: null
 plugin: 'block_content:3424aefc-1008-48a4-ac04-5f8dfb48f44a'
 settings:

diff --git a/web/sites/default/config/default/block.block.champions_skilllevel.yml b/web/sites/default/config/default/block.block.champions_skilllevel.yml
@@ -34,4 +34,4 @@ visibility:
   request_path:
     id: request_path
     negate: false
-    pages: "/knowledge-base/resources"
+    pages: /knowledge-base/resources
diff --git a/web/sites/default/config/default/block.block.cssndescriptionlinks.yml b/web/sites/default/config/default/block.block.cssndescriptionlinks.yml
@@ -12,7 +12,7 @@ dependencies:
 id: cssndescriptionlinks
 theme: aspTheme
 region: content
-weight: -10
+weight: -22
 provider: null
 plugin: 'block_content:7e958c18-c529-48d8-a51d-b7d1f4a99a23'
 settings:

diff --git a/web/sites/default/config/default/block.block.exposedformtagspage_1_3.yml b/web/sites/default/config/default/block.block.exposedformtagspage_1_3.yml
@@ -12,7 +12,7 @@ dependencies:
 id: exposedformtagspage_1_3
 theme: aspTheme
 region: content
-weight: -12
+weight: -25
 provider: null
 plugin: 'views_exposed_filter_block:tags-page_1'
 settings:

diff --git a/web/sites/default/config/default/block.block.interestsdescription_3.yml b/web/sites/default/config/default/block.block.interestsdescription_3.yml
@@ -12,7 +12,7 @@ dependencies:
 id: interestsdescription_3
 theme: aspTheme
 region: content
-weight: -15
+weight: -28
 provider: null
 plugin: 'block_content:4b14d8ad-d416-41fc-9a95-923651f97f98'
 settings:

diff --git a/web/sites/default/config/default/block.block.interestsdescription_4.yml b/web/sites/default/config/default/block.block.interestsdescription_4.yml
@@ -12,7 +12,7 @@ dependencies:
 id: interestsdescription_4
 theme: aspTheme
 region: content
-weight: -20
+weight: -30
 provider: null
 plugin: 'block_content:4b14d8ad-d416-41fc-9a95-923651f97f98'
 settings:

diff --git a/web/sites/default/config/default/block.block.mainpagecontent.yml b/web/sites/default/config/default/block.block.mainpagecontent.yml
@@ -9,7 +9,7 @@ dependencies:
 id: mainpagecontent
 theme: aspTheme
 region: content
-weight: -7
+weight: -20
 provider: null
 plugin: system_main_block
 settings:

diff --git a/web/sites/default/config/default/block.block.outagesblock_2.yml b/web/sites/default/config/default/block.block.outagesblock_2.yml
@@ -10,7 +10,7 @@ dependencies:
 id: outagesblock_2
 theme: aspTheme
 region: content
-weight: -3
+weight: -18
 provider: null
 plugin: outages_block
 settings:

diff --git a/web/sites/default/config/default/block.block.skillsdescription_3.yml b/web/sites/default/config/default/block.block.skillsdescription_3.yml
@@ -12,7 +12,7 @@ dependencies:
 id: skillsdescription_3
 theme: aspTheme
 region: content
-weight: -19
+weight: -29
 provider: null
 plugin: 'block_content:b25cd33e-a4be-4ab8-b975-fc092df35dd5'
 settings:

diff --git a/web/sites/default/config/default/block.block.tabs.yml b/web/sites/default/config/default/block.block.tabs.yml
@@ -7,7 +7,7 @@ dependencies:
 id: tabs
 theme: aspTheme
 region: content
-weight: -14
+weight: -27
 provider: null
 plugin: local_tasks_block
 settings:

diff --git a/web/sites/default/config/default/block.block.ticketingchoices_2.yml b/web/sites/default/config/default/block.block.ticketingchoices_2.yml
@@ -10,7 +10,7 @@ dependencies:
 id: ticketingchoices_2
 theme: aspTheme
 region: content
-weight: -13
+weight: -26
 provider: null
 plugin: ticketing_block
 settings:

diff --git a/web/sites/default/config/default/block.block.userlogin_2.yml b/web/sites/default/config/default/block.block.userlogin_2.yml
@@ -10,7 +10,7 @@ dependencies:
 id: userlogin_2
 theme: aspTheme
 region: content
-weight: -11
+weight: -23
 provider: null
 plugin: user_login_block
 settings:

diff --git a/...sites/default/config/default/block.block.views_block__match_engagement_view_block_5_2.yml b/...sites/default/config/default/block.block.views_block__match_engagement_view_block_5_2.yml
@@ -12,7 +12,7 @@ dependencies:
 id: views_block__match_engagement_view_block_5_2
 theme: aspTheme
 region: content
-weight: -6
+weight: -19
 provider: null
 plugin: 'views_block:match_engagement_view-block_5'
 settings: