From 91715321f89ab9d99be2dc3586bc2ebe8a798e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Tue, 20 Feb 2024 10:00:46 +0200
Subject: [PATCH 1/3] UHF-9497: Removed custom icons for hdbt subtheme as all
 usable icons should be available in hdbt theme.

---
 public/themes/custom/hdbt_subtheme/README.md  |  20 --
 .../hdbt_subtheme/templates/misc/icon.twig    |   1 -
 .../custom/hdbt_subtheme/webpack.config.js    |   7 -
 .../hdbt_subtheme/webpack.svgToSprite.js      | 181 ------------------
 4 files changed, 209 deletions(-)
 delete mode 100644 public/themes/custom/hdbt_subtheme/templates/misc/icon.twig
 delete mode 100644 public/themes/custom/hdbt_subtheme/webpack.svgToSprite.js

diff --git a/public/themes/custom/hdbt_subtheme/README.md b/public/themes/custom/hdbt_subtheme/README.md
index 1b81adab..2f1eda60 100644
--- a/public/themes/custom/hdbt_subtheme/README.md
+++ b/public/themes/custom/hdbt_subtheme/README.md
@@ -70,35 +70,15 @@ hdbt_subtheme
 │   │   └───...
 │   └───js
 │   │   │   common.js
-│   └───icons
-│       |   some-icon.svg
 └───dist
     └───css
         |   styles.min.css
     └───js
         |   bundle.min.js
