Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Implement phone and url field cell
Hakan Shehu9b0a5d8ec63b
diff --git a/desktop/package-lock.json b/desktop/package-lock.jsonindex 7a84e488..68f53145 100644--- a/desktop/package-lock.json+++ b/desktop/package-lock.json@@ -14,6 +14,7 @@"@radix-ui/react-checkbox": "^1.1.1","@radix-ui/react-dialog": "^1.1.1","@radix-ui/react-dropdown-menu": "^2.1.1",+ "@radix-ui/react-hover-card": "^1.1.1","@radix-ui/react-icons": "^1.3.0","@radix-ui/react-label": "^2.1.0","@radix-ui/react-popover": "^1.1.1",@@ -1952,6 +1953,37 @@}}},+ "node_modules/@radix-ui/react-hover-card": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-hover-card/-/react-hover-card-1.1.1.tgz",+ "integrity": "sha512-IwzAOP97hQpDADYVKrEEHUH/b2LA+9MgB0LgdmnbFO2u/3M5hmEofjjr2M6CyzUblaAqJdFm6B7oFtU72DPXrA==",+ "license": "MIT",+ "dependencies": {+ "@radix-ui/primitive": "1.1.0",+ "@radix-ui/react-compose-refs": "1.1.0",+ "@radix-ui/react-context": "1.1.0",+ "@radix-ui/react-dismissable-layer": "1.1.0",+ "@radix-ui/react-popper": "1.2.0",+ "@radix-ui/react-portal": "1.1.1",+ "@radix-ui/react-presence": "1.1.0",+ "@radix-ui/react-primitive": "2.0.0",+ "@radix-ui/react-use-controllable-state": "1.1.0"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },"node_modules/@radix-ui/react-icons": {"version": "1.3.0","resolved": "https://registry.npmjs.org/@radix-ui/react-icons/-/react-icons-1.3.0.tgz",diff --git a/desktop/package.json b/desktop/package.jsonindex 2d7cb3ff..b6c37f14 100644--- a/desktop/package.json+++ b/desktop/package.json@@ -54,6 +54,7 @@"@radix-ui/react-checkbox": "^1.1.1","@radix-ui/react-dialog": "^1.1.1","@radix-ui/react-dropdown-menu": "^2.1.1",+ "@radix-ui/react-hover-card": "^1.1.1","@radix-ui/react-icons": "^1.3.0","@radix-ui/react-label": "^2.1.0","@radix-ui/react-popover": "^1.1.1",diff --git a/desktop/src/components/databases/tables/cells/table-view-multi-select-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-multi-select-cell.tsxnew file mode 100644index 00000000..c7369246--- /dev/null+++ b/desktop/src/components/databases/tables/cells/table-view-multi-select-cell.tsx@@ -0,0 +1,118 @@+import React from 'react';+import { MultiSelectField, RecordNode } from '@/types/databases';+import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';+import {+ Popover,+ PopoverTrigger,+ PopoverContent,+} from '@/components/ui/popover';+import { SelectFieldOptions } from '@/components/databases/fields/select-field-options';+import { useMutation } from '@tanstack/react-query';+import { useWorkspace } from '@/contexts/workspace';+import { NeuronId } from '@/lib/id';+import { sql } from 'kysely';++const getMultiSelectValues = (+ record: RecordNode,+ field: MultiSelectField,+): string[] => {+ const attrs = record.attrs;+ if (!attrs) {+ return [];+ }++ const fieldValue = attrs[field.id];+ return Array.isArray(fieldValue) ? fieldValue : [];+};++interface TableViewMultiSelectCellProps {+ record: RecordNode;+ field: MultiSelectField;+}++export const TableViewMultiSelectCell = ({+ record,+ field,+}: TableViewMultiSelectCellProps) => {+ const workspace = useWorkspace();+ const { mutate, isPending } = useMutation({+ mutationFn: async (newValues: string[]) => {+ if (newValues.length > 0) {+ const values = JSON.stringify(newValues);+ const query = sql`+ UPDATE nodes+ SET attrs = json_set(coalesce(attrs, '{}'), '$.${sql.ref(field.id)}', ${sql.raw(values)}),+ updated_at = ${new Date().toISOString()},+ updated_by = ${workspace.userId},+ version_id = ${NeuronId.generate(NeuronId.Type.Version)}+ WHERE id = ${record.id}+ `.compile(workspace.schema);++ await workspace.mutate(query);+ } else {+ const query = sql`+ UPDATE nodes+ SET attrs = json_remove(attrs, '$.${sql.ref(field.id)}'),+ updated_at = ${new Date().toISOString()},+ updated_by = ${workspace.userId},+ version_id = ${NeuronId.generate(NeuronId.Type.Version)}+ WHERE id = ${record.id} AND attrs IS NOT NULL+ `.compile(workspace.schema);++ await workspace.mutate(query);+ }+ },+ });++ const [open, setOpen] = React.useState(false);+ const values = getMultiSelectValues(record, field);+ const [selectedValues, setSelectedValues] = React.useState(values);++ React.useEffect(() => {+ setSelectedValues(getMultiSelectValues(record, field));+ }, [record.versionId]);++ const selectedOptions = field.options?.filter((option) =>+ selectedValues.includes(option.id),+ );++ return (+ <Popover open={open} onOpenChange={setOpen}>+ <PopoverTrigger asChild>+ <div className="flex h-full w-full cursor-pointer flex-wrap gap-1 p-1">+ {selectedOptions?.map((option) => (+ <SelectOptionBadge+ key={option.id}+ name={option.name}+ color={option.color}+ />+ ))}+ {selectedOptions?.length === 0 && ' '}+ </div>+ </PopoverTrigger>+ <PopoverContent className="w-80 p-1">+ <SelectFieldOptions+ field={field}+ values={selectedValues}+ onSelect={(id) => {+ if (isPending) return;++ let newValues: string[];+ if (selectedValues.includes(id)) {+ newValues = selectedValues.filter((v) => v !== id);+ } else {+ newValues = [...selectedValues, id];+ }++ setSelectedValues(newValues);+ mutate(newValues, {+ onSuccess: () => {+ setOpen(false);+ },+ });+ }}+ />+ </PopoverContent>+ </Popover>+ );+};diff --git a/desktop/src/components/databases/tables/cells/table-view-phone-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-phone-cell.tsxnew file mode 100644index 00000000..1659bf27--- /dev/null+++ b/desktop/src/components/databases/tables/cells/table-view-phone-cell.tsx@@ -0,0 +1,95 @@+import React from 'react';+import isHotkey from 'is-hotkey';++import { useMutation } from '@tanstack/react-query';+import { useWorkspace } from '@/contexts/workspace';+import { NeuronId } from '@/lib/id';+import { RecordNode, PhoneField } from '@/types/databases';+import { sql } from 'kysely';++const getPhoneValue = (record: RecordNode, field: PhoneField): string => {+ const attrs = record.attrs;++ if (!attrs) {+ return '';+ }++ const fieldValue = attrs[field.id];++ if (typeof fieldValue === 'string') {+ return fieldValue;+ }++ return '';+};++interface TableViewPhoneCellProps {+ record: RecordNode;+ field: PhoneField;+}++export const TableViewPhoneCell = ({+ record,+ field,+}: TableViewPhoneCellProps) => {+ const workspace = useWorkspace();+ const { mutate, isPending } = useMutation({+ mutationFn: async (newValue: string) => {+ if (newValue.length > 0) {+ const query = sql`+ UPDATE nodes+ SET attrs = json_set(coalesce(attrs, '{}'), '$.${field.id}', ${newValue}),+ updated_at = ${new Date().toISOString()},+ updated_by = ${workspace.userId},+ version_id = ${NeuronId.generate(NeuronId.Type.Version)}+ WHERE id = ${record.id}+ `.compile(workspace.schema);++ await workspace.mutate(query);+ } else {+ const query = sql`+ UPDATE nodes+ SET attrs = json_remove(attrs, '$.${sql.ref(field.id)}'),+ updated_at = ${new Date().toISOString()},+ updated_by = ${workspace.userId},+ version_id = ${NeuronId.generate(NeuronId.Type.Version)}+ WHERE id = ${record.id} AND attrs IS NOT NULL+ `.compile(workspace.schema);++ await workspace.mutate(query);+ }+ },+ });++ const canEdit = true;++ const [text, setText] = React.useState<string>(+ getPhoneValue(record, field) ?? '',+ );++ React.useEffect(() => {+ setText(getPhoneValue(record, field) ?? '');+ }, [record.versionId]);++ const saveIfChanged = (current: string, previous: string | null) => {+ if (current.length && current !== previous) {+ mutate(current);+ }+ };++ return (+ <input+ value={text}+ readOnly={!canEdit || isPending}+ onChange={(e) => setText(e.target.value)}+ onBlur={() => saveIfChanged(text, getPhoneValue(record, field))}+ onKeyDown={(e) => {+ if (isHotkey('enter', e)) {+ saveIfChanged(text, getPhoneValue(record, field));+ e.preventDefault();+ }+ }}+ className="flex h-full w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm focus-visible:cursor-text"+ />+ );+};diff --git a/desktop/src/components/databases/tables/cells/table-view-url-cell.tsx b/desktop/src/components/databases/tables/cells/table-view-url-cell.tsxnew file mode 100644index 00000000..01166d7b--- /dev/null+++ b/desktop/src/components/databases/tables/cells/table-view-url-cell.tsx@@ -0,0 +1,132 @@+import React from 'react';+import isHotkey from 'is-hotkey';++import { useMutation } from '@tanstack/react-query';+import { useWorkspace } from '@/contexts/workspace';+import { NeuronId } from '@/lib/id';+import { RecordNode, UrlField } from '@/types/databases';+import { sql } from 'kysely';+import { cn, isValidUrl } from '@/lib/utils';+import {+ HoverCard,+ HoverCardContent,+ HoverCardTrigger,+} from '@/components/ui/hover-card';+import { Icon } from '@/components/ui/icon';++const getUrlValue = (record: RecordNode, field: UrlField): string => {+ const attrs = record.attrs;++ if (!attrs) {+ return '';+ }++ const fieldValue = attrs[field.id];++ if (typeof fieldValue === 'string') {+ return fieldValue;+ }++ return '';+};++interface TableViewUrlCellProps {+ record: RecordNode;+ field: UrlField;+ className?: string;+}++export const TableViewUrlCell = ({+ record,+ field,+ className,+}: TableViewUrlCellProps) => {+ const workspace = useWorkspace();+ const { mutate, isPending } = useMutation({+ mutationFn: async (newValue: string) => {+ if (newValue.length > 0) {+ const query = sql`+ UPDATE nodes+ SET attrs = json_set(coalesce(attrs, '{}'), '$.${field.id}', ${newValue}),+ updated_at = ${new Date().toISOString()},+ updated_by = ${workspace.userId},+ version_id = ${NeuronId.generate(NeuronId.Type.Version)}+ WHERE id = ${record.id}+ `.compile(workspace.schema);++ await workspace.mutate(query);+ } else {+ const query = sql`+ UPDATE nodes+ SET attrs = json_remove(attrs, '$.${sql.ref(field.id)}'),+ updated_at = ${new Date().toISOString()},+ updated_by = ${workspace.userId},+ version_id = ${NeuronId.generate(NeuronId.Type.Version)}+ WHERE id = ${record.id} AND attrs IS NOT NULL+ `.compile(workspace.schema);++ await workspace.mutate(query);+ }+ },+ });++ const canEdit = true;++ const [text, setText] = React.useState<string>(+ getUrlValue(record, field) ?? '',+ );++ React.useEffect(() => {+ setText(getUrlValue(record, field) ?? '');+ }, [record.versionId]);++ const saveIfChanged = (current: string, previous: string | null) => {+ if (current.length && current !== previous) {+ mutate(current);+ }+ };++ const isUrl = text.length > 0 && isValidUrl(text);++ return (+ <HoverCard openDelay={300}>+ <HoverCardTrigger>+ <input+ value={text}+ readOnly={!canEdit || isPending}+ onChange={(e) => setText(e.target.value)}+ onBlur={() => saveIfChanged(text, getUrlValue(record, field))}+ onKeyDown={(e) => {+ if (isHotkey('enter', e)) {+ saveIfChanged(text, getUrlValue(record, field));+ e.preventDefault();+ }+ }}+ className={cn(+ 'flex h-full w-full cursor-pointer flex-row items-center gap-1 p-1 text-sm focus-visible:cursor-text',+ className,+ )}+ />+ </HoverCardTrigger>+ <HoverCardContent+ className={cn(+ 'flex w-full min-w-80 max-w-128 flex-row items-center justify-between gap-2 text-ellipsis',+ !isUrl && 'hidden',+ )}+ >+ <a+ className="text-blue-500 underline hover:cursor-pointer hover:text-blue-600"+ href={text}+ target="_blank"+ rel="noreferrer"+ >+ {text}+ </a>+ <Icon+ name="external-link-line"+ className="h-4 min-h-4 w-4 min-w-4 text-muted-foreground"+ />+ </HoverCardContent>+ </HoverCard>+ );+};diff --git a/desktop/src/components/databases/tables/table-view-field-cell.tsx b/desktop/src/components/databases/tables/table-view-field-cell.tsxindex 5a01d04b..756b50b9 100644--- a/desktop/src/components/databases/tables/table-view-field-cell.tsx+++ b/desktop/src/components/databases/tables/table-view-field-cell.tsx@@ -6,6 +6,10 @@ import { TableViewBooleanCell } from '@/components/databases/tables/cells/table-import { TableViewCreatedAtCell } from '@/components/databases/tables/cells/table-view-created-at-cell';import { TableViewCreatedByCell } from '@/components/databases/tables/cells/table-view-created-by-cell';import { TableViewSelectCell } from '@/components/databases/tables/cells/table-view-select-cell';+import { TableViewPhoneCell } from '@/components/databases/tables/cells/table-view-phone-cell';+import { TableViewEmailCell } from '@/components/databases/tables/cells/table-view-email-cell';+import { TableViewUrlCell } from '@/components/databases/tables/cells/table-view-url-cell';+import { TableViewMultiSelectCell } from '@/components/databases/tables/cells/table-view-multi-select-cell';interface TableViewFieldCellProps {record: RecordNode;@@ -29,5 +33,13 @@ export const TableViewFieldCell = ({return <TableViewCreatedByCell record={record} field={field} />;case 'select':return <TableViewSelectCell record={record} field={field} />;+ case 'phone':+ return <TableViewPhoneCell record={record} field={field} />;+ case 'email':+ return <TableViewEmailCell record={record} field={field} />;+ case 'url':+ return <TableViewUrlCell record={record} field={field} />;+ case 'multi_select':+ return <TableViewMultiSelectCell record={record} field={field} />;}};diff --git a/desktop/src/components/ui/hover-card.tsx b/desktop/src/components/ui/hover-card.tsxnew file mode 100644index 00000000..863ff014--- /dev/null+++ b/desktop/src/components/ui/hover-card.tsx@@ -0,0 +1,27 @@+import * as React from "react"+import * as HoverCardPrimitive from "@radix-ui/react-hover-card"++import { cn } from "@/lib/utils"++const HoverCard = HoverCardPrimitive.Root++const HoverCardTrigger = HoverCardPrimitive.Trigger++const HoverCardContent = React.forwardRef<+ React.ElementRef<typeof HoverCardPrimitive.Content>,+ React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content>+>(({ className, align = "center", sideOffset = 4, ...props }, ref) => (+ <HoverCardPrimitive.Content+ ref={ref}+ align={align}+ sideOffset={sideOffset}+ className={cn(+ "z-50 w-64 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",+ className+ )}+ {...props}+ />+))+HoverCardContent.displayName = HoverCardPrimitive.Content.displayName++export { HoverCard, HoverCardTrigger, HoverCardContent }diff --git a/desktop/src/lib/utils.ts b/desktop/src/lib/utils.tsindex a0edcb3f..5647aab6 100644--- a/desktop/src/lib/utils.ts+++ b/desktop/src/lib/utils.ts@@ -125,3 +125,12 @@ export const compareString = (a?: string | null, b?: string | null): number => {return -1;};++export const isValidUrl = (url: string) => {+ try {+ new URL(url);+ return true;+ } catch (err) {+ return false;+ }+};