Merge pull request #941 from City-of-Helsinki/UHF-11656

teroelonen · web-flow · commit 609ca476b46d · 2025-04-24T10:18:43.000+03:00
UHF-11656: Numbers highlight paragraph
diff --git a/modules/hdbt_admin_tools/hdbt_admin_tools.module b/modules/hdbt_admin_tools/hdbt_admin_tools.module
@@ -1092,6 +1092,9 @@ function hdbt_admin_tools_preprocess_form_element(array &$variables): void {
   $variables['counter_step'] = $variables['element']['#counter_step'];
   $variables['counter_total'] = $variables['element']['#counter_total'];
   $variables['counter_input_tag'] = $variables['element']['#type'] === 'textarea' ? 'textarea' : 'input';
+  if (isset($variables['element']['#counter_type']) && $variables['element']['#counter_type'] === 'multifield') {
+    $variables['counter_input_tag'] = 'multifield';
+  }
 }
 
 /**
diff --git a/modules/helfi_node_landing_page/helfi_node_landing_page.module b/modules/helfi_node_landing_page/helfi_node_landing_page.module
@@ -79,6 +79,7 @@ function helfi_node_landing_page_helfi_paragraph_types() : array {
       'event_list' => 13,
       'news_list' => 14,
       'image_gallery' => 15,
+      'number_highlights' => 16,
     ],
   ];
 
diff --git a/modules/helfi_node_page/helfi_node_page.module b/modules/helfi_node_page/helfi_node_page.module
@@ -80,6 +80,7 @@ function helfi_node_page_helfi_paragraph_types() : array {
       'contact_card_listing' => 14,
       'news_list' => 15,
       'image_gallery' => 16,
+      'number_highlights' => 17,
     ],
     'field_lower_content' => [
       'list_of_links' => 0,
@@ -98,6 +99,7 @@ function helfi_node_page_helfi_paragraph_types() : array {
       'contact_card_listing' => 14,
       'news_list' => 15,
       'image_gallery' => 16,
+      'number_highlights' => 17,
     ],
     'field_sidebar_content' => [
       'from_library' => 0,
diff --git a/modules/helfi_paragraphs_number_highlights/config/install/core.entity_form_display.paragraph.number_highlights.default.yml b/modules/helfi_paragraphs_number_highlights/config/install/core.entity_form_display.paragraph.number_highlights.default.yml
@@ -0,0 +1,44 @@
+uuid: a26e6166-ba30-43ab-814e-4b7270bb3345
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.number_highlights.field_number_highlight
+    - field.field.paragraph.number_highlights.field_number_highlights_desc
+    - field.field.paragraph.number_highlights.field_number_highlights_title
+    - paragraphs.paragraphs_type.number_highlights
+  module:
+    - helfi_paragraphs_number_highlights
+    - text
+id: paragraph.number_highlights.default
+targetEntityType: paragraph
+bundle: number_highlights
+mode: default
+content:
+  field_number_highlight:
+    type: numbers_item_widget
+    weight: 2
+    region: content
+    settings:
+      placeholder_number: ''
+      placeholder_text: ''
+    third_party_settings: {  }
+  field_number_highlights_desc:
+    type: text_textarea
+    weight: 1
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  field_number_highlights_title:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  created: true
+  status: true
diff --git a/modules/helfi_paragraphs_number_highlights/config/install/core.entity_view_display.paragraph.number_highlights.default.yml b/modules/helfi_paragraphs_number_highlights/config/install/core.entity_view_display.paragraph.number_highlights.default.yml
@@ -0,0 +1,41 @@
+uuid: 94a2177c-d24a-448d-a3cb-3c78a42fa4d7
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.number_highlights.field_number_highlight
+    - field.field.paragraph.number_highlights.field_number_highlights_desc
+    - field.field.paragraph.number_highlights.field_number_highlights_title
+    - paragraphs.paragraphs_type.number_highlights
+  module:
+    - helfi_paragraphs_number_highlights
+    - text
+id: paragraph.number_highlights.default
+targetEntityType: paragraph
+bundle: number_highlights
+mode: default
+content:
+  field_number_highlight:
+    type: numbers_item_formatter
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 2
+    region: content
+  field_number_highlights_desc:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_number_highlights_title:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  search_api_excerpt: true
diff --git a/modules/helfi_paragraphs_number_highlights/config/install/field.field.paragraph.number_highlights.field_number_highlight.yml b/modules/helfi_paragraphs_number_highlights/config/install/field.field.paragraph.number_highlights.field_number_highlight.yml
@@ -0,0 +1,21 @@
+uuid: f62709b7-4e42-454d-8427-94e99c863cdf
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_number_highlight
+    - paragraphs.paragraphs_type.number_highlights
+  module:
+    - helfi_paragraphs_number_highlights
+id: paragraph.number_highlights.field_number_highlight
+field_name: field_number_highlight
+entity_type: paragraph
+bundle: number_highlights
+label: 'Number Highlight'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: numbers_item
diff --git a/modules/helfi_paragraphs_number_highlights/config/install/field.field.paragraph.number_highlights.field_number_highlights_desc.yml b/modules/helfi_paragraphs_number_highlights/config/install/field.field.paragraph.number_highlights.field_number_highlights_desc.yml
@@ -0,0 +1,22 @@
+uuid: d70a0b24-b005-48cb-b1db-fe34d2158208
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_number_highlights_desc
+    - paragraphs.paragraphs_type.number_highlights
+  module:
+    - text
+third_party_settings: { }
+id: paragraph.number_highlights.field_number_highlights_desc
+field_name: field_number_highlights_desc
+entity_type: paragraph
+bundle: number_highlights
+label: Description
+description: 'You can add a short description after the title.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: { }
+field_type: text_long
diff --git a/modules/helfi_paragraphs_number_highlights/config/install/field.field.paragraph.number_highlights.field_number_highlights_title.yml b/modules/helfi_paragraphs_number_highlights/config/install/field.field.paragraph.number_highlights.field_number_highlights_title.yml
@@ -0,0 +1,19 @@
+uuid: 6daf9f3a-8f30-40b8-a7ed-aca8332893d3
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_number_highlights_title
+    - paragraphs.paragraphs_type.number_highlights
+id: paragraph.number_highlights.field_number_highlights_title
+field_name: field_number_highlights_title
+entity_type: paragraph
+bundle: number_highlights
+label: Title
+description: 'You can add a title'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/modules/helfi_paragraphs_number_highlights/config/install/field.storage.paragraph.field_number_highlight.yml b/modules/helfi_paragraphs_number_highlights/config/install/field.storage.paragraph.field_number_highlight.yml
@@ -0,0 +1,19 @@
+uuid: b9338a23-ff49-4528-8150-1c308a9276cc
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_paragraphs_number_highlights
+    - paragraphs
+id: paragraph.field_number_highlight
+field_name: field_number_highlight
+entity_type: paragraph
+type: numbers_item
+settings: {  }
+module: helfi_paragraphs_number_highlights
+locked: false
+cardinality: 4
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/helfi_paragraphs_number_highlights/config/install/field.storage.paragraph.field_number_highlights_desc.yml b/modules/helfi_paragraphs_number_highlights/config/install/field.storage.paragraph.field_number_highlights_desc.yml
@@ -0,0 +1,19 @@
+uuid: d0dd1b70-5fda-432b-be4d-3f1728652697
+langcode: en
+status: true
+dependencies:
+  module:
+    - paragraphs
+    - text
+id: paragraph.field_number_highlights_desc
+field_name: field_number_highlights_desc
+entity_type: paragraph
+type: text_long
+settings: {  }
+module: text
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/helfi_paragraphs_number_highlights/config/install/field.storage.paragraph.field_number_highlights_title.yml b/modules/helfi_paragraphs_number_highlights/config/install/field.storage.paragraph.field_number_highlights_title.yml
@@ -0,0 +1,21 @@
+uuid: ce3e0954-0324-4ed7-9af8-25226d87d57d
+langcode: en
+status: true
+dependencies:
+  module:
+    - paragraphs
+id: paragraph.field_number_highlights_title
+field_name: field_number_highlights_title
+entity_type: paragraph
+type: string
+settings:
+  max_length: 255
+  case_sensitive: false
+  is_ascii: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/helfi_paragraphs_number_highlights/config/install/paragraphs.paragraphs_type.number_highlights.yml b/modules/helfi_paragraphs_number_highlights/config/install/paragraphs.paragraphs_type.number_highlights.yml
@@ -0,0 +1,10 @@
+uuid: e45a7a8d-d548-4068-8481-4b93be2620ee
+langcode: en
+status: true
+dependencies: {  }
+id: number_highlights
+label: 'Number highlights'
+icon_uuid: null
+icon_default: null
+description: ''
+behavior_plugins: {  }
diff --git a/modules/helfi_paragraphs_number_highlights/config/optional/language/fi/field.field.paragraph.number_highlights.field_number_highlight.yml b/modules/helfi_paragraphs_number_highlights/config/optional/language/fi/field.field.paragraph.number_highlights.field_number_highlight.yml
@@ -0,0 +1 @@
+label: Lukunosto
diff --git a/modules/helfi_paragraphs_number_highlights/config/optional/language/fi/field.field.paragraph.number_highlights.field_number_highlights_desc.yml b/modules/helfi_paragraphs_number_highlights/config/optional/language/fi/field.field.paragraph.number_highlights.field_number_highlights_desc.yml
@@ -0,0 +1,2 @@
+label: Kuvaus
+description: 'Voit lisätä lyhyen kuvauksen otsikon jälkeen.'
diff --git a/modules/helfi_paragraphs_number_highlights/config/optional/language/fi/field.field.paragraph.number_highlights.field_number_highlights_title.yml b/modules/helfi_paragraphs_number_highlights/config/optional/language/fi/field.field.paragraph.number_highlights.field_number_highlights_title.yml
@@ -0,0 +1,2 @@
+label: Otsikko
+description: 'Voit lisätä otsikon'
diff --git a/modules/helfi_paragraphs_number_highlights/config/optional/language/fi/paragraphs.paragraphs_type.number_highlights.yml b/modules/helfi_paragraphs_number_highlights/config/optional/language/fi/paragraphs.paragraphs_type.number_highlights.yml
@@ -0,0 +1 @@
+label: Lukunostot
diff --git a/modules/helfi_paragraphs_number_highlights/helfi_paragraphs_number_highlights.info.yml b/modules/helfi_paragraphs_number_highlights/helfi_paragraphs_number_highlights.info.yml
@@ -0,0 +1,8 @@
+name: 'HELfi Paragraphs: Number highlights'
+type: module
+core_version_requirement: '^9 || ^10'
+dependencies:
+  - paragraphs:paragraphs
+  - drupal:text
+'interface translation project': helfi_paragraphs_number_highlights
+'interface translation server pattern': modules/contrib/helfi_platform_config/modules/helfi_paragraphs_number_highlights/translations/%language.po
diff --git a/modules/helfi_paragraphs_number_highlights/helfi_paragraphs_number_highlights.module b/modules/helfi_paragraphs_number_highlights/helfi_paragraphs_number_highlights.module
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * Contains hooks for 'helfi_paragraphs_number_highlights' module.
+ */
+
+declare(strict_types=1);
+
+/**
+ * Implements hook_theme().
+ */
+function helfi_paragraphs_number_highlights_theme($existing, $type, $theme, $path) {
+  return [
+    'numbers_item' => [
+      'variables' => [
+        'number' => NULL,
+        'text' => NULL,
+        'attributes' => [],
+      ],
+    ],
+  ];
+}
diff --git a/modules/helfi_paragraphs_number_highlights/src/Plugin/Field/FieldFormatter/NumbersFormatter.php b/modules/helfi_paragraphs_number_highlights/src/Plugin/Field/FieldFormatter/NumbersFormatter.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\helfi_paragraphs_number_highlights\Plugin\Field\FieldFormatter;
+
+use Drupal\Core\Field\Attribute\FieldFormatter;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FormatterBase;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+
+/**
+ * Plugin implementation of the 'numbers_item' field formatter.
+ */
+#[FieldFormatter(
+  id: "numbers_item_formatter",
+  label: new TranslatableMarkup("Number + Text (Default)", [], ['context' => 'Number highlights']),
+  field_types: ["numbers_item"]
+)]
+class NumbersFormatter extends FormatterBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items, $langcode) {
+    $elements = [];
+    foreach ($items as $delta => $item) {
+      $elements[$delta] = [
+        '#theme' => 'numbers_item',
+        '#number' => $item->number,
+        '#text' => $item->text,
+        '#attributes' => [
+          'class' => ['numbers-item__container'],
+        ],
+      ];
+    }
+    return $elements;
+  }
+
+}
diff --git a/modules/helfi_paragraphs_number_highlights/src/Plugin/Field/FieldType/NumbersItem.php b/modules/helfi_paragraphs_number_highlights/src/Plugin/Field/FieldType/NumbersItem.php
diff --git a/modules/helfi_paragraphs_number_highlights/src/Plugin/Field/FieldWidget/NumbersWidget.php b/modules/helfi_paragraphs_number_highlights/src/Plugin/Field/FieldWidget/NumbersWidget.php
diff --git a/modules/helfi_paragraphs_number_highlights/templates/numbers-item.html.twig b/modules/helfi_paragraphs_number_highlights/templates/numbers-item.html.twig
diff --git a/modules/helfi_paragraphs_number_highlights/tests/src/Kernel/NumberItemTest.php b/modules/helfi_paragraphs_number_highlights/tests/src/Kernel/NumberItemTest.php
diff --git a/modules/helfi_paragraphs_number_highlights/translations/fi.po b/modules/helfi_paragraphs_number_highlights/translations/fi.po
diff --git a/modules/helfi_platform_config_base/helfi_platform_config_base.install b/modules/helfi_platform_config_base/helfi_platform_config_base.install

Original file line number	Diff line number	Diff line change
`@@ -1092,6 +1092,9 @@ function hdbt_admin_tools_preprocess_form_element(array &$variables): void {`
`1092`	`1092`	`$variables['counter_step'] = $variables['element']['#counter_step'];`
`1093`	`1093`	`$variables['counter_total'] = $variables['element']['#counter_total'];`
`1094`	`1094`	`$variables['counter_input_tag'] = $variables['element']['#type'] === 'textarea' ? 'textarea' : 'input';`
	`1095`	`+ if (isset($variables['element']['#counter_type']) && $variables['element']['#counter_type'] === 'multifield') {`
	`1096`	`+ $variables['counter_input_tag'] = 'multifield';`
	`1097`	`+ }`
`1095`	`1098`	`}`
`1096`	`1099`
`1097`	`1100`	`/**`