-    └───icons
-        |   sprite.svg
 ```
 
 ## How tos
 
-### How can I add a new SVG icon and then use it on my site.
-
-You can add your custom icons to `./src/icons/`. F.e. `my-awesome-icon.svg`.
-Running `nvm use && npm i && npm run build` will collect the icon to the sprite.svg and it should then be available for use on your site by calling `my-awesome-icon`. Just remember to clear caches.
-The icons can be used in twig like so:
-
-    {# HDBT Subtheme specific icons #}
-    {% include "@hdbt_subtheme/misc/icon.twig" with {icon: 'my-awesome-icon'} %}
-
-    {# HDBT specific icons #}
-    {% include "@hdbt/misc/icon.twig" with {icon: 'google-view'} %}
-
-To use the icon in SCSS, you can call it like so:
-
-    background-image: url('../icons/my-awesome-icon.svg');
-
 ### My javascript has unexpected errors when loading a page in Drupal.
 
 If you have compiled the code with dev-flag (`nmp run dev`), then the sourcemaps expects the JS files to be found in correct places.
diff --git a/public/themes/custom/hdbt_subtheme/templates/misc/icon.twig b/public/themes/custom/hdbt_subtheme/templates/misc/icon.twig
deleted file mode 100644
index 8e2c5124..00000000
--- a/public/themes/custom/hdbt_subtheme/templates/misc/icon.twig
+++ /dev/null
@@ -1 +0,0 @@
-<span class="hdbt-subtheme-icon hdbt-subtheme-icon--{{ icon }} {{ class }}" {% if label %} aria-label="{{ label }}" {% else %} aria-hidden="true" {% endif %}></span>
diff --git a/public/themes/custom/hdbt_subtheme/webpack.config.js b/public/themes/custom/hdbt_subtheme/webpack.config.js
index ab9055da..75b8e803 100644
--- a/public/themes/custom/hdbt_subtheme/webpack.config.js
+++ b/public/themes/custom/hdbt_subtheme/webpack.config.js
@@ -4,7 +4,6 @@ const glob = require('glob');
 const FriendlyErrorsWebpackPlugin = require('@nuxt/friendly-errors-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const RemoveEmptyScriptsPlugin = require('webpack-remove-empty-scripts');
-const SvgToSprite = require('./webpack.svgToSprite');
 const { merge } = require('webpack-merge');
 
 // Handle entry points.
@@ -105,12 +104,6 @@ module.exports = (env, argv) => {
       extensions: ['.js', '.json'],
     },
     plugins: [
-      // Uncomment following lines to create svg icon sprite.
-      // new SvgToSprite(
-      //   path.resolve(__dirname, 'src/icons/**/*.svg'),
-      //   'icons/hdbt-subtheme-sprite.svg',
-      //   'icons.json'
-      // ),
       new FriendlyErrorsWebpackPlugin(),
       new RemoveEmptyScriptsPlugin(),
       new MiniCssExtractPlugin({
diff --git a/public/themes/custom/hdbt_subtheme/webpack.svgToSprite.js b/public/themes/custom/hdbt_subtheme/webpack.svgToSprite.js
deleted file mode 100644
index cfb478ed..00000000
--- a/public/themes/custom/hdbt_subtheme/webpack.svgToSprite.js
+++ /dev/null
@@ -1,181 +0,0 @@
-const fs = require('fs');
-const md5 = require('md5');
-const path = require('path');
-const glob = require('glob');
-const SVGSpriter = require('svg-sprite');
-
-// Generates styles for each icon.
-class svgToSprite {
-  constructor(inputPattern, outputSvgSpriteFilename, outputIconJsonFilename) {
-    // Current theme name.
-    this.themeName = path.basename(path.resolve(process.cwd())).replace(/_/g, '-');
-
-    // Input and output patterns.
-    this.inputPattern = inputPattern;
-    this.svgSpriteFilename = outputSvgSpriteFilename;
-    this.svgToCssOutputFilename = `css/${this.themeName}-icons.css`;
-    this.svgToJsonOutputFilename = outputIconJsonFilename;
-
-    // Mapped SVG files.
-    this.files = [];
-    this.cssVariables = [];
-    this.classes = [];
-
-    // Sprite configurations.
-    this.spriteHashFilename = '';
-  }
-
-  apply(compiler) {
-    const pluginName = svgToSprite.name;
-    const { webpack } = compiler;
-    const { Compilation } = webpack;
-    const { RawSource } = webpack.sources;
-
-    // Tapping to the "thisCompilation" hook in order to further tap
-    // to the compilation process on an earlier stage.
-    compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
-
-      // Tapping to the assets processing pipeline on a specific stage.
-      compilation.hooks.processAssets.tap(
-        {
-          name: pluginName,
-          stage: Compilation.PROCESS_ASSETS_STAGE_SUMMARIZE,
-        },
-        () => {
-          if (this.files) {
-            // Create Spriter instance with custom configuration.
-            let spriter = new SVGSpriter({
-              mode: {
-                stack: {
-                  dest: "dist",
-                  sprite: this.svgSpriteFilename,
-                  rootviewbox: false,
-                }
-              }
-            });
-
-            // Add SVG files to Spriter instance.
-            this.files.forEach(function(pathname) {
-              spriter.add(pathname, null, fs.readFileSync(pathname, 'utf-8'));
-            });
-
-            // Compile the sprite.
-            spriter.compile((error, result) => {
-              for (let mode in result) {
-                for (let resource in result[mode]) {
-                  let hash = md5(result[mode][resource].contents).slice(-5);
-                  let outputFilename = this.svgSpriteFilename.replace(/.svg/g, `-${hash}.svg`);
-
-                  if (result[mode][resource].contents) {
-                    this.spriteHashFilename = outputFilename;
-
-                    // Adding new asset to the compilation, so it will be
-                    // automatically generated by the webpack
-                    // in the output directory.
-                    compilation.emitAsset(
-                      outputFilename,
-                      new RawSource(result[mode][resource].contents)
-                    );
-                  }
-                }
-              }
-            });
-          }
-        }
-      );
-    });
-
-    // SVG to CSS.
-    // Create styles for the icons.
-    compiler.hooks.emit.tapAsync('svgToCss', (compilation, callback) => {
-
-      // Create --hel-icon--{icon name} and [data-hds-icon-start:'{icon name}'] CSS variables.
-      let cssVariables = [];
-
-      while(this.cssVariables.length) {
-        let fullFilename = this.cssVariables.shift();
-        let filename = fullFilename.replace(/^.*[\\\/]/, '')
-        let name = filename.split('.');
-        cssVariables.push(`--${this.themeName}-icon--${name[0]}:url(../${this.spriteHashFilename}#${name[0]})`);
-      }
-      cssVariables = `:root{${ cssVariables.join(';') }}`;
-
-      // Create .hel-icon--{icon name} & [data-hds-icon-start:'{icon name}'] or {theme-name}--{icon name} css classes.
-      let cssClasses = '';
-      while(this.classes.length) {
-        let fullFilename = this.classes.shift();
-        let filename = fullFilename.replace(/^.*[\\\/]/, '')
-        let name = filename.split('.');
-        cssClasses += `.${this.themeName}-icon--${name[0]},[data-hds-icon-start='${name[0]}']{--url:var(--${this.themeName}-icon--${name[0]})}`;
-      }
-
-      // Add a URL as a CSS variable to the hel-icon mask-image.
-      // If icons are used elsewhere (f.e. in a separate theme or module) this
-      // variable will provide the correct URL for the icon.
-      let hdbtIconUrl = `.${this.themeName}-icon,[data-hds-icon-start]::before{` +
-        `-webkit-mask-image:var(--url);` +
-        `mask-image:var(--url)` +
-      `}`;
-
-      // Combine CSS variables and classes.
-      let filelist = cssVariables + cssClasses + hdbtIconUrl;
-
-      // Compile the assets.
-      compilation.assets[this.svgToCssOutputFilename] = {
-        source: function() {
-          return filelist;
-        },
-        size: function() {
-          return filelist.length;
-        }
-      };
-      callback();
-    });
-    compiler.hooks.environment.tap('svgToCss', this.checkForFiles.bind(this));
-    compiler.hooks.watchRun.tap('svgToCss', this.checkForFiles.bind(this));
-
-    // SVG to JSON
-    // Create a list of icons in JSON format.
-    compiler.hooks.emit.tapAsync('svgToJson', (compilation, callback) => {
-      let filelist = '[';
-      const last = this.files[this.files.length - 1];
-
-      while(this.files.length) {
-        let fullfilename = this.files.shift();
-        let filename = fullfilename.replace(/^.*[\\\/]/, '')
-        let name = filename.split('.');
-        let divider = (fullfilename === last) ? '"' : '",';
-        filelist += '"' + name[0] + divider;
-      }
-      filelist += ']';
-
-      compilation.assets[this.svgToJsonOutputFilename] = {
-        source: function() {
-          return filelist;
-        },
-        size: function() {
-          return filelist.length;
-        }
-      };
-      callback();
-    });
-    compiler.hooks.environment.tap('svgToJson', this.checkForFiles.bind(this));
-    compiler.hooks.watchRun.tap('svgToJson', this.checkForFiles.bind(this));
-  }
-
-  // Map files to suitable variables.
-  checkForFiles() {
-    glob.globSync(this.inputPattern).map((match) => {
-      const pathname = path.resolve(match);
-      const stats = fs.lstatSync(pathname);
-
-      if (stats.isFile()) {
-        this.classes = [...new Set([...this.classes, pathname])];
-        this.cssVariables = [...new Set([...this.cssVariables, pathname])];
-        this.files = [...new Set([...this.files, pathname])];
-      }
-    });
-  }
-}
-
-module.exports = svgToSprite;

