The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Validation rule form (1/5): render field chips with the shared Chip (#27090)
Thomas Trompette75048102bc00
diff --git a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleFieldChip.tsx b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleFieldChip.tsxindex 1b87793f755..02bd5fb6b91 100644--- a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleFieldChip.tsx+++ b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleFieldChip.tsx@@ -1,34 +1,39 @@import { styled } from '@linaria/react';-import { NodeViewWrapper, type NodeViewProps } from '@tiptap/react';import { useIcons } from 'twenty-ui/icon';+import { Chip } from 'twenty-ui/primitives/data-display';import { themeCssVariables, useTheme } from 'twenty-ui/theme';-import { BaseChip } from '@/ui/input/components/BaseChip';+import { type ValidationRuleFieldNodeAttributes } from '@/validation-rules/types/ValidationRuleFieldNodeAttributes';const StyledWrapper = styled.span`display: inline-block;+ font-family: ${themeCssVariables.font.family};padding-inline: ${themeCssVariables.spacing[0.5]};vertical-align: middle;white-space: nowrap;`;-type SettingsValidationRuleFieldChipProps = NodeViewProps;+type SettingsValidationRuleFieldChipProps = ValidationRuleFieldNodeAttributes;export const SettingsValidationRuleFieldChip = ({- node,+ path,+ label,+ iconName,}: SettingsValidationRuleFieldChipProps) => {const theme = useTheme();const { getIcon } = useIcons();- const Icon = getIcon(String(node.attrs.iconName));+ const Icon = getIcon(iconName);return (- <NodeViewWrapper as={StyledWrapper}>- <BaseChip- label={String(node.attrs.label)}- title={String(node.attrs.path)}- leftIcon={<Icon size={theme.icon.size.sm} />}- />- </NodeViewWrapper>+ <StyledWrapper>+ <Chip+ variant="soft"+ title={path}+ startElement={<Icon size={theme.icon.size.sm} />}+ >+ {label}+ </Chip>+ </StyledWrapper>);};diff --git a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleFieldNodeView.tsx b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleFieldNodeView.tsxnew file mode 100644index 00000000000..f2f89717554--- /dev/null+++ b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleFieldNodeView.tsx@@ -0,0 +1,19 @@+import { NodeViewWrapper, type NodeViewProps } from '@tiptap/react';++import { SettingsValidationRuleFieldChip } from '@/validation-rules/components/SettingsValidationRuleFieldChip';++type SettingsValidationRuleFieldNodeViewProps = NodeViewProps;++export const SettingsValidationRuleFieldNodeView = ({+ node,+}: SettingsValidationRuleFieldNodeViewProps) => {+ return (+ <NodeViewWrapper as="span">+ <SettingsValidationRuleFieldChip+ path={String(node.attrs.path)}+ label={String(node.attrs.label)}+ iconName={String(node.attrs.iconName)}+ />+ </NodeViewWrapper>+ );+};diff --git a/packages/twenty-front/src/modules/validation-rules/extensions/ValidationRuleFieldNode.ts b/packages/twenty-front/src/modules/validation-rules/extensions/ValidationRuleFieldNode.tsindex d42d3577fe8..e2d13ce76f4 100644--- a/packages/twenty-front/src/modules/validation-rules/extensions/ValidationRuleFieldNode.ts+++ b/packages/twenty-front/src/modules/validation-rules/extensions/ValidationRuleFieldNode.ts@@ -1,7 +1,7 @@import { Node } from '@tiptap/core';import { ReactNodeViewRenderer } from '@tiptap/react';-import { SettingsValidationRuleFieldChip } from '@/validation-rules/components/SettingsValidationRuleFieldChip';+import { SettingsValidationRuleFieldNodeView } from '@/validation-rules/components/SettingsValidationRuleFieldNodeView';import { VALIDATION_RULE_FIELD_NODE_NAME } from '@/validation-rules/constants/ValidationRuleFieldNodeName';export const ValidationRuleFieldNode = Node.create({@@ -25,6 +25,6 @@ export const ValidationRuleFieldNode = Node.create({renderText: ({ node }) => String(node.attrs.path),addNodeView() {- return ReactNodeViewRenderer(SettingsValidationRuleFieldChip);+ return ReactNodeViewRenderer(SettingsValidationRuleFieldNodeView);},});