diff --git a/backend/backend/application/file_explorer/file_explorer.py b/backend/backend/application/file_explorer/file_explorer.py
index 79402ba..2bbf3db 100644
--- a/backend/backend/application/file_explorer/file_explorer.py
+++ b/backend/backend/application/file_explorer/file_explorer.py
@@ -93,6 +93,9 @@ def load_models(self, session: Session):
# Sort models by execution order (DAG order)
sorted_model_names = topological_sort_models(models_with_refs)
+ # Build lookup for references by model name
+ refs_by_name = {m["model_name"]: m["references"] for m in models_with_refs}
+
# Build the model structure in sorted order
no_code_model_structure = []
for no_code_model_name in sorted_model_names:
@@ -103,6 +106,7 @@ def load_models(self, session: Session):
"key": f"{self.project_name}/models/no_code/{no_code_model_name}",
"is_folder": False,
"type": "NO_CODE_MODEL",
+ "references": refs_by_name.get(no_code_model_name, []),
}
)
model_structure: dict[str, Any] = {
diff --git a/frontend/src/ide/editor/lineage-tab/lineage-tab.jsx b/frontend/src/ide/editor/lineage-tab/lineage-tab.jsx
index 624238c..d10ec15 100644
--- a/frontend/src/ide/editor/lineage-tab/lineage-tab.jsx
+++ b/frontend/src/ide/editor/lineage-tab/lineage-tab.jsx
@@ -289,7 +289,81 @@ const transformLineageData = (data) => {
return data;
};
-function LineageTab({ nodeData }) {
+// Find all ancestor and descendant node IDs for a given model
+const getRelatedNodeIds = (allEdges, selectedLabel, allNodes) => {
+ const nodeByLabel = {};
+ allNodes.forEach((n) => {
+ nodeByLabel[n.data.originalLabel || n.data.label] = n.id;
+ });
+ const selectedId = nodeByLabel[selectedLabel];
+ if (!selectedId) return null;
+
+ const related = new Set([selectedId]);
+ const findAncestors = (id) => {
+ allEdges.forEach((e) => {
+ if (e.target === id && !related.has(e.source)) {
+ related.add(e.source);
+ findAncestors(e.source);
+ }
+ });
+ };
+ const findDescendants = (id) => {
+ allEdges.forEach((e) => {
+ if (e.source === id && !related.has(e.target)) {
+ related.add(e.target);
+ findDescendants(e.target);
+ }
+ });
+ };
+ findAncestors(selectedId);
+ findDescendants(selectedId);
+ return related;
+};
+
+const applyScopedStyles = (layoutedNodes, layoutedEdges, selectedLabel) => {
+ const rawEdges = layoutedEdges.map((e) => ({
+ source: e.source,
+ target: e.target,
+ }));
+ const related = getRelatedNodeIds(rawEdges, selectedLabel, layoutedNodes);
+ if (!related) return { nodes: layoutedNodes, edges: layoutedEdges };
+
+ const styledNodes = layoutedNodes.map((node) => {
+ const nodeLabel = node.data.originalLabel || node.data.label;
+ const isSelected = nodeLabel === selectedLabel;
+ const isRelated = related.has(node.id);
+ return {
+ ...node,
+ style: {
+ ...node.style,
+ opacity: isRelated ? 1 : 0.25,
+ border: isSelected
+ ? "2px dashed #1677ff"
+ : node.style?.border || "1px solid var(--black)",
+ },
+ };
+ });
+
+ const relatedEdgeSet = new Set();
+ layoutedEdges.forEach((e) => {
+ if (related.has(e.source) && related.has(e.target)) {
+ relatedEdgeSet.add(e.id);
+ }
+ });
+
+ const styledEdges = layoutedEdges.map((edge) => ({
+ ...edge,
+ style: {
+ ...edge.style,
+ opacity: relatedEdgeSet.has(edge.id) ? 1 : 0.15,
+ stroke: relatedEdgeSet.has(edge.id) ? "#1677ff" : undefined,
+ },
+ }));
+
+ return { nodes: styledNodes, edges: styledEdges };
+};
+
+function LineageTab({ nodeData, selectedModelName }) {
const axios = useAxiosPrivate();
const { selectedOrgId } = orgStore();
const { projectId } = useProjectStore();
@@ -486,15 +560,32 @@ function LineageTab({ nodeData }) {
transformedData.edges,
layoutDirection
);
- setNodes(layoutedNodes);
- setEdges(layoutedEdges);
+ if (selectedModelName) {
+ const scoped = applyScopedStyles(
+ layoutedNodes,
+ layoutedEdges,
+ selectedModelName
+ );
+ setNodes(scoped.nodes);
+ setEdges(scoped.edges);
+ } else {
+ setNodes(layoutedNodes);
+ setEdges(layoutedEdges);
+ }
})
.catch((error) => {
console.error(error);
notify({ error });
setLineageData({});
});
- }, [projectId, selectedOrgId, setNodes, setEdges, layoutDirection]);
+ }, [
+ projectId,
+ selectedOrgId,
+ setNodes,
+ setEdges,
+ layoutDirection,
+ selectedModelName,
+ ]);
const handleToggleLayout = useCallback(() => {
const newDirection = layoutDirection === "TB" ? "LR" : "TB";
@@ -504,10 +595,20 @@ function LineageTab({ nodeData }) {
if (lineageData && lineageData.nodes && lineageData.edges) {
const { nodes: layoutedNodes, edges: layoutedEdges } =
getLayoutedElements(lineageData.nodes, lineageData.edges, newDirection);
- setNodes(layoutedNodes);
- setEdges(layoutedEdges);
+ if (selectedModelName) {
+ const scoped = applyScopedStyles(
+ layoutedNodes,
+ layoutedEdges,
+ selectedModelName
+ );
+ setNodes(scoped.nodes);
+ setEdges(scoped.edges);
+ } else {
+ setNodes(layoutedNodes);
+ setEdges(layoutedEdges);
+ }
}
- }, [layoutDirection, lineageData, setNodes, setEdges]);
+ }, [layoutDirection, lineageData, setNodes, setEdges, selectedModelName]);
// Fetch sequence data for a model
const fetchSequenceData = useCallback(
@@ -674,15 +775,25 @@ function LineageTab({ nodeData }) {
transformedData.edges,
"TB"
);
- setNodes(layoutedNodes);
- setEdges(layoutedEdges);
+ if (selectedModelName) {
+ const scoped = applyScopedStyles(
+ layoutedNodes,
+ layoutedEdges,
+ selectedModelName
+ );
+ setNodes(scoped.nodes);
+ setEdges(scoped.edges);
+ } else {
+ setNodes(layoutedNodes);
+ setEdges(layoutedEdges);
+ }
})
.catch((error) => {
console.error(error);
notify({ error });
setLineageData({});
});
- }, [projectId, selectedOrgId, setNodes, setEdges]);
+ }, [projectId, selectedOrgId, setNodes, setEdges, selectedModelName]);
if (!lineageData) {
return ;
@@ -957,6 +1068,7 @@ function LineageTab({ nodeData }) {
LineageTab.propTypes = {
nodeData: PropTypes.object,
+ selectedModelName: PropTypes.string,
};
export { LineageTab };
diff --git a/frontend/src/ide/editor/no-code-model/no-code-model.jsx b/frontend/src/ide/editor/no-code-model/no-code-model.jsx
index 80304d0..bb83974 100644
--- a/frontend/src/ide/editor/no-code-model/no-code-model.jsx
+++ b/frontend/src/ide/editor/no-code-model/no-code-model.jsx
@@ -261,8 +261,18 @@ function NoCodeModel({ nodeData }) {
if (lineageData?.nodes && lineageData?.edges) {
const { nodes: layoutedNodes, edges: layoutedEdges } =
getLayoutedElements(lineageData.nodes, lineageData.edges, newDirection);
- setNodes(layoutedNodes);
- setEdges(layoutedEdges);
+ if (modelName) {
+ const scoped = applyScopedStyles(
+ layoutedNodes,
+ layoutedEdges,
+ modelName
+ );
+ setNodes(scoped.nodes);
+ setEdges(scoped.edges);
+ } else {
+ setNodes(layoutedNodes);
+ setEdges(layoutedEdges);
+ }
}
};
@@ -740,6 +750,7 @@ function NoCodeModel({ nodeData }) {
setSeqEdges(layoutedEdges);
runTransformation(res?.data?.model_data);
setConfigApply(true);
+ setRefreshModels(true);
handleModalClose("ok");
})
.catch((error) => {
@@ -2159,6 +2170,80 @@ function NoCodeModel({ nodeData }) {
);
};
+ // Find all ancestor and descendant node IDs for a given model
+ const getRelatedNodeIds = (allEdges, selectedLabel, allNodes) => {
+ const nodeByLabel = {};
+ allNodes.forEach((n) => {
+ nodeByLabel[n.data.originalLabel || n.data.label] = n.id;
+ });
+ const selectedId = nodeByLabel[selectedLabel];
+ if (!selectedId) return null;
+
+ const related = new Set([selectedId]);
+ const findAncestors = (id) => {
+ allEdges.forEach((e) => {
+ if (e.target === id && !related.has(e.source)) {
+ related.add(e.source);
+ findAncestors(e.source);
+ }
+ });
+ };
+ const findDescendants = (id) => {
+ allEdges.forEach((e) => {
+ if (e.source === id && !related.has(e.target)) {
+ related.add(e.target);
+ findDescendants(e.target);
+ }
+ });
+ };
+ findAncestors(selectedId);
+ findDescendants(selectedId);
+ return related;
+ };
+
+ const applyScopedStyles = (layoutedNodes, layoutedEdges, selectedLabel) => {
+ const rawEdges = layoutedEdges.map((e) => ({
+ source: e.source,
+ target: e.target,
+ }));
+ const related = getRelatedNodeIds(rawEdges, selectedLabel, layoutedNodes);
+ if (!related) return { nodes: layoutedNodes, edges: layoutedEdges };
+
+ const styledNodes = layoutedNodes.map((node) => {
+ const nodeLabel = node.data.originalLabel || node.data.label;
+ const isSelected = nodeLabel === selectedLabel;
+ const isRelated = related.has(node.id);
+ return {
+ ...node,
+ style: {
+ ...node.style,
+ opacity: isRelated ? 1 : 0.25,
+ border: isSelected
+ ? "2px dashed #1677ff"
+ : node.style?.border || "1px solid var(--black)",
+ },
+ };
+ });
+
+ const relatedEdgeSet = new Set();
+ layoutedEdges.forEach((e) => {
+ if (related.has(e.source) && related.has(e.target)) {
+ relatedEdgeSet.add(e.id);
+ }
+ });
+
+ const styledEdges = layoutedEdges.map((edge) => ({
+ ...edge,
+ style: {
+ ...edge.style,
+ opacity: relatedEdgeSet.has(edge.id) ? 1 : 0.15,
+ stroke: relatedEdgeSet.has(edge.id) ? "#1677ff" : undefined,
+ },
+ }));
+
+ return { nodes: styledNodes, edges: styledEdges };
+ };
+
const getLineageData = (callSample = false) => {
if (!projectId) return;
setLineageData();
@@ -2174,8 +2259,18 @@ function NoCodeModel({ nodeData }) {
setLineageData(data);
const { nodes: layoutedNodes, edges: layoutedEdges } =
getLayoutedElements(data.nodes, data.edges, lineageLayoutDirection);
- setNodes(layoutedNodes);
- setEdges(layoutedEdges);
+ if (modelName) {
+ const scoped = applyScopedStyles(
+ layoutedNodes,
+ layoutedEdges,
+ modelName
+ );
+ setNodes(scoped.nodes);
+ setEdges(scoped.edges);
+ } else {
+ setNodes(layoutedNodes);
+ setEdges(layoutedEdges);
+ }
})
.catch((error) => {
console.error(error);
diff --git a/frontend/src/ide/explorer/explorer-component.jsx b/frontend/src/ide/explorer/explorer-component.jsx
index 83ef24a..cf9c39b 100644
--- a/frontend/src/ide/explorer/explorer-component.jsx
+++ b/frontend/src/ide/explorer/explorer-component.jsx
@@ -82,6 +82,7 @@ const IdeExplorer = ({
} = useProjectStore();
const currentSchema = useProjectStore((state) => state.currentSchema);
const setCurrentSchema = useProjectStore((state) => state.setCurrentSchema);
+ const setSchemaList = useProjectStore((state) => state.setSchemaList);
// Reset currentSchema on unmount to prevent stale data
useEffect(() => {
@@ -127,6 +128,7 @@ const IdeExplorer = ({
const [isModalVisible, setIsModalVisible] = useState(false);
const [uploading, setUploading] = useState(false);
const [fileList, setFileList] = useState([]);
+ const [modelSortBy, setModelSortBy] = useState("dep_chain");
const MAX_FILE_SIZE_MB = 50;
const MAX_FILE_SIZE_BYTES = MAX_FILE_SIZE_MB * 1024 * 1024;
const { refreshModels, setRefreshModels } = useRefreshModelsStore();
@@ -188,6 +190,79 @@ const IdeExplorer = ({
}, 0);
};
+ // Sort no_code models based on sort option
+ const sortModels = (models, sortBy) => {
+ if (sortBy === "alpha_asc") {
+ return [...models].sort((a, b) => a.title.localeCompare(b.title));
+ }
+ if (sortBy === "alpha_desc") {
+ return [...models].sort((a, b) => b.title.localeCompare(a.title));
+ }
+ if (sortBy === "dep_chain") {
+ const modelSet = new Set(models.map((m) => m.title));
+ const childrenOf = {};
+ models.forEach((m) => {
+ (m.references || []).forEach((ref) => {
+ if (modelSet.has(ref)) {
+ if (!childrenOf[ref]) childrenOf[ref] = [];
+ childrenOf[ref].push(m.title);
+ }
+ });
+ });
+ const modelByName = {};
+ models.forEach((m) => {
+ modelByName[m.title] = m;
+ });
+ const visited = new Set();
+ const result = [];
+ const addChain = (name) => {
+ if (visited.has(name) || !modelByName[name]) return;
+ visited.add(name);
+ result.push(modelByName[name]);
+ (childrenOf[name] || []).forEach(addChain);
+ };
+ models.forEach((m) => {
+ const refs = (m.references || []).filter((r) => modelSet.has(r));
+ if (refs.length === 0) addChain(m.title);
+ });
+ models.forEach((m) => {
+ if (!visited.has(m.title)) result.push(m);
+ });
+ return result;
+ }
+ return [...models];
+ };
+
+ const applyModelDecorations = (models) => {
+ // Build set of model names to distinguish from external table references
+ const modelNames = new Set(models.map((m) => m.title));
+ models.forEach((m) => {
+ const refs = (m.references || []).filter((r) => modelNames.has(r));
+ if (refs.length > 0) {
+ m._isChild = true;
+ }
+ });
+ };
+
+ const handleModelSort = (sortBy) => {
+ setModelSortBy(sortBy);
+ if (rawTreeDataRef.current.length > 0) {
+ const freshData = JSON.parse(JSON.stringify(rawTreeDataRef.current));
+ freshData.forEach((node) => {
+ if (node.title === "models" && node.children) {
+ node.children.forEach((child) => {
+ if (child.title === "no_code" && child.children) {
+ child.children = sortModels(child.children, sortBy);
+ applyModelDecorations(child.children);
+ }
+ });
+ }
+ });
+ transformTree(freshData);
+ setTreeData(freshData, false);
+ }
+ };
+
// Function to map string icons from API to actual icon components
// depth: 0 = root (Database), 1 = schema, 2 = table, 3 = column
const mapIconsToTreeData = (data, depth = 0) => {
@@ -308,6 +383,9 @@ const IdeExplorer = ({
setCurrentSchema("");
}
+ // Store plain schema list in shared store
+ setSchemaList(allSchemas);
+
const items = allSchemas.map((el) => ({
label: el,
key: el,
@@ -350,6 +428,9 @@ const IdeExplorer = ({
data.map((item) => {
if (item.title === "no_code") {
item.children = item.children || [];
+ // Sort and decorate models
+ item.children = sortModels(item.children, modelSortBy);
+ applyModelDecorations(item.children);
// Clean up stale selected model keys
const currentModelKeys = item.children.map((c) => c.key);
const filtered = selectedModelKeysRef.current.filter((k) =>
@@ -455,6 +536,32 @@ const IdeExplorer = ({
+ handleModelSort(key),
+ }}
+ trigger={["click"]}
+ placement="bottomRight"
+ >
+
+
+
+
+
+
>
)}
@@ -2446,6 +2553,11 @@ function transformTree(tree) {
// change is_folder to isLeaf key and delete is_folder
delete Object.assign(node, { isLeaf: !node.is_folder }).is_folder;
+ // Indent child/reference models
+ if (node._isChild) {
+ node.className = "explorer-child-model";
+ }
+
if (node.children) {
transformTree(node.children);
}
diff --git a/frontend/src/ide/ide-layout.css b/frontend/src/ide/ide-layout.css
index 4a58aa7..db14961 100644
--- a/frontend/src/ide/ide-layout.css
+++ b/frontend/src/ide/ide-layout.css
@@ -79,6 +79,11 @@
width: 8px !important;
}
+/* Indent child/reference models to show hierarchy */
+.explorerTree .explorer-child-model {
+ padding-left: 12px !important;
+}
+
.contextMenu {
position: fixed;
z-index: 1000;
diff --git a/frontend/src/store/project-store.js b/frontend/src/store/project-store.js
index e99f8d6..67be3b8 100644
--- a/frontend/src/store/project-store.js
+++ b/frontend/src/store/project-store.js
@@ -9,6 +9,7 @@ const STORE_VARIABLES = {
projectId: "",
renamedModel: {},
currentSchema: "",
+ schemaList: [],
};
const useProjectStore = create(
@@ -71,6 +72,11 @@ const useProjectStore = create(
return { currentSchema: schema };
});
},
+ setSchemaList: (list) => {
+ setState(() => {
+ return { schemaList: list };
+ });
+ },
}),
{
name: "project-tab-storage",