From 29f86a455afa5fdab8163a9c4260ee39c541dce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Tue, 16 Jan 2024 10:05:37 +0200
Subject: [PATCH 1/2] UHF-8975: Updated the order for sote related paragraph
 type orders.

---
 .../custom/helfi_sote/helfi_sote.module       | 46 +++++++------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/public/modules/custom/helfi_sote/helfi_sote.module b/public/modules/custom/helfi_sote/helfi_sote.module
index 472b5c7c..30739ee9 100644
--- a/public/modules/custom/helfi_sote/helfi_sote.module
+++ b/public/modules/custom/helfi_sote/helfi_sote.module
@@ -33,54 +33,40 @@ function helfi_sote_helfi_paragraph_types() : array {
     'tpr_unit' => [
       'tpr_unit' => [
         'field_content' => [
-          'unit_accessibility_information',
-          'unit_contact_card',
+          'unit_accessibility_information' => 10,
+          'unit_contact_card' => 11,
         ],
         'field_lower_content' => [
-          'unit_accessibility_information',
-          'unit_contact_card',
-        ],
-      ],
-    ],
-    'tpr_service' => [
-      'tpr_service' => [
-        'field_content' => [
-          'unit_accessibility_information',
-          'unit_contact_card',
-        ],
-        'field_lower_content' => [
-          'unit_accessibility_information',
-          'unit_contact_card',
+          'unit_accessibility_information' => 14,
+          'unit_contact_card' => 15,
         ],
       ],
     ],
     'node' => [
       'page' => [
         'field_content' => [
-          'calculator',
-          'unit_accessibility_information',
-          'unit_contact_card',
+          'unit_accessibility_information' => 20,
+          'unit_contact_card' => 21,
         ],
         'field_lower_content' => [
-          'calculator',
-          'unit_accessibility_information',
-          'unit_contact_card',
+          'unit_accessibility_information' => 21,
+          'unit_contact_card' => 22,
         ],
       ],
       'landing_page' => [
         'field_content' => [
-          'unit_accessibility_information',
-          'unit_contact_card',
-          'health_station_search',
-          'maternity_and_child_health_clini',
+          'unit_accessibility_information' => 18,
+          'unit_contact_card' => 19,
+          'health_station_search' => 20,
+          'maternity_and_child_health_clini' => 21,
         ],
       ],
     ],
     'paragraphs_library_item' => [
       'paragraphs_library_item' => [
         'paragraphs' => [
-          'unit_accessibility_information',
-          'unit_contact_card',
+          'unit_accessibility_information' => 1,
+          'unit_contact_card' => 1,
         ],
       ],
     ],
@@ -90,8 +76,8 @@ function helfi_sote_helfi_paragraph_types() : array {
   foreach ($entities as $entityTypeId => $bundles) {
     foreach ($bundles as $bundle => $fields) {
       foreach ($fields as $field => $paragraphTypes) {
-        foreach ($paragraphTypes as $paragraphType) {
-          $enabled[] = new ParagraphTypeCollection($entityTypeId, $bundle, $field, $paragraphType);
+        foreach ($paragraphTypes as $paragraphType => $weight) {
+          $enabled[] = new ParagraphTypeCollection($entityTypeId, $bundle, $field, $paragraphType, $weight);
         }
       }
     }

From f35c745d4e74f4ecd23d1f3066f964fa869caa6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Thu, 18 Jan 2024 10:03:13 +0200
Subject: [PATCH 2/2] UHF-8975: Updated configurations for paragraphs.

---
 ....field.node.landing_page.field_content.yml | 44 +++++++++----------
 .../field.field.node.page.field_content.yml   | 40 ++++++++---------
 ...ld.field.node.page.field_lower_content.yml | 40 ++++++++---------
 ....field.node.page.field_sidebar_content.yml |  2 +-
 .../fi/paragraphs.paragraphs_type.chart.yml   |  2 +-
 ...s.paragraphs_type.contact_card_listing.yml |  4 +-
 ...agraphs.paragraphs_type.content_liftup.yml |  3 +-
 .../fi/paragraphs.paragraphs_type.map.yml     |  2 +-
 .../paragraphs.paragraphs_type.news_list.yml  |  2 +-
 ...raphs.paragraphs_type.popular_services.yml |  4 +-
 ...aragraphs.paragraphs_type.remote_video.yml |  2 +-
 ...aragraphs.paragraphs_type.service_list.yml |  2 +-
 ...aphs.paragraphs_type.unit_contact_card.yml |  1 +
 conf/cmi/paragraphs.paragraphs_type.chart.yml |  2 +
 ...agraphs.paragraphs_type.content_liftup.yml |  2 +
 conf/cmi/paragraphs.paragraphs_type.map.yml   |  2 +
 16 files changed, 80 insertions(+), 74 deletions(-)
 create mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.unit_contact_card.yml

diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml
index bfcf7c52..5198c91a 100644
--- a/conf/cmi/field.field.node.landing_page.field_content.yml
+++ b/conf/cmi/field.field.node.landing_page.field_content.yml
@@ -72,72 +72,72 @@ settings:
     negate: 0
     target_bundles_drag_drop:
       banner:
-        weight: 0
+        weight: 2
         enabled: true
       chart:
-        weight: 0
+        weight: 10
         enabled: true
       columns:
-        weight: 0
+        weight: 6
         enabled: true
       content_cards:
-        weight: 0
+        weight: 1
         enabled: true
       content_liftup:
-        weight: 0
+        weight: 11
         enabled: true
       event_list:
-        weight: 0
+        weight: 13
         enabled: true
       from_library:
-        weight: 0
+        weight: 5
         enabled: true
       health_station_search:
-        weight: 0
+        weight: 20
         enabled: true
       hearings:
-        weight: 0
+        weight: 14
         enabled: true
       liftup_with_image:
-        weight: 0
+        weight: 3
         enabled: true
       list_of_links:
         weight: 0
         enabled: true
       map:
-        weight: 0
+        weight: 8
         enabled: true
       maternity_and_child_health_clini:
-        weight: 0
+        weight: 21
         enabled: true
       news_list:
-        weight: 0
+        weight: 14
         enabled: true
       phasing:
-        weight: 0
+        weight: 7
         enabled: true
       popular_services:
-        weight: 0
+        weight: 4
         enabled: true
       remote_video:
-        weight: 0
+        weight: 9
         enabled: true
       service_list:
-        weight: 0
+        weight: 15
         enabled: true
       service_list_search:
-        weight: 0
+        weight: 16
         enabled: true
       target_group_links:
-        weight: 0
+        weight: 12
         enabled: true
       unit_accessibility_information:
-        weight: 0
+        weight: 18
         enabled: true
       unit_contact_card:
-        weight: 0
+        weight: 19
         enabled: true
       unit_search:
-        weight: 0
+        weight: 17
         enabled: true
 field_type: entity_reference_revisions
diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml
index 03f28289..fdae2b3a 100644
--- a/conf/cmi/field.field.node.page.field_content.yml
+++ b/conf/cmi/field.field.node.page.field_content.yml
@@ -68,66 +68,66 @@ settings:
     negate: 0
     target_bundles_drag_drop:
       accordion:
-        weight: 0
+        weight: 1
         enabled: true
       banner:
-        weight: 0
+        weight: 2
         enabled: true
       calculator:
-        weight: 0
+        weight: 19
         enabled: true
       chart:
-        weight: 0
+        weight: 11
         enabled: true
       columns:
-        weight: 0
+        weight: 6
         enabled: true
       contact_card_listing:
-        weight: 0
+        weight: 14
         enabled: true
       content_cards:
-        weight: 0
+        weight: 5
         enabled: true
       content_liftup:
-        weight: 0
+        weight: 12
         enabled: true
       event_list:
-        weight: 0
+        weight: 13
         enabled: true
       from_library:
-        weight: 0
+        weight: 8
         enabled: true
       image:
-        weight: 0
+        weight: 3
         enabled: true
       list_of_links:
-        weight: 0
+        weight: 4
         enabled: true
       map:
-        weight: 0
+        weight: 9
         enabled: true
       news_list:
-        weight: 0
+        weight: 15
         enabled: true
       phasing:
-        weight: 0
+        weight: 7
         enabled: true
       remote_video:
-        weight: 0
+        weight: 10
         enabled: true
       service_list_search:
-        weight: 0
+        weight: 16
         enabled: true
       text:
         weight: 0
         enabled: true
       unit_accessibility_information:
-        weight: 0
+        weight: 20
         enabled: true
       unit_contact_card:
-        weight: 0
+        weight: 21
         enabled: true
       unit_search:
-        weight: 0
+        weight: 17
         enabled: true
 field_type: entity_reference_revisions
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 784c25fd..8d45890e 100644
--- a/conf/cmi/field.field.node.page.field_lower_content.yml
+++ b/conf/cmi/field.field.node.page.field_lower_content.yml
@@ -68,66 +68,66 @@ settings:
     negate: 0
     target_bundles_drag_drop:
       accordion:
-        weight: 0
+        weight: 3
         enabled: true
       banner:
-        weight: 0
+        weight: 4
         enabled: true
       calculator:
-        weight: 0
+        weight: 20
         enabled: true
       chart:
-        weight: 0
+        weight: 11
         enabled: true
       columns:
-        weight: 0
+        weight: 6
         enabled: true
       contact_card_listing:
-        weight: 0
+        weight: 14
         enabled: true
       content_cards:
-        weight: 0
+        weight: 1
         enabled: true
       content_liftup:
-        weight: 0
+        weight: 12
         enabled: true
       event_list:
-        weight: 0
+        weight: 13
         enabled: true
       from_library:
-        weight: 0
+        weight: 8
         enabled: true
       image:
-        weight: 0
+        weight: 5
         enabled: true
       list_of_links:
         weight: 0
         enabled: true
       map:
-        weight: 0
+        weight: 9
         enabled: true
       news_list:
-        weight: 0
+        weight: 15
         enabled: true
       phasing:
-        weight: 0
+        weight: 7
         enabled: true
       remote_video:
-        weight: 0
+        weight: 10
         enabled: true
       service_list_search:
-        weight: 0
+        weight: 16
         enabled: true
       text:
-        weight: 0
+        weight: 2
         enabled: true
       unit_accessibility_information:
-        weight: 0
+        weight: 21
         enabled: true
       unit_contact_card:
-        weight: 0
+        weight: 22
         enabled: true
       unit_search:
-        weight: 0
+        weight: 17
         enabled: true
 field_type: entity_reference_revisions
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 6dc0a8ba..1f52ad20 100644
--- a/conf/cmi/field.field.node.page.field_sidebar_content.yml
+++ b/conf/cmi/field.field.node.page.field_sidebar_content.yml
@@ -33,6 +33,6 @@ settings:
         weight: 0
         enabled: true
       sidebar_text:
-        weight: 0
+        weight: 1
         enabled: true
 field_type: entity_reference_revisions
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.chart.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.chart.yml
index 8fc402f9..5c21c099 100644
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.chart.yml
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.chart.yml
@@ -1,2 +1,2 @@
-label: Kaavio
+label: Kaavioupotus
 description: 'Kaavio lohkolla voit lisätä upotettavan kaavion Power BI -palveluista.'
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.contact_card_listing.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.contact_card_listing.yml
index 6a577a66..5888ac28 100644
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.contact_card_listing.yml
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.contact_card_listing.yml
@@ -1,2 +1,2 @@
-label: Yhteystietokorttilistaus
-description: 'Yhteystietokorttilistausparagraafi, johon voi lisätä henkilöiden yhteystietoja.'
+label: Henkilöt
+description: 'Paragraafi, johon voi lisätä henkilöiden yhteystietoja.'
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml
index 1489cfe4..3cf63a6b 100644
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml
@@ -1,2 +1 @@
-label: Sisältönosto
-description: 'Sisältönostolla voit nostaa yksittäisen sisällön tämän sivuston sisältä. Sisällön tiedot haetaan automaattisesti viitteen kautta ja sisältö esitetään korttinäkymässä.'
+label: Toimipistekortti
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.map.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.map.yml
index caebbfb3..a8863f3f 100644
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.map.yml
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.map.yml
@@ -1,2 +1,2 @@
-label: Kartta
+label: Karttaupotus
 description: 'Kartta lohkolla voit lisätä upotettavan kartan https://kartta.hel.fi tai https://palvelukartta.hel.fi -palveluista.'
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.news_list.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.news_list.yml
index 27591fb1..21b5c1c3 100644
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.news_list.yml
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.news_list.yml
@@ -1 +1 @@
-label: Uutislistaus
+label: Uutiset
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.popular_services.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.popular_services.yml
index 3f05477b..671a07f0 100644
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.popular_services.yml
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.popular_services.yml
@@ -1,2 +1,2 @@
-label: 'Suositut palvelut'
-description: 'Esittele suosittuja palveluita.'
+label: 'Suositut sisällöt'
+description: 'Esittele suosittuja sisältöjä.'
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml
index 4359e926..33d4703c 100644
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.remote_video.yml
@@ -1,2 +1,2 @@
-label: 'Video ulkoisesta palvelusta'
+label: Videoupotus
 description: 'Tällä lohkolla voit upottaa videon ulkoisesta palvelusta. Tukee tällä hetkellä vain YouTubea.'
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml
index fed53d89..72d8dec2 100644
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml
@@ -1,2 +1,2 @@
-label: Palvelulistaus
+label: Palvelut
 description: 'Palvelulistaus lohkolla sisällöntuottaja voi sijoittaa listan palveluista valitsemalleen sivulle. Lohkosta valitaan julkaistut palvelut joita halutaan näyttää loppukäyttäjälle.'
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.unit_contact_card.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.unit_contact_card.yml
new file mode 100644
index 00000000..8343d716
--- /dev/null
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.unit_contact_card.yml
@@ -0,0 +1 @@
+label: 'Toimipisteen yhteystiedot'
diff --git a/conf/cmi/paragraphs.paragraphs_type.chart.yml b/conf/cmi/paragraphs.paragraphs_type.chart.yml
index 14a45743..ca444bf7 100644
--- a/conf/cmi/paragraphs.paragraphs_type.chart.yml
+++ b/conf/cmi/paragraphs.paragraphs_type.chart.yml
@@ -7,6 +7,8 @@ dependencies:
 third_party_settings:
   paragraphs_library:
     allow_library_conversion: true
+_core:
+  default_config_hash: Y3YB77frfRg61q6wyiwlydBQeAkhme2vM_Y-iRj8pug
 id: chart
 label: Chart
 icon_uuid: null
diff --git a/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml
index 16533dd5..27398308 100644
--- a/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml
+++ b/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml
@@ -2,6 +2,8 @@ uuid: 75231174-bf3f-4288-875c-f8e9a050e1fb
 langcode: en
 status: true
 dependencies: {  }
+_core:
+  default_config_hash: ONSzgYJ_Jc8pZ002ZLaFDdkbCXm0lKyjjWMpiEYA3v8
 id: content_liftup
 label: 'Content liftup'
 icon_uuid: null
diff --git a/conf/cmi/paragraphs.paragraphs_type.map.yml b/conf/cmi/paragraphs.paragraphs_type.map.yml
index 2df3b8a4..110611f7 100644
--- a/conf/cmi/paragraphs.paragraphs_type.map.yml
+++ b/conf/cmi/paragraphs.paragraphs_type.map.yml
@@ -7,6 +7,8 @@ dependencies:
 third_party_settings:
   paragraphs_library:
     allow_library_conversion: true
+_core:
+  default_config_hash: 42GDtoS2mo49FnPc1c03LOFH9DbKaoPQOhdlThp6Xvc
 id: map
 label: Map
 icon_uuid: null