The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
feat(front): allow advanced relation fields in FieldWidget selector (#22005)
martmull269c8ef400fd
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataItems.ts b/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataItems.tsindex c1f15872af1..82105a5fc0d 100644--- a/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataItems.ts+++ b/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataItems.ts@@ -14,6 +14,7 @@ type UseFieldListFieldMetadataItemsProps = {excludeFieldMetadataIds?: string[];excludeCreatedAtAndUpdatedAt?: boolean;showRelationSections?: boolean;+ includeSystemObjectRelations?: boolean;};export const useFieldListFieldMetadataItems = ({@@ -21,6 +22,7 @@ export const useFieldListFieldMetadataItems = ({excludeFieldMetadataIds = [],showRelationSections = true,excludeCreatedAtAndUpdatedAt = true,+ includeSystemObjectRelations = false,}: UseFieldListFieldMetadataItemsProps) => {const { labelIdentifierFieldMetadataItem } =useLabelIdentifierFieldMetadataItem({@@ -42,7 +44,9 @@ export const useFieldListFieldMetadataItems = ({const availableFieldMetadataItems = objectMetadataItem.readableFields.filter((fieldMetadataItem) =>- isFieldCellSupported(fieldMetadataItem, objectMetadataItems) &&+ isFieldCellSupported(fieldMetadataItem, objectMetadataItems, {+ includeSystemObjectRelations,+ }) &&fieldMetadataItem.id !== labelIdentifierFieldMetadataItem?.id &&!excludeFieldMetadataIds.includes(fieldMetadataItem.id) &&(!excludeCreatedAtAndUpdatedAt ||diff --git a/packages/twenty-front/src/modules/object-record/utils/isAdvancedRelationFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-record/utils/isAdvancedRelationFieldMetadataItem.tsnew file mode 100644index 00000000000..c50c26ebbd4--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/utils/isAdvancedRelationFieldMetadataItem.ts@@ -0,0 +1,12 @@+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';+import { isFieldCellSupported } from '@/object-record/utils/isFieldCellSupported';++export const isAdvancedRelationFieldMetadataItem = (+ fieldMetadataItem: FieldMetadataItem,+ objectMetadataItems: EnrichedObjectMetadataItem[],+) =>+ !isFieldCellSupported(fieldMetadataItem, objectMetadataItems) &&+ isFieldCellSupported(fieldMetadataItem, objectMetadataItems, {+ includeSystemObjectRelations: true,+ });diff --git a/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts b/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.tsindex 95089e1cb2b..b258f1bbf8c 100644--- a/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts+++ b/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts@@ -5,9 +5,14 @@ import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemFieldimport { isObjectMetadataAvailableForRelation } from '@/object-metadata/utils/isObjectMetadataAvailableForRelation';import { FieldMetadataType } from '~/generated-metadata/graphql';+type IsFieldCellSupportedOptions = {+ includeSystemObjectRelations?: boolean;+};+export const isFieldCellSupported = (fieldMetadataItem: FieldMetadataItem,objectMetadataItems: EnrichedObjectMetadataItem[],+ options: IsFieldCellSupportedOptions = {},) => {if (fieldMetadataItem.type === FieldMetadataType.POSITION) {return false;@@ -40,9 +45,12 @@ export const isFieldCellSupported = (return true;}+ if (!fieldMetadataItem.relation || !relationObjectMetadataItem) {+ return false;+ }+if (- !fieldMetadataItem.relation ||- !relationObjectMetadataItem ||+ !options.includeSystemObjectRelations &&!isObjectMetadataAvailableForRelation(relationObjectMetadataItem)) {return false;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetEligibleFields.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetEligibleFields.tsindex 55438afe3dd..282bd83554c 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetEligibleFields.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetEligibleFields.ts@@ -7,7 +7,12 @@ export const useFieldWidgetEligibleFields = (objectNameSingular: string) => {boxedRelationFieldMetadataItems,junctionRelationFieldMetadataItems,inlineFieldMetadataItems,- } = useFieldListFieldMetadataItems({ objectNameSingular });+ } = useFieldListFieldMetadataItems({+ objectNameSingular,+ // Allow advanced relation fields targeting system objects (e.g. calendarEventParticipants)+ // to appear in the FieldWidget selector — the widget can render them as boxed relations.+ includeSystemObjectRelations: true,+ });return useMemo(() => {const eligibleInlineFields = inlineFieldMetadataItems.filter(diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsxindex 4e497b63318..1778703d3c2 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetFieldDropdownContent.tsx@@ -1,4 +1,6 @@import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { isAdvancedRelationFieldMetadataItem } from '@/object-record/utils/isAdvancedRelationFieldMetadataItem';import { isDefined } from 'twenty-shared/utils';import { useUpdatePageLayoutWidget } from '@/page-layout/hooks/useUpdatePageLayoutWidget';import { useFieldWidgetEligibleFields } from '@/page-layout/widgets/field/hooks/useFieldWidgetEligibleFields';@@ -9,6 +11,8 @@ import {import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';+import { DropdownAdvancedSectionHeader } from '@/ui/layout/dropdown/components/DropdownAdvancedSectionHeader';+import { DropdownAdvancedSectionMenuItem } from '@/ui/layout/dropdown/components/DropdownAdvancedSectionMenuItem';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';@@ -20,7 +24,8 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/statesimport { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { t } from '@lingui/core/macro';-import { useState } from 'react';+import { isNonEmptyString } from '@sniptt/guards';+import { useMemo, useState } from 'react';import { useIcons } from 'twenty-ui/icon';import { MenuItemSelect } from 'twenty-ui/navigation';import { type FieldConfiguration } from '~/generated-metadata/graphql';@@ -28,6 +33,7 @@ import { filterBySearchQuery } from '~/utils/filterBySearchQuery';export const FieldWidgetFieldDropdownContent = () => {const [searchQuery, setSearchQuery] = useState('');+ const [isAdvancedOpen, setIsAdvancedOpen] = useState(false);const { pageLayoutId, objectNameSingular } =usePageLayoutIdFromContextStore();@@ -43,6 +49,31 @@ export const FieldWidgetFieldDropdownContent = () => {const allFieldWidgetFieldMetadataItems =useFieldWidgetEligibleFields(objectNameSingular);+ const { objectMetadataItems } = useObjectMetadataItems();++ const advancedFieldMetadataItems = useMemo(+ () =>+ allFieldWidgetFieldMetadataItems.filter((fieldMetadataItem) =>+ isAdvancedRelationFieldMetadataItem(+ fieldMetadataItem,+ objectMetadataItems,+ ),+ ),+ [allFieldWidgetFieldMetadataItems, objectMetadataItems],+ );++ const regularFieldMetadataItems = useMemo(+ () =>+ allFieldWidgetFieldMetadataItems.filter(+ (fieldMetadataItem) =>+ !isAdvancedRelationFieldMetadataItem(+ fieldMetadataItem,+ objectMetadataItems,+ ),+ ),+ [allFieldWidgetFieldMetadataItems, objectMetadataItems],+ );+const dropdownId = useAvailableComponentInstanceIdOrThrow(DropdownComponentInstanceContext,);@@ -62,11 +93,29 @@ export const FieldWidgetFieldDropdownContent = () => {const { getIcon } = useIcons();const availableFields = filterBySearchQuery({- items: allFieldWidgetFieldMetadataItems,+ items: isAdvancedOpen+ ? advancedFieldMetadataItems+ : regularFieldMetadataItems,searchQuery,getSearchableValues: (item) => [item.label],});+ const shouldShowAdvanced =+ !isAdvancedOpen &&+ advancedFieldMetadataItems.length > 0 &&+ (!isNonEmptyString(searchQuery) ||+ searchQuery.toLowerCase().includes('advanced'));++ const handleOpenAdvanced = () => {+ setIsAdvancedOpen(true);+ setSearchQuery('');+ };++ const handleBackFromAdvanced = () => {+ setIsAdvancedOpen(false);+ setSearchQuery('');+ };+const { fieldMetadataItem: currentFieldMetadataItem } =useFieldMetadataItemById(currentFieldMetadataId ?? '');@@ -108,6 +157,9 @@ export const FieldWidgetFieldDropdownContent = () => {return (<>+ {isAdvancedOpen && (+ <DropdownAdvancedSectionHeader onBack={handleBackFromAdvanced} />+ )}<DropdownMenuSearchInputautoFocustype="text"@@ -146,6 +198,9 @@ export const FieldWidgetFieldDropdownContent = () => {</SelectableListItem>))}</SelectableList>+ {shouldShowAdvanced && (+ <DropdownAdvancedSectionMenuItem onClick={handleOpenAdvanced} />+ )}</DropdownMenuItemsContainer></>);diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownAdvancedSectionHeader.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownAdvancedSectionHeader.tsxnew file mode 100644index 00000000000..8b650a5abb8--- /dev/null+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownAdvancedSectionHeader.tsx@@ -0,0 +1,23 @@+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';+import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';+import { Trans } from '@lingui/react/macro';+import { IconChevronLeft } from 'twenty-ui/icon';++type DropdownAdvancedSectionHeaderProps = {+ onBack: () => void;+};++export const DropdownAdvancedSectionHeader = ({+ onBack,+}: DropdownAdvancedSectionHeaderProps) => (+ <DropdownMenuHeader+ StartComponent={+ <DropdownMenuHeaderLeftComponent+ onClick={onBack}+ Icon={IconChevronLeft}+ />+ }+ >+ <Trans>Advanced</Trans>+ </DropdownMenuHeader>+);diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownAdvancedSectionMenuItem.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownAdvancedSectionMenuItem.tsxnew file mode 100644index 00000000000..48861f27761--- /dev/null+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownAdvancedSectionMenuItem.tsx@@ -0,0 +1,18 @@+import { Trans } from '@lingui/react/macro';+import { IconSettings } from 'twenty-ui/icon';+import { MenuItem } from 'twenty-ui/navigation';++type DropdownAdvancedSectionMenuItemProps = {+ onClick: () => void;+};++export const DropdownAdvancedSectionMenuItem = ({+ onClick,+}: DropdownAdvancedSectionMenuItemProps) => (+ <MenuItem+ text={<Trans>Advanced</Trans>}+ LeftIcon={IconSettings}+ onClick={onClick}+ hasSubMenu+ />+);diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsxindex c83d5d61ed5..159932a25d7 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx@@ -1,16 +1,14 @@import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { DropdownAdvancedSectionHeader } from '@/ui/layout/dropdown/components/DropdownAdvancedSectionHeader';+import { DropdownAdvancedSectionMenuItem } from '@/ui/layout/dropdown/components/DropdownAdvancedSectionMenuItem';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';-import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';-import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';-import { Trans } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';import { useState } from 'react';-import { IconChevronLeft, IconSettings } from 'twenty-ui/icon';import { MenuItem } from 'twenty-ui/navigation';type WorkflowObjectDropdownContentProps = {@@ -99,16 +97,7 @@ export const WorkflowObjectDropdownContent = ({return (<DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>{isSystemObjectsOpen && (- <DropdownMenuHeader- StartComponent={- <DropdownMenuHeaderLeftComponent- onClick={handleBack}- Icon={IconChevronLeft}- />- }- >- <Trans>Advanced</Trans>- </DropdownMenuHeader>+ <DropdownAdvancedSectionHeader onBack={handleBack} />)}<DropdownMenuSearchInputautoFocus@@ -128,12 +117,7 @@ export const WorkflowObjectDropdownContent = ({/>))}{shouldShowAdvanced && (- <MenuItem- text={<Trans>Advanced</Trans>}- LeftIcon={IconSettings}- onClick={handleAdvancedClick}- hasSubMenu- />+ <DropdownAdvancedSectionMenuItem onClick={handleAdvancedClick} />)}</DropdownMenuItemsContainer></DropdownContent>