The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Validation rule form (2/5): MenuItem suggestion rows (#27091)
Thomas Trompette101e7e33f7bc
diff --git a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleExpressionEditor.tsx b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleExpressionEditor.tsxindex 224e6263df3..042c514d126 100644--- a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleExpressionEditor.tsx+++ b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleExpressionEditor.tsx@@ -222,8 +222,19 @@ export const SettingsValidationRuleExpressionEditor = ({});};+ const getIsWordBeingTyped = () => {+ return (+ isDefined(editor) &&+ helperContext.replaceFromOffset <+ getValidationRuleEditorText(+ editor.state.doc,+ editor.state.selection.from,+ ).length+ );+ };+const handleEditorKeyDown = (event: KeyboardEvent): boolean => {- const { items, replaceFromOffset } = helperContext;+ const { items } = helperContext;if (event.key === 'ArrowDown' || event.key === 'ArrowUp') {if (items.length === 0) {@@ -245,17 +256,10 @@ export const SettingsValidationRuleExpressionEditor = ({}const highlightedItem = items[highlightedIndex];- const isWordBeingTyped =- isDefined(editor) &&- replaceFromOffset <- getValidationRuleEditorText(- editor.state.doc,- editor.state.selection.from,- ).length;if (isDefined(highlightedItem) &&- (hasNavigatedHelper || isWordBeingTyped)+ (hasNavigatedHelper || getIsWordBeingTyped())) {insertHelperItem(highlightedItem);}@@ -283,6 +287,7 @@ export const SettingsValidationRuleExpressionEditor = ({<SettingsValidationRuleHelperPanelitems={helperContext.items}highlightedIndex={highlightedIndex}+ isEnterHintVisible={hasNavigatedHelper || getIsWordBeingTyped()}editorFields={editorFields}onHighlight={setHighlightedIndex}onSelect={insertHelperItem}diff --git a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperDetails.tsx b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperDetails.tsxindex d44d6b42621..7e07c1e2c54 100644--- a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperDetails.tsx+++ b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperDetails.tsx@@ -7,11 +7,11 @@ import { themeCssVariables, useTheme } from 'twenty-ui/theme';import { getSettingsFieldTypeConfig } from '@/settings/data-model/utils/getSettingsFieldTypeConfig';import { isFieldTypeSupportedInSettings } from '@/settings/data-model/utils/isFieldTypeSupportedInSettings';import { SettingsValidationRuleExpressionText } from '@/validation-rules/components/SettingsValidationRuleExpressionText';-import { SettingsValidationRuleHelperItemIcon } from '@/validation-rules/components/SettingsValidationRuleHelperItemIcon';import { type ValidationRuleEditorField } from '@/validation-rules/types/ValidationRuleEditorField';import { type ValidationRuleHelperItem } from '@/validation-rules/types/ValidationRuleHelperItem';import { computeValidationRuleHelperItemExamples } from '@/validation-rules/utils/computeValidationRuleHelperItemExamples';import { getValidationRuleEditorFieldChipLabel } from '@/validation-rules/utils/getValidationRuleEditorFieldChipLabel';+import { getValidationRuleHelperItemIcon } from '@/validation-rules/utils/getValidationRuleHelperItemIcon';const StyledDetails = styled.div`display: flex;@@ -73,11 +73,21 @@ export const SettingsValidationRuleHelperDetails = ({const theme = useTheme();const { getIcon } = useIcons();+ const ItemIcon = getValidationRuleHelperItemIcon({ item, getIcon });+const examples = computeValidationRuleHelperItemExamples({item,fields: editorFields,});+ const itemIcon = (+ <ItemIcon+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ color={theme.font.color.tertiary}+ />+ );+const renderSummary = () => {switch (item.kind) {case 'field': {@@ -90,7 +100,7 @@ export const SettingsValidationRuleHelperDetails = ({return (<><StyledTitle>- <SettingsValidationRuleHelperItemIcon item={item} />+ {itemIcon}{getValidationRuleEditorFieldChipLabel(item.field)}</StyledTitle><StyledMeta>@@ -115,7 +125,7 @@ export const SettingsValidationRuleHelperDetails = ({return (<><StyledTitle>- <SettingsValidationRuleHelperItemIcon item={item} />+ {itemIcon}<StyledSignature>{item.definition.signature}</StyledSignature></StyledTitle><StyledMeta>diff --git a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperItemIcon.tsx b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperItemIcon.tsxdeleted file mode 100644index 3e7455d810e..00000000000--- a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperItemIcon.tsx+++ /dev/null@@ -1,38 +0,0 @@-import { isDefined } from 'twenty-shared/utils';-import { IconCode, IconFunction, useIcons } from 'twenty-ui/icon';-import { useTheme } from 'twenty-ui/theme';--import { getSettingsFieldTypeConfig } from '@/settings/data-model/utils/getSettingsFieldTypeConfig';-import { isFieldTypeSupportedInSettings } from '@/settings/data-model/utils/isFieldTypeSupportedInSettings';-import { type ValidationRuleHelperItem } from '@/validation-rules/types/ValidationRuleHelperItem';--type SettingsValidationRuleHelperItemIconProps = {- item: ValidationRuleHelperItem;-};--export const SettingsValidationRuleHelperItemIcon = ({- item,-}: SettingsValidationRuleHelperItemIconProps) => {- const theme = useTheme();- const { getIcon } = useIcons();-- if (item.kind === 'function') {- return <IconFunction size={theme.icon.size.md} />;- }-- if (item.kind === 'keyword') {- return <IconCode size={theme.icon.size.md} />;- }-- const TypeIcon = isFieldTypeSupportedInSettings(item.field.type)- ? getSettingsFieldTypeConfig(item.field.type)?.Icon- : undefined;-- if (isDefined(TypeIcon)) {- return <TypeIcon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />;- }-- const FieldIcon = getIcon(item.field.iconName);-- return <FieldIcon size={theme.icon.size.md} />;-};diff --git a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperPanel.tsx b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperPanel.tsxindex 8363b6430ee..3664c9027fe 100644--- a/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperPanel.tsx+++ b/packages/twenty-front/src/modules/validation-rules/components/SettingsValidationRuleHelperPanel.tsx@@ -1,12 +1,15 @@import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';+import { MenuItem } from 'twenty-ui/components';+import { useIcons } from 'twenty-ui/icon';+import { Shortcut } from 'twenty-ui/primitives/typography';import { themeCssVariables } from 'twenty-ui/theme';import { SettingsValidationRuleHelperDetails } from '@/validation-rules/components/SettingsValidationRuleHelperDetails';-import { SettingsValidationRuleHelperItemIcon } from '@/validation-rules/components/SettingsValidationRuleHelperItemIcon';import { type ValidationRuleEditorField } from '@/validation-rules/types/ValidationRuleEditorField';import { type ValidationRuleHelperItem } from '@/validation-rules/types/ValidationRuleHelperItem';+import { getValidationRuleHelperItemIcon } from '@/validation-rules/utils/getValidationRuleHelperItemIcon';const StyledPanel = styled.div`border: 1px solid ${themeCssVariables.border.color.medium};@@ -22,44 +25,10 @@ const StyledList = styled.div`border-right: 1px solid ${themeCssVariables.border.color.medium};display: flex;flex-direction: column;- gap: ${themeCssVariables.spacing[0.5]};overflow-y: auto;padding: ${themeCssVariables.spacing[1]};`;-const StyledItem = styled.div<{ isHighlighted: boolean }>`- align-items: center;- background: ${({ isHighlighted }) =>- isHighlighted- ? themeCssVariables.background.transparent.light- : 'transparent'};- border-radius: ${themeCssVariables.border.radius.sm};- color: ${themeCssVariables.font.color.secondary};- cursor: pointer;- display: flex;- flex-shrink: 0;- gap: ${themeCssVariables.spacing[2]};- height: 28px;- padding: 0 ${themeCssVariables.spacing[2]};-`;--const StyledItemLabel = styled.span`- color: ${themeCssVariables.font.color.primary};- overflow: hidden;- text-overflow: ellipsis;- white-space: nowrap;-`;--const StyledItemPath = styled.span`- color: ${themeCssVariables.font.color.light};- font-family: ${themeCssVariables.code.font.family};- font-size: ${themeCssVariables.font.size.sm};- margin-left: auto;- overflow: hidden;- text-overflow: ellipsis;- white-space: nowrap;-`;-const StyledEmpty = styled.div`color: ${themeCssVariables.font.color.light};padding: ${themeCssVariables.spacing[2]};@@ -73,6 +42,7 @@ const getItemKey = (item: ValidationRuleHelperItem) =>type SettingsValidationRuleHelperPanelProps = {items: ValidationRuleHelperItem[];highlightedIndex: number;+ isEnterHintVisible: boolean;editorFields: ValidationRuleEditorField[];onHighlight: (index: number) => void;onSelect: (item: ValidationRuleHelperItem) => void;@@ -81,11 +51,13 @@ type SettingsValidationRuleHelperPanelProps = {export const SettingsValidationRuleHelperPanel = ({items,highlightedIndex,+ isEnterHintVisible,editorFields,onHighlight,onSelect,}: SettingsValidationRuleHelperPanelProps) => {const { t } = useLingui();+ const { getIcon } = useIcons();const highlightedItem = items[highlightedIndex];@@ -99,33 +71,36 @@ export const SettingsValidationRuleHelperPanel = ({const isHighlighted = index === highlightedIndex;return (- <StyledItem+ <divkey={getItemKey(item)}role="option"aria-selected={isHighlighted}- isHighlighted={isHighlighted}ref={isHighlighted? (element: HTMLDivElement | null) =>element?.scrollIntoView({ block: 'nearest' }): undefined}- onMouseEnter={() => onHighlight(index)}- onMouseDown={(event) => {- event.preventDefault();- onSelect(item);- }}+ onMouseDown={(event) => event.preventDefault()}>- <SettingsValidationRuleHelperItemIcon item={item} />- <StyledItemLabel>- {item.kind === 'field'- ? item.field.label- : item.definition.name}- </StyledItemLabel>- {item.kind === 'field' && (- <StyledItemPath>{item.field.path}</StyledItemPath>- )}- </StyledItem>+ <MenuItem+ LeftIcon={getValidationRuleHelperItemIcon({ item, getIcon })}+ text={+ item.kind === 'field'+ ? item.field.label+ : item.definition.name+ }+ RightComponent={+ isHighlighted &&+ isEnterHintVisible && (+ <Shortcut shortcut={['Enter']} variant="text" />+ )+ }+ focused={isHighlighted}+ onMouseEnter={() => onHighlight(index)}+ onClick={() => onSelect(item)}+ />+ </div>);})}</StyledList>diff --git a/packages/twenty-front/src/modules/validation-rules/utils/getValidationRuleHelperItemIcon.ts b/packages/twenty-front/src/modules/validation-rules/utils/getValidationRuleHelperItemIcon.tsnew file mode 100644index 00000000000..6cbe6173717--- /dev/null+++ b/packages/twenty-front/src/modules/validation-rules/utils/getValidationRuleHelperItemIcon.ts@@ -0,0 +1,20 @@+import { IconCode, IconFunction, type IconComponent } from 'twenty-ui/icon';++import { type ValidationRuleHelperItem } from '@/validation-rules/types/ValidationRuleHelperItem';++export const getValidationRuleHelperItemIcon = ({+ item,+ getIcon,+}: {+ item: ValidationRuleHelperItem;+ getIcon: (iconKey?: string | null) => IconComponent;+}): IconComponent => {+ switch (item.kind) {+ case 'function':+ return IconFunction;+ case 'keyword':+ return IconCode;+ case 'field':+ return getIcon(item.field.iconName);+ }+};