Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
update config fix (#693)
Guy Ben-Aharone75323c16e05
diff --git a/src/context/config-context/config-context.tsx b/src/context/config-context/config-context.tsxindex b2d29235..2bfc39c8 100644--- a/src/context/config-context/config-context.tsx+++ b/src/context/config-context/config-context.tsx@@ -4,7 +4,10 @@ import type { ChartDBConfig } from '@/lib/domain/config';export interface ConfigContext {config?: ChartDBConfig;- updateConfig: (config: Partial<ChartDBConfig>) => Promise<void>;+ updateConfig: (params: {+ config?: Partial<ChartDBConfig>;+ updateFn?: (config: ChartDBConfig) => ChartDBConfig;+ }) => Promise<void>;}export const ConfigContext = createContext<ConfigContext>({diff --git a/src/context/config-context/config-provider.tsx b/src/context/config-context/config-provider.tsxindex 99cdccd6..a0e2ffaf 100644--- a/src/context/config-context/config-provider.tsx+++ b/src/context/config-context/config-provider.tsx@@ -19,15 +19,29 @@ export const ConfigProvider: React.FC<React.PropsWithChildren> = ({loadConfig();}, [getConfig]);- const updateConfig: ConfigContext['updateConfig'] = async (- config: Partial<ChartDBConfig>- ) => {- await updateDataConfig(config);- setConfig((prevConfig) =>- prevConfig- ? { ...prevConfig, ...config }- : { ...{ defaultDiagramId: '' }, ...config }- );+ const updateConfig: ConfigContext['updateConfig'] = async ({+ config,+ updateFn,+ }) => {+ const promise = new Promise<void>((resolve) => {+ setConfig((prevConfig) => {+ let baseConfig: ChartDBConfig = { defaultDiagramId: '' };+ if (prevConfig) {+ baseConfig = prevConfig;+ }++ const updatedConfig = updateFn+ ? updateFn(baseConfig)+ : { ...baseConfig, ...config };++ updateDataConfig(updatedConfig).then(() => {+ resolve();+ });+ return updatedConfig;+ });+ });++ return promise;};return (diff --git a/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx b/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsxindex c9ef1424..1a3e05e9 100644--- a/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx+++ b/src/dialogs/create-diagram-dialog/create-diagram-dialog.tsx@@ -91,7 +91,7 @@ export const CreateDiagramDialog: React.FC<CreateDiagramDialogProps> = ({}await addDiagram({ diagram });- await updateConfig({ defaultDiagramId: diagram.id });+ await updateConfig({ config: { defaultDiagramId: diagram.id } });closeCreateDiagramDialog();navigate(`/diagrams/${diagram.id}`);}, [@@ -120,7 +120,7 @@ export const CreateDiagramDialog: React.FC<CreateDiagramDialogProps> = ({};await addDiagram({ diagram });- await updateConfig({ defaultDiagramId: diagram.id });+ await updateConfig({ config: { defaultDiagramId: diagram.id } });closeCreateDiagramDialog();navigate(`/diagrams/${diagram.id}`);setTimeout(diff --git a/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsx b/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsxindex 72ffbfae..553fc5cc 100644--- a/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsx+++ b/src/dialogs/open-diagram-dialog/open-diagram-dialog.tsx@@ -65,7 +65,7 @@ export const OpenDiagramDialog: React.FC<OpenDiagramDialogProps> = ({const openDiagram = useCallback((diagramId: string) => {if (diagramId) {- updateConfig({ defaultDiagramId: diagramId });+ updateConfig({ config: { defaultDiagramId: diagramId } });navigate(`/diagrams/${diagramId}`);}},diff --git a/src/pages/editor-page/top-navbar/menu/menu.tsx b/src/pages/editor-page/top-navbar/menu/menu.tsxindex 5898e750..97c17891 100644--- a/src/pages/editor-page/top-navbar/menu/menu.tsx+++ b/src/pages/editor-page/top-navbar/menu/menu.tsx@@ -17,8 +17,6 @@ import { useDialog } from '@/hooks/use-dialog';import { useExportImage } from '@/hooks/use-export-image';import { databaseTypeToLabelMap } from '@/lib/databases';import { DatabaseType } from '@/lib/domain/database-type';-import { useConfig } from '@/hooks/use-config';-import { IS_CHARTDB_IO } from '@/lib/env';import {KeyboardShortcutAction,keyboardShortcutsForOS,@@ -65,7 +63,6 @@ export const Menu: React.FC<MenuProps> = () => {} = useLocalConfig();const { t } = useTranslation();const { redo, undo, hasRedo, hasUndo } = useHistory();- const { config, updateConfig } = useConfig();const { exportImage } = useExportImage();const navigate = useNavigate();@@ -116,53 +113,11 @@ export const Menu: React.FC<MenuProps> = () => {return;}- if (IS_CHARTDB_IO) {- const now = new Date();- const lastExportsInLastHalfHour =- config?.exportActions?.filter(- (date) =>- now.getTime() - date.getTime() < 30 * 60 * 1000- ) ?? [];-- if (lastExportsInLastHalfHour.length >= 5) {- showAlert({- title: 'Export SQL Limit Reached',- content: (- <div className="flex flex-col gap-1 text-sm">- <div>- We set a budget to allow the community to- check the feature. You have reached the- limit of 5 AI exports every 30min.- </div>- <div>- Feel free to use your OPENAI_TOKEN, see the- manual{' '}- <a- href="https://github.com/chartdb/chartdb"- target="_blank"- className="text-pink-600 hover:underline"- rel="noreferrer"- >- here.- </a>- </div>- </div>- ),- closeLabel: 'Close',- });- return;- }-- updateConfig({- exportActions: [...lastExportsInLastHalfHour, now],- });- }-openExportSQLDialog({targetDatabaseType: databaseType,});},- [config?.exportActions, updateConfig, showAlert, openExportSQLDialog]+ [openExportSQLDialog]);const showOrHideSidePanel = useCallback(() => {