From b3f9938999e37e62284920157073e412282e41ae Mon Sep 17 00:00:00 2001
From: hel-platta-automation
 <95360595+hel-platta-automation@users.noreply.github.com>
Date: Wed, 6 Mar 2024 12:29:16 +0000
Subject: [PATCH 2/3] Update configuration

---
 composer.lock                                 | 207 +++++++++---------
 ....entity_form_display.node.page.default.yml |  10 +-
 ...ty_form_display.paragraph.hero.default.yml |  19 +-
 ...e.entity_view_display.media.image.hero.yml |   2 +-
 ...ce_channel.tpr_service_channel.default.yml |   9 +-
 conf/cmi/core.entity_view_mode.media.hero.yml |   2 +-
 .../field.field.node.page.field_content.yml   |  22 +-
 ...ld.field.node.page.field_lower_content.yml |  24 +-
 ....field.node.page.field_sidebar_content.yml |   2 +-
 ...eld.paragraph.event_list.field_api_url.yml |   4 +-
 ...agraph.event_list.field_event_location.yml |   4 +-
 ...d.field.paragraph.hero.field_hero_desc.yml |   2 +-
 ...ld.storage.paragraph.field_hero_design.yml |  19 +-
 ...eld.paragraph.event_list.field_api_url.yml |   2 +-
 ...agraph.event_list.field_event_location.yml |   2 +-
 ...ld.storage.paragraph.field_hero_design.yml |  12 -
 ...ld.storage.paragraph.field_hero_design.yml |  12 -
 conf/cmi/views.view.service_list.yml          |   7 +-
 18 files changed, 172 insertions(+), 189 deletions(-)
 delete mode 100644 conf/cmi/language/fi/field.storage.paragraph.field_hero_design.yml
 delete mode 100644 conf/cmi/language/sv/field.storage.paragraph.field_hero_design.yml

diff --git a/composer.lock b/composer.lock
index bd4dcb1b..30906fd2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1190,16 +1190,16 @@
         },
         {
             "name": "doctrine/collections",
-            "version": "2.2.0",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/collections.git",
-                "reference": "07e16cd7b80a2cffed99e36b541876af172f0257"
+                "reference": "420480fc085bc65f3c956af13abe8e7546f94813"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/07e16cd7b80a2cffed99e36b541876af172f0257",
-                "reference": "07e16cd7b80a2cffed99e36b541876af172f0257",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/420480fc085bc65f3c956af13abe8e7546f94813",
+                "reference": "420480fc085bc65f3c956af13abe8e7546f94813",
                 "shasum": ""
             },
             "require": {
@@ -1256,7 +1256,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/collections/issues",
-                "source": "https://github.com/doctrine/collections/tree/2.2.0"
+                "source": "https://github.com/doctrine/collections/tree/2.2.1"
             },
             "funding": [
                 {
@@ -1272,7 +1272,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-25T22:55:36+00:00"
+            "time": "2024-03-05T22:28:45+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -1995,16 +1995,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "10.2.3",
+            "version": "10.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "cc8c7952f7013795b735f5c15290e76937163bb7"
+                "reference": "d1c5b44adfc79bda03252471491b0fba89d87eff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/cc8c7952f7013795b735f5c15290e76937163bb7",
-                "reference": "cc8c7952f7013795b735f5c15290e76937163bb7",
+                "url": "https://api.github.com/repos/drupal/core/zipball/d1c5b44adfc79bda03252471491b0fba89d87eff",
+                "reference": "d1c5b44adfc79bda03252471491b0fba89d87eff",
                 "shasum": ""
             },
             "require": {
@@ -2152,9 +2152,9 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/10.2.3"
+                "source": "https://github.com/drupal/core/tree/10.2.4"
             },
-            "time": "2024-02-07T22:44:48+00:00"
+            "time": "2024-03-06T08:23:56+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
@@ -3724,16 +3724,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "6.4.17",
+            "version": "6.4.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "13dbc7ad6fcf6f943cca47f3002e213052d23111"
+                "reference": "4c0799db84a8007dba7c48de4af7c3d874498c03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/13dbc7ad6fcf6f943cca47f3002e213052d23111",
-                "reference": "13dbc7ad6fcf6f943cca47f3002e213052d23111",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/4c0799db84a8007dba7c48de4af7c3d874498c03",
+                "reference": "4c0799db84a8007dba7c48de4af7c3d874498c03",
                 "shasum": ""
             },
             "require": {
@@ -3751,23 +3751,23 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.17",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.19",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2024-02-28T07:06:09+00:00"
+            "time": "2024-03-06T08:19:03+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
-            "version": "3.1.2",
+            "version": "3.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git",
-                "reference": "220819586d9ec9d11d72115be9a271ebc181c513"
+                "reference": "b39cc0cbf23eeea448a2b10b835b406b19efc3c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/220819586d9ec9d11d72115be9a271ebc181c513",
-                "reference": "220819586d9ec9d11d72115be9a271ebc181c513",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/b39cc0cbf23eeea448a2b10b835b406b19efc3c0",
+                "reference": "b39cc0cbf23eeea448a2b10b835b406b19efc3c0",
                 "shasum": ""
             },
             "require": {
@@ -3786,10 +3786,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.2",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.4",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues"
             },
-            "time": "2024-02-09T07:13:18+00:00"
+            "time": "2024-03-06T12:26:23+00:00"
         },
         {
             "name": "drupal/health_check",
@@ -3843,16 +3843,16 @@
         },
         {
             "name": "drupal/helfi_api_base",
-            "version": "2.6.1",
+            "version": "2.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
-                "reference": "5d713ea9804fe9c9f728da6cd02542f10768f918"
+                "reference": "778b6431d341db6f280aeb343d1bc673a378b5a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/5d713ea9804fe9c9f728da6cd02542f10768f918",
-                "reference": "5d713ea9804fe9c9f728da6cd02542f10768f918",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/778b6431d341db6f280aeb343d1bc673a378b5a0",
+                "reference": "778b6431d341db6f280aeb343d1bc673a378b5a0",
                 "shasum": ""
             },
             "require": {
@@ -3881,10 +3881,10 @@
             ],
             "description": "Helfi - API Base",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.1",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.4",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
             },
