Merge pull request #653 from City-of-Helsinki/dev

Dev to main
City-of-Helsinki · Jun 14, 2023 · 2b4289f · 2b4289f
2 parents 4452bc4 + a885524
commit 2b4289f
Show file tree

Hide file tree

Showing 89 changed files with 520 additions and 52,609 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^9.1",
         "phpspec/prophecy-phpunit": "^2",
-        "phpunit/phpunit": "~9.5.10"
+        "phpunit/phpunit": "^9.6"
     },
     "conflict": {
         "drupal/drupal": "*"

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -51,7 +51,6 @@ module:
   helfi_global_announcement: 0
   helfi_image_styles: 0
   helfi_kymp_content: 0
-  helfi_kymp_district_project_search: 0
   helfi_kymp_migrations: 0
   helfi_kymp_plans: 0
   helfi_media: 0

diff --git a/conf/cmi/search_api.index.districts.yml b/conf/cmi/search_api.index.districts.yml
@@ -12,7 +12,6 @@ dependencies:
     - node
     - media
     - search_api
-    - helfi_kymp_district_project_search
 id: districts
 name: Districts
 description: ''

diff --git a/conf/cmi/search_api.index.districts_for_filters.yml b/conf/cmi/search_api.index.districts_for_filters.yml
@@ -7,7 +7,6 @@ dependencies:
   module:
     - node
     - search_api
-    - helfi_kymp_district_project_search
 id: districts_for_filters
 name: 'Districts for filters'
 description: 'Districts to be used for search filters.'

diff --git a/conf/cmi/search_api.index.project_phases.yml b/conf/cmi/search_api.index.project_phases.yml
@@ -7,7 +7,6 @@ dependencies:
   module:
     - taxonomy
     - search_api
-    - helfi_kymp_district_project_search
 id: project_phases
 name: 'Project phases'
 description: 'Project phases from taxonomy to be used for search filters.'

diff --git a/conf/cmi/search_api.index.project_themes.yml b/conf/cmi/search_api.index.project_themes.yml
@@ -7,7 +7,6 @@ dependencies:
   module:
     - taxonomy
     - search_api
-    - helfi_kymp_district_project_search
 id: project_themes
 name: 'Project themes'
 description: 'Project themes from taxonomy to be used for search filters.'

diff --git a/conf/cmi/search_api.index.project_types.yml b/conf/cmi/search_api.index.project_types.yml
@@ -7,7 +7,6 @@ dependencies:
   module:
     - taxonomy
     - search_api
-    - helfi_kymp_district_project_search
 id: project_types
 name: 'Project types'
 description: 'Project types from taxonomy to be used for search filters.'

diff --git a/conf/cmi/search_api.index.projects.yml b/conf/cmi/search_api.index.projects.yml
@@ -17,7 +17,6 @@ dependencies:
     - media
     - taxonomy
     - search_api
-    - helfi_kymp_district_project_search
 id: projects
 name: Projects
 description: ''

diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml
@@ -6,6 +6,7 @@ dependencies:
     - rest.resource.helfi_global_mobile_menu
   module:
     - eu_cookie_compliance
+    - external_entities
     - helfi_api_base
     - helfi_tpr
     - media
@@ -21,6 +22,11 @@ permissions:
   - 'access content'
   - 'display eu cookie compliance popup'
   - 'restful get helfi_global_mobile_menu'
+  - 'view helfi_announcements external entity'
+  - 'view helfi_news external entity'
+  - 'view helfi_news_groups external entity'
+  - 'view helfi_news_neighbourhoods external entity'
+  - 'view helfi_news_tags external entity'
   - 'view media'
   - 'view remote entities'
   - 'view tpr_service'

diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml
@@ -6,6 +6,7 @@ dependencies:
     - rest.resource.helfi_global_mobile_menu
   module:
     - eu_cookie_compliance
+    - external_entities
     - helfi_api_base
     - helfi_tpr
     - media
@@ -24,6 +25,11 @@ permissions:
   - 'access toolbar'
   - 'display eu cookie compliance popup'
   - 'restful get helfi_global_mobile_menu'
+  - 'view helfi_announcements external entity'
+  - 'view helfi_news external entity'
+  - 'view helfi_news_groups external entity'
+  - 'view helfi_news_neighbourhoods external entity'
+  - 'view helfi_news_tags external entity'
   - 'view media'
   - 'view remote entities'
   - 'view tpr_service'

diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml
@@ -6,7 +6,7 @@ dependencies:
     - helfi_tpr
     - user
 _core:
-  default_config_hash: gx8yXH8TeErT_h2-G2YR6KM0mJzy0VUjVWug4J4nfwo
+  default_config_hash: 5_K8ODgHHlRW1KkmKxFiGOyt4Y7I6iexOtl2_g2s2G4
 id: er_tpr_unit
 label: 'Entity reference - TPR Unit'
 module: views
@@ -524,46 +524,6 @@ display:
           items_per_page: 40
       arguments: {  }
       filters:
-        content_translation_status:
-          id: content_translation_status
-          table: tpr_unit_field_data
-          field: content_translation_status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: tpr_unit
-          entity_field: content_translation_status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
         langcode:
           id: langcode
           table: tpr_unit_field_data

diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
@@ -10,7 +10,7 @@ dependencies:
     - text
     - user
 _core:
-  default_config_hash: XOlpVUQKUlLSivoX2Q_cLITkN9lG3XWYV0xIRbsf_pg
+  default_config_hash: pUd-EuRjmmZcRI9CC31DmD1tyVIMUKNtqAHiBjxB9Q0
 id: service_list
 label: 'Service list'
 module: views
@@ -235,19 +235,6 @@ display:
           transform_dash: false
           break_phrase: true
       filters:
-        content_translation_status:
-          id: content_translation_status
-          table: tpr_service_field_data
-          field: content_translation_status
-          entity_type: tpr_service
-          entity_field: content_translation_status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
         langcode:
           id: langcode
           table: tpr_service_field_data
@@ -290,6 +277,49 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
+        status_extra:
+          id: status_extra
+          table: tpr_service_field_data
+          field: status_extra
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: tpr_service
+          plugin_id: tpr_status
+          operator: '='
+          value: ''
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
       style:
         type: default
         options:
@@ -321,6 +351,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user
         - user.permissions
       tags: {  }
   block:
@@ -337,6 +368,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user
         - user.permissions
       tags: {  }
   block_search:
@@ -703,19 +735,6 @@ display:
             fail: 'not found'
           validate_options: {  }
       filters:
-        content_translation_status:
-          id: content_translation_status
-          table: tpr_service_field_data
-          field: content_translation_status
-          entity_type: tpr_service
-          entity_field: content_translation_status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
         langcode:
           id: langcode
           table: tpr_service_field_data
@@ -807,6 +826,45 @@ display:
             name_synonyms: name_synonyms
             description__summary: description__summary
             name_override: name_override
+        status_extra:
+          id: status_extra
+          table: tpr_service_field_data
+          field: status_extra
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: tpr_service
+          plugin_id: tpr_status
+          operator: '='
+          value: ''
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
       filter_groups:
         operator: AND
         groups:
@@ -843,6 +901,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user
         - user.permissions
       tags: {  }
   entity_reference_1:
@@ -1069,5 +1128,6 @@ display:
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - user
         - user.permissions
       tags: {  }