Merge branch 'feature/OPS-11043-group-v3' of github.com:UN-OCHA/iasc8…

… into feature/OPS-11043-group-v3
UN-OCHA · Jan 22, 2025 · 4d61a51 · 4d61a51
2 parents 9300cff + 898656f
commit 4d61a51
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 90 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/config/views.view.duplicate_of_iasc_group_content.yml b/config/views.view.duplicate_of_iasc_group_content.yml
@@ -10,7 +10,7 @@ dependencies:
     - node
 _core:
   default_config_hash: ZSKjHkl45YTbsYHiq_H7py04GDuX95t-GOHAAb8ZFbk
-id: duplicate_of_iasc_group_relationship
+id: duplicate_of_iasc_group_content
 label: 'Duplicate of IASC Group Content'
 module: gnode
 description: 'Lists all of the nodes that have been added to a group.'

diff --git a/config/views.view.iasc_group_content.yml b/config/views.view.iasc_group_content.yml
@@ -6,7 +6,7 @@ dependencies:
     - search_api.index.default_solr_index
   module:
     - search_api
-id: iasc_group_relationship
+id: iasc_group_content
 label: 'IASC Group Content'
 module: views
 description: ''

diff --git a/html/modules/custom/iasc_content/iasc_content.module b/html/modules/custom/iasc_content/iasc_content.module
@@ -1085,7 +1085,7 @@ function iasc_content_fix_entities($entity_type, $bundle, $field_name) {
  * Implemtents hook_views_pre_render().
  */
 function iasc_content_views_pre_render(ViewExecutable $view) {
-  if ($view->id() === 'iasc_group_relationship') {
+  if ($view->id() === 'iasc_group_content') {
     $group_id = $view->args[0];
     if ($group_id) {
       if ($group = $group = \Drupal::entityTypeManager()->getStorage('group')->load($group_id)) {

diff --git a/html/modules/custom/iasc_content/src/Plugin/Block/IascContentSectionMenu.php b/html/modules/custom/iasc_content/src/Plugin/Block/IascContentSectionMenu.php
@@ -66,7 +66,7 @@ public function build() {
     $parameters = $this->routeMatch->getParameters();
     $needed = FALSE;
 
-    if ($parameters->get('view_id', '') == 'iasc_group_relationship') {
+    if ($parameters->get('view_id', '') == 'iasc_group_content') {
       $needed = TRUE;
       $group_id = $parameters->get('group', '');
     }

diff --git a/local/docker-compose.yml b/local/docker-compose.yml
@@ -14,7 +14,7 @@ volumes:
 
 services:
   mysql:
-    image: public.ecr.aws/unocha/mysql:10.11
+    image: public.ecr.aws/unocha/mysql:11.4
     hostname: $PROJECT_NAME-mysql
     container_name: $PROJECT_NAME-mysql
     environment:

diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -10,7 +10,7 @@ volumes:
 
 services:
   mysql:
-    image: public.ecr.aws/unocha/mysql:10.11
+    image: public.ecr.aws/unocha/mysql:11.4
     hostname: iasc-test-mysql
     container_name: iasc-test-mysql
     environment: