Fix - Wrong preselected user in dynamic form (pnp#1316)

* Removed parsing the user ID from default value, because the ID is no longer in the peoplePicker default value

* changed the 2 methods so that they do what the name intends - they return the default value for the peoplepicker with the UPN and not the ID

* Get Single User Field the same way as the multiple users

* rewrite getUserUPNById to getUserUPNFromFieldValue for single user values

Author: SmarterJB

src/controls/dynamicForm/DynamicForm.tsx

@@ -281,28 +281,16 @@ export class DynamicForm extends React.Component<IDynamicFormProps, IDynamicForm
       field.newValue = [];
       for (let index = 0; index < newValue.length; index++) {
         const element = newValue[index];
-        let retrivedItem = false;
-        if (field.fieldDefaultValue !== null) {
-          if (field.fieldDefaultValue.join(',').indexOf(element.text) !== -1)
-            field.fieldDefaultValue.forEach(item => {
-              if (item.split('/')[1] === element.text) {
-                retrivedItem = true;
-                field.newValue.push(item.split('/')[0]);
-              }
-            });
-        }
-        if (!retrivedItem) {
-          if (element.id === undefined || parseInt(element.id, 10).toString() === "NaN") {
-            let user: string = element.secondaryText;
-            if (user.indexOf('@') === -1) {
-              user = element.loginName;
-            }
-            const result = await sp.web.ensureUser(user);
-            field.newValue.push(result.data.Id);
-          }
-          else {
-            field.newValue.push(element.id);
+        if (element.id === undefined || parseInt(element.id, 10).toString() === "NaN") {
+          let user: string = element.secondaryText;
+          if (user.indexOf('@') === -1) {
+            user = element.loginName;
           }
+          const result = await sp.web.ensureUser(user);
+          field.newValue.push(result.data.Id);
+        }
+        else {
+          field.newValue.push(element.id);
         }
       }
     }
@@ -456,7 +444,7 @@ export class DynamicForm extends React.Component<IDynamicFormProps, IDynamicForm
           else if (fieldType === "User") {
             if (item !== null) {
               const userEmails: string[] = [];
-              userEmails.push(await this._spService.getUserUPNById(parseInt(item[field.InternalName + "Id"])) + '');
+              userEmails.push(await this._spService.getUserUPNFromFieldValue(listId, listItemId, field.InternalName, this.webURL) + '');
               defaultValue = userEmails;
             }
             else {

src/services/SPService.ts

@@ -575,15 +575,16 @@ export default class SPService implements ISPService {
   public async getUsersUPNFromFieldValue(listId: string, listItemId: number, fieldName: string, webUrl?: string): Promise<any[]> { // eslint-disable-line @typescript-eslint/no-explicit-any
     try {
       const webAbsoluteUrl = !webUrl ? this._context.pageContext.web.absoluteUrl : webUrl;
-      const apiUrl = `${webAbsoluteUrl}/_api/web/lists(@listId)/items(${listItemId})?@listId=guid'${encodeURIComponent(listId)}'&$select=${fieldName}/Title,${fieldName}/Id&$expand=${fieldName}`;
+      const apiUrl = `${webAbsoluteUrl}/_api/web/lists(@listId)/items(${listItemId})?@listId=guid'${encodeURIComponent(listId)}'&$select=${fieldName}/Title,${fieldName}/Id,${fieldName}/Name&$expand=${fieldName}`;
 
       const data = await this._context.spHttpClient.get(apiUrl, SPHttpClient.configurations.v1);
       if (data.ok) {
         const result = await data.json();
         if (result && result[fieldName]) {
           const emails = [];
           result[fieldName].forEach(element => {
-            emails.push(element.Id + "/" + element.Title);
+            const loginNameWithoutClaimsToken = element.Name.split("|").pop();
+            emails.push(loginNameWithoutClaimsToken + "/" + element.Title);
           });
           return emails;
         }
@@ -596,16 +597,18 @@ export default class SPService implements ISPService {
     }
   }
 
-  public async getUserUPNById(userId: number, webUrl?: string): Promise<string> {
+  public async getUserUPNFromFieldValue(listId: string, listItemId: number, fieldName: string, webUrl?: string): Promise<any> {
     try {
       const webAbsoluteUrl = !webUrl ? this._context.pageContext.web.absoluteUrl : webUrl;
-      const apiUrl = `${webAbsoluteUrl}/_api/web/getuserbyid(${userId})?$select=UserPrincipalName,Title`;
+      const apiUrl = `${webAbsoluteUrl}/_api/web/lists(@listId)/items(${listItemId})?@listId=guid'${encodeURIComponent(listId)}'&$select=${fieldName}/Title,${fieldName}/Id,${fieldName}/Name&$expand=${fieldName}`;
 
       const data = await this._context.spHttpClient.get(apiUrl, SPHttpClient.configurations.v1);
       if (data.ok) {
-        const results = await data.json();
-        if (results) {
-          return userId + "/" + results.Title;
+        const result = await data.json();
+        if (result && result[fieldName]) {
+          const element = result[fieldName]
+            const loginNameWithoutClaimsToken = element.Name.split("|").pop();
+            return loginNameWithoutClaimsToken + "/" + element.Title;
         }
       }