Merge branch 'dev' of https://github.com/pnp/sp-dev-fx-controls-react …

…into dev
pnp · Jul 6, 2023 · bb65540 · bb65540
2 parents 5055326 + ee51ca3
commit bb65540
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx
@@ -260,7 +260,7 @@ export class DynamicForm extends React.Component<
               .map((term) => `-1#;${term.name}|${term.key};`)
               .join("#");
           } else if (fieldType === "User") {
-            objects[`${columnInternalName}Id`] = val.newValue;
+            objects[`${columnInternalName}Id`] = val.newValue.length === 0 ? null : val.newValue;
           } else if (fieldType === "Choice") {
             objects[columnInternalName] = val.newValue.key;
           } else if (fieldType === "MultiChoice") {
@@ -269,7 +269,7 @@ export class DynamicForm extends React.Component<
             objects[columnInternalName] = JSON.stringify(val.newValue);
           } else if (fieldType === "UserMulti") {
             objects[`${columnInternalName}Id`] = {
-              results: val.newValue.lenght === 0 ? null : val.newValue,
+              results: val.newValue.length === 0 ? null : val.newValue,
             };
           } else if (fieldType === "Thumbnail") {
             if (additionalData) {

diff --git a/src/services/SPService.ts b/src/services/SPService.ts
@@ -610,7 +610,11 @@ export default class SPService implements ISPService {
           const emails = [];
           result[fieldName].forEach(element => {
             const loginNameWithoutClaimsToken = element.Name.split("|").pop();
-            emails.push(loginNameWithoutClaimsToken + "/" + element.Title);
+            if(!loginNameWithoutClaimsToken.toLowerCase().includes('null')){
+              if(!element.Title.toLowerCase().includes('null')){
+                emails.push(loginNameWithoutClaimsToken + "/" + element.Title);
+              }
+            }
           });
           return emails;
         }
@@ -634,11 +638,15 @@ export default class SPService implements ISPService {
         if (result && result[fieldName]) {
           const element = result[fieldName]
           const loginNameWithoutClaimsToken = element.Name.split("|").pop();
-          return loginNameWithoutClaimsToken + "/" + element.Title;
+          if(!loginNameWithoutClaimsToken.toLowerCase().includes('null')){
+            if(!element.Title.toLowerCase().includes('null')){
+              return loginNameWithoutClaimsToken + "/" + element.Title;
+            }
+          }
         }
       }
 
-      return null;
+      return [];
     } catch (error) {
       console.dir(error);
       return Promise.reject(error);