The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
[2/2 Sidebar] New customization experience (#26037)
Thomas des Francsdc48d6e1610c
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 51b750dd1d1..d4e70ccf40d 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -8895,6 +8895,11 @@ export type FindAllRecordPageLayoutsQuery = { __typename?: 'Query', getPageLayou| { __typename?: 'WorkflowVersionConfiguration', configurationType: WidgetConfigurationType }}> | null }> | null }> };+export type FindAllStandalonePageLayoutsQueryVariables = Exact<{ [key: string]: never; }>;+++export type FindAllStandalonePageLayoutsQuery = { __typename?: 'Query', getPageLayouts: Array<{ __typename?: 'PageLayout', id: string, name: string }> };+export type CallRecordingIdForCalendarEventQueryVariables = Exact<{calendarEventId: Scalars['UUID']['input'];}>;@@ -10221,6 +10226,7 @@ export const UpsertFieldsWidgetDocument = {"kind":"Document","definitions":[{"kiexport const UpsertViewWidgetDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpsertViewWidget"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpsertViewWidgetInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"upsertViewWidget"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFieldFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewField"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"size"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"viewFieldGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFieldGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFieldGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"viewFields"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFilterFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFilter"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"operand"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"viewFilterGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"positionInViewFilterGroup"}},{"kind":"Field","name":{"kind":"Name","value":"subFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"relationTargetFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFilterGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewFilterGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"parentViewFilterGroupId"}},{"kind":"Field","name":{"kind":"Name","value":"logicalOperator"}},{"kind":"Field","name":{"kind":"Name","value":"positionInViewFilterGroup"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewSortFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewSort"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"direction"}},{"kind":"Field","name":{"kind":"Name","value":"subFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewGroupFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewGroup"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"isVisible"}},{"kind":"Field","name":{"kind":"Name","value":"fieldValue"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ViewFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"View"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"isCompact"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanAggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanAggregateOperationFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"mainGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"shouldHideEmptyGroups"}},{"kind":"Field","name":{"kind":"Name","value":"kanbanColumnWidth"}},{"kind":"Field","name":{"kind":"Name","value":"anyFieldFilterValue"}},{"kind":"Field","name":{"kind":"Name","value":"calendarFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"calendarEndFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"calendarLayout"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"createdByUserWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"viewFields"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFieldGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFieldGroupFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFilters"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFilterFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewFilterGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewFilterGroupFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewSorts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewSortFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"viewGroups"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ViewGroupFragment"}}]}}]}}]} as unknown as DocumentNode<UpsertViewWidgetMutation, UpsertViewWidgetMutationVariables>;export const FindAllRecordFormPageLayoutsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAllRecordFormPageLayouts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getPageLayouts"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"pageLayoutType"},"value":{"kind":"EnumValue","value":"RECORD_FORM"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PageLayoutFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PageLayoutWidgetFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayoutWidget"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"isSystemSideEffect"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"conditionalDisplay"}},{"kind":"Field","name":{"kind":"Name","value":"conditionalAvailabilityExpression"}},{"kind":"Field","name":{"kind":"Name","value":"gridPosition"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"column"}},{"kind":"Field","name":{"kind":"Name","value":"columnSpan"}},{"kind":"Field","name":{"kind":"Name","value":"row"}},{"kind":"Field","name":{"kind":"Name","value":"rowSpan"}}]}},{"kind":"Field","name":{"kind":"Name","value":"position"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayoutWidgetGridPosition"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"layoutMode"}},{"kind":"Field","name":{"kind":"Name","value":"row"}},{"kind":"Field","name":{"kind":"Name","value":"column"}},{"kind":"Field","name":{"kind":"Name","value":"rowSpan"}},{"kind":"Field","name":{"kind":"Name","value":"columnSpan"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayoutWidgetVerticalListPosition"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"layoutMode"}},{"kind":"Field","name":{"kind":"Name","value":"index"}},{"kind":"Field","name":{"kind":"Name","value":"heightBehavior"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayoutWidgetCanvasPosition"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"layoutMode"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BarChartConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisGroupBySubFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisDateGranularity"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisOrderBy"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisManualSortOrder"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupBySubFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupByDateGranularity"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisOrderBy"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisManualSortOrder"}},{"kind":"Field","name":{"kind":"Name","value":"omitNullValues"}},{"kind":"Field","name":{"kind":"Name","value":"axisNameDisplay"}},{"kind":"Field","name":{"kind":"Name","value":"displayDataLabel"}},{"kind":"Field","name":{"kind":"Name","value":"displayLegend"}},{"kind":"Field","name":{"kind":"Name","value":"numberFormat"}},{"kind":"Field","name":{"kind":"Name","value":"rangeMin"}},{"kind":"Field","name":{"kind":"Name","value":"rangeMax"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"filter"}},{"kind":"Field","name":{"kind":"Name","value":"groupMode"}},{"kind":"Field","name":{"kind":"Name","value":"layout"}},{"kind":"Field","name":{"kind":"Name","value":"isCumulative"}},{"kind":"Field","name":{"kind":"Name","value":"splitMultiValueFields"}},{"kind":"Field","name":{"kind":"Name","value":"timezone"}},{"kind":"Field","name":{"kind":"Name","value":"firstDayOfTheWeek"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LineChartConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisGroupBySubFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisDateGranularity"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisOrderBy"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisManualSortOrder"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupBySubFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupByDateGranularity"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisOrderBy"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisManualSortOrder"}},{"kind":"Field","name":{"kind":"Name","value":"omitNullValues"}},{"kind":"Field","name":{"kind":"Name","value":"axisNameDisplay"}},{"kind":"Field","name":{"kind":"Name","value":"displayDataLabel"}},{"kind":"Field","name":{"kind":"Name","value":"displayLegend"}},{"kind":"Field","name":{"kind":"Name","value":"numberFormat"}},{"kind":"Field","name":{"kind":"Name","value":"rangeMin"}},{"kind":"Field","name":{"kind":"Name","value":"rangeMax"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"filter"}},{"kind":"Field","name":{"kind":"Name","value":"isStacked"}},{"kind":"Field","name":{"kind":"Name","value":"isCumulative"}},{"kind":"Field","name":{"kind":"Name","value":"splitMultiValueFields"}},{"kind":"Field","name":{"kind":"Name","value":"timezone"}},{"kind":"Field","name":{"kind":"Name","value":"firstDayOfTheWeek"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PieChartConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"groupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"groupBySubFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"dateGranularity"}},{"kind":"Field","name":{"kind":"Name","value":"orderBy"}},{"kind":"Field","name":{"kind":"Name","value":"manualSortOrder"}},{"kind":"Field","name":{"kind":"Name","value":"displayDataLabel"}},{"kind":"Field","name":{"kind":"Name","value":"showCenterMetric"}},{"kind":"Field","name":{"kind":"Name","value":"displayLegend"}},{"kind":"Field","name":{"kind":"Name","value":"numberFormat"}},{"kind":"Field","name":{"kind":"Name","value":"hideEmptyCategory"}},{"kind":"Field","name":{"kind":"Name","value":"splitMultiValueFields"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"filter"}},{"kind":"Field","name":{"kind":"Name","value":"timezone"}},{"kind":"Field","name":{"kind":"Name","value":"firstDayOfTheWeek"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AggregateChartConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"displayDataLabel"}},{"kind":"Field","name":{"kind":"Name","value":"numberFormat"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"filter"}},{"kind":"Field","name":{"kind":"Name","value":"prefix"}},{"kind":"Field","name":{"kind":"Name","value":"suffix"}},{"kind":"Field","name":{"kind":"Name","value":"timezone"}},{"kind":"Field","name":{"kind":"Name","value":"firstDayOfTheWeek"}},{"kind":"Field","name":{"kind":"Name","value":"ratioAggregateConfig"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"optionValue"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"IframeConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StandaloneRichTextConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"body"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"blocknote"}},{"kind":"Field","name":{"kind":"Name","value":"markdown"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CalendarConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"EmailsConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"EmailThreadConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CallRecordingSummaryConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CallRecordingTranscriptConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"MessageCampaignBodyConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"MessageCampaignDetailsConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FieldConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"fieldDisplayMode"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"nestedRelationFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"isUIEditable"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FieldRichTextConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FieldsConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"newFieldDefaultVisibility"}},{"kind":"Field","name":{"kind":"Name","value":"shouldAllowUserToSeeHiddenFields"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FormFieldConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FilesConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"NotesConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TasksConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TimelineConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RecordTableConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"recordLimit"}},{"kind":"Field","name":{"kind":"Name","value":"isUIEditable"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowRunConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowVersionConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FrontComponentConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"frontComponentId"}},{"kind":"Field","name":{"kind":"Name","value":"headerCommandMenuItemUniversalIdentifiers"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageLayoutTabId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PageLayoutTabFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayoutTab"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"isSystemSideEffect"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"layoutMode"}},{"kind":"Field","name":{"kind":"Name","value":"widgets"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PageLayoutWidgetFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageLayoutId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PageLayoutFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayout"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"isSystemSideEffect"}},{"kind":"Field","name":{"kind":"Name","value":"isFirstTabPinned"}},{"kind":"Field","name":{"kind":"Name","value":"defaultTabToFocusOnMobileAndSidePanelId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"tabs"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PageLayoutTabFragment"}}]}}]}}]} as unknown as DocumentNode<FindAllRecordFormPageLayoutsQuery, FindAllRecordFormPageLayoutsQueryVariables>;export const FindAllRecordPageLayoutsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAllRecordPageLayouts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getPageLayouts"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"pageLayoutType"},"value":{"kind":"EnumValue","value":"RECORD_PAGE"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PageLayoutFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PageLayoutWidgetFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayoutWidget"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"isSystemSideEffect"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"deletedAt"}},{"kind":"Field","name":{"kind":"Name","value":"conditionalDisplay"}},{"kind":"Field","name":{"kind":"Name","value":"conditionalAvailabilityExpression"}},{"kind":"Field","name":{"kind":"Name","value":"gridPosition"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"column"}},{"kind":"Field","name":{"kind":"Name","value":"columnSpan"}},{"kind":"Field","name":{"kind":"Name","value":"row"}},{"kind":"Field","name":{"kind":"Name","value":"rowSpan"}}]}},{"kind":"Field","name":{"kind":"Name","value":"position"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayoutWidgetGridPosition"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"layoutMode"}},{"kind":"Field","name":{"kind":"Name","value":"row"}},{"kind":"Field","name":{"kind":"Name","value":"column"}},{"kind":"Field","name":{"kind":"Name","value":"rowSpan"}},{"kind":"Field","name":{"kind":"Name","value":"columnSpan"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayoutWidgetVerticalListPosition"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"layoutMode"}},{"kind":"Field","name":{"kind":"Name","value":"index"}},{"kind":"Field","name":{"kind":"Name","value":"heightBehavior"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayoutWidgetCanvasPosition"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"layoutMode"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"BarChartConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisGroupBySubFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisDateGranularity"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisOrderBy"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisManualSortOrder"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupBySubFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupByDateGranularity"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisOrderBy"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisManualSortOrder"}},{"kind":"Field","name":{"kind":"Name","value":"omitNullValues"}},{"kind":"Field","name":{"kind":"Name","value":"axisNameDisplay"}},{"kind":"Field","name":{"kind":"Name","value":"displayDataLabel"}},{"kind":"Field","name":{"kind":"Name","value":"displayLegend"}},{"kind":"Field","name":{"kind":"Name","value":"numberFormat"}},{"kind":"Field","name":{"kind":"Name","value":"rangeMin"}},{"kind":"Field","name":{"kind":"Name","value":"rangeMax"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"filter"}},{"kind":"Field","name":{"kind":"Name","value":"groupMode"}},{"kind":"Field","name":{"kind":"Name","value":"layout"}},{"kind":"Field","name":{"kind":"Name","value":"isCumulative"}},{"kind":"Field","name":{"kind":"Name","value":"splitMultiValueFields"}},{"kind":"Field","name":{"kind":"Name","value":"timezone"}},{"kind":"Field","name":{"kind":"Name","value":"firstDayOfTheWeek"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LineChartConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisGroupBySubFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisDateGranularity"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisOrderBy"}},{"kind":"Field","name":{"kind":"Name","value":"primaryAxisManualSortOrder"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupBySubFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisGroupByDateGranularity"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisOrderBy"}},{"kind":"Field","name":{"kind":"Name","value":"secondaryAxisManualSortOrder"}},{"kind":"Field","name":{"kind":"Name","value":"omitNullValues"}},{"kind":"Field","name":{"kind":"Name","value":"axisNameDisplay"}},{"kind":"Field","name":{"kind":"Name","value":"displayDataLabel"}},{"kind":"Field","name":{"kind":"Name","value":"displayLegend"}},{"kind":"Field","name":{"kind":"Name","value":"numberFormat"}},{"kind":"Field","name":{"kind":"Name","value":"rangeMin"}},{"kind":"Field","name":{"kind":"Name","value":"rangeMax"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"filter"}},{"kind":"Field","name":{"kind":"Name","value":"isStacked"}},{"kind":"Field","name":{"kind":"Name","value":"isCumulative"}},{"kind":"Field","name":{"kind":"Name","value":"splitMultiValueFields"}},{"kind":"Field","name":{"kind":"Name","value":"timezone"}},{"kind":"Field","name":{"kind":"Name","value":"firstDayOfTheWeek"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PieChartConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"groupByFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"groupBySubFieldName"}},{"kind":"Field","name":{"kind":"Name","value":"dateGranularity"}},{"kind":"Field","name":{"kind":"Name","value":"orderBy"}},{"kind":"Field","name":{"kind":"Name","value":"manualSortOrder"}},{"kind":"Field","name":{"kind":"Name","value":"displayDataLabel"}},{"kind":"Field","name":{"kind":"Name","value":"showCenterMetric"}},{"kind":"Field","name":{"kind":"Name","value":"displayLegend"}},{"kind":"Field","name":{"kind":"Name","value":"numberFormat"}},{"kind":"Field","name":{"kind":"Name","value":"hideEmptyCategory"}},{"kind":"Field","name":{"kind":"Name","value":"splitMultiValueFields"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"filter"}},{"kind":"Field","name":{"kind":"Name","value":"timezone"}},{"kind":"Field","name":{"kind":"Name","value":"firstDayOfTheWeek"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"AggregateChartConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"aggregateOperation"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"displayDataLabel"}},{"kind":"Field","name":{"kind":"Name","value":"numberFormat"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"filter"}},{"kind":"Field","name":{"kind":"Name","value":"prefix"}},{"kind":"Field","name":{"kind":"Name","value":"suffix"}},{"kind":"Field","name":{"kind":"Name","value":"timezone"}},{"kind":"Field","name":{"kind":"Name","value":"firstDayOfTheWeek"}},{"kind":"Field","name":{"kind":"Name","value":"ratioAggregateConfig"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"optionValue"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"IframeConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"StandaloneRichTextConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"body"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"blocknote"}},{"kind":"Field","name":{"kind":"Name","value":"markdown"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CalendarConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"EmailsConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"EmailThreadConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CallRecordingSummaryConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CallRecordingTranscriptConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"MessageCampaignBodyConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"MessageCampaignDetailsConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FieldConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"fieldDisplayMode"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"nestedRelationFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"isUIEditable"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FieldRichTextConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FieldsConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"newFieldDefaultVisibility"}},{"kind":"Field","name":{"kind":"Name","value":"shouldAllowUserToSeeHiddenFields"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FormFieldConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FilesConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"NotesConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TasksConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TimelineConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ViewConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RecordTableConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"viewId"}},{"kind":"Field","name":{"kind":"Name","value":"recordLimit"}},{"kind":"Field","name":{"kind":"Name","value":"isUIEditable"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowRunConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"WorkflowVersionConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"FrontComponentConfiguration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"configurationType"}},{"kind":"Field","name":{"kind":"Name","value":"frontComponentId"}},{"kind":"Field","name":{"kind":"Name","value":"headerCommandMenuItemUniversalIdentifiers"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageLayoutTabId"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PageLayoutTabFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayoutTab"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"isSystemSideEffect"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"position"}},{"kind":"Field","name":{"kind":"Name","value":"layoutMode"}},{"kind":"Field","name":{"kind":"Name","value":"widgets"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PageLayoutWidgetFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageLayoutId"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"PageLayoutFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"PageLayout"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"objectMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"isSystemSideEffect"}},{"kind":"Field","name":{"kind":"Name","value":"isFirstTabPinned"}},{"kind":"Field","name":{"kind":"Name","value":"defaultTabToFocusOnMobileAndSidePanelId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"tabs"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"PageLayoutTabFragment"}}]}}]}}]} as unknown as DocumentNode<FindAllRecordPageLayoutsQuery, FindAllRecordPageLayoutsQueryVariables>;+export const FindAllStandalonePageLayoutsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAllStandalonePageLayouts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getPageLayouts"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"pageLayoutType"},"value":{"kind":"EnumValue","value":"STANDALONE_PAGE"}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]} as unknown as DocumentNode<FindAllStandalonePageLayoutsQuery, FindAllStandalonePageLayoutsQueryVariables>;export const CallRecordingIdForCalendarEventDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"CallRecordingIdForCalendarEvent"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"calendarEventId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"callRecordingIdForCalendarEvent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"calendarEventId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"calendarEventId"}}}]}]}}]} as unknown as DocumentNode<CallRecordingIdForCalendarEventQuery, CallRecordingIdForCalendarEventQueryVariables>;export const BarChartDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"BarChartData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"BarChartDataInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"barChartData"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"data"}},{"kind":"Field","name":{"kind":"Name","value":"indexBy"}},{"kind":"Field","name":{"kind":"Name","value":"keys"}},{"kind":"Field","name":{"kind":"Name","value":"series"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"label"}}]}},{"kind":"Field","name":{"kind":"Name","value":"xAxisLabel"}},{"kind":"Field","name":{"kind":"Name","value":"yAxisLabel"}},{"kind":"Field","name":{"kind":"Name","value":"showLegend"}},{"kind":"Field","name":{"kind":"Name","value":"showDataLabels"}},{"kind":"Field","name":{"kind":"Name","value":"layout"}},{"kind":"Field","name":{"kind":"Name","value":"groupMode"}},{"kind":"Field","name":{"kind":"Name","value":"hasTooManyGroups"}},{"kind":"Field","name":{"kind":"Name","value":"formattedToRawLookup"}}]}}]}}]} as unknown as DocumentNode<BarChartDataQuery, BarChartDataQueryVariables>;export const LineChartDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"LineChartData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"LineChartDataInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"lineChartData"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"series"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"data"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"x"}},{"kind":"Field","name":{"kind":"Name","value":"y"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"xAxisLabel"}},{"kind":"Field","name":{"kind":"Name","value":"yAxisLabel"}},{"kind":"Field","name":{"kind":"Name","value":"showLegend"}},{"kind":"Field","name":{"kind":"Name","value":"showDataLabels"}},{"kind":"Field","name":{"kind":"Name","value":"hasTooManyGroups"}},{"kind":"Field","name":{"kind":"Name","value":"formattedToRawLookup"}}]}}]}}]} as unknown as DocumentNode<LineChartDataQuery, LineChartDataQueryVariables>;diff --git a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsxindex 1f65b2184f5..cd158b11c11 100644--- a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx+++ b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx@@ -121,7 +121,6 @@ export const PageChangeEffect = () => {if (!hasRoutedSidePanelTarget) {const currentPage = store.get(sidePanelPageInfoSelector.atom).page;const shouldKeepSidePanelOpen =- currentPage === SidePanelPages.NavigationMenuItemEdit ||currentPage === SidePanelPages.AskAI ||currentPage === SidePanelPages.RoutedPage;diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuAddToNavDroppableDndKit.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuAddToNavDroppableDndKit.tsxdeleted file mode 100644index a2ac2662a34..00000000000--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuAddToNavDroppableDndKit.tsx+++ /dev/null@@ -1,27 +0,0 @@-import { useDroppable } from '@dnd-kit/react';-import { type ReactNode } from 'react';--import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';--import type { AddToNavDroppableProvided } from '@/command-menu/components/CommandMenuAddToNavDroppableTypes';--type CommandMenuAddToNavDroppableDndKitProps = {- children: (provided: AddToNavDroppableProvided) => ReactNode;- isDropDisabled: boolean;-};--export const CommandMenuAddToNavDroppableDndKit = ({- children,- isDropDisabled,-}: CommandMenuAddToNavDroppableDndKitProps) => {- const { ref } = useDroppable({- id: ADD_TO_NAV_SOURCE_DROPPABLE_ID,- disabled: isDropDisabled,- });- const provided: AddToNavDroppableProvided = {- innerRef: ref,- droppableProps: { 'data-dnd-group': ADD_TO_NAV_SOURCE_DROPPABLE_ID },- placeholder: null,- };- return <>{children(provided)}</>;-};diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDragDndKit.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDragDndKit.tsxdeleted file mode 100644index 116305cea43..00000000000--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemWithAddToNavigationDragDndKit.tsx+++ /dev/null@@ -1,27 +0,0 @@-import { useDraggable } from '@dnd-kit/react';-import { type ReactNode } from 'react';--import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';--type CommandMenuItemWithAddToNavigationDragDndKitProps = {- id: string;- dragIndex: number;- menuItemContent: ReactNode;-};--export const CommandMenuItemWithAddToNavigationDragDndKit = ({- id,- dragIndex,- menuItemContent,-}: CommandMenuItemWithAddToNavigationDragDndKitProps) => {- const { ref } = useDraggable({- id,- data: {- sourceDroppableId: ADD_TO_NAV_SOURCE_DROPPABLE_ID,- sourceIndex: dragIndex,- },- disabled: false,- feedback: 'clone',- });- return <div ref={ref}>{menuItemContent}</div>;-};diff --git a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsxindex 95a85cd652f..1abf48aa895 100644--- a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx@@ -222,41 +222,3 @@ export const NoResultsSearchFallback: Story = {},},};--export const SubPageNavigation: Story = {- play: async ({ canvasElement }) => {- const canvas = within(canvasElement);-- // Let the side panel finish opening before interacting, otherwise the- // click can land mid-transition and the sub-page navigation is dropped.- await sleep(openTimeout);-- const objectButton = await canvas.findByText('Object');- expect(objectButton).toBeVisible();-- await userEvent.click(objectButton);-- expect(await canvas.findByText('Pick an object')).toBeVisible();-- const backButton = await canvas.findByRole('button', { name: 'Go back' });- await userEvent.click(backButton);-- await waitFor(() => {- expect(canvas.getByText('Object')).toBeVisible();- });- },- decorators: [- (Story) => {- jotaiStore.set(sidePanelNavigationStackState.atom, [- {- page: SidePanelPages.NavigationMenuAddItem,- pageTitle: 'Add item',- pageIcon: IconPlus,- pageId: '1',- },- ]);-- return <Story />;- },- ],-};diff --git a/packages/twenty-front/src/modules/layout-customization/hooks/__tests__/useIsLayoutCustomizationDirty.test.tsx b/packages/twenty-front/src/modules/layout-customization/hooks/__tests__/useIsLayoutCustomizationDirty.test.tsxindex f5ca0b45b4a..994bc54f4bb 100644--- a/packages/twenty-front/src/modules/layout-customization/hooks/__tests__/useIsLayoutCustomizationDirty.test.tsx+++ b/packages/twenty-front/src/modules/layout-customization/hooks/__tests__/useIsLayoutCustomizationDirty.test.tsx@@ -1,3 +1,4 @@+import { objectColorsDraftState } from '@/layout-customization/states/objectColorsDraftState';import { useIsLayoutCustomizationDirty } from '@/layout-customization/hooks/useIsLayoutCustomizationDirty';import { activeCustomizationPageLayoutIdsState } from '@/layout-customization/states/activeCustomizationPageLayoutIdsState';import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';@@ -52,6 +53,15 @@ const getWrapper =);describe('useIsLayoutCustomizationDirty', () => {+ it('enables Save for an object color change without navigation changes', () => {+ const store = createStore();+ store.set(objectColorsDraftState.atom, { 'company-id': 'red' });+ const { result } = renderHook(() => useIsLayoutCustomizationDirty(), {+ wrapper: getWrapper(store),+ });+ expect(result.current.isDirty).toBe(true);+ });+it('should return not dirty when no layouts are touched and nav is clean', () => {const store = createStore();const wrapper = getWrapper(store);diff --git a/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts b/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.tsindex 3107050f3dd..9299483f3d1 100644--- a/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts+++ b/packages/twenty-front/src/modules/layout-customization/hooks/useEnterLayoutCustomizationMode.ts@@ -9,7 +9,6 @@ import { commandMenuItemsDraftState } from '@/command-menu-item/edit/states/commimport { commandMenuItemsSelector } from '@/command-menu-item/states/commandMenuItemsSelector';import { activeCustomizationPageLayoutIdsState } from '@/layout-customization/states/activeCustomizationPageLayoutIdsState';import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';-import { navigationMenuItemEditSectionState } from '@/navigation-menu-item/common/states/navigationMenuItemEditSectionState';import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { navigationMenuItemsSelector } from '@/navigation-menu-item/common/states/navigationMenuItemsSelector';import { filterWorkspaceNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterWorkspaceNavigationMenuItems';@@ -70,7 +69,6 @@ export const useEnterLayoutCustomizationMode = () => {prefetchNavigationMenuItems,);store.set(navigationMenuItemsDraftState.atom, workspaceNavigationMenuItems);- store.set(navigationMenuItemEditSectionState.atom, 'workspace');const persistedCommandMenuItems = store.get(commandMenuItemsSelector.atom);store.set(commandMenuItemsDraftState.atom, persistedCommandMenuItems);diff --git a/packages/twenty-front/src/modules/layout-customization/hooks/useExitLayoutCustomizationMode.ts b/packages/twenty-front/src/modules/layout-customization/hooks/useExitLayoutCustomizationMode.tsindex 3ab98de0afd..293812469f6 100644--- a/packages/twenty-front/src/modules/layout-customization/hooks/useExitLayoutCustomizationMode.ts+++ b/packages/twenty-front/src/modules/layout-customization/hooks/useExitLayoutCustomizationMode.ts@@ -1,3 +1,5 @@+import { objectColorsDraftState } from '@/layout-customization/states/objectColorsDraftState';+import { navigationMenuItemIdToRenameState } from '@/navigation-menu-item/common/states/navigationMenuItemIdToRenameState';import { commandMenuItemsDraftState } from '@/command-menu-item/edit/states/commandMenuItemsDraftState';import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';import { activeCustomizationPageLayoutIdsState } from '@/layout-customization/states/activeCustomizationPageLayoutIdsState';@@ -30,6 +32,7 @@ export const useExitLayoutCustomizationMode = () => {);const exitLayoutCustomizationMode = useCallback(() => {+ store.set(objectColorsDraftState.atom, {});const activePageLayoutIds = store.get(activeCustomizationPageLayoutIdsState.atom,);@@ -46,6 +49,7 @@ export const useExitLayoutCustomizationMode = () => {resetRecordIndexSelection();setNavigationMenuItemsDraft(null);setSelectedNavigationMenuItemIdInEditMode(null);+ store.set(navigationMenuItemIdToRenameState.atom, null);store.set(commandMenuItemsDraftState.atom, null);setIsLayoutCustomizationModeEnabled(false);closeSidePanelMenu();diff --git a/packages/twenty-front/src/modules/layout-customization/hooks/useIsLayoutCustomizationDirty.ts b/packages/twenty-front/src/modules/layout-customization/hooks/useIsLayoutCustomizationDirty.tsindex e0f1c0ca2f6..877513bd158 100644--- a/packages/twenty-front/src/modules/layout-customization/hooks/useIsLayoutCustomizationDirty.ts+++ b/packages/twenty-front/src/modules/layout-customization/hooks/useIsLayoutCustomizationDirty.ts@@ -1,3 +1,4 @@+import { objectColorsDraftState } from '@/layout-customization/states/objectColorsDraftState';import { useCommandMenuItemsDraftState } from '@/command-menu-item/hooks/useCommandMenuItemsDraftState';import { activeCustomizationPageLayoutIdsState } from '@/layout-customization/states/activeCustomizationPageLayoutIdsState';import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState';@@ -16,6 +17,7 @@ import { isDefined } from 'twenty-shared/utils';import { isDeeplyEqual } from '~/utils/isDeeplyEqual';export const useIsLayoutCustomizationDirty = () => {+ const objectColorsDraft = useAtomValue(objectColorsDraftState.atom);const { isDirty: isNavigationDirty } = useNavigationMenuItemsDraftState();const { isDirty: isCommandMenuItemsDirty } = useCommandMenuItemsDraftState();@@ -109,6 +111,9 @@ export const useIsLayoutCustomizationDirty = () => {return {isDirty:- isNavigationDirty || isAnyPageLayoutDirty || isCommandMenuItemsDirty,+ Object.keys(objectColorsDraft).length > 0 ||+ isNavigationDirty ||+ isAnyPageLayoutDirty ||+ isCommandMenuItemsDirty,};};diff --git a/packages/twenty-front/src/modules/layout-customization/hooks/useSaveLayoutCustomization.ts b/packages/twenty-front/src/modules/layout-customization/hooks/useSaveLayoutCustomization.tsindex 777033c3328..0bd420948b9 100644--- a/packages/twenty-front/src/modules/layout-customization/hooks/useSaveLayoutCustomization.ts+++ b/packages/twenty-front/src/modules/layout-customization/hooks/useSaveLayoutCustomization.ts@@ -1,3 +1,5 @@+import { objectColorsDraftState } from '@/layout-customization/states/objectColorsDraftState';+import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';import { useSaveCommandMenuItemsDraft } from '@/command-menu-item/edit/hooks/useSaveCommandMenuItemsDraft';import { useCommandMenuItemsDraftState } from '@/command-menu-item/hooks/useCommandMenuItemsDraftState';import { useExitLayoutCustomizationMode } from '@/layout-customization/hooks/useExitLayoutCustomizationMode';@@ -27,6 +29,8 @@ import { isDeeplyEqual } from '~/utils/isDeeplyEqual';import { logError } from '~/utils/logError';export const useSaveLayoutCustomization = () => {+ const { updateOneObjectMetadataItem, refetchCommandMenuItems } =+ useUpdateOneObjectMetadataItem();const [isSaving, setIsSaving] = useState(false);const store = useStore();const { t } = useLingui();@@ -47,6 +51,50 @@ export const useSaveLayoutCustomization = () => {const save = useCallback(async () => {setIsSaving(true);try {+ const objectColorEntries = Object.entries(+ store.get(objectColorsDraftState.atom),+ );++ if (objectColorEntries.length > 0) {+ // TODO: replace with an updateManyObjectMetadataItems endpoint, landing+ // in its own PR after this one, so saving colours is a single request.+ // Each update otherwise refetches the command menu, so send them+ // together and refetch once.+ const colorResults = await Promise.all(+ objectColorEntries.map(async ([objectId, color]) => ({+ objectId,+ color,+ result: await updateOneObjectMetadataItem({+ idToUpdate: objectId,+ updatePayload: { color },+ shouldRefetchCommandMenuItems: false,+ }),+ })),+ );++ const savedColorByObjectId = new Map(+ colorResults+ .filter(({ result }) => result.status === 'successful')+ .map(({ objectId, color }) => [objectId, color]),+ );++ // The picker stays live while these run, so only drop an entry the user+ // has not changed again since it was sent.+ store.set(objectColorsDraftState.atom, (draft) =>+ Object.fromEntries(+ Object.entries(draft).filter(+ ([objectId, color]) =>+ savedColorByObjectId.get(objectId) !== color,+ ),+ ),+ );++ await refetchCommandMenuItems();++ if (savedColorByObjectId.size !== objectColorEntries.length) {+ return;+ }+ }const navigationDraft = store.get(navigationMenuItemsDraftState.atom);const prefetchItems = store.get(navigationMenuItemsSelector.atom);const workspaceItems = filterWorkspaceNavigationMenuItems(prefetchItems);@@ -153,6 +201,8 @@ export const useSaveLayoutCustomization = () => {setIsSaving(false);}}, [+ updateOneObjectMetadataItem,+ refetchCommandMenuItems,saveDraft,saveCommandMenuItemsDraft,isCommandMenuItemsDirty,diff --git a/packages/twenty-front/src/modules/layout-customization/states/objectColorsDraftState.ts b/packages/twenty-front/src/modules/layout-customization/states/objectColorsDraftState.tsnew file mode 100644index 00000000000..0edb95626fa--- /dev/null+++ b/packages/twenty-front/src/modules/layout-customization/states/objectColorsDraftState.ts@@ -0,0 +1,9 @@+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';+import { type ThemeColor } from 'twenty-ui/theme';++export const objectColorsDraftState = createAtomState<+ Record<string, ThemeColor>+>({+ key: 'objectColorsDraftState',+ defaultValue: {},+});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/constants/AddToNavSourceDroppableId.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/AddToNavSourceDroppableId.tsdeleted file mode 100644index 885949cc327..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/constants/AddToNavSourceDroppableId.ts+++ /dev/null@@ -1 +0,0 @@-export const ADD_TO_NAV_SOURCE_DROPPABLE_ID = 'add-to-nav-source';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/contexts/NavigationDropTargetContext.tsx b/packages/twenty-front/src/modules/navigation-menu-item/common/contexts/NavigationDropTargetContext.tsxindex a15256f23d7..9f12488d0c5 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/common/contexts/NavigationDropTargetContext.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/contexts/NavigationDropTargetContext.tsx@@ -1,16 +1,10 @@import { createContext } from 'react';-export type AddToNavigationFallbackDestination = {- droppableId: string;- index: number;-} | null;-type NavigationDropTargetContextType = {activeDropTargetId: string | null;setActiveDropTargetId: (id: string | null) => void;forbiddenDropTargetId: string | null;setForbiddenDropTargetId: (id: string | null) => void;- addToNavigationFallbackDestination: AddToNavigationFallbackDestination;};export const NavigationDropTargetContext =@@ -19,5 +13,4 @@ export const NavigationDropTargetContext =setActiveDropTargetId: () => {},forbiddenDropTargetId: null,setForbiddenDropTargetId: () => {},- addToNavigationFallbackDestination: null,});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useCreateManyNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useCreateManyNavigationMenuItems.tsindex 8e4ae012003..488526bd2cd 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useCreateManyNavigationMenuItems.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useCreateManyNavigationMenuItems.ts@@ -7,26 +7,7 @@ import {} from '~/generated-metadata/graphql';import { useUpdateMetadataStoreDraft } from '@/metadata-store/hooks/useUpdateMetadataStoreDraft';--const buildOptimisticNavigationMenuItem = (- input: CreateNavigationMenuItemInput & { id: string },-): NavigationMenuItem => ({- id: input.id,- type: input.type,- position: input.position ?? 0,- userWorkspaceId: input.userWorkspaceId ?? null,- targetRecordId: input.targetRecordId ?? null,- targetObjectMetadataId: input.targetObjectMetadataId ?? null,- viewId: input.viewId ?? null,- folderId: input.folderId ?? null,- name: input.name ?? null,- link: input.link ?? null,- icon: input.icon ?? null,- color: input.color ?? null,- applicationId: null,- createdAt: new Date().toISOString(),- updatedAt: new Date().toISOString(),-});+import { buildOptimisticNavigationMenuItem } from '@/navigation-menu-item/common/utils/buildOptimisticNavigationMenuItem';export const useCreateManyNavigationMenuItems = () => {const { addToDraft, removeFromDraft, applyChanges } =diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/states/addToNavPayloadRegistryState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/addToNavPayloadRegistryState.tsdeleted file mode 100644index d9822f2c694..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/states/addToNavPayloadRegistryState.ts+++ /dev/null@@ -1,10 +0,0 @@-import type { AddToNavigationDragPayload } from '@/navigation-menu-item/common/types/add-to-navigation-drag-payload';--import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';--export const addToNavPayloadRegistryState = createAtomState<- Map<string, AddToNavigationDragPayload>->({- key: 'navigation-menu-item/addToNavPayloadRegistryState',- defaultValue: new Map(),-});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemEditSectionState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemEditSectionState.tsdeleted file mode 100644index f7609e3f273..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemEditSectionState.ts+++ /dev/null@@ -1,9 +0,0 @@-import type { NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';--import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';--export const navigationMenuItemEditSectionState =- createAtomState<NavigationMenuItemSection>({- key: 'navigationMenuItemEditSectionState',- defaultValue: 'workspace',- });diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemIdToRenameState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemIdToRenameState.tsnew file mode 100644index 00000000000..1ef457fc453--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemIdToRenameState.ts@@ -0,0 +1,8 @@+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const navigationMenuItemIdToRenameState = createAtomState<string | null>(+ {+ key: 'navigationMenuItemIdToRenameState',+ defaultValue: null,+ },+);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemInsertionAnchorState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemInsertionAnchorState.tsnew file mode 100644index 00000000000..4b61fc0373a--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemInsertionAnchorState.ts@@ -0,0 +1,9 @@+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const navigationMenuItemInsertionAnchorState = createAtomState<{+ dropdownId: string;+ element: HTMLElement;+} | null>({+ key: 'navigationMenuItemInsertionAnchorState',+ defaultValue: null,+});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemInsertionPreviewState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemInsertionPreviewState.tsnew file mode 100644index 00000000000..b0eb45cc944--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/states/navigationMenuItemInsertionPreviewState.ts@@ -0,0 +1,12 @@+import { type NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const navigationMenuItemInsertionPreviewState = createAtomState<{+ dropdownId: string;+ section: NavigationMenuItemSection;+ folderId: string | null;+ index: number;+} | null>({+ key: 'navigationMenuItemInsertionPreviewState',+ defaultValue: null,+});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState.tsdeleted file mode 100644index 64778b184cf..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState.ts+++ /dev/null@@ -1,9 +0,0 @@-import type { PendingInsertionNavigationMenuItem } from '@/navigation-menu-item/common/types/PendingInsertionNavigationMenuItem';--import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';--export const pendingInsertionNavigationMenuItemState =- createAtomState<PendingInsertionNavigationMenuItem | null>({- key: 'pendingInsertionNavigationMenuItemState',- defaultValue: null,- });diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/types/PendingInsertionNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/types/PendingInsertionNavigationMenuItem.tsdeleted file mode 100644index 197ff53b843..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/types/PendingInsertionNavigationMenuItem.ts+++ /dev/null@@ -1,4 +0,0 @@-export type PendingInsertionNavigationMenuItem = {- folderId: string | null;- position: number;-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/types/add-to-navigation-drag-payload.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/types/add-to-navigation-drag-payload.tsdeleted file mode 100644index 9cb5bc444a7..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/types/add-to-navigation-drag-payload.ts+++ /dev/null@@ -1,41 +0,0 @@-export type AddToNavigationDragPayloadObject = {- type: 'OBJECT';- objectMetadataId: string;- label: string;- iconColor?: string;-};--export type AddToNavigationDragPayloadView = {- type: 'VIEW';- viewId: string;- label: string;-};--export type AddToNavigationDragPayloadRecord = {- type: 'RECORD';- recordId: string;- objectMetadataId: string;- objectNameSingular: string;- label: string;- imageUrl?: string | null;-};--export type AddToNavigationDragPayloadFolder = {- type: 'FOLDER';- folderId: string;- name: string;-};--export type AddToNavigationDragPayloadLink = {- type: 'LINK';- linkId: string;- name: string;- link: string;-};--export type AddToNavigationDragPayload =- | AddToNavigationDragPayloadObject- | AddToNavigationDragPayloadView- | AddToNavigationDragPayloadRecord- | AddToNavigationDragPayloadFolder- | AddToNavigationDragPayloadLink;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/buildCreateNavigationMenuItemInput.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/buildCreateNavigationMenuItemInput.test.tsnew file mode 100644index 00000000000..3de6553140d--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/buildCreateNavigationMenuItemInput.test.ts@@ -0,0 +1,34 @@+import { NavigationMenuItemType } from 'twenty-shared/types';++import { buildCreateNavigationMenuItemInput } from '@/navigation-menu-item/common/utils/buildCreateNavigationMenuItemInput';++describe('buildCreateNavigationMenuItemInput', () => {+ it('preserves standalone page identity and presentation when saving into a folder', () => {+ const input = buildCreateNavigationMenuItemInput(+ {+ id: 'navigation-item',+ type: NavigationMenuItemType.PAGE_LAYOUT,+ pageLayoutId: 'standalone-page',+ name: 'Team overview',+ icon: 'IconPerspective',+ color: 'blue',+ folderId: 'draft-folder',+ position: 0,+ createdAt: '',+ updatedAt: '',+ },+ () => 'saved-folder',+ );++ expect(input).toEqual({+ id: 'navigation-item',+ type: NavigationMenuItemType.PAGE_LAYOUT,+ pageLayoutId: 'standalone-page',+ name: 'Team overview',+ icon: 'IconPerspective',+ color: 'blue',+ folderId: 'saved-folder',+ position: 0,+ });+ });+});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/buildOptimisticNavigationMenuItem.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/buildOptimisticNavigationMenuItem.test.tsnew file mode 100644index 00000000000..167b918bdc2--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/buildOptimisticNavigationMenuItem.test.ts@@ -0,0 +1,21 @@+import { buildOptimisticNavigationMenuItem } from '@/navigation-menu-item/common/utils/buildOptimisticNavigationMenuItem';+import { filterAndSortNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems';+import { NavigationMenuItemType } from '~/generated-metadata/graphql';++describe('buildOptimisticNavigationMenuItem', () => {+ it('should keep a standalone page visible in the sidebar before the server responds', () => {+ const optimisticItem = buildOptimisticNavigationMenuItem({+ id: '95e7bd9c-7a0e-4a9f-94a6-8b8a9c2c9a4f',+ type: NavigationMenuItemType.PAGE_LAYOUT,+ pageLayoutId: '0a0be2ee-2f5f-4a5a-b1e5-1b5c8e3a4f21',+ name: 'Revenue',+ });++ expect(optimisticItem.pageLayoutId).toBe(+ '0a0be2ee-2f5f-4a5a-b1e5-1b5c8e3a4f21',+ );+ expect(filterAndSortNavigationMenuItems([optimisticItem], [], [])).toEqual([+ optimisticItem,+ ]);+ });+});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildCreateNavigationMenuItemInput.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildCreateNavigationMenuItemInput.tsindex 9bcbfc8d884..5970a09b344 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildCreateNavigationMenuItemInput.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildCreateNavigationMenuItemInput.ts@@ -29,6 +29,10 @@ export const buildCreateNavigationMenuItemInput = (} else if (isNavigationMenuItemObject(draftItem)) {input.targetObjectMetadataId =draftItem.targetObjectMetadataId ?? undefined;+ } else if (isDefined(draftItem.pageLayoutId)) {+ input.pageLayoutId = draftItem.pageLayoutId;+ input.name = draftItem.name ?? undefined;+ input.icon = draftItem.icon ?? null;} else if (isDefined(draftItem.viewId)) {input.viewId = draftItem.viewId;} else if (isDefined(draftItem.targetRecordId)) {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildNavigationMenuLinkUpdate.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildNavigationMenuLinkUpdate.tsdeleted file mode 100644index 295ede8f0e6..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildNavigationMenuLinkUpdate.ts+++ /dev/null@@ -1,20 +0,0 @@-import { type NavigationMenuItem } from '~/generated-metadata/graphql';--// Normalizes a link rename/url edit: a blank name falls back to "Link", and a-// blank url is ignored so the existing link is kept.-export const buildNavigationMenuLinkUpdate = (updates: {- name?: string;- link?: string;-}): Partial<NavigationMenuItem> => {- const normalized: Partial<NavigationMenuItem> = {};-- if (updates.name !== undefined) {- normalized.name = updates.name.trim() || 'Link';- }-- if (updates.link !== undefined && updates.link.trim() !== '') {- normalized.link = updates.link.trim();- }-- return normalized;-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildOptimisticNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildOptimisticNavigationMenuItem.tsnew file mode 100644index 00000000000..2d7cf4315da--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/buildOptimisticNavigationMenuItem.ts@@ -0,0 +1,25 @@+import {+ type CreateNavigationMenuItemInput,+ type NavigationMenuItem,+} from '~/generated-metadata/graphql';++export const buildOptimisticNavigationMenuItem = (+ input: CreateNavigationMenuItemInput & { id: string },+): NavigationMenuItem => ({+ id: input.id,+ type: input.type,+ position: input.position ?? 0,+ userWorkspaceId: input.userWorkspaceId ?? null,+ targetRecordId: input.targetRecordId ?? null,+ targetObjectMetadataId: input.targetObjectMetadataId ?? null,+ viewId: input.viewId ?? null,+ pageLayoutId: input.pageLayoutId ?? null,+ folderId: input.folderId ?? null,+ name: input.name ?? null,+ link: input.link ?? null,+ icon: input.icon ?? null,+ color: input.color ?? null,+ applicationId: null,+ createdAt: new Date().toISOString(),+ updatedAt: new Date().toISOString(),+});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/isValidObjectNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/isValidObjectNavigationMenuItem.tsdeleted file mode 100644index a7ae4775851..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/isValidObjectNavigationMenuItem.ts+++ /dev/null@@ -1,19 +0,0 @@-import { isNonEmptyString } from '@sniptt/guards';-import { type NavigationMenuItem } from '~/generated-metadata/graphql';--import { isNavigationMenuItemObject } from '@/navigation-menu-item/common/utils/isNavigationMenuItemObject';-import { isDefined } from 'twenty-shared/utils';--type ObjectNavigationMenuItem = Omit<- NavigationMenuItem,- 'targetObjectMetadataId'-> & {- targetObjectMetadataId: string;-};--export const isValidObjectNavigationMenuItem = (- item?: NavigationMenuItem,-): item is ObjectNavigationMenuItem =>- isDefined(item) &&- isNavigationMenuItemObject(item) &&- isNonEmptyString(item.targetObjectMetadataId);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemDisplay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemDisplay.tsxindex 1b716041c11..15de2d1668b 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemDisplay.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemDisplay.tsx@@ -1,3 +1,4 @@+import { NavigationMenuItemEditable } from '@/navigation-menu-item/edit/components/NavigationMenuItemEditable';import { NavigationMenuItemType } from 'twenty-shared/types';import { NavigationMenuItemFolder } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolder';import { NavigationMenuItemLinkDisplay } from '@/navigation-menu-item/display/link/components/NavigationMenuItemLinkDisplay';@@ -37,48 +38,54 @@ export const NavigationMenuItemDisplay = ({);case NavigationMenuItemType.LINK:return (- <NavigationMenuItemLinkDisplay- item={item}- isEditInPlace={isEditInPlace}- editModeProps={editModeProps}- isDragging={isDragging}- folderChildrenById={folderChildrenById}- folderCount={folderCount}- rightOptions={rightOptions}- onNavigationMenuItemClick={onNavigationMenuItemClick}- onActiveObjectMetadataItemClick={onActiveObjectMetadataItemClick}- readOnly={readOnly}- />+ <NavigationMenuItemEditable item={item}>+ <NavigationMenuItemLinkDisplay+ item={item}+ isEditInPlace={isEditInPlace}+ editModeProps={editModeProps}+ isDragging={isDragging}+ folderChildrenById={folderChildrenById}+ folderCount={folderCount}+ rightOptions={rightOptions}+ onNavigationMenuItemClick={onNavigationMenuItemClick}+ onActiveObjectMetadataItemClick={onActiveObjectMetadataItemClick}+ readOnly={readOnly}+ />+ </NavigationMenuItemEditable>);case NavigationMenuItemType.PAGE_LAYOUT:return (- <NavigationMenuItemPageLayoutDisplay- item={item}- isEditInPlace={isEditInPlace}- editModeProps={editModeProps}- isDragging={isDragging}- folderChildrenById={folderChildrenById}- folderCount={folderCount}- rightOptions={rightOptions}- onNavigationMenuItemClick={onNavigationMenuItemClick}- onActiveObjectMetadataItemClick={onActiveObjectMetadataItemClick}- readOnly={readOnly}- />+ <NavigationMenuItemEditable item={item}>+ <NavigationMenuItemPageLayoutDisplay+ item={item}+ isEditInPlace={isEditInPlace}+ editModeProps={editModeProps}+ isDragging={isDragging}+ folderChildrenById={folderChildrenById}+ folderCount={folderCount}+ rightOptions={rightOptions}+ onNavigationMenuItemClick={onNavigationMenuItemClick}+ onActiveObjectMetadataItemClick={onActiveObjectMetadataItemClick}+ readOnly={readOnly}+ />+ </NavigationMenuItemEditable>);default:return (- <NavigationMenuItemObjectDisplay- item={item}- isEditInPlace={isEditInPlace}- editModeProps={editModeProps}- isDragging={isDragging}- folderChildrenById={folderChildrenById}- folderCount={folderCount}- rightOptions={rightOptions}- onNavigationMenuItemClick={onNavigationMenuItemClick}- onActiveObjectMetadataItemClick={onActiveObjectMetadataItemClick}- readOnly={readOnly}- />+ <NavigationMenuItemEditable item={item}>+ <NavigationMenuItemObjectDisplay+ item={item}+ isEditInPlace={isEditInPlace}+ editModeProps={editModeProps}+ isDragging={isDragging}+ folderChildrenById={folderChildrenById}+ folderCount={folderCount}+ rightOptions={rightOptions}+ onNavigationMenuItemClick={onNavigationMenuItemClick}+ onActiveObjectMetadataItemClick={onActiveObjectMetadataItemClick}+ readOnly={readOnly}+ />+ </NavigationMenuItemEditable>);}};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsxindex 29a3d66bccc..455e2464df7 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx@@ -1,3 +1,5 @@+import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';+import { NavigationMenuItemIconWithOverlay } from '@/navigation-menu-item/display/components/NavigationMenuItemIconWithOverlay';import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';import { NavigationMenuItemType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -5,7 +7,7 @@ import {Avatar,getIconTileColorShades,} from 'twenty-ui/primitives/data-display';-import { IconLink, IconWorld, useIcons } from 'twenty-ui/icon';+import { IconLink, IconPerspective, IconWorld, useIcons } from 'twenty-ui/icon';import { themeCssVariables } from 'twenty-ui/theme-constants';import { type NavigationMenuItem } from '~/generated-metadata/graphql';@@ -29,6 +31,9 @@ export const NavigationMenuItemIcon = ({navigationMenuItem: NavigationMenuItem;}) => {const { getIcon } = useIcons();+ const isLayoutCustomizationModeEnabled = useAtomStateValue(+ isLayoutCustomizationModeEnabledState,+ );const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);const views = useAtomStateValue(viewsSelector);@@ -81,11 +86,9 @@ export const NavigationMenuItemIcon = ({const pageLayoutColor = getNavigationMenuItemColor(navigationMenuItem);const pageLayoutIconStyle = getIconTileColorShades(pageLayoutColor);- if (isDefined(PageLayoutIcon)) {- return <ColoredIcon Icon={PageLayoutIcon} color={pageLayoutColor} />;- }-- return (+ const pageIcon = isDefined(PageLayoutIcon) ? (+ <ColoredIcon Icon={PageLayoutIcon} color={pageLayoutColor} />+ ) : (<Avatarsize="md"shape="rounded-square"@@ -94,6 +97,14 @@ export const NavigationMenuItemIcon = ({backgroundColor={pageLayoutIconStyle.backgroundColor}/>);++ return isLayoutCustomizationModeEnabled ? (+ <NavigationMenuItemIconWithOverlay OverlayIcon={IconPerspective}>+ {pageIcon}+ </NavigationMenuItemIconWithOverlay>+ ) : (+ pageIcon+ );}if (navigationMenuItem.type === NavigationMenuItemType.LINK) {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIconWithOverlay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIconWithOverlay.tsxnew file mode 100644index 00000000000..979486fa3ee--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIconWithOverlay.tsx@@ -0,0 +1,54 @@+import { styled } from '@linaria/react';+import { useContext, type ReactNode } from 'react';+import { type IconComponent } from 'twenty-ui/icon';+import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';++const StyledCompositeContainer = styled.div`+ align-items: center;+ border-radius: ${themeCssVariables.border.radius.sm};+ box-sizing: border-box;+ display: flex;+ flex-shrink: 0;+ height: calc(${themeCssVariables.icon.size.md} * 1px);+ justify-content: center;+ position: relative;+ width: calc(${themeCssVariables.icon.size.md} * 1px);+`;++const StyledOverlay = styled.div<{ $backgroundColor: string }>`+ align-items: center;+ background-color: ${({ $backgroundColor }) => $backgroundColor};+ border-radius: ${themeCssVariables.border.radius.sm};+ bottom: -5px;+ display: flex;+ height: 14px;+ justify-content: center;+ position: absolute;+ right: -6px;+ width: 12px;+`;++type NavigationMenuItemIconWithOverlayProps = {+ children: ReactNode;+ OverlayIcon: IconComponent;+};++export const NavigationMenuItemIconWithOverlay = ({+ children,+ OverlayIcon,+}: NavigationMenuItemIconWithOverlayProps) => {+ const { theme } = useContext(ThemeContext);++ return (+ <StyledCompositeContainer>+ {children}+ <StyledOverlay $backgroundColor={themeCssVariables.grayScale.gray4}>+ <OverlayIcon+ size="12px"+ stroke={theme.icon.stroke.md}+ color={themeCssVariables.grayScale.gray10}+ />+ </StyledOverlay>+ </StyledCompositeContainer>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsxdeleted file mode 100644index f8aabcfa1f8..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsx+++ /dev/null@@ -1,113 +0,0 @@-import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';-import { styled } from '@linaria/react';-import { useContext, type ReactNode } from 'react';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { TintedIconTile } from 'twenty-ui/primitives/data-display';-import { IconGripVertical, type IconComponent } from 'twenty-ui/icon';-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';--import type { AddToNavigationDragPayload } from '@/navigation-menu-item/common/types/add-to-navigation-drag-payload';-import { getNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemColor';--const StyledIconSlot = styled.div<{- $hasFixedSize: boolean;- $disabled?: boolean;- $disableDrag?: boolean;-}>`- align-items: center;- cursor: ${({ $disabled, $disableDrag }) =>- $disabled || $disableDrag ? 'default' : 'grab'};- display: flex;- flex-shrink: 0;- height: ${({ $hasFixedSize }) =>- $hasFixedSize ? themeCssVariables.spacing[4] : 'auto'};- justify-content: center;- opacity: ${({ $disabled }) => ($disabled ? 0.5 : 1)};- width: ${({ $hasFixedSize }) =>- $hasFixedSize ? themeCssVariables.spacing[4] : 'auto'};-- &:active {- cursor: ${({ $disabled, $disableDrag }) =>- $disabled || $disableDrag ? 'default' : 'grabbing'};- }-`;--type AddToNavigationDragHandleProps = {- icon?: IconComponent;- customIconContent?: ReactNode;- payload: AddToNavigationDragPayload;- isHovered: boolean;- disabled?: boolean;- disableDrag?: boolean;-};--export const AddToNavigationDragHandle = ({- icon,- customIconContent,- payload,- isHovered,- disabled = false,- disableDrag = false,-}: AddToNavigationDragHandleProps) => {- const { theme } = useContext(ThemeContext);- const effectiveColor = getNavigationMenuItemColor(- { type: payload.type as NavigationMenuItemType },- payload.type === NavigationMenuItemType.OBJECT && payload.iconColor- ? {- nameSingular: '',- color: payload.iconColor,- isSystem: false,- }- : undefined,- );- const hasFixedIconSize =- payload.type !== NavigationMenuItemType.RECORD && !isHovered;- const renderIcon = () => {- if (isHovered) {- return (- <IconGripVertical- size={theme.icon.size.md}- stroke={theme.icon.stroke.sm}- color={theme.font.color.tertiary}- />- );- }-- if (isDefined(customIconContent)) {- return customIconContent;- }-- if (!isDefined(icon)) {- return null;- }-- const Icon = icon;-- if (payload.type === NavigationMenuItemType.VIEW) {- return <TintedIconTile Icon={Icon} color={effectiveColor} />;- }-- if (payload.type === NavigationMenuItemType.RECORD) {- return (- <Icon- size={theme.icon.size.md}- stroke={theme.icon.stroke.sm}- color={theme.grayScale.gray1}- />- );- }-- return <ColoredIcon Icon={Icon} color={effectiveColor} />;- };-- return (- <StyledIconSlot- $hasFixedSize={hasFixedIconSize || isDefined(customIconContent)}- $disabled={disabled}- $disableDrag={disableDrag}- >- {renderIcon()}- </StyledIconSlot>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationItemDropTarget.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationItemDropTarget.tsxindex 149fc937fcc..0d792d1900f 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationItemDropTarget.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/NavigationItemDropTarget.tsx@@ -1,3 +1,5 @@+import { type NavigationDrawerSubItemState } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerSubItemState';+import { NavigationMenuItemInsertionPreview } from '@/navigation-menu-item/edit/components/NavigationMenuItemInsertionPreview';import { styled } from '@linaria/react';import { type ReactNode, useContext } from 'react';import { themeCssVariables } from 'twenty-ui/theme-constants';@@ -52,6 +54,7 @@ type NavigationItemDropTargetProps = {compact?: boolean;dropTargetIdOverride?: string;highlightPosition?: 'top' | 'bottom';+ previewSubItemState?: NavigationDrawerSubItemState;};export const NavigationItemDropTarget = ({@@ -62,6 +65,7 @@ export const NavigationItemDropTarget = ({compact = false,dropTargetIdOverride,highlightPosition = 'bottom',+ previewSubItemState,}: NavigationItemDropTargetProps) => {const { activeDropTargetId, forbiddenDropTargetId } = useContext(NavigationDropTargetContext,@@ -78,6 +82,12 @@ export const NavigationItemDropTarget = ({data-drag-over={isDragOver && !isDropForbidden ? 'true' : undefined}data-drop-forbidden={isDropForbidden ? 'true' : undefined}>+ <NavigationMenuItemInsertionPreview+ folderId={folderId}+ index={index}+ sectionId={sectionId}+ subItemState={previewSubItemState}+ />{children}</StyledDropTarget>);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop.tsdeleted file mode 100644index b5fc9f534ea..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop.ts+++ /dev/null@@ -1,242 +0,0 @@-import { t } from '@lingui/core/macro';-import { useStore } from 'jotai';-import { useCallback } from 'react';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { isDefined, normalizeUrl } from 'twenty-shared/utils';-import { IconFolder, IconLink, useIcons } from 'twenty-ui/icon';--import { useEnterLayoutCustomizationMode } from '@/layout-customization/hooks/useEnterLayoutCustomizationMode';-import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';-import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink';-import { addToNavPayloadRegistryState } from '@/navigation-menu-item/common/states/addToNavPayloadRegistryState';-import { navigationMenuItemEditSectionState } from '@/navigation-menu-item/common/states/navigationMenuItemEditSectionState';-import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';-import { canNavigationMenuItemBeDroppedIn } from '@/navigation-menu-item/common/utils/canNavigationMenuItemBeDroppedIn';-import { getObjectMetadataIdsInDraft } from '@/navigation-menu-item/common/utils/getObjectMetadataIdsInDraft';-import { validateAndExtractWorkspaceFolderId } from '@/navigation-menu-item/common/utils/validateAndExtractWorkspaceFolderId';-import {- type NewNavigationMenuItemInput,- useNavigationMenuItemEditController,-} from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { viewsSelector } from '@/views/states/selectors/viewsSelector';--import type { NavigationMenuItemDropResult } from '@/navigation-menu-item/common/types/navigationMenuItemDropResult';--export const useHandleAddToNavigationDrop = () => {- const store = useStore();- const { currentItems, createItem } = useNavigationMenuItemEditController();- const { openNavigationMenuItemInSidePanel } =- useOpenNavigationMenuItemInSidePanel();- const { objectMetadataItems } = useObjectMetadataItems();- const views = useAtomStateValue(viewsSelector);- const { getIcon } = useIcons();- const { enterLayoutCustomizationMode } = useEnterLayoutCustomizationMode();- const setOpenNavigationMenuItemFolderIds = useSetAtomState(- openNavigationMenuItemFolderIdsState,- );-- const handleAddToNavigationDrop = useCallback(- (result: NavigationMenuItemDropResult) => {- // Drag-to-add always targets the workspace sidebar; favorites are added- // by click only.- if (store.get(navigationMenuItemEditSectionState.atom) === 'favorite') {- return;- }-- const { source, destination, draggableId } = result;- if (- source.droppableId !== ADD_TO_NAV_SOURCE_DROPPABLE_ID ||- !destination ||- !canNavigationMenuItemBeDroppedIn({- navigationMenuItemSection: 'workspace',- droppableId: destination.droppableId,- })- ) {- return;- }-- const payload =- store.get(addToNavPayloadRegistryState.atom).get(draggableId) ?? null;- if (!payload) {- return;- }-- const folderId = validateAndExtractWorkspaceFolderId(- destination.droppableId,- );- const index = destination.index;-- if (payload.type === NavigationMenuItemType.FOLDER && folderId !== null) {- return;- }-- if (isDefined(folderId)) {- setOpenNavigationMenuItemFolderIds((current) =>- current.includes(folderId) ? current : [...current, folderId],- );- }-- // Enter customization mode first: it (re)seeds the workspace draft from- // the live items, so creating beforehand would have the new item- // overwritten. It also bails without enabling the mode when a dashboard- // is mid-edit, so skip the create unless the mode is actually on —- // otherwise the item lands in a draft that is neither shown nor saved.- const addToWorkspaceAndOpenEdit = (- input: NewNavigationMenuItemInput,- position: { targetFolderId: string | null; targetIndex: number },- openOptions: Omit<- Parameters<typeof openNavigationMenuItemInSidePanel>[0],- 'itemId'- >,- ) => {- enterLayoutCustomizationMode();- if (!store.get(isLayoutCustomizationModeEnabledState.atom)) {- return;- }- const newItemId = createItem(input, position);- openNavigationMenuItemInSidePanel({- ...openOptions,- itemId: newItemId,- });- };-- switch (payload.type) {- case NavigationMenuItemType.FOLDER: {- addToWorkspaceAndOpenEdit(- {- type: NavigationMenuItemType.FOLDER,- name: payload.name,- color: DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER,- },- { targetFolderId: null, targetIndex: index },- {- pageTitle: t`Edit folder`,- pageIcon: IconFolder,- focusTitleInput: true,- },- );- return;- }- case NavigationMenuItemType.LINK: {- addToWorkspaceAndOpenEdit(- {- type: NavigationMenuItemType.LINK,- name: payload.name || t`Link label`,- link: normalizeUrl(payload.link),- color: DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK,- },- { targetFolderId: folderId, targetIndex: index },- {- pageTitle: t`Edit link`,- pageIcon: IconLink,- focusTitleInput: true,- },- );- return;- }- case NavigationMenuItemType.OBJECT: {- if (- getObjectMetadataIdsInDraft(currentItems).has(- payload.objectMetadataId,- )- ) {- return;- }- const objectMetadataItem = objectMetadataItems.find(- (item) => item.id === payload.objectMetadataId,- );- addToWorkspaceAndOpenEdit(- {- type: NavigationMenuItemType.OBJECT,- targetObjectMetadataId: payload.objectMetadataId,- color:- payload.iconColor ??- (objectMetadataItem- ? getObjectColorWithFallback(objectMetadataItem)- : undefined),- },- { targetFolderId: folderId, targetIndex: index },- {- pageTitle: objectMetadataItem?.labelPlural ?? payload.label,- pageIcon: objectMetadataItem- ? getIcon(objectMetadataItem.icon)- : IconFolder,- },- );- return;- }- case NavigationMenuItemType.VIEW: {- const view = views.find((v) => v.id === payload.viewId);- const viewObjectMetadataItem = view- ? objectMetadataItems.find(- (item) => item.id === view.objectMetadataId,- )- : undefined;- addToWorkspaceAndOpenEdit(- {- type: NavigationMenuItemType.VIEW,- viewId: payload.viewId,- color: viewObjectMetadataItem- ? getObjectColorWithFallback(viewObjectMetadataItem)- : undefined,- },- { targetFolderId: folderId, targetIndex: index },- {- pageTitle: view?.name ?? payload.label,- pageIcon: view ? getIcon(view.icon) : IconFolder,- },- );- return;- }- case NavigationMenuItemType.RECORD: {- if (!isDefined(payload.objectMetadataId)) {- return;- }- const objectMetadataItem = objectMetadataItems.find(- (item) => item.id === payload.objectMetadataId,- );- addToWorkspaceAndOpenEdit(- {- type: NavigationMenuItemType.RECORD,- targetObjectMetadataId: payload.objectMetadataId,- targetRecordId: payload.recordId,- targetRecordIdentifier: {- id: payload.recordId,- labelIdentifier: payload.label,- imageIdentifier: payload.imageUrl ?? null,- },- },- { targetFolderId: folderId, targetIndex: index },- {- pageTitle: payload.label,- pageIcon: objectMetadataItem- ? getIcon(objectMetadataItem.icon)- : IconFolder,- },- );- return;- }- }- },- [- createItem,- currentItems,- views,- getIcon,- objectMetadataItems,- openNavigationMenuItemInSidePanel,- setOpenNavigationMenuItemFolderIds,- enterLayoutCustomizationMode,- store,- ],- );-- return { handleAddToNavigationDrop };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useIsDropDisabledForSection.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useIsDropDisabledForSection.tsindex bebbc132a44..5246cd46059 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useIsDropDisabledForSection.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useIsDropDisabledForSection.ts@@ -1,4 +1,3 @@-import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';import { NavigationDragSourceContext } from '@/navigation-menu-item/common/contexts/NavigationDragSourceContext';import { canNavigationMenuItemBeDroppedIn } from '@/navigation-menu-item/common/utils/canNavigationMenuItemBeDroppedIn';import { useContext } from 'react';@@ -9,9 +8,6 @@ export const useIsDropDisabledForSection = (isWorkspaceSection: boolean) => {if (!isDefined(sourceDroppableId)) {return false;}- if (sourceDroppableId === ADD_TO_NAV_SOURCE_DROPPABLE_ID) {- return !isWorkspaceSection;- }const sourceIsWorkspace = canNavigationMenuItemBeDroppedIn({navigationMenuItemSection: 'workspace',droppableId: sourceDroppableId,diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useNavigationMenuItemDndKit.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useNavigationMenuItemDndKit.tsindex 69a9f1e90f7..af07f65684b 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useNavigationMenuItemDndKit.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/hooks/useNavigationMenuItemDndKit.ts@@ -1,12 +1,8 @@import { isSortable } from '@dnd-kit/react/sortable';-import { useStore } from 'jotai';import { useCallback, useState } from 'react';import { isDefined } from 'twenty-shared/utils';-import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';-import { NAVIGATION_MENU_ITEM_SECTION_DROPPABLE_CONFIG } from '@/navigation-menu-item/common/constants/NavigationMenuItemSectionDroppableConfig';import { NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';-import { addToNavPayloadRegistryState } from '@/navigation-menu-item/common/states/addToNavPayloadRegistryState';import type { DraggableData } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDraggableData';import type { DropDestination } from '@/navigation-menu-item/common/types/navigationMenuItemDndKitDropDestination';import type { NavigationMenuItemDropResult } from '@/navigation-menu-item/common/types/navigationMenuItemDropResult';@@ -14,13 +10,10 @@ import type { SortableTargetDestination } from '@/navigation-menu-item/common/tyimport type { NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';import { canNavigationMenuItemBeDroppedIn } from '@/navigation-menu-item/common/utils/canNavigationMenuItemBeDroppedIn';import { extractFolderIdFromDroppableId } from '@/navigation-menu-item/common/utils/extractFolderIdFromDroppableId';-import { getDndKitDropTargetId } from '@/navigation-menu-item/common/utils/getDndKitDropTargetId';import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';-import { useHandleAddToNavigationDrop } from '@/navigation-menu-item/display/dnd/hooks/useHandleAddToNavigationDrop';import { useHandleNavigationMenuItemDragAndDrop } from '@/navigation-menu-item/display/dnd/hooks/useHandleNavigationMenuItemDragAndDrop';import { resolveDropTarget } from '@/navigation-menu-item/display/dnd/utils/navigationMenuItemDndKitResolveDropTarget';import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';-import { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';import { useNavigationMenuItemsDraftState } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemsDraftState';import { type DragDropProviderDragEndEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragEndEvent';import { type DragDropProviderDragOverEvent } from '@/ui/utilities/drag-and-drop/types/DragDropProviderDragOverEvent';@@ -38,7 +31,6 @@ export type NavigationMenuItemDndKitContextValues = {setActiveDropTargetId: (id: string | null) => void;forbiddenDropTargetId: string | null;setForbiddenDropTargetId: (id: string | null) => void;- addToNavigationFallbackDestination: DropDestination | null;};};@@ -56,8 +48,6 @@ export const useNavigationMenuItemDndKit = (section === NavigationSections.FAVORITES ? 'favorite' : 'workspace';const isWorkspaceSection = sectionType === 'workspace';- const store = useStore();-const [isDragging, setIsDragging] = useState(false);const [sourceDroppableId, setSourceDroppableId] = useState<string | null>(null,@@ -68,15 +58,10 @@ export const useNavigationMenuItemDndKit = (const [forbiddenDropTargetId, setForbiddenDropTargetId] = useState<string | null>(null);- const [- addToNavigationFallbackDestination,- setAddToNavigationFallbackDestination,- ] = useState<DropDestination | null>(null);+ const [] = useState<DropDestination | null>(null);const { navigationMenuItems } = useNavigationMenuItemsData();- const { navigationMenuItemsSorted } = useSortedNavigationMenuItems();const { workspaceNavigationMenuItems } = useNavigationMenuItemsDraftState();- const { handleAddToNavigationDrop } = useHandleAddToNavigationDrop();const { handleNavigationMenuItemDragAndDrop } =useHandleNavigationMenuItemDragAndDrop(sectionType);@@ -84,55 +69,28 @@ export const useNavigationMenuItemDndKit = (? workspaceNavigationMenuItems: navigationMenuItems;- const orphanItems = isWorkspaceSection- ? workspaceNavigationMenuItems- : navigationMenuItemsSorted;-- const orphanItemCount = orphanItems.filter(- (item: { folderId?: string | null }) => !isDefined(item.folderId),- ).length;-- const { orphanDroppableId: defaultOrphanDroppableId } =- NAVIGATION_MENU_ITEM_SECTION_DROPPABLE_CONFIG[sectionType];-const getNavItemById = useCallback((id: string | undefined) =>id ? items.find((item) => item.id === id) : undefined,[items],);- const getAddToNavPayload = useCallback(- (sourceId: unknown) =>- store.get(addToNavPayloadRegistryState.atom).get(String(sourceId)) ??- null,- [store],- );-const isSourceFolderDrag = useCallback((source: { id?: unknown; data?: unknown } | null): boolean => {const sourceItem = getNavItemById(source?.id != null ? String(source.id) : undefined,);- if (isDefined(sourceItem) && isNavigationMenuItemFolder(sourceItem)) {- return true;- }- const payload = getAddToNavPayload(source?.id);- return payload?.type === 'FOLDER';+ return isDefined(sourceItem) && isNavigationMenuItemFolder(sourceItem);},- [getNavItemById, getAddToNavPayload],+ [getNavItemById],);const computeForbiddenTargetId = useCallback((source: { id?: unknown; data?: unknown } | null,resolved: SortableTargetDestination,- isAddToNavDrag: boolean,): string | null => {- const sourceIsFolder = isAddToNavDrag- ? getAddToNavPayload(source?.id)?.type === 'FOLDER'- : isSourceFolderDrag(source);-- if (!sourceIsFolder) {+ if (!isSourceFolderDrag(source)) {return null;}@@ -150,7 +108,7 @@ export const useNavigationMenuItemDndKit = (return null;},- [sectionType, getAddToNavPayload, isSourceFolderDrag],+ [sectionType, isSourceFolderDrag],);const applyWorkspaceReorder = useCallback(@@ -177,20 +135,6 @@ export const useNavigationMenuItemDndKit = (const source = operation.source;const sourceId = source?.data?.sourceDroppableId ?? null;setSourceDroppableId(sourceId);-- if (sourceId === ADD_TO_NAV_SOURCE_DROPPABLE_ID) {- const defaultDestination: DropDestination = {- droppableId: defaultOrphanDroppableId,- index: orphanItemCount,- };- setAddToNavigationFallbackDestination(defaultDestination);- setActiveDropTargetId(- getDndKitDropTargetId(- defaultDestination.droppableId,- defaultDestination.index,- ),- );- }};const handleDragOver = useCallback(@@ -198,8 +142,6 @@ export const useNavigationMenuItemDndKit = (const { operation } = event;const source = operation.source;const target = operation.target;- const isAddToNavDrag =- sourceDroppableId === ADD_TO_NAV_SOURCE_DROPPABLE_ID;const sourceIsSortable = source !== null && isSortable(source);const resolved = resolveDropTarget(target, getNavItemById, sectionType);@@ -210,52 +152,17 @@ export const useNavigationMenuItemDndKit = (isSortable(source) &&isSortable(target)) {- const forbiddenId = isAddToNavDrag- ? computeForbiddenTargetId(source, resolved, true)- : computeForbiddenTargetId(source, resolved, false);-setActiveDropTargetId(resolved.dropTargetId);- setForbiddenDropTargetId(forbiddenId);+ setForbiddenDropTargetId(computeForbiddenTargetId(source, resolved));return;}if (resolved !== null && sourceIsSortable) {setActiveDropTargetId(resolved.effectiveDropTargetId);- setAddToNavigationFallbackDestination(resolved.destination);- setForbiddenDropTargetId(- computeForbiddenTargetId(source, resolved, isAddToNavDrag),- );- return;+ setForbiddenDropTargetId(computeForbiddenTargetId(source, resolved));}-- if (!isAddToNavDrag) {- return;- }-- if (resolved !== null) {- setAddToNavigationFallbackDestination(resolved.destination);- setActiveDropTargetId(resolved.effectiveDropTargetId);- setForbiddenDropTargetId(- computeForbiddenTargetId(source, resolved, true),- );- return;- }-- const fallback = addToNavigationFallbackDestination;- setActiveDropTargetId(- fallback- ? getDndKitDropTargetId(fallback.droppableId, fallback.index)- : null,- );- setForbiddenDropTargetId(null);},- [- sourceDroppableId,- addToNavigationFallbackDestination,- getNavItemById,- sectionType,- computeForbiddenTargetId,- ],+ [getNavItemById, sectionType, computeForbiddenTargetId],);const handleDragEnd = (event: DragEndPayload) => {@@ -265,13 +172,11 @@ export const useNavigationMenuItemDndKit = (const draggableId = String(source?.id);const data = source?.data;const sourceId = data?.sourceDroppableId ?? null;- const fallback = addToNavigationFallbackDestination;setIsDragging(false);setSourceDroppableId(null);setActiveDropTargetId(null);setForbiddenDropTargetId(null);- setAddToNavigationFallbackDestination(null);const sourceIsSortable = source !== null && isSortable(source);const targetIsSortable = target !== null && isSortable(target);@@ -311,20 +216,9 @@ export const useNavigationMenuItemDndKit = (}}- let destination: DropDestination | null = resolved?.destination ?? null;+ const destination: DropDestination | null = resolved?.destination ?? null;const insertBeforeItemId = resolved?.insertBeforeItemId;- if (- destination == null &&- isDefined(fallback) &&- canNavigationMenuItemBeDroppedIn({- navigationMenuItemSection: sectionType,- droppableId: fallback.droppableId,- })- ) {- destination = fallback;- }-const dropResult: NavigationMenuItemDropResult = {draggableId,source: {@@ -335,11 +229,6 @@ export const useNavigationMenuItemDndKit = (...(insertBeforeItemId != null && { insertBeforeItemId }),};- if (sourceId === ADD_TO_NAV_SOURCE_DROPPABLE_ID) {- handleAddToNavigationDrop(dropResult);- return;- }-if (isWorkspaceSection) {if (isDefined(sourceId) &&@@ -377,7 +266,6 @@ export const useNavigationMenuItemDndKit = (setActiveDropTargetId,forbiddenDropTargetId,setForbiddenDropTargetId,- addToNavigationFallbackDestination,},};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolder.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolder.tsxindex 657ceaaeb56..06313d459bd 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolder.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolder.tsx@@ -1,3 +1,4 @@+import { NavigationMenuItemEditable } from '@/navigation-menu-item/edit/components/NavigationMenuItemEditable';import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';import { NavigationMenuItemFolderChevron } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevron';import { Suspense, lazy } from 'react';@@ -54,6 +55,7 @@ export const NavigationMenuItemFolder = ({if (readOnly) {return (<NavigationMenuItemFolderReadOnlyContent+ item={item}folderId={folderId}folderName={folderName}folderIconKey={folderIconKey}@@ -68,6 +70,7 @@ export const NavigationMenuItemFolder = ({<Suspensefallback={<NavigationMenuItemFolderReadOnlyContent+ item={item}folderId={folderId}folderName={folderName}folderIconKey={folderIconKey}@@ -78,6 +81,7 @@ export const NavigationMenuItemFolder = ({}><LazyNavigationMenuItemFolderDnd+ item={item}folderId={folderId}folderName={folderName}folderIconKey={folderIconKey}@@ -95,6 +99,7 @@ export const NavigationMenuItemFolder = ({};type NavigationMenuItemFolderReadOnlyContentProps = {+ item: NavigationMenuItem;folderId: string;folderName: string;folderIconKey?: string | null;@@ -104,6 +109,7 @@ type NavigationMenuItemFolderReadOnlyContentProps = {};const NavigationMenuItemFolderReadOnlyContent = ({+ item,folderId,folderName,folderIconKey,@@ -124,22 +130,24 @@ const NavigationMenuItemFolderReadOnlyContent = ({return (<NavigationMenuItemFolderLayoutheader={- <NavigationDrawerItem- label={folderName}- Icon={() => (- <ColoredIcon- Icon={FolderIcon}- color={folderColor ?? DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER}- />- )}- active={!isOpen && hasActiveChild}- onClick={handleToggle}- className="navigation-drawer-item"- triggerEvent="CLICK"- preventCollapseOnMobile={isMobile}- alwaysShowRightOptions- rightOptions={<NavigationMenuItemFolderChevron isOpen={isOpen} />}- />+ <NavigationMenuItemEditable item={item}>+ <NavigationDrawerItem+ label={folderName}+ Icon={() => (+ <ColoredIcon+ Icon={FolderIcon}+ color={folderColor ?? DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER}+ />+ )}+ active={!isOpen && hasActiveChild}+ onClick={handleToggle}+ className="navigation-drawer-item"+ triggerEvent="CLICK"+ preventCollapseOnMobile={isMobile}+ alwaysShowRightOptions+ rightOptions={<NavigationMenuItemFolderChevron isOpen={isOpen} />}+ />+ </NavigationMenuItemEditable>}isOpen={isOpen}isGroup={isGroup}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsxnew file mode 100644index 00000000000..320ba59b460--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsx@@ -0,0 +1,49 @@+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import type React from 'react';+import { IconChevronRight } from 'twenty-ui/icon';+import { LightIconButton } from 'twenty-ui/primitives/input';+import { themeCssVariables } from 'twenty-ui/theme-constants';++// Rotating a wrapper around the button keeps the icon component identity+// stable: passing an inline component to LightIconButton's Icon prop remounts+// the svg on every render, so the transition never runs.+const StyledButtonContainer = styled.span<{ isOpen: boolean }>`+ display: inline-flex;++ svg {+ transform: rotate(${({ isOpen }) => (isOpen ? 90 : 0)}deg);+ transition: transform+ calc(${themeCssVariables.animation.duration.normal} * 1s) ease;+ }++ @media (prefers-reduced-motion: reduce) {+ svg {+ transition: none;+ }+ }+`;++type NavigationMenuItemFolderChevronButtonProps = {+ isOpen: boolean;+ onClick: (event: React.MouseEvent<HTMLButtonElement>) => void;+};++export const NavigationMenuItemFolderChevronButton = ({+ isOpen,+ onClick,+}: NavigationMenuItemFolderChevronButtonProps) => {+ const { t } = useLingui();++ return (+ <StyledButtonContainer isOpen={isOpen}>+ <LightIconButton+ Icon={IconChevronRight}+ size="small"+ accent="tertiary"+ aria-label={isOpen ? t`Collapse folder` : t`Expand folder`}+ onClick={onClick}+ />+ </StyledButtonContainer>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsxindex 383b27f7abe..33639f78b69 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderDnd.tsx@@ -1,13 +1,16 @@+import { navigationMenuItemInsertionPreviewState } from '@/navigation-menu-item/common/states/navigationMenuItemInsertionPreviewState';+import { NavigationMenuItemEditable } from '@/navigation-menu-item/edit/components/NavigationMenuItemEditable';import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';import { NavigationMenuItemFolderChevron } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevron';+import { NavigationMenuItemFolderChevronButton } from '@/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton';import { NavigationMenuItemEntrance } from '@/navigation-menu-item/edit/components/NavigationMenuItemEntrance';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';-import React, { Fragment, useCallback, useContext } from 'react';+import React, { Fragment, useContext } from 'react';import { createPortal } from 'react-dom';import { isDefined } from 'twenty-shared/utils';-import { IconFolder, IconHeartOff, IconPlus, useIcons } from 'twenty-ui/icon';+import { IconHeartOff, IconPlus, useIcons } from 'twenty-ui/icon';import { LightIconButton } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme-constants';import { useIsMobile } from 'twenty-ui/utilities';@@ -39,11 +42,10 @@ import { useNavigationMenuItemFolderOpenState } from '@/navigation-menu-item/disimport { useIsNavigationMenuItemEditHighlighted } from '@/navigation-menu-item/display/hooks/useIsNavigationMenuItemEditHighlighted';import type { NavigationMenuItemClickParams } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemSectionItems';import { useFavoritesFolderEdit } from '@/navigation-menu-item/edit/folder/hooks/useFavoritesFolderEdit';-import { useOpenAddItemToFolderPage } from '@/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage';+import { NavigationMenuItemAddDropdown } from '@/navigation-menu-item/edit/components/NavigationMenuItemAddDropdown';import type { EditModeProps } from '@/object-metadata/components/EditModeProps';import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';-import { NavigationDrawerInput } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerInput';import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem';import { getNavigationSubItemLeftAdornment } from '@/ui/navigation/navigation-drawer/utils/getNavigationSubItemLeftAdornment';@@ -52,11 +54,12 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateconst StyledFolderContainer = styled.div<{$isSelectedInEditMode: boolean;}>`- border: ${({ $isSelectedInEditMode }) =>+ border-radius: ${themeCssVariables.border.radius.md};+ outline: ${({ $isSelectedInEditMode }) =>$isSelectedInEditMode? `1px solid ${themeCssVariables.color.blue}`: 'none'};- border-radius: ${themeCssVariables.border.radius.sm};+ outline-offset: -1px;transition: background-color 150ms ease-in-out;&[data-drag-over-header='true'] {@@ -68,12 +71,17 @@ const StyledFolderContainer = styled.div<{}`;+const StyledAddMenuItem = styled.div<{ isHidden: boolean }>`+ display: ${({ isHidden }) => (isHidden ? 'none' : 'contents')};+`;+const StyledFolderDroppableContent = styled.div`display: flex;flex-direction: column;`;type NavigationMenuItemFolderDndProps = {+ item: NavigationMenuItem;folderId: string;folderName: string;folderIconKey?: string | null;@@ -88,6 +96,7 @@ type NavigationMenuItemFolderDndProps = {};export const NavigationMenuItemFolderDnd = ({+ item,folderId,folderName,folderIconKey,@@ -108,9 +117,20 @@ export const NavigationMenuItemFolderDnd = ({);const isExpanded = isNavigationDrawerExpanded || isMobile;+ const navigationMenuItemInsertionPreview = useAtomStateValue(+ navigationMenuItemInsertionPreviewState,+ );const section: NavigationMenuItemSection = isEditInPlace? 'favorite': 'workspace';+ const insertionIndex =+ navigationMenuItemInsertionPreview?.section === section &&+ navigationMenuItemInsertionPreview.folderId === folderId+ ? navigationMenuItemInsertionPreview.index+ : null;+ const hasInsertionPreview = isDefined(insertionIndex);+ const isAddingFavoriteFolderItem = isEditInPlace && hasInsertionPreview;+const isWorkspace = !isEditInPlace;const sectionId = isEditInPlace? NavigationSections.FAVORITES@@ -136,14 +156,12 @@ export const NavigationMenuItemFolderDnd = ({const { deleteManyNavigationMenuItems } = useDeleteManyNavigationMenuItems();const favoritesEdit = useFavoritesFolderEdit({folderId,- folderName,navigationMenuItems,});const isLayoutCustomizationModeEnabled = useAtomStateValue(isLayoutCustomizationModeEnabledState,);- const { openAddItemToFolderPage } = useOpenAddItemToFolderPage();const isFolderEditHighlighted = useIsNavigationMenuItemEditHighlighted({id: folderId,folderId: null,@@ -186,34 +204,15 @@ export const NavigationMenuItemFolderDnd = ({const headerRightOptions = isEditInPlace ? (<NavigationMenuItemFolderNavigationDrawerItemDropdownfolderId={folderId}- onRename={() => favoritesEdit.setIsRenaming(true)}+ itemCount={navigationMenuItems.length}+ onEdit={favoritesEdit.startEditing}onDelete={favoritesEdit.handleFolderDelete}- closeDropdown={favoritesEdit.closeDropdown}/>) : (- <div- onClick={(event) => {- event.stopPropagation();- handleToggle();- }}- >- <NavigationMenuItemFolderChevron isOpen={isOpen} />- </div>+ <NavigationMenuItemFolderChevron isOpen={isOpen} />);- const headerOverride =- isEditInPlace && favoritesEdit.isRenaming ? (- <NavigationDrawerInput- Icon={IconFolder}- value={favoritesEdit.folderNameValue}- onChange={favoritesEdit.setFolderNameValue}- onSubmit={favoritesEdit.handleSubmitRename}- onCancel={favoritesEdit.handleCancelRename}- onClickOutside={favoritesEdit.handleClickOutsideRename}- />- ) : undefined;-- const header = headerOverride ?? (+ const header = (<NavigationDrawerItemlabel={folderName}Icon={() => <ColoredIcon Icon={FolderIcon} color={iconColor} />}@@ -225,7 +224,7 @@ export const NavigationMenuItemFolderDnd = ({isWorkspace && isFolderEditHighlighted && !isExpanded}onClick={handleHeaderClick}- rightOptions={headerRightOptions}+ rightOptions={shouldUseEditModeClick ? undefined : headerRightOptions}className="navigation-drawer-item"isRightOptionsDropdownOpen={isEditInPlace ? favoritesEdit.isDropdownOpen : undefined@@ -267,18 +266,23 @@ export const NavigationMenuItemFolderDnd = ({? isLayoutCustomizationModeEnabled || navigationMenuItems.length === 0: true;+ const showAddMenuItem = isEditInPlace+ ? navigationMenuItems.length === 0+ : isLayoutCustomizationModeEnabled;const folderContentLength =- isWorkspace && isLayoutCustomizationModeEnabled- ? navigationMenuItems.length + 1- : navigationMenuItems.length;-- const handleAddMenuItemToFolder = useCallback(() => {- openAddItemToFolderPage({- folderId,- position: navigationMenuItems.length,- resetNavigationStack: true,+ navigationMenuItems.length ++ (showAddMenuItem && !isAddingFavoriteFolderItem ? 1 : 0) ++ (hasInsertionPreview ? 1 : 0);+ const getIndexWithInsertionPreview = (index: number) =>+ isDefined(insertionIndex) && index >= insertionIndex ? index + 1 : index;+ const selectedIndexWithInsertionPreview =+ getIndexWithInsertionPreview(activeChildIndex);+ const getPreviewSubItemState = (index: number) =>+ getNavigationSubItemLeftAdornment({+ index,+ arrayLength: folderContentLength,+ selectedIndex: selectedIndexWithInsertionPreview,});- }, [folderId, navigationMenuItems.length, openAddItemToFolderPage]);const deleteModal =isEditInPlace && favoritesEdit.isModalOpened@@ -312,7 +316,25 @@ export const NavigationMenuItemFolderDnd = ({data-forbidden-drop-target={isForbiddenDropTarget ? 'true' : undefined}><NavigationMenuItemFolderLayout- header={wrappedHeader}+ header={+ <NavigationMenuItemEditable+ item={item}+ rightOptions={+ shouldUseEditModeClick &&+ isExpanded && (+ <NavigationMenuItemFolderChevronButton+ isOpen={isOpen}+ onClick={(event) => {+ event.stopPropagation();+ handleToggle();+ }}+ />+ )+ }+ >+ {wrappedHeader}+ </NavigationMenuItemEditable>+ }isOpen={isOpen}isGroup={isGroup}>@@ -324,6 +346,7 @@ export const NavigationMenuItemFolderDnd = ({index={index}sectionId={sectionId}compact={isCompact}+ previewSubItemState={getPreviewSubItemState(index)}dropTargetIdOverride={getDndKitDropTargetId(folderContentDroppableId,index,@@ -341,9 +364,9 @@ export const NavigationMenuItemFolderDnd = ({><NavigationMenuItemFolderSubItemnavigationMenuItem={navigationMenuItem}- index={index}+ index={getIndexWithInsertionPreview(index)}arrayLength={folderContentLength}- selectedIndex={activeChildIndex}+ selectedIndex={selectedIndexWithInsertionPreview}isDragging={isDragging}rightOptions={isEditInPlace ? (@@ -376,28 +399,40 @@ export const NavigationMenuItemFolderDnd = ({folderId={folderId}index={navigationMenuItems.length}sectionId={sectionId}- compact={isEditInPlace ? false : isCompact}+ compact={isCompact}+ previewSubItemState={getPreviewSubItemState(+ navigationMenuItems.length,+ )}dropTargetIdOverride={getDndKitDropTargetId(folderContentDroppableId,navigationMenuItems.length,)}/>- {isWorkspace && isLayoutCustomizationModeEnabled && (- <NavigationMenuItemEntrance>- <NavigationDrawerSubItem- label={t`Add menu item`}- Icon={IconPlus}- onClick={handleAddMenuItemToFolder}- triggerEvent="CLICK"- variant="tertiary"- isSelectedInEditMode={false}- subItemState={getNavigationSubItemLeftAdornment({- index: navigationMenuItems.length,- arrayLength: folderContentLength,- selectedIndex: -1,- })}- />- </NavigationMenuItemEntrance>+ {showAddMenuItem && (+ <StyledAddMenuItem isHidden={isAddingFavoriteFolderItem}>+ <NavigationMenuItemEntrance>+ <NavigationMenuItemAddDropdown+ folderId={folderId}+ section={section}+ position={navigationMenuItems.length}+ >+ <NavigationDrawerSubItem+ label={t`Add menu item`}+ Icon={IconPlus}+ triggerEvent="CLICK"+ variant="tertiary"+ isSelectedInEditMode={false}+ subItemState={getNavigationSubItemLeftAdornment({+ index: getIndexWithInsertionPreview(+ navigationMenuItems.length,+ ),+ arrayLength: folderContentLength,+ selectedIndex: -1,+ })}+ />+ </NavigationMenuItemAddDropdown>+ </NavigationMenuItemEntrance>+ </StyledAddMenuItem>)}</NavigationMenuItemDroppableSlot></StyledFolderDroppableContent>diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsxindex b2be484b866..ee9f96ee0f3 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderNavigationDrawerItemDropdown.tsx@@ -1,63 +1,72 @@import { useLingui } from '@lingui/react/macro';-import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/icon';+import {+ IconDotsVertical,+ IconEdit,+ IconPlus,+ IconTrash,+} from 'twenty-ui/icon';import { LightIconButton } from 'twenty-ui/primitives/input';import { MenuItem } from 'twenty-ui/primitives/navigation';-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { NavigationMenuItemMenu } from '@/navigation-menu-item/edit/components/NavigationMenuItemMenu';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';type NavigationMenuItemFolderNavigationDrawerItemDropdownProps = {folderId: string;- onRename: () => void;+ itemCount: number;+ onEdit: () => void;onDelete: () => void;- closeDropdown: () => void;};export const NavigationMenuItemFolderNavigationDrawerItemDropdown = ({folderId,- onRename,+ itemCount,+ onEdit,onDelete,- closeDropdown,}: NavigationMenuItemFolderNavigationDrawerItemDropdownProps) => {const { t } = useLingui();- const handleRename = () => {- closeDropdown();- onRename();- };-- const handleDelete = () => {- closeDropdown();- onDelete();- };+ const dropdownId = `navigation-menu-item-folder-edit-${folderId}`;return (- <Dropdown- dropdownId={`navigation-menu-item-folder-edit-${folderId}`}- data-select-disable+ <NavigationMenuItemMenu+ section="favorite"+ dropdownId={dropdownId}clickableComponent={<LightIconButton Icon={IconDotsVertical} accent="tertiary" />}dropdownPlacement="bottom-start"- dropdownComponents={- <DropdownContent widthInPixels={GenericDropdownContentWidth.Narrow}>+ renderMenu={({ onClose, onAdd }) => (+ <DropdownContent widthInPixels={GenericDropdownContentWidth.Large}><DropdownMenuItemsContainer><MenuItem- LeftIcon={IconPencil}- onClick={handleRename}+ LeftIcon={IconEdit}+ onClick={() => {+ onClose();+ onEdit();+ }}accent="default"- text={t`Rename`}+ text={t`Edit`}+ />+ <MenuItem+ LeftIcon={IconPlus}+ onClick={() => onAdd({ folderId, position: itemCount })}+ accent="default"+ text={t`Add menu item`}/><MenuItemLeftIcon={IconTrash}- onClick={handleDelete}+ onClick={() => {+ onClose();+ onDelete();+ }}accent="danger"- text={t`Delete`}+ text={t`Remove from sidebar`}/></DropdownMenuItemsContainer></DropdownContent>- }+ )}/>);};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsxindex f70b8645f89..0d33a0e54e1 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx@@ -1,3 +1,4 @@+import { NavigationMenuItemEditable } from '@/navigation-menu-item/edit/components/NavigationMenuItemEditable';import { useLingui } from '@lingui/react/macro';import { type ReactNode } from 'react';import { FeatureFlagKey, NavigationMenuItemType } from 'twenty-shared/types';@@ -137,24 +138,26 @@ export const NavigationMenuItemFolderSubItem = ({: viewSecondaryLabel;return (- <NavigationDrawerSubItem- secondaryLabel={secondaryLabel}- label={label}- Icon={() => (- <NavigationMenuItemIcon navigationMenuItem={navigationMenuItem} />- )}- to={isDragging || isEditable ? undefined : computedLink}- onClick={handleClick}- active={isActive}- isSelectedInEditMode={isEditHighlightedInNavigationMenu}- subItemState={getNavigationSubItemLeftAdornment({- index,- arrayLength,- selectedIndex,- })}- rightOptions={rightOptions}- isDragging={isDragging}- triggerEvent="CLICK"- />+ <NavigationMenuItemEditable item={navigationMenuItem}>+ <NavigationDrawerSubItem+ secondaryLabel={secondaryLabel}+ label={label}+ Icon={() => (+ <NavigationMenuItemIcon navigationMenuItem={navigationMenuItem} />+ )}+ to={isDragging || isEditable ? undefined : computedLink}+ onClick={handleClick}+ active={isActive}+ isSelectedInEditMode={isEditHighlightedInNavigationMenu}+ subItemState={getNavigationSubItemLeftAdornment({+ index,+ arrayLength,+ selectedIndex,+ })}+ rightOptions={rightOptions}+ isDragging={isDragging}+ triggerEvent="CLICK"+ />+ </NavigationMenuItemEditable>);};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/__tests__/useReadableNavigationMenuItems.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/__tests__/useReadableNavigationMenuItems.test.tsnew file mode 100644index 00000000000..f0e82131d80--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/__tests__/useReadableNavigationMenuItems.test.ts@@ -0,0 +1,65 @@+import { renderHook } from '@testing-library/react';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';++import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';+import { useReadableNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useReadableNavigationMenuItems';++jest.mock('@/ui/utilities/state/jotai/hooks/useAtomStateValue', () => ({+ useAtomStateValue: (state: unknown) =>+ state === isLayoutCustomizationModeEnabledState ? false : [],+}));+jest.mock('@/object-record/hooks/useObjectPermissions', () => ({+ useObjectPermissions: () => ({ objectPermissionsByObjectMetadataId: {} }),+}));++const FOLDER: NavigationMenuItem = {+ id: 'folder',+ type: NavigationMenuItemType.FOLDER,+ name: 'New folder',+ position: 0,+ createdAt: '',+ updatedAt: '',+};++describe('useReadableNavigationMenuItems', () => {+ it('keeps empty Favorites folders visible for renaming and adding items', () => {+ const folder = { ...FOLDER, userWorkspaceId: 'user-workspace' };+ const { result } = renderHook(() =>+ useReadableNavigationMenuItems({+ topLevelItems: [folder],+ folderChildrenById: new Map(),+ }),+ );+ expect(result.current.displayTopLevelItems).toEqual([folder]);+ });++ it('continues hiding empty workspace folders outside customization', () => {+ const { result } = renderHook(() =>+ useReadableNavigationMenuItems({+ topLevelItems: [FOLDER],+ folderChildrenById: new Map(),+ }),+ );+ expect(result.current.displayTopLevelItems).toEqual([]);+ });++ it('keeps the Favorites folder without exposing unreadable children', () => {+ const folder = { ...FOLDER, userWorkspaceId: 'user-workspace' };+ const unreadableItem = {+ ...FOLDER,+ id: 'object',+ folderId: folder.id,+ type: NavigationMenuItemType.OBJECT,+ targetObjectMetadataId: 'inaccessible',+ };+ const { result } = renderHook(() =>+ useReadableNavigationMenuItems({+ topLevelItems: [folder],+ folderChildrenById: new Map([[folder.id, [unreadableItem]]]),+ }),+ );+ expect(result.current.displayTopLevelItems).toEqual([folder]);+ expect(result.current.displayFolderChildrenById.get(folder.id)).toEqual([]);+ });+});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useIsNavigationMenuItemEditHighlighted.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useIsNavigationMenuItemEditHighlighted.tsindex b340214b5dd..96d837e495d 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useIsNavigationMenuItemEditHighlighted.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useIsNavigationMenuItemEditHighlighted.ts@@ -1,29 +1,7 @@-import { SidePanelPages } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';--import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-export const useIsNavigationMenuItemEditHighlighted = (- navigationMenuItem: Pick<NavigationMenuItem, 'id' | 'folderId'>,-): boolean => {- const selectedNavigationMenuItemIdInEditMode = useAtomStateValue(- selectedNavigationMenuItemIdInEditModeState,- );- const pendingInsertionNavigationMenuItem = useAtomStateValue(- pendingInsertionNavigationMenuItemState,- );- const sidePanelPage = useAtomStateValue(sidePanelPageInfoSelector).page;-- const isSelectedById =- selectedNavigationMenuItemIdInEditMode === navigationMenuItem.id;- const isPendingInsertionMatch =- isDefined(pendingInsertionNavigationMenuItem) &&- pendingInsertionNavigationMenuItem.folderId === navigationMenuItem.id &&- (sidePanelPage === SidePanelPages.NavigationMenuAddItem ||- sidePanelPage === SidePanelPages.NavigationMenuItemEdit);- return isSelectedById || isPendingInsertionMatch;-};+ item: Pick<NavigationMenuItem, 'id' | 'folderId'>,+): boolean =>+ useAtomStateValue(selectedNavigationMenuItemIdInEditModeState) === item.id;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useReadableNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useReadableNavigationMenuItems.tsindex 61949c136e0..0932beeb668 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useReadableNavigationMenuItems.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useReadableNavigationMenuItems.ts@@ -1,4 +1,5 @@import { type NavigationMenuItem } from '~/generated-metadata/graphql';+import { isDefined } from 'twenty-shared/utils';import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';@@ -39,7 +40,8 @@ export const useReadableNavigationMenuItems = ({const filteredTopLevelItems = topLevelItems.filter((item) =>isNavigationMenuItemFolder(item)- ? (filteredFolderChildrenById.get(item.id) ?? []).length > 0+ ? isDefined(item.userWorkspaceId) ||+ (filteredFolderChildrenById.get(item.id) ?? []).length > 0: isItemReadable(item),);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/__tests__/extractDomainFromUrl.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/__tests__/extractDomainFromUrl.test.tsdeleted file mode 100644index 631b32bf89b..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/__tests__/extractDomainFromUrl.test.ts+++ /dev/null@@ -1,15 +0,0 @@-import { extractDomainFromUrl } from '@/navigation-menu-item/display/link/utils/extractDomainFromUrl';--describe('extractDomainFromUrl', () => {- it('returns hostname and strips www prefix', () => {- expect(extractDomainFromUrl('https://www.example.com/path')).toBe(- 'example.com',- );- expect(extractDomainFromUrl('https://example.com')).toBe('example.com');- });-- it('returns undefined for invalid URLs', () => {- expect(extractDomainFromUrl('not-a-url')).toBeUndefined();- expect(extractDomainFromUrl('')).toBeUndefined();- });-});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/extractDomainFromUrl.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/extractDomainFromUrl.tsdeleted file mode 100644index 1f07dff8d5b..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/display/link/utils/extractDomainFromUrl.ts+++ /dev/null@@ -1,8 +0,0 @@-export const extractDomainFromUrl = (url: string): string | undefined => {- try {- const hostname = new URL(url).hostname;- return hostname.replace(/^www\./, '') || undefined;- } catch {- return undefined;- }-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsxindex 8205dd2cc39..8e89750e9eb 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSection.tsx@@ -1,8 +1,8 @@+import { NavigationMenuItemAddDropdown } from '@/navigation-menu-item/edit/components/NavigationMenuItemAddDropdown';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { useCallback, useContext, useMemo } from 'react';-import { SidePanelPages } from 'twenty-shared/types';-import { IconHeart, IconHeartOff, IconPlus } from 'twenty-ui/icon';+import { IconHeartOff, IconPlus } from 'twenty-ui/icon';import { LightIconButton } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme-constants';import { type NavigationMenuItem } from '~/generated-metadata/graphql';@@ -11,9 +11,6 @@ import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/coimport { NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';import { NavigationMenuItemDragContext } from '@/navigation-menu-item/common/contexts/NavigationMenuItemDragContext';import { useDeleteManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useDeleteManyNavigationMenuItems';-import { navigationMenuItemEditSectionState } from '@/navigation-menu-item/common/states/navigationMenuItemEditSectionState';-import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';import { NavigationMenuItemDisplay } from '@/navigation-menu-item/display/components/NavigationMenuItemDisplay';import { NavigationMenuItemDroppableSlot } from '@/navigation-menu-item/display/dnd/components/NavigationMenuItemDroppableSlot';@@ -24,11 +21,9 @@ import { useReadableNavigationMenuItems } from '@/navigation-menu-item/display/himport { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';import { NavigationMenuItemOrphanDropTarget } from '@/navigation-menu-item/display/sections/components/NavigationMenuItemOrphanDropTarget';import { NavigationMenuItemSection } from '@/navigation-menu-item/display/sections/components/NavigationMenuItemSection';-import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';import { useNavigationSection } from '@/ui/navigation/navigation-drawer/hooks/useNavigationSection';import { isNavigationSectionOpenFamilyState } from '@/ui/navigation/navigation-drawer/states/isNavigationSectionOpenFamilyState';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';const StyledList = styled.div`display: flex;@@ -52,17 +47,6 @@ export const FavoritesSection = () => {const { isDragging } = useContext(NavigationMenuItemDragContext);const favoritesDropDisabled = useIsDropDisabledForSection(false);- const { navigateSidePanel } = useNavigateSidePanel();- const setNavigationMenuItemEditSection = useSetAtomState(- navigationMenuItemEditSectionState,- );- const setPendingInsertionNavigationMenuItem = useSetAtomState(- pendingInsertionNavigationMenuItemState,- );- const setSelectedNavigationMenuItemIdInEditMode = useSetAtomState(- selectedNavigationMenuItemIdInEditModeState,- );-const { t } = useLingui();const { toggleNavigationSection, openNavigationSection } =@@ -98,20 +82,6 @@ export const FavoritesSection = () => {[topLevelItems],);- const handleAddFavorite = (event?: React.MouseEvent) => {- event?.stopPropagation();- openNavigationSection();- setNavigationMenuItemEditSection('favorite');- setPendingInsertionNavigationMenuItem(null);- setSelectedNavigationMenuItemIdInEditMode(null);- navigateSidePanel({- page: SidePanelPages.NavigationMenuAddItem,- pageTitle: t`New favorite`,- pageIcon: IconHeart,- resetNavigationStack: true,- });- };-const makeRightOptions = useCallback((item: NavigationMenuItem) => (<LightIconButton@@ -136,11 +106,13 @@ export const FavoritesSection = () => {isOpen={isNavigationSectionOpen}onToggle={toggleNavigationSection}rightIcon={- <LightIconButton- Icon={IconPlus}- onClick={handleAddFavorite}- accent="tertiary"- />+ <NavigationMenuItemAddDropdown+ instanceId="favorites"+ section="favorite"+ onOpen={openNavigationSection}+ >+ <LightIconButton Icon={IconPlus} accent="tertiary" />+ </NavigationMenuItemAddDropdown>}><StyledList>diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsxindex 3cb9f0ae171..397e2c5dcda 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/favorites/components/FavoritesSectionDispatcher.tsx@@ -4,7 +4,6 @@ import { NavigationMenuItemDndKitProvider } from '@/navigation-menu-item/displayimport { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';import { FavoritesSection } from '@/navigation-menu-item/display/sections/favorites/components/FavoritesSection';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { AnimatedEaseInOut } from 'twenty-ui/primitives/layout';export const FavoritesSectionDispatcher = () => {const isLayoutCustomizationModeEnabled = useAtomStateValue(@@ -14,15 +13,13 @@ export const FavoritesSectionDispatcher = () => {const hasFavorites = navigationMenuItemsSorted.some((item) => !item.folderId);- if (!hasFavorites) {+ if (!hasFavorites || isLayoutCustomizationModeEnabled) {return null;}return (- <AnimatedEaseInOut isOpen={!isLayoutCustomizationModeEnabled} initial>- <NavigationMenuItemDndKitProvider section={NavigationSections.FAVORITES}>- <FavoritesSection />- </NavigationMenuItemDndKitProvider>- </AnimatedEaseInOut>+ <NavigationMenuItemDndKitProvider section={NavigationSections.FAVORITES}>+ <FavoritesSection />+ </NavigationMenuItemDndKitProvider>);};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsxindex 0ba1dcef7d2..334bde56162 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSection.tsx@@ -1,42 +1,31 @@+import { NavigationMenuItemAddDropdown } from '@/navigation-menu-item/edit/components/NavigationMenuItemAddDropdown';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';import { useNavigate } from 'react-router-dom';-import { NavigationMenuItemType, SidePanelPages } from 'twenty-shared/types';-import {- IconColumnInsertRight,- IconLink,- IconPlus,- IconTool,- useIcons,-} from 'twenty-ui/icon';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { IconPlus, IconTool } from 'twenty-ui/icon';import { LightIconButton } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme-constants';import { useIsMobile } from 'twenty-ui/utilities';import { useEnterLayoutCustomizationMode } from '@/layout-customization/hooks/useEnterLayoutCustomizationMode';import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';-import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';-import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';import { preloadNavigationMenuItemDndKit } from '@/navigation-menu-item/display/dnd/preloadNavigationMenuItemDndKit';import {type NavigationMenuItemClickParams,useNavigationMenuItemSectionItems,} from '@/navigation-menu-item/display/hooks/useNavigationMenuItemSectionItems';-import { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';import { WorkspaceSectionContainer } from '@/navigation-menu-item/display/sections/workspace/components/WorkspaceSectionContainer';import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';-import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';import { lastVisitedViewPerObjectMetadataItemState } from '@/navigation/states/lastVisitedViewPerObjectMetadataItemState';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';-import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';+import { useNavigationSection } from '@/ui/navigation/navigation-drawer/hooks/useNavigationSection';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { viewsSelector } from '@/views/states/selectors/viewsSelector';import { PermissionFlagType } from '~/generated-metadata/graphql';@@ -50,7 +39,6 @@ const StyledRightIconsContainer = styled.div`export const WorkspaceSection = () => {const isMobile = useIsMobile();const items = useNavigationMenuItemSectionItems();- const { workspaceNavigationMenuItemsSorted } = useSortedNavigationMenuItems();const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);const views = useAtomStateValue(viewsSelector);const lastVisitedViewPerObjectMetadataItem = useAtomStateValue(@@ -65,14 +53,8 @@ export const WorkspaceSection = () => {selectedNavigationMenuItemIdInEditMode,setSelectedNavigationMenuItemIdInEditMode,] = useAtomState(selectedNavigationMenuItemIdInEditModeState);- const setOpenNavigationMenuItemFolderIds = useSetAtomState(- openNavigationMenuItemFolderIdsState,- );const navigate = useNavigate();- const { navigateSidePanel } = useNavigateSidePanel();- const { openNavigationMenuItemInSidePanel } =- useOpenNavigationMenuItemInSidePanel();- const { getIcon } = useIcons();+ const { openNavigationSection } = useNavigationSection('Workspace');const { t } = useLingui();@@ -81,55 +63,15 @@ export const WorkspaceSection = () => {enterLayoutCustomizationMode();};- const openFolderAndNavigateToFirstChild = (- folderId: string,- item: NavigationMenuItemClickParams['item'],- ) => {- setOpenNavigationMenuItemFolderIds((current) =>- current.includes(folderId) ? current : [...current, folderId],- );- openNavigationMenuItemInSidePanel({- pageTitle: t`Edit folder`,- pageIcon: getIcon(item.icon ?? FOLDER_ICON_DEFAULT),- });- const firstChild = workspaceNavigationMenuItemsSorted.find((navItem) => {- if (navItem.folderId !== folderId) return false;- if (navItem.type === NavigationMenuItemType.LINK) return false;- const link = getNavigationMenuItemComputedLink({- item: navItem,- objectMetadataItems,- views,- lastVisitedViewPerObjectMetadataItem,- });- return isNonEmptyString(link);- });- if (firstChild) {- const link = getNavigationMenuItemComputedLink({- item: firstChild,- objectMetadataItems,- views,- lastVisitedViewPerObjectMetadataItem,- });- if (isNonEmptyString(link)) {- navigate(link);- }- }- };-- const openViewOrRecordEditPanelAndNavigate = (- item: NavigationMenuItemClickParams['item'],- objectMetadataItem: EnrichedObjectMetadataItem | null | undefined,- ) => {- if (objectMetadataItem) {- const label =- item.type === NavigationMenuItemType.VIEW ||- item.type === NavigationMenuItemType.OBJECT- ? getNavigationMenuItemLabel(item, objectMetadataItems, views)- : objectMetadataItem.labelSingular;- openNavigationMenuItemInSidePanel({- pageTitle: label,- pageIcon: getIcon(objectMetadataItem.icon),- });+ const handleNavigationMenuItemClick = ({+ item,+ }: NavigationMenuItemClickParams) => {+ setSelectedNavigationMenuItemIdInEditMode(item.id);+ if (+ item.type === NavigationMenuItemType.FOLDER ||+ item.type === NavigationMenuItemType.LINK+ ) {+ return;}const link = getNavigationMenuItemComputedLink({item,@@ -141,58 +83,13 @@ export const WorkspaceSection = () => {navigate(link);}};-- const handleNavigationMenuItemClick = (- params: NavigationMenuItemClickParams,- ) => {- const { item, objectMetadataItem } = params;- setSelectedNavigationMenuItemIdInEditMode(item.id);-- switch (item.type) {- case NavigationMenuItemType.FOLDER:- openFolderAndNavigateToFirstChild(item.id, item);- break;- case NavigationMenuItemType.LINK:- openNavigationMenuItemInSidePanel({- pageTitle: t`Edit link`,- pageIcon: IconLink,- });- break;- case NavigationMenuItemType.PAGE_LAYOUT:- openNavigationMenuItemInSidePanel({- pageTitle:- getNavigationMenuItemLabel(item, objectMetadataItems, views) ||- t`Edit page`,- pageIcon: getIcon(item.icon),- });- break;- default:- openViewOrRecordEditPanelAndNavigate(item, objectMetadataItem);- }- };-const handleActiveObjectMetadataItemClick = (- objectMetadataItem: EnrichedObjectMetadataItem,+ _objectMetadataItem: EnrichedObjectMetadataItem,navigationMenuItemId: string,) => {- if (!enterLayoutCustomizationMode()) {- return;+ if (enterLayoutCustomizationMode()) {+ setSelectedNavigationMenuItemIdInEditMode(navigationMenuItemId);}- setSelectedNavigationMenuItemIdInEditMode(navigationMenuItemId);- openNavigationMenuItemInSidePanel({- pageTitle: objectMetadataItem.labelSingular,- pageIcon: getIcon(objectMetadataItem.icon),- });- };-- const handleAddMenuItem = (event?: React.MouseEvent) => {- event?.stopPropagation();- navigateSidePanel({- page: SidePanelPages.NavigationMenuAddItem,- pageTitle: t`New menu item`,- pageIcon: IconColumnInsertRight,- resetNavigationStack: true,- });};return (@@ -205,12 +102,17 @@ export const WorkspaceSection = () => {isMobile ? undefined : (<StyledRightIconsContainer>{isLayoutCustomizationModeEnabled ? (- <LightIconButton- Icon={IconPlus}- accent="tertiary"- size="small"- onClick={handleAddMenuItem}- />+ <NavigationMenuItemAddDropdown+ instanceId="workspace-header"+ position={0}+ onOpen={openNavigationSection}+ >+ <LightIconButton+ Icon={IconPlus}+ accent="tertiary"+ size="small"+ />+ </NavigationMenuItemAddDropdown>) : (hasLayoutsPermission && (<div onMouseEnter={preloadNavigationMenuItemDndKit}>diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSectionContainer.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSectionContainer.tsxindex 69390a48373..83c6fd7d36c 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSectionContainer.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSectionContainer.tsx@@ -1,12 +1,10 @@import { styled } from '@linaria/react';-import React, { lazy, Suspense, useContext } from 'react';+import React, { lazy, Suspense } from 'react';import { isDefined } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme-constants';import { type NavigationMenuItem } from '~/generated-metadata/graphql';import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';-import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';-import { NavigationDropTargetContext } from '@/navigation-menu-item/common/contexts/NavigationDropTargetContext';import { type NavigationMenuItemClickParams } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemSectionItems';import { useReadableNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useReadableNavigationMenuItems';import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem';@@ -58,14 +56,7 @@ export const WorkspaceSectionContainer = ({const views = useAtomStateValue(viewsSelector);const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);- const { addToNavigationFallbackDestination } = useContext(- NavigationDropTargetContext,- );-const flatItems = items.filter((item) => !isDefined(item.folderId));- const isAddToNavigationDropTargetVisible =- addToNavigationFallbackDestination?.droppableId ===- NavigationMenuItemDroppableIds.WORKSPACE_ORPHAN_NAVIGATION_MENU_ITEMS;const folderChildrenById = items.reduce<Map<string, NavigationMenuItem[]>>((acc, item) => {@@ -125,7 +116,6 @@ export const WorkspaceSectionContainer = ({onToggle={() => toggleNavigationSection()}rightIcon={rightIcon}alwaysShowRightIcon={isLayoutCustomizationModeEnabled}- forceExpanded={isAddToNavigationDropTargetVisible}contentWrapper={(children) => (<StyledWorkspaceSectionContentGapOffset>{children}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSectionListDndKit.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSectionListDndKit.tsxindex 9672f6baf53..640eff7f4fe 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSectionListDndKit.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/sections/workspace/components/WorkspaceSectionListDndKit.tsx@@ -1,6 +1,5 @@import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';import { NavigationMenuItemDroppableIds } from '@/navigation-menu-item/common/constants/NavigationMenuItemDroppableIds';-import { NavigationDropTargetContext } from '@/navigation-menu-item/common/contexts/NavigationDropTargetContext';import {FOLDER_HEADER_SLOT_COLLISION_PRIORITY,NavigationMenuItemDroppableSlot,@@ -34,10 +33,6 @@ const StyledListItemRow = styled.div`gap: 0;`;-const StyledOrphanAppendSlotOverlap = styled.div`- margin-top: calc(-1 * ${themeCssVariables.betweenSiblingsGap});-`;-export const WorkspaceSectionListDndKit = ({filteredItems,getEditModeProps,@@ -50,9 +45,6 @@ export const WorkspaceSectionListDndKit = ({);const workspaceDropDisabled = useIsDropDisabledForSection(true);const { isDragging } = useContext(NavigationMenuItemDragContext);- const { addToNavigationFallbackDestination } = useContext(- NavigationDropTargetContext,- );const folderCount = filteredItems.filter((item) => item.type === NavigationMenuItemType.FOLDER,).length;@@ -86,42 +78,21 @@ export const WorkspaceSectionListDndKit = ({</NavigationMenuItemSortableItem></StyledListItemRow>))}- <StyledOrphanAppendSlotOverlap>- <NavigationMenuItemDroppableSlot- droppableId={- NavigationMenuItemDroppableIds.WORKSPACE_ORPHAN_NAVIGATION_MENU_ITEMS- }+ <NavigationMenuItemDroppableSlot+ droppableId={+ NavigationMenuItemDroppableIds.WORKSPACE_ORPHAN_NAVIGATION_MENU_ITEMS+ }+ index={orphanAppendDndIndex}+ disabled={workspaceDropDisabled}+ collisionPriority={FOLDER_HEADER_SLOT_COLLISION_PRIORITY}+ >+ <NavigationMenuItemOrphanDropTargetindex={orphanAppendDndIndex}- disabled={workspaceDropDisabled}- collisionPriority={FOLDER_HEADER_SLOT_COLLISION_PRIORITY}- >- <NavigationMenuItemOrphanDropTarget- index={orphanAppendDndIndex}- compact- highlightPosition="top"- />- {isAddMenuItemButtonVisible && <WorkspaceSectionAddMenuItemButton />}- </NavigationMenuItemDroppableSlot>- </StyledOrphanAppendSlotOverlap>- {addToNavigationFallbackDestination?.droppableId ===- NavigationMenuItemDroppableIds.WORKSPACE_ORPHAN_NAVIGATION_MENU_ITEMS &&- addToNavigationFallbackDestination.index > orphanAppendDndIndex && (- <StyledOrphanAppendSlotOverlap>- <NavigationMenuItemDroppableSlot- droppableId={- NavigationMenuItemDroppableIds.WORKSPACE_ORPHAN_NAVIGATION_MENU_ITEMS- }- index={addToNavigationFallbackDestination.index}- disabled={workspaceDropDisabled}- collisionPriority={FOLDER_HEADER_SLOT_COLLISION_PRIORITY}- >- <NavigationMenuItemOrphanDropTarget- index={addToNavigationFallbackDestination.index}- compact- />- </NavigationMenuItemDroppableSlot>- </StyledOrphanAppendSlotOverlap>- )}+ compact+ highlightPosition="top"+ />+ {isAddMenuItemButtonVisible && <WorkspaceSectionAddMenuItemButton />}+ </NavigationMenuItemDroppableSlot></StyledList>);};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsxindex 61bf2b4044f..8ab4b40fd96 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx@@ -1,33 +1,6 @@import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';-import { styled } from '@linaria/react';-import { useContext } from 'react';import { type IconComponent } from 'twenty-ui/icon';-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';--const StyledCompositeContainer = styled.div`- align-items: center;- border-radius: ${themeCssVariables.border.radius.sm};- box-sizing: border-box;- display: flex;- flex-shrink: 0;- height: calc(${themeCssVariables.icon.size.md} * 1px);- justify-content: center;- position: relative;- width: calc(${themeCssVariables.icon.size.md} * 1px);-`;--const StyledViewOverlay = styled.div<{ $backgroundColor: string }>`- align-items: center;- background-color: ${({ $backgroundColor }) => $backgroundColor};- border-radius: ${themeCssVariables.border.radius.sm};- bottom: -5px;- display: flex;- height: 14px;- justify-content: center;- position: absolute;- right: -6px;- width: 12px;-`;+import { NavigationMenuItemIconWithOverlay } from '@/navigation-menu-item/display/components/NavigationMenuItemIconWithOverlay';export type ObjectIconWithViewOverlayProps = {ObjectIcon: IconComponent;@@ -39,19 +12,8 @@ export const ObjectIconWithViewOverlay = ({ObjectIcon,ViewIcon,objectColor,-}: ObjectIconWithViewOverlayProps) => {- const { theme } = useContext(ThemeContext);-- return (- <StyledCompositeContainer>- <ColoredIcon Icon={ObjectIcon} color={objectColor} />- <StyledViewOverlay $backgroundColor={themeCssVariables.grayScale.gray4}>- <ViewIcon- size="12px"- stroke={theme.icon.stroke.md}- color={themeCssVariables.grayScale.gray10}- />- </StyledViewOverlay>- </StyledCompositeContainer>- );-};+}: ObjectIconWithViewOverlayProps) => (+ <NavigationMenuItemIconWithOverlay OverlayIcon={ViewIcon}>+ <ColoredIcon Icon={ObjectIcon} color={objectColor} />+ </NavigationMenuItemIconWithOverlay>+);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemActions.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemActions.tsxnew file mode 100644index 00000000000..cbe50dbe9d4--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemActions.tsx@@ -0,0 +1,158 @@+import { useState } from 'react';+import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';+import { useLingui } from '@lingui/react/macro';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import {+ IconChevronUp,+ IconChevronDown,+ IconHierarchy2,+ useIcons,+ IconFolderSymlink,+ IconRowInsertTop,+ IconRowInsertBottom,+ IconTrash,+ IconChevronLeft,+} from 'twenty-ui/icon';+import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';+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 { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';+import { useNavigationMenuItemMoveRemove } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove';+import { type NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';+import { type NavigationMenuItemAddTarget } from '@/navigation-menu-item/edit/components/NavigationMenuItemMenu';+import {+ NavigationMenuItemSelectableItem,+ type NavigationMenuItemOption,+} from '@/navigation-menu-item/edit/components/NavigationMenuItemSelectableItem';++type NavigationMenuItemActionsProps = {+ item: NavigationMenuItem;+ section: NavigationMenuItemSection;+ onAdd: (target: NavigationMenuItemAddTarget) => void;+ dropdownId: string;+ onClose: () => void;+};+export const NavigationMenuItemActions = ({+ item,+ section,+ onAdd,+ dropdownId,+ onClose,+}: NavigationMenuItemActionsProps) => {+ const { t } = useLingui();+ const { getIcon } = useIcons();+ const { items, getSortedSiblings, moveUp, moveDown, moveToFolder, remove } =+ useNavigationMenuItemMoveRemove(section);+ const [page, setPage] = useState<'actions' | 'folders'>('actions');+ const siblings = getSortedSiblings(item.id) ?? [];+ const index = siblings.findIndex((sibling) => sibling.id === item.id);+ const run = (action: () => Promise<void>) => {+ void action();+ onClose();+ };+ const actions: NavigationMenuItemOption[] = [+ {+ id: 'up',+ label: t`Move up`,+ Icon: IconChevronUp,+ isDisabled: index <= 0,+ onClick: () => run(() => moveUp(item.id)),+ },+ {+ id: 'down',+ label: t`Move down`,+ Icon: IconChevronDown,+ isDisabled: index < 0 || index === siblings.length - 1,+ onClick: () => run(() => moveDown(item.id)),+ },+ {+ id: 'folder',+ label: t`Move to folder`,+ Icon: IconFolderSymlink,+ isDisabled: item.type === NavigationMenuItemType.FOLDER,+ hasSubMenu: true,+ onClick: () => setPage('folders'),+ },+ {+ id: 'before',+ label: t`Add menu item before`,+ Icon: IconRowInsertTop,+ hasSubMenu: true,+ onClick: () =>+ onAdd({ folderId: item.folderId ?? undefined, position: index }),+ },+ {+ id: 'after',+ label: t`Add menu item after`,+ Icon: IconRowInsertBottom,+ hasSubMenu: true,+ onClick: () =>+ onAdd({ folderId: item.folderId ?? undefined, position: index + 1 }),+ },+ {+ id: 'remove',+ label: t`Remove from sidebar`,+ Icon: IconTrash,+ accent: 'danger',+ onClick: () => run(() => remove(item.id)),+ },+ ];+ const folders: NavigationMenuItemOption[] = [+ {+ id: 'root',+ label: t`Root level`,+ Icon: IconHierarchy2,+ isDisabled: !isDefined(item.folderId),+ onClick: () => run(() => moveToFolder(item.id, null)),+ },+ ...items+ .filter((folder) => folder.type === NavigationMenuItemType.FOLDER)+ .map((folder) => ({+ id: folder.id,+ label: folder.name ?? t`Folder`,+ icon: (+ <ColoredIcon+ Icon={getIcon(folder.icon ?? FOLDER_ICON_DEFAULT)}+ color={folder.color ?? DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER}+ />+ ),+ isDisabled: folder.id === item.folderId,+ onClick: () => run(() => moveToFolder(item.id, folder.id)),+ })),+ ];+ const options = page === 'folders' ? folders : actions;+ return (+ <DropdownContent widthInPixels={GenericDropdownContentWidth.Large}>+ {page === 'folders' && (+ <DropdownMenuHeader+ StartComponent={+ <DropdownMenuHeaderLeftComponent+ Icon={IconChevronLeft}+ onClick={() => setPage('actions')}+ />+ }+ >{t`Move to folder`}</DropdownMenuHeader>+ )}+ <SelectableList+ key={page}+ selectableListInstanceId={`${dropdownId}-actions`}+ focusId={dropdownId}+ selectableItemIdArray={options+ .filter((option) => !option.isDisabled)+ .map((option) => option.id)}+ >+ <DropdownMenuItemsContainer hasMaxHeight={page === 'folders'}>+ {options.map((option) => (+ <NavigationMenuItemSelectableItem key={option.id} item={option} />+ ))}+ </DropdownMenuItemsContainer>+ </SelectableList>+ </DropdownContent>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemAddDropdown.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemAddDropdown.tsxnew file mode 100644index 00000000000..e20b0b80083--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemAddDropdown.tsx@@ -0,0 +1,54 @@+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { navigationMenuItemInsertionAnchorState } from '@/navigation-menu-item/common/states/navigationMenuItemInsertionAnchorState';+import { type ReactNode } from 'react';+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { NavigationMenuItemAddDropdownContent } from '@/navigation-menu-item/edit/components/NavigationMenuItemAddDropdownContent';++type NavigationMenuItemAddDropdownProps = {+ children: ReactNode;+ instanceId?: string;+ section?: 'workspace' | 'favorite';+ onOpen?: () => void;+} & (+ | { folderId: string; position: number }+ | { folderId?: never; position?: number }+);++export const NavigationMenuItemAddDropdown = ({+ children,+ instanceId,+ section = 'workspace',+ folderId,+ position,+ onOpen,+}: NavigationMenuItemAddDropdownProps) => {+ const navigationMenuItemInsertionAnchor = useAtomStateValue(+ navigationMenuItemInsertionAnchorState,+ );+ const dropdownId = `navigation-add-item-${instanceId ?? folderId ?? 'workspace'}`;+ const { closeDropdown } = useCloseDropdown();++ return (+ <Dropdown+ dropdownId={dropdownId}+ positionReference={+ navigationMenuItemInsertionAnchor?.dropdownId === dropdownId+ ? navigationMenuItemInsertionAnchor.element+ : undefined+ }+ dropdownPlacement="right-start"+ onOpen={onOpen}+ clickableComponent={children}+ dropdownComponents={+ <NavigationMenuItemAddDropdownContent+ section={section}+ dropdownId={dropdownId}+ folderId={folderId}+ position={position}+ onClose={() => closeDropdown(dropdownId)}+ />+ }+ />+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemAddDropdownContent.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemAddDropdownContent.tsxnew file mode 100644index 00000000000..61c6acf0a73--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemAddDropdownContent.tsx@@ -0,0 +1,230 @@+import { type NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';+import { NavigationMenuItemInsertionPreviewEffect } from '@/navigation-menu-item/edit/effect-components/NavigationMenuItemInsertionPreviewEffect';+import {+ useNavigationMenuItemAddOptions,+ type NavigationMenuItemAddStep,+} from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemAddOptions';+import { navigationMenuItemIdToRenameState } from '@/navigation-menu-item/common/states/navigationMenuItemIdToRenameState';+import {+ NavigationMenuItemSelectableItem,+ type NavigationMenuItemOption,+} from '@/navigation-menu-item/edit/components/NavigationMenuItemSelectableItem';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';+import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { Fragment, useState } from 'react';+import { useLingui } from '@lingui/react/macro';+import { isNonEmptyString } from '@sniptt/guards';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { IconChevronLeft, IconX } from 'twenty-ui/icon';+import { MenuItem } from 'twenty-ui/primitives/navigation';+import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';+import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';+import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';+import {+ useNavigationMenuItemEditController,+ type NewNavigationMenuItemInput,+} from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';+import { normalizeSearchText } from '~/utils/normalizeSearchText';++type Step = NavigationMenuItemAddStep;+type NavigationMenuItemAddDropdownContentProps = {+ dropdownId: string;+ section: NavigationMenuItemSection;+ folderId?: string;+ position?: number;+ onClose: () => void;+};++export const NavigationMenuItemAddDropdownContent = ({+ dropdownId,+ section,+ folderId,+ position,+ onClose,+}: NavigationMenuItemAddDropdownContentProps) => {+ const { t } = useLingui();+ const setSelectedNavigationMenuItemIdInEditMode = useSetAtomState(+ selectedNavigationMenuItemIdInEditModeState,+ );+ const setNavigationMenuItemIdToRename = useSetAtomState(+ navigationMenuItemIdToRenameState,+ );+ const [step, setStep] = useState<Step>('main');+ const [search, setSearch] = useState('');+ const isSearchingAllItems = step === 'main' && search.trim().length > 0;+ const [objectId, setObjectId] = useState<string | null>(null);+ const { currentItems, createItem } =+ useNavigationMenuItemEditController(section);+ const insertionIndex =+ position ??+ currentItems.filter(+ (item) => (item.folderId ?? null) === (folderId ?? null),+ ).length;++ const navigate = (next: Step) => {+ setStep(next);+ setSearch('');+ setObjectId(null);+ };+ const goBack = () => {+ setSearch('');+ if (isDefined(objectId)) {+ setObjectId(null);+ } else {+ setStep('main');+ }+ };+ const addItem = (input: NewNavigationMenuItemInput) => {+ const itemId = createItem(input, {+ targetFolderId: folderId ?? null,+ targetIndex: position,+ });+ onClose();+ setSelectedNavigationMenuItemIdInEditMode(itemId);+ if (input.type === NavigationMenuItemType.FOLDER) {+ setNavigationMenuItemIdToRename(itemId);+ }+ };+ const {+ getItems,+ standalonePagesLoading,+ standalonePagesError,+ recordSearchLoading,+ isSearchDebouncing,+ } = useNavigationMenuItemAddOptions({+ step,+ search,+ objectId,+ folderId,+ currentItems,+ isSearchingAllItems,+ addItem,+ navigateToStep: navigate,+ selectObject: (nextObjectId) => {+ setObjectId(nextObjectId);+ setSearch('');+ },+ });++ const titles: Record<Step, string> = {+ main: t`Add menu item`,+ object: t`Object`,+ view: t`View`,+ record: t`Record`,+ page: t`Page`,+ };++ const normalizedSearch = normalizeSearchText(search.trim());+ const matchesSearch = (item: NavigationMenuItemOption) =>+ (item.searchableValues ?? [item.label]).some((value) =>+ normalizeSearchText(value).includes(normalizedSearch),+ );+ const groups = isSearchingAllItems+ ? [+ { label: t`Objects`, items: getItems('object').filter(matchesSearch) },+ { label: t`Views`, items: getItems('view').filter(matchesSearch) },+ { label: t`Pages`, items: getItems('page').filter(matchesSearch) },+ {+ label: t`Records`,+ items: isSearchDebouncing ? [] : getItems('record'),+ },+ {+ label: t`Other`,+ items: getItems('main').filter(+ (item) =>+ (item.id === 'folder' || item.id === 'link') &&+ matchesSearch(item),+ ),+ },+ ]+ : [+ {+ label: '',+ items: getItems().filter(+ (item) => step === 'record' || matchesSearch(item),+ ),+ },+ ];+ const items = groups.flatMap((group) => group.items);+ const getEmptyMessage = () => {+ if (step === 'page' && isDefined(standalonePagesError)) {+ return t`Couldn't load pages`;+ }++ if (+ (step === 'record' || isSearchingAllItems) &&+ (recordSearchLoading || isSearchDebouncing)+ ) {+ return t`Loading...`;+ }++ if ((step === 'page' || isSearchingAllItems) && standalonePagesLoading) {+ return t`Loading...`;+ }++ return t`No results found`;+ };++ const emptyMessage = getEmptyMessage();++ return (+ <DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}>+ <NavigationMenuItemInsertionPreviewEffect+ dropdownId={dropdownId}+ section={section}+ folderId={folderId ?? null}+ index={insertionIndex}+ />+ <DropdownMenuHeader+ StartComponent={+ <DropdownMenuHeaderLeftComponent+ Icon={step === 'main' ? IconX : IconChevronLeft}+ onClick={step === 'main' ? onClose : goBack}+ />+ }+ >+ {titles[step]}+ </DropdownMenuHeader>+ <DropdownMenuSearchInput+ key={`search-${step}-${objectId}`}+ value={search}+ onChange={(event) => setSearch(event.target.value)}+ placeholder={step === 'record' ? t`Search records...` : t`Search...`}+ />+ <DropdownMenuSeparator />+ <SelectableList+ key={`${step}-${objectId}`}+ selectableListInstanceId={`${dropdownId}-list`}+ focusId={dropdownId}+ selectableItemIdArray={items+ .filter((item) => !item.isDisabled)+ .map((item) => item.id)}+ >+ <DropdownMenuItemsContainer hasMaxHeight>+ {groups+ .filter((group) => group.items.length > 0)+ .map((group) => (+ <Fragment key={group.label}>+ {isNonEmptyString(group.label) && (+ <DropdownMenuSectionLabel label={group.label} />+ )}+ {group.items.map((item) => (+ <NavigationMenuItemSelectableItem key={item.id} item={item} />+ ))}+ </Fragment>+ ))}+ {items.length === 0 && (+ <MenuItem disabled text={emptyMessage} accent="placeholder" />+ )}+ </DropdownMenuItemsContainer>+ </SelectableList>+ </DropdownContent>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsxnew file mode 100644index 00000000000..882bdda7ddd--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsx@@ -0,0 +1,212 @@+import { NavigationMenuItemObjectColorEditor } from '@/navigation-menu-item/edit/components/NavigationMenuItemObjectColorEditor';+import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+// Aliased so both reads satisfy the matching-state-variable lint rule, which+// requires the variable to be named after the state it reads.+import {+ isDropdownOpenComponentState,+ isDropdownOpenComponentState as isColorPickerOpenComponentState,+} from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { useCallback, useState, type ReactNode } from 'react';+import { styled } from '@linaria/react';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';+import { NavigationMenuItemMenu } from '@/navigation-menu-item/edit/components/NavigationMenuItemMenu';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';+import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';+import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';+import { NavigationMenuItemActions } from '@/navigation-menu-item/edit/components/NavigationMenuItemActions';+import { NavigationMenuItemRowActions } from '@/navigation-menu-item/edit/components/NavigationMenuItemRowActions';+import { NavigationMenuItemTypeTooltip } from '@/navigation-menu-item/edit/components/NavigationMenuItemTypeTooltip';+import { NavigationMenuItemLinkEditorOpenEffect } from '@/navigation-menu-item/edit/effect-components/NavigationMenuItemLinkEditorOpenEffect';+import { NavigationMenuItemLinkEditor } from '@/navigation-menu-item/edit/components/NavigationMenuItemLinkEditor';+import { NavigationMenuItemInlineEditor } from '@/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor';++const StyledRow = styled.div`+ min-width: 0;+ position: relative;++ &:hover .navigation-drawer-item {+ background: ${themeCssVariables.background.transparent.light};+ }++ &:hover > [data-navigation-actions],+ &:focus-within > [data-navigation-actions] {+ opacity: 1;+ pointer-events: auto;+ }+`;+type NavigationMenuItemEditableProps = {+ item: NavigationMenuItem;+ children: ReactNode;+ rightOptions?: ReactNode;+};+export const NavigationMenuItemEditable = ({+ item,+ children,+ rightOptions,+}: NavigationMenuItemEditableProps) => {+ const isLayoutCustomizationModeEnabled = useAtomStateValue(+ isLayoutCustomizationModeEnabledState,+ );++ const theme = useTheme();+ const isExpanded = useIsNavigationDrawerContentExpanded();+ const [+ selectedNavigationMenuItemIdInEditMode,+ setSelectedNavigationMenuItemIdInEditMode,+ ] = useAtomState(selectedNavigationMenuItemIdInEditModeState);+ const { openDropdown } = useOpenDropdown();+ const [mode, setMode] = useState<'actions' | 'edit'>('actions');+ const dropdownId = `navigation-item-${item.id}`;+ const isDropdownOpen = useAtomComponentStateValue(+ isDropdownOpenComponentState,+ dropdownId,+ );+ const isColorPickerOpen = useAtomComponentStateValue(+ isColorPickerOpenComponentState,+ `navigation-item-${item.id}-color`,+ );+ const anchorId = `navigation-item-anchor-${item.id}`;+ const isWorkspace = !isDefined(item.userWorkspaceId);+ const canOrganize = isLayoutCustomizationModeEnabled && isWorkspace;+ const canEdit =+ item.type === NavigationMenuItemType.LINK ||+ item.type === NavigationMenuItemType.FOLDER;+ const openEditMode = useCallback(() => setMode('edit'), []);+ const open = (nextMode: 'actions' | 'edit') => {+ setMode(nextMode);+ openDropdown({ dropdownComponentInstanceIdFromProps: dropdownId });+ };+ const shouldOpenLinkEditor =+ item.type === NavigationMenuItemType.LINK &&+ selectedNavigationMenuItemIdInEditMode === item.id;+ const canPickObjectColor =+ canOrganize && item.type === NavigationMenuItemType.OBJECT;+ const isSelectedFolder =+ item.type === NavigationMenuItemType.FOLDER &&+ selectedNavigationMenuItemIdInEditMode === item.id;+ const canEditInline = canEdit && (canOrganize || isSelectedFolder);++ const renderRow = () => {+ if (canPickObjectColor) {+ return (+ <NavigationMenuItemObjectColorEditor item={item}>+ {children}+ </NavigationMenuItemObjectColorEditor>+ );+ }++ if (canEditInline) {+ return (+ <NavigationMenuItemInlineEditor+ item={item}+ dropdownId={dropdownId}+ rowAnchorId={anchorId}+ onEditLink={() => open('edit')}+ >+ {children}+ </NavigationMenuItemInlineEditor>+ );+ }++ return children;+ };++ const row = renderRow();+ const shouldWrapInMenu =+ canOrganize ||+ (canEdit && selectedNavigationMenuItemIdInEditMode === item.id);+ const content = shouldWrapInMenu ? (+ <NavigationMenuItemMenu+ section={isWorkspace ? 'workspace' : 'favorite'}+ dropdownId={dropdownId}+ clickableComponent={row}+ disableClickForClickableComponent+ dropdownPlacement={mode === 'edit' ? 'top-start' : 'right-start'}+ dropdownOffset={+ mode === 'edit' ? { y: theme.spacingMultiplicator } : undefined+ }+ excludedClickOutsideIds={[+ `${dropdownId}-icon`,+ `${dropdownId}-icon-icon-color-picker`,+ ]}+ onClose={() =>+ setSelectedNavigationMenuItemIdInEditMode((selectedId) =>+ selectedId === item.id ? null : selectedId,+ )+ }+ renderMenu={({ onClose, onAdd }) =>+ mode === 'edit' && item.type === NavigationMenuItemType.LINK ? (+ <DropdownContent+ widthInPixels={GenericDropdownContentWidth.ExtraLarge}+ >+ <NavigationMenuItemLinkEditor+ item={item}+ dropdownId={dropdownId}+ onClose={onClose}+ />+ </DropdownContent>+ ) : (+ <NavigationMenuItemActions+ item={item}+ section={isWorkspace ? 'workspace' : 'favorite'}+ dropdownId={dropdownId}+ onClose={onClose}+ onAdd={onAdd}+ />+ )+ }+ />+ ) : (+ row+ );+ return (+ <StyledRow+ id={anchorId}+ onContextMenu={(event) => {+ if (+ !canOrganize ||+ !(event.target instanceof Node) ||+ !event.currentTarget.contains(event.target)+ ) {+ return;+ }+ event.preventDefault();+ event.stopPropagation();+ open('actions');+ }}+ >+ {shouldOpenLinkEditor && (+ <NavigationMenuItemLinkEditorOpenEffect+ dropdownId={dropdownId}+ onOpen={openEditMode}+ />+ )}+ {content}+ {canOrganize && isExpanded && (+ <NavigationMenuItemRowActions+ rightOptions={rightOptions}+ onOpenActions={() => open('actions')}+ />+ )}+ {isLayoutCustomizationModeEnabled && (+ <NavigationMenuItemTypeTooltip+ type={item.type}+ anchorId={anchorId}+ hidden={+ isDropdownOpen ||+ isColorPickerOpen ||+ selectedNavigationMenuItemIdInEditMode === item.id+ }+ />+ )}+ </StyledRow>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsxnew file mode 100644index 00000000000..605f47344e4--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsx@@ -0,0 +1,205 @@+import { navigationMenuItemIdToRenameState } from '@/navigation-menu-item/common/states/navigationMenuItemIdToRenameState';+import { getLinkNavigationMenuItemLabel } from '@/navigation-menu-item/display/link/utils/getLinkNavigationMenuItemLabel';+import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';+import { useIcons } from 'twenty-ui/icon';+import { NavigationMenuItemNameInputFocusEffect } from '@/navigation-menu-item/edit/effect-components/NavigationMenuItemNameInputFocusEffect';+import { useState, type ReactNode } from 'react';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { themeCssVariables } from 'twenty-ui/theme-constants';+import { parseThemeColor } from 'twenty-ui/utilities';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';+import { TextInput } from '@/ui/field/input/components/TextInput';+import { IconPicker } from '@/ui/input/components/IconPicker';+import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';+import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';+import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';+import { NavigationDrawerItemEditingContext } from '@/ui/navigation/navigation-drawer/contexts/NavigationDrawerItemEditingContext';+import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';+import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';+import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';++const StyledEditor = styled.div`+ display: contents;+`;++const StyledButton = styled.button`+ align-items: center;+ background: transparent;+ border: 0;+ color: inherit;+ cursor: pointer;+ display: flex;+ font: inherit;+ font-weight: ${themeCssVariables.font.weight.medium};+ min-width: 0;+ padding: 0;+ text-align: left;+`;+const StyledLabelButton = styled(StyledButton)`+ display: block;+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+ width: 100%;+`;+const StyledNameInput = styled(TextInput)`+ font-weight: ${themeCssVariables.font.weight.medium};+ min-width: 0;+ padding: 0;+`;++type NavigationMenuItemInlineEditorProps = {+ item: NavigationMenuItem;+ children: ReactNode;+ dropdownId: string;+ rowAnchorId: string;+ onEditLink: () => void;+};++export const NavigationMenuItemInlineEditor = ({+ item,+ children,+ dropdownId,+ rowAnchorId,+ onEditLink,+}: NavigationMenuItemInlineEditorProps) => {+ const { t } = useLingui();+ const { getIcon } = useIcons();+ const { updateItem } = useNavigationMenuItemEditController(+ isDefined(item.userWorkspaceId) ? 'favorite' : 'workspace',+ );+ const [+ selectedNavigationMenuItemIdInEditMode,+ setSelectedNavigationMenuItemIdInEditMode,+ ] = useAtomState(selectedNavigationMenuItemIdInEditModeState);+ const isExpanded = useIsNavigationDrawerContentExpanded();+ const isSelected = selectedNavigationMenuItemIdInEditMode === item.id;+ const [navigationMenuItemIdToRename, setNavigationMenuItemIdToRename] =+ useAtomState(navigationMenuItemIdToRenameState);+ const [isRenaming, setIsRenaming] = useState(false);+ const [initialName, setInitialName] = useState(item.name ?? '');+ const [name, setName] = useState(item.name ?? '');+ const focusId = `${dropdownId}-name`;+ const isNameInputVisible =+ (isRenaming || navigationMenuItemIdToRename === item.id) &&+ isExpanded &&+ isSelected;+ const clearFavoriteSelection = () => {+ if (isDefined(item.userWorkspaceId)) {+ setSelectedNavigationMenuItemIdInEditMode((currentId) =>+ currentId === item.id ? null : currentId,+ );+ }+ };+ const stopRenaming = (clearSelection = true) => {+ if (clearSelection) {+ clearFavoriteSelection();+ }+ setIsRenaming(false);+ setNavigationMenuItemIdToRename((currentId) =>+ currentId === item.id ? null : currentId,+ );+ };+ const isFolder = item.type === NavigationMenuItemType.FOLDER;+ const select = () => setSelectedNavigationMenuItemIdInEditMode(item.id);+ const finishRename = (value: string, clearSelection = true) => {+ void updateItem(item.id, { name: value.trim() || initialName });+ stopRenaming(clearSelection);+ };+ const iconButton = (+ <StyledButton+ type="button"+ aria-label={isFolder ? t`Choose icon and color` : t`Edit link`}+ onClick={isFolder ? undefined : onEditLink}+ >+ {isFolder ? (+ <ColoredIcon+ Icon={getIcon(item.icon ?? FOLDER_ICON_DEFAULT)}+ color={item.color ?? DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER}+ />+ ) : (+ <NavigationMenuItemIcon navigationMenuItem={item} />+ )}+ </StyledButton>+ );+ const icon = isFolder ? (+ <IconPicker+ dropdownId={`${dropdownId}-icon`}+ selectedIconKey={item.icon ?? FOLDER_ICON_DEFAULT}+ onOpen={select}+ onClose={clearFavoriteSelection}+ onChange={({ iconKey }) => void updateItem(item.id, { icon: iconKey })}+ iconColorPicker={{+ selectedColor: parseThemeColor(+ item.color ?? DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER,+ ),+ onColorChange: (color) => void updateItem(item.id, { color }),+ }}+ clickableComponent={iconButton}+ />+ ) : (+ iconButton+ );+ const label =+ isFolder && isNameInputVisible ? (+ <StyledNameInput+ instanceId={focusId}+ autoFocus+ selectOnFocus+ copyButton={false}+ value={name}+ onChange={setName}+ onEnter={finishRename}+ onTab={finishRename}+ onShiftTab={finishRename}+ onEscape={() => stopRenaming()}+ onClickOutside={(event, value) =>+ finishRename(+ value,+ !(+ event.target instanceof Element &&+ isDefined(event.target.closest(`#${rowAnchorId}`))+ ),+ )+ }+ />+ ) : (+ <StyledLabelButton+ type="button"+ onClick={(event) => {+ event.stopPropagation();+ if (!isFolder) {+ onEditLink();+ } else if (isSelected) {+ setInitialName(item.name ?? '');+ setName(item.name ?? '');+ setIsRenaming(true);+ } else {+ select();+ }+ }}+ >+ {isFolder ? item.name : getLinkNavigationMenuItemLabel(item)}+ </StyledLabelButton>+ );+ return (+ <NavigationDrawerItemEditingContext.Provider+ value={{+ icon,+ label,+ isSelected:+ isSelected &&+ (!isFolder || !isExpanded || isDefined(item.userWorkspaceId)),+ }}+ >+ {isNameInputVisible && (+ <NavigationMenuItemNameInputFocusEffect focusId={focusId} />+ )}+ <StyledEditor>{children}</StyledEditor>+ </NavigationDrawerItemEditingContext.Provider>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInsertionPreview.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInsertionPreview.tsxnew file mode 100644index 00000000000..0a7f6662cdc--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInsertionPreview.tsx@@ -0,0 +1,84 @@+import { isDefined } from 'twenty-shared/utils';+import { type NavigationDrawerSubItemState } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerSubItemState';+import { useCallback } from 'react';+import { navigationMenuItemInsertionAnchorState } from '@/navigation-menu-item/common/states/navigationMenuItemInsertionAnchorState';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';+import { NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';+import { navigationMenuItemInsertionPreviewState } from '@/navigation-menu-item/common/states/navigationMenuItemInsertionPreviewState';+import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { useIcons } from 'twenty-ui/icon';+import { themeCssVariables } from 'twenty-ui/theme-constants';++type NavigationMenuItemInsertionPreviewProps = {+ folderId: string | null;+ index: number;+ sectionId: NavigationSections;+ subItemState?: NavigationDrawerSubItemState;+};++const StyledPreview = styled.div<{ isInFolder: boolean }>`+ margin-bottom: ${({ isInFolder }) =>+ isInFolder ? 0 : themeCssVariables.betweenSiblingsGap};+`;++export const NavigationMenuItemInsertionPreview = ({+ folderId,+ index,+ sectionId,+ subItemState,+}: NavigationMenuItemInsertionPreviewProps) => {+ const navigationMenuItemInsertionPreview = useAtomStateValue(+ navigationMenuItemInsertionPreviewState,+ );+ const setNavigationMenuItemInsertionAnchor = useSetAtomState(+ navigationMenuItemInsertionAnchorState,+ );+ const dropdownId = navigationMenuItemInsertionPreview?.dropdownId;+ const setAnchor = useCallback(+ (element: HTMLDivElement | null) => {+ if (!isDefined(dropdownId)) {+ return;+ }+ const button = element?.querySelector('button');+ setNavigationMenuItemInsertionAnchor((anchor) => {+ if (isDefined(button)) {+ return { dropdownId, element: button };+ }+ return anchor?.dropdownId === dropdownId ? null : anchor;+ });+ },+ [dropdownId, setNavigationMenuItemInsertionAnchor],+ );+ const { t } = useLingui();+ const { getIcon } = useIcons();+ const section =+ sectionId === NavigationSections.WORKSPACE ? 'workspace' : 'favorite';++ if (+ navigationMenuItemInsertionPreview?.section !== section ||+ navigationMenuItemInsertionPreview.folderId !== folderId ||+ navigationMenuItemInsertionPreview.index !== index+ ) {+ return null;+ }++ return (+ <StyledPreview+ ref={setAnchor}+ isInFolder={isDefined(folderId)}+ role="status"+ aria-label={t`Select a menu item`}+ >+ <NavigationDrawerItem+ label={t`Select a menu item`}+ Icon={getIcon('IconFold')}+ variant="placeholder"+ indentationLevel={folderId ? 2 : 1}+ subItemState={subItemState}+ />+ </StyledPreview>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemLinkEditor.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemLinkEditor.tsxnew file mode 100644index 00000000000..51e0e01fef1--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemLinkEditor.tsx@@ -0,0 +1,64 @@+import { useState } from 'react';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { ensureAbsoluteUrl, isDefined, isValidUrl } from 'twenty-shared/utils';+import { themeCssVariables } from 'twenty-ui/theme-constants';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';+import { DoubleTextInput } from '@/ui/field/input/components/DoubleTextInput';+import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';++const StyledError = styled.div`+ color: ${themeCssVariables.font.color.danger};+ font-size: ${themeCssVariables.font.size.sm};+ padding: ${themeCssVariables.spacing[2]};+`;++type NavigationMenuItemLinkEditorProps = {+ item: NavigationMenuItem;+ dropdownId: string;+ onClose: () => void;+};++export const NavigationMenuItemLinkEditor = ({+ item,+ dropdownId,+ onClose,+}: NavigationMenuItemLinkEditorProps) => {+ const { t } = useLingui();+ const { updateItem } = useNavigationMenuItemEditController(+ isDefined(item.userWorkspaceId) ? 'favorite' : 'workspace',+ );+ const [error, setError] = useState(false);+ const saveLink = ({+ firstValue,+ secondValue,+ }: {+ firstValue: string;+ secondValue: string;+ }) => {+ const link = ensureAbsoluteUrl(secondValue.trim());+ if (!isValidUrl(link)) {+ setError(true);+ return;+ }+ void updateItem(item.id, { name: firstValue.trim(), link });+ onClose();+ };+ return (+ <>+ <DoubleTextInput+ instanceId={dropdownId}+ selectOnFocus+ firstValue={item.name ?? ''}+ secondValue={item.link ?? ''}+ firstValuePlaceholder={t`Link label`}+ secondValuePlaceholder={t`URL`}+ onEnter={saveLink}+ onEscape={onClose}+ onClickOutside={(_, value) => saveLink(value)}+ onChange={() => setError(false)}+ />+ {error && <StyledError role="alert">{t`Enter a valid URL`}</StyledError>}+ </>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemMenu.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemMenu.tsxnew file mode 100644index 00000000000..2fa3f4594bf--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemMenu.tsx@@ -0,0 +1,104 @@+import { type ReactNode, useState } from 'react';+import { isDefined } from 'twenty-shared/utils';++import { navigationMenuItemInsertionAnchorState } from '@/navigation-menu-item/common/states/navigationMenuItemInsertionAnchorState';+import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';+import { type NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';+import { NavigationMenuItemAddDropdownContent } from '@/navigation-menu-item/edit/components/NavigationMenuItemAddDropdownContent';+import {+ Dropdown,+ type DropdownProps,+} from '@/ui/layout/dropdown/components/Dropdown';+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';++export type NavigationMenuItemAddTarget = {+ folderId?: string;+ position?: number;+};++type NavigationMenuItemMenuProps = Pick<+ DropdownProps,+ | 'dropdownId'+ | 'clickableComponent'+ | 'disableClickForClickableComponent'+ | 'dropdownPlacement'+ | 'dropdownOffset'+ | 'excludedClickOutsideIds'+ | 'onClose'+> & {+ section: NavigationMenuItemSection;+ renderMenu: (controls: {+ onClose: () => void;+ onAdd: (target: NavigationMenuItemAddTarget) => void;+ }) => ReactNode;+};++export const NavigationMenuItemMenu = ({+ section,+ dropdownId,+ renderMenu,+ onClose,+ dropdownPlacement = 'right-start',+ dropdownOffset,+ clickableComponent,+ disableClickForClickableComponent,+ excludedClickOutsideIds,+}: NavigationMenuItemMenuProps) => {+ const [addTarget, setAddTarget] =+ useState<NavigationMenuItemAddTarget | null>(null);+ const navigationMenuItemInsertionAnchor = useAtomStateValue(+ navigationMenuItemInsertionAnchorState,+ );+ const setOpenNavigationMenuItemFolderIds = useSetAtomState(+ openNavigationMenuItemFolderIdsState,+ );+ const { closeDropdown } = useCloseDropdown();+ const close = () => closeDropdown(dropdownId);+ const openAddMenu = (target: NavigationMenuItemAddTarget) => {+ const { folderId } = target;+ if (isDefined(folderId)) {+ setOpenNavigationMenuItemFolderIds((folderIds) =>+ folderIds.includes(folderId) ? folderIds : [...folderIds, folderId],+ );+ }+ setAddTarget(target);+ };++ return (+ <Dropdown+ clickableComponent={clickableComponent}+ disableClickForClickableComponent={disableClickForClickableComponent}+ excludedClickOutsideIds={excludedClickOutsideIds}+ dropdownId={dropdownId}+ dropdownPlacement={+ isDefined(addTarget) ? 'right-start' : dropdownPlacement+ }+ dropdownOffset={isDefined(addTarget) ? undefined : dropdownOffset}+ positionReference={+ isDefined(addTarget) &&+ navigationMenuItemInsertionAnchor?.dropdownId === dropdownId+ ? navigationMenuItemInsertionAnchor.element+ : undefined+ }+ onClose={() => {+ setAddTarget(null);+ onClose?.();+ }}+ dropdownComponents={+ isDefined(addTarget) ? (+ <NavigationMenuItemAddDropdownContent+ folderId={addTarget.folderId}+ position={addTarget.position}+ section={section}+ dropdownId={dropdownId}+ onClose={close}+ />+ ) : (+ renderMenu({ onClose: close, onAdd: openAddMenu })+ )+ }+ />+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemObjectColorEditor.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemObjectColorEditor.tsxnew file mode 100644index 00000000000..f1618acf4f7--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemObjectColorEditor.tsx@@ -0,0 +1,110 @@+import { objectColorsDraftState } from '@/layout-customization/states/objectColorsDraftState';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';+import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';+import { objectMetadataItemsWithFieldsSelector } from '@/object-metadata/states/objectMetadataItemsWithFieldsSelector';+import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';+import { ThemeColorPickerMenu } from '@/ui/input/components/ThemeColorPickerMenu';+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { NavigationDrawerItemEditingContext } from '@/ui/navigation/navigation-drawer/contexts/NavigationDrawerItemEditingContext';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { type ReactNode } from 'react';+import { isDefined } from 'twenty-shared/utils';+import {+ PermissionFlagType,+ type NavigationMenuItem,+} from '~/generated-metadata/graphql';++const StyledIconButton = styled.button`+ align-items: center;+ background: transparent;+ border: 0;+ color: inherit;+ cursor: pointer;+ display: flex;+ padding: 0;+`;++type NavigationMenuItemObjectColorEditorProps = {+ item: NavigationMenuItem;+ children: ReactNode;+};++export const NavigationMenuItemObjectColorEditor = ({+ item,+ children,+}: NavigationMenuItemObjectColorEditorProps) => {+ const { t } = useLingui();+ const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);+ const objectMetadataItemsWithFields = useAtomStateValue(+ objectMetadataItemsWithFieldsSelector,+ );+ const setObjectColorsDraft = useSetAtomState(objectColorsDraftState);+ const hasDataModelPermission = useHasPermissionFlag(+ PermissionFlagType.DATA_MODEL,+ );+ const { closeDropdown } = useCloseDropdown();+ const dropdownId = `navigation-item-${item.id}-color`;+ const object = objectMetadataItems.find(+ (object) => object.id === item.targetObjectMetadataId,+ );+ const persistedObject = objectMetadataItemsWithFields.find(+ (object) => object.id === item.targetObjectMetadataId,+ );++ if (!isDefined(object) || object.isSystem || !hasDataModelPermission) {+ return children;+ }++ return (+ <NavigationDrawerItemEditingContext.Provider+ value={{+ label: undefined,+ isSelected: false,+ icon: (+ <Dropdown+ dropdownId={dropdownId}+ dropdownPlacement="right-start"+ clickableComponent={+ <StyledIconButton+ type="button"+ aria-label={t`Change object color`}+ >+ <ObjectMetadataIcon objectMetadataItem={object} />+ </StyledIconButton>+ }+ dropdownComponents={+ <DropdownContent>+ <ThemeColorPickerMenu+ selectedColor={getObjectColorWithFallback(object)}+ onSelectColor={(color) => {+ setObjectColorsDraft((draft) => {+ const { [object.id]: _previousColor, ...otherColors } =+ draft;++ if (+ color === getObjectColorWithFallback(persistedObject)+ ) {+ return otherColors;+ }++ return { ...otherColors, [object.id]: color };+ });+ closeDropdown(dropdownId);+ }}+ />+ </DropdownContent>+ }+ />+ ),+ }}+ >+ {children}+ </NavigationDrawerItemEditingContext.Provider>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemRowActions.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemRowActions.tsxnew file mode 100644index 00000000000..6ae4ccf517f--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemRowActions.tsx@@ -0,0 +1,47 @@+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { type ReactNode } from 'react';+import { IconDotsVertical } from 'twenty-ui/icon';+import { LightIconButton } from 'twenty-ui/primitives/input';+import { themeCssVariables } from 'twenty-ui/theme-constants';++const StyledActions = styled.div`+ align-items: center;+ bottom: ${themeCssVariables.spacing['0.5']};+ display: flex;+ opacity: 0;+ pointer-events: none;+ position: absolute;+ right: ${themeCssVariables.spacing['0.5']};+`;++type NavigationMenuItemRowActionsProps = {+ rightOptions?: ReactNode;+ onOpenActions: () => void;+};++export const NavigationMenuItemRowActions = ({+ rightOptions,+ onOpenActions,+}: NavigationMenuItemRowActionsProps) => {+ const { t } = useLingui();++ return (+ <StyledActions+ data-navigation-actions+ onMouseDown={(event) => event.stopPropagation()}+ >+ {rightOptions}+ <LightIconButton+ Icon={IconDotsVertical}+ size="small"+ accent="tertiary"+ aria-label={t`Menu item actions`}+ onClick={(event) => {+ event.stopPropagation();+ onOpenActions();+ }}+ />+ </StyledActions>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemSelectableItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemSelectableItem.tsxnew file mode 100644index 00000000000..3b2aad2972c--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemSelectableItem.tsx@@ -0,0 +1,52 @@+import { type ReactNode } from 'react';+import { type IconComponent } from 'twenty-ui/icon';+import { useLingui } from '@lingui/react/macro';+import { MenuItem } from 'twenty-ui/primitives/navigation';+import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';+import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';+export type NavigationMenuItemOption = {+ id: string;+ label: string;+ searchableValues?: string[];+ contextualText?: string;+ Icon?: IconComponent;+ icon?: ReactNode;+ onClick: () => void;+ isDisabled?: boolean;+ isAlreadyInSidebar?: boolean;+ hasSubMenu?: boolean;+ accent?: 'default' | 'danger';+};+type NavigationMenuItemSelectableItemProps = { item: NavigationMenuItemOption };++export const NavigationMenuItemSelectableItem = ({+ item,+}: NavigationMenuItemSelectableItemProps) => {+ const { t } = useLingui();+ const isSelectedItemId = useAtomComponentFamilyStateValue(+ isSelectedItemIdComponentFamilyState,+ item.id,+ );+ return (+ <SelectableListItem+ itemId={item.id}+ onEnter={item.isDisabled ? undefined : item.onClick}+ >+ <MenuItem+ text={item.label}+ accent={item.accent}+ LeftIcon={item.Icon}+ LeftComponent={item.icon}+ onClick={item.onClick}+ disabled={item.isDisabled}+ contextualText={+ item.isAlreadyInSidebar ? t`Already in sidebar` : item.contextualText+ }+ contextualTextPosition="left"+ hasSubMenu={item.hasSubMenu}+ focused={isSelectedItemId}+ />+ </SelectableListItem>+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemTypeTooltip.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemTypeTooltip.tsxnew file mode 100644index 00000000000..0015487e5cf--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemTypeTooltip.tsx@@ -0,0 +1,60 @@+import { useLingui } from '@lingui/react/macro';+import { NavigationMenuItemType } from 'twenty-shared/types';+import {+ IconAddressBook,+ IconBox,+ IconFolder,+ IconLink,+ IconPerspective,+ IconTable,+ type IconComponent,+} from 'twenty-ui/icon';+import {+ AppTooltip,+ TooltipDelay,+ TooltipPosition,+} from 'twenty-ui/primitives/surfaces';+import { useTheme } from 'twenty-ui/theme-constants';++type NavigationMenuItemTypeTooltipProps = {+ type: NavigationMenuItemType;+ anchorId: string;+ hidden: boolean;+};++export const NavigationMenuItemTypeTooltip = ({+ type,+ anchorId,+ hidden,+}: NavigationMenuItemTypeTooltipProps) => {+ const { t } = useLingui();+ const theme = useTheme();++ const labelsByType: Record<+ NavigationMenuItemType,+ { label: string; Icon: IconComponent }+ > = {+ OBJECT: { label: t`Object`, Icon: IconBox },+ VIEW: { label: t`View`, Icon: IconTable },+ RECORD: { label: t`Record`, Icon: IconAddressBook },+ LINK: { label: t`Link`, Icon: IconLink },+ FOLDER: { label: t`Folder`, Icon: IconFolder },+ PAGE_LAYOUT: { label: t`Page`, Icon: IconPerspective },+ };++ return (+ <AppTooltip+ delay={TooltipDelay.mediumDelay}+ anchorSelect={`#${anchorId}`}+ title={labelsByType[type].label}+ description={+ type === NavigationMenuItemType.FOLDER ? t`Click to edit` : undefined+ }+ Icon={labelsByType[type].Icon}+ offset={theme.spacingMultiplicator}+ hidden={hidden}+ place={TooltipPosition.Top}+ positionStrategy="fixed"+ />+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsxindex a4e047a5cbf..ab8cb03b629 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/WorkspaceSectionAddMenuItemButton.tsx@@ -1,65 +1,21 @@import { useLingui } from '@lingui/react/macro';-import { styled } from '@linaria/react';-import React from 'react';-import { SidePanelPages } from 'twenty-shared/types';-import { IconColumnInsertRight, IconPlus } from 'twenty-ui/icon';-import { themeCssVariables } from 'twenty-ui/theme-constants';+import { IconPlus } from 'twenty-ui/icon';import { NavigationMenuItemEntrance } from '@/navigation-menu-item/edit/components/NavigationMenuItemEntrance';--import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';-import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoSelector';+import { NavigationMenuItemAddDropdown } from '@/navigation-menu-item/edit/components/NavigationMenuItemAddDropdown';import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';--const StyledContainer = styled.div`- padding-top: ${themeCssVariables.spacing['0.5']};-`;export const WorkspaceSectionAddMenuItemButton = () => {const { t } = useLingui();- const { navigateSidePanel } = useNavigateSidePanel();- const sidePanelPage = useAtomStateValue(sidePanelPageInfoSelector).page;- const [- pendingInsertionNavigationMenuItem,- setPendingInsertionNavigationMenuItem,- ] = useAtomState(pendingInsertionNavigationMenuItemState);-- const setSelectedNavigationMenuItemIdInEditMode = useSetAtomState(- selectedNavigationMenuItemIdInEditModeState,- );-- const handleClick = (event?: React.MouseEvent) => {- event?.stopPropagation();- setPendingInsertionNavigationMenuItem(null);- setSelectedNavigationMenuItemIdInEditMode(null);- navigateSidePanel({- page: SidePanelPages.NavigationMenuAddItem,- pageTitle: t`New menu item`,- pageIcon: IconColumnInsertRight,- resetNavigationStack: true,- });- };-- const isSelected =- sidePanelPage === SidePanelPages.NavigationMenuAddItem &&- pendingInsertionNavigationMenuItem === null;-return (<NavigationMenuItemEntrance>- <StyledContainer>+ <NavigationMenuItemAddDropdown><NavigationDrawerItemIcon={IconPlus}label={t`Add menu item`}- onClick={handleClick}triggerEvent="CLICK"variant="tertiary"- isSelectedInEditMode={isSelected}/>- </StyledContainer>+ </NavigationMenuItemAddDropdown></NavigationMenuItemEntrance>);};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/__stories__/NavigationMenuItemEditable.stories.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/__stories__/NavigationMenuItemEditable.stories.tsxnew file mode 100644index 00000000000..0c6d9426824--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/__stories__/NavigationMenuItemEditable.stories.tsx@@ -0,0 +1,245 @@+import { navigationMenuItemIdToRenameState } from '@/navigation-menu-item/common/states/navigationMenuItemIdToRenameState';+import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';+import { Fragment } from 'react';+import { NavigationSections } from '@/navigation-menu-item/common/constants/NavigationSections.constants';+import { NavigationItemDropTarget } from '@/navigation-menu-item/display/dnd/components/NavigationItemDropTarget';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, userEvent, within } from 'storybook/test';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { IconLink } from 'twenty-ui/icon';+import { type NavigationMenuItem } from '~/generated-metadata/graphql';+import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { NavigationMenuItemEditable } from '@/navigation-menu-item/edit/components/NavigationMenuItemEditable';+import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';+import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';+import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';+import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecorator';+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';++const ITEMS: NavigationMenuItem[] = ['Docs', 'Status'].map(+ (name, position) => ({+ id: name.toLowerCase(),+ type: NavigationMenuItemType.LINK,+ name,+ link: 'https://example.com',+ position,+ createdAt: '2026-01-01T00:00:00.000Z',+ updatedAt: '2026-01-01T00:00:00.000Z',+ }),+);++const EditableNavigation = () => {+ const items = useAtomStateValue(navigationMenuItemsDraftState) ?? [];+ return (+ <>+ {[...items]+ .sort((a, b) => a.position - b.position)+ .map((item, index) => (+ <Fragment key={item.id}>+ <NavigationItemDropTarget+ folderId={null}+ index={index}+ sectionId={NavigationSections.WORKSPACE}+ compact+ />+ <NavigationMenuItemEditable item={item}>+ <NavigationDrawerItem label={item.name ?? ''} Icon={IconLink} />+ </NavigationMenuItemEditable>+ </Fragment>+ ))}+ <NavigationItemDropTarget+ folderId={null}+ index={items.length}+ sectionId={NavigationSections.WORKSPACE}+ compact+ />+ </>+ );+};++const meta: Meta<typeof NavigationMenuItemEditable> = {+ title: 'Modules/NavigationMenuItem/NavigationMenuItemEditable',+ component: NavigationMenuItemEditable,+ decorators: [+ ComponentWithRouterDecorator,+ ObjectMetadataItemsDecorator,+ IconsProviderDecorator,+ ToastDecorator,+ ],+ parameters: { container: { width: 240 } },+ beforeEach: () => {+ jotaiStore.set(selectedNavigationMenuItemIdInEditModeState.atom, null);+ jotaiStore.set(navigationMenuItemIdToRenameState.atom, null);+ jotaiStore.set(isLayoutCustomizationModeEnabledState.atom, true);+ jotaiStore.set(navigationMenuItemsDraftState.atom, ITEMS);+ jotaiStore.set(isNavigationDrawerExpandedState.atom, true);+ },+ render: () => <EditableNavigation />,+};+export default meta;+type Story = StoryObj<typeof NavigationMenuItemEditable>;++export const EditLink: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(await canvas.findByText('Docs'));+ const label = await body.findByDisplayValue('Docs');+ await userEvent.clear(label);+ await userEvent.type(label, 'Documentation{Enter}');+ await expect(await canvas.findByText('Documentation')).toBeVisible();+ await userEvent.click(+ (await canvas.findAllByRole('button', { name: 'Edit link' }))[0],+ );+ const url = await body.findByDisplayValue('https://example.com');+ await userEvent.clear(url);+ await userEvent.type(url, 'https://twenty.com/docs{Enter}');+ await userEvent.click(+ (await canvas.findAllByRole('button', { name: 'Edit link' }))[0],+ );+ await expect(+ await body.findByDisplayValue('https://twenty.com/docs'),+ ).toBeVisible();+ await userEvent.keyboard('{Escape}');+ },+};++export const OrganizeFromBothMenus: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const docs = await canvas.findByText('Docs');+ await userEvent.tab();+ await userEvent.click(+ (await canvas.findAllByRole('button', { name: 'Menu item actions' }))[0],+ );+ await userEvent.click(await body.findByText('Move down'));+ await expect(+ (await canvas.findAllByText(/^(Docs|Status)$/)).map(+ (button) => button.textContent,+ ),+ ).toEqual(['Status', 'Docs']);+ await userEvent.pointer({ target: docs, keys: '[MouseRight]' });+ await expect(await body.findByText('Add menu item before')).toBeVisible();+ await expect(await body.findByText('Add menu item after')).toBeVisible();+ await expect(await body.findByText('Move to folder')).toBeVisible();+ await userEvent.click(await body.findByText('Remove from sidebar'));+ await expect(canvas.queryByText('Docs')).not.toBeInTheDocument();+ await expect(await canvas.findByText('Status')).toBeVisible();+ },+};++export const PreviewInsertion: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.pointer({+ target: await canvas.findByText('Docs'),+ keys: '[MouseRight]',+ });+ await userEvent.click(await body.findByText('Add menu item after'));+ await expect(+ await canvas.findByRole('button', { name: 'Select a menu item' }),+ ).toBeDisabled();+ await expect(+ (await canvas.findAllByText(/^(Docs|Status|Select a menu item)$/)).map(+ (element) => element.textContent,+ ),+ ).toEqual(['Docs', 'Select a menu item', 'Status']);+ await userEvent.click(await body.findByText('Object'));+ await expect(await canvas.findByText('Select a menu item')).toBeVisible();+ await userEvent.keyboard('{Escape}');+ await expect(+ canvas.queryByText('Select a menu item'),+ ).not.toBeInTheDocument();+ await userEvent.pointer({+ target: await canvas.findByText('Docs'),+ keys: '[MouseRight]',+ });+ await userEvent.click(await body.findByText('Add menu item before'));+ await expect(+ (await canvas.findAllByText(/^(Docs|Status|Select a menu item)$/)).map(+ (element) => element.textContent,+ ),+ ).toEqual(['Select a menu item', 'Docs', 'Status']);+ await userEvent.click(await body.findByText('Link'));+ await expect(await body.findByDisplayValue('Twenty')).toBeVisible();+ await expect(+ canvas.queryByText('Select a menu item'),+ ).not.toBeInTheDocument();+ await userEvent.keyboard('{Escape}');+ },+};++export const EditFolderInPlace: Story = {+ beforeEach: () => {+ jotaiStore.set(navigationMenuItemsDraftState.atom, [+ {+ ...ITEMS[0],+ id: 'folder',+ name: 'Projects',+ type: NavigationMenuItemType.FOLDER,+ icon: 'IconFolder',+ color: 'orange',+ },+ ]);+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ await userEvent.click(await canvas.findByText('Projects'));+ await expect(canvas.queryByRole('textbox')).not.toBeInTheDocument();+ await userEvent.click(await canvas.findByText('Projects'));+ const input = await canvas.findByDisplayValue('Projects');+ await userEvent.clear(input);+ await userEvent.type(input, 'Work{Enter}');+ await userEvent.click(await canvas.findByText('Work'));+ await userEvent.clear(await canvas.findByDisplayValue('Work'));+ await userEvent.type(await canvas.findByRole('textbox'), 'Discard{Escape}');+ await expect(await canvas.findByText('Work')).toBeVisible();+ await userEvent.click(+ await canvas.findByLabelText('Choose icon and color', {+ selector: 'button',+ }),+ );+ await expect(+ await body.findByRole('button', { name: 'Icon123' }),+ ).toBeVisible();+ await userEvent.keyboard('{Escape}');+ },+};++export const TooltipsStayOutOfActionMenus: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const docs = await canvas.findByText('Docs');+ const status = await canvas.findByText('Status');++ await userEvent.hover(docs);+ await expect(await body.findByRole('tooltip')).toHaveTextContent('Link');+ await userEvent.hover(status);+ await expect(await body.findByRole('tooltip')).toHaveTextContent('Link');+ await expect(body.getAllByRole('tooltip')).toHaveLength(1);++ for (const name of ['Docs', 'Status']) {+ await userEvent.tab();+ await userEvent.tab();+ await expect(canvas.getByText(name)).toHaveFocus();+ const actions = (+ await canvas.findAllByRole('button', { name: 'Menu item actions' })+ )[name === 'Docs' ? 0 : 1];+ await userEvent.hover(actions);+ await expect(body.queryByRole('tooltip')).not.toBeInTheDocument();+ await userEvent.click(actions);+ await expect(await body.findByText('Remove from sidebar')).toBeVisible();+ await expect(body.queryByRole('tooltip')).not.toBeInTheDocument();+ await userEvent.keyboard('{Escape}');+ await expect(body.queryByRole('tooltip')).not.toBeInTheDocument();+ }+ },+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/__tests__/NavigationMenuItemMenu.test.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/__tests__/NavigationMenuItemMenu.test.tsxnew file mode 100644index 00000000000..3dc2a8deb44--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/__tests__/NavigationMenuItemMenu.test.tsx@@ -0,0 +1,77 @@+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';+import { createStore, Provider } from 'jotai';++import { openNavigationMenuItemFolderIdsState } from '@/navigation-menu-item/common/states/openNavigationMenuItemFolderIdsState';+import { NavigationMenuItemMenu } from '@/navigation-menu-item/edit/components/NavigationMenuItemMenu';++jest.mock(+ '@/navigation-menu-item/edit/components/NavigationMenuItemAddDropdownContent',+ () => ({+ NavigationMenuItemAddDropdownContent: ({+ onClose,+ }: {+ onClose: () => void;+ }) => <button onClick={onClose}>Close picker</button>,+ }),+);++describe('NavigationMenuItemMenu', () => {+ it.each(['favorite', 'workspace'] as const)(+ 'replaces %s actions with the picker and resets when closed',+ async (section) => {+ const user = userEvent.setup();+ const store = createStore();+ render(+ <I18nProvider i18n={i18n}>+ <Provider store={store}>+ <NavigationMenuItemMenu+ dropdownId="folder-actions"+ section={section}+ clickableComponent={<span>Folder actions</span>}+ renderMenu={({ onAdd }) => (+ <button+ onClick={() => onAdd({ folderId: 'folder', position: 1 })}+ >+ Add menu item+ </button>+ )}+ />+ </Provider>+ </I18nProvider>,+ );++ await user.click(screen.getByRole('button', { name: 'Folder actions' }));+ await user.click(screen.getByRole('button', { name: 'Add menu item' }));+ expect(+ screen.queryByRole('button', { name: 'Add menu item' }),+ ).not.toBeInTheDocument();+ expect(store.get(openNavigationMenuItemFolderIdsState.atom)).toContain(+ 'folder',+ );+ await user.click(screen.getByRole('button', { name: 'Close picker' }));+ expect(+ screen.queryByRole('button', { name: 'Close picker' }),+ ).not.toBeInTheDocument();++ await user.click(screen.getByRole('button', { name: 'Folder actions' }));+ expect(+ screen.getByRole('button', { name: 'Add menu item' }),+ ).toBeVisible();+ expect(+ screen.queryByRole('button', { name: 'Close picker' }),+ ).not.toBeInTheDocument();+ await user.click(screen.getByRole('button', { name: 'Add menu item' }));+ await user.keyboard('{Escape}');+ expect(+ screen.queryByRole('button', { name: 'Close picker' }),+ ).not.toBeInTheDocument();+ await user.click(screen.getByRole('button', { name: 'Folder actions' }));+ expect(+ screen.getByRole('button', { name: 'Add menu item' }),+ ).toBeVisible();+ },+ );+});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/effect-components/NavigationMenuItemInsertionPreviewEffect.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/effect-components/NavigationMenuItemInsertionPreviewEffect.tsxnew file mode 100644index 00000000000..78dfa16fa2d--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/effect-components/NavigationMenuItemInsertionPreviewEffect.tsx@@ -0,0 +1,47 @@+import { useEffect } from 'react';++import { navigationMenuItemInsertionPreviewState } from '@/navigation-menu-item/common/states/navigationMenuItemInsertionPreviewState';+import { type NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';++type NavigationMenuItemInsertionPreviewEffectProps = {+ dropdownId: string;+ section: NavigationMenuItemSection;+ folderId: string | null;+ index: number;+};++// The preview follows the add flow's lifetime, including nested menu pages,+// and re-syncs while it stays open as the insertion point moves.+export const NavigationMenuItemInsertionPreviewEffect = ({+ dropdownId,+ section,+ folderId,+ index,+}: NavigationMenuItemInsertionPreviewEffectProps) => {+ const setNavigationMenuItemInsertionPreview = useSetAtomState(+ navigationMenuItemInsertionPreviewState,+ );++ useEffect(() => {+ setNavigationMenuItemInsertionPreview({+ dropdownId,+ section,+ folderId,+ index,+ });++ return () =>+ setNavigationMenuItemInsertionPreview((preview) =>+ preview?.dropdownId === dropdownId ? null : preview,+ );+ }, [+ dropdownId,+ section,+ folderId,+ index,+ setNavigationMenuItemInsertionPreview,+ ]);++ return <></>;+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/effect-components/NavigationMenuItemLinkEditorOpenEffect.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/effect-components/NavigationMenuItemLinkEditorOpenEffect.tsxnew file mode 100644index 00000000000..d9c77ce680c--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/effect-components/NavigationMenuItemLinkEditorOpenEffect.tsx@@ -0,0 +1,24 @@+import { useEffect } from 'react';++import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';++type NavigationMenuItemLinkEditorOpenEffectProps = {+ dropdownId: string;+ onOpen: () => void;+};++// A link created from the add dropdown is selected by that dropdown, which+// cannot reach this row because it does not exist yet when the click happens.+export const NavigationMenuItemLinkEditorOpenEffect = ({+ dropdownId,+ onOpen,+}: NavigationMenuItemLinkEditorOpenEffectProps) => {+ const { openDropdown } = useOpenDropdown();++ useEffect(() => {+ onOpen();+ openDropdown({ dropdownComponentInstanceIdFromProps: dropdownId });+ }, [dropdownId, onOpen, openDropdown]);++ return <></>;+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/effect-components/NavigationMenuItemNameInputFocusEffect.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/effect-components/NavigationMenuItemNameInputFocusEffect.tsxnew file mode 100644index 00000000000..fc4a57d933d--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/effect-components/NavigationMenuItemNameInputFocusEffect.tsx@@ -0,0 +1,31 @@+import { useEffect } from 'react';++import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';+import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';+import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';++type NavigationMenuItemNameInputFocusEffectProps = {+ focusId: string;+};++export const NavigationMenuItemNameInputFocusEffect = ({+ focusId,+}: NavigationMenuItemNameInputFocusEffectProps) => {+ const { pushFocusItemToFocusStack } = usePushFocusItemToFocusStack();+ const { removeFocusItemFromFocusStackById } =+ useRemoveFocusItemFromFocusStackById();++ useEffect(() => {+ pushFocusItemToFocusStack({+ focusId,+ component: { type: FocusComponentType.TEXT_INPUT, instanceId: focusId },+ globalHotkeysConfig: {+ enableGlobalHotkeysConflictingWithKeyboard: false,+ },+ });++ return () => removeFocusItemFromFocusStackById({ focusId });+ }, [focusId, pushFocusItemToFocusStack, removeFocusItemFromFocusStackById]);++ return <></>;+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useFavoritesFolderEdit.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useFavoritesFolderEdit.tsindex be010c9b87d..63a7e65fb49 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useFavoritesFolderEdit.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useFavoritesFolderEdit.ts@@ -1,10 +1,10 @@-import { useState } from 'react';+import { navigationMenuItemIdToRenameState } from '@/navigation-menu-item/common/states/navigationMenuItemIdToRenameState';+import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { type NavigationMenuItem } from '~/generated-metadata/graphql';import { NAVIGATION_MENU_ITEM_FOLDER_DELETE_MODAL_ID } from '@/navigation-menu-item/common/constants/NavigationMenuItemFolderDeleteModalId';import { useDeleteNavigationMenuItemFolder } from '@/navigation-menu-item/edit/folder/hooks/useDeleteNavigationMenuItemFolder';-import { useRenameNavigationMenuItemFolder } from '@/navigation-menu-item/edit/folder/hooks/useRenameNavigationMenuItemFolder';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';import { useModal } from '@/ui/layout/modal/hooks/useModal';import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState';@@ -12,20 +12,25 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/usetype UseFavoritesFolderEditParams = {folderId: string;- folderName: string;navigationMenuItems: NavigationMenuItem[];};export const useFavoritesFolderEdit = ({folderId,- folderName: initialFolderName,navigationMenuItems,}: UseFavoritesFolderEditParams) => {- const [isRenaming, setIsRenaming] = useState(false);- const [folderNameValue, setFolderNameValue] = useState(initialFolderName);+ const setSelectedNavigationMenuItemIdInEditMode = useSetAtomState(+ selectedNavigationMenuItemIdInEditModeState,+ );+ const setNavigationMenuItemIdToRename = useSetAtomState(+ navigationMenuItemIdToRenameState,+ );++ const startEditing = () => {+ setSelectedNavigationMenuItemIdInEditMode(folderId);+ setNavigationMenuItemIdToRename(folderId);+ };- const { renameNavigationMenuItemFolder } =- useRenameNavigationMenuItemFolder();const { deleteNavigationMenuItemFolder } =useDeleteNavigationMenuItemFolder();const { openModal } = useModal();@@ -35,7 +40,6 @@ export const useFavoritesFolderEdit = ({isDropdownOpenComponentState,dropdownId,);- const { closeDropdown } = useCloseDropdown();const modalId = `${NAVIGATION_MENU_ITEM_FOLDER_DELETE_MODAL_ID}-${folderId}`;const isModalOpened = useAtomComponentStateValue(@@ -43,37 +47,11 @@ export const useFavoritesFolderEdit = ({modalId,);- const handleSubmitRename = async (value: string) => {- if (value === '') return;- await renameNavigationMenuItemFolder(folderId, value);- setIsRenaming(false);- return true;- };-- const handleCancelRename = () => {- setFolderNameValue(initialFolderName);- setIsRenaming(false);- };-- const handleClickOutsideRename = async (- _event: MouseEvent | TouchEvent,- value: string,- ) => {- if (!value) {- setIsRenaming(false);- return;- }- await renameNavigationMenuItemFolder(folderId, value);- setIsRenaming(false);- };-const handleFolderDelete = async () => {if (navigationMenuItems.length > 0) {openModal(modalId);- closeDropdown(dropdownId);} else {await deleteNavigationMenuItemFolder(folderId);- closeDropdown(dropdownId);}};@@ -82,18 +60,10 @@ export const useFavoritesFolderEdit = ({};return {- isRenaming,- setIsRenaming,- folderNameValue,- setFolderNameValue,- handleSubmitRename,- handleCancelRename,- handleClickOutsideRename,+ startEditing,handleFolderDelete,handleConfirmDelete,isDropdownOpen,- dropdownId,- closeDropdown: () => closeDropdown(dropdownId),modalId,isModalOpened,navigationMenuItemCount: navigationMenuItems.length,diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useRenameNavigationMenuItemFolder.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useRenameNavigationMenuItemFolder.tsdeleted file mode 100644index fb596cd9004..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/folder/hooks/useRenameNavigationMenuItemFolder.ts+++ /dev/null@@ -1,22 +0,0 @@-import { useUpdateManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useUpdateManyNavigationMenuItems';--export const useRenameNavigationMenuItemFolder = () => {- const { updateManyNavigationMenuItems } = useUpdateManyNavigationMenuItems();-- const renameNavigationMenuItemFolder = async (- folderId: string,- newName: string,- ): Promise<void> => {- if (!newName) {- return;- }-- await updateManyNavigationMenuItems([- { id: folderId, update: { name: newName } },- ]);- };-- return {- renameNavigationMenuItemFolder,- };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/__tests__/useNavigationMenuItemEditController.test.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/__tests__/useNavigationMenuItemEditController.test.tsxnew file mode 100644index 00000000000..b5713d865f5--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/__tests__/useNavigationMenuItemEditController.test.tsx@@ -0,0 +1,129 @@+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { act, renderHook } from '@testing-library/react';+import { createStore, Provider } from 'jotai';+import { type ReactNode } from 'react';+import { NavigationMenuItemType } from 'twenty-shared/types';++import { useCreateManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useCreateManyNavigationMenuItems';+import { useDeleteManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useDeleteManyNavigationMenuItems';+import { useUpdateManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useUpdateManyNavigationMenuItems';+import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';+import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';++jest.mock(+ '@/navigation-menu-item/common/hooks/useCreateManyNavigationMenuItems',+ () => ({+ useCreateManyNavigationMenuItems: jest.fn(),+ }),+);+jest.mock(+ '@/navigation-menu-item/common/hooks/useUpdateManyNavigationMenuItems',+ () => ({+ useUpdateManyNavigationMenuItems: jest.fn(),+ }),+);+jest.mock(+ '@/navigation-menu-item/common/hooks/useDeleteManyNavigationMenuItems',+ () => ({+ useDeleteManyNavigationMenuItems: jest.fn(),+ }),+);+jest.mock(+ '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData',+ () => ({+ useNavigationMenuItemsData: () => ({+ navigationMenuItems: [],+ workspaceNavigationMenuItems: [],+ currentUserWorkspaceId: 'current-user-workspace',+ }),+ }),+);+jest.mock('twenty-ui/primitives/feedback', () => ({+ ...jest.requireActual('twenty-ui/primitives/feedback'),+ useToast: () => ({ enqueueToast: jest.fn() }),+}));++describe('useNavigationMenuItemEditController', () => {+ it('keeps simultaneous Favorites mutations separate from Workspace drafts', async () => {+ const createManyNavigationMenuItems = jest.fn().mockResolvedValue([]);+ const updateManyNavigationMenuItems = jest.fn().mockResolvedValue([]);+ const deleteManyNavigationMenuItems = jest.fn().mockResolvedValue([]);+ jest+ .mocked(useCreateManyNavigationMenuItems)+ .mockReturnValue({ createManyNavigationMenuItems });+ jest+ .mocked(useUpdateManyNavigationMenuItems)+ .mockReturnValue({ updateManyNavigationMenuItems });+ jest+ .mocked(useDeleteManyNavigationMenuItems)+ .mockReturnValue({ deleteManyNavigationMenuItems });+ const store = createStore();+ store.set(navigationMenuItemsDraftState.atom, []);+ const { result } = renderHook(+ () => ({+ workspace: useNavigationMenuItemEditController('workspace'),+ favorite: useNavigationMenuItemEditController('favorite'),+ }),+ {+ wrapper: ({ children }: { children: ReactNode }) => (+ <I18nProvider i18n={i18n}>+ <Provider store={store}>{children}</Provider>+ </I18nProvider>+ ),+ },+ );++ let workspaceId = '';+ let favoriteId = '';+ act(() => {+ favoriteId = result.current.favorite.createItem({+ type: NavigationMenuItemType.FOLDER,+ name: 'Personal',+ });+ workspaceId = result.current.workspace.createItem({+ type: NavigationMenuItemType.FOLDER,+ name: 'Team',+ });+ });+ expect(createManyNavigationMenuItems).toHaveBeenCalledTimes(1);+ expect(createManyNavigationMenuItems).toHaveBeenCalledWith([+ expect.objectContaining({+ id: favoriteId,+ userWorkspaceId: 'current-user-workspace',+ name: 'Personal',+ }),+ ]);+ expect(store.get(navigationMenuItemsDraftState.atom)).toEqual([+ expect.objectContaining({+ id: workspaceId,+ userWorkspaceId: undefined,+ name: 'Team',+ }),+ ]);++ await act(async () => {+ await result.current.workspace.updateItem(workspaceId, {+ name: 'Team renamed',+ });+ await result.current.favorite.updateItem(favoriteId, {+ name: 'Personal renamed',+ });+ });+ expect(updateManyNavigationMenuItems).toHaveBeenCalledTimes(1);+ expect(updateManyNavigationMenuItems).toHaveBeenCalledWith([+ { id: favoriteId, update: { name: 'Personal renamed' } },+ ]);+ expect(store.get(navigationMenuItemsDraftState.atom)?.[0].name).toBe(+ 'Team renamed',+ );++ await act(async () => {+ await result.current.favorite.deleteItems([favoriteId]);+ await result.current.workspace.deleteItems([workspaceId]);+ });+ expect(deleteManyNavigationMenuItems).toHaveBeenCalledTimes(1);+ expect(deleteManyNavigationMenuItems).toHaveBeenCalledWith([favoriteId]);+ expect(store.get(navigationMenuItemsDraftState.atom)).toEqual([]);+ });+});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/__tests__/useNavigationMenuItemSearchRecords.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/__tests__/useNavigationMenuItemSearchRecords.test.tsnew file mode 100644index 00000000000..fb7549a4ba3--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/__tests__/useNavigationMenuItemSearchRecords.test.ts@@ -0,0 +1,90 @@+import { type NavigationMenuItem } from '~/generated-metadata/graphql';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { useObjectRecordSearchRecords } from '@/object-record/hooks/useObjectRecordSearchRecords';+import { act, renderHook } from '@testing-library/react';+import { useNavigationMenuItemSearchRecords } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemSearchRecords';++jest.mock('@/side-panel/hooks/useSearchableObjectNameSingulars', () => ({+ useSearchableObjectNameSingulars: () => ['person'],+}));+jest.mock('@/object-record/hooks/useObjectRecordSearchRecords', () => ({+ useObjectRecordSearchRecords: jest.fn(() => ({+ loading: false,+ searchRecords: [],+ })),+}));++describe('navigation record search empty state', () => {+ beforeEach(() => {+ jest.useFakeTimers();+ jest+ .mocked(useObjectRecordSearchRecords)+ .mockReturnValue({ loading: false, searchRecords: [], error: undefined });+ });+ afterEach(() => jest.useRealTimers());++ it('keeps loading between quick empty responses until the current search settles', () => {+ const { result, rerender } = renderHook(+ ({ searchInput }) =>+ useNavigationMenuItemSearchRecords({ searchInput, currentItems: [] }),+ { initialProps: { searchInput: '' } },+ );++ rerender({ searchInput: 'goo' });+ expect(result.current.recordSearchLoading).toBe(true);+ act(() => jest.advanceTimersByTime(300));+ expect(result.current.recordSearchLoading).toBe(true);++ act(() => jest.advanceTimersByTime(100));+ rerender({ searchInput: 'goog' });+ expect(result.current.recordSearchLoading).toBe(true);+ act(() => jest.advanceTimersByTime(300));+ expect(result.current.recordSearchLoading).toBe(true);+ act(() => jest.advanceTimersByTime(300));+ expect(result.current.recordSearchLoading).toBe(false);+ expect(result.current.navigationMenuItemSearchRecords).toEqual([]);+ });+});++describe('navigation record search duplicates', () => {+ it('keeps an existing record visible and only marks it unavailable in its section', () => {+ const record = {+ recordId: 'ivan',+ objectNameSingular: 'person',+ label: 'Ivan Zhao',+ imageUrl: null,+ };+ jest.mocked(useObjectRecordSearchRecords).mockReturnValue({+ loading: false,+ searchRecords: [+ { ...record, objectLabelSingular: 'Person', tsRankCD: 1, tsRank: 1 },+ ],+ error: undefined,+ });+ const existingItem: NavigationMenuItem = {+ id: 'navigation-ivan',+ type: NavigationMenuItemType.RECORD,+ targetRecordId: record.recordId,+ folderId: 'folder',+ position: 0,+ createdAt: '',+ updatedAt: '',+ };+ const { result, rerender } = renderHook(+ ({ currentItems }: { currentItems: NavigationMenuItem[] }) =>+ useNavigationMenuItemSearchRecords({+ searchInput: 'Ivan',+ currentItems,+ }),+ { initialProps: { currentItems: [existingItem] } },+ );+ expect(result.current.navigationMenuItemSearchRecords).toEqual([+ { ...record, isAlreadyInSidebar: true },+ ]);++ rerender({ currentItems: [] });+ expect(result.current.navigationMenuItemSearchRecords).toEqual([+ { ...record, isAlreadyInSidebar: false },+ ]);+ });+});diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemAddOptions.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemAddOptions.tsxnew file mode 100644index 00000000000..2d2f28eeb20--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemAddOptions.tsx@@ -0,0 +1,368 @@+import { useQuery } from '@apollo/client/react';+import { useLingui } from '@lingui/react/macro';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import {+ IconBox,+ IconFolder,+ IconLink,+ IconPerspective,+ IconTable,+ useIcons,+} from 'twenty-ui/icon';+import { Avatar, TintedIconTile } from 'twenty-ui/primitives/data-display';+import {+ FindAllStandalonePageLayoutsDocument,+ type NavigationMenuItem,+} from '~/generated-metadata/graphql';++import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';+import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink';+import { navigationMenuItemsSelector } from '@/navigation-menu-item/common/states/navigationMenuItemsSelector';+import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';+import { type NavigationMenuItemOption } from '@/navigation-menu-item/edit/components/NavigationMenuItemSelectableItem';+import { type NewNavigationMenuItemInput } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';+import { useNavigationMenuItemSearchRecords } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemSearchRecords';+import { useNavigationMenuObjectMetadataForSection } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataForSection';+import { getAvailableObjectMetadataForNewSidebarItem } from '@/navigation-menu-item/edit/utils/getAvailableObjectMetadataForNewSidebarItem';+import { isViewDisplayableInNavigationMenu } from '@/navigation-menu-item/edit/utils/isViewDisplayableInNavigationMenu';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { getAvatarShape } from '@/object-metadata/utils/getAvatarShape';+import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';+import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { ViewKey } from '@/views/types/ViewKey';+import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';++export type NavigationMenuItemAddStep =+ | 'main'+ | 'object'+ | 'view'+ | 'record'+ | 'page';++type UseNavigationMenuItemAddOptionsParams = {+ step: NavigationMenuItemAddStep;+ search: string;+ objectId: string | null;+ folderId?: string;+ currentItems: NavigationMenuItem[];+ isSearchingAllItems: boolean;+ addItem: (input: NewNavigationMenuItemInput) => void;+ navigateToStep: (step: NavigationMenuItemAddStep) => void;+ selectObject: (objectId: string) => void;+};++export const useNavigationMenuItemAddOptions = ({+ step,+ search,+ objectId,+ folderId,+ currentItems,+ isSearchingAllItems,+ addItem,+ navigateToStep,+ selectObject,+}: UseNavigationMenuItemAddOptionsParams) => {+ const { t } = useLingui();+ const { getIcon } = useIcons();++ const {+ data: standalonePagesData,+ loading: standalonePagesLoading,+ error: standalonePagesError,+ } = useQuery(FindAllStandalonePageLayoutsDocument, {+ skip: step !== 'page' && !isSearchingAllItems,+ });++ const navigationMenuItems = useAtomStateValue(navigationMenuItemsSelector);+ const { objectMetadataItems } = useObjectMetadataItems();+ const { activeNonSystemObjectMetadataItems } =+ useFilteredObjectMetadataItems();+ const {+ views,+ objectMetadataIdsWithIndexView,+ objectMetadataIdsAlreadyAdded,+ viewIdsAlreadyAdded,+ } = useNavigationMenuObjectMetadataForSection(currentItems);+ const {+ navigationMenuItemSearchRecords,+ recordSearchLoading,+ isSearchDebouncing,+ } = useNavigationMenuItemSearchRecords({+ searchInput: search,+ currentItems,+ skip: step !== 'record' && !isSearchingAllItems,+ });+ const {+ availableObjectMetadataItems,+ availableSystemObjectMetadataItems,+ objectMetadataItemsWithViews,+ availableSystemObjectMetadataItemsForView,+ } = getAvailableObjectMetadataForNewSidebarItem({+ objectMetadataItems,+ activeNonSystemObjectMetadataItems,+ objectMetadataIdsWithIndexView,+ objectMetadataIdsWithDisplayableViews: new Set(+ views+ .filter((view) => view.key !== ViewKey.INDEX)+ .map((view) => view.objectMetadataId),+ ),+ });++ const getItems = (+ targetStep: NavigationMenuItemAddStep = step,+ ): NavigationMenuItemOption[] => {+ if (targetStep === 'main') {+ return [+ {+ id: 'object',+ label: t`Object`,+ icon: <TintedIconTile Icon={IconBox} />,+ onClick: () => navigateToStep('object'),+ hasSubMenu: true,+ },+ {+ id: 'view',+ label: t`View`,+ icon: <TintedIconTile Icon={IconTable} />,+ onClick: () => navigateToStep('view'),+ hasSubMenu: true,+ },+ {+ id: 'record',+ label: t`Record`,+ icon: <Avatar name={t`Record`} shape="circle" size="md" />,+ onClick: () => navigateToStep('record'),+ hasSubMenu: true,+ },+ {+ id: 'folder',+ label: t`Folder`,+ contextualText: isDefined(folderId)+ ? t`Cannot nest folders into folders`+ : undefined,+ Icon: isDefined(folderId) ? IconFolder : undefined,+ icon: isDefined(folderId) ? undefined : (+ <ColoredIcon+ Icon={IconFolder}+ color={DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER}+ />+ ),+ onClick: () => {+ addItem({+ type: NavigationMenuItemType.FOLDER,+ name: t`New folder`,+ color: DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER,+ });+ },+ isDisabled: isDefined(folderId),+ },+ {+ id: 'link',+ label: t`Link`,+ icon: (+ <ColoredIcon+ Icon={IconLink}+ color={DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK}+ />+ ),+ onClick: () => {+ addItem({+ type: NavigationMenuItemType.LINK,+ name: 'Twenty',+ link: 'https://twenty.com',+ color: DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK,+ });+ },+ },+ {+ id: 'page',+ label: t`Page`,+ icon: <TintedIconTile Icon={IconPerspective} />,+ onClick: () => navigateToStep('page'),+ hasSubMenu: true,+ },+ ];+ }+ if (+ targetStep === 'object' ||+ (targetStep === 'view' && !objectId && !isSearchingAllItems)+ ) {+ const objects =+ targetStep === 'object'+ ? [+ ...availableObjectMetadataItems,+ ...availableSystemObjectMetadataItems,+ ]+ : [+ ...objectMetadataItemsWithViews,+ ...availableSystemObjectMetadataItemsForView,+ ];+ if (targetStep === 'object') {+ objects.sort(+ (firstObject, secondObject) =>+ Number(objectMetadataIdsAlreadyAdded.has(firstObject.id)) -+ Number(objectMetadataIdsAlreadyAdded.has(secondObject.id)),+ );+ }+ return objects.map((object) => ({+ id: object.id,+ label: object.labelPlural,+ searchableValues: [+ object.labelPlural,+ object.labelSingular,+ object.namePlural,+ object.nameSingular,+ ],+ icon: <ObjectMetadataIcon objectMetadataItem={object} />,+ isAlreadyInSidebar:+ targetStep === 'object' &&+ objectMetadataIdsAlreadyAdded.has(object.id),+ isDisabled:+ targetStep === 'object' &&+ objectMetadataIdsAlreadyAdded.has(object.id),+ hasSubMenu: targetStep === 'view',+ onClick: () => {+ if (targetStep === 'view') {+ selectObject(object.id);+ } else {+ addItem({+ type: NavigationMenuItemType.OBJECT,+ targetObjectMetadataId: object.id,+ color: getObjectColorWithFallback(object),+ });+ }+ },+ }));+ }+ if (targetStep === 'view') {+ const objectIdsWithViews = new Set(+ [+ ...objectMetadataItemsWithViews,+ ...availableSystemObjectMetadataItemsForView,+ ].map((object) => object.id),+ );++ return views+ .filter(+ (view) =>+ (isSearchingAllItems+ ? objectIdsWithViews.has(view.objectMetadataId)+ : view.objectMetadataId === objectId) &&+ isViewDisplayableInNavigationMenu(view),+ )+ .sort((a, b) => a.position - b.position)+ .map((view) => {+ const Icon = getIcon(view.icon);+ return {+ id: view.id,+ label: view.name,+ icon: <TintedIconTile Icon={Icon} />,+ isDisabled: viewIdsAlreadyAdded.has(view.id),+ isAlreadyInSidebar: viewIdsAlreadyAdded.has(view.id),+ onClick: () =>+ addItem({ type: NavigationMenuItemType.VIEW, viewId: view.id }),+ };+ });+ }+ if (targetStep === 'page') {+ const pageLayoutIdsAlreadyAdded = new Set(+ currentItems.map((item) => item.pageLayoutId),+ );+ // Reversed relative to the lookup order: the last Map write wins, so+ // currentItems must come second to keep taking precedence.+ const navigationItemByPageLayoutId = new Map(+ [...navigationMenuItems, ...currentItems]+ .filter(+ (item) =>+ item.type === NavigationMenuItemType.PAGE_LAYOUT &&+ isDefined(item.pageLayoutId),+ )+ .map((item) => [item.pageLayoutId, item] as const),+ );++ return (standalonePagesData?.getPageLayouts ?? [])+ .map((page) => {+ const navigationItem = navigationItemByPageLayoutId.get(page.id);+ const name = navigationItem?.name ?? page.name;+ return {+ id: page.id,+ label: name,+ icon: isDefined(navigationItem) ? (+ <NavigationMenuItemIcon navigationMenuItem={navigationItem} />+ ) : (+ <TintedIconTile Icon={IconPerspective} />+ ),+ isDisabled: pageLayoutIdsAlreadyAdded.has(page.id),+ isAlreadyInSidebar: pageLayoutIdsAlreadyAdded.has(page.id),+ onClick: () =>+ addItem({+ type: NavigationMenuItemType.PAGE_LAYOUT,+ pageLayoutId: page.id,+ name,+ icon: isDefined(navigationItem)+ ? navigationItem.icon+ : 'IconPerspective',+ color: navigationItem?.color,+ }),+ };+ })+ .sort(+ (firstPage, secondPage) =>+ Number(firstPage.isAlreadyInSidebar) -+ Number(secondPage.isAlreadyInSidebar) ||+ firstPage.label.localeCompare(secondPage.label),+ );+ }+ if (targetStep === 'record') {+ return navigationMenuItemSearchRecords.flatMap((record) => {+ const object = objectMetadataItems.find(+ (object) => object.nameSingular === record.objectNameSingular,+ );+ if (!isDefined(object)) {+ return [];+ }+ return [+ {+ isDisabled: record.isAlreadyInSidebar,+ isAlreadyInSidebar: record.isAlreadyInSidebar,+ id: record.recordId,+ label: record.label,+ icon: (+ <Avatar+ name={record.label}+ shape={getAvatarShape(object)}+ size="md"+ src={getAbsoluteImageUrl(record.imageUrl)}+ colorSeed={record.recordId}+ />+ ),+ onClick: () =>+ addItem({+ type: NavigationMenuItemType.RECORD,+ targetObjectMetadataId: object.id,+ targetRecordId: record.recordId,+ targetRecordIdentifier: {+ id: record.recordId,+ labelIdentifier: record.label,+ imageIdentifier: record.imageUrl ?? null,+ },+ }),+ },+ ];+ });+ }+ return [];+ };++ return {+ getItems,+ standalonePagesLoading,+ standalonePagesError,+ recordSearchLoading,+ isSearchDebouncing,+ };+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.tsindex fb593dde838..cdfd726e344 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts@@ -1,3 +1,4 @@+import { type NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';import { useLingui } from '@lingui/react/macro';import { type NavigationMenuItemType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -7,12 +8,10 @@ import { type NavigationMenuItem } from '~/generated-metadata/graphql';import { useCreateManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useCreateManyNavigationMenuItems';import { useDeleteManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useDeleteManyNavigationMenuItems';import { useUpdateManyNavigationMenuItems } from '@/navigation-menu-item/common/hooks/useUpdateManyNavigationMenuItems';-import { navigationMenuItemEditSectionState } from '@/navigation-menu-item/common/states/navigationMenuItemEditSectionState';import { navigationMenuItemsDraftState } from '@/navigation-menu-item/common/states/navigationMenuItemsDraftState';import { buildCreateNavigationMenuItemInput } from '@/navigation-menu-item/common/utils/buildCreateNavigationMenuItemInput';import { computeInsertIndexAndPosition } from '@/navigation-menu-item/common/utils/computeInsertIndexAndPosition';import { useNavigationMenuItemsData } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemsData';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useToast } from 'twenty-ui/primitives/feedback';@@ -20,6 +19,8 @@ export type NewNavigationMenuItemInput = {type: NavigationMenuItemType;targetObjectMetadataId?: string | null;viewId?: string | null;+ pageLayoutId?: string | null;+ icon?: string | null;targetRecordId?: string | null;targetRecordIdentifier?: NavigationMenuItem['targetRecordIdentifier'];name?: string | null;@@ -32,18 +33,13 @@ type CreateItemOptions = {targetIndex?: number;};-// The single create/update/delete API for the add/edit side panel. It forks on-// the active section (mirroring useHandleNavigationMenuItemDragAndDrop): the-// workspace section stages changes in the draft (saved on layout exit), while-// the favorite section persists personal items immediately and optimistically.-// On the immediate path the mutation hooks roll back on failure, so errors are-// surfaced here and the rejection is swallowed — callers fire-and-forget.-export const useNavigationMenuItemEditController = () => {+// Workspace edits stay in the layout draft; favorites persist immediately.+// Mutation hooks roll back failed optimistic updates, so report errors here.+export const useNavigationMenuItemEditController = (+ section: NavigationMenuItemSection,+) => {const { t } = useLingui();const { enqueueToast } = useToast();- const navigationMenuItemEditSection = useAtomStateValue(- navigationMenuItemEditSectionState,- );const {navigationMenuItems,workspaceNavigationMenuItems,@@ -56,7 +52,7 @@ export const useNavigationMenuItemEditController = () => {const { updateManyNavigationMenuItems } = useUpdateManyNavigationMenuItems();const { deleteManyNavigationMenuItems } = useDeleteManyNavigationMenuItems();- const isDraftMode = navigationMenuItemEditSection === 'workspace';+ const isDraftMode = section === 'workspace';const currentItems = isDraftMode? workspaceNavigationMenuItems: navigationMenuItems;@@ -91,6 +87,8 @@ export const useNavigationMenuItemEditController = () => {targetRecordId: input.targetRecordId ?? undefined,targetRecordIdentifier: input.targetRecordIdentifier,viewId: input.viewId ?? undefined,+ pageLayoutId: input.pageLayoutId ?? undefined,+ icon: input.icon ?? undefined,name: input.name ?? undefined,link: input.link ?? undefined,color: input.color ?? undefined,diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems.tsindex 6e50fc6c3cb..5a7c25233b6 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems.ts@@ -1,36 +1,28 @@+import { type NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { navigationMenuItemEditSectionState } from '@/navigation-menu-item/common/states/navigationMenuItemEditSectionState';import { flattenNavigationMenuItemsWithFolderChildren } from '@/navigation-menu-item/common/utils/flattenNavigationMenuItemsWithFolderChildren';import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder';import { useNavigationMenuItemSectionItems } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemSectionItems';import { useSortedNavigationMenuItems } from '@/navigation-menu-item/display/hooks/useSortedNavigationMenuItems';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-// Flat ordered item list (orphans + folders followed by their children) for the-// section the add/edit panel is operating on. The edit page resolves the-// selected item and computes move/organize bounds against this list, so it must-// return personal items in the favorite section and workspace items otherwise.-export const useNavigationMenuItemEditSectionItems =- (): NavigationMenuItem[] => {- const navigationMenuItemEditSection = useAtomStateValue(- navigationMenuItemEditSectionState,- );- const workspaceSectionItems = useNavigationMenuItemSectionItems();- const { navigationMenuItemsSorted } = useSortedNavigationMenuItems();- const { userNavigationMenuItemsByFolder } =- useNavigationMenuItemsByFolder();+export const useNavigationMenuItemEditSectionItems = (+ section: NavigationMenuItemSection,+): NavigationMenuItem[] => {+ const workspaceSectionItems = useNavigationMenuItemSectionItems();+ const { navigationMenuItemsSorted } = useSortedNavigationMenuItems();+ const { userNavigationMenuItemsByFolder } = useNavigationMenuItemsByFolder();- if (navigationMenuItemEditSection === 'workspace') {- return workspaceSectionItems;- }+ if (section === 'workspace') {+ return workspaceSectionItems;+ }- const topLevelItems = navigationMenuItemsSorted.filter(- (item) => !item.folderId,- );+ const topLevelItems = navigationMenuItemsSorted.filter(+ (item) => !item.folderId,+ );- return flattenNavigationMenuItemsWithFolderChildren(- topLevelItems,- userNavigationMenuItemsByFolder,- );- };+ return flattenNavigationMenuItemsWithFolderChildren(+ topLevelItems,+ userNavigationMenuItemsByFolder,+ );+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove.tsindex ee5908aa258..bd4b8d6d4a1 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove.ts@@ -1,3 +1,4 @@+import { type NavigationMenuItemSection } from '@/navigation-menu-item/common/types/NavigationMenuItemSection';import { isDefined } from 'twenty-shared/utils';import { getPositionBetween } from '@/navigation-menu-item/common/utils/getPositionBetween';@@ -5,10 +6,12 @@ import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';import { useNavigationMenuItemEditSectionItems } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems';-export const useNavigationMenuItemMoveRemove = () => {+export const useNavigationMenuItemMoveRemove = (+ section: NavigationMenuItemSection,+) => {const { currentItems, updateItem, deleteItems } =- useNavigationMenuItemEditController();- const items = useNavigationMenuItemEditSectionItems();+ useNavigationMenuItemEditController(section);+ const items = useNavigationMenuItemEditSectionItems(section);const visibleItemIds = new Set(items.map((item) => item.id));const getSortedSiblings = (navigationMenuItemId: string) => {@@ -134,5 +137,5 @@ export const useNavigationMenuItemMoveRemove = () => {});};- return { moveUp, moveDown, remove, moveToFolder };+ return { items, getSortedSiblings, moveUp, moveDown, remove, moveToFolder };};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemSearchRecords.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemSearchRecords.tsnew file mode 100644index 00000000000..a89390c1415--- /dev/null+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemSearchRecords.ts@@ -0,0 +1,83 @@+import { useDebounce } from 'use-debounce';++import { type NavigationMenuItem } from '~/generated-metadata/graphql';+import { useObjectRecordSearchRecords } from '@/object-record/hooks/useObjectRecordSearchRecords';+import { useSearchableObjectNameSingulars } from '@/side-panel/hooks/useSearchableObjectNameSingulars';+import { isDefined } from 'twenty-shared/utils';++const DEFAULT_RECORD_SUGGESTION_LIMIT = 10;+const SEARCH_DEBOUNCE_DELAY = 300;++export type NavigationMenuItemSearchRecord = {+ recordId: string;+ isAlreadyInSidebar: boolean;+ objectNameSingular: string;+ label: string;+ imageUrl?: string | null;+};++type UseNavigationMenuItemSearchRecordsParams = {+ searchInput: string;+ currentItems: NavigationMenuItem[];+ selectedObjectNameSingular?: string | null;+ skip?: boolean;+};++export const useNavigationMenuItemSearchRecords = ({+ searchInput,+ currentItems,+ selectedObjectNameSingular = null,+ skip = false,+}: UseNavigationMenuItemSearchRecordsParams) => {+ const trimmedSearchInput = searchInput.trim();++ const [deferredSearchInput] = useDebounce(+ trimmedSearchInput,+ SEARCH_DEBOUNCE_DELAY,+ );++ const includedObjectNameSingulars = useSearchableObjectNameSingulars({+ selectedObjectNameSingular,+ });++ const { loading: recordSearchLoading, searchRecords } =+ useObjectRecordSearchRecords({+ objectNameSingulars: includedObjectNameSingulars,+ searchInput: deferredSearchInput,+ skip,+ limit: deferredSearchInput ? undefined : DEFAULT_RECORD_SUGGESTION_LIMIT,+ });++ const isSearchDebouncing = trimmedSearchInput !== deferredSearchInput;+ const isSearchPending = !skip && (recordSearchLoading || isSearchDebouncing);+ // Avoid flashing the empty state between responses while the user is typing.+ const [settledSearchInput] = useDebounce(+ isSearchPending ? null : trimmedSearchInput,+ SEARCH_DEBOUNCE_DELAY,+ );++ const recordIdsAlreadyAdded = new Set(+ currentItems.flatMap((item) =>+ isDefined(item.targetRecordId) ? [item.targetRecordId] : [],+ ),+ );++ const navigationMenuItemSearchRecords = searchRecords.map(+ (record): NavigationMenuItemSearchRecord => ({+ recordId: record.recordId,+ isAlreadyInSidebar: recordIdsAlreadyAdded.has(record.recordId),+ objectNameSingular: record.objectNameSingular,+ label: record.label,+ imageUrl: record.imageUrl,+ }),+ );++ return {+ navigationMenuItemSearchRecords,+ deferredSearchInput,+ isSearchDebouncing,+ recordSearchLoading:+ isSearchPending || (!skip && settledSearchInput !== trimmedSearchInput),+ trimmedSearchInput,+ };+};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemSectionAllFolders.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemSectionAllFolders.tsdeleted file mode 100644index 8c7ba586e23..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemSectionAllFolders.ts+++ /dev/null@@ -1,18 +0,0 @@-import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';--export const useNavigationMenuItemSectionAllFolders = () => {- const { currentItems } = useNavigationMenuItemEditController();-- const allFolders = currentItems- .filter(isNavigationMenuItemFolder)- .map((item) => ({- id: item.id,- name: item.name ?? 'Folder',- folderId: item.folderId,- icon: item.icon,- color: item.color,- }));-- return { allFolders };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemSectionFolders.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemSectionFolders.tsdeleted file mode 100644index de1b2e1aee4..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemSectionFolders.ts+++ /dev/null@@ -1,27 +0,0 @@-import { navigationMenuItemEditSectionState } from '@/navigation-menu-item/common/states/navigationMenuItemEditSectionState';-import { useNavigationMenuItemsByFolder } from '@/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';--export const useNavigationMenuItemSectionFolders = () => {- const navigationMenuItemEditSection = useAtomStateValue(- navigationMenuItemEditSectionState,- );- const {- workspaceNavigationMenuItemsByFolder,- userNavigationMenuItemsByFolder,- } = useNavigationMenuItemsByFolder();-- const folders =- navigationMenuItemEditSection === 'workspace'- ? workspaceNavigationMenuItemsByFolder- : userNavigationMenuItemsByFolder;-- const sectionFolders = folders.map((folder) => ({- id: folder.id,- name: folder.folderName,- icon: folder.icon,- color: folder.color,- }));-- return { sectionFolders };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemTitleEdit.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemTitleEdit.tsdeleted file mode 100644index 65c57654831..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemTitleEdit.ts+++ /dev/null@@ -1,56 +0,0 @@-import { useState } from 'react';--import { navigationMenuItemEditSectionState } from '@/navigation-menu-item/common/states/navigationMenuItemEditSectionState';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';--type UseNavigationMenuItemTitleEditParams = {- itemId: string | null;- itemName: string;- defaultLabel: string;- persistName: (name: string) => void;-};--// Title editing for a navigation menu item, section-aware: the workspace-// section writes the in-memory draft on every keystroke (live preview), while-// a personal favorite persists immediately, so keystrokes are buffered locally-// (keyed by item id, self-invalidating on item switch) and committed on save.-export const useNavigationMenuItemTitleEdit = ({- itemId,- itemName,- defaultLabel,- persistName,-}: UseNavigationMenuItemTitleEditParams) => {- const navigationMenuItemEditSection = useAtomStateValue(- navigationMenuItemEditSectionState,- );- const isDraftMode = navigationMenuItemEditSection === 'workspace';- const [localNameEdit, setLocalNameEdit] = useState<{- itemId: string;- text: string;- } | null>(null);-- const bufferedName =- localNameEdit?.itemId === itemId ? localNameEdit.text : null;- const value = isDraftMode ? itemName : (bufferedName ?? itemName);-- const handleChange = (text: string) => {- if (isDraftMode) {- persistName(text);- } else if (itemId !== null) {- setLocalNameEdit({ itemId, text });- }- };-- const handleSave = () => {- const trimmed = value.trim();- const finalName = trimmed.length > 0 ? trimmed : defaultLabel;- if (finalName !== itemName) {- persistName(finalName);- }- if (!isDraftMode) {- setLocalNameEdit(null);- }- };-- return { value, handleChange, handleSave };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage.tsdeleted file mode 100644index bce08608de1..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenAddItemToFolderPage.ts+++ /dev/null@@ -1,42 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { SidePanelPages } from 'twenty-shared/types';-import { IconColumnInsertRight } from 'twenty-ui/icon';--import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';--type OpenAddItemToFolderPageParams = {- folderId: string;- position: number;- resetNavigationStack?: boolean;-};--export const useOpenAddItemToFolderPage = () => {- const { t } = useLingui();- const { navigateSidePanel } = useNavigateSidePanel();- const setPendingInsertionNavigationMenuItem = useSetAtomState(- pendingInsertionNavigationMenuItemState,- );- const setSelectedNavigationMenuItemIdInEditMode = useSetAtomState(- selectedNavigationMenuItemIdInEditModeState,- );-- const openAddItemToFolderPage = ({- folderId,- position,- resetNavigationStack = true,- }: OpenAddItemToFolderPageParams) => {- setPendingInsertionNavigationMenuItem({ folderId, position });- setSelectedNavigationMenuItemIdInEditMode(null);- navigateSidePanel({- page: SidePanelPages.NavigationMenuAddItem,- pageTitle: t`New menu item`,- pageIcon: IconColumnInsertRight,- resetNavigationStack,- });- };-- return { openAddItemToFolderPage };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel.tsdeleted file mode 100644index c13c0a8e432..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel.ts+++ /dev/null@@ -1,45 +0,0 @@-import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { SidePanelPages } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import type { IconComponent } from 'twenty-ui/icon';--export const useOpenNavigationMenuItemInSidePanel = () => {- const { navigateSidePanel } = useNavigateSidePanel();- const setSelectedNavigationMenuItemIdInEditMode = useSetAtomState(- selectedNavigationMenuItemIdInEditModeState,- );- const setPendingInsertionNavigationMenuItem = useSetAtomState(- pendingInsertionNavigationMenuItemState,- );-- const openNavigationMenuItemInSidePanel = ({- itemId,- pageTitle,- pageIcon,- focusTitleInput = false,- }: {- itemId?: string;- pageTitle: string;- pageIcon: IconComponent;- focusTitleInput?: boolean;- }) => {- if (isDefined(itemId)) {- setSelectedNavigationMenuItemIdInEditMode(itemId);- }- setPendingInsertionNavigationMenuItem(null);- navigateSidePanel({- page: SidePanelPages.NavigationMenuItemEdit,- pageTitle,- pageIcon,- resetNavigationStack: true,- focusTitleInput,- });- };-- return {- openNavigationMenuItemInSidePanel,- };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem.tsdeleted file mode 100644index c90d1c02aa6..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem.ts+++ /dev/null@@ -1,16 +0,0 @@-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { useNavigationMenuItemEditSectionItems } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';--export const useSelectedNavigationMenuItemEditItem = () => {- const selectedNavigationMenuItemIdInEditMode = useAtomStateValue(- selectedNavigationMenuItemIdInEditModeState,- );- const items = useNavigationMenuItemEditSectionItems();-- const selectedItem = selectedNavigationMenuItemIdInEditMode- ? items.find((item) => item.id === selectedNavigationMenuItemIdInEditMode)- : undefined;-- return { selectedItem };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel.tsdeleted file mode 100644index 50bc84891f1..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel.ts+++ /dev/null@@ -1,53 +0,0 @@-import { NavigationMenuItemType } from 'twenty-shared/types';-import { type NavigationMenuItem } from '~/generated-metadata/graphql';--import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';-import { useSelectedNavigationMenuItemEditItemObjectMetadata } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata';-import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';-import { viewsSelector } from '@/views/states/selectors/viewsSelector';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';--const getLabelForItem = (- item: NavigationMenuItem,- objectMetadataItems: Parameters<typeof getNavigationMenuItemLabel>[1],- views: Parameters<typeof getNavigationMenuItemLabel>[2],- objectLabelSingular?: string | null,-): string => {- switch (item.type) {- case NavigationMenuItemType.FOLDER:- return item.name ?? 'Folder';- case NavigationMenuItemType.LINK:- return item.name ?? 'Link';- case NavigationMenuItemType.PAGE_LAYOUT:- return item.name ?? 'Page';- case NavigationMenuItemType.OBJECT:- case NavigationMenuItemType.VIEW:- return (- getNavigationMenuItemLabel(item, objectMetadataItems, views) ||- objectLabelSingular ||- ''- );- default:- return objectLabelSingular ?? '';- }-};--export const useSelectedNavigationMenuItemEditItemLabel = () => {- const { selectedItem } = useSelectedNavigationMenuItemEditItem();- const { selectedItemObjectMetadata } =- useSelectedNavigationMenuItemEditItemObjectMetadata();- const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);- const views = useAtomStateValue(viewsSelector);-- const selectedItemLabel = selectedItem- ? getLabelForItem(- selectedItem,- objectMetadataItems,- views,- selectedItemObjectMetadata?.labelSingular,- )- : null;-- return { selectedItemLabel };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata.tsdeleted file mode 100644index 4652bdf3d5c..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata.ts+++ /dev/null@@ -1,21 +0,0 @@-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';-import { getObjectMetadataForNavigationMenuItem } from '@/navigation-menu-item/display/object/utils/getObjectMetadataForNavigationMenuItem';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { viewsSelector } from '@/views/states/selectors/viewsSelector';--export const useSelectedNavigationMenuItemEditItemObjectMetadata = () => {- const { selectedItem } = useSelectedNavigationMenuItemEditItem();- const views = useAtomStateValue(viewsSelector);- const { objectMetadataItems } = useObjectMetadataItems();-- const selectedItemObjectMetadata = selectedItem- ? getObjectMetadataForNavigationMenuItem(- selectedItem,- objectMetadataItems,- views,- )- : null;-- return { selectedItemObjectMetadata };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption.tsxdeleted file mode 100644index daa31c6514a..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption.tsx+++ /dev/null@@ -1,79 +0,0 @@-import { CommandMenuItemDropdown } from '@/command-menu/components/CommandMenuItemDropdown';-import { useUpdateMetadataStoreDraft } from '@/metadata-store/hooks/useUpdateMetadataStoreDraft';-import { type FlatObjectMetadataItem } from '@/metadata-store/types/FlatObjectMetadataItem';-import { isValidObjectNavigationMenuItem } from '@/navigation-menu-item/common/utils/isValidObjectNavigationMenuItem';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';-import { ThemeColorPickerMenu } from '@/ui/input/components/ThemeColorPickerMenu';-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';-import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { capitalize } from 'twenty-shared/utils';-import { IconColorSwatch } from 'twenty-ui/icon';-import { DEFAULT_COLOR_LABELS } from 'twenty-ui/primitives/navigation';-import { type ThemeColor } from 'twenty-ui/theme';-import { themeCssVariables } from 'twenty-ui/theme-constants';--const NAVIGATION_MENU_ITEM_COLOR_DROPDOWN_ID = 'navigation-menu-item-color';--const StyledMenuStyleText = styled.span`- color: ${themeCssVariables.font.color.light};- font-size: 13px;-`;--type SidePanelEditColorOptionProps = {- navigationMenuItemId: string;- color: ThemeColor;-};--export const SidePanelEditColorOption = ({- navigationMenuItemId,- color,-}: SidePanelEditColorOptionProps) => {- const { t } = useLingui();- const { updateItem, isDraftMode } = useNavigationMenuItemEditController();- const { closeDropdown } = useCloseDropdown();- const { updateInDraft, applyChanges } = useUpdateMetadataStoreDraft();- const { selectedItem } = useSelectedNavigationMenuItemEditItem();-- const themeColor = color ?? 'gray';- const colorLabel = DEFAULT_COLOR_LABELS[themeColor] ?? capitalize(themeColor);-- const handleSelectColor = (selectedColor: ThemeColor) => {- void updateItem(navigationMenuItemId, { color: selectedColor });-- // A personal favorite's color is item-local; only workspace customization- // recolors the shared object metadata.- if (isDraftMode && isValidObjectNavigationMenuItem(selectedItem)) {- updateInDraft('objectMetadataItems', [- {- id: selectedItem.targetObjectMetadataId,- color: selectedColor,- } as FlatObjectMetadataItem,- ]);- applyChanges();- }-- closeDropdown(NAVIGATION_MENU_ITEM_COLOR_DROPDOWN_ID);- };-- return (- <CommandMenuItemDropdown- id="edit-navigation-menu-item-color"- label={t`Color`}- Icon={IconColorSwatch}- dropdownId={NAVIGATION_MENU_ITEM_COLOR_DROPDOWN_ID}- dropdownPlacement="bottom-start"- RightComponent={<StyledMenuStyleText>{colorLabel}</StyledMenuStyleText>}- dropdownComponents={- <DropdownContent>- <ThemeColorPickerMenu- selectedColor={themeColor}- onSelectColor={handleSelectColor}- />- </DropdownContent>- }- />- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsxdeleted file mode 100644index 1f66aacdf48..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsx+++ /dev/null@@ -1,87 +0,0 @@-import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';-import { useLingui } from '@lingui/react/macro';-import { useState } from 'react';-import { useIcons } from 'twenty-ui/icon';--import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';-import { useFolderPickerSelectionData } from '@/navigation-menu-item/edit/side-panel/hooks/useFolderPickerSelectionData';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { filterBySearchQuery } from '~/utils/filterBySearchQuery';--export const SidePanelEditFolderPickerSubPage = () => {- const { t } = useLingui();- const { getIcon } = useIcons();- const [searchValue, setSearchValue] = useState('');- const { foldersToShow, includeNoFolderOption, handleSelectFolder } =- useFolderPickerSelectionData();-- const filteredFolders = filterBySearchQuery({- items: foldersToShow,- searchQuery: searchValue,- getSearchableValues: (folder) => [folder.name],- });- const isEmpty = filteredFolders.length === 0 && !includeNoFolderOption;- const selectableItemIds = [- ...(includeNoFolderOption ? ['no-folder'] : []),- ...(filteredFolders.length > 0 ? filteredFolders.map((f) => f.id) : []),- ];- const noResultsText =- searchValue.trim().length > 0- ? t`No results found`- : t`No folders available`;-- return (- <SidePanelSubViewWithSearch- searchPlaceholder={t`Search a folder...`}- searchValue={searchValue}- onSearchChange={setSearchValue}- >- <SidePanelList- selectableItemIds={selectableItemIds}- noResults={isEmpty}- noResultsText={noResultsText}- >- <SidePanelGroup heading={t`Folders`}>- {includeNoFolderOption && (- <SelectableListItem- itemId="no-folder"- onEnter={() => handleSelectFolder(null)}- >- <CommandMenuItem- label={t`No folder`}- id="no-folder"- onClick={() => handleSelectFolder(null)}- />- </SelectableListItem>- )}- {filteredFolders.map((folder) => {- const FolderIcon = getIcon(folder.icon ?? FOLDER_ICON_DEFAULT);- const folderColor =- folder.color ?? DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER;- return (- <SelectableListItem- key={folder.id}- itemId={folder.id}- onEnter={() => handleSelectFolder(folder.id)}- >- <CommandMenuItem- LeftComponent={- <ColoredIcon Icon={FolderIcon} color={folderColor} />- }- label={folder.name}- id={folder.id}- onClick={() => handleSelectFolder(folder.id)}- />- </SelectableListItem>- );- })}- </SidePanelGroup>- </SidePanelList>- </SidePanelSubViewWithSearch>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView.tsxdeleted file mode 100644index aa5ae72461d..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView.tsx+++ /dev/null@@ -1,122 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { isNonEmptyString } from '@sniptt/guards';-import { useState } from 'react';-import { ensureAbsoluteUrl } from 'twenty-shared/utils';-import { type NavigationMenuItem } from '~/generated-metadata/graphql';--import { navigationMenuItemEditSectionState } from '@/navigation-menu-item/common/states/navigationMenuItemEditSectionState';-import { extractDomainFromUrl } from '@/navigation-menu-item/display/link/utils/extractDomainFromUrl';-import {- type OrganizeActionsProps,- SidePanelEditOrganizeActions,-} from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions';-import { SidePanelEditOwnerSection } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection';-import { getOrganizeActionsSelectableItemIds } from '@/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { TextInput } from '@/ui/input/components/TextInput';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';--type SidePanelEditLinkItemViewProps = OrganizeActionsProps & {- selectedItem: NavigationMenuItem;- onUpdateLink: (- linkId: string,- updates: { link?: string; name?: string },- ) => void;- onOpenFolderPicker: () => void;- showMoveToFolder?: boolean;-};--export const SidePanelEditLinkItemView = ({- selectedItem,- onUpdateLink,- canMoveUp,- canMoveDown,- onOpenFolderPicker,- onMoveUp,- onMoveDown,- onRemove,- onAddBefore,- onAddAfter,- showMoveToFolder = false,-}: SidePanelEditLinkItemViewProps) => {- const { t } = useLingui();- const navigationMenuItemEditSection = useAtomStateValue(- navigationMenuItemEditSectionState,- );- const isDraftMode = navigationMenuItemEditSection === 'workspace';- const [urlEditInput, setUrlEditInput] = useState('');- const [lastAutoSetName, setLastAutoSetName] = useState<string | null>(null);-- const defaultLabel = t`Link label`;- const selectableItemIds =- getOrganizeActionsSelectableItemIds(showMoveToFolder);-- const currentName = selectedItem.name ?? defaultLabel;- const currentDomain = selectedItem.link- ? extractDomainFromUrl(ensureAbsoluteUrl(selectedItem.link))- : undefined;- const canAutoUpdateName =- currentName === defaultLabel ||- currentName === currentDomain ||- currentName === lastAutoSetName;-- const handleUrlChange = (value: string) => {- setUrlEditInput(value);- // A personal favorite persists immediately, so the auto-derived name is- // applied on blur (see handleUrlBlur) rather than on every keystroke.- if (!isDraftMode || !canAutoUpdateName) return;- const trimmed = value.trim();- if (!isNonEmptyString(trimmed)) return;- const domain = extractDomainFromUrl(ensureAbsoluteUrl(trimmed));- if (domain !== undefined) {- setLastAutoSetName(domain);- onUpdateLink(selectedItem.id, { name: domain });- }- };-- const handleUrlBlur = (event: React.FocusEvent<HTMLInputElement>) => {- const value = event.target.value.trim();- if (!isNonEmptyString(value)) {- return;- }- const absoluteUrl = ensureAbsoluteUrl(value);- const updates: { link: string; name?: string } = { link: absoluteUrl };- const autoName =- !isDraftMode && canAutoUpdateName- ? extractDomainFromUrl(absoluteUrl)- : undefined;- if (autoName !== undefined) {- setLastAutoSetName(autoName);- updates.name = autoName;- }- onUpdateLink(selectedItem.id, updates);- setUrlEditInput('');- };-- return (- <SidePanelList selectableItemIds={selectableItemIds}>- <SidePanelGroup heading={t`Customize`}>- <TextInput- fullWidth- placeholder="www.google.com"- value={urlEditInput || selectedItem.link || ''}- onChange={handleUrlChange}- onBlur={handleUrlBlur}- />- </SidePanelGroup>- <SidePanelEditOrganizeActions- canMoveUp={canMoveUp}- canMoveDown={canMoveDown}- onMoveUp={onMoveUp}- onMoveDown={onMoveDown}- onRemove={onRemove}- onAddBefore={onAddBefore}- onAddAfter={onAddAfter}- showMoveToFolder={showMoveToFolder}- onMoveToFolder={onOpenFolderPicker}- />- <SidePanelEditOwnerSection applicationId={selectedItem.applicationId} />- </SidePanelList>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase.tsxdeleted file mode 100644index db0632a3518..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase.tsx+++ /dev/null@@ -1,99 +0,0 @@-import { navigationMenuItemsSelector } from '@/navigation-menu-item/common/states/navigationMenuItemsSelector';-import { getNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemColor';-import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';-import { SidePanelEditColorOption } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption';-import {- type OrganizeActionsProps,- SidePanelEditOrganizeActions,-} from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions';-import { getOrganizeActionsSelectableItemIds } from '@/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds';-import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { viewsSelector } from '@/views/states/selectors/viewsSelector';-import { useLingui } from '@lingui/react/macro';-import { isNonEmptyString } from '@sniptt/guards';-import { isDefined } from 'twenty-shared/utils';-import { parseThemeColor } from 'twenty-ui/utilities';-import { type NavigationMenuItem } from '~/generated-metadata/graphql';--type SidePanelEditObjectViewBaseProps = OrganizeActionsProps & {- onOpenFolderPicker: () => void;- showMoveToFolder?: boolean;- showColorOption?: boolean;- selectedItem?: NavigationMenuItem | null;-};--export const SidePanelEditObjectViewBase = ({- onOpenFolderPicker,- canMoveUp,- canMoveDown,- onMoveUp,- onMoveDown,- onRemove,- onAddBefore,- onAddAfter,- showMoveToFolder = false,- showColorOption = false,- selectedItem,-}: SidePanelEditObjectViewBaseProps) => {- const { t } = useLingui();- const selectableItemIds =- getOrganizeActionsSelectableItemIds(showMoveToFolder);- const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);- const views = useAtomStateValue(viewsSelector);-- const objectNameSingular = isDefined(selectedItem)- ? (getNavigationMenuItemObjectNameSingular(- selectedItem,- objectMetadataItems,- views,- ) ?? '')- : '';-- const objectMetadataItem = objectMetadataItems.find(- (item) => item.nameSingular === objectNameSingular,- );-- const navigationMenuItems = useAtomStateValue(navigationMenuItemsSelector);- const persistedNavItem = navigationMenuItems.find(- (item) => item.id === selectedItem?.id,- );- const hasUserChangedColor =- isNonEmptyString(selectedItem?.color) &&- selectedItem.color !== (persistedNavItem?.color ?? undefined);-- const effectiveColor = isDefined(selectedItem)- ? getNavigationMenuItemColor(selectedItem, objectMetadataItem)- : undefined;- const displayColor = hasUserChangedColor- ? selectedItem.color- : effectiveColor;-- return (- <SidePanelList selectableItemIds={selectableItemIds}>- {showColorOption &&- isDefined(selectedItem) &&- objectMetadataItem?.isSystem !== true && (- <SidePanelGroup heading={t`Customize`}>- <SidePanelEditColorOption- navigationMenuItemId={selectedItem.id}- color={parseThemeColor(displayColor)}- />- </SidePanelGroup>- )}- <SidePanelEditOrganizeActions- canMoveUp={canMoveUp}- canMoveDown={canMoveDown}- onMoveUp={onMoveUp}- onMoveDown={onMoveDown}- onRemove={onRemove}- onAddBefore={onAddBefore}- onAddAfter={onAddAfter}- showMoveToFolder={showMoveToFolder}- onMoveToFolder={onOpenFolderPicker}- />- </SidePanelList>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsxdeleted file mode 100644index d8cf481a4b5..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions.tsx+++ /dev/null@@ -1,123 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import {- IconChevronDown,- IconChevronUp,- IconFolderSymlink,- IconRowInsertBottom,- IconRowInsertTop,- IconTrash,-} from 'twenty-ui/icon';--import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { SidePanelNavigationItemActions } from '@/navigation-menu-item/edit/side-panel/constants/side-panel-navigation-item-actions';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';--export type OrganizeActionsProps = {- canMoveUp: boolean;- canMoveDown: boolean;- onMoveUp: () => void;- onMoveDown: () => void;- onRemove: () => void;- onAddBefore?: () => void;- onAddAfter?: () => void;-};--type SidePanelEditOrganizeActionsProps = OrganizeActionsProps & {- showMoveToFolder?: boolean;- onMoveToFolder?: () => void;-};--export const SidePanelEditOrganizeActions = ({- canMoveUp,- canMoveDown,- onMoveUp,- onMoveDown,- onRemove,- onAddBefore,- onAddAfter,- showMoveToFolder = false,- onMoveToFolder,-}: SidePanelEditOrganizeActionsProps) => {- const { t } = useLingui();-- return (- <SidePanelGroup heading={t`Organize`}>- <SelectableListItem- itemId={SidePanelNavigationItemActions.MOVE_UP}- onEnter={canMoveUp ? onMoveUp : undefined}- >- <CommandMenuItem- Icon={IconChevronUp}- label={t`Move up`}- id={SidePanelNavigationItemActions.MOVE_UP}- onClick={onMoveUp}- disabled={!canMoveUp}- />- </SelectableListItem>- <SelectableListItem- itemId={SidePanelNavigationItemActions.MOVE_DOWN}- onEnter={canMoveDown ? onMoveDown : undefined}- >- <CommandMenuItem- Icon={IconChevronDown}- label={t`Move down`}- id={SidePanelNavigationItemActions.MOVE_DOWN}- onClick={onMoveDown}- disabled={!canMoveDown}- />- </SelectableListItem>- {showMoveToFolder && onMoveToFolder && (- <SelectableListItem- itemId={SidePanelNavigationItemActions.MOVE_TO_FOLDER}- onEnter={onMoveToFolder}- >- <CommandMenuItem- Icon={IconFolderSymlink}- label={t`Move to folder`}- id={SidePanelNavigationItemActions.MOVE_TO_FOLDER}- hasSubMenu- onClick={onMoveToFolder}- />- </SelectableListItem>- )}- {onAddBefore && (- <SelectableListItem- itemId={SidePanelNavigationItemActions.ADD_BEFORE}- onEnter={onAddBefore}- >- <CommandMenuItem- Icon={IconRowInsertTop}- label={t`Add menu item before`}- id={SidePanelNavigationItemActions.ADD_BEFORE}- onClick={onAddBefore}- />- </SelectableListItem>- )}- {onAddAfter && (- <SelectableListItem- itemId={SidePanelNavigationItemActions.ADD_AFTER}- onEnter={onAddAfter}- >- <CommandMenuItem- Icon={IconRowInsertBottom}- label={t`Add menu item after`}- id={SidePanelNavigationItemActions.ADD_AFTER}- onClick={onAddAfter}- />- </SelectableListItem>- )}- <SelectableListItem- itemId={SidePanelNavigationItemActions.REMOVE}- onEnter={onRemove}- >- <CommandMenuItem- Icon={IconTrash}- label={t`Remove from sidebar`}- id={SidePanelNavigationItemActions.REMOVE}- onClick={onRemove}- />- </SelectableListItem>- </SidePanelGroup>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection.tsxdeleted file mode 100644index c14a94b18a1..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection.tsx+++ /dev/null@@ -1,54 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { isDefined } from 'twenty-shared/utils';-import { IconApps } from 'twenty-ui/icon';--import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useQuery } from '@apollo/client/react';-import { FindOneApplicationNameDocument } from '~/generated-metadata/graphql';--type SidePanelEditOwnerSectionProps = {- applicationId?: string | null;-};--export const SidePanelEditOwnerSection = ({- applicationId: applicationIdProp,-}: SidePanelEditOwnerSectionProps) => {- const { t } = useLingui();-- const { selectedItem } = useSelectedNavigationMenuItemEditItem();- const { currentItems } = useNavigationMenuItemEditController();-- const applicationIdFromSection = isDefined(selectedItem)- ? currentItems.find((item) => item.id === selectedItem.id)?.applicationId- : undefined;-- const applicationId = applicationIdProp ?? applicationIdFromSection;-- const { data } = useQuery(FindOneApplicationNameDocument, {- variables: { id: applicationId ?? '' },- skip: !isDefined(applicationId),- });-- const applicationName = data?.findOneApplication?.name;-- if (!isDefined(applicationName)) {- return null;- }-- return (- <SidePanelGroup heading={t`Owner`}>- <SelectableListItem itemId="owner-app" onEnter={() => {}}>- <CommandMenuItem- Icon={IconApps}- label={applicationName}- id="owner-app"- disabled- />- </SelectableListItem>- </SidePanelGroup>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsxdeleted file mode 100644index bb83a965898..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsx+++ /dev/null@@ -1,222 +0,0 @@-import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { useNavigationMenuItemSectionAllFolders } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemSectionAllFolders';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';-import { NavigationMenuItemType } from 'twenty-shared/types';--import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { useSelectedNavigationMenuItemEditItemLabel } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel';-import { buildNavigationMenuLinkUpdate } from '@/navigation-menu-item/common/utils/buildNavigationMenuLinkUpdate';-import { SidePanelEditColorOption } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption';-import { SidePanelEditLinkItemView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditLinkItemView';-import { SidePanelEditObjectViewBase } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase';-import { SidePanelEditOrganizeActions } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions';-import { SidePanelEditOwnerSection } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOwnerSection';-import { useNavigationMenuItemEditOrganizeActions } from '@/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions';-import { getOrganizeActionsSelectableItemIds } from '@/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { isDefined } from 'twenty-shared/utils';-import { IconPlus } from 'twenty-ui/icon';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { parseThemeColor } from 'twenty-ui/utilities';--const ADD_ITEM_TO_FOLDER_ACTION_ID = 'add-item-to-folder';--const StyledSidePanelPlaceholder = styled.p`- color: ${themeCssVariables.font.color.tertiary};- font-size: ${themeCssVariables.font.size.sm};-`;--const StyledSidePanelPageContainer = styled.div`- padding: ${themeCssVariables.spacing[3]};-`;--export const SidePanelNavigationMenuItemEditPage = () => {- const { t } = useLingui();-- const selectedNavigationMenuItemIdInEditMode = useAtomStateValue(- selectedNavigationMenuItemIdInEditModeState,- );- const { selectedItemLabel } = useSelectedNavigationMenuItemEditItemLabel();- const { selectedItem } = useSelectedNavigationMenuItemEditItem();- const selectedItemType = selectedItem?.type ?? null;- const { allFolders } = useNavigationMenuItemSectionAllFolders();-- const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();- const openFolderPicker = () =>- navigateToSidePanelSubPage(SidePanelSubPages.EditFolderPicker);-- const {- canMoveUp,- canMoveDown,- onMoveUp,- onMoveDown,- onRemove,- onAddBefore,- onAddAfter,- } = useNavigationMenuItemEditOrganizeActions();-- const { currentItems, updateItem } = useNavigationMenuItemEditController();- const setPendingInsertionNavigationMenuItem = useSetAtomState(- pendingInsertionNavigationMenuItemState,- );-- const currentFolderId =- selectedItemType === NavigationMenuItemType.FOLDER- ? selectedItem?.id- : selectedItem?.folderId;- const canMoveToOtherFolder = allFolders.some(- (folder) => folder.id !== currentFolderId,- );-- const handleAddItemToFolder = () => {- if (!selectedItem || selectedItem.type !== NavigationMenuItemType.FOLDER) {- return;- }- const folderItemCount = currentItems.filter(- (item) => item.folderId === selectedItem.id,- ).length;- setPendingInsertionNavigationMenuItem({- folderId: selectedItem.id,- position: folderItemCount,- });- navigateToSidePanelSubPage(SidePanelSubPages.NewSidebarItemMainMenu);- };-- if (!selectedNavigationMenuItemIdInEditMode || !selectedItemLabel) {- return (- <StyledSidePanelPageContainer>- <StyledSidePanelPlaceholder>- {t`Select a navigation item to edit`}- </StyledSidePanelPlaceholder>- </StyledSidePanelPageContainer>- );- }-- switch (selectedItemType) {- case NavigationMenuItemType.OBJECT:- return (- <SidePanelEditObjectViewBase- onOpenFolderPicker={openFolderPicker}- showMoveToFolder={canMoveToOtherFolder}- canMoveUp={canMoveUp}- canMoveDown={canMoveDown}- onMoveUp={onMoveUp}- onMoveDown={onMoveDown}- onRemove={onRemove}- onAddBefore={onAddBefore}- onAddAfter={onAddAfter}- showColorOption={isDefined(selectedItem)}- selectedItem={selectedItem}- />- );- case NavigationMenuItemType.VIEW:- return (- <SidePanelEditObjectViewBase- onOpenFolderPicker={openFolderPicker}- showMoveToFolder={canMoveToOtherFolder}- canMoveUp={canMoveUp}- canMoveDown={canMoveDown}- onMoveUp={onMoveUp}- onMoveDown={onMoveDown}- onRemove={onRemove}- onAddBefore={onAddBefore}- onAddAfter={onAddAfter}- />- );- case NavigationMenuItemType.LINK:- if (- isDefined(selectedItem) &&- selectedItem.type === NavigationMenuItemType.LINK- ) {- return (- <SidePanelEditLinkItemView- key={selectedItem.id}- selectedItem={selectedItem}- onUpdateLink={(linkId, updates) => {- void updateItem(linkId, buildNavigationMenuLinkUpdate(updates));- }}- onOpenFolderPicker={openFolderPicker}- showMoveToFolder={canMoveToOtherFolder}- canMoveUp={canMoveUp}- canMoveDown={canMoveDown}- onMoveUp={onMoveUp}- onMoveDown={onMoveDown}- onRemove={onRemove}- onAddBefore={onAddBefore}- onAddAfter={onAddAfter}- />- );- }- return null;- case NavigationMenuItemType.FOLDER:- return (- <SidePanelList- selectableItemIds={[- ADD_ITEM_TO_FOLDER_ACTION_ID,- ...getOrganizeActionsSelectableItemIds(false),- ]}- >- {selectedItem && (- <SidePanelGroup heading={t`Customize`}>- <SelectableListItem- itemId={ADD_ITEM_TO_FOLDER_ACTION_ID}- onEnter={handleAddItemToFolder}- >- <CommandMenuItem- Icon={IconPlus}- label={t`Add item to folder`}- id={ADD_ITEM_TO_FOLDER_ACTION_ID}- onClick={handleAddItemToFolder}- hasSubMenu- />- </SelectableListItem>- <SidePanelEditColorOption- navigationMenuItemId={selectedItem.id}- color={parseThemeColor(selectedItem.color)}- />- </SidePanelGroup>- )}- <SidePanelEditOrganizeActions- canMoveUp={canMoveUp}- canMoveDown={canMoveDown}- onMoveUp={onMoveUp}- onMoveDown={onMoveDown}- onRemove={onRemove}- onAddBefore={onAddBefore}- onAddAfter={onAddAfter}- />- <SidePanelEditOwnerSection />- </SidePanelList>- );- default:- return (- <SidePanelList- selectableItemIds={getOrganizeActionsSelectableItemIds(- canMoveToOtherFolder,- )}- >- <SidePanelEditOrganizeActions- canMoveUp={canMoveUp}- canMoveDown={canMoveDown}- onMoveUp={onMoveUp}- onMoveDown={onMoveDown}- onRemove={onRemove}- onAddBefore={onAddBefore}- onAddAfter={onAddAfter}- showMoveToFolder={canMoveToOtherFolder}- onMoveToFolder={openFolderPicker}- />- </SidePanelList>- );- }-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsxdeleted file mode 100644index 35c4fdd5017..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsx+++ /dev/null@@ -1,148 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { Avatar } from 'twenty-ui/primitives/data-display';-import { IconBox, IconFolder, IconLink, IconTable } from 'twenty-ui/icon';-import { themeCssVariables } from 'twenty-ui/theme-constants';--import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { useAddFolderToNavigationMenu } from '@/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu';-import { useAddLinkToNavigationMenu } from '@/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu';-import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelItemWithAddToNavigationDrag } from '@/side-panel/components/SidePanelItemWithAddToNavigationDrag';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';--type SidePanelNewSidebarItemMainMenuProps = {- onSelectObject: () => void;- onSelectView: () => void;- onSelectRecord: () => void;-};--const MAIN_MENU_ITEM_TYPES = [- NavigationMenuItemType.OBJECT,- NavigationMenuItemType.VIEW,- NavigationMenuItemType.RECORD,- NavigationMenuItemType.FOLDER,- NavigationMenuItemType.LINK,-] as const;--export const SidePanelNewSidebarItemMainMenu = ({- onSelectObject,- onSelectView,- onSelectRecord,-}: SidePanelNewSidebarItemMainMenuProps) => {- const { t } = useLingui();- const pendingInsertionNavigationMenuItem = useAtomStateValue(- pendingInsertionNavigationMenuItemState,- );- const { handleAddFolder } = useAddFolderToNavigationMenu();- const { handleAddLink } = useAddLinkToNavigationMenu();-- const isAddingToFolder = isDefined(- pendingInsertionNavigationMenuItem?.folderId,- );- const selectableItemIds = isAddingToFolder- ? MAIN_MENU_ITEM_TYPES.filter(- (type) => type !== NavigationMenuItemType.FOLDER,- )- : [...MAIN_MENU_ITEM_TYPES];-- return (- <SidePanelAddToNavigationDroppable>- {({ innerRef, droppableProps, placeholder }) => (- <SidePanelList selectableItemIds={selectableItemIds}>- {/* eslint-disable-next-line react/jsx-props-no-spreading */}- <div ref={innerRef} {...droppableProps}>- <SidePanelGroup heading={t`Data`}>- <SelectableListItem- itemId={NavigationMenuItemType.OBJECT}- onEnter={onSelectObject}- >- <CommandMenuItem- Icon={IconBox}- label={t`Object`}- id={NavigationMenuItemType.OBJECT}- hasSubMenu={true}- onClick={onSelectObject}- />- </SelectableListItem>- <SelectableListItem- itemId={NavigationMenuItemType.VIEW}- onEnter={onSelectView}- >- <CommandMenuItem- Icon={IconTable}- label={t`View`}- id={NavigationMenuItemType.VIEW}- hasSubMenu={true}- onClick={onSelectView}- />- </SelectableListItem>- <SelectableListItem- itemId={NavigationMenuItemType.RECORD}- onEnter={onSelectRecord}- >- <CommandMenuItem- Icon={() => (- <Avatar- name="L"- shape="circle"- backgroundColor={themeCssVariables.color.green4}- />- )}- label={t`Record`}- id={NavigationMenuItemType.RECORD}- hasSubMenu={true}- onClick={onSelectRecord}- />- </SelectableListItem>- </SidePanelGroup>- <SidePanelGroup heading={t`Other`}>- <SelectableListItem- itemId={NavigationMenuItemType.FOLDER}- onEnter={isAddingToFolder ? undefined : handleAddFolder}- >- <SidePanelItemWithAddToNavigationDrag- icon={IconFolder}- label={t`Folder`}- id={NavigationMenuItemType.FOLDER}- onClick={handleAddFolder}- dragIndex={3}- payload={{- type: NavigationMenuItemType.FOLDER,- folderId: 'new',- name: t`New folder`,- }}- disabled={isAddingToFolder}- />- </SelectableListItem>- <SelectableListItem- itemId={NavigationMenuItemType.LINK}- onEnter={handleAddLink}- >- <SidePanelItemWithAddToNavigationDrag- icon={IconLink}- label={t`Link`}- id={NavigationMenuItemType.LINK}- onClick={handleAddLink}- dragIndex={4}- payload={{- type: NavigationMenuItemType.LINK,- linkId: 'new',- name: t`Link label`,- link: 'https://www.example.com',- }}- />- </SelectableListItem>- </SidePanelGroup>- {placeholder}- </div>- </SidePanelList>- )}- </SidePanelAddToNavigationDroppable>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage.tsxdeleted file mode 100644index 741fef22744..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage.tsx+++ /dev/null@@ -1,95 +0,0 @@-import { useState } from 'react';-import { NavigationMenuItemType } from 'twenty-shared/types';--import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useNavigationMenuObjectMetadataForSection } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataForSection';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';-import { SidePanelObjectPickerSubView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView';-import { getAvailableObjectMetadataForNewSidebarItem } from '@/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem';-import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';-import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';-import { ViewKey } from '@/views/types/ViewKey';-import { useIcons } from 'twenty-ui/icon';--export const SidePanelNewSidebarItemObjectSubPage = () => {- const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();- const { getIcon } = useIcons();- const [objectSearchInput, setObjectSearchInput] = useState('');-- const { currentItems, createItem } = useNavigationMenuItemEditController();- const { objectMetadataItems } = useObjectMetadataItems();- const { openNavigationMenuItemInSidePanel } =- useOpenNavigationMenuItemInSidePanel();- const { activeNonSystemObjectMetadataItems } =- useFilteredObjectMetadataItems();- const [- pendingInsertionNavigationMenuItem,- setPendingInsertionNavigationMenuItem,- ] = useAtomState(pendingInsertionNavigationMenuItemState);- const {- views,- objectMetadataIdsWithIndexView,- objectMetadataIdsAlreadyAdded,- } = useNavigationMenuObjectMetadataForSection(currentItems);-- const objectMetadataIdsWithDisplayableViews = new Set(- views- .filter((view) => view.key !== ViewKey.INDEX)- .map((view) => view.objectMetadataId),- );-- const { availableObjectMetadataItems } =- getAvailableObjectMetadataForNewSidebarItem({- objectMetadataItems,- activeNonSystemObjectMetadataItems,- objectMetadataIdsWithIndexView,- objectMetadataIdsWithDisplayableViews,- });-- const handleSelectObject = (- objectMetadataItem: EnrichedObjectMetadataItem,- ) => {- if (objectMetadataIdsAlreadyAdded.has(objectMetadataItem.id)) {- return;- }- const itemId = createItem(- {- type: NavigationMenuItemType.OBJECT,- targetObjectMetadataId: objectMetadataItem.id,- color: getObjectColorWithFallback(objectMetadataItem),- },- {- targetFolderId: pendingInsertionNavigationMenuItem?.folderId,- targetIndex: pendingInsertionNavigationMenuItem?.position,- },- );- setPendingInsertionNavigationMenuItem(null);- openNavigationMenuItemInSidePanel({- itemId,- pageTitle: objectMetadataItem.labelSingular,- pageIcon: getIcon(objectMetadataItem.icon),- });- };-- return (- <SidePanelObjectPickerSubView- objects={availableObjectMetadataItems}- searchValue={objectSearchInput}- onSearchChange={setObjectSearchInput}- onOpenSystemPicker={() =>- navigateToSidePanelSubPage(- SidePanelSubPages.NewSidebarItemObjectSystemPicker,- )- }- isViewItem={false}- onChangeObject={handleSelectObject}- objectMenuItemVariant="add"- />- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsxdeleted file mode 100644index 2d6feefd2e6..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage.tsx+++ /dev/null@@ -1,90 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { useState } from 'react';-import { NavigationMenuItemType } from 'twenty-shared/types';--import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useNavigationMenuObjectMetadataForSection } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataForSection';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';-import { SidePanelSystemObjectPickerSubView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelSystemObjectPickerSubView';-import { getAvailableObjectMetadataForNewSidebarItem } from '@/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem';-import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';-import { ViewKey } from '@/views/types/ViewKey';-import { useIcons } from 'twenty-ui/icon';--export const SidePanelNewSidebarItemObjectSystemPickerSubPage = () => {- const { t } = useLingui();- const { getIcon } = useIcons();- const [searchValue, setSearchValue] = useState('');-- const { currentItems, createItem } = useNavigationMenuItemEditController();- const { objectMetadataItems } = useObjectMetadataItems();- const { openNavigationMenuItemInSidePanel } =- useOpenNavigationMenuItemInSidePanel();- const { activeNonSystemObjectMetadataItems } =- useFilteredObjectMetadataItems();- const [- pendingInsertionNavigationMenuItem,- setPendingInsertionNavigationMenuItem,- ] = useAtomState(pendingInsertionNavigationMenuItemState);- const {- views,- objectMetadataIdsWithIndexView,- objectMetadataIdsAlreadyAdded,- } = useNavigationMenuObjectMetadataForSection(currentItems);-- const objectMetadataIdsWithDisplayableViews = new Set(- views- .filter((view) => view.key !== ViewKey.INDEX)- .map((view) => view.objectMetadataId),- );-- const { availableSystemObjectMetadataItems } =- getAvailableObjectMetadataForNewSidebarItem({- objectMetadataItems,- activeNonSystemObjectMetadataItems,- objectMetadataIdsWithIndexView,- objectMetadataIdsWithDisplayableViews,- });-- const handleSelectObject = (- objectMetadataItem: EnrichedObjectMetadataItem,- ) => {- if (objectMetadataIdsAlreadyAdded.has(objectMetadataItem.id)) {- return;- }- const itemId = createItem(- {- type: NavigationMenuItemType.OBJECT,- targetObjectMetadataId: objectMetadataItem.id,- color: getObjectColorWithFallback(objectMetadataItem),- },- {- targetFolderId: pendingInsertionNavigationMenuItem?.folderId,- targetIndex: pendingInsertionNavigationMenuItem?.position,- },- );- setPendingInsertionNavigationMenuItem(null);- openNavigationMenuItemInSidePanel({- itemId,- pageTitle: objectMetadataItem.labelSingular,- pageIcon: getIcon(objectMetadataItem.icon),- });- };-- return (- <SidePanelSystemObjectPickerSubView- systemObjects={availableSystemObjectMetadataItems}- searchValue={searchValue}- onSearchChange={setSearchValue}- isViewItem={false}- onChangeObject={handleSelectObject}- objectMenuItemVariant="add"- emptyNoResultsText={t`All system objects are already in the sidebar`}- />- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemPage.tsxdeleted file mode 100644index 751277645a6..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemPage.tsx+++ /dev/null@@ -1,47 +0,0 @@-import { isNonEmptyString } from '@sniptt/guards';-import { useLingui } from '@lingui/react/macro';-import { useState } from 'react';--import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { SidePanelNewSidebarItemMainMenu } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu';-import { SidePanelNewSidebarItemSearchResults } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemSearchResults';-import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';--export const SidePanelNewSidebarItemPage = () => {- const { t } = useLingui();- const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();- const [searchValue, setSearchValue] = useState('');- const trimmedSearchValue = searchValue.trim();- const hasSearchQuery = isNonEmptyString(trimmedSearchValue);-- return (- <SidePanelSubViewWithSearch- searchPlaceholder={t`Search a nav item...`}- searchValue={searchValue}- onSearchChange={setSearchValue}- >- {hasSearchQuery ? (- <SidePanelNewSidebarItemSearchResults- searchValue={trimmedSearchValue}- />- ) : (- <SidePanelNewSidebarItemMainMenu- onSelectRecord={() =>- navigateToSidePanelSubPage(SidePanelSubPages.NewSidebarItemRecord)- }- onSelectObject={() =>- navigateToSidePanelSubPage(- SidePanelSubPages.NewSidebarItemObjectPicker,- )- }- onSelectView={() =>- navigateToSidePanelSubPage(- SidePanelSubPages.NewSidebarItemViewObjectPicker,- )- }- />- )}- </SidePanelSubViewWithSearch>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem.tsxdeleted file mode 100644index 39d05f7470d..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem.tsx+++ /dev/null@@ -1,110 +0,0 @@-import { Avatar } from 'twenty-ui/primitives/data-display';-import { useIcons } from 'twenty-ui/icon';-import {- CoreObjectNameSingular,- NavigationMenuItemType,-} from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';--import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import type { AddToNavigationDragPayload } from '@/navigation-menu-item/common/types/add-to-navigation-drag-payload';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { SidePanelItemWithAddToNavigationDrag } from '@/side-panel/components/SidePanelItemWithAddToNavigationDrag';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';-import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';--type SearchRecord = {- recordId: string;- objectNameSingular: string;- label: string;- imageUrl?: string | null;-};--type SidePanelNewSidebarItemRecordItemProps = {- record: SearchRecord;- dragIndex?: number;-};--export const SidePanelNewSidebarItemRecordItem = ({- record,- dragIndex,-}: SidePanelNewSidebarItemRecordItemProps) => {- const { getIcon } = useIcons();- const { createItem } = useNavigationMenuItemEditController();- const [- pendingInsertionNavigationMenuItem,- setPendingInsertionNavigationMenuItem,- ] = useAtomState(pendingInsertionNavigationMenuItemState);- const { openNavigationMenuItemInSidePanel } =- useOpenNavigationMenuItemInSidePanel();- const { objectMetadataItems } = useObjectMetadataItems();- const objectMetadataItem = objectMetadataItems.find(- (item) => item.nameSingular === record.objectNameSingular,- );- const recordPayload: AddToNavigationDragPayload = {- type: NavigationMenuItemType.RECORD,- recordId: record.recordId,- objectMetadataId: objectMetadataItem?.id ?? '',- objectNameSingular: record.objectNameSingular,- label: record.label,- imageUrl: record.imageUrl,- };-- const handleSelectRecord = () => {- if (!isDefined(objectMetadataItem)) {- return;- }- const itemId = createItem(- {- type: NavigationMenuItemType.RECORD,- targetObjectMetadataId: objectMetadataItem.id,- targetRecordId: record.recordId,- targetRecordIdentifier: {- id: record.recordId,- labelIdentifier: record.label,- imageIdentifier: record.imageUrl ?? null,- },- },- {- targetFolderId: pendingInsertionNavigationMenuItem?.folderId ?? null,- targetIndex: pendingInsertionNavigationMenuItem?.position,- },- );- setPendingInsertionNavigationMenuItem(null);- openNavigationMenuItemInSidePanel({- itemId,- pageTitle: record.label,- pageIcon: getIcon(objectMetadataItem.icon),- });- };-- return (- <SelectableListItem itemId={record.recordId} onEnter={handleSelectRecord}>- <SidePanelItemWithAddToNavigationDrag- customIconContent={- <Avatar- shape={- record.objectNameSingular === CoreObjectNameSingular.Company- ? 'square'- : 'circle'- }- src={getAbsoluteImageUrl(record.imageUrl)}- colorSeed={record.recordId}- name={record.label}- />- }- label={record.label}- description={- objectMetadataItem?.labelSingular ?? record.objectNameSingular- }- id={record.recordId}- onClick={handleSelectRecord}- dragIndex={dragIndex}- payload={recordPayload}- />- </SelectableListItem>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage.tsxdeleted file mode 100644index 4ef531b842d..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage.tsx+++ /dev/null@@ -1,82 +0,0 @@-import { ToastOnQueryErrorEffect } from '@/apollo/components/ToastOnQueryErrorEffect';-import { isNonEmptyString } from '@sniptt/guards';-import { useLingui } from '@lingui/react/macro';-import { useState } from 'react';--import { useAvailableNavigationMenuItemSearchRecords } from '@/navigation-menu-item/edit/side-panel/hooks/useAvailableNavigationMenuItemSearchRecords';-import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SidePanelObjectFilterDropdown } from '@/side-panel/components/SidePanelObjectFilterDropdown';-import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { SidePanelNewSidebarItemRecordItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem';--export const SidePanelNewSidebarItemRecordSubPage = () => {- const { t } = useLingui();- const [recordSearchInput, setRecordSearchInput] = useState('');- const [selectedObjectNameSingular, setSelectedObjectNameSingular] = useState<- string | null- >(null);- const {- availableSearchRecords,- error,- isSearchDebouncing,- recordSearchLoading,- trimmedSearchInput,- } = useAvailableNavigationMenuItemSearchRecords({- searchInput: recordSearchInput,- selectedObjectNameSingular,- skip: !isNonEmptyString(recordSearchInput.trim()),- });-- const isRecordSearchLoading = recordSearchLoading || isSearchDebouncing;- const isEmpty = availableSearchRecords.length === 0 && !isRecordSearchLoading;- const selectableItemIds = isEmpty- ? []- : availableSearchRecords.map((record) => record.recordId);- const noResultsText = isNonEmptyString(trimmedSearchInput)- ? t`No results found`- : t`Type to search records`;-- return (- <>- <ToastOnQueryErrorEffect error={error} />- <SidePanelSubViewWithSearch- searchPlaceholder={t`Search records...`}- searchValue={recordSearchInput}- onSearchChange={setRecordSearchInput}- rightElement={- <SidePanelObjectFilterDropdown- selectedObjectNameSingular={selectedObjectNameSingular}- onSelectObject={setSelectedObjectNameSingular}- />- }- >- <SidePanelAddToNavigationDroppable>- {({ innerRef, droppableProps, placeholder }) => (- <SidePanelList- selectableItemIds={selectableItemIds}- loading={isRecordSearchLoading}- noResults={isEmpty}- noResultsText={noResultsText}- >- {/* oxlint-disable-next-line react/jsx-props-no-spreading */}- <div ref={innerRef} {...droppableProps}>- <SidePanelGroup heading={t`Results`}>- {availableSearchRecords.map((record, index) => (- <SidePanelNewSidebarItemRecordItem- key={record.recordId}- record={record}- dragIndex={index}- />- ))}- </SidePanelGroup>- {placeholder}- </div>- </SidePanelList>- )}- </SidePanelAddToNavigationDroppable>- </SidePanelSubViewWithSearch>- </>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemSearchResults.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemSearchResults.tsxdeleted file mode 100644index ee326b56ac1..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemSearchResults.tsx+++ /dev/null@@ -1,275 +0,0 @@-import { ToastOnQueryErrorEffect } from '@/apollo/components/ToastOnQueryErrorEffect';-import { isNonEmptyString } from '@sniptt/guards';-import { useLingui } from '@lingui/react/macro';-import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { useIcons } from 'twenty-ui/icon';--import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useNavigationMenuObjectMetadataForSection } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataForSection';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';-import { SidePanelNewSidebarItemRecordItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordItem';-import { SidePanelObjectMenuItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem';-import { useAvailableNavigationMenuItemSearchRecords } from '@/navigation-menu-item/edit/side-panel/hooks/useAvailableNavigationMenuItemSearchRecords';-import { getAvailableObjectMetadataForNewSidebarItem } from '@/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem';-import { isViewDisplayableInNavigationMenu } from '@/navigation-menu-item/edit/side-panel/utils/isViewDisplayableInNavigationMenu';-import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';-import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelItemWithAddToNavigationDrag } from '@/side-panel/components/SidePanelItemWithAddToNavigationDrag';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';-import { type View } from '@/views/types/View';-import { ViewKey } from '@/views/types/ViewKey';-import { filterBySearchQuery } from '~/utils/filterBySearchQuery';--type SidePanelNewSidebarItemSearchResultsProps = {- searchValue: string;-};--export const SidePanelNewSidebarItemSearchResults = ({- searchValue,-}: SidePanelNewSidebarItemSearchResultsProps) => {- const { t } = useLingui();- const { getIcon } = useIcons();- const { currentItems, createItem } = useNavigationMenuItemEditController();- const [- pendingInsertionNavigationMenuItem,- setPendingInsertionNavigationMenuItem,- ] = useAtomState(pendingInsertionNavigationMenuItemState);- const { openNavigationMenuItemInSidePanel } =- useOpenNavigationMenuItemInSidePanel();- const { objectMetadataItems } = useObjectMetadataItems();- const { activeNonSystemObjectMetadataItems } =- useFilteredObjectMetadataItems();- const { views, objectMetadataIdsWithIndexView, viewIdsAlreadyAdded } =- useNavigationMenuObjectMetadataForSection(currentItems);- const trimmedSearchValue = searchValue.trim();- const {- availableSearchRecords,- isSearchDebouncing,- recordSearchLoading,- error,- } = useAvailableNavigationMenuItemSearchRecords({- searchInput: trimmedSearchValue,- skip: !isNonEmptyString(trimmedSearchValue),- });- const isRecordSearchLoading = recordSearchLoading || isSearchDebouncing;-- const availableViews = views- .filter((view) => view.key !== ViewKey.INDEX)- .filter((view) => !viewIdsAlreadyAdded.has(view.id))- .filter(isViewDisplayableInNavigationMenu);-- const objectMetadataIdsWithDisplayableViews = new Set(- availableViews.map((view) => view.objectMetadataId),- );-- const {- availableObjectMetadataItems,- availableSystemObjectMetadataItems,- objectMetadataItemsWithViews,- availableSystemObjectMetadataItemsForView,- } = getAvailableObjectMetadataForNewSidebarItem({- objectMetadataItems,- activeNonSystemObjectMetadataItems,- objectMetadataIdsWithIndexView,- objectMetadataIdsWithDisplayableViews,- });-- const searchableObjectMetadataItems = [- ...availableObjectMetadataItems,- ...availableSystemObjectMetadataItems,- ].toSorted((a, b) => a.labelPlural.localeCompare(b.labelPlural));-- const searchableObjectMetadataItemsWithViews = [- ...objectMetadataItemsWithViews,- ...availableSystemObjectMetadataItemsForView,- ];-- const filteredObjectMetadataItems = filterBySearchQuery({- items: searchableObjectMetadataItems,- searchQuery: trimmedSearchValue,- getSearchableValues: (item) => [- item.labelPlural,- item.labelSingular,- item.namePlural,- item.nameSingular,- ],- });-- const objectMetadataItemIdsWithViews = new Set(- searchableObjectMetadataItemsWithViews.map((item) => item.id),- );-- const filteredViews = filterBySearchQuery({- items: availableViews- .filter((view) =>- objectMetadataItemIdsWithViews.has(view.objectMetadataId),- )- .sort((viewA, viewB) => viewA.name.localeCompare(viewB.name)),- searchQuery: trimmedSearchValue,- getSearchableValues: (view) => [view.name],- });-- const selectableItemIds = [- ...filteredObjectMetadataItems.map((item) => item.id),- ...filteredViews.map((view) => view.id),- ...availableSearchRecords.map((record) => record.recordId),- ];-- const isEmpty =- filteredObjectMetadataItems.length === 0 &&- filteredViews.length === 0 &&- availableSearchRecords.length === 0 &&- !isRecordSearchLoading;-- const handleSelectObject = (- objectMetadataItem: EnrichedObjectMetadataItem,- ) => {- const itemId = createItem(- {- type: NavigationMenuItemType.OBJECT,- targetObjectMetadataId: objectMetadataItem.id,- color: getObjectColorWithFallback(objectMetadataItem),- },- {- targetFolderId: pendingInsertionNavigationMenuItem?.folderId,- targetIndex: pendingInsertionNavigationMenuItem?.position,- },- );-- setPendingInsertionNavigationMenuItem(null);- openNavigationMenuItemInSidePanel({- itemId,- pageTitle: objectMetadataItem.labelSingular,- pageIcon: getIcon(objectMetadataItem.icon),- });- };-- const handleSelectView = (view: View) => {- const objectMetadataItem = objectMetadataItems.find(- (item) => item.id === view.objectMetadataId,- );- const viewIconColor = isDefined(objectMetadataItem)- ? getObjectColorWithFallback(objectMetadataItem)- : undefined;-- const itemId = createItem(- {- type: NavigationMenuItemType.VIEW,- viewId: view.id,- color: viewIconColor,- },- {- targetFolderId: pendingInsertionNavigationMenuItem?.folderId ?? null,- targetIndex: pendingInsertionNavigationMenuItem?.position,- },- );-- setPendingInsertionNavigationMenuItem(null);- openNavigationMenuItemInSidePanel({- itemId,- pageTitle: view.name,- pageIcon: getIcon(view.icon),- });- };-- const getObjectMetadataItemForView = (view: View) =>- objectMetadataItems.find((item) => item.id === view.objectMetadataId);-- return (- <>- <ToastOnQueryErrorEffect error={error} />- <SidePanelAddToNavigationDroppable>- {({ innerRef, droppableProps, placeholder }) => (- <SidePanelList- selectableItemIds={selectableItemIds}- loading={isRecordSearchLoading}- noResults={isEmpty}- noResultsText={t`No results found`}- >- {/* oxlint-disable-next-line react/jsx-props-no-spreading */}- <div ref={innerRef} {...droppableProps}>- <SidePanelGroup heading={t`Objects`}>- {filteredObjectMetadataItems.map(- (objectMetadataItem, index) => (- <SidePanelObjectMenuItem- key={objectMetadataItem.id}- objectMetadataItem={objectMetadataItem}- onSelect={handleSelectObject}- variant="add"- dragIndex={index}- />- ),- )}- </SidePanelGroup>- <SidePanelGroup heading={t`Views`}>- {filteredViews.map((view, index) => {- const objectMetadataItem = getObjectMetadataItemForView(view);- const objectIconColor = isDefined(objectMetadataItem)- ? getObjectColorWithFallback(objectMetadataItem)- : undefined;-- return (- <SelectableListItem- key={view.id}- itemId={view.id}- onEnter={() => handleSelectView(view)}- >- <SidePanelItemWithAddToNavigationDrag- customIconContent={- isDefined(objectMetadataItem) ? (- <ObjectIconWithViewOverlay- ObjectIcon={getIcon(objectMetadataItem.icon)}- ViewIcon={getIcon(view.icon)}- objectColor={objectIconColor}- />- ) : undefined- }- icon={- isDefined(objectMetadataItem)- ? undefined- : getIcon(view.icon)- }- label={view.name}- id={view.id}- onClick={() => handleSelectView(view)}- dragIndex={filteredObjectMetadataItems.length + index}- payload={{- type: NavigationMenuItemType.VIEW,- viewId: view.id,- label: view.name,- }}- />- </SelectableListItem>- );- })}- </SidePanelGroup>- <SidePanelGroup heading={t`Records`}>- {availableSearchRecords.map((record, index) => (- <SidePanelNewSidebarItemRecordItem- key={record.recordId}- record={record}- dragIndex={- filteredObjectMetadataItems.length +- filteredViews.length +- index- }- />- ))}- </SidePanelGroup>- {placeholder}- </div>- </SidePanelList>- )}- </SidePanelAddToNavigationDroppable>- </>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubPage.tsxdeleted file mode 100644index 19dba9cc839..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubPage.tsx+++ /dev/null@@ -1,75 +0,0 @@-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useNavigationMenuObjectMetadataForSection } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataForSection';-import { SidePanelNewSidebarItemViewObjectPickerSubView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView';-import { getAvailableObjectMetadataForNewSidebarItem } from '@/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem';-import { isViewDisplayableInNavigationMenu } from '@/navigation-menu-item/edit/side-panel/utils/isViewDisplayableInNavigationMenu';-import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { selectedObjectMetadataIdForViewFlowState } from '@/side-panel/states/selectedObjectMetadataIdForViewFlowState';-import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { useState } from 'react';--export const SidePanelNewSidebarItemViewObjectPickerSubPage = () => {- const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();- const [searchValue, setSearchValue] = useState('');- const setSelectedObjectMetadataIdForViewFlow = useSetAtomComponentState(- selectedObjectMetadataIdForViewFlowState,- );-- const { currentItems } = useNavigationMenuItemEditController();- const { objectMetadataItems } = useObjectMetadataItems();- const { activeNonSystemObjectMetadataItems } =- useFilteredObjectMetadataItems();- const { views, objectMetadataIdsWithIndexView, viewIdsAlreadyAdded } =- useNavigationMenuObjectMetadataForSection(currentItems);-- const objectMetadataIdsWithDisplayableViews = new Set(- views- .filter(- (view) =>- isViewDisplayableInNavigationMenu(view) &&- !viewIdsAlreadyAdded.has(view.id),- )- .map((view) => view.objectMetadataId),- );-- const {- objectMetadataItemsWithViews,- availableSystemObjectMetadataItemsForView,- } = getAvailableObjectMetadataForNewSidebarItem({- objectMetadataItems,- activeNonSystemObjectMetadataItems,- objectMetadataIdsWithIndexView,- objectMetadataIdsWithDisplayableViews,- });-- const handleSelectObject = (- objectMetadataItem: EnrichedObjectMetadataItem,- ) => {- setSelectedObjectMetadataIdForViewFlow(objectMetadataItem.id);- navigateToSidePanelSubPage(- SidePanelSubPages.NewSidebarItemViewPicker,- objectMetadataItem.labelPlural,- );- };-- return (- <SidePanelNewSidebarItemViewObjectPickerSubView- objects={objectMetadataItemsWithViews}- searchValue={searchValue}- onSearchChange={setSearchValue}- onOpenSystemPicker={() =>- navigateToSidePanelSubPage(- SidePanelSubPages.NewSidebarItemViewSystemPicker,- )- }- onSelectObject={handleSelectObject}- showSystemObjectsOption={- availableSystemObjectMetadataItemsForView.length > 0- }- />- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsxdeleted file mode 100644index 9baef4c4e35..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx+++ /dev/null@@ -1,86 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { IconSettings } from 'twenty-ui/icon';--import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { useSidePanelFilteredPickerItems } from '@/side-panel/hooks/useSidePanelFilteredPickerItems';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';--type SidePanelNewSidebarItemViewObjectPickerSubViewProps = {- objects: EnrichedObjectMetadataItem[];- searchValue: string;- onSearchChange: (value: string) => void;- onOpenSystemPicker: () => void;- onSelectObject: (objectMetadataItem: EnrichedObjectMetadataItem) => void;- showSystemObjectsOption?: boolean;-};--export const SidePanelNewSidebarItemViewObjectPickerSubView = ({- objects,- searchValue,- onSearchChange,- onOpenSystemPicker,- onSelectObject,- showSystemObjectsOption = true,-}: SidePanelNewSidebarItemViewObjectPickerSubViewProps) => {- const { t } = useLingui();- const { filteredItems, selectableItemIds, isEmpty, hasSearchQuery } =- useSidePanelFilteredPickerItems({- items: objects,- searchQuery: searchValue,- getSearchableValues: (item) => [item.labelPlural],- appendSelectableIds: showSystemObjectsOption ? ['system'] : [],- });- const noResultsText = hasSearchQuery- ? t`No results found`- : t`No objects with views found`;-- return (- <SidePanelSubViewWithSearch- searchPlaceholder={t`Search an object...`}- searchValue={searchValue}- onSearchChange={onSearchChange}- >- <SidePanelList- selectableItemIds={selectableItemIds}- noResults={isEmpty}- noResultsText={noResultsText}- >- <SidePanelGroup heading={t`Objects`}>- {filteredItems.map((objectMetadataItem) => (- <SelectableListItem- key={objectMetadataItem.id}- itemId={objectMetadataItem.id}- onEnter={() => onSelectObject(objectMetadataItem)}- >- <CommandMenuItem- Icon={() => (- <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />- )}- label={objectMetadataItem.labelPlural}- id={objectMetadataItem.id}- hasSubMenu- onClick={() => onSelectObject(objectMetadataItem)}- />- </SelectableListItem>- ))}- {showSystemObjectsOption && (- <SelectableListItem itemId="system" onEnter={onOpenSystemPicker}>- <CommandMenuItem- Icon={IconSettings}- label={t`System objects`}- id="system"- hasSubMenu={true}- onClick={onOpenSystemPicker}- />- </SelectableListItem>- )}- </SidePanelGroup>- </SidePanelList>- </SidePanelSubViewWithSearch>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubPage.tsxdeleted file mode 100644index 186700b3d04..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubPage.tsx+++ /dev/null@@ -1,20 +0,0 @@-import { SidePanelNewSidebarItemViewPickerSubView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView';-import { selectedObjectMetadataIdForViewFlowState } from '@/side-panel/states/selectedObjectMetadataIdForViewFlowState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { isDefined } from 'twenty-shared/utils';--export const SidePanelNewSidebarItemViewPickerSubPage = () => {- const selectedObjectMetadataIdForViewFlow = useAtomComponentStateValue(- selectedObjectMetadataIdForViewFlowState,- );-- if (!isDefined(selectedObjectMetadataIdForViewFlow)) {- return null;- }-- return (- <SidePanelNewSidebarItemViewPickerSubView- selectedObjectMetadataIdForView={selectedObjectMetadataIdForViewFlow}- />- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView.tsxdeleted file mode 100644index a98a1e77659..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubView.tsx+++ /dev/null@@ -1,153 +0,0 @@-import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useNavigationMenuObjectMetadataForSection } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataForSection';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';-import { isViewDisplayableInNavigationMenu } from '@/navigation-menu-item/edit/side-panel/utils/isViewDisplayableInNavigationMenu';-import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelItemWithAddToNavigationDrag } from '@/side-panel/components/SidePanelItemWithAddToNavigationDrag';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { useSidePanelFilteredPickerItems } from '@/side-panel/hooks/useSidePanelFilteredPickerItems';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';-import { type View } from '@/views/types/View';-import { useLingui } from '@lingui/react/macro';-import { useState } from 'react';-import { isDefined } from 'twenty-shared/utils';-import { useIcons } from 'twenty-ui/icon';--type SidePanelNewSidebarItemViewPickerSubViewProps = {- selectedObjectMetadataIdForView: string;-};--export const SidePanelNewSidebarItemViewPickerSubView = ({- selectedObjectMetadataIdForView,-}: SidePanelNewSidebarItemViewPickerSubViewProps) => {- const { t } = useLingui();- const { getIcon } = useIcons();- const [searchValue, setSearchValue] = useState('');- const { currentItems, createItem } = useNavigationMenuItemEditController();- const [- pendingInsertionNavigationMenuItem,- setPendingInsertionNavigationMenuItem,- ] = useAtomState(pendingInsertionNavigationMenuItemState);- const { openNavigationMenuItemInSidePanel } =- useOpenNavigationMenuItemInSidePanel();- const { objectMetadataItems } = useObjectMetadataItems();- const { views } = useNavigationMenuObjectMetadataForSection(currentItems);-- const viewsForSelectedObject = views- .filter(- (view) =>- view.objectMetadataId === selectedObjectMetadataIdForView &&- isViewDisplayableInNavigationMenu(view),- )- .sort((a, b) => a.position - b.position);-- const selectedObjectMetadataItem = objectMetadataItems.find(- (item) => item.id === selectedObjectMetadataIdForView,- );-- const {- filteredItems: filteredViews,- selectableItemIds,- isEmpty,- hasSearchQuery,- } = useSidePanelFilteredPickerItems({- items: viewsForSelectedObject,- searchQuery: searchValue,- getSearchableValues: (view) => [view.name],- });- const noResultsText = hasSearchQuery- ? t`No results found`- : t`No custom views available`;-- const selectedObjectIconColor = isDefined(selectedObjectMetadataItem)- ? getObjectColorWithFallback(selectedObjectMetadataItem)- : undefined;-- const handleSelectView = (view: View) => {- const itemId = createItem(- {- type: NavigationMenuItemType.VIEW,- viewId: view.id,- color: selectedObjectIconColor,- },- {- targetFolderId: pendingInsertionNavigationMenuItem?.folderId ?? null,- targetIndex: pendingInsertionNavigationMenuItem?.position,- },- );- setPendingInsertionNavigationMenuItem(null);- openNavigationMenuItemInSidePanel({- itemId,- pageTitle: view.name,- pageIcon: getIcon(view.icon),- });- };-- return (- <SidePanelSubViewWithSearch- searchPlaceholder={t`Search a view...`}- searchValue={searchValue}- onSearchChange={setSearchValue}- >- <SidePanelAddToNavigationDroppable>- {({ innerRef, droppableProps, placeholder }) => (- <SidePanelList- selectableItemIds={selectableItemIds}- noResults={isEmpty}- noResultsText={noResultsText}- >- {/* oxlint-disable-next-line react/jsx-props-no-spreading */}- <div ref={innerRef} {...droppableProps}>- <SidePanelGroup heading={t`Views`}>- {filteredViews.map((view, index) => (- <SelectableListItem- key={view.id}- itemId={view.id}- onEnter={() => handleSelectView(view)}- >- <SidePanelItemWithAddToNavigationDrag- customIconContent={- selectedObjectMetadataItem ? (- <ObjectIconWithViewOverlay- ObjectIcon={getIcon(- selectedObjectMetadataItem.icon,- )}- ViewIcon={getIcon(view.icon)}- objectColor={selectedObjectIconColor}- />- ) : undefined- }- icon={- selectedObjectMetadataItem- ? undefined- : getIcon(view.icon)- }- label={view.name}- id={view.id}- onClick={() => handleSelectView(view)}- dragIndex={index}- payload={{- type: NavigationMenuItemType.VIEW,- viewId: view.id,- label: view.name,- }}- />- </SelectableListItem>- ))}- </SidePanelGroup>- {placeholder}- </div>- </SidePanelList>- )}- </SidePanelAddToNavigationDroppable>- </SidePanelSubViewWithSearch>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemPickerSubPage.tsxdeleted file mode 100644index fae0b18e79e..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemPickerSubPage.tsx+++ /dev/null@@ -1,65 +0,0 @@-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useNavigationMenuObjectMetadataForSection } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataForSection';-import { SidePanelNewSidebarItemViewSystemSubView } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView';-import { getAvailableObjectMetadataForNewSidebarItem } from '@/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem';-import { isViewDisplayableInNavigationMenu } from '@/navigation-menu-item/edit/side-panel/utils/isViewDisplayableInNavigationMenu';-import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { selectedObjectMetadataIdForViewFlowState } from '@/side-panel/states/selectedObjectMetadataIdForViewFlowState';-import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { useState } from 'react';--export const SidePanelNewSidebarItemViewSystemPickerSubPage = () => {- const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();- const [searchValue, setSearchValue] = useState('');- const setSelectedObjectMetadataIdForViewFlow = useSetAtomComponentState(- selectedObjectMetadataIdForViewFlowState,- );-- const { currentItems } = useNavigationMenuItemEditController();- const { objectMetadataItems } = useObjectMetadataItems();- const { activeNonSystemObjectMetadataItems } =- useFilteredObjectMetadataItems();- const { views, objectMetadataIdsWithIndexView, viewIdsAlreadyAdded } =- useNavigationMenuObjectMetadataForSection(currentItems);-- const objectMetadataIdsWithDisplayableViews = new Set(- views- .filter(- (view) =>- isViewDisplayableInNavigationMenu(view) &&- !viewIdsAlreadyAdded.has(view.id),- )- .map((view) => view.objectMetadataId),- );-- const { availableSystemObjectMetadataItemsForView } =- getAvailableObjectMetadataForNewSidebarItem({- objectMetadataItems,- activeNonSystemObjectMetadataItems,- objectMetadataIdsWithIndexView,- objectMetadataIdsWithDisplayableViews,- });-- const handleSelectObject = (- objectMetadataItem: EnrichedObjectMetadataItem,- ) => {- setSelectedObjectMetadataIdForViewFlow(objectMetadataItem.id);- navigateToSidePanelSubPage(- SidePanelSubPages.NewSidebarItemViewPicker,- objectMetadataItem.labelPlural,- );- };-- return (- <SidePanelNewSidebarItemViewSystemSubView- systemObjects={availableSystemObjectMetadataItemsForView}- searchValue={searchValue}- onSearchChange={setSearchValue}- onSelectObject={handleSelectObject}- />- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView.tsxdeleted file mode 100644index db2bce8a275..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView.tsx+++ /dev/null@@ -1,72 +0,0 @@-import { useLingui } from '@lingui/react/macro';--import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { useSidePanelFilteredPickerItems } from '@/side-panel/hooks/useSidePanelFilteredPickerItems';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';--type SidePanelNewSidebarItemViewSystemSubViewProps = {- systemObjects: EnrichedObjectMetadataItem[];- searchValue: string;- onSearchChange: (value: string) => void;- onSelectObject: (objectMetadataItem: EnrichedObjectMetadataItem) => void;-};--export const SidePanelNewSidebarItemViewSystemSubView = ({- systemObjects,- searchValue,- onSearchChange,- onSelectObject,-}: SidePanelNewSidebarItemViewSystemSubViewProps) => {- const { t } = useLingui();- const {- filteredItems: filteredSystemObjectMetadataItems,- selectableItemIds,- isEmpty,- hasSearchQuery,- } = useSidePanelFilteredPickerItems({- items: systemObjects,- searchQuery: searchValue,- getSearchableValues: (item) => [item.labelPlural],- });- const noResultsText = hasSearchQuery- ? t`No results found`- : t`No system objects with views found`;-- return (- <SidePanelSubViewWithSearch- searchPlaceholder={t`Search a system object...`}- searchValue={searchValue}- onSearchChange={onSearchChange}- >- <SidePanelList- selectableItemIds={selectableItemIds}- noResults={isEmpty}- noResultsText={noResultsText}- >- <SidePanelGroup heading={t`System objects`}>- {filteredSystemObjectMetadataItems.map((objectMetadataItem) => (- <SelectableListItem- key={objectMetadataItem.id}- itemId={objectMetadataItem.id}- onEnter={() => onSelectObject(objectMetadataItem)}- >- <CommandMenuItem- Icon={() => (- <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />- )}- label={objectMetadataItem.labelPlural}- id={objectMetadataItem.id}- onClick={() => onSelectObject(objectMetadataItem)}- />- </SelectableListItem>- ))}- </SidePanelGroup>- </SidePanelList>- </SidePanelSubViewWithSearch>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem.tsxdeleted file mode 100644index 781f56f95c4..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem.tsx+++ /dev/null@@ -1,84 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { isDefined } from 'twenty-shared/utils';-import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useNavigationMenuObjectMetadataForSection } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataForSection';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { SidePanelItemWithAddToNavigationDrag } from '@/side-panel/components/SidePanelItemWithAddToNavigationDrag';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';-import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';-import { indexViewIdFromObjectMetadataItemFamilySelector } from '@/views/states/selectors/indexViewIdFromObjectMetadataItemFamilySelector';--type SidePanelObjectMenuItemProps = {- objectMetadataItem: EnrichedObjectMetadataItem;- onSelect: (objectMetadataItem: EnrichedObjectMetadataItem) => void;- variant: 'add' | 'edit';- dragIndex?: number;- disableDrag?: boolean;-};--export const SidePanelObjectMenuItem = ({- objectMetadataItem,- onSelect,- variant,- dragIndex,- disableDrag = false,-}: SidePanelObjectMenuItemProps) => {- const { t } = useLingui();- const { currentItems } = useNavigationMenuItemEditController();- const { objectMetadataIdsAlreadyAdded } =- useNavigationMenuObjectMetadataForSection(currentItems);- const isAlreadyInNavbar = objectMetadataIdsAlreadyAdded.has(- objectMetadataItem.id,- );- const defaultViewId = useAtomFamilySelectorValue(- indexViewIdFromObjectMetadataItemFamilySelector,- { objectMetadataItemId: objectMetadataItem.id },- );- const iconColor = getObjectColorWithFallback(objectMetadataItem);- const isDisabled = isAlreadyInNavbar || !isDefined(defaultViewId);-- const handleClick = () => {- if (isDisabled || !defaultViewId) {- return;- }- onSelect(objectMetadataItem);- };-- const styledIcon = () => (- <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />- );-- return (- <SelectableListItem itemId={objectMetadataItem.id} onEnter={handleClick}>- {variant === 'add' && !isDisabled ? (- <SidePanelItemWithAddToNavigationDrag- icon={styledIcon}- label={objectMetadataItem.labelPlural}- id={objectMetadataItem.id}- onClick={handleClick}- dragIndex={dragIndex}- disableDrag={disableDrag}- payload={{- type: NavigationMenuItemType.OBJECT,- objectMetadataId: objectMetadataItem.id,- label: objectMetadataItem.labelPlural,- iconColor,- }}- />- ) : (- <CommandMenuItem- Icon={styledIcon}- label={objectMetadataItem.labelPlural}- id={objectMetadataItem.id}- onClick={handleClick}- disabled={isDisabled}- description={isAlreadyInNavbar ? t`Already in navbar` : undefined}- />- )}- </SelectableListItem>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem.tsxdeleted file mode 100644index 09b7a783804..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem.tsx+++ /dev/null@@ -1,57 +0,0 @@-import { isDefined } from 'twenty-shared/utils';--import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { SidePanelObjectMenuItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';--type SidePanelObjectPickerItemProps = {- objectMetadataItem: EnrichedObjectMetadataItem;- isViewItem: boolean;- onSelectObjectForViewEdit?: (- objectMetadataItem: EnrichedObjectMetadataItem,- ) => void;- onChangeObject: (objectMetadataItem: EnrichedObjectMetadataItem) => void;- objectMenuItemVariant?: 'add' | 'edit';- dragIndex?: number;- disableDrag?: boolean;-};--export const SidePanelObjectPickerItem = ({- objectMetadataItem,- isViewItem,- onSelectObjectForViewEdit,- onChangeObject,- objectMenuItemVariant = 'edit',- dragIndex,- disableDrag = false,-}: SidePanelObjectPickerItemProps) => {- if (isViewItem && isDefined(onSelectObjectForViewEdit)) {- return (- <SelectableListItem- itemId={objectMetadataItem.id}- onEnter={() => onSelectObjectForViewEdit(objectMetadataItem)}- >- <CommandMenuItem- Icon={() => (- <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />- )}- label={objectMetadataItem.labelPlural}- id={objectMetadataItem.id}- onClick={() => onSelectObjectForViewEdit(objectMetadataItem)}- />- </SelectableListItem>- );- }-- return (- <SidePanelObjectMenuItem- objectMetadataItem={objectMetadataItem}- onSelect={onChangeObject}- variant={objectMenuItemVariant}- dragIndex={dragIndex}- disableDrag={disableDrag}- />- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsxdeleted file mode 100644index 0ff527a42c9..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsx+++ /dev/null@@ -1,115 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { IconSettings } from 'twenty-ui/icon';--import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { SidePanelObjectPickerItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem';-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { useSidePanelFilteredPickerItems } from '@/side-panel/hooks/useSidePanelFilteredPickerItems';-import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';--type SidePanelObjectPickerSubViewProps = {- objects: EnrichedObjectMetadataItem[];- searchValue: string;- onSearchChange: (value: string) => void;- onOpenSystemPicker: () => void;- isViewItem: boolean;- onSelectObjectForViewEdit?: (- objectMetadataItem: EnrichedObjectMetadataItem,- ) => void;- onChangeObject: (objectMetadataItem: EnrichedObjectMetadataItem) => void;- objectMenuItemVariant?: 'add' | 'edit';- emptyNoResultsText?: string;- disableDrag?: boolean;-};--export const SidePanelObjectPickerSubView = ({- objects,- searchValue,- onSearchChange,- onOpenSystemPicker,- isViewItem,- onSelectObjectForViewEdit,- onChangeObject,- objectMenuItemVariant = 'edit',- emptyNoResultsText,- disableDrag = false,-}: SidePanelObjectPickerSubViewProps) => {- const { t } = useLingui();- const { filteredItems, selectableItemIds, isEmpty, hasSearchQuery } =- useSidePanelFilteredPickerItems({- items: objects,- searchQuery: searchValue,- getSearchableValues: (item) => [item.labelPlural],- appendSelectableIds: ['system'],- });-- const noResultsText = hasSearchQuery- ? t`No results found`- : (emptyNoResultsText ?? t`All objects are already in the sidebar`);-- const isAddVariant = objectMenuItemVariant === 'add';-- const listContent = (- <SidePanelGroup heading={t`Objects`}>- {filteredItems.map((objectMetadataItem, index) => (- <SidePanelObjectPickerItem- key={objectMetadataItem.id}- objectMetadataItem={objectMetadataItem}- isViewItem={isViewItem}- onSelectObjectForViewEdit={onSelectObjectForViewEdit}- onChangeObject={onChangeObject}- objectMenuItemVariant={objectMenuItemVariant}- dragIndex={isAddVariant && !disableDrag ? index : undefined}- disableDrag={disableDrag}- />- ))}- <SelectableListItem itemId="system" onEnter={onOpenSystemPicker}>- <CommandMenuItem- Icon={IconSettings}- label={t`System objects`}- id="system"- hasSubMenu- onClick={onOpenSystemPicker}- />- </SelectableListItem>- </SidePanelGroup>- );-- return (- <SidePanelSubViewWithSearch- searchPlaceholder={t`Search an object...`}- searchValue={searchValue}- onSearchChange={onSearchChange}- >- {isAddVariant ? (- <SidePanelAddToNavigationDroppable>- {({ innerRef, droppableProps, placeholder }) => (- <SidePanelList- selectableItemIds={selectableItemIds}- noResults={isEmpty}- noResultsText={noResultsText}- >- {/* oxlint-disable-next-line react/jsx-props-no-spreading */}- <div ref={innerRef} {...droppableProps}>- {listContent}- {placeholder}- </div>- </SidePanelList>- )}- </SidePanelAddToNavigationDroppable>- ) : (- <SidePanelList- selectableItemIds={selectableItemIds}- noResults={isEmpty}- noResultsText={noResultsText}- >- {listContent}- </SidePanelList>- )}- </SidePanelSubViewWithSearch>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelSystemObjectPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelSystemObjectPickerSubView.tsxdeleted file mode 100644index 3ec70cf0291..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelSystemObjectPickerSubView.tsx+++ /dev/null@@ -1,100 +0,0 @@-import { useLingui } from '@lingui/react/macro';--import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';-import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';-import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { useSidePanelFilteredPickerItems } from '@/side-panel/hooks/useSidePanelFilteredPickerItems';-import { SidePanelObjectPickerItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem';--type SidePanelSystemObjectPickerSubViewProps = {- systemObjects: EnrichedObjectMetadataItem[];- searchValue: string;- onSearchChange: (value: string) => void;- isViewItem: boolean;- onSelectObjectForViewEdit?: (- objectMetadataItem: EnrichedObjectMetadataItem,- ) => void;- onChangeObject: (objectMetadataItem: EnrichedObjectMetadataItem) => void;- objectMenuItemVariant?: 'add' | 'edit';- emptyNoResultsText?: string;- disableDrag?: boolean;-};--export const SidePanelSystemObjectPickerSubView = ({- systemObjects,- searchValue,- onSearchChange,- isViewItem,- onSelectObjectForViewEdit,- onChangeObject,- objectMenuItemVariant = 'edit',- emptyNoResultsText,- disableDrag = false,-}: SidePanelSystemObjectPickerSubViewProps) => {- const { t } = useLingui();- const { filteredItems, selectableItemIds, isEmpty, hasSearchQuery } =- useSidePanelFilteredPickerItems({- items: systemObjects,- searchQuery: searchValue,- getSearchableValues: (item) => [item.labelPlural],- });-- const noResultsText = hasSearchQuery- ? t`No results found`- : (emptyNoResultsText ?? t`No system objects available`);-- const isAddVariant = objectMenuItemVariant === 'add';-- const listContent = (- <SidePanelGroup heading={t`System objects`}>- {filteredItems.map((objectMetadataItem, index) => (- <SidePanelObjectPickerItem- key={objectMetadataItem.id}- objectMetadataItem={objectMetadataItem}- isViewItem={isViewItem}- onSelectObjectForViewEdit={onSelectObjectForViewEdit}- onChangeObject={onChangeObject}- objectMenuItemVariant={objectMenuItemVariant}- dragIndex={isAddVariant && !disableDrag ? index : undefined}- disableDrag={disableDrag}- />- ))}- </SidePanelGroup>- );-- return (- <SidePanelSubViewWithSearch- searchPlaceholder={t`Search a system object...`}- searchValue={searchValue}- onSearchChange={onSearchChange}- >- {isAddVariant ? (- <SidePanelAddToNavigationDroppable>- {({ innerRef, droppableProps, placeholder }) => (- <SidePanelList- selectableItemIds={selectableItemIds}- noResults={isEmpty}- noResultsText={noResultsText}- >- {/* eslint-disable-next-line react/jsx-props-no-spreading */}- <div ref={innerRef} {...droppableProps}>- {listContent}- {placeholder}- </div>- </SidePanelList>- )}- </SidePanelAddToNavigationDroppable>- ) : (- <SidePanelList- selectableItemIds={selectableItemIds}- noResults={isEmpty}- noResultsText={noResultsText}- >- {listContent}- </SidePanelList>- )}- </SidePanelSubViewWithSearch>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/constants/side-panel-navigation-item-actions.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/constants/side-panel-navigation-item-actions.tsdeleted file mode 100644index 34c608d4e65..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/constants/side-panel-navigation-item-actions.ts+++ /dev/null@@ -1,8 +0,0 @@-export enum SidePanelNavigationItemActions {- MOVE_UP = 'move-up',- MOVE_DOWN = 'move-down',- MOVE_TO_FOLDER = 'move-to-folder',- ADD_BEFORE = 'add-before',- ADD_AFTER = 'add-after',- REMOVE = 'remove',-}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu.tsdeleted file mode 100644index 5e7031e115a..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu.ts+++ /dev/null@@ -1,44 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { IconFolder } from 'twenty-ui/icon';--import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';-import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';--export const useAddFolderToNavigationMenu = () => {- const { t } = useLingui();- const { createItem } = useNavigationMenuItemEditController();- const { openNavigationMenuItemInSidePanel } =- useOpenNavigationMenuItemInSidePanel();- const [- pendingInsertionNavigationMenuItem,- setPendingInsertionNavigationMenuItem,- ] = useAtomState(pendingInsertionNavigationMenuItemState);-- const handleAddFolder = () => {- const itemId = createItem(- {- type: NavigationMenuItemType.FOLDER,- name: t`New folder`,- color: DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER,- },- {- targetFolderId: pendingInsertionNavigationMenuItem?.folderId ?? null,- targetIndex: pendingInsertionNavigationMenuItem?.position,- },- );-- setPendingInsertionNavigationMenuItem(null);- openNavigationMenuItemInSidePanel({- itemId,- pageTitle: t`Edit folder`,- pageIcon: IconFolder,- focusTitleInput: true,- });- };-- return { handleAddFolder };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu.tsdeleted file mode 100644index 96c8b66ceb7..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu.ts+++ /dev/null@@ -1,46 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { normalizeUrl } from 'twenty-shared/utils';-import { IconLink } from 'twenty-ui/icon';--import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink';-import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useOpenNavigationMenuItemInSidePanel } from '@/navigation-menu-item/edit/hooks/useOpenNavigationMenuItemInSidePanel';-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';--export const useAddLinkToNavigationMenu = () => {- const { t } = useLingui();- const { createItem } = useNavigationMenuItemEditController();- const { openNavigationMenuItemInSidePanel } =- useOpenNavigationMenuItemInSidePanel();- const [- pendingInsertionNavigationMenuItem,- setPendingInsertionNavigationMenuItem,- ] = useAtomState(pendingInsertionNavigationMenuItemState);-- const handleAddLink = () => {- const itemId = createItem(- {- type: NavigationMenuItemType.LINK,- name: t`Link label`,- link: normalizeUrl('www.example.com'),- color: DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK,- },- {- targetFolderId: pendingInsertionNavigationMenuItem?.folderId ?? null,- targetIndex: pendingInsertionNavigationMenuItem?.position,- },- );-- setPendingInsertionNavigationMenuItem(null);- openNavigationMenuItemInSidePanel({- itemId,- pageTitle: t`Edit link`,- pageIcon: IconLink,- focusTitleInput: true,- });- };-- return { handleAddLink };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAvailableNavigationMenuItemSearchRecords.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAvailableNavigationMenuItemSearchRecords.tsdeleted file mode 100644index 97ba6490674..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useAvailableNavigationMenuItemSearchRecords.ts+++ /dev/null@@ -1,80 +0,0 @@-import { isNonEmptyString } from '@sniptt/guards';-import { useMemo } from 'react';-import { useDebounce } from 'use-debounce';--import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useObjectRecordSearchRecords } from '@/object-record/hooks/useObjectRecordSearchRecords';-import { useSearchableObjectNameSingulars } from '@/side-panel/hooks/useSearchableObjectNameSingulars';-import { isDefined } from 'twenty-shared/utils';--type NavigationMenuItemSearchRecord = {- recordId: string;- objectNameSingular: string;- label: string;- imageUrl?: string | null;-};--type UseAvailableNavigationMenuItemSearchRecordsParams = {- searchInput: string;- selectedObjectNameSingular?: string | null;- skip?: boolean;-};--export const useAvailableNavigationMenuItemSearchRecords = ({- searchInput,- selectedObjectNameSingular = null,- skip = false,-}: UseAvailableNavigationMenuItemSearchRecordsParams) => {- const { currentItems } = useNavigationMenuItemEditController();- const trimmedSearchInput = searchInput.trim();-- const [deferredSearchInput] = useDebounce(trimmedSearchInput, 300);-- const includedObjectNameSingulars = useSearchableObjectNameSingulars({- selectedObjectNameSingular,- });-- const {- loading: recordSearchLoading,- searchRecords,- error,- } = useObjectRecordSearchRecords({- objectNameSingulars: includedObjectNameSingulars,- searchInput: deferredSearchInput,- skip: skip || !isNonEmptyString(deferredSearchInput),- });-- const recordIdsAlreadyAdded = useMemo(- () =>- new Set(- currentItems.flatMap((item) =>- isDefined(item.targetRecordId) ? [item.targetRecordId] : [],- ),- ),- [currentItems],- );-- const availableSearchRecords = useMemo(- () =>- searchRecords- .filter((record) => !recordIdsAlreadyAdded.has(record.recordId))- .map(- (record): NavigationMenuItemSearchRecord => ({- recordId: record.recordId,- objectNameSingular: record.objectNameSingular,- label: record.label,- imageUrl: record.imageUrl,- }),- ),- [recordIdsAlreadyAdded, searchRecords],- );-- return {- error,- availableSearchRecords,- deferredSearchInput,- isSearchDebouncing: trimmedSearchInput !== deferredSearchInput,- recordSearchLoading,- trimmedSearchInput,- };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useFolderPickerSelectionData.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useFolderPickerSelectionData.tsdeleted file mode 100644index b036962717e..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useFolderPickerSelectionData.ts+++ /dev/null@@ -1,100 +0,0 @@-import { isDefined } from 'twenty-shared/utils';--import { NavigationMenuItemType } from 'twenty-shared/types';-import { useNavigationMenuItemSectionAllFolders } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemSectionAllFolders';-import { useNavigationMenuItemSectionFolders } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemSectionFolders';-import { useNavigationMenuItemMoveRemove } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';--type FolderOption = {- id: string;- name: string;- folderId?: string | null;-};--const getDescendantFolderIds = (- folderId: string,- allFolders: FolderOption[],-): Set<string> => {- const result = new Set<string>();- for (const folder of allFolders) {- if (folder.folderId !== folderId) continue;- result.add(folder.id);- getDescendantFolderIds(folder.id, allFolders).forEach((id) =>- result.add(id),- );- }- return result;-};--const excludeCurrentFolder = <T extends { id: string }>(- folders: T[],- currentFolderId: string | null,-): T[] =>- !isDefined(currentFolderId)- ? folders- : folders.filter((folder) => folder.id !== currentFolderId);--export const useFolderPickerSelectionData = () => {- const { closeSidePanelMenu } = useSidePanelMenu();- const { moveToFolder } = useNavigationMenuItemMoveRemove();- const selectedNavigationMenuItemIdInEditMode = useAtomStateValue(- selectedNavigationMenuItemIdInEditModeState,- );- const { selectedItem } = useSelectedNavigationMenuItemEditItem();- const selectedItemType = selectedItem?.type ?? null;- const { allFolders } = useNavigationMenuItemSectionAllFolders();- const { sectionFolders } = useNavigationMenuItemSectionFolders();-- const selectedFolderId =- selectedItemType === NavigationMenuItemType.FOLDER- ? selectedNavigationMenuItemIdInEditMode- : null;- const currentFolderId =- selectedItemType === NavigationMenuItemType.FOLDER- ? (selectedItem?.id ?? null)- : (selectedItem?.folderId ?? null);-- const descendantFolderIds =- selectedItemType === NavigationMenuItemType.FOLDER &&- isDefined(selectedFolderId)- ? getDescendantFolderIds(selectedFolderId, allFolders)- : new Set<string>();-- const includeNoFolderOption =- (selectedItemType === NavigationMenuItemType.FOLDER &&- isDefined(selectedFolderId)) ||- (selectedItemType === NavigationMenuItemType.LINK &&- isDefined(currentFolderId));-- const folders =- includeNoFolderOption &&- selectedItemType === NavigationMenuItemType.FOLDER &&- isDefined(selectedFolderId)- ? allFolders.filter(- (folder) =>- folder.id !== selectedFolderId &&- !descendantFolderIds.has(folder.id),- )- : excludeCurrentFolder(allFolders, currentFolderId);-- const foldersToShow = includeNoFolderOption- ? folders- : excludeCurrentFolder(sectionFolders, currentFolderId);-- const handleSelectFolder = (folderId: string | null) => {- if (isDefined(selectedNavigationMenuItemIdInEditMode)) {- void moveToFolder(selectedNavigationMenuItemIdInEditMode, folderId);- closeSidePanelMenu();- }- };-- return {- foldersToShow,- includeNoFolderOption,- handleSelectFolder,- };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.tsdeleted file mode 100644index b33fd97f6e5..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/hooks/useNavigationMenuItemEditOrganizeActions.ts+++ /dev/null@@ -1,172 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { isNonEmptyString } from '@sniptt/guards';-import { SidePanelPages } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { IconDotsVertical } from 'twenty-ui/icon';--import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { type PendingInsertionNavigationMenuItem } from '@/navigation-menu-item/common/types/PendingInsertionNavigationMenuItem';-import { useNavigateToNavigationMenuItemLink } from '@/navigation-menu-item/common/hooks/useNavigateToNavigationMenuItemLink';-import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';-import { useNavigationMenuItemEditSectionItems } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems';-import { useNavigationMenuItemMoveRemove } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemMoveRemove';-import { type OrganizeActionsProps } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditOrganizeActions';-import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';-import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';-import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';-import { useSidePanelSubPageHistory } from '@/side-panel/hooks/useSidePanelSubPageHistory';-import { SidePanelSubPages } from '@/side-panel/types/SidePanelSubPages';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { viewsSelector } from '@/views/states/selectors/viewsSelector';-import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { lastVisitedViewPerObjectMetadataItemState } from '@/navigation/states/lastVisitedViewPerObjectMetadataItemState';--const computeInsertionPosition = (- selectedItem: { id: string; folderId?: string | null },- sectionItems: NavigationMenuItem[],- offset: 0 | 1,-): PendingInsertionNavigationMenuItem | null => {- const folderId = selectedItem.folderId ?? null;- const itemsInFolderSorted = sectionItems- .filter((item) => (item.folderId ?? null) === folderId)- .sort((a, b) => a.position - b.position);- const selectedIndexSorted = itemsInFolderSorted.findIndex(- (item) => item.id === selectedItem.id,- );-- if (selectedIndexSorted < 0) {- return null;- }-- return {- folderId,- position: selectedIndexSorted + offset,- };-};--export const useNavigationMenuItemEditOrganizeActions =- (): OrganizeActionsProps => {- const { t } = useLingui();- const { navigateToNavigationMenuItemLink } =- useNavigateToNavigationMenuItemLink();- const { closeSidePanelMenu } = useSidePanelMenu();- const { navigateSidePanel } = useNavigateSidePanel();- const { navigateToSidePanelSubPage } = useSidePanelSubPageHistory();- const selectedNavigationMenuItemIdInEditMode = useAtomStateValue(- selectedNavigationMenuItemIdInEditModeState,- );- const setSelectedNavigationMenuItemIdInEditMode = useSetAtomState(- selectedNavigationMenuItemIdInEditModeState,- );- const setPendingInsertionNavigationMenuItem = useSetAtomState(- pendingInsertionNavigationMenuItemState,- );- const items = useNavigationMenuItemEditSectionItems();- const { moveUp, moveDown, remove } = useNavigationMenuItemMoveRemove();- const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);- const views = useAtomStateValue(viewsSelector);- const lastVisitedViewPerObjectMetadataItem = useAtomStateValue(- lastVisitedViewPerObjectMetadataItemState,- );-- const selectedItem = selectedNavigationMenuItemIdInEditMode- ? items.find((item) => item.id === selectedNavigationMenuItemIdInEditMode)- : undefined;-- const folderId = selectedItem?.folderId ?? null;- const siblings = items- .filter(- (item) =>- ('folderId' in item ? (item.folderId ?? null) : null) === folderId,- )- .sort((a, b) => a.position - b.position);- const selectedIndexInSiblings = selectedItem- ? siblings.findIndex((item) => item.id === selectedItem.id)- : -1;-- const canMoveUp =- selectedIndexInSiblings > 0 &&- selectedItem != null &&- isDefined(selectedNavigationMenuItemIdInEditMode);- const canMoveDown =- selectedIndexInSiblings >= 0 &&- selectedIndexInSiblings < siblings.length - 1 &&- selectedItem != null &&- isDefined(selectedNavigationMenuItemIdInEditMode);-- const handleMoveUp = () => {- if (canMoveUp && isDefined(selectedNavigationMenuItemIdInEditMode)) {- void moveUp(selectedNavigationMenuItemIdInEditMode);- }- };-- const handleMoveDown = () => {- if (canMoveDown && isDefined(selectedNavigationMenuItemIdInEditMode)) {- void moveDown(selectedNavigationMenuItemIdInEditMode);- }- };-- const handleRemove = () => {- if (!isDefined(selectedNavigationMenuItemIdInEditMode)) {- return;- }-- const nextItem =- siblings[selectedIndexInSiblings + 1] ??- siblings[selectedIndexInSiblings - 1];-- void remove(selectedNavigationMenuItemIdInEditMode);-- if (isDefined(nextItem)) {- setSelectedNavigationMenuItemIdInEditMode(nextItem.id);- const link = getNavigationMenuItemComputedLink({- item: nextItem,- objectMetadataItems,- views,- lastVisitedViewPerObjectMetadataItem,- });- if (isNonEmptyString(link)) {- navigateToNavigationMenuItemLink(link);- }- navigateSidePanel({- page: SidePanelPages.NavigationMenuItemEdit,- pageTitle: t`Edit`,- pageIcon: IconDotsVertical,- resetNavigationStack: true,- });- } else {- setSelectedNavigationMenuItemIdInEditMode(null);- closeSidePanelMenu();- }- };-- const handleAddAtOffset = (offset: 0 | 1) => {- if (!isDefined(selectedItem)) return;- const insertion = computeInsertionPosition(selectedItem, items, offset);- if (!insertion) return;-- const title =- offset === 0 ? t`Add menu item before` : t`Add menu item after`;-- setPendingInsertionNavigationMenuItem(insertion);- navigateToSidePanelSubPage(- SidePanelSubPages.NewSidebarItemMainMenu,- title,- );- };-- const handleAddBefore = () => handleAddAtOffset(0);- const handleAddAfter = () => handleAddAtOffset(1);-- return {- canMoveUp,- canMoveDown,- onMoveUp: handleMoveUp,- onMoveDown: handleMoveDown,- onRemove: handleRemove,- onAddBefore: handleAddBefore,- onAddAfter: handleAddAfter,- };- };diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds.tsdeleted file mode 100644index 073889d7ab5..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/getOrganizeActionsSelectableItemIds.ts+++ /dev/null@@ -1,26 +0,0 @@-import { SidePanelNavigationItemActions } from '@/navigation-menu-item/edit/side-panel/constants/side-panel-navigation-item-actions';--const ORGANIZE_ACTIONS_WITHOUT_MOVE_TO_FOLDER: SidePanelNavigationItemActions[] =- [- SidePanelNavigationItemActions.MOVE_UP,- SidePanelNavigationItemActions.MOVE_DOWN,- SidePanelNavigationItemActions.ADD_BEFORE,- SidePanelNavigationItemActions.ADD_AFTER,- SidePanelNavigationItemActions.REMOVE,- ];--const ORGANIZE_ACTIONS_WITH_MOVE_TO_FOLDER: SidePanelNavigationItemActions[] = [- SidePanelNavigationItemActions.MOVE_UP,- SidePanelNavigationItemActions.MOVE_DOWN,- SidePanelNavigationItemActions.MOVE_TO_FOLDER,- SidePanelNavigationItemActions.ADD_BEFORE,- SidePanelNavigationItemActions.ADD_AFTER,- SidePanelNavigationItemActions.REMOVE,-];--export const getOrganizeActionsSelectableItemIds = (- includeMoveToFolder: boolean,-): SidePanelNavigationItemActions[] =>- includeMoveToFolder- ? ORGANIZE_ACTIONS_WITH_MOVE_TO_FOLDER- : ORGANIZE_ACTIONS_WITHOUT_MOVE_TO_FOLDER;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/utils/getAvailableObjectMetadataForNewSidebarItem.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/getAvailableObjectMetadataForNewSidebarItem.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/utils/getAvailableObjectMetadataForNewSidebarItem.tsdiff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/isViewDisplayableInNavigationMenu.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/utils/isViewDisplayableInNavigationMenu.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/utils/isViewDisplayableInNavigationMenu.tsrename to packages/twenty-front/src/modules/navigation-menu-item/edit/utils/isViewDisplayableInNavigationMenu.tsdiff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.tsindex 7cefd2565d7..3b84ec96c17 100644--- a/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useUpdateOneObjectMetadataItem.ts@@ -27,12 +27,28 @@ export const useUpdateOneObjectMetadataItem = () => {const { updateInDraft, replaceDraft, applyChanges } =useUpdateMetadataStoreDraft();+ const refetchCommandMenuItems = async () => {+ const commandMenuItemsResult = await client.query({+ query: FindManyCommandMenuItemsDocument,+ fetchPolicy: 'network-only',+ });++ replaceDraft(+ 'commandMenuItems',+ commandMenuItemsResult.data?.commandMenuItems ?? [],+ );+ applyChanges();+ };+const updateOneObjectMetadataItem = async ({idToUpdate,updatePayload,+ shouldRefetchCommandMenuItems = true,}: {idToUpdate: UpdateOneObjectInput['id'];updatePayload: UpdateOneObjectInput['update'];+ // Callers updating several objects at once refetch once at the end instead.+ shouldRefetchCommandMenuItems?: boolean;}): Promise<MetadataRequestResult<Awaited<ReturnType<typeof updateOneObjectMetadataItemMutation>>@@ -56,16 +72,9 @@ export const useUpdateOneObjectMetadataItem = () => {]);applyChanges();- const commandMenuItemsResult = await client.query({- query: FindManyCommandMenuItemsDocument,- fetchPolicy: 'network-only',- });-- replaceDraft(- 'commandMenuItems',- commandMenuItemsResult.data?.commandMenuItems ?? [],- );- applyChanges();+ if (shouldRefetchCommandMenuItems) {+ await refetchCommandMenuItems();+ }}return {@@ -91,6 +100,7 @@ export const useUpdateOneObjectMetadataItem = () => {return {updateOneObjectMetadataItem,+ refetchCommandMenuItems,loading,};};diff --git a/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsSelector.ts b/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsSelector.tsindex 8150763b178..6d038494e3c 100644--- a/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsSelector.ts+++ b/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsSelector.ts@@ -1,3 +1,5 @@+import { objectColorsDraftState } from '@/layout-customization/states/objectColorsDraftState';+import { isDefined } from 'twenty-shared/utils';import { objectMetadataItemsWithFieldsSelector } from '@/object-metadata/states/objectMetadataItemsWithFieldsSelector';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';@@ -6,5 +8,16 @@ export const objectMetadataItemsSelector = createAtomSelector<EnrichedObjectMetadataItem[]>({key: 'objectMetadataItemsSelector',- get: ({ get }) => get(objectMetadataItemsWithFieldsSelector),+ get: ({ get }) => {+ const objectMetadataItems = get(objectMetadataItemsWithFieldsSelector);+ const objectColorsDraft = get(objectColorsDraftState);+ if (Object.keys(objectColorsDraft).length === 0) {+ return objectMetadataItems;+ }+ return objectMetadataItems.map((object) => {+ const draftColor = objectColorsDraft[object.id];++ return isDefined(draftColor) ? { ...object, color: draftColor } : object;+ });+ },});diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/__tests__/ObjectFilterDropdownOptionSelect.test.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/__tests__/ObjectFilterDropdownOptionSelect.test.tsxindex b961d84910c..75440f11747 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/__tests__/ObjectFilterDropdownOptionSelect.test.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/__tests__/ObjectFilterDropdownOptionSelect.test.tsx@@ -27,7 +27,10 @@ jest.mock('@/ui/layout/dropdown/hooks/useCloseDropdown', () => ({}));jest.mock('@/ui/layout/selectable-list/hooks/useSelectableList', () => ({- useSelectableList: () => ({ resetSelectedItem: jest.fn() }),+ useSelectableList: () => ({+ resetSelectedItem: jest.fn(),+ setSelectedItemId: jest.fn(),+ }),}));jest.mock(diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsxindex 8aac3993009..e44a9d80ce6 100644--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx@@ -112,7 +112,6 @@ export const ObjectSortDropdownButton = () => {const handleDropdownOpen = () => {resetSortDropdown();- setSelectedItemId(selectableItemIdArray[0]);};const { closeSortDropdown } = useCloseSortDropdown();@@ -158,11 +157,6 @@ export const ObjectSortDropdownButton = () => {dropdownId,);- const setSelectedItemId = useSetAtomComponentState(- selectedItemIdComponentState,- dropdownId,- );-const shouldShowHiddenFields = hiddenFieldMetadataItemsSorted.length > 0;const shouldShowVisibleFields = visibleFieldMetadataItems.length > 0;diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsxindex fa47b9cbb14..e0f6afaa41d 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/components/SingleRecordPickerMenuItems.tsx@@ -1,3 +1,4 @@+import { isDefined } from 'twenty-shared/utils';import { isUndefined } from '@sniptt/guards';import { Key } from 'ts-key-enum';@@ -95,6 +96,9 @@ export const SingleRecordPickerMenuItems = ({selectableListInstanceId={selectableListComponentInstanceId}selectableItemIdArray={selectableItemIds}focusId={focusId}+ // The empty option leads the list, so preselecting it would make Enter+ // detach the relation instead of picking a record.+ shouldPreselectFirstItem={!isDefined(emptyLabel)}>{emptyLabel && (<SelectableListItemdiff --git a/packages/twenty-front/src/modules/page-layout/graphql/queries/findAllStandalonePageLayouts.ts b/packages/twenty-front/src/modules/page-layout/graphql/queries/findAllStandalonePageLayouts.tsnew file mode 100644index 00000000000..500573181d1--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/graphql/queries/findAllStandalonePageLayouts.ts@@ -0,0 +1,10 @@+import { gql } from '@apollo/client';++export const FIND_ALL_STANDALONE_PAGE_LAYOUTS = gql`+ query FindAllStandalonePageLayouts {+ getPageLayouts(pageLayoutType: STANDALONE_PAGE) {+ id+ name+ }+ }+`;diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelAddToNavigationDroppable.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelAddToNavigationDroppable.tsxdeleted file mode 100644index de7a2f0cb18..00000000000--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelAddToNavigationDroppable.tsx+++ /dev/null@@ -1,38 +0,0 @@-import { lazy, Suspense, useContext, type ReactNode } from 'react';--import { ADD_TO_NAV_SOURCE_DROPPABLE_ID } from '@/navigation-menu-item/common/constants/AddToNavSourceDroppableId';-import { NavigationDragSourceContext } from '@/navigation-menu-item/common/contexts/NavigationDragSourceContext';--import type { AddToNavDroppableProvided } from '@/command-menu/components/CommandMenuAddToNavDroppableTypes';--const FALLBACK_PROVIDED: AddToNavDroppableProvided = {- innerRef: () => {},- droppableProps: {},- placeholder: null,-};--const CommandMenuAddToNavDroppableDndKit = lazy(() =>- import('@/command-menu/components/CommandMenuAddToNavDroppableDndKit').then(- (m) => ({ default: m.CommandMenuAddToNavDroppableDndKit }),- ),-);--type SidePanelAddToNavigationDroppableProps = {- children: (provided: AddToNavDroppableProvided) => ReactNode;-};--export const SidePanelAddToNavigationDroppable = ({- children,-}: SidePanelAddToNavigationDroppableProps) => {- const { sourceDroppableId } = useContext(NavigationDragSourceContext);- const isDropDisabled = sourceDroppableId === ADD_TO_NAV_SOURCE_DROPPABLE_ID;-- return (- <Suspense fallback={children(FALLBACK_PROVIDED)}>- <CommandMenuAddToNavDroppableDndKit- children={children}- isDropDisabled={isDropDisabled}- />- </Suspense>- );-};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsxdeleted file mode 100644index 3b2c74a14c5..00000000000--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx+++ /dev/null@@ -1,109 +0,0 @@-import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';-import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { useIcons } from 'twenty-ui/icon';--import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { useNavigationMenuItemEditSectionItems } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems';-import { useNavigationMenuItemTitleEdit } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemTitleEdit';-import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';-import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoSelector';-import { sidePanelShouldFocusTitleInputComponentState } from '@/side-panel/states/sidePanelShouldFocusTitleInputComponentState';-import { IconPicker } from '@/ui/input/components/IconPicker';-import { TitleInput } from '@/ui/input/components/TitleInput';-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';--const StyledClickableIconWrapper = styled.div`- cursor: pointer;-`;--export const SidePanelFolderInfo = () => {- const { t } = useLingui();- const { getIcon } = useIcons();- const sidePanelPageInfo = useAtomStateValue(sidePanelPageInfoSelector);- const [sidePanelShouldFocusTitleInput, setSidePanelShouldFocusTitleInput] =- useAtomComponentState(- sidePanelShouldFocusTitleInputComponentState,- sidePanelPageInfo.instanceId,- );- const selectedNavigationMenuItemIdInEditMode = useAtomStateValue(- selectedNavigationMenuItemIdInEditModeState,- );- const items = useNavigationMenuItemEditSectionItems();- const { updateItem } = useNavigationMenuItemEditController();-- const defaultLabel = t`New folder`;- const placeholder = t`Folder name`;-- const selectedItem = selectedNavigationMenuItemIdInEditMode- ? items.find(- (item) =>- item.type === NavigationMenuItemType.FOLDER &&- item.id === selectedNavigationMenuItemIdInEditMode,- )- : undefined;-- const { value, handleChange, handleSave } = useNavigationMenuItemTitleEdit({- itemId: selectedItem?.id ?? null,- itemName: selectedItem?.name ?? defaultLabel,- defaultLabel,- persistName: (name) => {- if (isDefined(selectedItem)) {- void updateItem(selectedItem.id, { name });- }- },- });-- if (!isDefined(selectedItem)) return null;-- const selectedIconKey = selectedItem.icon ?? FOLDER_ICON_DEFAULT;- const FolderIconComponent = getIcon(selectedIconKey);-- return (- <HeaderIdentifier- icon={- <IconPicker- dropdownId="side-panel-folder-icon-picker"- selectedIconKey={selectedIconKey}- onChange={({ iconKey }) =>- void updateItem(selectedItem.id, { icon: iconKey })- }- clickableComponent={- <StyledClickableIconWrapper>- <ColoredIcon- Icon={FolderIconComponent}- color={- selectedItem.color ??- DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER- }- />- </StyledClickableIconWrapper>- }- />- }- title={- <TitleInput- instanceId={`folder-name-${selectedItem.id}`}- sizeVariant="sm"- value={value}- onChange={handleChange}- placeholder={placeholder}- onEnter={handleSave}- onEscape={handleSave}- onClickOutside={handleSave}- onTab={handleSave}- onShiftTab={handleSave}- shouldFocus={sidePanelShouldFocusTitleInput}- onFocus={() => setSidePanelShouldFocusTitleInput(false)}- />- }- label={t`Folder`}- />- );-};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsxdeleted file mode 100644index 2e79ce6167c..00000000000--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelItemWithAddToNavigationDrag.tsx+++ /dev/null@@ -1,137 +0,0 @@-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { type ReactNode, lazy, Suspense, useState } from 'react';-import { isDefined } from 'twenty-shared/utils';-import { type IconComponent } from 'twenty-ui/icon';--import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { addToNavPayloadRegistryState } from '@/navigation-menu-item/common/states/addToNavPayloadRegistryState';-import { navigationMenuItemEditSectionState } from '@/navigation-menu-item/common/states/navigationMenuItemEditSectionState';-import type { AddToNavigationDragPayload } from '@/navigation-menu-item/common/types/add-to-navigation-drag-payload';-import { AddToNavigationDragHandle } from '@/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';--const CommandMenuItemWithAddToNavigationDragDndKit = lazy(() =>- import('@/command-menu/components/CommandMenuItemWithAddToNavigationDragDndKit').then(- (m) => ({- default: m.CommandMenuItemWithAddToNavigationDragDndKit,- }),- ),-);--type SidePanelItemWithAddToNavigationDragProps = {- icon?: IconComponent;- customIconContent?: ReactNode;- label: string;- description?: string;- id: string;- onClick: () => void;- payload: AddToNavigationDragPayload;- dragIndex?: number;- disabled?: boolean;- disableDrag?: boolean;-};--const StyledDraggableMenuItem = styled.div<{- $disabled?: boolean;- $disableDrag?: boolean;-}>`- cursor: ${({ $disabled, $disableDrag }) =>- $disabled || $disableDrag ? 'default' : 'grab'};- pointer-events: ${({ $disabled }) => ($disabled ? 'none' : 'auto')};- width: 100%;-- &:active {- cursor: ${({ $disabled, $disableDrag }) =>- $disabled || $disableDrag ? 'default' : 'grabbing'};- }-`;--export const SidePanelItemWithAddToNavigationDrag = ({- icon,- customIconContent,- label,- description,- id,- onClick,- payload,- dragIndex,- disabled = false,- disableDrag = false,-}: SidePanelItemWithAddToNavigationDragProps) => {- const { t } = useLingui();- const setAddToNavPayloadRegistry = useSetAtomState(- addToNavPayloadRegistryState,- );- const navigationMenuItemEditSection = useAtomStateValue(- navigationMenuItemEditSectionState,- );- const [isHovered, setIsHovered] = useState(false);-- // Favorites are added by click only; drag-to-add targets the workspace- // sidebar and runs through layout-customization mode.- const effectiveDisableDrag =- disableDrag || navigationMenuItemEditSection === 'favorite';- const showDragAffordance = !disabled && !effectiveDisableDrag && isHovered;- const contextualDescription = showDragAffordance- ? t`Drag to add to navbar`- : description;-- const DragHandleIcon = () => (- <AddToNavigationDragHandle- icon={icon}- customIconContent={customIconContent}- payload={payload}- isHovered={showDragAffordance}- disabled={disabled}- disableDrag={effectiveDisableDrag}- />- );-- const registerPayload = () => {- if (!disabled && !effectiveDisableDrag && isDefined(dragIndex)) {- setAddToNavPayloadRegistry((prev) => new Map(prev).set(id, payload));- }- };-- const menuItemContent = (- <StyledDraggableMenuItem- $disabled={disabled}- $disableDrag={effectiveDisableDrag}- onMouseEnter={() => {- if (!disabled && !effectiveDisableDrag) {- setIsHovered(true);- registerPayload();- }- }}- onMouseLeave={() => {- if (!disabled && !effectiveDisableDrag) setIsHovered(false);- }}- onMouseDown={registerPayload}- >- <CommandMenuItem- Icon={DragHandleIcon}- label={label}- description={contextualDescription}- id={id}- onClick={onClick}- disabled={disabled}- />- </StyledDraggableMenuItem>- );-- if (!isDefined(dragIndex) || effectiveDisableDrag) {- return menuItemContent;- }-- return (- <Suspense fallback={menuItemContent}>- <CommandMenuItemWithAddToNavigationDragDndKit- id={id}- dragIndex={dragIndex}- menuItemContent={menuItemContent}- />- </Suspense>- );-};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsxdeleted file mode 100644index f40f9abc25d..00000000000--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelLinkInfo.tsx+++ /dev/null@@ -1,85 +0,0 @@-import { useLingui } from '@lingui/react/macro';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { IconLink, IconWorld } from 'twenty-ui/icon';--import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { LinkIconWithLinkOverlay } from '@/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay';-import { useNavigationMenuItemEditSectionItems } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems';-import { useNavigationMenuItemTitleEdit } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemTitleEdit';-import { useNavigationMenuItemEditController } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController';-import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';-import { sidePanelPageInfoSelector } from '@/side-panel/states/sidePanelPageInfoSelector';-import { sidePanelShouldFocusTitleInputComponentState } from '@/side-panel/states/sidePanelShouldFocusTitleInputComponentState';-import { TitleInput } from '@/ui/input/components/TitleInput';-import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';--export const SidePanelLinkInfo = () => {- const { t } = useLingui();- const sidePanelPageInfo = useAtomStateValue(sidePanelPageInfoSelector);- const [sidePanelShouldFocusTitleInput, setSidePanelShouldFocusTitleInput] =- useAtomComponentState(- sidePanelShouldFocusTitleInputComponentState,- sidePanelPageInfo.instanceId,- );- const selectedNavigationMenuItemIdInEditMode = useAtomStateValue(- selectedNavigationMenuItemIdInEditModeState,- );- const items = useNavigationMenuItemEditSectionItems();- const { updateItem } = useNavigationMenuItemEditController();-- const defaultLabel = t`Link label`;- const placeholder = t`Link label`;-- const selectedItem = selectedNavigationMenuItemIdInEditMode- ? items.find(- (item) =>- item.type === NavigationMenuItemType.LINK &&- item.id === selectedNavigationMenuItemIdInEditMode,- )- : undefined;-- const { value, handleChange, handleSave } = useNavigationMenuItemTitleEdit({- itemId: selectedItem?.id ?? null,- itemName: selectedItem?.name ?? defaultLabel,- defaultLabel,- persistName: (name) => {- if (isDefined(selectedItem)) {- void updateItem(selectedItem.id, { name });- }- },- });-- if (!isDefined(selectedItem)) return null;-- return (- <HeaderIdentifier- icon={- <LinkIconWithLinkOverlay- link={selectedItem.link}- LinkIcon={IconLink}- DefaultIcon={IconWorld}- color={selectedItem.color}- />- }- title={- <TitleInput- instanceId={`link-label-${selectedItem.id}`}- sizeVariant="sm"- value={value}- onChange={handleChange}- placeholder={placeholder}- onEnter={handleSave}- onEscape={handleSave}- onClickOutside={handleSave}- onTab={handleSave}- onShiftTab={handleSave}- shouldFocus={sidePanelShouldFocusTitleInput}- onFocus={() => setSidePanelShouldFocusTitleInput(false)}- />- }- label={t`Link`}- />- );-};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsxdeleted file mode 100644index ebfcb2dc407..00000000000--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectViewRecordInfo.tsx+++ /dev/null@@ -1,50 +0,0 @@-import { useLingui } from '@lingui/react/macro';--import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';-import { NavigationMenuItemIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemIcon';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItem';-import { useSelectedNavigationMenuItemEditItemLabel } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel';-import { useSelectedNavigationMenuItemEditItemObjectMetadata } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemObjectMetadata';--export const SidePanelObjectViewRecordInfo = () => {- const { t } = useLingui();- const { selectedItem } = useSelectedNavigationMenuItemEditItem();- const { selectedItemLabel } = useSelectedNavigationMenuItemEditItemLabel();- const { selectedItemObjectMetadata } =- useSelectedNavigationMenuItemEditItemObjectMetadata();-- const navItem =- selectedItem && selectedItem.type !== NavigationMenuItemType.FOLDER- ? selectedItem- : undefined;-- if (!navItem || !selectedItemLabel) {- return null;- }-- const isObjectViewOrRecord = [- NavigationMenuItemType.OBJECT,- NavigationMenuItemType.VIEW,- NavigationMenuItemType.RECORD,- ].includes(navItem.type);-- if (!isObjectViewOrRecord) {- return null;- }-- const label =- navItem.type === NavigationMenuItemType.RECORD- ? selectedItemObjectMetadata?.labelSingular- : navItem.type === NavigationMenuItemType.OBJECT- ? t`Object`- : t`View`;-- return (- <HeaderIdentifier- icon={<NavigationMenuItemIcon navigationMenuItem={navItem} />}- title={selectedItemLabel}- label={label}- />- );-};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsxindex 5d0a618c50a..3c16714bcc0 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx@@ -1,64 +1,24 @@import { isDefined } from 'twenty-shared/utils';-import { IconColumnInsertRight } from 'twenty-ui/icon';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { useNavigationMenuItemEditSectionItems } from '@/navigation-menu-item/edit/hooks/useNavigationMenuItemEditSectionItems';import { SidePanelAskAiInfo } from '@/side-panel/components/SidePanelAskAiInfo';-import { SidePanelFolderInfo } from '@/side-panel/components/SidePanelFolderInfo';-import { SidePanelLinkInfo } from '@/side-panel/components/SidePanelLinkInfo';import { SidePanelMultipleRecordsInfo } from '@/side-panel/components/SidePanelMultipleRecordsInfo';-import { SidePanelObjectViewRecordInfo } from '@/side-panel/components/SidePanelObjectViewRecordInfo';import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';import { SidePanelPageLayoutInfo } from '@/side-panel/components/SidePanelPageLayoutInfo';import { SidePanelWorkflowStepInfo } from '@/side-panel/components/SidePanelWorkflowStepInfo';import { isPageLayoutSidePanelPage } from '@/side-panel/pages/page-layout/utils/isPageLayoutSidePanelPage';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { NavigationMenuItemType, SidePanelPages } from 'twenty-shared/types';+import { SidePanelPages } from 'twenty-shared/types';import { type SidePanelContextChipProps } from '@/side-panel/components/SidePanelContextChip';-import { useContext } from 'react';-import { ThemeContext } from 'twenty-ui/theme-constants';type SidePanelPageInfoProps = {pageChip: SidePanelContextChipProps | undefined;};export const SidePanelPageInfo = ({ pageChip }: SidePanelPageInfoProps) => {- const { theme } = useContext(ThemeContext);- const selectedNavigationMenuItemIdInEditMode = useAtomStateValue(- selectedNavigationMenuItemIdInEditModeState,- );- const items = useNavigationMenuItemEditSectionItems();if (!isDefined(pageChip)) {return null;}- const isNavigationMenuItemEditPage =- pageChip.page?.page === SidePanelPages.NavigationMenuItemEdit;- const selectedNavItem = isNavigationMenuItemEditPage- ? items.find((item) => item.id === selectedNavigationMenuItemIdInEditMode)- : undefined;-- if (isNavigationMenuItemEditPage && isDefined(selectedNavItem)) {- const navItemType = selectedNavItem.type;-- if (navItemType === NavigationMenuItemType.FOLDER) {- return <SidePanelFolderInfo />;- }-- if (navItemType === NavigationMenuItemType.LINK) {- return <SidePanelLinkInfo />;- }-- if (- navItemType === NavigationMenuItemType.OBJECT ||- navItemType === NavigationMenuItemType.VIEW ||- navItemType === NavigationMenuItemType.RECORD- ) {- return <SidePanelObjectViewRecordInfo />;- }- }-const isWorkflowStepPage = pageChip.page?.page? [SidePanelPages.WorkflowStepEdit,@@ -101,19 +61,5 @@ export const SidePanelPageInfo = ({ pageChip }: SidePanelPageInfoProps) => {return <SidePanelAskAiInfo />;}- if (pageChip.page?.page === SidePanelPages.NavigationMenuAddItem) {- return (- <HeaderIdentifier- icon={- <IconColumnInsertRight- size={theme.icon.size.md}- color={theme.font.color.tertiary}- />- }- title={pageChip.text ?? ''}- />- );- }-return <HeaderIdentifier title={pageChip.text ?? ''} />;};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelSubViewWithSearch.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelSubViewWithSearch.tsxdeleted file mode 100644index 0c701d31b06..00000000000--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelSubViewWithSearch.tsx+++ /dev/null@@ -1,86 +0,0 @@-import { styled } from '@linaria/react';-import { type ReactNode } from 'react';--import { themeCssVariables } from 'twenty-ui/theme-constants';--const StyledSubViewContainer = styled.div`- display: flex;- flex-direction: column;- height: 100%;- min-height: 0;- overflow: hidden;-`;--const StyledSearchContainer = styled.div`- align-items: center;- border-bottom: 1px solid ${themeCssVariables.border.color.light};- display: flex;- height: ${themeCssVariables.spacing[10]};- min-width: 0;- padding-inline: ${themeCssVariables.spacing[3]};-`;--const StyledSearchInput = styled.input`- background: transparent;- border: none;- border-radius: 0;- box-sizing: border-box;-- min-width: 0;- outline: none;- overflow: hidden;- padding: 0;- width: 100%;-- &::placeholder {- color: ${themeCssVariables.font.color.tertiary};- }-`;--const StyledScrollableListWrapper = styled.div`- display: flex;- flex: 1;- flex-direction: column;- min-height: 0;- overflow: hidden;-- & > * {- flex: 1;- min-height: 0;- }-`;--type SidePanelSubViewWithSearchProps = {- searchPlaceholder: string;- searchValue: string;- onSearchChange: (value: string) => void;- searchInputProps?: React.InputHTMLAttributes<HTMLInputElement>;- rightElement?: ReactNode;- children?: ReactNode;-};--export const SidePanelSubViewWithSearch = ({- searchPlaceholder,- searchValue,- onSearchChange,- searchInputProps,- rightElement,- children,-}: SidePanelSubViewWithSearchProps) => (- <StyledSubViewContainer>- <StyledSearchContainer>- <StyledSearchInput- placeholder={searchPlaceholder}- value={searchValue}- onChange={(event) => onSearchChange(event.target.value)}- autoFocus- // oxlint-disable-next-line react/jsx-props-no-spreading- {...searchInputProps}- />- {rightElement}- </StyledSearchContainer>- {children != null && (- <StyledScrollableListWrapper>{children}</StyledScrollableListWrapper>- )}- </StyledSubViewContainer>-);diff --git a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsxindex aed88c8cd2a..a0972d97a60 100644--- a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx+++ b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx@@ -1,12 +1,10 @@import { SidePanelCommandMenuItemDisplayPage } from '@/command-menu-item/display/components/SidePanelCommandMenuItemDisplayPage';import { SidePanelCommandMenuItemEditPage } from '@/command-menu-item/edit/components/SidePanelCommandMenuItemEditPage';-import { SidePanelNavigationMenuItemEditPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage';import { SidePanelCoreWorkflowFiltersPage } from '@/object-core/workflows/components/SidePanelCoreWorkflowFiltersPage';import { SidePanelCoreWorkflowVersionPage } from '@/object-core/workflows/versions/components/SidePanelCoreWorkflowVersionPage';import { SidePanelCoreWorkflowVersionsPage } from '@/object-core/workflows/versions/components/SidePanelCoreWorkflowVersionsPage';import { SidePanelSettingsMetadataTranslationsPage } from '@/settings/translations/components/SidePanelSettingsMetadataTranslationsPage';import { SidePanelRoutedPage } from '@/side-panel/routing/components/SidePanelRoutedPage';-import { SidePanelNewSidebarItemPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemPage';import { SidePanelEmailBlockSettingsPage } from '@/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage';import { SidePanelAskAiPage } from '@/side-panel/pages/ask-ai/components/SidePanelAskAiPage';import { SidePanelComposeEmailPage } from '@/side-panel/pages/compose-email/components/SidePanelComposeEmailPage';@@ -90,11 +88,6 @@ export const SIDE_PANEL_PAGES_CONFIG = new Map<SidePanelPages.PageLayoutRecordPageWidgetTypeSelect,<SidePanelPageLayoutRecordPageWidgetTypeSelect />,],- [- SidePanelPages.NavigationMenuItemEdit,- <SidePanelNavigationMenuItemEditPage />,- ],- [SidePanelPages.NavigationMenuAddItem, <SidePanelNewSidebarItemPage />],[SidePanelPages.CommandMenuEdit, <SidePanelCommandMenuItemEditPage />],[SidePanelPages.ComposeCalendarEvent, <SidePanelComposeCalendarEventPage />],[SidePanelPages.ComposeEmail, <SidePanelComposeEmailPage />],diff --git a/packages/twenty-front/src/modules/side-panel/constants/SidePanelSubPagesConfig.tsx b/packages/twenty-front/src/modules/side-panel/constants/SidePanelSubPagesConfig.tsxindex 75a7a98e666..434fd69b14d 100644--- a/packages/twenty-front/src/modules/side-panel/constants/SidePanelSubPagesConfig.tsx+++ b/packages/twenty-front/src/modules/side-panel/constants/SidePanelSubPagesConfig.tsx@@ -1,11 +1,3 @@-import { SidePanelEditFolderPickerSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage';-import { SidePanelNewSidebarItemPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemPage';-import { SidePanelNewSidebarItemObjectSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSubPage';-import { SidePanelNewSidebarItemObjectSystemPickerSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemObjectSystemPickerSubPage';-import { SidePanelNewSidebarItemRecordSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemRecordSubPage';-import { SidePanelNewSidebarItemViewObjectPickerSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubPage';-import { SidePanelNewSidebarItemViewPickerSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewPickerSubPage';-import { SidePanelNewSidebarItemViewSystemPickerSubPage } from '@/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemPickerSubPage';import { SidePanelChartFilterSubPage } from '@/side-panel/pages/page-layout/components/SidePanelChartFilterSubPage';import { SidePanelFieldRelationTableFieldsSubPage } from '@/side-panel/pages/page-layout/components/SidePanelFieldRelationTableFieldsSubPage';import { SidePanelFieldsLayoutSubPage } from '@/side-panel/pages/page-layout/components/SidePanelFieldsLayoutSubPage';@@ -20,7 +12,6 @@ export const SIDE_PANEL_SUB_PAGES_CONFIG = new Map<>([[SidePanelSubPages.PageLayoutGraphFilter, <SidePanelChartFilterSubPage />],[SidePanelSubPages.PageLayoutFieldsLayout, <SidePanelFieldsLayoutSubPage />],- [SidePanelSubPages.NewSidebarItemMainMenu, <SidePanelNewSidebarItemPage />],[SidePanelSubPages.PageLayoutRecordTableFilter,<SidePanelRecordTableFilterSubPage />,@@ -33,29 +24,4 @@ export const SIDE_PANEL_SUB_PAGES_CONFIG = new Map<SidePanelSubPages.PageLayoutFieldRelationTableFields,<SidePanelFieldRelationTableFieldsSubPage />,],- [- SidePanelSubPages.NewSidebarItemViewObjectPicker,- <SidePanelNewSidebarItemViewObjectPickerSubPage />,- ],- [- SidePanelSubPages.NewSidebarItemViewPicker,- <SidePanelNewSidebarItemViewPickerSubPage />,- ],- [- SidePanelSubPages.NewSidebarItemViewSystemPicker,- <SidePanelNewSidebarItemViewSystemPickerSubPage />,- ],- [- SidePanelSubPages.NewSidebarItemObjectPicker,- <SidePanelNewSidebarItemObjectSubPage />,- ],- [- SidePanelSubPages.NewSidebarItemObjectSystemPicker,- <SidePanelNewSidebarItemObjectSystemPickerSubPage />,- ],- [- SidePanelSubPages.NewSidebarItemRecord,- <SidePanelNewSidebarItemRecordSubPage />,- ],- [SidePanelSubPages.EditFolderPicker, <SidePanelEditFolderPickerSubPage />],]);diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.ts b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.tsindex 75feca724f8..29960030847 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.ts+++ b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelCloseAnimationCompleteCleanup.ts@@ -1,9 +1,5 @@import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';-import { addToNavPayloadRegistryState } from '@/navigation-menu-item/common/states/addToNavPayloadRegistryState';-import { navigationMenuItemEditSectionState } from '@/navigation-menu-item/common/states/navigationMenuItemEditSectionState';-import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';@@ -106,10 +102,6 @@ export const useSidePanelCloseAnimationCompleteCleanup = () => {removedItems: currentNavigationStack,remainingItems: [],});- store.set(selectedNavigationMenuItemIdInEditModeState.atom, null);- store.set(pendingInsertionNavigationMenuItemState.atom, null);- store.set(navigationMenuItemEditSectionState.atom, 'workspace');- store.set(addToNavPayloadRegistryState.atom, new Map());resetSelectedItem();store.set(hasUserSelectedSidePanelListItemState.atom, false);diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelFilteredPickerItems.ts b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelFilteredPickerItems.tsdeleted file mode 100644index bf672c8e601..00000000000--- a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelFilteredPickerItems.ts+++ /dev/null@@ -1,43 +0,0 @@-import { filterBySearchQuery } from '~/utils/filterBySearchQuery';--type UseSidePanelFilteredPickerItemsParams<T> = {- items: T[];- searchQuery: string;- getSearchableValues: (item: T) => string[];- appendSelectableIds?: string[];-};--type UseSidePanelFilteredPickerItemsResult<T> = {- filteredItems: T[];- selectableItemIds: string[];- isEmpty: boolean;- hasSearchQuery: boolean;-};--export const useSidePanelFilteredPickerItems = <T extends { id: string }>({- items,- searchQuery,- getSearchableValues,- appendSelectableIds = [],-}: UseSidePanelFilteredPickerItemsParams<T>): UseSidePanelFilteredPickerItemsResult<T> => {- const filteredItems = filterBySearchQuery({- items,- searchQuery,- getSearchableValues,- });-- const selectableItemIds =- filteredItems.length > 0- ? [...filteredItems.map((item) => item.id), ...appendSelectableIds]- : appendSelectableIds;-- const isEmpty = filteredItems.length === 0;- const hasSearchQuery = searchQuery.trim().length > 0;-- return {- filteredItems,- selectableItemIds,- isEmpty,- hasSearchQuery,- };-};diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.tsindex 296f42063d3..4ec88d88d4e 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts+++ b/packages/twenty-front/src/modules/side-panel/hooks/useSidePanelMenu.ts@@ -1,7 +1,6 @@import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';import { useResetRecordIndexSelection } from '@/object-record/record-index/hooks/useResetRecordIndexSelection';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';import { isSidePanelClosingState } from '@/side-panel/states/isSidePanelClosingState';@@ -16,8 +15,7 @@ import { t } from '@lingui/core/macro';import { useStore } from 'jotai';import { useCallback } from 'react';import { SidePanelPages } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';-import { IconColumnInsertRight, IconDotsVertical } from 'twenty-ui/icon';+import { IconDotsVertical } from 'twenty-ui/icon';export const useSidePanelMenu = () => {const store = useStore();@@ -66,38 +64,12 @@ export const useSidePanelMenu = () => {store.set(sidePanelSearchState.atom, '');store.set(sidePanelSearchObjectFilterState.atom, null);- const isLayoutCustomizationModeEnabled = store.get(- isLayoutCustomizationModeEnabledState.atom,- );-- const selectedNavigationItemId = store.get(- selectedNavigationMenuItemIdInEditModeState.atom,- );- if (- isLayoutCustomizationModeEnabled &&- isDefined(selectedNavigationItemId)- ) {- navigateSidePanel({- page: SidePanelPages.NavigationMenuItemEdit,- pageTitle: t`Edit`,- pageIcon: IconDotsVertical,- resetNavigationStack: true,- });- } else if (isLayoutCustomizationModeEnabled) {- navigateSidePanel({- page: SidePanelPages.NavigationMenuAddItem,- pageTitle: t`New menu item`,- pageIcon: IconColumnInsertRight,- resetNavigationStack: true,- });- } else {- navigateSidePanel({- page: SidePanelPages.CommandMenuDisplay,- pageTitle: t`Command Menu`,- pageIcon: IconDotsVertical,- resetNavigationStack: true,- });- }+ navigateSidePanel({+ page: SidePanelPages.CommandMenuDisplay,+ pageTitle: t`Command Menu`,+ pageIcon: IconDotsVertical,+ resetNavigationStack: true,+ });}, [closeAnyOpenDropdown, navigateSidePanel, store]);const navigateSidePanelMenu = navigateSidePanel;diff --git a/packages/twenty-front/src/modules/side-panel/states/selectedObjectMetadataIdForViewFlowState.ts b/packages/twenty-front/src/modules/side-panel/states/selectedObjectMetadataIdForViewFlowState.tsdeleted file mode 100644index 2d4719ede5e..00000000000--- a/packages/twenty-front/src/modules/side-panel/states/selectedObjectMetadataIdForViewFlowState.ts+++ /dev/null@@ -1,9 +0,0 @@-import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';--export const selectedObjectMetadataIdForViewFlowState =- createAtomComponentState<string | null>({- key: 'side-panel/selected-object-metadata-id-for-view-flow',- defaultValue: null,- componentInstanceContext: SidePanelPageComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/side-panel/types/SidePanelSubPages.ts b/packages/twenty-front/src/modules/side-panel/types/SidePanelSubPages.tsindex c4553174a96..6412f20ecd6 100644--- a/packages/twenty-front/src/modules/side-panel/types/SidePanelSubPages.ts+++ b/packages/twenty-front/src/modules/side-panel/types/SidePanelSubPages.ts@@ -4,12 +4,4 @@ export enum SidePanelSubPages {PageLayoutRecordTableFilter = 'page-layout-record-table-filter',PageLayoutRecordTableSort = 'page-layout-record-table-sort',PageLayoutFieldRelationTableFields = 'page-layout-field-relation-table-fields',- NewSidebarItemMainMenu = 'new-sidebar-item-main-menu',- NewSidebarItemViewObjectPicker = 'new-sidebar-item-view-object-picker',- NewSidebarItemViewPicker = 'new-sidebar-item-view-picker',- NewSidebarItemViewSystemPicker = 'new-sidebar-item-view-system-picker',- NewSidebarItemObjectPicker = 'new-sidebar-item-object-picker',- NewSidebarItemObjectSystemPicker = 'new-sidebar-item-object-system-picker',- NewSidebarItemRecord = 'new-sidebar-item-record',- EditFolderPicker = 'edit-folder-picker',}diff --git a/packages/twenty-front/src/modules/side-panel/utils/getSidePanelSubPageTitle.ts b/packages/twenty-front/src/modules/side-panel/utils/getSidePanelSubPageTitle.tsindex 27d3b33853b..39cdea809bd 100644--- a/packages/twenty-front/src/modules/side-panel/utils/getSidePanelSubPageTitle.ts+++ b/packages/twenty-front/src/modules/side-panel/utils/getSidePanelSubPageTitle.ts@@ -16,22 +16,6 @@ export const getSidePanelSubPageTitle = (return t`Sorts`;case SidePanelSubPages.PageLayoutFieldRelationTableFields:return t`Fields`;- case SidePanelSubPages.NewSidebarItemMainMenu:- return t`Add menu item`;- case SidePanelSubPages.NewSidebarItemViewObjectPicker:- return t`Pick an object`;- case SidePanelSubPages.NewSidebarItemViewPicker:- return t`Pick a view`;- case SidePanelSubPages.NewSidebarItemViewSystemPicker:- return t`System objects`;- case SidePanelSubPages.NewSidebarItemObjectPicker:- return t`Pick an object`;- case SidePanelSubPages.NewSidebarItemObjectSystemPicker:- return t`System objects`;- case SidePanelSubPages.NewSidebarItemRecord:- return t`Add a record`;- case SidePanelSubPages.EditFolderPicker:- return t`Move to a folder`;default:assertUnreachable(subPage);}diff --git a/packages/twenty-front/src/modules/ui/field/input/components/DoubleTextInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/DoubleTextInput.tsxindex 5c14a0c7aad..bf6b87a462a 100644--- a/packages/twenty-front/src/modules/ui/field/input/components/DoubleTextInput.tsx+++ b/packages/twenty-front/src/modules/ui/field/input/components/DoubleTextInput.tsx@@ -35,6 +35,7 @@ type DoubleTextInputProps = {secondValue: string;firstValuePlaceholder: string;secondValuePlaceholder: string;+ selectOnFocus?: boolean;onEnter: (newDoubleTextValue: FieldDoubleText) => void;onEscape: (newDoubleTextValue: FieldDoubleText) => void;onTab?: (newDoubleTextValue: FieldDoubleText) => void;@@ -53,6 +54,7 @@ export const DoubleTextInput = ({secondValue,firstValuePlaceholder,secondValuePlaceholder,+ selectOnFocus = false,onClickOutside,onEnter,onEscape,@@ -190,6 +192,9 @@ export const DoubleTextInput = ({) => {event.stopPropagation();event.preventDefault();+ if (selectOnFocus) {+ event.currentTarget.select();+ }};return (@@ -198,7 +203,12 @@ export const DoubleTextInput = ({<StyledTextInputautoComplete="off"autoFocus- onFocus={() => setFocusPosition('left')}+ onFocus={(event) => {+ setFocusPosition('left');+ if (selectOnFocus) {+ event.currentTarget.select();+ }+ }}ref={firstValueInputRef}placeholder={firstValuePlaceholder}value={firstInternalValue}@@ -212,10 +222,18 @@ export const DoubleTextInput = ({handleOnPaste(event)}onClick={handleClickToPreventParentClickEvents}+ onMouseUp={+ selectOnFocus ? handleClickToPreventParentClickEvents : undefined+ }/><StyledTextInputautoComplete="off"- onFocus={() => setFocusPosition('right')}+ onFocus={(event) => {+ setFocusPosition('right');+ if (selectOnFocus) {+ event.currentTarget.select();+ }+ }}ref={secondValueInputRef}placeholder={secondValuePlaceholder}value={secondInternalValue}@@ -226,6 +244,9 @@ export const DoubleTextInput = ({);}}onClick={handleClickToPreventParentClickEvents}+ onMouseUp={+ selectOnFocus ? handleClickToPreventParentClickEvents : undefined+ }/></StyledContainer></FieldInputContainer>diff --git a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsxindex aebc27a7641..e6817f043f5 100644--- a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx+++ b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx@@ -34,6 +34,7 @@ export type TextInputProps = {instanceId: string;placeholder?: string;autoFocus?: boolean;+ selectOnFocus?: boolean;value: string;onEnter?: (newText: string) => void;onEscape?: (newText: string) => void;@@ -59,6 +60,7 @@ export const TextInput = ({instanceId,placeholder,autoFocus,+ selectOnFocus = false,value,onEnter,onEscape,@@ -105,6 +107,9 @@ export const TextInput = ({placeholder={placeholder}onChange={handleChange}autoFocus={autoFocus}+ onFocus={+ selectOnFocus ? (event) => event.currentTarget.select() : undefined+ }value={internalText}disabled={disabled}className={className}diff --git a/packages/twenty-front/src/modules/ui/field/input/components/__tests__/DoubleTextInput.test.tsx b/packages/twenty-front/src/modules/ui/field/input/components/__tests__/DoubleTextInput.test.tsxnew file mode 100644index 00000000000..6630914941a--- /dev/null+++ b/packages/twenty-front/src/modules/ui/field/input/components/__tests__/DoubleTextInput.test.tsx@@ -0,0 +1,40 @@+import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';++import { DoubleTextInput } from '@/ui/field/input/components/DoubleTextInput';++it('replaces the full label and URL when clicking into either field', async () => {+ const user = userEvent.setup();+ render(+ <DoubleTextInput+ instanceId="link-text-selection-test"+ firstValue="Eurosport"+ secondValue="https://eurosport.fr"+ firstValuePlaceholder="Link label"+ secondValuePlaceholder="URL"+ selectOnFocus+ onEnter={jest.fn()}+ onEscape={jest.fn()}+ onClickOutside={jest.fn()}+ />,+ );++ const label = screen.getByPlaceholderText('Link label');+ const url = screen.getByPlaceholderText('URL');++ await user.click(label);+ await user.keyboard('Twenty');+ expect(label).toHaveValue('Twenty');++ await user.click(label);+ await user.keyboard('Twenty CRM');+ expect(label).toHaveValue('Twenty CRM');++ await user.click(url);+ await user.keyboard('https://twenty.com');+ expect(url).toHaveValue('https://twenty.com');++ await user.tab({ shift: true });+ await user.keyboard('Updated label');+ expect(label).toHaveValue('Updated label');+});diff --git a/packages/twenty-front/src/modules/ui/input/components/ThemeColorPickerMenu.tsx b/packages/twenty-front/src/modules/ui/input/components/ThemeColorPickerMenu.tsxindex af967d13856..0d11b9f2189 100644--- a/packages/twenty-front/src/modules/ui/input/components/ThemeColorPickerMenu.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/ThemeColorPickerMenu.tsx@@ -1,3 +1,9 @@+import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';+import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';+import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';+import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponentInstanceContext';+import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';@@ -19,6 +25,14 @@ export const ThemeColorPickerMenu = ({selectedColor,onSelectColor,}: ThemeColorPickerMenuProps) => {+ const dropdownId = useAvailableComponentInstanceIdOrThrow(+ DropdownComponentInstanceContext,+ );+ const selectableListInstanceId = `${dropdownId}-colors`;+ const selectedItemId = useAtomComponentStateValue(+ selectedItemIdComponentState,+ selectableListInstanceId,+ );const [searchValue, setSearchValue] = useState('');const query = searchValue.trim().toLowerCase();@@ -39,17 +53,29 @@ export const ThemeColorPickerMenu = ({onChange={(event) => setSearchValue(event.target.value)}/><DropdownMenuSeparator />- <DropdownMenuItemsContainer hasMaxHeight>- {filteredColorNames.map((colorName) => (- <MenuItemSelectColor- key={colorName}- onClick={() => onSelectColor(colorName)}- color={colorName}- selected={colorName === selectedColor}- colorLabels={DEFAULT_COLOR_LABELS}- />- ))}- </DropdownMenuItemsContainer>+ <SelectableList+ selectableListInstanceId={selectableListInstanceId}+ focusId={dropdownId}+ selectableItemIdArray={filteredColorNames}+ >+ <DropdownMenuItemsContainer hasMaxHeight>+ {filteredColorNames.map((colorName) => (+ <SelectableListItem+ key={colorName}+ itemId={colorName}+ onEnter={() => onSelectColor(colorName)}+ >+ <MenuItemSelectColor+ focused={selectedItemId === colorName}+ onClick={() => onSelectColor(colorName)}+ color={colorName}+ selected={colorName === selectedColor}+ colorLabels={DEFAULT_COLOR_LABELS}+ />+ </SelectableListItem>+ ))}+ </DropdownMenuItemsContainer>+ </SelectableList></>);};diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsxindex 57acd5856d9..659f13e2cb2 100644--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx@@ -24,7 +24,12 @@ import {useFloating,} from '@floating-ui/react';import { styled } from '@linaria/react';-import { type MouseEvent, type ReactNode, useCallback } from 'react';+import {+ type MouseEvent,+ type ReactNode,+ useCallback,+ useLayoutEffect,+} from 'react';import { flushSync } from 'react-dom';import { type Keys } from 'react-hotkeys-hook';import { isDefined } from 'twenty-shared/utils';@@ -54,6 +59,7 @@ export type DropdownProps = {globalHotkeysConfig?: Partial<GlobalHotkeysConfig>;dropdownId: string;dropdownPlacement?: Placement;+ positionReference?: HTMLElement | null;dropdownOffset?: DropdownOffset;onClickOutside?: () => void;onClose?: () => void;@@ -76,6 +82,7 @@ export const Dropdown = ({dropdownId,globalHotkeysConfig,dropdownPlacement = 'bottom-end',+ positionReference,dropdownOffset,onClickOutside,onClose,@@ -170,6 +177,16 @@ export const Dropdown = ({strategy: 'fixed',});+ useLayoutEffect(() => {+ if (!isDefined(positionReference)) {+ return;+ }+ // Keep the original trigger for click-outside handling.+ const trigger = refs.domReference.current;+ refs.setPositionReference(positionReference);+ return () => refs.setPositionReference(trigger);+ }, [positionReference, refs]);+const handleClickableComponentClick = useCallback(async (event: MouseEvent) => {if (disableClickForClickableComponent) return;diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsx b/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsxindex 27d0422632b..1d5e23a64df 100644--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsx+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/components/SelectableList.tsx@@ -1,15 +1,9 @@-import { type ReactNode, useEffect } from 'react';+import { type ReactNode } from 'react';-import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';import { useSelectableListHotKeys } from '@/ui/layout/selectable-list/hooks/internal/useSelectableListHotKeys';+import { useSyncSelectableListItems } from '@/ui/layout/selectable-list/hooks/internal/useSyncSelectableListItems';import { SelectableListComponentInstanceContext } from '@/ui/layout/selectable-list/states/contexts/SelectableListComponentInstanceContext';import { SelectableListContextProvider } from '@/ui/layout/selectable-list/states/contexts/SelectableListContext';-import { selectableItemIdsComponentState } from '@/ui/layout/selectable-list/states/selectableItemIdsComponentState';-import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';-import { useStore } from 'jotai';-import { isDefined } from 'twenty-shared/utils';-import { arrayToChunks } from '~/utils/array/arrayToChunks';type SelectableListProps = {children: ReactNode;@@ -28,68 +22,16 @@ export const SelectableList = ({selectableListInstanceId,onSelect,focusId,- shouldPreselectFirstItem,+ shouldPreselectFirstItem = true,}: SelectableListProps) => {useSelectableListHotKeys(selectableListInstanceId, focusId, onSelect);- const store = useStore();-- const { resetSelectedItem, setSelectedItemId } = useSelectableList(- selectableListInstanceId,- );-- const setSelectableItemIds = useSetAtomComponentState(- selectableItemIdsComponentState,+ useSyncSelectableListItems({selectableListInstanceId,- );-- useEffect(() => {- if (!selectableItemIdArray && !selectableItemIdMatrix) {- throw new Error(- 'Either selectableItemIdArray or selectableItemIdsMatrix must be provided',- );- }-- if (isDefined(selectableItemIdMatrix)) {- setSelectableItemIds(selectableItemIdMatrix);- }-- if (isDefined(selectableItemIdArray)) {- setSelectableItemIds(arrayToChunks(selectableItemIdArray, 1));- }-- if (shouldPreselectFirstItem !== true) {- return;- }-- const itemIds =- selectableItemIdArray ?? selectableItemIdMatrix?.flat() ?? [];- const firstItemId = itemIds[0];-- if (!isDefined(firstItemId)) {- resetSelectedItem();- return;- }-- const selectedItemId = store.get(- selectedItemIdComponentState.atomFamily({- instanceId: selectableListInstanceId,- }),- );-- if (!isDefined(selectedItemId) || !itemIds.includes(selectedItemId)) {- setSelectedItemId(firstItemId);- }- }, [selectableItemIdArray,selectableItemIdMatrix,- selectableListInstanceId,- setSelectableItemIds,shouldPreselectFirstItem,- resetSelectedItem,- setSelectedItemId,- store,- ]);+ });return (<SelectableListComponentInstanceContext.Providerdiff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/components/__tests__/SelectableList.test.tsx b/packages/twenty-front/src/modules/ui/layout/selectable-list/components/__tests__/SelectableList.test.tsxnew file mode 100644index 00000000000..ab361f737fc--- /dev/null+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/components/__tests__/SelectableList.test.tsx@@ -0,0 +1,143 @@+import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';+import { createStore, Provider } from 'jotai';+import { StrictMode, useState } from 'react';++import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';+import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';+import { isSelectedItemIdComponentFamilyState } from '@/ui/layout/selectable-list/states/isSelectedItemIdComponentFamilyState';+import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';+import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';++const FOCUS_ID = 'menu-preselection-test';++const TestItem = ({+ label,+ onEnter,+}: {+ label: string;+ onEnter: () => void;+}) => {+ const isSelectedItemId = useAtomComponentFamilyStateValue(+ isSelectedItemIdComponentFamilyState,+ label,+ );+ return (+ <SelectableListItem itemId={label} onEnter={onEnter}>+ <button aria-pressed={isSelectedItemId}>{label}</button>+ </SelectableListItem>+ );+};++const TestMenu = ({+ onEnter,+ preselect,+}: {+ onEnter: (label: string) => void;+ preselect?: boolean;+}) => {+ const [search, setSearch] = useState('');+ const items = ['Alpha', 'Beta'].filter((label) =>+ label.toLowerCase().includes(search),+ );+ return (+ <SelectableList+ selectableListInstanceId={FOCUS_ID}+ focusId={FOCUS_ID}+ selectableItemIdArray={items}+ shouldPreselectFirstItem={preselect}+ >+ <input+ aria-label="Search"+ autoFocus+ value={search}+ onChange={(event) => setSearch(event.target.value)}+ />+ {items.map((label) => (+ <TestItem key={label} label={label} onEnter={() => onEnter(label)} />+ ))}+ </SelectableList>+ );+};++const renderMenu = (preselect?: boolean) => {+ const store = createStore();+ store.set(focusStackState.atom, [+ {+ focusId: FOCUS_ID,+ componentInstance: {+ componentType: FocusComponentType.DROPDOWN,+ componentInstanceId: FOCUS_ID,+ },+ globalHotkeysConfig: {+ enableGlobalHotkeysWithModifiers: true,+ enableGlobalHotkeysConflictingWithKeyboard: true,+ },+ },+ ]);+ const onEnter = jest.fn();+ const renderResult = render(+ <StrictMode>+ <Provider store={store}>+ <TestMenu onEnter={onEnter} preselect={preselect} />+ </Provider>+ </StrictMode>,+ );+ return { ...renderResult, store, onEnter, user: userEvent.setup() };+};++describe('SelectableList preselection', () => {+ it('selects the first item by default and activates it with Enter', async () => {+ const { user, onEnter } = renderMenu();+ expect(+ screen.getByRole('button', { name: 'Alpha', pressed: true }),+ ).toBeInTheDocument();+ await user.keyboard('{Enter}');+ expect(onEnter).toHaveBeenCalledWith('Alpha');+ await user.keyboard('{ArrowDown}{Enter}');+ expect(onEnter).toHaveBeenLastCalledWith('Beta');+ });++ it('selects the first remaining result and clears selection for empty results', async () => {+ const { user, onEnter } = renderMenu();+ await user.type(screen.getByRole('textbox', { name: 'Search' }), 'be');+ expect(+ screen.getByRole('button', { name: 'Beta', pressed: true }),+ ).toBeInTheDocument();+ await user.keyboard('{Enter}');+ expect(onEnter).toHaveBeenCalledWith('Beta');+ onEnter.mockClear();+ await user.type(screen.getByRole('textbox', { name: 'Search' }), 'xyz');+ await user.keyboard('{Enter}');+ expect(onEnter).not.toHaveBeenCalled();+ await user.clear(screen.getByRole('textbox', { name: 'Search' }));+ await user.keyboard('{Enter}');+ expect(onEnter).toHaveBeenCalledWith('Alpha');+ });++ it('starts at the first item when the menu reopens', async () => {+ const { user, onEnter, store, unmount } = renderMenu();+ await user.keyboard('{ArrowDown}{Enter}');+ expect(onEnter).toHaveBeenLastCalledWith('Beta');+ unmount();+ render(+ <Provider store={store}>+ <TestMenu onEnter={onEnter} />+ </Provider>,+ );+ expect(+ screen.getByRole('button', { name: 'Alpha', pressed: true }),+ ).toBeInTheDocument();+ await user.keyboard('{Enter}');+ expect(onEnter).toHaveBeenLastCalledWith('Alpha');+ });++ it('supports opting out of preselection', async () => {+ const { user, onEnter } = renderMenu(false);+ await user.keyboard('{Enter}');+ expect(onEnter).not.toHaveBeenCalled();+ await user.keyboard('{ArrowDown}{Enter}');+ expect(onEnter).toHaveBeenCalledWith('Alpha');+ });+});diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSyncSelectableListItems.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSyncSelectableListItems.tsnew file mode 100644index 00000000000..a70ee0ef392--- /dev/null+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/internal/useSyncSelectableListItems.ts@@ -0,0 +1,91 @@+import { useStore } from 'jotai';+import { useEffect } from 'react';+import { isDefined } from 'twenty-shared/utils';++import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';+import { selectableItemIdsComponentState } from '@/ui/layout/selectable-list/states/selectableItemIdsComponentState';+import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';+import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';+import { arrayToChunks } from '~/utils/array/arrayToChunks';++type UseSyncSelectableListItemsParams = {+ selectableListInstanceId: string;+ selectableItemIdArray?: string[];+ selectableItemIdMatrix?: string[][];+ shouldPreselectFirstItem: boolean;+};++export const useSyncSelectableListItems = ({+ selectableListInstanceId,+ selectableItemIdArray,+ selectableItemIdMatrix,+ shouldPreselectFirstItem,+}: UseSyncSelectableListItemsParams) => {+ const store = useStore();++ const { resetSelectedItem, setSelectedItemId } = useSelectableList(+ selectableListInstanceId,+ );++ const setSelectableItemIds = useSetAtomComponentState(+ selectableItemIdsComponentState,+ selectableListInstanceId,+ );++ useEffect(() => {+ if (!selectableItemIdArray && !selectableItemIdMatrix) {+ throw new Error(+ 'Either selectableItemIdArray or selectableItemIdsMatrix must be provided',+ );+ }++ if (isDefined(selectableItemIdMatrix)) {+ setSelectableItemIds(selectableItemIdMatrix);+ }++ if (isDefined(selectableItemIdArray)) {+ setSelectableItemIds(arrayToChunks(selectableItemIdArray, 1));+ }++ if (shouldPreselectFirstItem !== true) {+ return;+ }++ const itemIds =+ selectableItemIdArray ?? selectableItemIdMatrix?.flat() ?? [];+ const firstItemId = itemIds[0];++ if (!isDefined(firstItemId)) {+ resetSelectedItem();+ return;+ }++ const selectedItemId = store.get(+ selectedItemIdComponentState.atomFamily({+ instanceId: selectableListInstanceId,+ }),+ );++ if (!isDefined(selectedItemId) || !itemIds.includes(selectedItemId)) {+ setSelectedItemId(firstItemId);+ }+ }, [+ selectableItemIdArray,+ selectableItemIdMatrix,+ selectableListInstanceId,+ setSelectableItemIds,+ shouldPreselectFirstItem,+ resetSelectedItem,+ setSelectedItemId,+ store,+ ]);++ useEffect(+ () => () => {+ if (shouldPreselectFirstItem) {+ resetSelectedItem();+ }+ },+ [resetSelectedItem, shouldPreselectFirstItem],+ );+};diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsxindex 2d35db38958..964f31fddaf 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx@@ -1,3 +1,4 @@+import { NavigationDrawerItemEditingContext } from '@/ui/navigation/navigation-drawer/contexts/NavigationDrawerItemEditingContext';import { NAVIGATION_DRAWER_COLLAPSED_BUTTON_SIZE } from '@/ui/navigation/navigation-drawer/constants/NavigationDrawerCollapsedButtonSize';import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';@@ -9,11 +10,10 @@ import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';-import { isNonEmptyString } from '@sniptt/guards';import { type JSX, type ReactNode, useContext } from 'react';import { Link } from 'react-router-dom';import { isDefined } from 'twenty-shared/utils';-import { Pill, TintedIconTile } from 'twenty-ui/primitives/data-display';+import { Pill } from 'twenty-ui/primitives/data-display';import { type IconComponent, type TablerIconsProps } from 'twenty-ui/icon';import {AppTooltip,@@ -49,8 +49,6 @@ export type NavigationDrawerItemProps = {to?: string;onClick?: () => void;Icon?: IconComponent | ((props: TablerIconsProps) => JSX.Element);- iconColor?: string | null;- withIconBackground?: boolean;active?: boolean;modifier?: NavigationDrawerItemModifier;rightOptions?: ReactNode;@@ -60,7 +58,7 @@ export type NavigationDrawerItemProps = {triggerEvent?: TriggerEventType;preventCollapseOnMobile?: boolean;isSelectedInEditMode?: boolean;- variant?: 'default' | 'tertiary';+ variant?: 'default' | 'tertiary' | 'placeholder';};type StyledItemProps = Pick<@@ -82,8 +80,10 @@ type StyledItemProps = Pick<const StyledItem = styled.button<StyledItemProps>`align-items: center;- background: ${({ active }) =>- active ? themeCssVariables.background.transparent.light : 'transparent'};+ background: ${({ active, variant }) =>+ active || variant === 'placeholder'+ ? themeCssVariables.background.transparent.light+ : 'transparent'};border: ${({ isSelectedInEditMode }) =>isSelectedInEditMode? `1px solid ${themeCssVariables.color.blue}`@@ -91,6 +91,9 @@ const StyledItem = styled.button<StyledItemProps>`border-radius: ${themeCssVariables.border.radius.md};box-sizing: border-box;color: ${({ active, isSoon, variant }) => {+ if (variant === 'placeholder') {+ return themeCssVariables.font.color.light;+ }if (variant === 'tertiary') {return themeCssVariables.font.color.tertiary;}@@ -124,7 +127,8 @@ const StyledItem = styled.button<StyledItemProps>`? themeCssVariables.spacing['0.5']: themeCssVariables.spacing[1]};padding-top: ${themeCssVariables.spacing[1]};- pointer-events: ${({ isSoon }) => (isSoon ? 'none' : 'auto')};+ pointer-events: ${({ isSoon, variant }) =>+ isSoon || variant === 'placeholder' ? 'none' : 'auto'};text-decoration: none;user-select: none;width: ${({ isNavigationDrawerExpanded, hasRightOptions }) =>@@ -207,17 +211,6 @@ const StyledIcon = styled.div`margin-right: ${themeCssVariables.spacing[2]};`;-const StyledIconBackgroundTile = styled.div`- align-items: center;- background-color: ${themeCssVariables.grayScale.gray3};- border-radius: ${themeCssVariables.border.radius.md};- display: flex;- flex-shrink: 0;- height: ${themeCssVariables.spacing[6]};- justify-content: center;- width: ${themeCssVariables.spacing[6]};-`;-const StyledRightOptionsContainer = styled.div`align-items: center;border-radius: ${themeCssVariables.border.radius.md};@@ -259,8 +252,6 @@ export const NavigationDrawerItem = ({secondaryLabel,indentationLevel = DEFAULT_INDENTATION_LEVEL,Icon,- iconColor,- withIconBackground = false,to,onClick,active,@@ -276,6 +267,7 @@ export const NavigationDrawerItem = ({variant = 'default',}: NavigationDrawerItemProps) => {const { theme } = useContext(ThemeContext);+ const editingContent = useContext(NavigationDrawerItemEditingContext);const isMobile = useIsMobile();const isExpanded = useIsNavigationDrawerContentExpanded();const setIsNavigationDrawerExpanded = useSetAtomState(@@ -321,32 +313,57 @@ export const NavigationDrawerItem = ({triggerEvent,});- const elementType = isExternalLink- ? 'a'- : isInternalLink- ? Link- : isDefined(rightOptions)- ? 'div'- : undefined;+ const elementType = editingContent+ ? 'div'+ : isExternalLink+ ? 'a'+ : isInternalLink+ ? Link+ : isDefined(rightOptions)+ ? 'div'+ : undefined;return (<StyledNavigationDrawerItemContainer><StyledItemid={navigationItemId}className={`navigation-drawer-item ${className || ''}`}- onClick={handleMouseDownNavigationClickClick}- onMouseDown={handleMouseDown}+ onClick={(event) => {+ if (+ !(event.target instanceof Node) ||+ !event.currentTarget.contains(event.target)+ ) {+ return;+ }+ handleMouseDownNavigationClickClick(event);+ }}+ onMouseDown={(event) => {+ if (+ !(event.target instanceof Node) ||+ !event.currentTarget.contains(event.target)+ ) {+ return;+ }+ handleMouseDown(event);+ }}active={active}aria-current={isDefined(to) && active ? 'page' : undefined}isSoon={isSoon}variant={variant}+ disabled={variant === 'placeholder'}indentationLevel={indentationLevel}isNavigationDrawerExpanded={isExpanded}isDragging={isDragging}hasRightOptions={isDefined(rightOptions)}- isSelectedInEditMode={isSelectedInEditMode}+ isSelectedInEditMode={+ isSelectedInEditMode || editingContent?.isSelected+ }as={elementType}- role={!to && isDefined(rightOptions) ? 'button' : undefined}+ role={+ !editingContent && !to && isDefined(rightOptions)+ ? 'button'+ : undefined+ }to={isInternalLink ? to : undefined}href={isExternalLink ? to : undefined}target={isExternalLink ? '_blank' : undefined}@@ -360,31 +377,12 @@ export const NavigationDrawerItem = ({</NavigationDrawerAnimatedCollapseWrapper>)}- {Icon &&- (isNonEmptyString(iconColor) ? (- <StyledIcon>- <TintedIconTile Icon={Icon} color={iconColor} />- </StyledIcon>- ) : withIconBackground ? (- <StyledIcon>- <StyledIconBackgroundTile>- <Icon- size={theme.icon.size.md}- stroke={theme.icon.stroke.md}- color={- showBreadcrumb && !isExpanded- ? theme.font.color.light- : 'currentColor'- }- />- </StyledIconBackgroundTile>- </StyledIcon>- ) : (+ {editingContent ? (+ <StyledIcon>{editingContent.icon}</StyledIcon>+ ) : (+ isDefined(Icon) && (<StyledIcon><Icon- style={{- minWidth: theme.icon.size.md,- }}size={theme.icon.size.md}stroke={theme.icon.stroke.md}color={@@ -394,25 +392,28 @@ export const NavigationDrawerItem = ({}/></StyledIcon>- ))}+ )+ )}<StyledLabelParent>- <OverflowingTextWithTooltip- text={- <>- <StyledItemLabel>{label}</StyledItemLabel>- {secondaryLabel && (- <StyledItemSecondaryLabel>- {' · '}- {secondaryLabel}- </StyledItemSecondaryLabel>- )}- </>- }- tooltipContent={- secondaryLabel ? `${label} · ${secondaryLabel}` : label- }- />+ {editingContent?.label ?? (+ <OverflowingTextWithTooltip+ text={+ <>+ <StyledItemLabel>{label}</StyledItemLabel>+ {secondaryLabel && (+ <StyledItemSecondaryLabel>+ {' · '}+ {secondaryLabel}+ </StyledItemSecondaryLabel>+ )}+ </>+ }+ tooltipContent={+ secondaryLabel ? `${label} · ${secondaryLabel}` : label+ }+ />+ )}</StyledLabelParent>{showStyledSpacer && <StyledSpacer />}diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem.tsxindex 9e9fcecf3f2..539e0727b29 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem.tsx@@ -10,7 +10,6 @@ export const NavigationDrawerSubItem = ({label,secondaryLabel,Icon,- iconColor,to,onClick,active,@@ -30,7 +29,6 @@ export const NavigationDrawerSubItem = ({indentationLevel={2}subItemState={subItemState}Icon={Icon}- iconColor={iconColor}to={to}onClick={onClick}active={active}diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/contexts/NavigationDrawerItemEditingContext.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/contexts/NavigationDrawerItemEditingContext.tsnew file mode 100644index 00000000000..344d00d58b9--- /dev/null+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/contexts/NavigationDrawerItemEditingContext.ts@@ -0,0 +1,7 @@+import { createContext, type ReactNode } from 'react';++export const NavigationDrawerItemEditingContext = createContext<{+ icon: ReactNode;+ label: ReactNode;+ isSelected: boolean;+} | null>(null);diff --git a/packages/twenty-shared/src/types/SidePanelPages.ts b/packages/twenty-shared/src/types/SidePanelPages.tsindex ca3b75b677b..e24d8012223 100644--- a/packages/twenty-shared/src/types/SidePanelPages.ts+++ b/packages/twenty-shared/src/types/SidePanelPages.ts@@ -27,8 +27,6 @@ export enum SidePanelPages {RecordPageFieldsSettings = 'record-page-fields-settings',RecordPageFieldSettings = 'record-page-field-settings',ViewFrontComponent = 'view-front-component',- NavigationMenuItemEdit = 'navigation-menu-item-edit',- NavigationMenuAddItem = 'navigation-menu-add-item',CommandMenuEdit = 'command-menu-edit',PageLayoutRecordPageWidgetTypeSelect = 'page-layout-record-page-widget-type-select',ComposeEmail = 'compose-email',diff --git a/packages/twenty-ui/src/primitives/surfaces/AppTooltip/AppTooltip.module.scss b/packages/twenty-ui/src/primitives/surfaces/AppTooltip/AppTooltip.module.scssindex 315cb860b08..041c5555359 100644--- a/packages/twenty-ui/src/primitives/surfaces/AppTooltip/AppTooltip.module.scss+++ b/packages/twenty-ui/src/primitives/surfaces/AppTooltip/AppTooltip.module.scss@@ -27,8 +27,11 @@opacity: 0;}+ // No exit transition: the shared tooltip is reused across anchors, and a+ // fading node lingers while the next one opens, which strands references to+ // the old element. Scope any exit animation per instance instead.&[data-ending-style] {- transition-timing-function: ease-in;+ transition-duration: 0s;}}diff --git a/packages/twenty-ui/src/primitives/surfaces/AppTooltip/AppTooltip.tsx b/packages/twenty-ui/src/primitives/surfaces/AppTooltip/AppTooltip.tsxindex f06c2903272..a98207920df 100644--- a/packages/twenty-ui/src/primitives/surfaces/AppTooltip/AppTooltip.tsx+++ b/packages/twenty-ui/src/primitives/surfaces/AppTooltip/AppTooltip.tsx@@ -3,7 +3,7 @@ import { isNonEmptyString } from '@sniptt/guards';import { clsx } from 'clsx';import { useEffect, useRef, useState } from 'react';import { type IconComponent } from '@ui/icon/types/IconComponent';-import { useThemeContainer } from '@ui/theme-constants';+import { useTheme, useThemeContainer } from '@ui/theme-constants';import { isDefined } from '@ui/utilities/utils/isDefined';import styles from './AppTooltip.module.scss';@@ -95,6 +95,7 @@ export const AppTooltip = ({};const themeContainer = useThemeContainer();+ const theme = useTheme();const [show, setShow] = useState(false);const [anchorElements, setAnchorElements] = useState<Element[]>([]);@@ -167,14 +168,20 @@ export const AppTooltip = ({return;}+ setShow(false);setActiveAnchor(anchorElements[0] ?? null);}, [anchorElements, activeAnchor]);useEffect(() => {- if (anchorElements.length === 0) {+ if (hidden || anchorElements.length === 0) {+ setShow(false);+ isHoveringTooltipRef.current = false;return;}+ let hoveredAnchor: Element | null = null;+ let focusedAnchor: Element | null = null;+const handleShow = (value: boolean) => {if (!isControlled) {setShow(value);@@ -205,42 +212,87 @@ export const AppTooltip = ({clearTimeout(hideDelayTimerRef.current);};- const handleAnchorLeave = (anchorElement: Element) => {- if (anchorElement.contains(anchorElement.ownerDocument.activeElement)) {- return;- }-+ // Always defer the hide: a shared tooltip moved between anchors would+ // otherwise unmount and remount, losing the popup node mid-swap.+ const handleAnchorLeave = () => {+ clearTimeout(showDelayTimerRef.current);clearTimeout(hideDelayTimerRef.current);+hideDelayTimerRef.current = setTimeout(() => {if (isHoveringTooltipRef.current) {return;}handleShow(false);}, HIDE_DELAY_MS);- clearTimeout(showDelayTimerRef.current);+ };++ // Dragging or replacing a row can prevent its mouseleave event. Only+ // watched while an anchor is hovered, so idle tooltips cost nothing.+ const handlePointerMove = (event: PointerEvent) => {+ if (+ isDefined(hoveredAnchor) &&+ event.target instanceof Node &&+ !hoveredAnchor.contains(event.target)+ ) {+ stopWatchingPointer();+ if (!isDefined(focusedAnchor)) {+ handleAnchorLeave();+ }+ }+ };++ const stopWatchingPointer = () => {+ hoveredAnchor = null;+ document.removeEventListener('pointermove', handlePointerMove);};const removeListeners = anchorElements.map((anchorElement) => {- const handleEnter = () => handleAnchorEnter(anchorElement);- const handleLeave = () => handleAnchorLeave(anchorElement);+ const handleEnter = () => {+ hoveredAnchor = anchorElement;+ document.addEventListener('pointermove', handlePointerMove);+ handleAnchorEnter(anchorElement);+ };+ // Keyboard focus keeps the tooltip up on its own, so only a blur closes+ // one the anchor itself was focused into.+ const handlePointerLeave = () => {+ stopWatchingPointer();+ if (isDefined(focusedAnchor)) {+ return;+ }+ handleAnchorLeave();+ };+ const handleFocus = () => {+ focusedAnchor = anchorElement;+ handleAnchorEnter(anchorElement);+ };+ const handleBlur = () => {+ focusedAnchor = null;+ stopWatchingPointer();+ handleAnchorLeave();+ };- // mouseover/mouseout instead of mouseenter/mouseleave to replicate- // react-tooltip's default open and close events- anchorElement.addEventListener('mouseover', handleEnter);- anchorElement.addEventListener('mouseout', handleLeave);- anchorElement.addEventListener('focus', handleEnter);- anchorElement.addEventListener('blur', handleLeave);+ // Deliberately not react-tooltip's mouseover/mouseout parity: those fire+ // per descendant, so child-to-child movement restarted the show timer.+ anchorElement.addEventListener('mouseenter', handleEnter);+ anchorElement.addEventListener('mouseleave', handlePointerLeave);+ anchorElement.addEventListener('focus', handleFocus);+ anchorElement.addEventListener('blur', handleBlur);return () => {- anchorElement.removeEventListener('mouseover', handleEnter);- anchorElement.removeEventListener('mouseout', handleLeave);- anchorElement.removeEventListener('focus', handleEnter);- anchorElement.removeEventListener('blur', handleLeave);+ anchorElement.removeEventListener('mouseenter', handleEnter);+ anchorElement.removeEventListener('mouseleave', handlePointerLeave);+ anchorElement.removeEventListener('focus', handleFocus);+ anchorElement.removeEventListener('blur', handleBlur);};});- return () => removeListeners.forEach((removeListener) => removeListener());- }, [anchorElements, isControlled, delayShowMs]);+ return () => {+ document.removeEventListener('pointermove', handlePointerMove);+ removeListeners.forEach((removeListener) => removeListener());+ clearTimeout(showDelayTimerRef.current);+ clearTimeout(hideDelayTimerRef.current);+ };+ }, [anchorElements, isControlled, delayShowMs, interactive, hidden]);useEffect(() => {return () => {@@ -278,7 +330,13 @@ export const AppTooltip = ({<div className={styles.textContent}>{hasTitle && (<div className={styles.title}>- {isDefined(Icon) && <Icon className={styles.icon} aria-hidden />}+ {isDefined(Icon) && (+ <Icon+ className={styles.icon}+ size={theme.icon.size.sm}+ aria-hidden+ />+ )}<span>{title}</span></div>)}diff --git a/packages/twenty-ui/src/primitives/surfaces/AppTooltip/__tests__/AppTooltip.test.tsx b/packages/twenty-ui/src/primitives/surfaces/AppTooltip/__tests__/AppTooltip.test.tsxnew file mode 100644index 00000000000..be252a1b618--- /dev/null+++ b/packages/twenty-ui/src/primitives/surfaces/AppTooltip/__tests__/AppTooltip.test.tsx@@ -0,0 +1,157 @@+import { fireEvent, render, screen, waitFor } from '@testing-library/react';+import userEvent from '@testing-library/user-event';++import { AppTooltip, TooltipDelay } from '../AppTooltip';++describe('AppTooltip', () => {+ it('closes on pointer leave even when a child retains focus', async () => {+ const user = userEvent.setup();++ render(+ <>+ <div id="row">+ <button>Folder</button>+ </div>+ <AppTooltip+ anchorSelect="#row"+ title="Click to edit"+ delay={TooltipDelay.noDelay}+ />+ </>,+ );++ const button = screen.getByRole('button');+ await user.hover(button);+ expect(await screen.findByRole('tooltip')).toBeVisible();+ await user.click(button);+ expect(button).toHaveFocus();+ await user.unhover(button);++ await waitFor(() =>+ expect(screen.queryByRole('tooltip')).not.toBeInTheDocument(),+ );+ });++ it('stays open on pointer leave while the anchor itself holds focus', async () => {+ const user = userEvent.setup();++ render(+ <>+ <span id="anchor" tabIndex={0}>+ Domain Name+ </span>+ <AppTooltip+ anchorSelect="#anchor"+ title="The company website URL"+ delay={TooltipDelay.noDelay}+ />+ </>,+ );++ await user.tab();+ const anchor = screen.getByText('Domain Name');+ expect(anchor).toHaveFocus();+ expect(await screen.findByRole('tooltip')).toBeVisible();++ await user.hover(anchor);+ await user.unhover(anchor);++ expect(anchor).toHaveFocus();+ expect(screen.getByRole('tooltip')).toBeVisible();+ });++ it('opens for keyboard focus and closes on blur', async () => {+ const user = userEvent.setup();++ render(+ <>+ <button id="anchor">Folder</button>+ <button>Next</button>+ <AppTooltip+ anchorSelect="#anchor"+ title="Click to edit"+ delay={TooltipDelay.noDelay}+ />+ </>,+ );++ await user.tab();+ expect(await screen.findByRole('tooltip')).toBeVisible();+ await user.tab();+ await waitFor(() =>+ expect(screen.queryByRole('tooltip')).not.toBeInTheDocument(),+ );+ });+ it('does not restore a stale tooltip after a menu closes', async () => {+ const user = userEvent.setup();+ const renderTooltip = (hidden: boolean) => (+ <>+ <button id="anchor">Folder</button>+ <AppTooltip+ anchorSelect="#anchor"+ title="Folder tooltip"+ hidden={hidden}+ delay={TooltipDelay.noDelay}+ />+ </>+ );+ const { rerender } = render(renderTooltip(false));++ await user.hover(screen.getByRole('button'));+ expect(await screen.findByRole('tooltip')).toBeVisible();+ rerender(renderTooltip(true));+ await user.unhover(screen.getByRole('button'));+ rerender(renderTooltip(false));++ await waitFor(() =>+ expect(screen.queryByRole('tooltip')).not.toBeInTheDocument(),+ );+ await user.hover(screen.getByRole('button'));+ expect(await screen.findByRole('tooltip')).toBeVisible();+ });++ it('closes when a hovered anchor is replaced without a leave event', async () => {+ const user = userEvent.setup();+ const renderTooltip = (version: number) => (+ <>+ <button key={version} id="anchor">+ Folder+ </button>+ <AppTooltip+ anchorSelect="#anchor"+ title="Folder tooltip"+ delay={TooltipDelay.noDelay}+ />+ </>+ );+ const { rerender } = render(renderTooltip(0));++ await user.hover(screen.getByRole('button'));+ expect(await screen.findByRole('tooltip')).toBeVisible();+ rerender(renderTooltip(1));++ await waitFor(() =>+ expect(screen.queryByRole('tooltip')).not.toBeInTheDocument(),+ );+ });+ it('closes on pointer movement outside even if mouseleave was missed', async () => {+ const user = userEvent.setup();+ render(+ <>+ <button id="anchor">Folder</button>+ <AppTooltip+ anchorSelect="#anchor"+ title="Folder tooltip"+ delay={TooltipDelay.noDelay}+ />+ </>,+ );++ await user.hover(screen.getByRole('button'));+ expect(await screen.findByRole('tooltip')).toBeVisible();+ fireEvent.pointerMove(document.body);+ await waitFor(() =>+ expect(screen.queryByRole('tooltip')).not.toBeInTheDocument(),+ );+ });+});