Merge pull request #1288 from necyberteam/md-dev

Md dev
necyberteam · Nov 15, 2024 · c1d9bc7 · c1d9bc7
2 parents 057dd70 + 33fc011
commit c1d9bc7
Show file tree

Hide file tree

Showing 16 changed files with 1,494 additions and 25 deletions.
diff --git a/blt/md/md-2230 b/blt/md/md-2230
@@ -0,0 +1 @@
+ccmnet_org
diff --git a/blt/md/md-2252 b/blt/md/md-2252
@@ -0,0 +1 @@
+ccmnet_org
diff --git a/blt/md/md-2266 b/blt/md/md-2266
@@ -0,0 +1 @@
+amp_cyberinfrastructure_org
diff --git a/blt/md/md-2269 b/blt/md/md-2269
@@ -0,0 +1 @@
+amp_cyberinfrastructure_org
diff --git a/blt/md/md-2275 b/blt/md/md-2275
@@ -0,0 +1 @@
+amp_cyberinfrastructure_org
diff --git a/composer.json b/composer.json
@@ -137,6 +137,7 @@
     "drupal/recaptcha_v3": "^2.0",
     "drupal/recurring_events": "^2.0@RC",
     "drupal/redirect": "^1.8",
+    "drupal/redis": "^1.8",
     "drupal/rel_to_abs": "^2.2",
     "drupal/restui": "^1.20",
     "drupal/role_delegation": "^1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/cypress/cypress/e2e/accessmatch/community-persona/community-persona.cy.js b/tests/cypress/cypress/e2e/accessmatch/community-persona/community-persona.cy.js
@@ -95,8 +95,9 @@ function user199_verify_self_cp() {
     .should('have.attr', 'href', "/affinity-groups");
   cy.contains('Add Resource')
     .should('have.attr', 'href', "/form/resource");
-  cy.contains('See engagements')
-    .should('have.attr', 'href', "/engagements");
+  // Todo: MATCH Engagements only displayed on people with an Engagement
+  // cy.contains('MATCH Engagements')
+  //   .should('have.attr', 'href', "/engagements");
 }
 
 /**

diff --git a/web/sites/default/config/default/core.extension.yml b/web/sites/default/config/default/core.extension.yml
@@ -123,6 +123,7 @@ module:
   recurring_events: 0
   recurring_events_views: 0
   redirect: 0
+  redis: 0
   rel_to_abs: 0
   rest: 0
   restui: 0

diff --git a/web/sites/default/config/default/field.storage.node.field_infrastructure_news_type.yml b/web/sites/default/config/default/field.storage.node.field_infrastructure_news_type.yml
@@ -22,6 +22,9 @@ settings:
     -
       value: Reconfiguration
       label: Reconfiguration
+    -
+      value: Degraded
+      label: Degraded
   allowed_values_function: ''
 module: options
 locked: false

diff --git a/web/sites/default/config/default/pfdp.pfdp_directory._resume.yml b/web/sites/default/config/default/pfdp.pfdp_directory._resume.yml
@@ -5,7 +5,7 @@ dependencies: {  }
 id: _resume
 path: /resume
 bypass: false
-grant_file_owners: true
+grant_file_owners: false
 users: {  }
 roles:
   administrator: administrator
@@ -41,3 +41,6 @@ roles:
   ccmnet_pm: '0'
   consultant: '0'
   cip: '0'
+  site_developer: '0'
+  ccmnet: '0'
+  ccmnet_admin: '0'
diff --git a/web/sites/default/config/default/views.view.ag_instances_api.yml b/web/sites/default/config/default/views.view.ag_instances_api.yml
@@ -662,6 +662,72 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        nid_1:
+          id: nid_1
+          table: node_field_data
+          field: nid
+          relationship: none
+          group_type: group
+          admin_label: 'Full URL'
+          entity_type: node
+          entity_field: nid
+          plugin_id: field
+          label: ''
+          exclude: false
+          alter:
+            alter_text: true
+            text: 'https://support.access-ci.org/node/{{ nid_1 }}'
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
         field_affinity_group_category:
           id: field_affinity_group_category
           table: node__field_affinity_group_category
@@ -1146,9 +1212,6 @@ display:
             field_coordinator_1:
               alias: coordinator_name
               raw_output: false
-            nothing:
-              alias: coordinator
-              raw_output: false
             field_image:
               alias: ''
               raw_output: false
@@ -1161,11 +1224,8 @@ display:
             nid:
               alias: ''
               raw_output: false
-            view:
-              alias: kb
-              raw_output: false
-            view_1:
-              alias: events
+            nid_1:
+              alias: url
               raw_output: false
             field_affinity_group_category:
               alias: ''
@@ -1176,8 +1236,8 @@ display:
             field_use_ext_email_list:
               alias: ''
               raw_output: false
-            view_2:
-              alias: votes
+            field_ask_ci_locale:
+              alias: ''
               raw_output: false
       display_extenders:
         jsonapi_views: