Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Implement field rename

Hakan Shehu15a2a4483141
diff --git a/desktop/src/components/databases/fields/field-rename-input.tsx b/desktop/src/components/databases/fields/field-rename-input.tsx
new file mode 100644
index 00000000..92debdc5
--- /dev/null
+++ b/desktop/src/components/databases/fields/field-rename-input.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import isHotkey from 'is-hotkey';
+import { Input } from '@/components/ui/input';
+import { Field } from '@/types/databases';
+import { useWorkspace } from '@/contexts/workspace';
+import { useMutation } from '@tanstack/react-query';
+import { NeuronId } from '@/lib/id';
+import { sql } from 'kysely';
+
+interface FieldRenameInputProps {
+ field: Field;
+}
+
+export const FieldRenameInput = ({ field }: FieldRenameInputProps) => {
+ const workspace = useWorkspace();
+ const [name, setName] = React.useState(field.name);
+
+ const { mutate, isPending } = useMutation({
+ mutationFn: async (newName: string) => {
+ const query = sql`
+ UPDATE nodes
+ SET attrs = json_set(attrs, '$.name', ${newName}),
+ updated_at = ${new Date().toISOString()},
+ updated_by = ${workspace.userId},
+ version_id = ${NeuronId.generate(NeuronId.Type.Version)}
+ WHERE id = ${field.id}
+ `.compile(workspace.schema);
+
+ await workspace.mutate(query);
+ },
+ });
+
+ return (
+ <div className="w-full p-1">
+ <Input
+ value={name}
+ onChange={(e) => {
+ setName(e.target.value);
+ }}
+ onBlur={() => {
+ if (name !== field.name && !isPending) {
+ mutate(name);
+ }
+ }}
+ onKeyDown={(e) => {
+ if (isHotkey('enter', e) && name !== field.name && !isPending) {
+ mutate(name);
+ }
+ }}
+ />
+ </div>
+ );
+};
diff --git a/desktop/src/components/databases/fields/select-option-settings-popover.tsx b/desktop/src/components/databases/fields/select-option-settings-popover.tsx
index b7d647c6..9b34c367 100644
--- a/desktop/src/components/databases/fields/select-option-settings-popover.tsx
+++ b/desktop/src/components/databases/fields/select-option-settings-popover.tsx
@@ -74,7 +74,7 @@ export const SelectOptionSettingsPopover = ({
setName(e.target.value);
}}
onBlur={() => {
- if (name !== option.name) {
+ if (name !== option.name && !isPending) {
mutate({
name,
color: option.color,
@@ -83,7 +83,7 @@ export const SelectOptionSettingsPopover = ({
}}
onKeyDown={(e) => {
if (isHotkey('enter', e)) {
- if (name !== option.name) {
+ if (name !== option.name && !isPending) {
mutate({
name,
color: option.color,
diff --git a/desktop/src/components/databases/tables/table-view-field-header.tsx b/desktop/src/components/databases/tables/table-view-field-header.tsx
index a745197b..34a83c17 100644
--- a/desktop/src/components/databases/tables/table-view-field-header.tsx
+++ b/desktop/src/components/databases/tables/table-view-field-header.tsx
@@ -4,15 +4,15 @@ import { cn } from '@/lib/utils';
import { getDefaultFieldWidth, getFieldIcon } from '@/lib/databases';
import { useDrag, useDrop } from 'react-dnd';
import { Resizable } from 're-resizable';
+import { Field } from '@/types/databases';
import {
Popover,
PopoverContent,
PopoverTrigger,
} from '@/components/ui/popover';
import { Separator } from '@/components/ui/separator';
-import { Input } from '@/components/ui/input';
import { FieldDeleteDialog } from '@/components/databases/fields/field-delete-dialog';
-import { Field } from '@/types/databases';
+import { FieldRenameInput } from '@/components/databases/fields/field-rename-input';
interface TableViewFieldHeaderProps {
field: Field;
@@ -116,15 +116,7 @@ export const TableViewFieldHeader = ({
</div>
</PopoverTrigger>
<PopoverContent className="ml-1 flex w-72 flex-col gap-1 p-2 text-sm">
- <div className="p-1">
- <Input
- value={field.name}
- onChange={(e) => {
- // setName(e.target.value);
- // updateName(e.target.value);
- }}
- />
- </div>
+ <FieldRenameInput field={field} />
<Separator />
{true && (
<>