Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
switch to selectbox instead of combobox + add translations + fix overflows
Guy Ben-Aharon3dc59b7e0a44
diff --git a/src/components/select-box/select-box.tsx b/src/components/select-box/select-box.tsxindex 9a93adf0..abdb92e8 100644--- a/src/components/select-box/select-box.tsx+++ b/src/components/select-box/select-box.tsx@@ -37,8 +37,7 @@ interface SelectBoxProps {oneLine?: boolean;selectAll?: boolean;deselectAll?: boolean;- onSelectAll?: () => void;- onDeselectAll?: () => void;+ clearText?: string;}export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(@@ -55,8 +54,7 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(oneLine,selectAll,deselectAll,- onSelectAll,- onDeselectAll,+ clearText,},ref) => {@@ -81,9 +79,17 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>();const handleClear = React.useCallback(() => {+ if (!multiple) return;+onChange?.(multiple ? [] : '');}, [multiple, onChange]);+ const handleSelectAll = React.useCallback(() => {+ if (!multiple) return;+ const allIds = options.map((option) => option.value);+ onChange?.(allIds);+ }, [multiple, onChange, options]);+const selectedMultipleOptions = React.useMemo(() =>options@@ -146,8 +152,13 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(selectedMultipleOptions)) : (- options.find((opt) => opt.value === value)- ?.label+ <div className="block w-full min-w-0 shrink-0 truncate">+ {+ options.find(+ (opt) => opt.value === value+ )?.label+ }+ </div>)) : (<span className="mr-auto text-muted-foreground">@@ -156,17 +167,20 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>()}</div><div className="flex items-center self-stretch pl-1 text-muted-foreground/60 hover:text-foreground [&>div]:flex [&>div]:items-center [&>div]:self-stretch">- {value && value.length > 0 ? (+ {value && value.length > 0 && multiple ? (<divonClick={(e) => {e.preventDefault();handleClear();}}>- <span className="text-xs">- {t('clear')}- </span>- {/* <Cross2Icon className="size-4" /> */}+ {clearText ? (+ <span className="text-xs">+ {clearText}+ </span>+ ) : (+ <Cross2Icon className="size-3.5" />+ )}</div>) : (<div>@@ -177,10 +191,16 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(</div></PopoverTrigger><PopoverContent- className="w-[var(--radix-popover-trigger-width)] p-0"- align="start"+ className="w-fit min-w-[var(--radix-popover-trigger-width)] p-0"+ align="center">- <Command>+ <Command+ filter={(value, search) =>+ value.toLowerCase().includes(search.toLowerCase())+ ? 1+ : 0+ }+ ><div className="relative"><CommandInputvalue={searchTerm}@@ -203,7 +223,10 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(!isAllSelected && (<divclassName="absolute inset-y-0 right-0 flex cursor-pointer items-center pr-3 text-xs text-muted-foreground hover:text-foreground"- onClick={() => onSelectAll?.()}+ onClick={(e) => {+ e.preventDefault();+ handleSelectAll();+ }}>{t('select_all')}</div>@@ -214,7 +237,10 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(isAllSelected && (<divclassName="absolute inset-y-0 right-0 flex cursor-pointer items-center pr-3 text-xs text-muted-foreground hover:text-foreground"- onClick={() => onDeselectAll?.()}+ onClick={(e) => {+ e.preventDefault();+ handleClear();+ }}>{t('deselect_all')}</div>@@ -255,7 +281,7 @@ export const SelectBox = React.forwardRef<HTMLInputElement, SelectBoxProps>(<CheckIcon /></div>)}- <div className="flex items-center">+ <div className="flex items-center truncate"><span>{option.label}</span>diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.tsindex b2a7b7fd..dfee92bc 100644--- a/src/i18n/locales/en.ts+++ b/src/i18n/locales/en.ts@@ -70,6 +70,10 @@ export const en = {clear: 'Clear',side_panel: {+ schema: 'Schema:',+ filter_by_schema: 'Filter by schema',+ search_schema: 'Search schema...',+ no_schemas_found: 'No schemas found.',view_all_options: 'View all Options...',tables_section: {tables: 'Tables',@@ -87,6 +91,7 @@ export const en = {add_field: 'Add Field',add_index: 'Add Index',index_select_fields: 'Select fields',+ no_types_found: 'No types found',field_name: 'Name',field_type: 'Type',field_actions: {diff --git a/src/i18n/locales/es.ts b/src/i18n/locales/es.tsindex f12fe439..0e42e409 100644--- a/src/i18n/locales/es.ts+++ b/src/i18n/locales/es.ts@@ -70,6 +70,10 @@ export const es: LanguageTranslation = {clear: 'Clear', // TODO: Translateside_panel: {+ schema: 'Schema:', // TODO: Translate+ filter_by_schema: 'Filter by schema', // TODO: Translate+ search_schema: 'Search schema...', // TODO: Translate+ no_schemas_found: 'No schemas found.', // TODO: Translateview_all_options: 'Ver todas las opciones...',tables_section: {tables: 'Tablas',@@ -89,6 +93,7 @@ export const es: LanguageTranslation = {index_select_fields: 'Seleccionar campos',field_name: 'Nombre',field_type: 'Tipo',+ no_types_found: 'No types found', // TODO: Translatefield_actions: {title: 'Atributos del Campo',unique: 'Único',diff --git a/src/pages/editor-page/side-panel/side-panel.tsx b/src/pages/editor-page/side-panel/side-panel.tsxindex 96a8bcaa..a1074021 100644--- a/src/pages/editor-page/side-panel/side-panel.tsx+++ b/src/pages/editor-page/side-panel/side-panel.tsx@@ -34,20 +34,12 @@ export const SidePanel: React.FC<SidePanelProps> = () => {[schemas]);- const deselectAllSchemas = () => {- filterSchemas([]);- };-- const selectAllSchemas = () => {- filterSchemas(schemas.map((schema) => schema.id));- };-return (<aside className="flex h-full flex-col overflow-hidden">{schemasOptions.length > 0 && (<div className="flex items-center justify-center border-b pl-3 pt-0.5"><div className="shrink-0 text-sm font-semibold">- Schema:+ {t('side_panel.schema')}</div><div className="flex min-w-0 flex-1"><SelectBox@@ -60,11 +52,10 @@ export const SidePanel: React.FC<SidePanelProps> = () => {onChange={(values) => {filterSchemas(values as string[]);}}- onSelectAll={selectAllSchemas}- onDeselectAll={deselectAllSchemas}- placeholder="Filter by schema"- inputPlaceholder="Search schema"- emptyPlaceholder="No schema found."+ placeholder={t('side_panel.filter_by_schema')}+ inputPlaceholder={t('side_panel.search_schema')}+ emptyPlaceholder={t('side_panel.no_schemas_found')}+ clearText={t('clear')}multiple/></div>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 b60885a4..bbe091d7 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,7 +1,6 @@import React from 'react';import { Ellipsis, GripVertical, Trash2 } from 'lucide-react';import { Input } from '@/components/input/input';-import { Combobox } from '@/components/combobox/combobox';import { Button } from '@/components/button/button';import { KeyRound } from 'lucide-react';import { Separator } from '@/components/separator/separator';@@ -26,6 +25,7 @@ import { Textarea } from '@/components/textarea/textarea';import { TableFieldToggle } from './table-field-toggle';import { useSortable } from '@dnd-kit/sortable';import { CSS } from '@dnd-kit/utilities';+import { SelectBox } from '@/components/select-box/select-box';export interface TableFieldProps {field: DBField;@@ -90,14 +90,13 @@ export const TableField: React.FC<TableFieldProps> = ({<Tooltip><TooltipTrigger className="flex h-8 !w-5/12" asChild><span>- <Combobox- className="flex h-8 w-full"- mode="single"+ <SelectBox+ className="flex h-8 min-h-8 w-full"options={dataFieldOptions}placeholder={t('side_panel.tables_section.table.field_type')}- selected={field.type.id}+ value={field.type.id}onChange={(value) =>updateField({type: dataTypeMap[databaseType].find(@@ -105,7 +104,9 @@ export const TableField: React.FC<TableFieldProps> = ({),})}- emptyText="No types found."+ emptyPlaceholder={t(+ 'side_panel.tables_section.table.no_types_found'+ )}/></span></TooltipTrigger>diff --git a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-index/table-index.tsx b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-index/table-index.tsxindex 418ea530..034269be 100644--- a/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-index/table-index.tsx+++ b/src/pages/editor-page/side-panel/tables-section/table-list/table-list-item/table-list-item-content/table-index/table-index.tsx@@ -1,6 +1,5 @@import React from 'react';import { Ellipsis, Trash2 } from 'lucide-react';-import { Combobox } from '@/components/combobox/combobox';import { Button } from '@/components/button/button';import { DBIndex } from '@/lib/domain/db-index';import { DBField } from '@/lib/domain/db-field';@@ -14,6 +13,7 @@ import { Checkbox } from '@/components/checkbox/checkbox';import { Label } from '@/components/label/label';import { Input } from '@/components/input/input';import { useTranslation } from 'react-i18next';+import { SelectBox } from '@/components/select-box/select-box';export interface TableIndexProps {index: DBIndex;@@ -39,19 +39,21 @@ export const TableIndex: React.FC<TableIndexProps> = ({};return (<div className="flex flex-1 flex-row justify-between gap-2 p-1">- <Combobox- className="flex h-8 flex-1"- popoverClassName="w-48"- mode="multiple"+ <SelectBox+ className="flex h-8 min-h-8 min-w-0 flex-1"+ multiple+ oneLineoptions={fieldOptions}placeholder={t('side_panel.tables_section.table.index_select_fields')}- selected={index.fieldIds}+ value={index.fieldIds}onChange={updateIndexFields}- emptyText="No types found."+ emptyPlaceholder={t(+ 'side_panel.tables_section.table.no_types_found'+ )}/>- <div className="flex">+ <div className="flex shrink-0"><Popover><PopoverTrigger asChild><Button