Merge branch 'v4' into develop

# Conflicts:
#	src/web/assets/feedme/dist/FeedMe.js
#	src/web/assets/feedme/dist/FeedMe.js.map

Author: angrybrad

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Feed Me
 
+## Unreleased
+
+- Fixed a bug where the Entry Type wouldn’t be remembered for related Entry fields in a feed’s mappings. ([#1387](https://github.com/craftcms/feed-me/issues/1387), [#1390](https://github.com/craftcms/feed-me/pull/1390))
+
 ## 5.3.0 - 2023-11-27
 
 - Added the ability to provide a filename for importing assets via the assets field if you choose to “Create asset from URL”. ([#749](https://github.com/craftcms/feed-me/issues/749))

src/templates/_includes/fields/entries.html

@@ -100,13 +100,14 @@
             {% endfor %}
 
             {% if sources and sources[0] %}
-                <div class="element-group element-group-entrytype" data-items="{{ entryTypes|json_encode }}">
+                {% set selectedTypeId = hash_get(feed.fieldMapping, optionsPath ~ '.group.typeId') ?: '' %}
+                <div class="element-group element-group-entrytype" data-items="{{ entryTypes|json_encode }}" data-selectedTypeId="{{ selectedTypeId }}">
                     <span>{{ 'Type:'|t('feed-me') }}</span>
 
                     {{ forms.selectField({
                         name: 'options[group][typeId]',
                         class: '',
-                        value: hash_get(feed.fieldMapping, optionsPath ~ '.group.typeId') ?: '',
+                        value: selectedTypeId,
                         options: entryTypes['item_' ~ sources[0].id] ?? [],
                     }) }}
                 </div>

src/web/assets/feedme/dist/FeedMe.js

@@ -191,6 +191,7 @@ $(function () {
         .parents('.field-extra-settings')
         .find('.element-group-entrytype');
       var sections = $container.data('items');
+      var selectedTypeId = $container.data('selectedtypeid');
 
       // var sections = $(this).parents('.element-sub-group').data('items');
       var entryType = 'item_' + $(this).val();
@@ -202,7 +203,14 @@ $(function () {
       var newOptions = '';
       $.each(entryTypes, function (index, value) {
         if (index) {
-          newOptions += '<option value="' + index + '">' + value + '</option>';
+          newOptions +=
+            '<option value="' +
+            index +
+            '"' +
+            (index == selectedTypeId ? ' selected="selected"' : '') +
+            '>' +
+            value +
+            '</option>';
         }
       });