BGE: custom lookup mappings

src/aura/BGE_DataImportBatchEntry/BGE_DataImportBatchEntry.cmp

@@ -44,6 +44,7 @@
     <aura:attribute name="data" type="List" default="[]" description="Data Import records that appear in the table" access="public"/>
     <aura:attribute name="errors" type="Map" description="Dry run errors to display on the lightning:dataTable" access="public"/>
     <aura:attribute name="columns" type="List" description="Columns for the table" access="public"/>
+    <aura:attribute name="referenceFields" type="List" description="Reference fields used in this batch" access="public"/>
     <aura:attribute name="labels" type="Map" description="Labels retrieved in Apex related to Schema information." access="public"/>
     <aura:attribute name="dataImportFields" type="Object[]" default="[]" description="List of Data Import fields to use in the new row component." access="public"/>
     <aura:attribute name="donorType" type="String" default="Contact1" description="Used to circumvent unhelpful labeling of Account1/Contact1" access="public"/>

src/aura/BGE_DataImportBatchEntry/BGE_DataImportBatchEntryHelper.js

@@ -44,6 +44,7 @@
      */
     setColumns: function(component, dataColumns) {
         var columns = [];
+        var referenceFields = [];
         columns.push({
             label: 'Donor',
             fieldName: 'donorLink',
@@ -60,6 +61,8 @@
                     editable: !col.readOnly,
                     typeAttributes: JSON.parse(col.typeAttributes)
                 });
+            } else {
+                referenceFields.push(col.fieldName);
             }
         });
 
@@ -82,6 +85,7 @@
         });
 
         component.set('v.columns', columns);
