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

Dev to main

.env

@@ -19,7 +19,7 @@ DRUPAL_HOSTNAME=helfi-rekry.docker.so
 # Docker image
 DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3
 
-COMPOSE_PROFILES=search,queue
+COMPOSE_PROFILES=search
 
 # Public webroot
 DRUPAL_WEBROOT=public

.platform/schema

@@ -1 +1 @@
-10
+12

README.md

@@ -8,7 +8,7 @@ search found on the site and provides other recruitment information for the city
 Env | Branch | Drush alias | URL
 --- | ------ | ----------- | ---
 development | * | - | http://helfi-rekry.docker.so/
-production | main | @main | TBD
+production | main | @main | https://www.hel.fi/fi/avoimet-tyopaikat
 
 ## Requirements
 
@@ -110,7 +110,7 @@ listings are published for indexing.
 
 - The `helfi_rekry_content` module code can be found from [here](https://github.com/City-of-Helsinki/drupal-helfi-rekry/tree/dev/public/modules/custom/helfi_rekry_content).
 - The migration interval for the new job listings can be checked from the cron configuration [here](https://github.com/City-of-Helsinki/drupal-helfi-rekry/blob/dev/docker/openshift/crons/migrate-job-listings.sh).
-- The migration interval for changed job listings poll is written on this cron configuration [here](https://github.com/City-of-Helsinki/drupal-helfi-rekry/blob/dev/docker/openshift/crons/migrate-changed-job-listings.sh).
+- The migration interval for images, taxonomy terms, etc. is written on this cron configuration [here](https://github.com/City-of-Helsinki/drupal-helfi-rekry/blob/dev/docker/openshift/crons/migrate-helbit-data.sh).
 - The scheduled publishing interval can be checked from this cron configuration [here](https://github.com/City-of-Helsinki/drupal-helfi-rekry/blob/dev/docker/openshift/crons/content-scheduler.sh).
 
 ### Testing on local

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:

composer.json

@@ -27,6 +27,7 @@
         "google/apiclient": "^2.17"
     },
     "require-dev": {
+        "dg/bypass-finals": "^1.5",
         "donatj/mock-webserver": "^2.4",
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^10.0",

conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml

@@ -43,12 +43,12 @@ settings:
       contact_card_listing: contact_card_listing
       content_cards: content_cards
       image: image
+      image_gallery: image_gallery
       liftup_with_image: liftup_with_image
       list_of_links: list_of_links
       map: map
       sidebar_text: sidebar_text
       text: text
-      image_gallery: image_gallery
     negate: 0
     target_bundles_drag_drop:
       accordion:

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

conf/cmi/core.extension.yml

@@ -39,13 +39,13 @@ module:
   focal_point: 0
   gin_toolbar: 0
   hdbt_admin_tools: 0
+  hdbt_cookie_banner: 0
   health_check: 0
   helfi_api_base: 0
   helfi_azure_fs: 0
   helfi_base_content: 0
   helfi_ckeditor: 0
   helfi_etusivu_entities: 0
-  helfi_eu_cookie_compliance: 0
   helfi_google_api: 0
   helfi_hakuvahti: 0
   helfi_image_styles: 0
@@ -169,7 +169,6 @@ module:
   paragraphs: 11
   publication_date: 99
   minimal: 1000
-  eu_cookie_compliance: 1001
 theme:
   claro: 0
   stable9: 0