From 3d681dcccd2f943ebfdaff09830fd1ab1f0a20ff Mon Sep 17 00:00:00 2001
From: IRRDC <jk@oneassist.de>
Date: Mon, 4 Dec 2023 11:21:06 +0100
Subject: [PATCH] Fixing issue #1717

Previous fix for #1568 was incomplete. New expanded fix for #1717. DefaultValue can be an object too.
---
 src/controls/dynamicForm/DynamicForm.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx
index eb3a2e609..bc7235453 100644
--- a/src/controls/dynamicForm/DynamicForm.tsx
+++ b/src/controls/dynamicForm/DynamicForm.tsx
@@ -597,7 +597,7 @@ export class DynamicForm extends React.Component<
             hiddenName = response.value;
             termSetId = field.TermSetId;
             anchorId = field.AnchorId;
-            if (item !== null && item[field.InternalName] !== null && item[field.InternalName].results !== null) {
+            if (item && item[field.InternalName] && item[field.InternalName].results) {
               item[field.InternalName].results.forEach((element) => {
                 selectedTags.push({
                   key: element.TermGuid,
@@ -605,9 +605,18 @@ export class DynamicForm extends React.Component<
                 });
               });
 
+              defaultValue = selectedTags;
+            } else if (defaultValue && defaultValue.results) {
+              defaultValue.results.forEach((element) => {
+                selectedTags.push({
+                  key: element.TermGuid,
+                  name: element.Label,
+                });
+              });
+
               defaultValue = selectedTags;
             } else {
-              if (defaultValue !== null && defaultValue !== "") {
+              if (defaultValue && defaultValue !== "") {
                 defaultValue.split(/#|;/).forEach((element) => {
                   if (element.indexOf("|") !== -1)
                     selectedTags.push({