NGSTACK-906 update sort_children_tags template to check if sortBy or sortOrder is null and fix TagsIntegrationTest

Author: AntePrkacin

bundle/Resources/views/admin/tag/sort_children_tags.html.twig

@@ -6,7 +6,8 @@
             <label for="sort_by">{{ 'tag.subitems.sort_by'|trans }}:</label>
             <select id="sort_by" name="sort_by">
                 {% for case in enum_cases('Netgen\\TagsBundle\\API\\Repository\\Values\\Enums\\TagSortBy') %}
-                    <option value="{{ case.value }}" {% if tag.sortBy.value == case.value %}selected="selected"{% endif %}>
+                    <option value="{{ case.value }}"
+                            {% if tag.sortBy is defined and tag.sortBy.value == case.value %}selected="selected"{% endif %}>
                         {{ ('tag.enum.sort_by.' ~ case.value)|trans }}
                     </option>
                 {% endfor %}
@@ -17,7 +18,8 @@
             <label for="sort_order">{{ 'tag.subitems.sort_order'|trans }}:</label>
             <select id="sort_order" name="sort_order">
                 {% for case in enum_cases('Netgen\\TagsBundle\\API\\Repository\\Values\\Enums\\TagSortOrder') %}
-                    <option value="{{ case.value }}" {% if tag.sortOrder.value == case.value %}selected="selected"{% endif %}>
+                    <option value="{{ case.value }}"
+                            {% if tag.sortOrder is defined and tag.sortOrder.value == case.value %}selected="selected"{% endif %}>
                         {{ ('tag.enum.sort_order.' ~ case.value)|trans }}
                     </option>
                 {% endfor %}

tests/API/Repository/FieldType/TagsIntegrationTest.php

@@ -8,8 +8,6 @@
 use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use Ibexa\Core\Base\Exceptions\InvalidArgumentType;
 use Ibexa\Tests\Integration\Core\Repository\FieldType\BaseIntegrationTest;
-use Netgen\TagsBundle\API\Repository\Values\Enums\TagSortBy;
-use Netgen\TagsBundle\API\Repository\Values\Enums\TagSortOrder;
 use Netgen\TagsBundle\API\Repository\Values\Tags\Tag;
 use Netgen\TagsBundle\Core\FieldType\Tags\Type;
 use Netgen\TagsBundle\Core\FieldType\Tags\Value as TagsValue;
@@ -256,8 +254,8 @@ private function getTag1(): Tag
                 'languageCodes' => ['eng-GB'],
                 'prioritizedLanguageCode' => 'eng-GB',
                 'priority' => 0,
-                'sortBy' => TagSortBy::Id,
-                'sortOrder' => TagSortOrder::Ascending,
+                'sortBy' => null,
+                'sortOrder' => null,
             ],
         );
     }
@@ -282,8 +280,8 @@ private function getTag2(): Tag
                 'languageCodes' => ['eng-GB'],
                 'prioritizedLanguageCode' => 'eng-GB',
                 'priority' => 0,
-                'sortBy' => TagSortBy::Id,
-                'sortOrder' => TagSortOrder::Ascending,
+                'sortBy' => null,
+                'sortOrder' => null,
             ],
         );
     }
@@ -308,8 +306,8 @@ private function getTag3(): Tag
                 'languageCodes' => ['eng-GB'],
                 'prioritizedLanguageCode' => 'eng-GB',
                 'priority' => 0,
-                'sortBy' => TagSortBy::Id,
-                'sortOrder' => TagSortOrder::Ascending,
+                'sortBy' => null,
+                'sortOrder' => null,
             ],
         );
     }