Merge pull request #1394 from mgitta/master

Lookup fixes

Author: joelfmrodrigues

src/controls/dynamicForm/DynamicForm.tsx

@@ -238,8 +238,7 @@ export class DynamicForm extends React.Component<IDynamicFormProps, IDynamicForm
 
       }
       // Otherwise, depending on the content type ID of the item, if any, we need to behave accordingly
-      else if (contentTypeId === undefined || contentTypeId === '') {
-         if (!contentTypeId.startsWith('0x0120')) {
+      else if (contentTypeId === undefined || contentTypeId === '' || !contentTypeId.startsWith('0x0120')) {
             // We are adding a new list item
             try {
               const iar = await sp.web.lists.getById(listId).items.add(objects);
@@ -288,7 +287,6 @@ export class DynamicForm extends React.Component<IDynamicFormProps, IDynamicForm
             }
             console.log("Error", error);
           }
-        }
       }
 
       this.setState({

src/controls/dynamicForm/dynamicField/DynamicField.tsx

@@ -245,6 +245,7 @@ export class DynamicField extends React.Component<IDynamicFieldProps, IDynamicFi
             defaultSelectedItems={defaultValue}
             columnInternalName={lookupField}
             className={styles.feildDisplay}
+            enableDefaultSuggestions={true}
             keyColumnInternalName='Id'
             itemLimit={100}
             onSelectedItem={(newValue) => { this.onChange(newValue); }}

src/services/SPService.ts

@@ -8,8 +8,8 @@ import { IContentTypesOptions, IFieldsOptions, ILibsOptions, ISPService, LibsOrd
 
 interface ICachedListItems {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    items: any[];
-    expiration: number;
+  items: any[];
+  expiration: number;
 }
 
 export default class SPService implements ISPService {
@@ -211,16 +211,16 @@ export default class SPService implements ISPService {
    * Get List Items
    */
   public async getListItems(
-      filterText: string,
-      listId: string,
-      internalColumnName: string,
-      field: ISPField | undefined,
-      keyInternalColumnName?: string,
-      webUrl?: string,
-      filterString?: string,
-      substringSearch: boolean = false,
-      orderBy?: string,
-      cacheInterval: number = 1): Promise<any[]> { // eslint-disable-line @typescript-eslint/no-explicit-any
+    filterText: string,
+    listId: string,
+    internalColumnName: string,
+    field: ISPField | undefined,
+    keyInternalColumnName?: string,
+    webUrl?: string,
+    filterString?: string,
+    substringSearch: boolean = false,
+    orderBy?: string,
+    cacheInterval: number = 1): Promise<any[]> { // eslint-disable-line @typescript-eslint/no-explicit-any
     const webAbsoluteUrl = !webUrl ? this._webAbsoluteUrl : webUrl;
     let apiUrl = '';
     let isPost = false;
@@ -555,9 +555,18 @@ export default class SPService implements ISPService {
         const result = await data.json();
         if (result && result[fieldName]) {
           const lookups = [];
-          result[fieldName].forEach(element => {
-            lookups.push({ key: element.ID, name: element[lookupFieldName || 'Title'] });
-          });
+           const isArray = Array.isArray(result[fieldName]);
+           //multiselect lookups are arrays
+           if (isArray) {
+            result[fieldName].forEach(element => {
+              lookups.push({ key: element.ID, name: element[lookupFieldName || 'Title'] });
+            });
+           }
+           //single select lookups are objects
+           else {
+             const singleItem = result[fieldName];
+             lookups.push({ key: singleItem.ID, name: singleItem[lookupFieldName || 'Title'] });
+           }
           return lookups;
         }
       }
@@ -624,8 +633,8 @@ export default class SPService implements ISPService {
         const result = await data.json();
         if (result && result[fieldName]) {
           const element = result[fieldName]
-            const loginNameWithoutClaimsToken = element.Name.split("|").pop();
-            return loginNameWithoutClaimsToken + "/" + element.Title;
+          const loginNameWithoutClaimsToken = element.Name.split("|").pop();
+          return loginNameWithoutClaimsToken + "/" + element.Title;
         }
       }