diff --git a/frontend/components/v2/config-panels/V2SplitPanelLayoutConfigPanel.tsx b/frontend/components/v2/config-panels/V2SplitPanelLayoutConfigPanel.tsx
index d3462802..935e9f42 100644
--- a/frontend/components/v2/config-panels/V2SplitPanelLayoutConfigPanel.tsx
+++ b/frontend/components/v2/config-panels/V2SplitPanelLayoutConfigPanel.tsx
@@ -322,7 +322,7 @@ const PanelColumnSection: React.FC<{
{
name: colInfo.columnName,
label:
- colInfo.columnLabel || colInfo.columnName,
+ colInfo.displayName || colInfo.columnName,
width: 120,
},
]);
@@ -407,10 +407,10 @@ const PanelColumnSection: React.FC<{
/>
- {col.columnLabel || col.columnName}
+ {col.displayName || col.columnName}
- {(col as any).input_type || col.dataType}
+ {col.input_type || col.dataType}
);
@@ -822,20 +822,24 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
setLoadingColumns((prev) => ({ ...prev, [tableName]: true }));
try {
const columnsResponse = await tableTypeApi.getColumns(tableName);
- const cols: ColumnInfo[] = (columnsResponse || []).map((col: any) => ({
+ const cols = (columnsResponse || []).map((col: any) => ({
tableName: col.tableName || tableName,
columnName: col.columnName || col.column_name,
- columnLabel:
+ displayName:
col.displayName ||
col.columnLabel ||
col.column_label ||
col.columnName ||
col.column_name,
- dataType: col.dataType || col.data_type || col.dbType,
- webType: col.webType || col.web_type,
- input_type: col.inputType || col.input_type,
+ dataType: col.dataType || col.data_type || col.dbType || "",
+ dbType: col.dbType || col.dataType || col.data_type || "",
+ webType: col.webType || col.web_type || "text",
+ inputType: col.inputType || "direct",
+ input_type: col.input_type || col.inputType,
+ isNullable: col.isNullable === true || col.isNullable === "Y",
+ isPrimaryKey: col.isPrimaryKey ?? false,
referenceTable: col.referenceTable || col.reference_table,
- }));
+ })) as ColumnInfo[];
setLoadedTableColumns((prev) => ({ ...prev, [tableName]: cols }));
await loadEntityJoinColumnsForTable(tableName);
} catch (error) {
@@ -1234,12 +1238,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
({
- columnName: col.columnName,
- columnLabel: col.columnLabel || col.columnName,
- dataType: col.dataType,
- input_type: (col as any).input_type,
- }))}
+ columns={leftTableColumns}
config={config.leftPanel?.dataFilter}
onConfigChange={(dataFilter) =>
updateLeftPanel({ dataFilter })
@@ -1379,7 +1378,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName}
value={col.columnName}
>
- {col.columnLabel || col.columnName}
+ {col.displayName || col.columnName}
))}
@@ -1411,7 +1410,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName}
value={col.columnName}
>
- {col.columnLabel || col.columnName}
+ {col.displayName || col.columnName}
))}
@@ -1467,7 +1466,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName}
value={col.columnName}
>
- {col.columnLabel || col.columnName}
+ {col.displayName || col.columnName}
))}
@@ -1497,7 +1496,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName}
value={col.columnName}
>
- {col.columnLabel || col.columnName}
+ {col.displayName || col.columnName}
))}
@@ -1645,12 +1644,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
({
- columnName: col.columnName,
- columnLabel: col.columnLabel || col.columnName,
- dataType: col.dataType,
- input_type: (col as any).input_type,
- }))}
+ columns={rightTableColumns}
config={config.rightPanel?.dataFilter}
onConfigChange={(dataFilter) =>
updateRightPanel({ dataFilter })
@@ -1730,7 +1724,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName}
value={col.columnName}
>
- {col.columnLabel || col.columnName}
+ {col.displayName || col.columnName}
))}
@@ -2202,7 +2196,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName}
value={col.columnName}
>
- {col.columnLabel || col.columnName}
+ {col.displayName || col.columnName}
))}
@@ -2229,7 +2223,7 @@ export const V2SplitPanelLayoutConfigPanel: React.FC<
key={col.columnName}
value={col.columnName}
>
- {col.columnLabel || col.columnName}
+ {col.displayName || col.columnName}
)
)}