Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
feat(chart max length): enable edit length from data type select box (#616)
Guy Ben-Aharonbd67ccfbcf66
diff --git a/src/components/select-box/select-box.tsx b/src/components/select-box/select-box.tsxindex a3ba0f98..d9eeb96d 100644--- a/src/components/select-box/select-box.tsx+++ b/src/components/select-box/select-box.tsx@@ -24,12 +24,19 @@ export interface SelectBoxOption {value: string;label: string;description?: string;+ regex?: string;+ extractRegex?: RegExp;}export interface SelectBoxProps {options: SelectBoxOption[];value?: string[] | string;- onChange?: (values: string[] | string) => void;+ valueSuffix?: string;+ optionSuffix?: (option: SelectBoxOption) => string;+ onChange?: (+ values: string[] | string,+ regexMatches?: string[] | string+ ) => void;placeholder?: string;inputPlaceholder?: string;emptyPlaceholder?: string;@@ -55,10 +62,12 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(className,options,value,+ valueSuffix,onChange,multiple,oneLine,selectAll,+ optionSuffix,deselectAll,clearText,showClear,@@ -86,7 +95,7 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>();const handleSelect = React.useCallback(- (selectedValue: string) => {+ (selectedValue: string, regexMatches?: string[]) => {if (multiple) {const newValue =value?.includes(selectedValue) && Array.isArray(value)@@ -94,7 +103,7 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(: [...(value ?? []), selectedValue];onChange?.(newValue);} else {- onChange?.(selectedValue);+ onChange?.(selectedValue, regexMatches);setIsOpen(false);}},@@ -199,6 +208,7 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>((opt) => opt.value === value)?.label}+ {valueSuffix ? valueSuffix : ''}</div>)) : (@@ -239,11 +249,22 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(align="center"><Command- filter={(value, search) =>- value.toLowerCase().includes(search.toLowerCase())+ filter={(value, search, keywords) => {+ if (+ keywords?.length &&+ keywords.some((keyword) =>+ new RegExp(keyword).test(search)+ )+ ) {+ return 1;+ }++ return value+ .toLowerCase()+ .includes(search.toLowerCase())? 1- : 0- }+ : 0;+ }}><div className="relative"><CommandInput@@ -302,14 +323,36 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(const isSelected =Array.isArray(value) &&value.includes(option.value);++ const isRegexMatch =+ option.regex &&+ new RegExp(option.regex)?.test(+ searchTerm+ );++ const matches = option.extractRegex+ ? searchTerm.match(+ option.extractRegex+ )+ : undefined;+return (<CommandItemclassName="flex items-center"key={option.value}+ keywords={+ option.regex+ ? [option.regex]+ : undefined+ }// value={option.value}onSelect={() =>handleSelect(- option.value+ option.value,+ matches?.map(+ (match) =>+ match.toString()+ ))}>@@ -327,7 +370,15 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>()}<div className="flex items-center truncate"><span>- {option.label}+ {isRegexMatch+ ? searchTerm+ : option.label}+ {!isRegexMatch &&+ optionSuffix+ ? optionSuffix(+ option+ )+ : ''}</span>{option.description && (<span className="ml-1 text-xs text-muted-foreground">@@ -337,19 +388,20 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(</span>)}</div>- {!multiple &&+ {((!multiple &&option.value ===- value && (- <CheckIcon- className={cn(- 'ml-auto',- option.value ===- value- ? 'opacity-100'- : 'opacity-0'- )}- />- )}+ value) ||+ isRegexMatch) && (+ <CheckIcon+ className={cn(+ 'ml-auto',+ option.value ===+ value+ ? 'opacity-100'+ : 'opacity-0'+ )}+ />+ )}</CommandItem>);})}diff --git a/src/pages/editor-page/canvas/table-node/table-node-field.tsx b/src/pages/editor-page/canvas/table-node/table-node-field.tsxindex eb56a55e..b79f90fc 100644--- a/src/pages/editor-page/canvas/table-node/table-node-field.tsx+++ b/src/pages/editor-page/canvas/table-node/table-node-field.tsx@@ -227,7 +227,7 @@ export const TableNodeField: React.FC<TableNodeFieldProps> = React.memo(!readonly ? 'group-hover:hidden' : '')}>- {field.type.name}+ {field.type.name.split(' ')[0]}{field.nullable ? '?' : ''}</div>{readonly ? null : (diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field-modal/table-field-modal.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field-modal/table-field-modal.tsxindex 07da2671..5b3eb185 100644--- a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field-modal/table-field-modal.tsx+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field-modal/table-field-modal.tsx@@ -55,7 +55,13 @@ export const TableFieldPopover: React.FC<TableFieldPopoverProps> = ({}, [localField]);return (- <Popover onOpenChange={(isOpen) => !isOpen && setLocalField(field)}>+ <Popover+ onOpenChange={(isOpen) => {+ if (isOpen) {+ setLocalField(field);+ }+ }}+ ><PopoverTrigger asChild><Buttonvariant="ghost"diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsxindex 528b5c5a..1c191278 100644--- a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-field/table-field.tsx@@ -1,4 +1,4 @@-import React from 'react';+import React, { useCallback } from 'react';import { GripVertical, KeyRound } from 'lucide-react';import { Input } from '@/components/input/input';import type { DBField } from '@/lib/domain/db-field';@@ -16,6 +16,10 @@ import { useTranslation } from 'react-i18next';import { TableFieldToggle } from './table-field-toggle';import { useSortable } from '@dnd-kit/sortable';import { CSS } from '@dnd-kit/utilities';+import type {+ SelectBoxOption,+ SelectBoxProps,+} from '@/components/select-box/select-box';import { SelectBox } from '@/components/select-box/select-box';import { TableFieldPopover } from './table-field-modal/table-field-modal';@@ -36,10 +40,51 @@ export const TableField: React.FC<TableFieldProps> = ({const { attributes, listeners, setNodeRef, transform, transition } =useSortable({ id: field.id });- const dataFieldOptions = dataTypeMap[databaseType].map((type) => ({- label: type.name,- value: type.id,- }));+ const dataFieldOptions: SelectBoxOption[] = dataTypeMap[databaseType].map(+ (type) => ({+ label: type.name,+ value: type.id,+ regex: type.hasCharMaxLength+ ? `^${type.name}\\(\\d+\\)$`+ : undefined,+ extractRegex: type.hasCharMaxLength ? /\((\d+)\)/ : undefined,+ })+ );++ const onChangeDataType = useCallback<+ NonNullable<SelectBoxProps['onChange']>+ >(+ (value, regexMatches) => {+ const dataType = dataTypeMap[databaseType].find(+ (v) => v.id === value+ ) ?? {+ id: value as string,+ name: value as string,+ };++ let characterMaximumLength: string | undefined = undefined;++ if (regexMatches?.length && dataType?.hasCharMaxLength) {+ characterMaximumLength = regexMatches[1];+ } else if (+ field.characterMaximumLength &&+ dataType?.hasCharMaxLength+ ) {+ characterMaximumLength = field.characterMaximumLength;+ }++ updateField({+ characterMaximumLength,+ type: dataTypeDataToDataType(+ dataType ?? {+ id: value as string,+ name: value as string,+ }+ ),+ });+ },+ [updateField, databaseType, field.characterMaximumLength]+ );const style = {transform: CSS.Translate.toString(transform),@@ -90,26 +135,39 @@ export const TableField: React.FC<TableFieldProps> = ({'side_panel.tables_section.table.field_type')}value={field.type.id}- onChange={(value) =>- updateField({- characterMaximumLength: undefined,- type: dataTypeDataToDataType(- dataTypeMap[databaseType].find(- (v) => v.id === value- ) ?? {- id: value as string,- name: value as string,- }- ),- })+ valueSuffix={+ field.characterMaximumLength+ ? `(${field.characterMaximumLength})`+ : ''}+ optionSuffix={(option) => {+ const type = dataTypeMap[databaseType].find(+ (v) => v.id === option.value+ );++ if (!type) {+ return '';+ }++ if (type.hasCharMaxLength) {+ return `(${!field.characterMaximumLength ? 'n' : field.characterMaximumLength})`;+ }++ return '';+ }}+ onChange={onChangeDataType}emptyPlaceholder={t('side_panel.tables_section.table.no_types_found')}/></span></TooltipTrigger>- <TooltipContent>{field.type.name}</TooltipContent>+ <TooltipContent>+ {field.type.name}+ {field.characterMaximumLength+ ? `(${field.characterMaximumLength})`+ : ''}+ </TooltipContent></Tooltip></div><div className="flex w-4/12 justify-end gap-1 overflow-hidden">