Skip to content

Database diagrams editor that allows you to visualize and design your DB with a single query.

update dependencies order (#255)

Guy Ben-Aharon0cddaee67f83
diff --git a/src/pages/editor-page/side-panel/dependencies-section/dependencies-section.tsx b/src/pages/editor-page/side-panel/dependencies-section/dependencies-section.tsx
index 92c47c28..1ca6f4d7 100644
--- a/src/pages/editor-page/side-panel/dependencies-section/dependencies-section.tsx
+++ b/src/pages/editor-page/side-panel/dependencies-section/dependencies-section.tsx
@@ -48,7 +48,18 @@ export const DependenciesSection: React.FC<DependenciesSectionProps> = () => {
dependency
) => shouldShowDependencyBySchemaFilter(dependency, filteredSchemas);
- return dependencies.filter(filterSchema).filter(filterName);
+ return dependencies
+ .filter(filterSchema)
+ .filter(filterName)
+ .sort((a, b) => {
+ const dependentTableA = getTable(a.dependentTableId);
+ const tableA = getTable(a.tableId);
+ const dependentTableB = getTable(b.dependentTableId);
+ const tableB = getTable(b.tableId);
+ return `${dependentTableA?.name}${tableA?.name}`.localeCompare(
+ `${dependentTableB?.name}${tableB?.name}`
+ );
+ });
}, [dependencies, filterText, filteredSchemas, getTable]);
return (
diff --git a/src/pages/editor-page/side-panel/dependencies-section/dependency-list/dependency-list-item/dependency-list-item-content/dependency-list-item-content.tsx b/src/pages/editor-page/side-panel/dependencies-section/dependency-list/dependency-list-item/dependency-list-item-content/dependency-list-item-content.tsx
index 5e329f22..ef8ee6c0 100644
--- a/src/pages/editor-page/side-panel/dependencies-section/dependency-list/dependency-list-item/dependency-list-item-content/dependency-list-item-content.tsx
+++ b/src/pages/editor-page/side-panel/dependencies-section/dependency-list/dependency-list-item/dependency-list-item-content/dependency-list-item-content.tsx
@@ -38,40 +38,40 @@ export const DependencyListItemContent: React.FC<
<div className="flex items-center justify-between gap-1 text-xs">
<div className="flex basis-1/2 flex-col gap-2 overflow-hidden text-xs">
<div className="flex flex-row items-center gap-1">
- <FileOutput className="size-4 text-subtitle" />
+ <FileMinus2 className="size-4 text-subtitle" />
<div className="font-bold text-subtitle">
{t(
- 'side_panel.dependencies_section.dependency.table'
+ 'side_panel.dependencies_section.dependency.dependent_table'
)}
</div>
</div>
<Tooltip>
<TooltipTrigger>
- <div className="truncate text-left text-sm">
- {table?.name}
+ <div className="truncate text-left text-sm ">
+ {dependentTable?.name}
</div>
</TooltipTrigger>
- <TooltipContent>{table?.name}</TooltipContent>
+ <TooltipContent>
+ {dependentTable?.name}
+ </TooltipContent>
</Tooltip>
</div>
<div className="flex basis-1/2 flex-col gap-2 overflow-hidden text-xs">
<div className="flex flex-row items-center gap-1">
- <FileMinus2 className="size-4 text-subtitle" />
+ <FileOutput className="size-4 text-subtitle" />
<div className="font-bold text-subtitle">
{t(
- 'side_panel.dependencies_section.dependency.dependent_table'
+ 'side_panel.dependencies_section.dependency.table'
)}
</div>
</div>
<Tooltip>
<TooltipTrigger>
- <div className="truncate text-left text-sm ">
- {dependentTable?.name}
+ <div className="truncate text-left text-sm">
+ {table?.name}
</div>
</TooltipTrigger>
- <TooltipContent>
- {dependentTable?.name}
- </TooltipContent>
+ <TooltipContent>{table?.name}</TooltipContent>
</Tooltip>
</div>
</div>
diff --git a/src/pages/editor-page/side-panel/dependencies-section/dependency-list/dependency-list-item/dependency-list-item-header/dependency-list-item-header.tsx b/src/pages/editor-page/side-panel/dependencies-section/dependency-list/dependency-list-item/dependency-list-item-header/dependency-list-item-header.tsx
index 81076a71..bebb7134 100644
--- a/src/pages/editor-page/side-panel/dependencies-section/dependency-list/dependency-list-item/dependency-list-item-header/dependency-list-item-header.tsx
+++ b/src/pages/editor-page/side-panel/dependencies-section/dependency-list/dependency-list-item/dependency-list-item-header/dependency-list-item-header.tsx
@@ -39,7 +39,7 @@ export const DependencyListItemHeader: React.FC<
return '';
}
- return `${table.name} -> ${dependentTable.name}`;
+ return `${dependentTable.name} -> ${table.name}`;
}, [dependency.tableId, dependency.dependentTableId, getTable]);
const focusOnDependency = useCallback(