TP-1166 merge fix

config/sync/core.menu.static_menu_link_overrides.yml

@@ -14,3 +14,9 @@ definitions:
     weight: 0
     expanded: false
     enabled: false
+  user__page:
+    weight: 10
+    enabled: false
+    menu_name: account
+    parent: ''
+    expanded: false

public/modules/custom/hel_tpm_forms/hel_tpm_forms.module

@@ -124,6 +124,19 @@ function hel_tpm_forms_node_service_form_alter_helper(&$form, FormStateInterface
     ],
   ];
 
+  // Check if current service provider user is included in the options list. If
+  // not, add a 'none' option so that when saving the form, a new user must be
+  // chosen. This prevents accidentally saving with the first user in the list
+  // when the current selection is no longer included in the list.
+  if ($node = $form_state->getFormObject()?->getEntity()) {
+    if ($current_provider_user = $node?->get('field_service_provider_updatee')?->first()?->getValue()['target_id'] &&
+        $provider_user_options = $form['field_service_provider_updatee']['widget']['#options']) {
+      if (!array_key_exists($current_provider_user, $provider_user_options)) {
+        $form['field_service_provider_updatee']['widget']['#options'] = ['_none' => t("- Select a value -")] + $provider_user_options;
+      }
+    }
+  }
+
   $form['paging_footer'] = [
     '#theme' => 'hel_tpm_steps',
   ];

public/modules/custom/hel_tpm_general/hel_tpm_general.install

@@ -9,6 +9,7 @@ use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Site\Settings;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\hel_tpm_general\PreventMailUtility;
 use Drupal\node\Entity\Node;
 
@@ -619,6 +620,27 @@ function hel_tpm_general_update_10108(&$sandbox) {
   $sandbox['#finished'] = empty($sandbox['max']) ? 1 : ($sandbox['progress'] / $sandbox['max']);
 }
 
+/**
+ * Create My account menu link and translations.
+ */
+function hel_tpm_general_update_10109(&$sandbox) {
+ $menu_link = MenuLinkContent::create([
+   'title' => 'Oma käyttäjätilini',
+   'link' => ['uri' => 'internal:/user/edit'],
+   'menu_name' => 'account',
+   'expanded' => TRUE,
+   'weight' => -10
+ ]);
+ $menu_link->save();
+ $translation = $menu_link->addTranslation('en');
+ $translation->set('title', 'My account');
+ $translation->save();
+
+ $translation = $menu_link->addTranslation('sv');
+ $translation->set('title', 'Mitt konto');
+ $translation->save();
+}
+
 /**
  * Helper function to migrate service language paragraphs to node field.
  *

public/themes/custom/palvelumanuaali/components/03-organisms/site/site-header/_site-header.scss

@@ -216,7 +216,7 @@
         }
       }
     }
-    &:last-child() {
+    &:last-child {
       margin-bottom: 0;
     }
   }