dattatable 2.10.72 → 2.10.74

package/build/common/listCfg.d.ts

@@ -16,7 +16,9 @@ export interface IListConfigProps {
 export interface ILookupData {
     field: string;
     list: string;
-    items: string[];
+    items: {
+        [key: string]: string;
+    }[];
 }
 export interface IGenerateLookupDataProps {
     lookupFields: Types.SP.FieldLookup[];

package/build/common/listCfg.js

@@ -45,31 +45,14 @@ var ListConfig = /** @class */ (function () {
                             var dstList = (0, gd_sprest_bs_1.Web)(props.webUrl, { requestDigest: contextInfo.GetContextWebInformation.FormDigestValue }).Lists(lookupData.list);
                             // Update the dialog
                             props.showDialog ? loadingDialog_1.LoadingDialog.setBody("Importing the list data: " + lookupData.list) : null;
-                            var _loop_1 = function (i) {
-                                var addItem = true;
-                                var value = lookupData.items[i];
-                                // See if the items exists
-                                currItems.results.find(function (a) {
-                                    // See if the item exists
-                                    if (a[lookupData.field] == value) {
-                                        // Set the flag
-                                        addItem = false;
-                                    }
-                                });
-                                // See if we are adding the item
-                                if (addItem) {
-                                    // Create the item
-                                    var dstItem = {};
-                                    dstItem[lookupData.field] = value;
-                                    dstList.Items().add(dstItem).batch(function (item) {
-                                        // Log
-                                        console.log("[" + lookupData.list + "] Item added: " + item[lookupData.field]);
-                                    });
-                                }
-                            };
                             // Parse the list items
                             for (var i = 0; i < lookupData.items.length; i++) {
-                                _loop_1(i);
+                                var lookupItem = lookupData.items[i];
+                                // Create the item
+                                dstList.Items().add(lookupItem).batch(function (item) {
+                                    // Log
+                                    console.log("[" + lookupData.list + "] Item added: " + item[lookupData.field]);
+                                });
                             }
                             // Execute the batch job
                             dstList.execute(function () {
@@ -147,6 +130,10 @@ var ListConfig = /** @class */ (function () {
                         var fieldRefs = [];
                         for (var j = 0; j < ct.FieldLinks.results.length; j++) {
                             var fieldLink = ct.FieldLinks.results[j];
+                            // Ignore the Taxonomy fields, they will get added automatically
+                            if (fieldLink.Name == "TaxCatchAll" || fieldLink.Name == "TaxCatchAllLabel") {
+                                continue;
+                            }
                             // Get the field
                             var field = list.getField(fieldLink.Name);
                             // See if this is a lookup field
@@ -328,18 +315,33 @@ var ListConfig = /** @class */ (function () {
                             // Remove all properties, except for the TextField property
                             var removeProps = [];
                             var props_1 = schemaXml.querySelector("ArrayOfProperty");
-                            for (var j = props_1.children.length - 1; j >= 0; j--) {
+                            var _loop_1 = function (j) {
                                 // See if this isn't the text field property
                                 var prop = props_1.children[j];
                                 if (prop.querySelector("Name").innerHTML == "TextField") {
                                     // Find the hidden text field for this MMS field
-                                    var field = list.getFieldById(prop.querySelector("Value").innerHTML);
-                                    if (field && fields[field.InternalName] != true) {
-                                        // Append the field
-                                        fields[field.InternalName] = true;
-                                        cfgProps.ListCfg[0].CustomFields.push({
-                                            name: field.InternalName,
-                                            schemaXml: field.SchemaXml
+                                    var field_1 = list.getFieldById(prop.querySelector("Value").innerHTML);
+                                    if (field_1) {
+                                        // Ensure we haven't already added it
+                                        if (fields[field_1.InternalName] != true) {
+                                            // Append the field
+                                            fields[field_1.InternalName] = true;
+                                            cfgProps.ListCfg[0].CustomFields.push({
+                                                name: field_1.InternalName,
+                                                schemaXml: field_1.SchemaXml
+                                            });
+                                        }
+                                        // Parse the content types
+                                        gd_sprest_bs_1.Helper.Executor(cfgProps.ListCfg[0].ContentTypes, function (ct) {
+                                            // Parse the field links
+                                            for (var i = 0; i < ct.FieldRefs.length; i++) {
+                                                // See if this is the target field
+                                                if (ct.FieldRefs[i] == field_1.InternalName) {
+                                                    // Remove this from the content types
+                                                    ct.FieldRefs.splice(i, 1);
+                                                    break;
+                                                }
+                                            }
                                         });
                                     }
                                 }
@@ -347,6 +349,9 @@ var ListConfig = /** @class */ (function () {
                                     // Remove it
                                     removeProps.push(prop);
                                 }
+                            };
+                            for (var j = props_1.children.length - 1; j >= 0; j--) {
+                                _loop_1(j);
                             }
                             // Remove the properties
                             for (var i = 0; i < removeProps.length; i++) {
@@ -404,23 +409,38 @@ var ListConfig = /** @class */ (function () {
                 return new Promise(function (resolve) {
                     // Get the source list
                     (0, gd_sprest_bs_1.Web)(props.srcWebUrl).Lists().getById(lookupField.LookupList).execute(function (list) {
+                        var fields = [];
+                        // Get the list content type fields
+                        list.ContentTypes().query({ Expand: ["FieldLinks"] }).execute(function (cts) {
+                            // Parse the content type fields
+                            for (var i = 0; i < cts.results[0].FieldLinks.results.length; i++) {
+                                var field = cts.results[0].FieldLinks.results[i];
+                                // Add the field link
+                                fields.push(field.Name);
+                            }
+                        });
                         // Get the list items
                         list.Items().query({
                             GetAllItems: true,
                             Top: 5000,
                             OrderBy: ["Id"]
                         }).execute(function (items) {
-                            var values = [];
+                            var lookupItems = [];
                             // Parse the items
                             for (var i = 0; i < items.results.length; i++) {
-                                // Add the value
-                                var value = items.results[i][lookupField.LookupField];
-                                value ? values.push(value) : null;
+                                var lookupItem = {};
+                                // Parse the field links
+                                for (var j = 0; j < fields.length; j++) {
+                                    // Add the value
+                                    lookupItem[fields[j]] = items.results[i][fields[j]];
+                                }
+                                // Add the lookup item
+                                lookupItems.push(lookupItem);
                             }
                             // Save the item data
                             lookupListData.push({
                                 field: lookupField.LookupField,
-                                items: values.sort(),
+                                items: lookupItems,
                                 list: list.Title
                             });
                             // Set the flag
@@ -431,7 +451,7 @@ var ListConfig = /** @class */ (function () {
                     }, function () {
                         // Check the next list
                         resolve(null);
-                    });
+                    }, true); // Set the flag to run this after the previous request completes
                 });
             }).then(function () {
                 // Resolve the request