+        component.set('v.referenceFields', referenceFields);
     },
 
     /**
@@ -186,10 +190,9 @@
     setDataTableRows: function(component, baseRows, responseRows) {
         let rows = [];
         let errors = [];
-        let namespace = component.get('v.labels.namespacePrefix');
 
         for (let i=0; i<responseRows.length; i++) {
-            const row = this.flattenDataImportRow(namespace, responseRows[i]);
+            const row = this.flattenDataImportRow(component, responseRows[i]);
             rows.push(row);
 
             //get payment and opportunity error information if import failed
@@ -275,8 +278,7 @@
      * @param isNewRecord: flag to indicate if record needs to be inserted or replaced
      */
     updateDataTableAfterDryRun: function (component, updatedRecord, isNewRecord) {
-        let namespace = component.get('v.labels.namespacePrefix');
-        let tableRow = this.flattenDataImportRow(namespace, updatedRecord);
+        let tableRow = this.flattenDataImportRow(component, updatedRecord);
         let hasError = false;
 
         //get payment and opportunity error information if import failed
@@ -547,20 +549,28 @@
      * @param currentRow: custom DataImportRow class data passed from the Apex controller.
      * @return Object row
      */
-    flattenDataImportRow: function(namespace, currentRow) {
+    flattenDataImportRow: function(component, currentRow) {
+        const referenceFields = component.get('v.referenceFields');
+
         let row = currentRow.record;
         row.donorName = currentRow.donorName;
         row.donorLink = currentRow.donorLink;
         row.matchedRecordUrl = currentRow.matchedRecordUrl;
         row.matchedRecordLabel = currentRow.matchedRecordLabel;
         row.errors = currentRow.errors;
-        // reformat lookup info to display as a url in datatable
-        if (row[namespace + 'DonationCampaignImported__c']) {
-            let campaignLinkFieldLabel = namespace + 'DonationCampaignImported__clabel';
-            let campaignLinkFieldName = namespace + 'DonationCampaignImported__clink';
-            row[campaignLinkFieldLabel] = row[namespace + 'DonationCampaignImported__r'].Name;
-            row[campaignLinkFieldName] = '/' + row[namespace + 'DonationCampaignImported__c'];
-        }
+
+        // reformat lookups to display as links in datatable
+        referenceFields.forEach(function(fieldName) {
+            if (row[fieldName]) {
+                let campaignLinkFieldLabel = fieldName + '_label';
+                let campaignLinkFieldName = fieldName + '_link';
+                //TODO: is this the easiest way to do this string manipulation?
+                let relationshipName = fieldName.slice(0, -1) + 'r';
+                row[campaignLinkFieldLabel] = row[relationshipName].Name;
+                row[campaignLinkFieldName] = '/' + row[fieldName];
+            }
+        });
+
         return row;
     },
 

src/classes/BGE_ConfigurationWizard_CTRL.cls

@@ -149,9 +149,9 @@ public with sharing class BGE_ConfigurationWizard_CTRL {
     */
     public static List<Schema.DescribeFieldResult> getRelevantFields(Set<String> allowedObjects) {
 
-        Map<String, Schema.DescribeFieldResult> dfrMap = new Map<String, Schema.DescribeFieldResult>();
+        Map<String, Schema.DescribeFieldResult> filteredDFRMap = new Map<String, Schema.DescribeFieldResult>();
 
-        Map<String, Schema.DescribeFieldResult> fieldMap =
+        Map<String, Schema.DescribeFieldResult> allFieldsMap =
                 UTIL_Describe.getAllFieldsDescribe(UTIL_Namespace.StrTokenNSPrefix('DataImport__c'));
 
         Set<String> bannedFields = new Set<String>{
@@ -191,38 +191,40 @@ public with sharing class BGE_ConfigurationWizard_CTRL {
             'EMAIL',
             'MULTIPICKLIST',
             'PHONE',
-            'URL'
+            'URL',
+            'REFERENCE'
         };
 
         // these fields have been whitelisted since they have special handling in BDI
         Set<String> allowedFields = new Set<String>{
-            'DonationCampaignImported__c'
+                'Donation_Record_Type_Name__c'
         };
 
         // looping through the fields on DataImport__c and remove unsupported data types
-        for (Schema.DescribeFieldResult dfr : fieldMap.values()) {
+        for (Schema.DescribeFieldResult dfr : allFieldsMap.values()) {
             String dataImportFieldApiName = UTIL_Namespace.StrTokenRemoveNSPrefix(dfr.getName());
 
             String dataImportFieldMappedObject = BDI_DataImportService.getTargetObject(dfr.getName());
+
             Boolean fieldAllowed = (allowedObjects.contains(dataImportFieldMappedObject)
                 && allowedDataTypes.contains(dfr.getType().name())
                 && !bannedFields.contains(dataImportFieldApiName)
                 && dfr.getInlineHelpText() != null)
                 || allowedFields.contains(dataImportFieldApiName);
 
             if (fieldAllowed) {
-                dfrMap.put(dfr.label, dfr);
+                filteredDFRMap.put(dfr.label, dfr);
             }
         }
 
-        BGE_BatchGiftEntry_UTIL.checkFieldPermissions(dfrMap.values());
+        BGE_BatchGiftEntry_UTIL.checkFieldPermissions(filteredDFRMap.values());
 
-        List<String> sortedFieldLabels = new List<String>(dfrMap.keySet());
+        List<String> sortedFieldLabels = new List<String>(filteredDFRMap.keySet());
         sortedFieldLabels.sort();
 
         List<Schema.DescribeFieldResult> sortedDFRs = new List<Schema.DescribeFieldResult>();
         for (String fieldLabel : sortedFieldLabels) {
-            sortedDFRs.add(dfrMap.get(fieldLabel));
+            sortedDFRs.add(filteredDFRMap.get(fieldLabel));
         }
 
         return sortedDFRs;

src/classes/BGE_DataImportBatchEntry_CTRL.cls

@@ -256,7 +256,6 @@ public with sharing class BGE_DataImportBatchEntry_CTRL {
             'donationAmountField' => Schema.SObjectType.DataImport__c.fields.Donation_Amount__c.getName(),
             'expectedCountField' => Schema.SObjectType.DataImportBatch__c.fields.Expected_Count_of_Gifts__c.getName(),
             'expectedTotalField' => Schema.SObjectType.DataImportBatch__c.fields.Expected_Total_Batch_Amount__c.getName(),
-            'namespacePrefix' => UTIL_Namespace.StrTokenNSPrefix(''),
             'noDataImportsFound' => String.format(Label.stgNoObjectsFound, new List<String>{Schema.SObjectType.DataImport__c.getName()}),
             'opportunityImportedLookupField' => Schema.SObjectType.DataImport__c.fields.DonationImported__c.getName(),
             'opportunityImportedStatusField' => Schema.SObjectType.DataImport__c.fields.DonationImportStatus__c.getName(),
@@ -347,40 +346,43 @@ public with sharing class BGE_DataImportBatchEntry_CTRL {
                 if (dataImportDFR != null) {
 
                     if (UTIL_Permissions.canUpdate(dataImportDFR, false)) {
+                        String targetObject = BDI_DataImportService.getTargetObject(dataImportDFR.name);
+                        String targetField = BDI_DataImportService.getTargetField(dataImportDFR.name);
+                        DescribeFieldResult targetDFR = UTIL_Describe.getFieldDescribe(targetObject, targetField);
 
                         Column col = new Column();
 
-                        col.label = dataImportDFR.getLabel();
-                        col.fieldName = dataImportDFR.getName();
+                        col.label = dataImportDFR.label;
+                        col.fieldName = dataImportDFR.name;
                         col.defaultValue = field.defaultValue;
                         col.required = field.requiredInEntryForm;
                         col.hide = field.hide;
-                        col.type = UTIL_LightningComponentSupport.getLightningDataTableDataType(dataImportDFR.getType());
+                        col.type = UTIL_LightningComponentSupport.getLightningDataTableDataType(dataImportDFR.type);
                         // lookups aren't editable in the grid since we don't have lookup support there
                         col.readOnly = col.type == 'reference' ? true : false;
                         col.typeAttributes = '{}';
                         col.options = BGE_BatchGiftEntry_UTIL.getPicklistOptions(col.fieldName);
-
-                        columns.add(col);
-
-                        if (dataImportDFR.getType().name() == 'reference') {
-                            // manually construct EXTRA column for campaign link
-                            Column linkCol = new Column();
-                            linkCol.label = dataImportDFR.getLabel();
-                            String fieldLabel = dataImportDFR.name + 'label';
-                            String fieldName = dataImportDFR.name + 'link';
-                            linkCol.fieldName = fieldName;
-                            linkCol.readOnly = true;
-                            linkCol.required = field.requiredInEntryForm;
-                            linkCol.type = 'url';
-                            linkCol.typeAttributes = '{"label":{"fieldName":"'+fieldLabel+'"},"target":"_blank"}';
-                            columns.add(linkCol);
+
+                        if (dataImportDFR.type == Schema.DisplayType.Reference) {
+                            if (targetDFR.getReferenceTo() == dataImportDFR.getReferenceTo()) {
+                                // manually construct EXTRA column for lookup link
+                                Column linkCol = new Column();
+                                linkCol.label = dataImportDFR.getLabel();
+                                String fieldLabel = dataImportDFR.name + '_label';
+                                String fieldName = dataImportDFR.name + '_link';
+                                linkCol.fieldName = fieldName;
+                                linkCol.readOnly = true;
+                                linkCol.required = field.requiredInEntryForm;
+                                linkCol.type = 'url';
+                                linkCol.typeAttributes = '{"label":{"fieldName":"' + fieldLabel + '"},"target":"_blank"}';
+
+                                columns.add(linkCol);
+                                columns.add(col);
+                            }
+                        } else {
+                            columns.add(col);
                         }
 
-                        String targetObject = BDI_DataImportService.getTargetObject(col.fieldName);
-                        String targetField = BDI_DataImportService.getTargetField(col.fieldName);
-                        DescribeFieldResult targetDFR = UTIL_Describe.getFieldDescribe(targetObject,targetField);
-
                         if (!UTIL_Permissions.canUpdate(targetDFR, false)) {
                             unpermittedFields.add(targetDFR);
                         }