Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
add colors to diff (#647)
Guy Ben-Aharond94a71e9e1af
diff --git a/src/context/diff-context/diff-check/diff-check.ts b/src/context/diff-context/diff-check/diff-check.tsindex 463386f2..662754ac 100644--- a/src/context/diff-context/diff-check/diff-check.ts+++ b/src/context/diff-context/diff-check/diff-check.ts@@ -96,7 +96,7 @@ function compareTables({}}- // Check for table name and comments changes+ // Check for table name, comments and color changesfor (const oldTable of oldTables) {const newTable = newTables.find((t) => t.id === oldTable.id);@@ -144,6 +144,26 @@ function compareTables({changedTables.set(oldTable.id, true);}++ if (oldTable.color !== newTable.color) {+ diffMap.set(+ getDiffMapKey({+ diffObject: 'table',+ objectId: oldTable.id,+ attribute: 'color',+ }),+ {+ object: 'table',+ type: 'changed',+ tableId: oldTable.id,+ attribute: 'color',+ newValue: newTable.color,+ oldValue: oldTable.color,+ }+ );++ changedTables.set(oldTable.id, true);+ }}}diff --git a/src/context/diff-context/diff-context.tsx b/src/context/diff-context/diff-context.tsxindex 43fd24d8..277343e1 100644--- a/src/context/diff-context/diff-context.tsx+++ b/src/context/diff-context/diff-context.tsx@@ -46,6 +46,7 @@ export interface DiffContext {checkIfNewTable: ({ tableId }: { tableId: string }) => boolean;checkIfTableRemoved: ({ tableId }: { tableId: string }) => boolean;getTableNewName: ({ tableId }: { tableId: string }) => string | null;+ getTableNewColor: ({ tableId }: { tableId: string }) => string | null;// field diffcheckIfFieldHasChange: ({diff --git a/src/context/diff-context/diff-provider.tsx b/src/context/diff-context/diff-provider.tsxindex 50361f1e..8043dc76 100644--- a/src/context/diff-context/diff-provider.tsx+++ b/src/context/diff-context/diff-provider.tsx@@ -169,6 +169,26 @@ export const DiffProvider: React.FC<React.PropsWithChildren> = ({[diffMap]);+ const getTableNewColor = useCallback<DiffContext['getTableNewColor']>(+ ({ tableId }) => {+ const tableColorKey = getDiffMapKey({+ diffObject: 'table',+ objectId: tableId,+ attribute: 'color',+ });++ if (diffMap.has(tableColorKey)) {+ const diff = diffMap.get(tableColorKey);++ if (diff?.type === 'changed') {+ return diff.newValue as string;+ }+ }+ return null;+ },+ [diffMap]+ );+const checkIfTableHasChange = useCallback<DiffContext['checkIfTableHasChange']>(({ tableId }) => tablesChanged.get(tableId) ?? false, [tablesChanged]);@@ -331,6 +351,7 @@ export const DiffProvider: React.FC<React.PropsWithChildren> = ({checkIfNewTable,checkIfTableRemoved,checkIfTableHasChange,+ getTableNewColor,// field diffcheckIfFieldHasChange,diff --git a/src/lib/domain/diff/table-diff.ts b/src/lib/domain/diff/table-diff.tsindex d325b5d4..dd27ff97 100644--- a/src/lib/domain/diff/table-diff.ts+++ b/src/lib/domain/diff/table-diff.ts@@ -2,11 +2,15 @@ import { z } from 'zod';import type { DBTable } from '../db-table';import { dbTableSchema } from '../db-table';-export type TableDiffAttribute = 'name' | 'comments';+export type TableDiffAttribute = keyof Pick<+ DBTable,+ 'name' | 'comments' | 'color'+>;const tableDiffAttributeSchema: z.ZodType<TableDiffAttribute> = z.union([z.literal('name'),z.literal('comments'),+ z.literal('color'),]);export interface TableDiffChanged {diff --git a/src/pages/editor-page/canvas/table-node/table-node.tsx b/src/pages/editor-page/canvas/table-node/table-node.tsxindex 7e8d48eb..cf32c5c5 100644--- a/src/pages/editor-page/canvas/table-node/table-node.tsx+++ b/src/pages/editor-page/canvas/table-node/table-node.tsx@@ -68,6 +68,7 @@ export const TableNode: React.FC<NodeProps<TableNodeType>> = React.memo(const {getTableNewName,+ getTableNewColor,checkIfTableHasChange,checkIfNewTable,checkIfTableRemoved,@@ -80,6 +81,18 @@ export const TableNode: React.FC<NodeProps<TableNodeType>> = React.memo([getTableNewName, table.id]);+ const tableChangedColor = useMemo(+ () => getTableNewColor({ tableId: table.id }),+ [getTableNewColor, table.id]+ );+ const tableColor = useMemo(() => {+ if (tableChangedColor) {+ return tableChangedColor;+ }++ return table.color;+ }, [tableChangedColor, table.color]);+const isDiffTableChanged = useMemo(() => checkIfTableHasChange({ tableId: table.id }),[checkIfTableHasChange, table.id]@@ -253,7 +266,7 @@ export const TableNode: React.FC<NodeProps<TableNodeType>> = React.memo(/><divclassName="h-2 rounded-t-[6px]"- style={{ backgroundColor: table.color }}+ style={{ backgroundColor: tableColor }}></div><div className="group flex h-9 items-center justify-between bg-slate-200 px-2 dark:bg-slate-900"><div className="flex min-w-0 flex-1 items-center gap-2">