Skip to content
Snippets Groups Projects
Unverified Commit 7036aa8f authored by Dalton's avatar Dalton Committed by GitHub
Browse files

Fix scripting error in model metadata sidebar (#25758)

* Fix scripting error in model metadata sidebar

* Default to card's result_metadata col if we can't find it in the query metadata

* Look at virtual card table for column metadataa
parent 7a2cae95
No related branches found
No related tags found
No related merge requests found
......@@ -186,6 +186,10 @@ function DatasetEditor(props) {
);
const fields = useMemo(() => {
const virtualCardTable = dataset.table();
const virtualCardColumns = (virtualCardTable?.fields ?? []).map(field =>
field.column(),
);
// Columns in results_metadata contain all the necessary metadata
// orderedColumns contain properly sorted columns, but they only contain field names and refs.
// Normally, columns in results_metadata are ordered too,
......@@ -199,9 +203,13 @@ function DatasetEditor(props) {
return columns;
}
return orderedColumns
.map(col => columns.find(c => isSameField(c.field_ref, col.fieldRef)))
.map(
col =>
columns.find(c => isSameField(c.field_ref, col.fieldRef)) ||
virtualCardColumns.find(c => isSameField(c.field_ref, col.fieldRef)),
)
.filter(Boolean);
}, [orderedColumns, result]);
}, [dataset, orderedColumns, result?.data?.results_metadata?.columns]);
const isEditingQuery = datasetEditorTab === "query";
const isEditingMetadata = datasetEditorTab === "metadata";
......
......@@ -153,7 +153,9 @@ function DatasetFieldMetadataSidebar({
setShouldAnimateFieldChange(true);
// setTimeout is required as form fields are rerendered pretty frequently
setTimeout(() => {
displayNameInputRef.current?.select?.();
if (_.isFunction(displayNameInputRef.current?.select)) {
displayNameInputRef.current.select();
}
});
}
}, [field, previousField]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment