City-of-Helsinki · tuutti · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024
diff --git a/.env b/.env
@@ -15,7 +15,7 @@ OC_PROJECT_NAME=hki-kasko-kasvatus-koulutus-test
 STAGE_FILE_PROXY_ORIGIN=https://stplattaprod.blob.core.windows.net
 STAGE_FILE_PROXY_ORIGIN_DIR=kasvatuskoulutus76e5cprod
 
-COMPOSE_PROFILES=search,queue
+COMPOSE_PROFILES=search
 
 # Docker image
 DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3

diff --git a/compose.yaml b/compose.yaml
@@ -151,13 +151,12 @@ services:
       - search
   artemis:
     container_name: "${COMPOSE_PROJECT_NAME}-artemis"
-    image: quay.io/artemiscloud/activemq-artemis-broker
-    environment:
-      AMQ_EXTRA_ARGS: "--user admin --password admin"
+    image: apache/activemq-artemis
     depends_on:
       - app
     networks:
       - internal
+      - stonehenge-network
     profiles:
       - queue
   chromium:

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml
@@ -128,9 +128,9 @@ content:
     third_party_settings: {  }
   simple_sitemap:
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
   status:
     type: boolean_checkbox
     weight: 12

diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -133,6 +133,16 @@ content:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
+  field_categories:
+    type: readonly_field_widget
+    weight: 39
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   field_content:
     type: paragraphs
     weight: 31
@@ -152,6 +162,16 @@ content:
         collapse_edit_all: collapse_edit_all
         duplicate: duplicate
     third_party_settings: {  }
+  field_hs_front_page:
+    type: entity_reference_autocomplete
+    weight: 31
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   field_lower_content:
     type: paragraphs
     weight: 33
@@ -179,6 +199,16 @@ content:
       sidebar: false
       use_details: true
     third_party_settings: {  }
+  field_ontologyword_details:
+    type: readonly_field_widget
+    weight: 40
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   field_phone_label:
     type: string_textfield
     weight: 11
@@ -194,6 +224,16 @@ content:
     settings:
       display_label: true
     third_party_settings: {  }
+  field_study_field:
+    type: select2_entity_reference
+    weight: 31
+    region: content
+    settings:
+      width: 100%
+      autocomplete: false
+      match_operator: CONTAINS
+      match_limit: 10
+    third_party_settings: {  }
   field_unit_type:
     type: entity_reference_autocomplete
     weight: 34
@@ -204,6 +244,13 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  hide_description:
+    type: boolean_checkbox
+    weight: 18
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   hide_sidebar_navigation:
     type: boolean_checkbox
     weight: 35
@@ -391,6 +438,16 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  subgroup:
+    type: readonly_field_widget
+    weight: 40
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   toc_enabled:
     type: boolean_checkbox
     weight: 3
@@ -439,63 +496,6 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
-  field_categories:
-    type: readonly_field_widget
-    weight: 39
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
-  field_hs_front_page:
-    type: entity_reference_autocomplete
-    weight: 31
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_ontologyword_details:
-    type: readonly_field_widget
-    weight: 40
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
-  field_study_field:
-    type: select2_entity_reference
-    weight: 31
-    region: content
-    settings:
-      width: 100%
-      autocomplete: false
-      match_operator: CONTAINS
-      match_limit: 10
-    third_party_settings: {  }
-  hide_description:
-    type: boolean_checkbox
-    weight: 18
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  subgroup:
-    type: readonly_field_widget
-    weight: 40
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
 hidden:
   created: true
   field_districts: true

diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -143,6 +143,13 @@ content:
     third_party_settings: {  }
     weight: 17
     region: content
+  field_ontologyword_details:
+    type: tpr_ontologyword_details_formatter
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 28
+    region: content
   field_phone_label:
     type: string
     label: hidden
@@ -280,6 +287,13 @@ content:
     third_party_settings: {  }
     weight: 16
     region: content
+  subgroup:
+    type: tpr_connection
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 32
+    region: content
   toc_enabled:
     type: boolean
     label: hidden
@@ -316,20 +330,6 @@ content:
     third_party_settings: {  }
     weight: 12
     region: content
-  field_ontologyword_details:
-    type: tpr_ontologyword_details_formatter
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 28
-    region: content
-  subgroup:
-    type: tpr_connection
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 32
-    region: content
 hidden:
   created: true
   field_categories: true

diff --git a/conf/cmi/search_api.index.schools.yml b/conf/cmi/search_api.index.schools.yml
@@ -6,10 +6,9 @@ dependencies:
     - field.storage.tpr_unit.field_ontologyword_details
     - search_api.server.elastic_kasko
   module:
-    - helfi_tpr
-    - search_api
     - helfi_kasko_content
     - helfi_react_search
+    - helfi_tpr
   enforced:
     config:
       - field.storage.tpr_unit.field_ontologyword_details

diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml
@@ -91,6 +91,7 @@ display:
         type: mini
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 10
           total_pages: null
           id: 0
@@ -105,7 +106,6 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml
@@ -381,6 +381,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 50
           total_pages: null
           id: 0
@@ -398,7 +399,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml
@@ -381,6 +381,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 50
           total_pages: null
           id: 0
@@ -398,7 +399,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
@@ -109,6 +109,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 4
           total_pages: null
           id: 0
@@ -126,7 +127,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
@@ -646,6 +646,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 5
           total_pages: null
           id: 0
@@ -663,7 +664,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml
@@ -93,6 +93,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 8
           total_pages: null
           id: 0
@@ -110,7 +111,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml
@@ -286,6 +286,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 15
           total_pages: null
           id: 0
@@ -303,7 +304,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/docker/openshift/crons/menu-queue.sh b/docker/openshift/crons/menu-queue.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+source /init.sh
+
+if [ -z "$AMQ_BROKERS" ]; then
+  exit 0
+fi
+
+if ! is_drupal_module_enabled "helfi_navigation"; then
+  exit 0
+fi
+
+while true
+do
+  # Restart process every 12 hours.
+  drush stomp:worker helfi_navigation_menu_queue --lease-time 43200
+done