QRunIO/qqq-frontend-material-dashboard
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq-frontend-material-dashboard.git synced 2025-07-18 13:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-1955 Handle associated fields; better messaging w/ undefined values

Browse Source
This commit is contained in:
darin.kelkhoff
2024-12-04 16:11:49 -06:00
parent 8fafe16a95
commit 02c163899a
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/qqq/utils/qqq/SavedBulkLoadProfileUtils.ts
View File

@ -37,7 +37,7 @@ export class SavedBulkLoadProfileUtils
for (let bulkLoadField of orderedFieldArray) for (let bulkLoadField of orderedFieldArray)
{ {
const fieldName = bulkLoadField.field.name; const fieldName = bulkLoadField.getQualifiedName()
const compareField = compareFieldsMap[fieldName]; const compareField = compareFieldsMap[fieldName];
const baseField = baseFieldsMap[fieldName]; const baseField = baseFieldsMap[fieldName];
if(!compareField) if(!compareField)
@ -55,12 +55,13 @@ export class SavedBulkLoadProfileUtils
if (compareField.valueType == "column") if (compareField.valueType == "column")
{ {
const column = fileDescription.getColumnNames()[compareField.columnIndex]; const column = fileDescription.getColumnNames()[compareField.columnIndex];
rs.push(`Changed ${compareField.getQualifiedLabel()} from using a default value (${baseField.defaultValue}) to using a file column (${column})`); rs.push(`Changed ${compareField.getQualifiedLabel()} from using a default value (${baseField.defaultValue}) to using a file column ${column ? `(${column})` : ""}`);
} }
else if (compareField.valueType == "defaultValue") else if (compareField.valueType == "defaultValue")
{ {
const column = fileDescription.getColumnNames()[baseField.columnIndex]; const column = fileDescription.getColumnNames()[baseField.columnIndex];
rs.push(`Changed ${compareField.getQualifiedLabel()} from using a file column (${column}) to using a default value (${compareField.defaultValue})`); const value = compareField.defaultValue;
rs.push(`Changed ${compareField.getQualifiedLabel()} from using a file column (${column}) to using a default value ${value === undefined ? "" : `(${value})`}`);
} }
} }
else if (baseField.valueType == compareField.valueType && baseField.valueType == "defaultValue") else if (baseField.valueType == compareField.valueType && baseField.valueType == "defaultValue")
@ -70,7 +71,8 @@ export class SavedBulkLoadProfileUtils
////////////////////////////////////////////////// //////////////////////////////////////////////////
if (baseField.defaultValue != compareField.defaultValue) if (baseField.defaultValue != compareField.defaultValue)
{ {
rs.push(`Changed ${compareField.getQualifiedLabel()} default value from (${baseField.defaultValue}) to (${compareField.defaultValue})`); const value = compareField.defaultValue;
rs.push(`Changed ${compareField.getQualifiedLabel()} default value from (${baseField.defaultValue}) to ${value === undefined ? "" : `(${value})`}`);
} }
} }
else if (baseField.valueType == compareField.valueType && baseField.valueType == "column") else if (baseField.valueType == compareField.valueType && baseField.valueType == "column")
@ -78,23 +80,27 @@ export class SavedBulkLoadProfileUtils
/////////////////////////////////////////// ///////////////////////////////////////////
// if we changed the column, report that // // if we changed the column, report that //
/////////////////////////////////////////// ///////////////////////////////////////////
let isDiff = false;
if (fileDescription.hasHeaderRow) if (fileDescription.hasHeaderRow)
{ {
if (baseField.headerName != compareField.headerName) if (baseField.headerName != compareField.headerName)
{ {
const baseColumn = fileDescription.getColumnNames()[baseField.columnIndex]; isDiff = true;
const compareColumn = fileDescription.getColumnNames()[compareField.columnIndex];
rs.push(`Changed ${compareField.getQualifiedLabel()} file column from (${baseColumn}) to (${compareColumn})`);
} }
} }
else else
{ {
if (baseField.columnIndex != compareField.columnIndex) if (baseField.columnIndex != compareField.columnIndex)
{
isDiff = true;
}
}
if(isDiff)
{ {
const baseColumn = fileDescription.getColumnNames()[baseField.columnIndex]; const baseColumn = fileDescription.getColumnNames()[baseField.columnIndex];
const compareColumn = fileDescription.getColumnNames()[compareField.columnIndex]; const compareColumn = fileDescription.getColumnNames()[compareField.columnIndex];
rs.push(`Changed ${compareField.getQualifiedLabel()} file column from (${baseColumn}) to (${compareColumn})`); rs.push(`Changed ${compareField.getQualifiedLabel()} file column from ${baseColumn ? `(${baseColumn})` : "--"} to ${compareColumn ? `(${compareColumn})` : "--"}`);
}
} }
///////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////
@ -120,7 +126,7 @@ export class SavedBulkLoadProfileUtils
for (let bulkLoadField of orderedFieldArray) for (let bulkLoadField of orderedFieldArray)
{ {
const fieldName = bulkLoadField.field.name; const fieldName = bulkLoadField.getQualifiedName()
const compareField = compareFieldsMap[fieldName]; const compareField = compareFieldsMap[fieldName];
if(!compareField) if(!compareField)
{ {
@ -292,7 +298,7 @@ export class SavedBulkLoadProfileUtils
{ {
try try
{ {
const fieldName = bulkLoadField.field.name; const fieldName = bulkLoadField.getQualifiedName() // todo - does this (and the others calls to this) need suffix?
const valueMappingDiff = this.diffFieldValueMappings(bulkLoadField, baseMapping.valueMappings[fieldName] ?? {}, activeMapping.valueMappings[fieldName] ?? {}); const valueMappingDiff = this.diffFieldValueMappings(bulkLoadField, baseMapping.valueMappings[fieldName] ?? {}, activeMapping.valueMappings[fieldName] ?? {});
if(valueMappingDiff) if(valueMappingDiff)