-            "time": "2024-02-09T07:17:02+00:00"
+            "time": "2024-03-06T08:32:04+00:00"
         },
         {
             "name": "drupal/helfi_azure_fs",
@@ -3932,12 +3932,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-tools.git",
-                "reference": "7a1cc3ed0c3e4f81bb964fa33a55d5987cb673f1"
+                "reference": "18ace52d7b4c99347a0eb150443062e26a7aabaa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/7a1cc3ed0c3e4f81bb964fa33a55d5987cb673f1",
-                "reference": "7a1cc3ed0c3e4f81bb964fa33a55d5987cb673f1",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/18ace52d7b4c99347a0eb150443062e26a7aabaa",
+                "reference": "18ace52d7b4c99347a0eb150443062e26a7aabaa",
                 "shasum": ""
             },
             "require": {
@@ -4009,7 +4009,7 @@
                 "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main",
                 "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues"
             },
-            "time": "2024-02-28T07:58:18+00:00"
+            "time": "2024-02-29T08:57:00+00:00"
         },
         {
             "name": "drupal/helfi_navigation",
@@ -4047,16 +4047,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "4.3.16",
+            "version": "4.3.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "372c946e224d5d7aa3be3aa33a5b21652093013f"
+                "reference": "d5d63d606dd0909554c9a26cd99d334b29a4c529"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/372c946e224d5d7aa3be3aa33a5b21652093013f",
-                "reference": "372c946e224d5d7aa3be3aa33a5b21652093013f",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d5d63d606dd0909554c9a26cd99d334b29a4c529",
+                "reference": "d5d63d606dd0909554c9a26cd99d334b29a4c529",
                 "shasum": ""
             },
             "require": {
@@ -4138,7 +4138,8 @@
                         "[#UHF-7008] Core localization file download URL is wrong (https://www.drupal.org/project/drupal/issues/3022876)": "https://git.drupalcode.org/project/drupal/-/commit/40a96136b2dfe4322338508dffa636f6cb407900.patch",
                         "[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "https://www.drupal.org/files/issues/2020-02-20/3114824_2.patch",
                         "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch",
-                        "[#UHF-9388] Process translation config files for custom modules (https://www.drupal.org/i/2845437)": "https://www.drupal.org/files/issues/2023-10-16/2845437-61.patch"
+                        "[#UHF-9388] Process translation config files for custom modules (https://www.drupal.org/i/2845437)": "https://www.drupal.org/files/issues/2023-10-16/2845437-61.patch",
+                        "[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch"
                     },
                     "drupal/default_content": {
                         "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch"
@@ -4165,10 +4166,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.16",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.18",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2024-02-27T09:50:42+00:00"
+            "time": "2024-03-06T06:25:46+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -4224,16 +4225,16 @@
         },
         {
             "name": "drupal/helfi_tpr",
-            "version": "2.3.5",
+            "version": "2.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git",
-                "reference": "c14c8634c913125faf96d217d11bac4a456049a8"
+                "reference": "44f69ad718b06aea6022fc9e66c4625525e056c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/c14c8634c913125faf96d217d11bac4a456049a8",
-                "reference": "c14c8634c913125faf96d217d11bac4a456049a8",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/44f69ad718b06aea6022fc9e66c4625525e056c4",
+                "reference": "44f69ad718b06aea6022fc9e66c4625525e056c4",
                 "shasum": ""
             },
             "require": {
@@ -4259,10 +4260,10 @@
             ],
             "description": "TPR integration",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.5",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.6",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues"
             },
-            "time": "2024-01-26T07:55:57+00:00"
+            "time": "2024-03-01T14:46:13+00:00"
         },
         {
             "name": "drupal/helfi_tunnistamo",
@@ -4360,17 +4361,17 @@
         },
         {
             "name": "drupal/imagecache_external",
-            "version": "3.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/imagecache_external.git",
-                "reference": "3.0.1"
+                "reference": "3.0.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.1.zip",
-                "reference": "3.0.1",
-                "shasum": "f36e080a5059d760f4c47ad21ac9391f1b1ea6b3"
+                "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.2.zip",
+                "reference": "3.0.2",
+                "shasum": "0c6254c6de9c4ecd62da6f82f231484f5178e61d"
             },
             "require": {
                 "drupal/core": "^9.3 || ^10"
@@ -4378,8 +4379,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "3.0.1",
-                    "datestamp": "1665918248",
+                    "version": "3.0.2",
+                    "datestamp": "1709311320",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -6592,26 +6593,30 @@
         },
         {
             "name": "drupal/view_unpublished",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/view_unpublished.git",
-                "reference": "8.x-1.1"
+                "reference": "8.x-1.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/view_unpublished-8.x-1.1.zip",
-                "reference": "8.x-1.1",
-                "shasum": "f9f5e88cbaf1a1e71952d94cf67ef2f180e292be"
+                "url": "https://ftp.drupal.org/files/projects/view_unpublished-8.x-1.2.zip",
+                "reference": "8.x-1.2",
+                "shasum": "14374dd56d841270207e21974c7b7cf8aa1804f7"
             },
             "require": {
                 "drupal/core": "^9.4 || ^10"
             },
