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
Remove duplicate components for record field values
Hakan Shehuaa3ab40c00ee
diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-boolean-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/cells/table-view-boolean-cell.tsxdeleted file mode 100644index d4f5fcb4..00000000--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-boolean-cell.tsx+++ /dev/null@@ -1,40 +0,0 @@-import React from 'react';-import { Checkbox } from '@/renderer/components/ui/checkbox';-import { BooleanFieldAttributes } from '@colanode/core';-import { useRecord } from '@/renderer/contexts/record';--interface TableViewBooleanCellProps {- field: BooleanFieldAttributes;-}--export const TableViewBooleanCell = ({ field }: TableViewBooleanCellProps) => {- const record = useRecord();-- const [input, setInput] = React.useState<boolean>(- record.getBooleanValue(field)- );-- React.useEffect(() => {- setInput(record.getBooleanValue(field));- }, [record.versionId]);-- return (- <div className="flex h-full w-full flex-row items-center justify-center p-1">- <Checkbox- checked={input}- disabled={!record.canEdit}- onCheckedChange={(e) => {- if (!record.canEdit) return;-- if (typeof e === 'boolean') {- setInput(e.valueOf());- record.updateFieldValue(field, {- type: 'boolean',- value: e.valueOf(),- });- }- }}- />- </div>- );-};diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-created-at-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/cells/table-view-created-at-cell.tsxdeleted file mode 100644index 0a3b5095..00000000--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-created-at-cell.tsx+++ /dev/null@@ -1,21 +0,0 @@-import { CreatedAtFieldAttributes } from '@colanode/core';-import { useRecord } from '@/renderer/contexts/record';--interface TableViewCreatedAtCellProps {- field: CreatedAtFieldAttributes;-}--export const TableViewCreatedAtCell = ({- field,-}: TableViewCreatedAtCellProps) => {- const record = useRecord();-- const createdAt = new Date(record.createdAt);- return (- <div className="h-full w-full p-1 text-sm" data-field={field.id}>- <p>- {createdAt.toLocaleDateString()} {createdAt.toLocaleTimeString()}- </p>- </div>- );-};diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-created-by-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/cells/table-view-created-by-cell.tsxdeleted file mode 100644index bcbdca83..00000000--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-created-by-cell.tsx+++ /dev/null@@ -1,48 +0,0 @@-import { Avatar } from '@/renderer/components/avatars/avatar';-import { CreatedByFieldAttributes } from '@colanode/core';-import { useQuery } from '@/renderer/hooks/use-query';-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useRecord } from '@/renderer/contexts/record';--interface TableViewCreatedByCellProps {- field: CreatedByFieldAttributes;-}--export const TableViewCreatedByCell = ({- field,-}: TableViewCreatedByCellProps) => {- const workspace = useWorkspace();- const record = useRecord();-- const { data } = useQuery({- type: 'node_get',- nodeId: record.createdBy,- userId: workspace.userId,- });-- const createdBy =- data && data.attributes.type === 'user'- ? {- name: data.attributes.name,- avatar: data.attributes.avatar,- }- : {- name: 'Unknown',- avatar: null,- };-- return (- <div- className="flex h-full w-full flex-row items-center gap-1 p-1 text-sm"- data-field={field.id}- >- <Avatar- id={record.createdBy}- name={createdBy.name}- avatar={createdBy.avatar}- size="small"- />- <p>{createdBy.name}</p>- </div>- );-};diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-email-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/cells/table-view-email-cell.tsxdeleted file mode 100644index a8400450..00000000--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-email-cell.tsx+++ /dev/null@@ -1,31 +0,0 @@-import { EmailFieldAttributes } from '@colanode/core';-import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';-import { useRecord } from '@/renderer/contexts/record';--interface TableViewEmailCellProps {- field: EmailFieldAttributes;-}--export const TableViewEmailCell = ({ field }: TableViewEmailCellProps) => {- const record = useRecord();-- return (- <SmartTextInput- value={record.getEmailValue(field)}- readOnly={!record.canEdit}- onChange={(newValue) => {- if (!record.canEdit) return;-- if (newValue === null || newValue === '') {- record.removeFieldValue(field);- } else {- record.updateFieldValue(field, {- type: 'email',- value: newValue,- });- }- }}- className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text"- />- );-};diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-multi-select-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/cells/table-view-multi-select-cell.tsxdeleted file mode 100644index 7ff749d6..00000000--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-multi-select-cell.tsx+++ /dev/null@@ -1,91 +0,0 @@-import React from 'react';-import { MultiSelectFieldAttributes } from '@colanode/core';-import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';-import {- Popover,- PopoverTrigger,- PopoverContent,-} from '@/renderer/components/ui/popover';-import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';-import { useRecord } from '@/renderer/contexts/record';--interface TableViewMultiSelectCellProps {- field: MultiSelectFieldAttributes;-}--export const TableViewMultiSelectCell = ({- field,-}: TableViewMultiSelectCellProps) => {- const record = useRecord();-- const [open, setOpen] = React.useState(false);- const [selectedValues, setSelectedValues] = React.useState(- record.getMultiSelectValue(field)- );-- React.useEffect(() => {- setSelectedValues(record.getMultiSelectValue(field));- }, [record.versionId]);-- const selectOptions = Object.values(field.options ?? {});- const selectedOptions = selectOptions.filter((option) =>- selectedValues.includes(option.id)- );-- if (!record.canEdit) {- return (- <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>- );- }-- 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 (!record.canEdit) return;-- const newValues = selectedValues.includes(id)- ? selectedValues.filter((v) => v !== id)- : [...selectedValues, id];-- setSelectedValues(newValues);-- if (newValues.length === 0) {- record.removeFieldValue(field);- } else {- record.updateFieldValue(field, {- type: 'multiSelect',- value: newValues,- });- }- }}- allowAdd={true}- />- </PopoverContent>- </Popover>- );-};diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-number-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/cells/table-view-number-cell.tsxdeleted file mode 100644index 33110d41..00000000--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-number-cell.tsx+++ /dev/null@@ -1,35 +0,0 @@-import { NumberFieldAttributes } from '@colanode/core';-import { SmartNumberInput } from '@/renderer/components/ui/smart-number-input';-import { useRecord } from '@/renderer/contexts/record';--interface TableViewNumberCellProps {- field: NumberFieldAttributes;-}--export const TableViewNumberCell = ({ field }: TableViewNumberCellProps) => {- const record = useRecord();-- return (- <SmartNumberInput- value={record.getNumberValue(field)}- readOnly={!record.canEdit}- onChange={(newValue) => {- if (!record.canEdit) return;-- if (newValue === record.getNumberValue(field)) {- return;- }-- if (newValue === null) {- record.removeFieldValue(field);- } else {- record.updateFieldValue(field, {- type: 'number',- value: newValue,- });- }- }}- className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text"- />- );-};diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-phone-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/cells/table-view-phone-cell.tsxdeleted file mode 100644index 3ff382ca..00000000--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-phone-cell.tsx+++ /dev/null@@ -1,35 +0,0 @@-import { PhoneFieldAttributes } from '@colanode/core';-import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';-import { useRecord } from '@/renderer/contexts/record';--interface TableViewPhoneCellProps {- field: PhoneFieldAttributes;-}--export const TableViewPhoneCell = ({ field }: TableViewPhoneCellProps) => {- const record = useRecord();-- return (- <SmartTextInput- value={record.getPhoneValue(field)}- readOnly={!record.canEdit}- onChange={(newValue) => {- if (!record.canEdit) return;-- if (newValue === record.getPhoneValue(field)) {- return;- }-- if (newValue === null || newValue === '') {- record.removeFieldValue(field);- } else {- record.updateFieldValue(field, {- type: 'phone',- value: newValue,- });- }- }}- className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text"- />- );-};diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-select-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/cells/table-view-select-cell.tsxdeleted file mode 100644index 1d24b2cb..00000000--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-select-cell.tsx+++ /dev/null@@ -1,85 +0,0 @@-import React from 'react';-import { SelectFieldAttributes } from '@colanode/core';-import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';-import {- Popover,- PopoverTrigger,- PopoverContent,-} from '@/renderer/components/ui/popover';-import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';-import { useRecord } from '@/renderer/contexts/record';--interface TableViewSelectCellProps {- field: SelectFieldAttributes;-}--export const TableViewSelectCell = ({ field }: TableViewSelectCellProps) => {- const record = useRecord();- const [open, setOpen] = React.useState(false);- const [selectedValue, setSelectedValue] = React.useState(- record.getSelectValue(field)- );-- React.useEffect(() => {- setSelectedValue(record.getSelectValue(field));- }, [record.versionId]);-- const selectOptions = Object.values(field.options ?? {});- const selectedOption = selectOptions.find(- (option) => option.id === selectedValue- );-- if (!record.canEdit) {- return (- <div className="h-full w-full cursor-pointer p-1">- {selectedOption ? (- <SelectOptionBadge- name={selectedOption.name}- color={selectedOption.color}- />- ) : (- ' '- )}- </div>- );- }-- return (- <Popover open={open} onOpenChange={setOpen}>- <PopoverTrigger asChild>- <div className="h-full w-full cursor-pointer p-1">- {selectedOption ? (- <SelectOptionBadge- name={selectedOption.name}- color={selectedOption.color}- />- ) : (- ' '- )}- </div>- </PopoverTrigger>- <PopoverContent className="w-80 p-1">- <SelectFieldOptions- field={field}- values={selectedValue ? [selectedValue] : []}- allowAdd={true}- onSelect={(id) => {- if (!record.canEdit) return;-- if (selectedValue === id) {- setSelectedValue('');- record.removeFieldValue(field);- } else {- record.updateFieldValue(field, {- type: 'select',- value: id,- });- setOpen(false);- }- setSelectedValue(id);- }}- />- </PopoverContent>- </Popover>- );-};diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-text-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/cells/table-view-text-cell.tsxdeleted file mode 100644index 5d64b0aa..00000000--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-text-cell.tsx+++ /dev/null@@ -1,35 +0,0 @@-import { TextFieldAttributes } from '@colanode/core';-import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';-import { useRecord } from '@/renderer/contexts/record';--interface TableViewTextCellProps {- field: TextFieldAttributes;-}--export const TableViewTextCell = ({ field }: TableViewTextCellProps) => {- const record = useRecord();-- return (- <SmartTextInput- value={record.getTextValue(field)}- readOnly={!record.canEdit}- onChange={(newValue) => {- if (!record.canEdit) return;-- if (newValue === record.getTextValue(field)) {- return;- }-- if (newValue === null || newValue === '') {- record.removeFieldValue(field);- } else {- record.updateFieldValue(field, {- type: 'text',- value: newValue,- });- }- }}- className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text"- />- );-};diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-url-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/cells/table-view-url-cell.tsxdeleted file mode 100644index 1f003c69..00000000--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-url-cell.tsx+++ /dev/null@@ -1,65 +0,0 @@-import { UrlFieldAttributes } from '@colanode/core';-import { cn, isValidUrl } from '@/shared/lib/utils';-import {- HoverCard,- HoverCardContent,- HoverCardTrigger,-} from '@/renderer/components/ui/hover-card';-import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';-import { ExternalLink } from 'lucide-react';-import { useRecord } from '@/renderer/contexts/record';--interface TableViewUrlCellProps {- field: UrlFieldAttributes;-}--export const TableViewUrlCell = ({ field }: TableViewUrlCellProps) => {- const record = useRecord();-- const text = record.getUrlValue(field);- const isUrl = text && isValidUrl(text);-- return (- <HoverCard openDelay={300}>- <HoverCardTrigger>- <SmartTextInput- value={text}- readOnly={!record.canEdit}- onChange={(newValue) => {- if (!record.canEdit) return;-- if (newValue === text) {- return;- }-- if (newValue === null || newValue === '') {- record.removeFieldValue(field);- } else {- record.updateFieldValue(field, {- type: 'url',- value: newValue,- });- }- }}- className="flex h-full w-full cursor-pointer flex-row items-center gap-1 border-none p-1 text-sm focus-visible:cursor-text"- />- </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>- <ExternalLink className="size-4 min-h-4 min-w-4 text-muted-foreground" />- </HoverCardContent>- </HoverCard>- );-};diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-field-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-field-cell.tsxdeleted file mode 100644index 4a76abf8..00000000--- a/apps/desktop/src/renderer/components/databases/tables/table-view-field-cell.tsx+++ /dev/null@@ -1,50 +0,0 @@-import { RecordNode, FieldAttributes } from '@colanode/core';-import { TableViewTextCell } from '@/renderer/components/databases/tables/cells/table-view-text-cell';-import { TableViewNumberCell } from '@/renderer/components/databases/tables/cells/table-view-number-cell';-import { TableViewBooleanCell } from '@/renderer/components/databases/tables/cells/table-view-boolean-cell';-import { TableViewCreatedAtCell } from '@/renderer/components/databases/tables/cells/table-view-created-at-cell';-import { TableViewCreatedByCell } from '@/renderer/components/databases/tables/cells/table-view-created-by-cell';-import { TableViewSelectCell } from '@/renderer/components/databases/tables/cells/table-view-select-cell';-import { TableViewPhoneCell } from '@/renderer/components/databases/tables/cells/table-view-phone-cell';-import { TableViewEmailCell } from '@/renderer/components/databases/tables/cells/table-view-email-cell';-import { TableViewUrlCell } from '@/renderer/components/databases/tables/cells/table-view-url-cell';-import { TableViewMultiSelectCell } from '@/renderer/components/databases/tables/cells/table-view-multi-select-cell';-import { TableViewDateCell } from '@/renderer/components/databases/tables/cells/table-view-date-cell';--interface TableViewFieldCellProps {- record: RecordNode;- field: FieldAttributes;-}--export const TableViewFieldCell = ({ field }: TableViewFieldCellProps) => {- switch (field.type) {- case 'text':- return <TableViewTextCell field={field} />;- case 'number':- return <TableViewNumberCell field={field} />;- case 'boolean':- return <TableViewBooleanCell field={field} />;- case 'createdAt':- return <TableViewCreatedAtCell field={field} />;- case 'createdBy':- return <TableViewCreatedByCell field={field} />;- case 'select':- return <TableViewSelectCell field={field} />;- case 'phone':- return <TableViewPhoneCell field={field} />;- case 'email':- return <TableViewEmailCell field={field} />;- case 'url':- return <TableViewUrlCell field={field} />;- case 'multiSelect':- return <TableViewMultiSelectCell field={field} />;- case 'collaborator':- return null;- case 'date':- return <TableViewDateCell field={field} />;- case 'file':- return null;- default:- return null;- }-};diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsxindex d6eece01..77b7cf27 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsx@@ -1,5 +1,5 @@import { TableViewNameCell } from '@/renderer/components/databases/tables/table-view-name-cell';-import { TableViewFieldCell } from '@/renderer/components/databases/tables/table-view-field-cell';+import { RecordFieldValue } from '@/renderer/components/records/record-field-value';import { extractNodeRole, RecordNode } from '@colanode/core';import { useView } from '@/renderer/contexts/view';import { RecordProvider } from '@/renderer/components/records/record-provider';@@ -39,7 +39,7 @@ export const TableViewRow = ({ index, record }: TableViewRowProps) => {className="h-8 border-r"style={{ width: `${field.width}px` }}>- <TableViewFieldCell record={record} field={field.field} />+ <RecordFieldValue field={field.field} /></div>);})}diff --git a/apps/desktop/src/renderer/components/records/record-attributes.tsx b/apps/desktop/src/renderer/components/records/record-attributes.tsxindex f4e5e74e..3c0b82c7 100644--- a/apps/desktop/src/renderer/components/records/record-attributes.tsx+++ b/apps/desktop/src/renderer/components/records/record-attributes.tsx@@ -1,3 +1,4 @@+import React from 'react';import { RecordName } from '@/renderer/components/records/record-name';import { useDatabase } from '@/renderer/contexts/database';import { RecordField } from '@/renderer/components/records/record-field';@@ -13,17 +14,19 @@ export const RecordAttributes = () => {<RecordAvatar /><RecordName /></div>- <div className="flex flex-row gap-2">- <div className="flex w-60 flex-col gap-2">- {database.fields.map((field) => (- <RecordField key={field.id} field={field} />- ))}- </div>- <div className="flex flex-1 flex-col gap-2">- {database.fields.map((field) => {- return <RecordFieldValue key={`value-${field.id}`} field={field} />;- })}- </div>+ <div className="flex flex-col gap-2">+ {database.fields.map((field) => (+ <React.Fragment key={field.id}>+ <div className="flex flex-row gap-2 h-8">+ <div className="w-60 max-w-60">+ <RecordField field={field} />+ </div>+ <div className="flex-1 max-w-128">+ <RecordFieldValue field={field} />+ </div>+ </div>+ </React.Fragment>+ ))}</div></div>);diff --git a/apps/desktop/src/renderer/components/records/record-field-value.tsx b/apps/desktop/src/renderer/components/records/record-field-value.tsxindex 951fa4a3..841eee70 100644--- a/apps/desktop/src/renderer/components/records/record-field-value.tsx+++ b/apps/desktop/src/renderer/components/records/record-field-value.tsx@@ -9,6 +9,7 @@ import { RecordPhoneValue } from '@/renderer/components/records/values/record-phimport { RecordEmailValue } from '@/renderer/components/records/values/record-email-value';import { RecordUrlValue } from '@/renderer/components/records/values/record-url-value';import { RecordMultiSelectValue } from '@/renderer/components/records/values/record-multi-select-value';+import { RecordDateValue } from '@/renderer/components/records/values/record-date-value';interface RecordFieldValueProps {field: FieldAttributes;@@ -16,26 +17,28 @@ interface RecordFieldValueProps {export const RecordFieldValue = ({ field }: RecordFieldValueProps) => {switch (field.type) {- case 'text':- return <RecordTextValue field={field} />;- case 'number':- return <RecordNumberValue field={field} />;case 'boolean':return <RecordBooleanValue field={field} />;case 'createdAt':return <RecordCreatedAtValue field={field} />;case 'createdBy':return <RecordCreatedByValue field={field} />;- case 'select':- return <RecordSelectValue field={field} />;- case 'phone':- return <RecordPhoneValue field={field} />;+ case 'date':+ return <RecordDateValue field={field} />;case 'email':return <RecordEmailValue field={field} />;- case 'url':- return <RecordUrlValue field={field} />;case 'multiSelect':return <RecordMultiSelectValue field={field} />;+ case 'number':+ return <RecordNumberValue field={field} />;+ case 'phone':+ return <RecordPhoneValue field={field} />;+ case 'select':+ return <RecordSelectValue field={field} />;+ case 'text':+ return <RecordTextValue field={field} />;+ case 'url':+ return <RecordUrlValue field={field} />;default:return null;}diff --git a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-date-cell.tsx b/apps/desktop/src/renderer/components/records/values/record-date-value.tsxsimilarity index 88%rename from apps/desktop/src/renderer/components/databases/tables/cells/table-view-date-cell.tsxrename to apps/desktop/src/renderer/components/records/values/record-date-value.tsxindex b5caa10a..f63b1385 100644--- a/apps/desktop/src/renderer/components/databases/tables/cells/table-view-date-cell.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-date-value.tsx@@ -2,11 +2,11 @@ import { DateFieldAttributes } from '@colanode/core';import { DatePicker } from '@/renderer/components/ui/date-picker';import { useRecord } from '@/renderer/contexts/record';-interface TableViewDateCellProps {+interface RecordDateValueProps {field: DateFieldAttributes;}-export const TableViewDateCell = ({ field }: TableViewDateCellProps) => {+export const RecordDateValue = ({ field }: RecordDateValueProps) => {const record = useRecord();return (