+            "require-dev": {
+                "drupal/coder": "^8.3.18",
+                "phpcompatibility/php-compatibility": "10.x-dev@dev"
+            },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.1",
-                    "datestamp": "1681757575",
+                    "version": "8.x-1.2",
+                    "datestamp": "1709383642",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -8660,16 +8665,16 @@
         },
         {
             "name": "mck89/peast",
-            "version": "v1.16.1",
+            "version": "v1.16.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mck89/peast.git",
-                "reference": "f6e681062bb25c8dacbd30e079f4ad3fd890d7ad"
+                "reference": "2791b08ffcc1862fe18eef85675da3aa58c406fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mck89/peast/zipball/f6e681062bb25c8dacbd30e079f4ad3fd890d7ad",
-                "reference": "f6e681062bb25c8dacbd30e079f4ad3fd890d7ad",
+                "url": "https://api.github.com/repos/mck89/peast/zipball/2791b08ffcc1862fe18eef85675da3aa58c406fe",
+                "reference": "2791b08ffcc1862fe18eef85675da3aa58c406fe",
                 "shasum": ""
             },
             "require": {
@@ -8682,7 +8687,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.16.1-dev"
+                    "dev-master": "1.16.2-dev"
                 }
             },
             "autoload": {
@@ -8703,9 +8708,9 @@
             "description": "Peast is PHP library that generates AST for JavaScript code",
             "support": {
                 "issues": "https://github.com/mck89/peast/issues",
-                "source": "https://github.com/mck89/peast/tree/v1.16.1"
+                "source": "https://github.com/mck89/peast/tree/v1.16.2"
             },
-            "time": "2024-02-14T08:15:19+00:00"
+            "time": "2024-03-05T09:16:03+00:00"
         },
         {
             "name": "microsoft/azure-storage-blob",
@@ -8846,16 +8851,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.0.1",
+            "version": "v5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69"
+                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69",
-                "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
                 "shasum": ""
             },
             "require": {
@@ -8898,9 +8903,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
             },
-            "time": "2024-02-21T19:24:10+00:00"
+            "time": "2024-03-05T20:51:40+00:00"
         },
         {
             "name": "nodespark/des-connector",
@@ -9515,30 +9520,30 @@
         },
         {
             "name": "phrity/util-errorhandler",
-            "version": "1.0.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sirn-se/phrity-util-errorhandler.git",
-                "reference": "dc9ac8fb70d733c48a9d9d1eb50f7022172da6bc"
+                "reference": "4016d9f9615a4c602f525b0542e4835e316a42e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sirn-se/phrity-util-errorhandler/zipball/dc9ac8fb70d733c48a9d9d1eb50f7022172da6bc",
-                "reference": "dc9ac8fb70d733c48a9d9d1eb50f7022172da6bc",
+                "url": "https://api.github.com/repos/sirn-se/phrity-util-errorhandler/zipball/4016d9f9615a4c602f525b0542e4835e316a42e4",
+                "reference": "4016d9f9615a4c602f525b0542e4835e316a42e4",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2|^8.0"
+                "php": "^7.4 | ^8.0"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.0",
-                "phpunit/phpunit": "^8.0|^9.0",
+                "phpunit/phpunit": "^9.0 | ^10.0 | ^11.0",
                 "squizlabs/php_codesniffer": "^3.5"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "": "src/"
+                    "Phrity\\Util\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -9560,9 +9565,9 @@
             ],
             "support": {
                 "issues": "https://github.com/sirn-se/phrity-util-errorhandler/issues",
-                "source": "https://github.com/sirn-se/phrity-util-errorhandler/tree/1.0.1"
+                "source": "https://github.com/sirn-se/phrity-util-errorhandler/tree/1.1.0"
             },
-            "time": "2022-10-27T12:14:42+00:00"
+            "time": "2024-03-05T19:32:14+00:00"
         },
         {
             "name": "psr/cache",
@@ -10192,16 +10197,16 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.5",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
                 "shasum": ""
             },
             "require": {
@@ -10246,7 +10251,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
             },
             "funding": [
                 {
@@ -10254,7 +10259,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-07T05:35:17+00:00"
+            "time": "2024-03-02T06:30:58+00:00"
         },
         {
             "name": "sentry/sentry",
@@ -11097,16 +11102,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.4.4",
+            "version": "v6.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "7a186f64a7f02787c04e8476538624d6aa888e42"
+                "reference": "f6947cb939d8efee137797382cb4db1af653ef75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7a186f64a7f02787c04e8476538624d6aa888e42",
-                "reference": "7a186f64a7f02787c04e8476538624d6aa888e42",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6947cb939d8efee137797382cb4db1af653ef75",
+                "reference": "f6947cb939d8efee137797382cb4db1af653ef75",
                 "shasum": ""
             },
             "require": {
@@ -11190,7 +11195,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.4"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.5"
             },
             "funding": [
                 {
@@ -11206,7 +11211,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-27T06:32:13+00:00"
+            "time": "2024-03-04T21:00:47+00:00"
         },
         {
             "name": "symfony/mailer",
@@ -12449,16 +12454,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v6.4.3",
+            "version": "v6.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842"
+                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/3b2957ad54902f0f544df83e3d58b38d7e8e5842",
-                "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/7fe30068e207d9c31c0138501ab40358eb2d49a4",
+                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4",
                 "shasum": ""
             },
             "require": {
@@ -12512,7 +12517,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.3"
+                "source": "https://github.com/symfony/routing/tree/v6.4.5"
             },
             "funding": [
                 {
@@ -12528,7 +12533,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T13:55:02+00:00"
+            "time": "2024-02-27T12:33:30+00:00"
         },
         {
             "name": "symfony/serializer",
diff --git a/conf/cmi/core.entity_form_display.node.page.default.yml b/conf/cmi/core.entity_form_display.node.page.default.yml
index 3961ffa1..eb73342b 100644
--- a/conf/cmi/core.entity_form_display.node.page.default.yml
+++ b/conf/cmi/core.entity_form_display.node.page.default.yml
@@ -21,7 +21,7 @@ dependencies:
     - publication_date
     - scheduler
 _core:
-  default_config_hash: _RX52hwdyz48o4MBqyRPUVkop-Unt1rcPuPanpQ7ksk
+  default_config_hash: IrTthHmbnCZxuMpndzRlr9-t2RT3szU18RcM_bpnrz0
 id: node.page.default
 targetEntityType: node
 bundle: page
@@ -79,10 +79,12 @@ content:
         duplicate: '0'
     third_party_settings: {  }
   field_lead_in:
-    type: string_textarea
+    type: textarea_character_counter
     weight: 13
     region: content
     settings:
+      counter_step: 160
+      counter_total: 200
       rows: 3
       placeholder: ''
     third_party_settings: {  }
@@ -203,10 +205,12 @@ content:
       display_label: true
     third_party_settings: {  }
   title:
-    type: string_textfield
+    type: textfield_character_counter
     weight: 1
     region: content
     settings:
+      counter_step: 0
+      counter_total: 55
       size: 60
       placeholder: ''
     third_party_settings: {  }
diff --git a/conf/cmi/core.entity_form_display.paragraph.hero.default.yml b/conf/cmi/core.entity_form_display.paragraph.hero.default.yml
index 31f4c70f..5c5ce571 100644
--- a/conf/cmi/core.entity_form_display.paragraph.hero.default.yml
+++ b/conf/cmi/core.entity_form_display.paragraph.hero.default.yml
@@ -11,24 +11,29 @@ dependencies:
     - field.field.paragraph.hero.field_hero_title
     - paragraphs.paragraphs_type.hero
   module:
+    - allowed_formats
     - hdbt_admin_tools
     - media_library
-    - text
 _core:
-  default_config_hash: CvDiqRtujItZjhiR7KUf0a9dQrlgEcmuDDhJHmzUNOw
+  default_config_hash: 1GjBs_T3tKYlTF4jxU6lUtwC7YSCChaZ4Tmsrialewk
 id: paragraph.hero.default
 targetEntityType: paragraph
 bundle: hero
 mode: default
 content:
   field_hero_desc:
-    type: text_textarea
+    type: formatted_text_character_counter
     weight: 3
     region: content
     settings:
+      counter_step: 160
+      counter_total: 200
       rows: 5
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      allowed_formats:
+        hide_help: '0'
+        hide_guidelines: '0'
   field_hero_design:
     type: design_field_widget
     weight: 0
@@ -47,6 +52,8 @@ content:
     weight: 6
     region: content
     settings:
+      placeholder_url: ''
+      placeholder_title: ''
       linkit_profile: helfi
       linkit_auto_link_text: false
     third_party_settings: {  }
@@ -57,10 +64,12 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_hero_title:
-    type: string_textfield
+    type: textfield_character_counter
     weight: 2
     region: content
     settings:
+      counter_step: 0
+      counter_total: 55
       size: 60
       placeholder: ''
     third_party_settings: {  }
diff --git a/conf/cmi/core.entity_view_display.media.image.hero.yml b/conf/cmi/core.entity_view_display.media.image.hero.yml
index 0ad9d4a0..1336a127 100644
--- a/conf/cmi/core.entity_view_display.media.image.hero.yml
+++ b/conf/cmi/core.entity_view_display.media.image.hero.yml
@@ -11,7 +11,7 @@ dependencies:
   module:
     - responsive_image
 _core:
-  default_config_hash: UX2CrJYBdnGTpSaqiYid65d46ihnZEmWEBJbdXJZQ7g
+  default_config_hash: 1TRAhLvz-37rbjca1TJiVCP65Gy_X5ppn2iiiTRvl-g
 id: media.image.hero
 targetEntityType: media
 bundle: image
diff --git a/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml b/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml
index 16687008..d8dd9db5 100644
--- a/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml
+++ b/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml
@@ -9,7 +9,7 @@ dependencies:
     - telephone
     - text
 _core:
-  default_config_hash: i0i5Sy5UJYyKJqoc7NKFbAMaMlXpC53GoO7Z3mahaBE
+  default_config_hash: NC4qX-7naY7U9PAcLK80wAYby0wkk8T8ZuqKK2_fRd0
 id: tpr_service_channel.tpr_service_channel.default
 targetEntityType: tpr_service_channel
 bundle: tpr_service_channel
@@ -106,6 +106,13 @@ content:
     third_party_settings: {  }
     weight: 22
     region: content
+  information:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 4
+    region: content
   langcode:
     type: language
     label: hidden
diff --git a/conf/cmi/core.entity_view_mode.media.hero.yml b/conf/cmi/core.entity_view_mode.media.hero.yml
index e61858ba..86ebc56f 100644
--- a/conf/cmi/core.entity_view_mode.media.hero.yml
+++ b/conf/cmi/core.entity_view_mode.media.hero.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - media
 _core:
-  default_config_hash: XHi0bUTi0UQU5CFI90xrtRS1tLLlwUSrMhNft4fY_XA
+  default_config_hash: zAj-eiOJoImMZ2MAmC2k7HFfOKvT0JA_aHDz6RaN2uQ
 id: media.hero
 label: Hero
 description: ''
diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml
index 5340a215..678a94f1 100644
--- a/conf/cmi/field.field.node.page.field_content.yml
+++ b/conf/cmi/field.field.node.page.field_content.yml
@@ -42,23 +42,23 @@ settings:
   handler_settings:
     target_bundles:
       text: text
-      columns: columns
-      image: image
       accordion: accordion
+      banner: banner
+      image: image
       list_of_links: list_of_links
-      contact_card_listing: contact_card_listing
       content_cards: content_cards
-      content_liftup: content_liftup
-      banner: banner
-      event_list: event_list
-      news_list: news_list
-      from_library: from_library
+      columns: columns
       phasing: phasing
-      chart: chart
-      remote_video: remote_video
+      from_library: from_library
       map: map
-      unit_search: unit_search
+      remote_video: remote_video
+      chart: chart
+      event_list: event_list
+      contact_card_listing: contact_card_listing
+      news_list: news_list
+      content_liftup: content_liftup
       service_list_search: service_list_search
+      unit_search: unit_search
     negate: 0
     target_bundles_drag_drop:
       accordion:
diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml
index f39db838..3c03f6e8 100644
--- a/conf/cmi/field.field.node.page.field_lower_content.yml
+++ b/conf/cmi/field.field.node.page.field_lower_content.yml
@@ -41,24 +41,24 @@ settings:
   handler: 'default:paragraph'
   handler_settings:
     target_bundles:
-      text: text
-      columns: columns
-      image: image
-      accordion: accordion
       list_of_links: list_of_links
-      contact_card_listing: contact_card_listing
       content_cards: content_cards
-      content_liftup: content_liftup
+      text: text
+      accordion: accordion
       banner: banner
-      event_list: event_list
-      news_list: news_list
-      from_library: from_library
-      chart: chart
+      image: image
+      columns: columns
       phasing: phasing
-      remote_video: remote_video
+      from_library: from_library
       map: map
-      unit_search: unit_search
+      remote_video: remote_video
+      chart: chart
+      event_list: event_list
+      contact_card_listing: contact_card_listing
+      news_list: news_list
+      content_liftup: content_liftup
       service_list_search: service_list_search
+      unit_search: unit_search
     negate: 0
     target_bundles_drag_drop:
       accordion:
diff --git a/conf/cmi/field.field.node.page.field_sidebar_content.yml b/conf/cmi/field.field.node.page.field_sidebar_content.yml
index 1f52ad20..bf8b71f3 100644
--- a/conf/cmi/field.field.node.page.field_sidebar_content.yml
+++ b/conf/cmi/field.field.node.page.field_sidebar_content.yml
@@ -25,8 +25,8 @@ settings:
   handler: 'default:paragraph'
   handler_settings:
     target_bundles:
-      sidebar_text: sidebar_text
       from_library: from_library
+      sidebar_text: sidebar_text
     negate: 0
     target_bundles_drag_drop:
       from_library:
diff --git a/conf/cmi/field.field.paragraph.event_list.field_api_url.yml b/conf/cmi/field.field.paragraph.event_list.field_api_url.yml
index ad6231c7..45b017ea 100644
--- a/conf/cmi/field.field.paragraph.event_list.field_api_url.yml
+++ b/conf/cmi/field.field.paragraph.event_list.field_api_url.yml
@@ -8,13 +8,13 @@ dependencies:
   module:
     - link
 _core:
-  default_config_hash: Y-6hGxIpid7_ScRXE2GozslolF7R3tkTNiJFFaLEw4Y
+  default_config_hash: qFl3v-buWHh5wpZVM1bBbrLFD8prLGRuI8-zz1PX_sA
 id: paragraph.event_list.field_api_url
 field_name: field_api_url
 entity_type: paragraph
 bundle: event_list
 label: 'Api URL'
-description: 'Add URL from tapahtumat.hel.fi to form a list of events. Example URL: https://tapahtumat.hel.fi/fi/events?categories=museum'
+description: 'Add URL from tapahtumat.hel.fi to form a list of events. Example URL: https://tapahtumat.hel.fi/fi/events?categories=museum. If you want to use the location filter, the URL should contain the IDs of all relevant locations. For example: &places=tprek:123,tprek:456'
 required: false
 translatable: false
 default_value: {  }
diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_location.yml b/conf/cmi/field.field.paragraph.event_list.field_event_location.yml
index 63caffe9..35c56c7f 100644
--- a/conf/cmi/field.field.paragraph.event_list.field_event_location.yml
+++ b/conf/cmi/field.field.paragraph.event_list.field_event_location.yml
@@ -6,13 +6,13 @@ dependencies:
     - field.storage.paragraph.field_event_location
     - paragraphs.paragraphs_type.event_list
 _core:
-  default_config_hash: qn_ofDevCfu_ZKP8n6kRAQFTmy0cRAXNJUvxS6mU-6Q
+  default_config_hash: DSXkHRCUYDva2angAe8mEVxY95-9mh8B_oOd_9i-1I0
 id: paragraph.event_list.field_event_location
 field_name: field_event_location
 entity_type: paragraph
 bundle: event_list
 label: 'Event location'
-description: 'Show "event location" filter. Do not use at the same time with the "Remote events" filter.'
+description: 'Show "event location" filter. Do not use at the same time with the "Remote events" filter. The API URL field should include all location IDs, otherwise this list will display all active locations.'
 required: false
 translatable: false
 default_value:
diff --git a/conf/cmi/field.field.paragraph.hero.field_hero_desc.yml b/conf/cmi/field.field.paragraph.hero.field_hero_desc.yml
index ac9a71de..e6e0acb6 100644
--- a/conf/cmi/field.field.paragraph.hero.field_hero_desc.yml
+++ b/conf/cmi/field.field.paragraph.hero.field_hero_desc.yml
@@ -12,7 +12,7 @@ third_party_settings:
   allowed_formats:
     allowed_formats: {  }
 _core:
-  default_config_hash: 8R816KbWZKNUvPgCHKY1nRR0RRNTUOhsmU9s2eQCy-c
+  default_config_hash: cwwrLHDaOq3Y_x5EhOnPYng3P2Qpk-AZNL5Zo6DZn20
 id: paragraph.hero.field_hero_desc
 field_name: field_hero_desc
 entity_type: paragraph
diff --git a/conf/cmi/field.storage.paragraph.field_hero_design.yml b/conf/cmi/field.storage.paragraph.field_hero_design.yml
index b195327c..15361208 100644
--- a/conf/cmi/field.storage.paragraph.field_hero_design.yml
+++ b/conf/cmi/field.storage.paragraph.field_hero_design.yml
@@ -6,28 +6,13 @@ dependencies:
     - options
     - paragraphs
 _core:
-  default_config_hash: zZ661kERU722BOWyFdnw3UIzhMePsDzfGXd2TsHAJYc
+  default_config_hash: KXFi1Afbypvb78pxWyzXeA3ha5otHESFK39t-DuF16Q
 id: paragraph.field_hero_design
 field_name: field_hero_design
 entity_type: paragraph
 type: list_string
 settings:
-  allowed_values:
-    -
-      value: without-image-left
-      label: 'Without image, align left'
-    -
-      value: with-image-right
-      label: 'Image on the right'
-    -
-      value: with-image-left
-      label: 'Image on the left'
-    -
-      value: with-image-bottom
-      label: 'Image on the bottom'
-    -
-      value: diagonal
-      label: Diagonal
+  allowed_values: {  }
   allowed_values_function: helfi_paragraphs_hero_design_allowed_values
 module: options
 locked: false
diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_api_url.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_api_url.yml
index 84bd6531..1eab9886 100644
--- a/conf/cmi/language/fi/field.field.paragraph.event_list.field_api_url.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.event_list.field_api_url.yml
@@ -1 +1 @@
-description: 'Tapahtumat.hel.fi-osoite, jonka perusteella listaus muodostetaan.'
+description: 'Tapahtumat.hel.fi-osoite, jonka perusteella listaus muodostetaan. Esimerkki: https://tapahtumat.hel.fi/fi/events?categories=museum. Jos haluat käyttää tapahtumapaikka-suodatinta, URLissa tulee olla mukana tapahtumapaikkojen ID:t. Esim: &places=tprek:123,tprek:456'
diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml
index 5808b45f..aa160447 100644
--- a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml
@@ -1,5 +1,5 @@
 label: Tapahtumapaikka
-description: 'Näytä "tapahtumapaikka" -suodatin. Älä käytä yhtä aikaa "Etätapahtumat" -suodattimen kanssa.'
+description: 'Näytä "tapahtumapaikka" -suodatin. Älä käytä yhtä aikaa "Etätapahtumat" -suodattimen kanssa. API URL kentässä tulee olla tapahtumapaikkojen ID:t mukana, muuten listassa näytetään kaikki aktiiviset tapahtumapaikat.'
 settings:
   on_label: Kyllä
   off_label: Ei
diff --git a/conf/cmi/language/fi/field.storage.paragraph.field_hero_design.yml b/conf/cmi/language/fi/field.storage.paragraph.field_hero_design.yml
deleted file mode 100644
index 7e625c9c..00000000
--- a/conf/cmi/language/fi/field.storage.paragraph.field_hero_design.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-settings:
-  allowed_values:
-    -
-      label: 'Ilman kuvaa, tasattu vasemmalle'
-    -
-      label: 'Kuva oikealla'
-    -
-      label: 'Kuva vasemmalla'
-    -
-      label: 'Kuva alhaalla'
-    -
-      label: Diagonaalinen
diff --git a/conf/cmi/language/sv/field.storage.paragraph.field_hero_design.yml b/conf/cmi/language/sv/field.storage.paragraph.field_hero_design.yml
deleted file mode 100644
index 5c5f4ec1..00000000
--- a/conf/cmi/language/sv/field.storage.paragraph.field_hero_design.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-settings:
-  allowed_values:
-    -
-      label: 'Utan bild, justerad vänster'
-    -
-      label: 'Bild justerad till höger'
-    -
-      label: 'Bild justerad till vänster'
-    -
-      label: 'Bild justerad ner'
-    -
-      label: Diagonal
diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
index defe52b4..a07e3619 100644
--- a/conf/cmi/views.view.service_list.yml
+++ b/conf/cmi/views.view.service_list.yml
@@ -645,7 +645,7 @@ display:
         type: full
         options:
           offset: 0
-          items_per_page: 15
+          items_per_page: 5
           total_pages: null
           id: 0
           tags:
@@ -896,10 +896,7 @@ display:
         filters: false
         filter_groups: false
       relationships: {  }
-      display_extenders:
-        metatag_display_extender:
-          metatags: {  }
-          tokenize: false
+      display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts:

From 050b55c6615011e8ccacd8acc9edd9ddfbc11332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Thu, 7 Mar 2024 08:56:52 +0200
Subject: [PATCH 3/3] Update views.view.service_list.yml

---
 conf/cmi/views.view.service_list.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
index a07e3619..37736e72 100644
--- a/conf/cmi/views.view.service_list.yml
+++ b/conf/cmi/views.view.service_list.yml
@@ -896,7 +896,10 @@ display:
         filters: false
         filter_groups: false
       relationships: {  }
-      display_extenders: {  }
+      display_extenders:
+        metatag_display_extender:
+          metatags: {  }
+          tokenize: false
     cache_metadata:
       max-age: -1
       contexts: