The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
refactor(front): support multiple widget header actions (#24204)
nitine41fe53892b6
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCard.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCard.tsxindex dda1ccabab9..71f0e1e17bf 100644--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCard.tsx+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCard.tsx@@ -1,54 +1,14 @@-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { styled } from '@linaria/react';-import { useLingui } from '@lingui/react/macro';-import { format, getYear } from 'date-fns';--import { CalendarMonthCard } from '@/activities/calendar/components/CalendarMonthCard';+import { CalendarEventsCardContent } from '@/activities/calendar/components/CalendarEventsCardContent';import { TIMELINE_CALENDAR_EVENTS_DEFAULT_PAGE_SIZE } from '@/activities/calendar/constants/Calendar';-import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext';import { getTimelineCalendarEventsFromObjectRecord } from '@/activities/calendar/graphql/queries/getTimelineCalendarEventsFromObjectRecord';-import { useCalendarEvents } from '@/activities/calendar/hooks/useCalendarEvents';-import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';-import { SkeletonLoader } from '@/activities/components/SkeletonLoader';import { useCustomResolver } from '@/activities/hooks/useCustomResolver';import { useSubscribeTimelineToParticipantChanges } from '@/activities/hooks/useSubscribeTimelineToParticipantChanges';-import { usePublishWidgetHeaderInfo } from '@/page-layout/widgets/hooks/usePublishWidgetHeaderInfo';+import { WidgetHeaderCountEffect } from '@/page-layout/widgets/components/WidgetHeaderCountEffect';import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';-import { H3Title } from 'twenty-ui/typography';-import {- AnimatedPlaceholder,- AnimatedPlaceholderEmptyContainer,- AnimatedPlaceholderEmptySubTitle,- AnimatedPlaceholderEmptyTextContainer,- AnimatedPlaceholderEmptyTitle,-} from 'twenty-ui/feedback';-import { Section } from 'twenty-ui/layout';-import { themeCssVariables } from 'twenty-ui/theme-constants';import { type TimelineCalendarEventsWithTotal } from '~/generated/graphql';-import { dateLocaleState } from '~/localization/states/dateLocaleState';--const StyledContainer = styled.div`- box-sizing: border-box;- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[8]};- overflow: scroll;- padding: ${themeCssVariables.spacing[6]};- width: 100%;-`;--const StyledYear = styled.span`- color: ${themeCssVariables.font.color.light};-`;--const StyledTitleContainer = styled.div`- margin-bottom: ${themeCssVariables.spacing[4]};-`;export const CalendarEventsCard = () => {- const { t } = useLingui();const targetRecord = useTargetRecord();- const { localeCatalog } = useAtomStateValue(dateLocaleState);const { data, firstQueryLoading, isFetchingMore, fetchMoreRecords, refetch } =useCustomResolver<TimelineCalendarEventsWithTotal>(@@ -70,15 +30,6 @@ export const CalendarEventsCard = () => {const { timelineCalendarEvents, totalNumberOfCalendarEvents } =data?.getTimelineCalendarEventsFromObjectRecord ?? {};- usePublishWidgetHeaderInfo({ count: totalNumberOfCalendarEvents });-- const {- calendarEventsByDayTime,- daysByMonthTime,- monthTimes,- monthTimesByYear,- } = useCalendarEvents(timelineCalendarEvents || []);-const hasMoreCalendarEvents =timelineCalendarEvents && totalNumberOfCalendarEvents? timelineCalendarEvents?.length < totalNumberOfCalendarEvents@@ -90,66 +41,16 @@ export const CalendarEventsCard = () => {}};- const objectName = targetRecord.targetObjectNameSingular;-- if (firstQueryLoading) {- return <SkeletonLoader />;- }-- if (!firstQueryLoading && !timelineCalendarEvents?.length) {- // TODO: change animated placeholder- return (- <AnimatedPlaceholderEmptyContainer>- <AnimatedPlaceholder type="noMatchRecord" />- <AnimatedPlaceholderEmptyTextContainer>- <AnimatedPlaceholderEmptyTitle>- {t`No Events`}- </AnimatedPlaceholderEmptyTitle>- <AnimatedPlaceholderEmptySubTitle>- {t`No events have been scheduled with this ${objectName} yet.`}- </AnimatedPlaceholderEmptySubTitle>- </AnimatedPlaceholderEmptyTextContainer>- </AnimatedPlaceholderEmptyContainer>- );- }-return (- <CalendarContext.Provider- value={{- calendarEventsByDayTime,- }}- >- <StyledContainer>- {monthTimes.map((monthTime) => {- const monthDayTimes = daysByMonthTime[monthTime] || [];- const year = getYear(monthTime);- const lastMonthTimeOfYear = monthTimesByYear[year]?.[0];- const isLastMonthOfYear = lastMonthTimeOfYear === monthTime;- const monthLabel = format(monthTime, 'MMMM', {- locale: localeCatalog,- });-- return (- <Section key={monthTime}>- <StyledTitleContainer>- <H3Title- title={- <>- {monthLabel}- {isLastMonthOfYear && <StyledYear> {year}</StyledYear>}- </>- }- />- </StyledTitleContainer>- <CalendarMonthCard dayTimes={monthDayTimes} />- </Section>- );- })}- <CustomResolverFetchMoreLoader- loading={isFetchingMore || firstQueryLoading}- onLastRowVisible={handleLastRowVisible}- />- </StyledContainer>- </CalendarContext.Provider>+ <>+ <WidgetHeaderCountEffect count={totalNumberOfCalendarEvents} />+ <CalendarEventsCardContent+ firstQueryLoading={firstQueryLoading}+ isFetchingMore={isFetchingMore}+ objectName={targetRecord.targetObjectNameSingular}+ onLastRowVisible={handleLastRowVisible}+ timelineCalendarEvents={timelineCalendarEvents}+ />+ </>);};diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsxnew file mode 100644index 00000000000..e5da204b45b--- /dev/null+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx@@ -0,0 +1,126 @@+import { CalendarMonthCard } from '@/activities/calendar/components/CalendarMonthCard';+import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext';+import { useCalendarEvents } from '@/activities/calendar/hooks/useCalendarEvents';+import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { format, getYear } from 'date-fns';+import {+ AnimatedPlaceholder,+ AnimatedPlaceholderEmptyContainer,+ AnimatedPlaceholderEmptySubTitle,+ AnimatedPlaceholderEmptyTextContainer,+ AnimatedPlaceholderEmptyTitle,+} from 'twenty-ui/feedback';+import { Section } from 'twenty-ui/layout';+import { themeCssVariables } from 'twenty-ui/theme-constants';+import { H3Title } from 'twenty-ui/typography';+import { type TimelineCalendarEvent } from '~/generated/graphql';+import { dateLocaleState } from '~/localization/states/dateLocaleState';++const StyledContainer = styled.div`+ box-sizing: border-box;+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[8]};+ overflow: scroll;+ padding: ${themeCssVariables.spacing[6]};+ width: 100%;+`;++const StyledYear = styled.span`+ color: ${themeCssVariables.font.color.light};+`;++const StyledTitleContainer = styled.div`+ margin-bottom: ${themeCssVariables.spacing[4]};+`;++type CalendarEventsCardContentProps = {+ firstQueryLoading: boolean;+ isFetchingMore: boolean;+ objectName: string;+ onLastRowVisible: () => Promise<void>;+ timelineCalendarEvents: TimelineCalendarEvent[] | undefined;+};++export const CalendarEventsCardContent = ({+ firstQueryLoading,+ isFetchingMore,+ objectName,+ onLastRowVisible,+ timelineCalendarEvents,+}: CalendarEventsCardContentProps) => {+ const { t } = useLingui();+ const { localeCatalog } = useAtomStateValue(dateLocaleState);++ const {+ calendarEventsByDayTime,+ daysByMonthTime,+ monthTimes,+ monthTimesByYear,+ } = useCalendarEvents(timelineCalendarEvents ?? []);++ if (firstQueryLoading) {+ return <SkeletonLoader />;+ }++ if (!timelineCalendarEvents?.length) {+ // TODO: change animated placeholder+ return (+ <AnimatedPlaceholderEmptyContainer>+ <AnimatedPlaceholder type="noMatchRecord" />+ <AnimatedPlaceholderEmptyTextContainer>+ <AnimatedPlaceholderEmptyTitle>+ {t`No Events`}+ </AnimatedPlaceholderEmptyTitle>+ <AnimatedPlaceholderEmptySubTitle>+ {t`No events have been scheduled with this ${objectName} yet.`}+ </AnimatedPlaceholderEmptySubTitle>+ </AnimatedPlaceholderEmptyTextContainer>+ </AnimatedPlaceholderEmptyContainer>+ );+ }++ return (+ <CalendarContext.Provider+ value={{+ calendarEventsByDayTime,+ }}+ >+ <StyledContainer>+ {monthTimes.map((monthTime) => {+ const monthDayTimes = daysByMonthTime[monthTime] || [];+ const year = getYear(monthTime);+ const lastMonthTimeOfYear = monthTimesByYear[year]?.[0];+ const isLastMonthOfYear = lastMonthTimeOfYear === monthTime;+ const monthLabel = format(monthTime, 'MMMM', {+ locale: localeCatalog,+ });++ return (+ <Section key={monthTime}>+ <StyledTitleContainer>+ <H3Title+ title={+ <>+ {monthLabel}+ {isLastMonthOfYear && <StyledYear> {year}</StyledYear>}+ </>+ }+ />+ </StyledTitleContainer>+ <CalendarMonthCard dayTimes={monthDayTimes} />+ </Section>+ );+ })}+ <CustomResolverFetchMoreLoader+ loading={isFetchingMore}+ onLastRowVisible={onLastRowVisible}+ />+ </StyledContainer>+ </CalendarContext.Provider>+ );+};diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailsCard.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailsCard.tsxindex 2712dd38a75..09b2fe611d9 100644--- a/packages/twenty-front/src/modules/activities/emails/components/EmailsCard.tsx+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailsCard.tsx@@ -1,42 +1,16 @@-import { styled } from '@linaria/react';import { CoreObjectNameSingular } from 'twenty-shared/types';-import { ActivityList } from '@/activities/components/ActivityList';-import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';-import { SkeletonLoader } from '@/activities/components/SkeletonLoader';-import { EmailThreadPreview } from '@/activities/emails/components/EmailThreadPreview';-import { EmptyInboxPlaceholder } from '@/activities/emails/components/EmptyInboxPlaceholder';+import { EmailsCardContent } from '@/activities/emails/components/EmailsCardContent';import { TIMELINE_THREADS_DEFAULT_PAGE_SIZE } from '@/activities/emails/constants/Messaging';import { getTimelineThreadsFromObjectRecord } from '@/activities/emails/graphql/queries/getTimelineThreadsFromObjectRecord';-import { useComposeEmailForTargetRecord } from '@/activities/emails/hooks/useComposeEmailForTargetRecord';import { useCustomResolver } from '@/activities/hooks/useCustomResolver';import { useSubscribeTimelineToParticipantChanges } from '@/activities/hooks/useSubscribeTimelineToParticipantChanges';-import { usePublishWidgetHeaderInfo } from '@/page-layout/widgets/hooks/usePublishWidgetHeaderInfo';+import { WidgetHeaderCountEffect } from '@/page-layout/widgets/components/WidgetHeaderCountEffect';import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';-import { t } from '@lingui/core/macro';-import { useMemo } from 'react';-import { IconPlus } from 'twenty-ui/icon';-import { Section } from 'twenty-ui/layout';-import { themeCssVariables } from 'twenty-ui/theme-constants';-import {- type TimelineThread,- type TimelineThreadsWithTotal,-} from '~/generated/graphql';--const StyledContainer = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[6]};- height: 100%;- overflow: auto;- padding: ${themeCssVariables.spacing[6]} ${themeCssVariables.spacing[6]}- ${themeCssVariables.spacing[2]};-`;+import { type TimelineThreadsWithTotal } from '~/generated/graphql';export const EmailsCard = () => {const targetRecord = useTargetRecord();- const { openComposer, loading: composerLoading } =- useComposeEmailForTargetRecord();const { data, firstQueryLoading, isFetchingMore, fetchMoreRecords, refetch } =useCustomResolver<TimelineThreadsWithTotal>(@@ -58,21 +32,6 @@ export const EmailsCard = () => {const { totalNumberOfThreads, timelineThreads } =data?.getTimelineThreadsFromObjectRecord ?? {};- const composeAction = useMemo(- () => ({- Icon: IconPlus,- label: t`Compose`,- onClick: openComposer,- disabled: composerLoading,- }),- [openComposer, composerLoading],- );-- usePublishWidgetHeaderInfo({- count: totalNumberOfThreads,- primaryAction: composeAction,- });-const hasMoreTimelineThreads =timelineThreads && totalNumberOfThreads? timelineThreads?.length < totalNumberOfThreads@@ -84,33 +43,15 @@ export const EmailsCard = () => {}};- if (firstQueryLoading) {- return <SkeletonLoader />;- }-- if (!firstQueryLoading && !timelineThreads?.length) {- return (- <StyledContainer>- <EmptyInboxPlaceholder />- </StyledContainer>- );- }-return (- <StyledContainer>- <Section>- {!firstQueryLoading && (- <ActivityList>- {timelineThreads?.map((thread: TimelineThread) => (- <EmailThreadPreview key={thread.id} thread={thread} />- ))}- </ActivityList>- )}- <CustomResolverFetchMoreLoader- loading={isFetchingMore || firstQueryLoading}- onLastRowVisible={handleLastRowVisible}- />- </Section>- </StyledContainer>+ <>+ <WidgetHeaderCountEffect count={totalNumberOfThreads} />+ <EmailsCardContent+ firstQueryLoading={firstQueryLoading}+ isFetchingMore={isFetchingMore}+ onLastRowVisible={handleLastRowVisible}+ timelineThreads={timelineThreads}+ />+ </>);};diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsxnew file mode 100644index 00000000000..359666f178e--- /dev/null+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsx@@ -0,0 +1,61 @@+import { ActivityList } from '@/activities/components/ActivityList';+import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';+import { EmailThreadPreview } from '@/activities/emails/components/EmailThreadPreview';+import { EmptyInboxPlaceholder } from '@/activities/emails/components/EmptyInboxPlaceholder';+import { styled } from '@linaria/react';+import { Section } from 'twenty-ui/layout';+import { themeCssVariables } from 'twenty-ui/theme-constants';+import { type TimelineThread } from '~/generated/graphql';++const StyledContainer = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[6]};+ height: 100%;+ overflow: auto;+ padding: ${themeCssVariables.spacing[6]} ${themeCssVariables.spacing[6]}+ ${themeCssVariables.spacing[2]};+`;++type EmailsCardContentProps = {+ firstQueryLoading: boolean;+ isFetchingMore: boolean;+ onLastRowVisible: () => Promise<void>;+ timelineThreads: TimelineThread[] | undefined;+};++export const EmailsCardContent = ({+ firstQueryLoading,+ isFetchingMore,+ onLastRowVisible,+ timelineThreads,+}: EmailsCardContentProps) => {+ if (firstQueryLoading) {+ return <SkeletonLoader />;+ }++ if (!timelineThreads?.length) {+ return (+ <StyledContainer>+ <EmptyInboxPlaceholder />+ </StyledContainer>+ );+ }++ return (+ <StyledContainer>+ <Section>+ <ActivityList>+ {timelineThreads.map((thread) => (+ <EmailThreadPreview key={thread.id} thread={thread} />+ ))}+ </ActivityList>+ <CustomResolverFetchMoreLoader+ loading={isFetchingMore}+ onLastRowVisible={onLastRowVisible}+ />+ </Section>+ </StyledContainer>+ );+};diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentFileInput.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentFileInput.tsxnew file mode 100644index 00000000000..00f2bb704d3--- /dev/null+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentFileInput.tsx@@ -0,0 +1,38 @@+import { useUploadAttachmentFiles } from '@/activities/files/hooks/useUploadAttachmentFiles';+import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';+import { styled } from '@linaria/react';+import { type ChangeEvent, type Ref } from 'react';+import { isDefined } from 'twenty-shared/utils';++const StyledFileInput = styled.input`+ display: none;+`;++type AttachmentFileInputProps = {+ ref?: Ref<HTMLInputElement>;+ targetableObject: ActivityTargetableObject;+};++export const AttachmentFileInput = ({+ ref,+ targetableObject,+}: AttachmentFileInputProps) => {+ const { uploadAttachmentFiles } = useUploadAttachmentFiles();++ const handleFileInputChange = (event: ChangeEvent<HTMLInputElement>) => {+ if (isDefined(event.target.files)) {+ const files = Array.from(event.target.files);+ event.target.value = '';+ uploadAttachmentFiles({ files, targetableObject });+ }+ };++ return (+ <StyledFileInput+ ref={ref}+ onChange={handleFileInputChange}+ type="file"+ multiple+ />+ );+};diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentUploadTrigger.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentUploadTrigger.tsxnew file mode 100644index 00000000000..5e357802f4f--- /dev/null+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentUploadTrigger.tsx@@ -0,0 +1,31 @@+import { AttachmentFileInput } from '@/activities/files/components/AttachmentFileInput';+import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';+import { type ReactNode, useRef } from 'react';++type AttachmentUploadTriggerProps = {+ targetableObject: ActivityTargetableObject;+ children: (params: { openFilePicker: () => void }) => ReactNode;+};++// Owns the hidden file input, so the input is mounted exactly as long as a+// trigger that can open it.+export const AttachmentUploadTrigger = ({+ targetableObject,+ children,+}: AttachmentUploadTriggerProps) => {+ const inputFileRef = useRef<HTMLInputElement>(null);++ const openFilePicker = () => {+ inputFileRef.current?.click();+ };++ return (+ <>+ <AttachmentFileInput+ ref={inputFileRef}+ targetableObject={targetableObject}+ />+ {children({ openFilePicker })}+ </>+ );+};diff --git a/packages/twenty-front/src/modules/activities/files/components/FilesCard.tsx b/packages/twenty-front/src/modules/activities/files/components/FilesCard.tsxindex acbf2bef11f..3af06fbcc75 100644--- a/packages/twenty-front/src/modules/activities/files/components/FilesCard.tsx+++ b/packages/twenty-front/src/modules/activities/files/components/FilesCard.tsx@@ -1,168 +1,30 @@-import { styled } from '@linaria/react';-import { type ChangeEvent, useMemo, useRef, useState } from 'react';--import { SkeletonLoader } from '@/activities/components/SkeletonLoader';-import { AttachmentList } from '@/activities/files/components/AttachmentList';-import { DropZone } from '@/activities/files/components/DropZone';+import { FilesCardContent } from '@/activities/files/components/FilesCardContent';import { useAttachments } from '@/activities/files/hooks/useAttachments';-import { useUploadAttachmentFile } from '@/activities/files/hooks/useUploadAttachmentFile';-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';-import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';-import { usePublishWidgetHeaderInfo } from '@/page-layout/widgets/hooks/usePublishWidgetHeaderInfo';-import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';+import { useCanUploadAttachmentFiles } from '@/activities/files/hooks/useCanUploadAttachmentFiles';+import { useUploadAttachmentFiles } from '@/activities/files/hooks/useUploadAttachmentFiles';+import { WidgetHeaderCountEffect } from '@/page-layout/widgets/components/WidgetHeaderCountEffect';import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';-import { Trans, useLingui } from '@lingui/react/macro';-import { isDefined } from 'twenty-shared/utils';-import { IconPlus } from 'twenty-ui/icon';-import { Button } from 'twenty-ui/input';-import {- AnimatedPlaceholder,- AnimatedPlaceholderEmptyContainer,- AnimatedPlaceholderEmptySubTitle,- AnimatedPlaceholderEmptyTextContainer,- AnimatedPlaceholderEmptyTitle,-} from 'twenty-ui/feedback';-import { PermissionFlagType } from '~/generated-metadata/graphql';--const StyledAttachmentsContainer = styled.div`- display: flex;- flex: 1;- flex-direction: column;- height: 100%;- overflow: auto;-`;--const StyledFileInput = styled.input`- display: none;-`;--const StyledDropZoneContainer = styled.div`- height: 100%;-`;export const FilesCard = () => {const targetRecord = useTargetRecord();- const inputFileRef = useRef<HTMLInputElement>(null);const { attachments, loading, totalCountAttachments } =useAttachments(targetRecord);- const { uploadAttachmentFile } = useUploadAttachmentFile();-- const [isDraggingFile, setIsDraggingFile] = useState(false);-- const { t } = useLingui();+ const { uploadAttachmentFiles } = useUploadAttachmentFiles();+ const { canUploadFiles } = useCanUploadAttachmentFiles(targetRecord);- const onUploadFile = async (file: File) => {- await uploadAttachmentFile(file, targetRecord);- };-- const onUploadFiles = async (files: File[]) => {- for (const file of files) {- await onUploadFile(file);- }- };-- const handleFileChange = (e: ChangeEvent<HTMLInputElement>) => {- if (isDefined(e.target.files)) {- onUploadFiles(Array.from(e.target.files));- }- };-- const handleUploadFileClick = () => {- inputFileRef?.current?.click?.();- };-- const isAttachmentsEmpty = attachments.length === 0;-- const { objectMetadataItem } = useObjectMetadataItem({- objectNameSingular: targetRecord.targetObjectNameSingular,- });-- const objectPermissions = useObjectPermissionsForObject(- objectMetadataItem.id,- );-- const hasObjectUpdatePermissions = objectPermissions.canUpdateObjectRecords;-- const hasUploadPermission = useHasPermissionFlag(- PermissionFlagType.UPLOAD_FILE,- );-- const canUploadFiles = hasObjectUpdatePermissions && hasUploadPermission;-- const addFileAction = useMemo(- () =>- canUploadFiles- ? {- Icon: IconPlus,- label: t`Add file`,- onClick: () => inputFileRef?.current?.click?.(),- }- : undefined,- [canUploadFiles, t],- );-- usePublishWidgetHeaderInfo({- count: totalCountAttachments,- primaryAction: addFileAction,- });-- if (loading && isAttachmentsEmpty) {- return <SkeletonLoader />;- }-- if (isAttachmentsEmpty) {- return (- <StyledDropZoneContainer- onDragEnter={() => canUploadFiles && setIsDraggingFile(true)}- >- {isDraggingFile && canUploadFiles ? (- <DropZone- setIsDraggingFile={setIsDraggingFile}- onUploadFiles={onUploadFiles}- />- ) : (- <AnimatedPlaceholderEmptyContainer>- <AnimatedPlaceholder type="noFile" />- <AnimatedPlaceholderEmptyTextContainer>- <AnimatedPlaceholderEmptyTitle>- <Trans>No Files</Trans>- </AnimatedPlaceholderEmptyTitle>- <AnimatedPlaceholderEmptySubTitle>- <Trans>There are no associated files with this record.</Trans>- </AnimatedPlaceholderEmptySubTitle>- </AnimatedPlaceholderEmptyTextContainer>- <StyledFileInput- ref={inputFileRef}- onChange={handleFileChange}- type="file"- multiple- />- {canUploadFiles && (- <Button- Icon={IconPlus}- title={t`Add file`}- variant="secondary"- onClick={handleUploadFileClick}- />- )}- </AnimatedPlaceholderEmptyContainer>- )}- </StyledDropZoneContainer>- );- }+ const handleUploadFiles = (files: File[]) =>+ uploadAttachmentFiles({ files, targetableObject: targetRecord });return (- <StyledAttachmentsContainer>- <StyledFileInput- ref={inputFileRef}- onChange={handleFileChange}- type="file"- multiple- />- <AttachmentList- targetableObject={targetRecord}- attachments={attachments ?? []}+ <>+ <WidgetHeaderCountEffect count={totalCountAttachments} />+ <FilesCardContent+ attachments={attachments}+ canUploadFiles={canUploadFiles}+ loading={loading}+ onUploadFiles={handleUploadFiles}+ targetRecord={targetRecord}/>- </StyledAttachmentsContainer>+ </>);};diff --git a/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsx b/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsxnew file mode 100644index 00000000000..9ced9306ae5--- /dev/null+++ b/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsx@@ -0,0 +1,103 @@+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';+import { AttachmentList } from '@/activities/files/components/AttachmentList';+import { AttachmentUploadTrigger } from '@/activities/files/components/AttachmentUploadTrigger';+import { DropZone } from '@/activities/files/components/DropZone';+import { type Attachment } from '@/activities/files/types/Attachment';+import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';+import { styled } from '@linaria/react';+import { Trans, useLingui } from '@lingui/react/macro';+import { useState } from 'react';+import {+ AnimatedPlaceholder,+ AnimatedPlaceholderEmptyContainer,+ AnimatedPlaceholderEmptySubTitle,+ AnimatedPlaceholderEmptyTextContainer,+ AnimatedPlaceholderEmptyTitle,+} from 'twenty-ui/feedback';+import { IconPlus } from 'twenty-ui/icon';+import { Button } from 'twenty-ui/input';++const StyledAttachmentsContainer = styled.div`+ display: flex;+ flex: 1;+ flex-direction: column;+ height: 100%;+ overflow: auto;+`;++const StyledDropZoneContainer = styled.div`+ height: 100%;+`;++type FilesCardContentProps = {+ attachments: Attachment[];+ canUploadFiles: boolean;+ loading: boolean;+ onUploadFiles: (files: File[]) => Promise<void>;+ targetRecord: ActivityTargetableObject;+};++export const FilesCardContent = ({+ attachments,+ canUploadFiles,+ loading,+ onUploadFiles,+ targetRecord,+}: FilesCardContentProps) => {+ const [isDraggingFile, setIsDraggingFile] = useState(false);+ const { t } = useLingui();++ const isAttachmentsEmpty = attachments.length === 0;++ if (loading && isAttachmentsEmpty) {+ return <SkeletonLoader />;+ }++ if (isAttachmentsEmpty) {+ return (+ <StyledDropZoneContainer+ onDragEnter={() => canUploadFiles && setIsDraggingFile(true)}+ >+ {isDraggingFile && canUploadFiles ? (+ <DropZone+ setIsDraggingFile={setIsDraggingFile}+ onUploadFiles={onUploadFiles}+ />+ ) : (+ <AnimatedPlaceholderEmptyContainer>+ <AnimatedPlaceholder type="noFile" />+ <AnimatedPlaceholderEmptyTextContainer>+ <AnimatedPlaceholderEmptyTitle>+ <Trans>No Files</Trans>+ </AnimatedPlaceholderEmptyTitle>+ <AnimatedPlaceholderEmptySubTitle>+ <Trans>There are no associated files with this record.</Trans>+ </AnimatedPlaceholderEmptySubTitle>+ </AnimatedPlaceholderEmptyTextContainer>+ {canUploadFiles && (+ <AttachmentUploadTrigger targetableObject={targetRecord}>+ {({ openFilePicker }) => (+ <Button+ Icon={IconPlus}+ title={t`Add file`}+ variant="secondary"+ onClick={openFilePicker}+ />+ )}+ </AttachmentUploadTrigger>+ )}+ </AnimatedPlaceholderEmptyContainer>+ )}+ </StyledDropZoneContainer>+ );+ }++ return (+ <StyledAttachmentsContainer>+ <AttachmentList+ targetableObject={targetRecord}+ attachments={attachments}+ />+ </StyledAttachmentsContainer>+ );+};diff --git a/packages/twenty-front/src/modules/activities/files/hooks/useCanUploadAttachmentFiles.ts b/packages/twenty-front/src/modules/activities/files/hooks/useCanUploadAttachmentFiles.tsnew file mode 100644index 00000000000..c0ec6a7e945--- /dev/null+++ b/packages/twenty-front/src/modules/activities/files/hooks/useCanUploadAttachmentFiles.ts@@ -0,0 +1,20 @@+import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';+import { useCanUpdateObjectRecords } from '@/object-record/hooks/useCanUpdateObjectRecords';+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';+import { PermissionFlagType } from '~/generated-metadata/graphql';++export const useCanUploadAttachmentFiles = (+ targetableObject: ActivityTargetableObject,+) => {+ const { canUpdateObjectRecords } = useCanUpdateObjectRecords(+ targetableObject.targetObjectNameSingular,+ );++ const hasUploadPermission = useHasPermissionFlag(+ PermissionFlagType.UPLOAD_FILE,+ );++ return {+ canUploadFiles: canUpdateObjectRecords && hasUploadPermission,+ };+};diff --git a/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFiles.ts b/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFiles.tsnew file mode 100644index 00000000000..e7c75d4ff4d--- /dev/null+++ b/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFiles.ts@@ -0,0 +1,20 @@+import { useUploadAttachmentFile } from '@/activities/files/hooks/useUploadAttachmentFile';+import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';++export const useUploadAttachmentFiles = () => {+ const { uploadAttachmentFile } = useUploadAttachmentFile();++ const uploadAttachmentFiles = async ({+ files,+ targetableObject,+ }: {+ files: File[];+ targetableObject: ActivityTargetableObject;+ }) => {+ for (const file of files) {+ await uploadAttachmentFile(file, targetableObject);+ }+ };++ return { uploadAttachmentFiles };+};diff --git a/packages/twenty-front/src/modules/activities/hooks/useCreateActivityForTargetRecord.ts b/packages/twenty-front/src/modules/activities/hooks/useCreateActivityForTargetRecord.tsnew file mode 100644index 00000000000..8ead7bbfa23--- /dev/null+++ b/packages/twenty-front/src/modules/activities/hooks/useCreateActivityForTargetRecord.ts@@ -0,0 +1,35 @@+import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';+import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';+import { useCanUpdateObjectRecords } from '@/object-record/hooks/useCanUpdateObjectRecords';+import { type CoreObjectNameSingular } from 'twenty-shared/types';++type UseCreateActivityForTargetRecordParams = {+ targetRecord: ActivityTargetableObject;+ activityObjectNameSingular:+ | CoreObjectNameSingular.Note+ | CoreObjectNameSingular.Task;+};++// Creating an activity attaches it to the target record, so it requires+// update permission on the target object, not just create permission on the+// activity object.+export const useCreateActivityForTargetRecord = ({+ targetRecord,+ activityObjectNameSingular,+}: UseCreateActivityForTargetRecordParams) => {+ const { canUpdateObjectRecords } = useCanUpdateObjectRecords(+ targetRecord.targetObjectNameSingular,+ );++ const openCreateActivityDrawer = useOpenCreateActivityDrawer({+ activityObjectNameSingular,+ });++ const createActivity = () =>+ openCreateActivityDrawer({ targetableObjects: [targetRecord] });++ return {+ canCreateActivity: canUpdateObjectRecords,+ createActivity,+ };+};diff --git a/packages/twenty-front/src/modules/activities/notes/components/NotesCard.tsx b/packages/twenty-front/src/modules/activities/notes/components/NotesCard.tsxindex 8d17d171a13..967184b34e8 100644--- a/packages/twenty-front/src/modules/activities/notes/components/NotesCard.tsx+++ b/packages/twenty-front/src/modules/activities/notes/components/NotesCard.tsx@@ -1,33 +1,9 @@-import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';-import { SkeletonLoader } from '@/activities/components/SkeletonLoader';-import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';-import { NoteList } from '@/activities/notes/components/NoteList';+import { useCreateActivityForTargetRecord } from '@/activities/hooks/useCreateActivityForTargetRecord';+import { NotesCardContent } from '@/activities/notes/components/NotesCardContent';import { useNotes } from '@/activities/notes/hooks/useNotes';-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';-import { CoreObjectNameSingular } from 'twenty-shared/types';-import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';-import { usePublishWidgetHeaderInfo } from '@/page-layout/widgets/hooks/usePublishWidgetHeaderInfo';+import { WidgetHeaderCountEffect } from '@/page-layout/widgets/components/WidgetHeaderCountEffect';import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';-import { styled } from '@linaria/react';-import { t } from '@lingui/core/macro';-import { useMemo } from 'react';-import { IconPlus } from 'twenty-ui/icon';-import { Button } from 'twenty-ui/input';-import {- AnimatedPlaceholder,- AnimatedPlaceholderEmptyContainer,- AnimatedPlaceholderEmptySubTitle,- AnimatedPlaceholderEmptyTextContainer,- AnimatedPlaceholderEmptyTitle,-} from 'twenty-ui/feedback';--const StyledNotesContainer = styled.div`- display: flex;- flex: 1;- flex-direction: column;- height: 100%;- overflow: auto;-`;+import { CoreObjectNameSingular } from 'twenty-shared/types';export const NotesCard = () => {const targetRecord = useTargetRecord();@@ -40,79 +16,21 @@ export const NotesCard = () => {}};- const openCreateActivity = useOpenCreateActivityDrawer({- activityObjectNameSingular: CoreObjectNameSingular.Note,- });-- const isNotesEmpty = notes.length === 0;-- const { objectMetadataItem } = useObjectMetadataItem({- objectNameSingular: targetRecord.targetObjectNameSingular,- });-- const objectPermissions = useObjectPermissionsForObject(- objectMetadataItem.id,- );-- const hasObjectUpdatePermissions = objectPermissions.canUpdateObjectRecords;-- const newNoteAction = useMemo(- () =>- hasObjectUpdatePermissions- ? {- Icon: IconPlus,- label: t`New note`,- onClick: () =>- openCreateActivity({ targetableObjects: [targetRecord] }),- }- : undefined,- [hasObjectUpdatePermissions, openCreateActivity, targetRecord],- );-- usePublishWidgetHeaderInfo({- count: totalCountNotes,- primaryAction: newNoteAction,- });-- if (loading && isNotesEmpty) {- return <SkeletonLoader />;- }-- if (isNotesEmpty) {- return (- <AnimatedPlaceholderEmptyContainer>- <AnimatedPlaceholder type="noNote" />- <AnimatedPlaceholderEmptyTextContainer>- <AnimatedPlaceholderEmptyTitle>- {t`No notes`}- </AnimatedPlaceholderEmptyTitle>- <AnimatedPlaceholderEmptySubTitle>- {t`There are no associated notes with this record.`}- </AnimatedPlaceholderEmptySubTitle>- </AnimatedPlaceholderEmptyTextContainer>- {hasObjectUpdatePermissions && (- <Button- Icon={IconPlus}- title={t`New note`}- variant="secondary"- onClick={() =>- openCreateActivity({- targetableObjects: [targetRecord],- })- }- />- )}- </AnimatedPlaceholderEmptyContainer>- );- }+ const { canCreateActivity, createActivity } =+ useCreateActivityForTargetRecord({+ targetRecord,+ activityObjectNameSingular: CoreObjectNameSingular.Note,+ });return (- <StyledNotesContainer>- <NoteList notes={notes} />- <CustomResolverFetchMoreLoader+ <>+ <WidgetHeaderCountEffect count={totalCountNotes} />+ <NotesCardContentloading={loading}+ notes={notes}+ onCreateNote={canCreateActivity ? createActivity : undefined}onLastRowVisible={handleLastRowVisible}/>- </StyledNotesContainer>+ </>);};diff --git a/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsx b/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsxnew file mode 100644index 00000000000..787e0bc5fc1--- /dev/null+++ b/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsx@@ -0,0 +1,78 @@+import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';+import { NoteList } from '@/activities/notes/components/NoteList';+import { type Note } from '@/activities/types/Note';+import { styled } from '@linaria/react';+import { t } from '@lingui/core/macro';+import { isDefined } from 'twenty-shared/utils';+import {+ AnimatedPlaceholder,+ AnimatedPlaceholderEmptyContainer,+ AnimatedPlaceholderEmptySubTitle,+ AnimatedPlaceholderEmptyTextContainer,+ AnimatedPlaceholderEmptyTitle,+} from 'twenty-ui/feedback';+import { IconPlus } from 'twenty-ui/icon';+import { Button } from 'twenty-ui/input';++const StyledNotesContainer = styled.div`+ display: flex;+ flex: 1;+ flex-direction: column;+ height: 100%;+ overflow: auto;+`;++type NotesCardContentProps = {+ loading: boolean;+ notes: Note[];+ onCreateNote: (() => void) | undefined;+ onLastRowVisible: () => Promise<void>;+};++export const NotesCardContent = ({+ loading,+ notes,+ onCreateNote,+ onLastRowVisible,+}: NotesCardContentProps) => {+ const isNotesEmpty = notes.length === 0;++ if (loading && isNotesEmpty) {+ return <SkeletonLoader />;+ }++ if (isNotesEmpty) {+ return (+ <AnimatedPlaceholderEmptyContainer>+ <AnimatedPlaceholder type="noNote" />+ <AnimatedPlaceholderEmptyTextContainer>+ <AnimatedPlaceholderEmptyTitle>+ {t`No notes`}+ </AnimatedPlaceholderEmptyTitle>+ <AnimatedPlaceholderEmptySubTitle>+ {t`There are no associated notes with this record.`}+ </AnimatedPlaceholderEmptySubTitle>+ </AnimatedPlaceholderEmptyTextContainer>+ {isDefined(onCreateNote) && (+ <Button+ Icon={IconPlus}+ title={t`New note`}+ variant="secondary"+ onClick={onCreateNote}+ />+ )}+ </AnimatedPlaceholderEmptyContainer>+ );+ }++ return (+ <StyledNotesContainer>+ <NoteList notes={notes} />+ <CustomResolverFetchMoreLoader+ loading={loading}+ onLastRowVisible={onLastRowVisible}+ />+ </StyledNotesContainer>+ );+};diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsxindex 5fd2a00970d..7ddf17cf9d5 100644--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroups.tsx@@ -1,35 +1,9 @@-import { styled } from '@linaria/react';--import { SkeletonLoader } from '@/activities/components/SkeletonLoader';-import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';+import { useCreateActivityForTargetRecord } from '@/activities/hooks/useCreateActivityForTargetRecord';+import { TaskGroupsContent } from '@/activities/tasks/components/TaskGroupsContent';import { useTasks } from '@/activities/tasks/hooks/useTasks';import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';-import { type Task } from '@/activities/types/Task';-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';-import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';-import { usePublishWidgetHeaderInfo } from '@/page-layout/widgets/hooks/usePublishWidgetHeaderInfo';-import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { t } from '@lingui/core/macro';-import groupBy from 'lodash.groupby';-import { useMemo } from 'react';+import { WidgetHeaderCountEffect } from '@/page-layout/widgets/components/WidgetHeaderCountEffect';import { CoreObjectNameSingular } from 'twenty-shared/types';-import { IconPlus } from 'twenty-ui/icon';-import { Button } from 'twenty-ui/input';-import {- AnimatedPlaceholder,- AnimatedPlaceholderEmptyContainer,- AnimatedPlaceholderEmptySubTitle,- AnimatedPlaceholderEmptyTextContainer,- AnimatedPlaceholderEmptyTitle,-} from 'twenty-ui/feedback';-import { TaskList } from './TaskList';--const StyledContainer = styled.div`- display: flex;- flex-direction: column;- width: 100%;-`;type TaskGroupsProps = {filterDropdownId?: string;@@ -41,89 +15,20 @@ export const TaskGroups = ({ targetableObject }: TaskGroupsProps) => {targetableObjects: [targetableObject],});- const { objectMetadataItem } = useObjectMetadataItem({- objectNameSingular: targetableObject.targetObjectNameSingular,- });-- const objectPermissions = useObjectPermissionsForObject(- objectMetadataItem.id,- );-- const hasObjectUpdatePermissions = objectPermissions.canUpdateObjectRecords;-- const openCreateActivity = useOpenCreateActivityDrawer({- activityObjectNameSingular: CoreObjectNameSingular.Task,- });-- const newTaskAction = useMemo(- () =>- hasObjectUpdatePermissions- ? {- Icon: IconPlus,- label: t`New task`,- onClick: () =>- openCreateActivity({ targetableObjects: [targetableObject] }),- }- : undefined,- [hasObjectUpdatePermissions, openCreateActivity, targetableObject],- );-- usePublishWidgetHeaderInfo({- count: totalCountTasks,- primaryAction: newTaskAction,- });-- const activeTabId = useAtomComponentStateValue(activeTabIdComponentState);-- const isLoading =- (activeTabId !== 'done' && tasksLoading) ||- (activeTabId === 'done' && tasksLoading);-- const isTasksEmpty =- (activeTabId !== 'done' && tasks?.length === 0) ||- (activeTabId === 'done' && tasks?.length === 0);-- if (isLoading && isTasksEmpty) {- return <SkeletonLoader />;- }-- if (isTasksEmpty) {- return (- <AnimatedPlaceholderEmptyContainer>- <AnimatedPlaceholder type="noTask" />- <AnimatedPlaceholderEmptyTextContainer>- <AnimatedPlaceholderEmptyTitle>- {t`Mission accomplished!`}- </AnimatedPlaceholderEmptyTitle>- <AnimatedPlaceholderEmptySubTitle>- {t`All tasks addressed. Maintain the momentum.`}- </AnimatedPlaceholderEmptySubTitle>- </AnimatedPlaceholderEmptyTextContainer>- {hasObjectUpdatePermissions && (- <Button- Icon={IconPlus}- title={t`New task`}- variant="secondary"- onClick={() =>- openCreateActivity({- targetableObjects: [targetableObject],- })- }- />- )}- </AnimatedPlaceholderEmptyContainer>- );- }-- const sortedTasksByStatus = Object.entries(- groupBy(tasks, ({ status }) => status),- ).sort(([statusA], [statusB]) => statusB.localeCompare(statusA));+ const { canCreateActivity, createActivity } =+ useCreateActivityForTargetRecord({+ targetRecord: targetableObject,+ activityObjectNameSingular: CoreObjectNameSingular.Task,+ });return (- <StyledContainer>- {sortedTasksByStatus.map(([status, tasksByStatus]: [string, Task[]]) => (- <TaskList key={status} title={status} tasks={tasksByStatus} />- ))}- </StyledContainer>+ <>+ <WidgetHeaderCountEffect count={totalCountTasks} />+ <TaskGroupsContent+ isLoading={tasksLoading}+ onCreateTask={canCreateActivity ? createActivity : undefined}+ tasks={tasks}+ />+ </>);};diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsxnew file mode 100644index 00000000000..b33d6c7eb7d--- /dev/null+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx@@ -0,0 +1,76 @@+import { SkeletonLoader } from '@/activities/components/SkeletonLoader';+import { TaskList } from '@/activities/tasks/components/TaskList';+import { type Task } from '@/activities/types/Task';+import { styled } from '@linaria/react';+import { t } from '@lingui/core/macro';+import groupBy from 'lodash.groupby';+import { isDefined } from 'twenty-shared/utils';+import {+ AnimatedPlaceholder,+ AnimatedPlaceholderEmptyContainer,+ AnimatedPlaceholderEmptySubTitle,+ AnimatedPlaceholderEmptyTextContainer,+ AnimatedPlaceholderEmptyTitle,+} from 'twenty-ui/feedback';+import { IconPlus } from 'twenty-ui/icon';+import { Button } from 'twenty-ui/input';++const StyledContainer = styled.div`+ display: flex;+ flex-direction: column;+ width: 100%;+`;++type TaskGroupsContentProps = {+ isLoading: boolean;+ onCreateTask: (() => void) | undefined;+ tasks: Task[];+};++export const TaskGroupsContent = ({+ isLoading,+ onCreateTask,+ tasks,+}: TaskGroupsContentProps) => {+ const isTasksEmpty = tasks.length === 0;++ if (isLoading && isTasksEmpty) {+ return <SkeletonLoader />;+ }++ if (isTasksEmpty) {+ return (+ <AnimatedPlaceholderEmptyContainer>+ <AnimatedPlaceholder type="noTask" />+ <AnimatedPlaceholderEmptyTextContainer>+ <AnimatedPlaceholderEmptyTitle>+ {t`Mission accomplished!`}+ </AnimatedPlaceholderEmptyTitle>+ <AnimatedPlaceholderEmptySubTitle>+ {t`All tasks addressed. Maintain the momentum.`}+ </AnimatedPlaceholderEmptySubTitle>+ </AnimatedPlaceholderEmptyTextContainer>+ {isDefined(onCreateTask) && (+ <Button+ Icon={IconPlus}+ title={t`New task`}+ variant="secondary"+ onClick={onCreateTask}+ />+ )}+ </AnimatedPlaceholderEmptyContainer>+ );+ }++ const sortedTasksByStatus = Object.entries(+ groupBy(tasks, ({ status }) => status),+ ).sort(([statusA], [statusB]) => statusB.localeCompare(statusA));++ return (+ <StyledContainer>+ {sortedTasksByStatus.map(([status, tasksByStatus]: [string, Task[]]) => (+ <TaskList key={status} title={status} tasks={tasksByStatus} />+ ))}+ </StyledContainer>+ );+};diff --git a/packages/twenty-front/src/modules/object-record/hooks/useCanUpdateObjectRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useCanUpdateObjectRecords.tsnew file mode 100644index 00000000000..b2c1b18d2d4--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/hooks/useCanUpdateObjectRecords.ts@@ -0,0 +1,14 @@+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';+import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';++export const useCanUpdateObjectRecords = (objectNameSingular: string) => {+ const { objectMetadataItem } = useObjectMetadataItem({+ objectNameSingular,+ });++ const objectPermissions = useObjectPermissionsForObject(+ objectMetadataItem.id,+ );++ return { canUpdateObjectRecords: objectPermissions.canUpdateObjectRecords };+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/NonRecordPageWidgetRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/NonRecordPageWidgetRenderer.tsxindex fab9a17ec18..78b89873258 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/NonRecordPageWidgetRenderer.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/NonRecordPageWidgetRenderer.tsx@@ -25,7 +25,6 @@ export const NonRecordPageWidgetRenderer = ({showHeader={state.showHeader}hasAccess={state.hasAccess}restriction={state.restriction}- actions={[]}isInVerticalListTab={state.isInVerticalListTab}isMobile={state.isMobile}isReorderEnabled={true}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetRenderer.tsxindex 1f00a596be4..0ad3ab1d2ce 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetRenderer.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetRenderer.tsx@@ -1,6 +1,5 @@import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { WidgetCardShell } from '@/page-layout/widgets/components/WidgetCardShell';-import { useWidgetActions } from '@/page-layout/widgets/hooks/useWidgetActions';import { useWidgetRendererState } from '@/page-layout/widgets/hooks/useWidgetRendererState';type RecordPageWidgetRendererProps = {@@ -14,8 +13,6 @@ export const RecordPageWidgetRenderer = ({const isWidgetEditable = state.isPageLayoutInEditMode;- const actions = useWidgetActions({ widget });-const isSoloVariant = state.variant === 'solo';return (@@ -30,7 +27,6 @@ export const RecordPageWidgetRenderer = ({showHeader={state.showHeader}hasAccess={state.hasAccess}restriction={state.restriction}- actions={actions}isInVerticalListTab={state.isInVerticalListTab}isMobile={state.isMobile}isReorderEnabled={true}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionActivityCreate.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionActivityCreate.tsxnew file mode 100644index 00000000000..93fe0d7e65a--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionActivityCreate.tsx@@ -0,0 +1,37 @@+import { useCreateActivityForTargetRecord } from '@/activities/hooks/useCreateActivityForTargetRecord';+import { WidgetCardHeaderActionButton } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton';+import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';+import { type CoreObjectNameSingular } from 'twenty-shared/types';+import { IconPlus } from 'twenty-ui/icon';++type WidgetActionActivityCreateProps = {+ activityObjectNameSingular:+ | CoreObjectNameSingular.Note+ | CoreObjectNameSingular.Task;+ label: string;+};++export const WidgetActionActivityCreate = ({+ activityObjectNameSingular,+ label,+}: WidgetActionActivityCreateProps) => {+ const targetRecord = useTargetRecord();++ const { canCreateActivity, createActivity } =+ useCreateActivityForTargetRecord({+ targetRecord,+ activityObjectNameSingular,+ });++ if (!canCreateActivity) {+ return null;+ }++ return (+ <WidgetCardHeaderActionButton+ Icon={IconPlus}+ label={label}+ onClick={createActivity}+ />+ );+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsxindex f18727c3b7c..b850144f0b1 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx@@ -1,7 +1,4 @@-import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';-import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';@@ -16,37 +13,28 @@ import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guarimport { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';import { useRecordShowContainerActions } from '@/object-record/record-show/hooks/useRecordShowContainerActions';import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';-import { useResolveFieldMetadataIdFromNameOrId } from '@/page-layout/hooks/useResolveFieldMetadataIdFromNameOrId';+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { FieldWidgetEditAction } from '@/page-layout/widgets/field/components/FieldWidgetEditAction';import { FieldWidgetRelationEditAction } from '@/page-layout/widgets/field/components/FieldWidgetRelationEditAction';+import { useFieldWidgetFieldDefinition } from '@/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition';import { generateFieldWidgetInstanceId } from '@/page-layout/widgets/field/utils/generateFieldWidgetInstanceId';-import { isFieldWidget } from '@/page-layout/widgets/field/utils/isFieldWidget';-import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';import { assertIsDefinedOrThrow } from 'twenty-shared/utils';-export const WidgetActionFieldEdit = () => {- const widget = useCurrentWidget();+type WidgetActionFieldEditProps = {+ widget: PageLayoutWidget;+};++export const WidgetActionFieldEdit = ({+ widget,+}: WidgetActionFieldEditProps) => {const targetRecord = useTargetRecord();const { isInSidePanel } = useLayoutRenderingContext();- const { objectMetadataItem } = useObjectMetadataItem({- objectNameSingular: targetRecord.targetObjectNameSingular,- });-- const fieldMetadataId = isFieldWidget(widget)- ? widget.configuration.fieldMetadataId- : undefined;-- const resolvedFieldMetadataId = useResolveFieldMetadataIdFromNameOrId(- fieldMetadataId ?? '',- );-- const { fieldMetadataItem } = useFieldMetadataItemById(- resolvedFieldMetadataId ?? '',- );+ const { objectMetadataItem, fieldMetadataItem, fieldDefinition } =+ useFieldWidgetFieldDefinition(widget);const { objectPermissionsByObjectMetadataId } = useObjectPermissions();const getIsMetadataItemFromStandardApplication =@@ -62,14 +50,7 @@ export const WidgetActionFieldEdit = () => {});assertIsDefinedOrThrow(fieldMetadataItem);-- const fieldDefinition = formatFieldMetadataItemAsColumnDefinition({- field: fieldMetadataItem,- position: 0,- objectMetadataItem,- showLabel: true,- labelWidth: 90,- });+ assertIsDefinedOrThrow(fieldDefinition);const isRelationField =isFieldRelation(fieldDefinition) || isFieldMorphRelation(fieldDefinition);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsxindex b9b92ffa9bc..5817552fe9a 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx@@ -1,13 +1,7 @@-import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';-import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';-import { hasJunctionConfig } from '@/object-record/record-field/ui/utils/junction/hasJunctionConfig';-import { useResolveFieldMetadataIdFromNameOrId } from '@/page-layout/hooks/useResolveFieldMetadataIdFromNameOrId';-import { isFieldWidget } from '@/page-layout/widgets/field/utils/isFieldWidget';-import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import { useFieldWidgetFieldDefinition } from '@/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition';import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';import { indexViewIdFromObjectMetadataItemFamilySelector } from '@/views/states/selectors/indexViewIdFromObjectMetadataItemFamilySelector';@@ -17,9 +11,8 @@ import { Link } from 'react-router-dom';import { AppPath, ViewFilterOperand } from 'twenty-shared/types';import { getAppPath, isDefined } from 'twenty-shared/utils';import { IconArrowUpRight } from 'twenty-ui/icon';-import { AppTooltip, TooltipDelay, TooltipPosition } from 'twenty-ui/surfaces';import { LightIconButton } from 'twenty-ui/input';-import { RelationType } from '~/generated-metadata/graphql';+import { AppTooltip, TooltipDelay, TooltipPosition } from 'twenty-ui/surfaces';const StyledLinkContainer = styled.div`display: flex;@@ -29,50 +22,24 @@ const StyledLinkContainer = styled.div`}`;-const StyledSeeAllButtonWrapper = styled.div`- opacity: 1;- pointer-events: auto;-`;+type WidgetActionFieldSeeAllProps = {+ widget: PageLayoutWidget;+};-export const WidgetActionFieldSeeAll = () => {- const widget = useCurrentWidget();+export const WidgetActionFieldSeeAll = ({+ widget,+}: WidgetActionFieldSeeAllProps) => {const targetRecord = useTargetRecord();- const { objectMetadataItem } = useObjectMetadataItem({- objectNameSingular: targetRecord.targetObjectNameSingular,- });-- const fieldMetadataId = isFieldWidget(widget)- ? widget.configuration.fieldMetadataId- : undefined;-- const resolvedFieldMetadataId = useResolveFieldMetadataIdFromNameOrId(- fieldMetadataId ?? '',- );-- const { fieldMetadataItem } = useFieldMetadataItemById(- resolvedFieldMetadataId ?? '',- );-- const fieldDefinition = isDefined(fieldMetadataItem)- ? formatFieldMetadataItemAsColumnDefinition({- field: fieldMetadataItem,- position: 0,- objectMetadataItem,- showLabel: true,- labelWidth: 90,- })- : null;+ const { fieldDefinition } = useFieldWidgetFieldDefinition(widget);const relationMetadata =isDefined(fieldDefinition) && isFieldRelation(fieldDefinition)- ? (fieldDefinition.metadata as FieldRelationMetadata)+ ? fieldDefinition.metadata: null;const { objectMetadataItems } = useObjectMetadataItems();- const isJunction = hasJunctionConfig(relationMetadata?.settings);-const relationObjectMetadataItem = objectMetadataItems.find((item) =>item.nameSingular ===@@ -83,26 +50,18 @@ export const WidgetActionFieldSeeAll = () => {({ id }) => id === relationMetadata?.relationFieldMetadataId,);- const targetObjectMetadataItem = relationObjectMetadataItem;-const indexViewId = useAtomFamilySelectorValue(indexViewIdFromObjectMetadataItemFamilySelector,- { objectMetadataItemId: targetObjectMetadataItem?.id ?? '' },+ { objectMetadataItemId: relationObjectMetadataItem?.id ?? '' },);if (- !isDefined(relationMetadata) ||- relationMetadata.relationType !== RelationType.ONE_TO_MANY ||- !isDefined(targetObjectMetadataItem) ||- isJunction+ !isDefined(relationObjectMetadataItem) ||+ !isDefined(relationFieldMetadataItem)) {return null;}- if (!isDefined(relationFieldMetadataItem)) {- return null;- }-const filterQueryParams = {filter: {[relationFieldMetadataItem.name]: {@@ -117,14 +76,14 @@ export const WidgetActionFieldSeeAll = () => {const filterLinkHref = getAppPath(AppPath.RecordIndexPage,{- objectNamePlural: targetObjectMetadataItem.namePlural,+ objectNamePlural: relationObjectMetadataItem.namePlural,},filterQueryParams,);const tooltipId = `widget-see-all-${widget.id}`;const relationLabelPlural =- targetObjectMetadataItem.labelPlural.toLowerCase();+ relationObjectMetadataItem.labelPlural.toLowerCase();const tooltipContent = t`See all ${relationLabelPlural} linked to this record`;return (@@ -132,9 +91,7 @@ export const WidgetActionFieldSeeAll = () => {<div id={tooltipId}><StyledLinkContainer><Link to={filterLinkHref} data-testid="widget-see-all-link">- <StyledSeeAllButtonWrapper>- <LightIconButton Icon={IconArrowUpRight} accent="secondary" />- </StyledSeeAllButtonWrapper>+ <LightIconButton Icon={IconArrowUpRight} accent="secondary" /></Link></StyledLinkContainer></div>diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionRenderer.tsxdeleted file mode 100644index 99871a1a101..00000000000--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionRenderer.tsx+++ /dev/null@@ -1,27 +0,0 @@-import { type WidgetAction } from '@/page-layout/widgets/types/WidgetAction';-import { CustomError } from 'twenty-shared/utils';-import { WidgetType } from '~/generated-metadata/graphql';-import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';-import { WidgetActionFieldEdit } from './WidgetActionFieldEdit';-import { WidgetActionFieldSeeAll } from './WidgetActionFieldSeeAll';--type WidgetActionRendererProps = {- action: WidgetAction;-};--export const WidgetActionRenderer = ({ action }: WidgetActionRendererProps) => {- const widget = useCurrentWidget();-- if (action.id === 'edit' && widget.type === WidgetType.FIELD) {- return <WidgetActionFieldEdit />;- }-- if (action.id === 'see-all' && widget.type === WidgetType.FIELD) {- return <WidgetActionFieldSeeAll />;- }-- throw new CustomError(- `Unsupported action renderer for action id: ${action.id}`,- 'UNSUPPORTED_WIDGET_ACTION_RENDERER',- );-};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsxindex dfffd3abe9a..af803eb3478 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx@@ -4,7 +4,6 @@ import { PageLayoutWidgetInvalidConfigDisplay } from '@/page-layout/widgets/compimport { WidgetContentRenderer } from '@/page-layout/widgets/components/WidgetContentRenderer';import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';import { type WidgetAccessDenialInfo } from '@/page-layout/widgets/types/WidgetAccessDenialInfo';-import { type WidgetAction } from '@/page-layout/widgets/types/WidgetAction';import { type WidgetCardVariant } from '@/page-layout/widgets/types/WidgetCardVariant';import { WidgetCard } from '@/page-layout/widgets/widget-card/components/WidgetCard';import { WidgetCardContent } from '@/page-layout/widgets/widget-card/components/WidgetCardContent';@@ -33,7 +32,6 @@ type WidgetCardShellProps = {showHeader: boolean;hasAccess: boolean;restriction: WidgetAccessDenialInfo;- actions: WidgetAction[];isInVerticalListTab: boolean;isMobile: boolean;isReorderEnabled: boolean;@@ -55,7 +53,6 @@ export const WidgetCardShell = ({showHeader,hasAccess,restriction,- actions,isInVerticalListTab,isMobile,isReorderEnabled,@@ -97,12 +94,12 @@ export const WidgetCardShell = ({widgetId={widget.id}variant={variant}isInEditMode={isEditable}+ hasAccess={hasAccess}isResizing={isResizing}isReorderEnabled={isReorderEnabled}isDeletingWidgetEnabled={isDeletingWidgetEnabled}title={widget.title}onRemove={onRemove}- actions={actions}forbiddenDisplay={!hasAccess && (<PageLayoutWidgetForbiddenDisplaydiff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetFieldActions.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetFieldActions.tsxnew file mode 100644index 00000000000..681d71d2cd1--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetFieldActions.tsx@@ -0,0 +1,19 @@+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import { WidgetActionFieldEdit } from '@/page-layout/widgets/components/WidgetActionFieldEdit';+import { WidgetActionFieldSeeAll } from '@/page-layout/widgets/components/WidgetActionFieldSeeAll';+import { useFieldWidgetActionVisibility } from '@/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility';++type WidgetFieldActionsProps = {+ widget: PageLayoutWidget;+};++export const WidgetFieldActions = ({ widget }: WidgetFieldActionsProps) => {+ const { showSeeAll, showEdit } = useFieldWidgetActionVisibility({ widget });++ return (+ <>+ {showSeeAll && <WidgetActionFieldSeeAll widget={widget} />}+ {showEdit && <WidgetActionFieldEdit widget={widget} />}+ </>+ );+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetHeaderCountEffect.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetHeaderCountEffect.tsxnew file mode 100644index 00000000000..d4509596fe3--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetHeaderCountEffect.tsx@@ -0,0 +1,32 @@+import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';+import { WidgetHeaderCountSyncEffect } from '@/page-layout/widgets/components/WidgetHeaderCountSyncEffect';+import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';+import { useAvailableComponentInstanceId } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId';+import { isDefined } from 'twenty-shared/utils';++type WidgetHeaderCountEffectProps = {+ count?: number;+};++export const WidgetHeaderCountEffect = ({+ count,+}: WidgetHeaderCountEffectProps) => {+ const pageLayoutInstanceId = useAvailableComponentInstanceId(+ PageLayoutComponentInstanceContext,+ );+ const widgetInstanceId = useAvailableComponentInstanceId(+ WidgetComponentInstanceContext,+ );++ if (isDefined(pageLayoutInstanceId) && isDefined(widgetInstanceId)) {+ return (+ <WidgetHeaderCountSyncEffect+ count={count}+ pageLayoutInstanceId={pageLayoutInstanceId}+ widgetInstanceId={widgetInstanceId}+ />+ );+ }++ return null;+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetHeaderCountSyncEffect.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetHeaderCountSyncEffect.tsxnew file mode 100644index 00000000000..b5979ab21c8--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetHeaderCountSyncEffect.tsx@@ -0,0 +1,33 @@+import { widgetHeaderCountComponentFamilyState } from '@/page-layout/widgets/states/widgetHeaderCountComponentFamilyState';+import { useSetAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentFamilyState';+import { useEffect } from 'react';++type WidgetHeaderCountSyncEffectProps = {+ count?: number;+ pageLayoutInstanceId: string;+ widgetInstanceId: string;+};++export const WidgetHeaderCountSyncEffect = ({+ count,+ pageLayoutInstanceId,+ widgetInstanceId,+}: WidgetHeaderCountSyncEffectProps) => {+ const setWidgetHeaderCount = useSetAtomComponentFamilyState(+ widgetHeaderCountComponentFamilyState,+ widgetInstanceId,+ pageLayoutInstanceId,+ );++ useEffect(() => {+ setWidgetHeaderCount(count ?? null);+ }, [count, setWidgetHeaderCount]);++ useEffect(() => {+ return () => {+ setWidgetHeaderCount(null);+ };+ }, [setWidgetHeaderCount]);++ return null;+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetHeaderActionComponentByWidgetType.ts b/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetHeaderActionComponentByWidgetType.tsnew file mode 100644index 00000000000..adca4b3ac63--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetHeaderActionComponentByWidgetType.ts@@ -0,0 +1,22 @@+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import { WidgetFieldActions } from '@/page-layout/widgets/components/WidgetFieldActions';+import { WidgetActionEmailCompose } from '@/page-layout/widgets/emails/components/WidgetActionEmailCompose';+import { WidgetActionFileAttach } from '@/page-layout/widgets/files/components/WidgetActionFileAttach';+import { WidgetActionNoteCreate } from '@/page-layout/widgets/notes/components/WidgetActionNoteCreate';+import { WidgetActionTaskCreate } from '@/page-layout/widgets/tasks/components/WidgetActionTaskCreate';+import { type ComponentType } from 'react';+import { WidgetType } from '~/generated-metadata/graphql';++export type WidgetHeaderActionComponentProps = {+ widget: PageLayoutWidget;+};++export const WIDGET_HEADER_ACTION_COMPONENT_BY_WIDGET_TYPE: Partial<+ Record<WidgetType, ComponentType<WidgetHeaderActionComponentProps>>+> = {+ [WidgetType.FIELD]: WidgetFieldActions,+ [WidgetType.EMAILS]: WidgetActionEmailCompose,+ [WidgetType.TASKS]: WidgetActionTaskCreate,+ [WidgetType.NOTES]: WidgetActionNoteCreate,+ [WidgetType.FILES]: WidgetActionFileAttach,+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetTypesWithAlwaysVisibleSoloHeader.ts b/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetTypesWithAlwaysVisibleSoloHeader.tsnew file mode 100644index 00000000000..470f164459e--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/constants/WidgetTypesWithAlwaysVisibleSoloHeader.ts@@ -0,0 +1,8 @@+import { WidgetType } from '~/generated-metadata/graphql';++export const WIDGET_TYPES_WITH_ALWAYS_VISIBLE_SOLO_HEADER: WidgetType[] = [+ WidgetType.EMAILS,+ WidgetType.TASKS,+ WidgetType.NOTES,+ WidgetType.FILES,+];diff --git a/packages/twenty-front/src/modules/page-layout/widgets/emails/components/WidgetActionEmailCompose.tsx b/packages/twenty-front/src/modules/page-layout/widgets/emails/components/WidgetActionEmailCompose.tsxnew file mode 100644index 00000000000..5af03668679--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/emails/components/WidgetActionEmailCompose.tsx@@ -0,0 +1,17 @@+import { useComposeEmailForTargetRecord } from '@/activities/emails/hooks/useComposeEmailForTargetRecord';+import { WidgetCardHeaderActionButton } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton';+import { t } from '@lingui/core/macro';+import { IconPlus } from 'twenty-ui/icon';++export const WidgetActionEmailCompose = () => {+ const { openComposer, loading } = useComposeEmailForTargetRecord();++ return (+ <WidgetCardHeaderActionButton+ Icon={IconPlus}+ label={t`Compose`}+ onClick={openComposer}+ disabled={loading}+ />+ );+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsxindex 6a0aa9e4c54..794c0cd598f 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetEditAction.tsx@@ -3,28 +3,14 @@ import { useContext } from 'react';import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';import { useInlineCell } from '@/object-record/record-inline-cell/hooks/useInlineCell';import { useOpenFieldWidgetFieldInputEditMode } from '@/page-layout/widgets/field/hooks/useOpenFieldWidgetFieldInputEditMode';-import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';-import { styled } from '@linaria/react';+import { WidgetCardHeaderHoverReveal } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderHoverReveal';import { IconPencil } from 'twenty-ui/icon';import { LightIconButton } from 'twenty-ui/input';-import { themeCssVariables } from 'twenty-ui/theme-constants';--const StyledEditButtonWrapper = styled.div<{ isMobile: boolean }>`- opacity: ${({ isMobile }) => (isMobile ? '1' : '0')};- pointer-events: none;- transition: opacity ${themeCssVariables.animation.duration.instant}s ease;-- .widget:hover & {- opacity: 1;- pointer-events: auto;- }-`;export const FieldWidgetEditAction = () => {const { recordId, fieldDefinition } = useContext(FieldContext);const { openInlineCell } = useInlineCell();const { openFieldInput } = useOpenFieldWidgetFieldInputEditMode();- const isMobile = useIsMobile();const handleClick = () => {openInlineCell();@@ -35,12 +21,12 @@ export const FieldWidgetEditAction = () => {};return (- <StyledEditButtonWrapper isMobile={isMobile}>+ <WidgetCardHeaderHoverReveal><LightIconButtonIcon={IconPencil}accent="secondary"onClick={handleClick}/>- </StyledEditButtonWrapper>+ </WidgetCardHeaderHoverReveal>);};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetActions.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.tssimilarity index 55%rename from packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetActions.tsrename to packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.tsindex 42a2a3cef4d..4a50ee0cf13 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetActions.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.ts@@ -1,44 +1,30 @@-import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';-import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';-import { useResolveFieldMetadataIdFromNameOrId } from '@/page-layout/hooks/useResolveFieldMetadataIdFromNameOrId';+import { hasJunctionConfig } from '@/object-record/record-field/ui/utils/junction/hasJunctionConfig';+import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import { useFieldWidgetFieldDefinition } from '@/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition';import { isFieldWidget } from '@/page-layout/widgets/field/utils/isFieldWidget';-import { type WidgetAction } from '@/page-layout/widgets/types/WidgetAction';import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';import { isDefined } from 'twenty-shared/utils';import { RelationType } from '~/generated-metadata/graphql';-type UseWidgetActionsParams = {+type UseFieldWidgetActionVisibilityParams = {widget: PageLayoutWidget;};-export const useWidgetActions = ({+export const useFieldWidgetActionVisibility = ({widget,-}: UseWidgetActionsParams): WidgetAction[] => {+}: UseFieldWidgetActionVisibilityParams) => {const targetRecord = useTargetRecord();+ const isPageLayoutInEditMode = useIsPageLayoutInEditMode();- const { objectMetadataItem } = useObjectMetadataItem({- objectNameSingular: targetRecord.targetObjectNameSingular,- });-- const fieldMetadataId = isFieldWidget(widget)- ? widget.configuration.fieldMetadataId- : undefined;-- const resolvedFieldMetadataId = useResolveFieldMetadataIdFromNameOrId(- fieldMetadataId ?? '',- );-- const { fieldMetadataItem } = useFieldMetadataItemById(- resolvedFieldMetadataId ?? '',- );+ const { objectMetadataItem, fieldMetadataItem, fieldDefinition } =+ useFieldWidgetFieldDefinition(widget);const { objectPermissionsByObjectMetadataId } = useObjectPermissions();const getIsMetadataItemFromStandardApplication =@@ -49,41 +35,33 @@ export const useWidgetActions = ({objectMetadataId: objectMetadataItem.id,});- const actions: WidgetAction[] = [];-if (!isFieldWidget(widget) ||!isDefined(fieldMetadataItem) ||- !fieldMetadataItem.isActive+ !fieldMetadataItem.isActive ||+ !isDefined(fieldDefinition)) {- return actions;+ return { showSeeAll: false, showEdit: false };}- const fieldDefinition = formatFieldMetadataItemAsColumnDefinition({- field: fieldMetadataItem,- position: 0,- objectMetadataItem,- showLabel: true,- labelWidth: 90,- });+ const relationMetadata = isFieldRelation(fieldDefinition)+ ? fieldDefinition.metadata+ : null;const isOneToManyRelation =- isFieldRelation(fieldDefinition) &&- fieldDefinition.metadata.relationType === RelationType.ONE_TO_MANY;+ relationMetadata?.relationType === RelationType.ONE_TO_MANY;// "See all" links to the relation field's own index, which lists the first// hop. A nested widget lists the second hop, so the link would point at a// different object than the widget shows.- const isNestedRelationWidget =- isFieldWidget(widget) &&- isDefined(widget.configuration.nestedRelationFieldMetadataId);+ const isNestedRelationWidget = isDefined(+ widget.configuration.nestedRelationFieldMetadataId,+ );- if (isOneToManyRelation && !isNestedRelationWidget) {- actions.push({- id: 'see-all',- position: 0,- });- }+ const isJunctionRelation = hasJunctionConfig(relationMetadata?.settings);++ const showSeeAll =+ isOneToManyRelation && !isNestedRelationWidget && !isJunctionRelation;const isFieldReadOnly = isRecordFieldReadOnly({isRecordReadOnly,@@ -102,12 +80,10 @@ export const useWidgetActions = ({objectPermissionsByObjectMetadataId,});- if (!isFieldReadOnly) {- actions.push({- id: 'edit',- position: 1,- });- }+ // The read-only chain already hides edit during layout customization+ // (useIsRecordReadOnly returns true then); the explicit check states the+ // rule here instead of leaving it implicit.+ const showEdit = !isPageLayoutInEditMode && !isFieldReadOnly;- return actions.sort((a, b) => a.position - b.position);+ return { showSeeAll, showEdit };};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition.tsnew file mode 100644index 00000000000..777755b5864--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition.ts@@ -0,0 +1,44 @@+import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';+import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';+import { useResolveFieldMetadataIdFromNameOrId } from '@/page-layout/hooks/useResolveFieldMetadataIdFromNameOrId';+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import { isFieldWidget } from '@/page-layout/widgets/field/utils/isFieldWidget';+import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';+import { isDefined } from 'twenty-shared/utils';++export const useFieldWidgetFieldDefinition = (widget: PageLayoutWidget) => {+ const targetRecord = useTargetRecord();++ const { objectMetadataItem } = useObjectMetadataItem({+ objectNameSingular: targetRecord.targetObjectNameSingular,+ });++ const fieldMetadataId = isFieldWidget(widget)+ ? widget.configuration.fieldMetadataId+ : undefined;++ const resolvedFieldMetadataId = useResolveFieldMetadataIdFromNameOrId(+ fieldMetadataId ?? '',+ );++ const { fieldMetadataItem } = useFieldMetadataItemById(+ resolvedFieldMetadataId ?? '',+ );++ const fieldDefinition = isDefined(fieldMetadataItem)+ ? formatFieldMetadataItemAsColumnDefinition({+ field: fieldMetadataItem,+ position: 0,+ objectMetadataItem,+ showLabel: true,+ labelWidth: 90,+ })+ : null;++ return {+ objectMetadataItem,+ fieldMetadataItem: fieldMetadataItem ?? null,+ fieldDefinition,+ };+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/files/components/WidgetActionFileAttach.tsx b/packages/twenty-front/src/modules/page-layout/widgets/files/components/WidgetActionFileAttach.tsxnew file mode 100644index 00000000000..0d701bc0fbc--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/files/components/WidgetActionFileAttach.tsx@@ -0,0 +1,27 @@+import { AttachmentUploadTrigger } from '@/activities/files/components/AttachmentUploadTrigger';+import { useCanUploadAttachmentFiles } from '@/activities/files/hooks/useCanUploadAttachmentFiles';+import { WidgetCardHeaderActionButton } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton';+import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';+import { t } from '@lingui/core/macro';+import { IconPlus } from 'twenty-ui/icon';++export const WidgetActionFileAttach = () => {+ const targetRecord = useTargetRecord();+ const { canUploadFiles } = useCanUploadAttachmentFiles(targetRecord);++ if (!canUploadFiles) {+ return null;+ }++ return (+ <AttachmentUploadTrigger targetableObject={targetRecord}>+ {({ openFilePicker }) => (+ <WidgetCardHeaderActionButton+ Icon={IconPlus}+ label={t`Add file`}+ onClick={openFilePicker}+ />+ )}+ </AttachmentUploadTrigger>+ );+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/__tests__/usePublishWidgetHeaderInfo.test.tsx b/packages/twenty-front/src/modules/page-layout/widgets/hooks/__tests__/usePublishWidgetHeaderInfo.test.tsxdeleted file mode 100644index 0a343322852..00000000000--- a/packages/twenty-front/src/modules/page-layout/widgets/hooks/__tests__/usePublishWidgetHeaderInfo.test.tsx+++ /dev/null@@ -1,125 +0,0 @@-import {- PAGE_LAYOUT_TEST_INSTANCE_ID,- PageLayoutTestWrapper,-} from '@/page-layout/hooks/__tests__/PageLayoutTestWrapper';-import { usePublishWidgetHeaderInfo } from '@/page-layout/widgets/hooks/usePublishWidgetHeaderInfo';-import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';-import { widgetHeaderInfoComponentFamilyState } from '@/page-layout/widgets/states/widgetHeaderInfoComponentFamilyState';-import { renderHook } from '@testing-library/react';-import { createStore } from 'jotai';-import { type ReactNode } from 'react';-import { IconPlus } from 'twenty-ui/icon';--const WIDGET_ID = 'widget-under-test';--const getWrapper =- (store: ReturnType<typeof createStore>) =>- ({ children }: { children: ReactNode }) => (- <PageLayoutTestWrapper- store={store}- instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}- >- <WidgetComponentInstanceContext.Provider- value={{ instanceId: WIDGET_ID }}- >- {children}- </WidgetComponentInstanceContext.Provider>- </PageLayoutTestWrapper>- );--const getPublishedHeaderInfo = (store: ReturnType<typeof createStore>) =>- store.get(- widgetHeaderInfoComponentFamilyState.atomFamily({- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,- familyKey: WIDGET_ID,- }),- );--describe('usePublishWidgetHeaderInfo', () => {- it('publishes count and primary action to the widget header info state', () => {- const store = createStore();- const onClick = jest.fn();-- renderHook(- () =>- usePublishWidgetHeaderInfo({- count: 12,- primaryAction: { Icon: IconPlus, label: 'Compose', onClick },- }),- { wrapper: getWrapper(store) },- );-- const publishedHeaderInfo = getPublishedHeaderInfo(store);-- expect(publishedHeaderInfo?.count).toBe(12);- expect(publishedHeaderInfo?.primaryAction?.label).toBe('Compose');- });-- it('clears the published header info on unmount', () => {- const store = createStore();-- const { unmount } = renderHook(- () => usePublishWidgetHeaderInfo({ count: 3 }),- { wrapper: getWrapper(store) },- );-- expect(getPublishedHeaderInfo(store)?.count).toBe(3);-- unmount();-- expect(getPublishedHeaderInfo(store)).toBeNull();- });-- it('no-ops without throwing when rendered outside a widget', () => {- expect(() =>- renderHook(() => usePublishWidgetHeaderInfo({ count: 7 })),- ).not.toThrow();- });-- it('keeps the published state referentially stable across re-renders with inline actions', () => {- const store = createStore();-- const { rerender } = renderHook(- // a fresh object and a fresh closure on every render, like a- // non-memoizing caller would pass- () =>- usePublishWidgetHeaderInfo({- count: 5,- primaryAction: {- Icon: IconPlus,- label: 'New task',- onClick: () => undefined,- },- }),- { wrapper: getWrapper(store) },- );-- const firstPublished = getPublishedHeaderInfo(store);- rerender();- rerender();- const secondPublished = getPublishedHeaderInfo(store);-- expect(secondPublished).toBe(firstPublished);- });-- it('calls the latest onClick through the stable wrapper', () => {- const store = createStore();- const firstOnClick = jest.fn();- const secondOnClick = jest.fn();-- const { rerender } = renderHook(- ({ onClick }: { onClick: () => void }) =>- usePublishWidgetHeaderInfo({- primaryAction: { Icon: IconPlus, label: 'Compose', onClick },- }),- { wrapper: getWrapper(store), initialProps: { onClick: firstOnClick } },- );-- rerender({ onClick: secondOnClick });-- getPublishedHeaderInfo(store)?.primaryAction?.onClick();-- expect(firstOnClick).not.toHaveBeenCalled();- expect(secondOnClick).toHaveBeenCalledTimes(1);- });-});diff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidget.ts b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidget.tsindex cf1911189a4..fe8542f3294 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidget.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidget.ts@@ -1,24 +1,9 @@-import { useCurrentPageLayout } from '@/page-layout/hooks/useCurrentPageLayout';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext';+import { useCurrentWidgetOrNull } from '@/page-layout/widgets/hooks/useCurrentWidgetOrNull';import { assertIsDefinedOrThrow } from 'twenty-shared/utils';-import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';export const useCurrentWidget = (): PageLayoutWidget => {- const widgetComponentInstanceId = useComponentInstanceStateContext(- WidgetComponentInstanceContext,- );-- assertIsDefinedOrThrow(- widgetComponentInstanceId,- new Error('Widget Component Instance ID is not defined'),- );-- const { currentPageLayout } = useCurrentPageLayout();-- const widget = currentPageLayout?.tabs- ?.flatMap((tab) => tab.widgets)- .find((widget) => widget.id === widgetComponentInstanceId.instanceId);+ const widget = useCurrentWidgetOrNull();assertIsDefinedOrThrow(widget, new Error('Current widget is not defined'));diff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidgetOrNull.ts b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidgetOrNull.tsnew file mode 100644index 00000000000..d6b52ff970a--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidgetOrNull.ts@@ -0,0 +1,24 @@+import { useCurrentPageLayout } from '@/page-layout/hooks/useCurrentPageLayout';+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';+import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext';+import { isDefined } from 'twenty-shared/utils';++export const useCurrentWidgetOrNull = (): PageLayoutWidget | null => {+ const widgetComponentInstanceId = useComponentInstanceStateContext(+ WidgetComponentInstanceContext,+ );++ const { currentPageLayout } = useCurrentPageLayout();++ if (!isDefined(widgetComponentInstanceId)) {+ return null;+ }++ return (+ currentPageLayout?.tabs+ ?.flatMap((tab) => tab.widgets)+ .find((widget) => widget.id === widgetComponentInstanceId.instanceId) ??+ null+ );+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/usePublishWidgetHeaderInfo.ts b/packages/twenty-front/src/modules/page-layout/widgets/hooks/usePublishWidgetHeaderInfo.tsdeleted file mode 100644index 6bd8101889e..00000000000--- a/packages/twenty-front/src/modules/page-layout/widgets/hooks/usePublishWidgetHeaderInfo.ts+++ /dev/null@@ -1,97 +0,0 @@-import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';-import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';-import { widgetHeaderInfoComponentFamilyState } from '@/page-layout/widgets/states/widgetHeaderInfoComponentFamilyState';-import { type WidgetHeaderInfo } from '@/page-layout/widgets/types/WidgetHeaderInfo';-import { useAvailableComponentInstanceId } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceId';-import { useSetAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentFamilyState';-import { useCallback, useEffect, useLayoutEffect, useRef } from 'react';-import { isDefined } from 'twenty-shared/utils';--const OUTSIDE_WIDGET_INSTANCE_ID = 'widget-header-info-outside-widget';--// Publish header information (grey count next to the title, primary action on-// the right) from a widget's content to the widget chrome. Safe to call from-// components that also render outside a page layout: it no-ops there.-// Republishes only when a rendered value actually changes: the widget chrome-// reads this state above the widget content, so publishing a fresh object on-// every render (an inline primaryAction, an unstable onClick) would loop the-// widget subtree forever. onClick goes through a stable wrapper for the same-// reason, so callers do not have to memoize anything.-export const usePublishWidgetHeaderInfo = ({- count,- primaryAction,-}: WidgetHeaderInfo) => {- const pageLayoutInstanceId = useAvailableComponentInstanceId(- PageLayoutComponentInstanceContext,- );- const widgetInstanceId = useAvailableComponentInstanceId(- WidgetComponentInstanceContext,- );-- const isInsideWidget =- isDefined(pageLayoutInstanceId) && isDefined(widgetInstanceId);-- const setWidgetHeaderInfo = useSetAtomComponentFamilyState(- widgetHeaderInfoComponentFamilyState,- widgetInstanceId ?? OUTSIDE_WIDGET_INSTANCE_ID,- pageLayoutInstanceId ?? OUTSIDE_WIDGET_INSTANCE_ID,- );-- // oxlint-disable-next-line twenty/no-state-useref- const onClickRef = useRef(primaryAction?.onClick);-- const primaryActionOnClick = primaryAction?.onClick;-- // Assigned after commit so the stable wrapper never exposes a callback from- // a render React abandoned.- useLayoutEffect(() => {- onClickRef.current = primaryActionOnClick;- }, [primaryActionOnClick]);-- const handlePrimaryActionClick = useCallback(() => {- onClickRef.current?.();- }, []);-- const hasPrimaryAction = isDefined(primaryAction);- const primaryActionIcon = primaryAction?.Icon;- const primaryActionLabel = primaryAction?.label;- const primaryActionDisabled = primaryAction?.disabled;-- useEffect(() => {- if (!isInsideWidget) {- return;- }-- setWidgetHeaderInfo({- count,- primaryAction:- hasPrimaryAction && isDefined(primaryActionIcon)- ? {- Icon: primaryActionIcon,- label: primaryActionLabel ?? '',- onClick: handlePrimaryActionClick,- disabled: primaryActionDisabled,- }- : undefined,- });- }, [- count,- hasPrimaryAction,- primaryActionIcon,- primaryActionLabel,- primaryActionDisabled,- handlePrimaryActionClick,- isInsideWidget,- setWidgetHeaderInfo,- ]);-- useEffect(() => {- if (!isInsideWidget) {- return;- }-- return () => {- setWidgetHeaderInfo(null);- };- }, [isInsideWidget, setWidgetHeaderInfo]);-};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetRendererState.ts b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetRendererState.tsindex 23754813add..31fccbb6c71 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetRendererState.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetRendererState.ts@@ -9,17 +9,17 @@ import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { useIsCurrentWidgetLastOfTab } from '@/page-layout/widgets/hooks/useIsCurrentWidgetLastOfTab';import { useIsInPinnedTab } from '@/page-layout/widgets/hooks/useIsInPinnedTab';import { useWidgetPermissions } from '@/page-layout/widgets/hooks/useWidgetPermissions';+import { WIDGET_TYPES_WITH_ALWAYS_VISIBLE_SOLO_HEADER } from '@/page-layout/widgets/constants/WidgetTypesWithAlwaysVisibleSoloHeader';import { widgetCardHoveredComponentFamilyState } from '@/page-layout/widgets/states/widgetCardHoveredComponentFamilyState';-import { widgetHeaderInfoComponentFamilyState } from '@/page-layout/widgets/states/widgetHeaderInfoComponentFamilyState';+import { widgetHasHeaderCountComponentFamilySelector } from '@/page-layout/widgets/states/selectors/widgetHasHeaderCountComponentFamilySelector';import { getWidgetCardVariant } from '@/page-layout/widgets/utils/getWidgetCardVariant';import { useOpenWidgetSettingsInSidePanel } from '@/side-panel/hooks/useOpenWidgetSettingsInSidePanel';import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';-import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';+import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useSetAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentFamilyState';import { type MouseEvent } from 'react';-import { isDefined } from 'twenty-shared/utils';import {PageLayoutTabLayoutMode,WidgetType,@@ -58,14 +58,14 @@ export const useWidgetRendererState = (widget: PageLayoutWidget) => {const isLastWidget = useIsCurrentWidgetLastOfTab(widget.id);- const widgetHeaderInfo = useAtomComponentFamilyStateValue(- widgetHeaderInfoComponentFamilyState,+ const hasWidgetHeaderCount = useAtomComponentFamilySelectorValue(+ widgetHasHeaderCountComponentFamilySelector,widget.id,);const hasWidgetHeaderInfo =- isDefined(widgetHeaderInfo?.count) ||- isDefined(widgetHeaderInfo?.primaryAction);+ hasWidgetHeaderCount ||+ WIDGET_TYPES_WITH_ALWAYS_VISIBLE_SOLO_HEADER.includes(widget.type);const isHeaderHiddenInViewMode =widget.type === WidgetType.STANDALONE_RICH_TEXT ||@@ -76,7 +76,7 @@ export const useWidgetRendererState = (widget: PageLayoutWidget) => {isHeaderHiddenInViewMode && !isPageLayoutInEditMode;// A solo widget owns its tab, and the tab label already names it: the- // header only appears when the widget published something to say in it.+ // header only appears when the widget content set something to show in it.const showHeader =presentation === 'solo' ? hasWidgetHeaderInfo : !hideHeaderInViewMode;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/notes/components/WidgetActionNoteCreate.tsx b/packages/twenty-front/src/modules/page-layout/widgets/notes/components/WidgetActionNoteCreate.tsxnew file mode 100644index 00000000000..7605a67af1f--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/notes/components/WidgetActionNoteCreate.tsx@@ -0,0 +1,10 @@+import { WidgetActionActivityCreate } from '@/page-layout/widgets/components/WidgetActionActivityCreate';+import { t } from '@lingui/core/macro';+import { CoreObjectNameSingular } from 'twenty-shared/types';++export const WidgetActionNoteCreate = () => (+ <WidgetActionActivityCreate+ activityObjectNameSingular={CoreObjectNameSingular.Note}+ label={t`New note`}+ />+);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/states/selectors/widgetHasHeaderCountComponentFamilySelector.ts b/packages/twenty-front/src/modules/page-layout/widgets/states/selectors/widgetHasHeaderCountComponentFamilySelector.tsnew file mode 100644index 00000000000..0e46fcf6b9a--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/states/selectors/widgetHasHeaderCountComponentFamilySelector.ts@@ -0,0 +1,20 @@+import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';+import { widgetHeaderCountComponentFamilyState } from '@/page-layout/widgets/states/widgetHeaderCountComponentFamilyState';+import { createAtomComponentFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilySelector';+import { isDefined } from 'twenty-shared/utils';++export const widgetHasHeaderCountComponentFamilySelector =+ createAtomComponentFamilySelector<boolean, string>({+ key: 'widgetHasHeaderCountComponentFamilySelector',+ componentInstanceContext: PageLayoutComponentInstanceContext,+ get:+ ({ instanceId, familyKey }) =>+ ({ get }) => {+ const widgetHeaderCount = get(widgetHeaderCountComponentFamilyState, {+ instanceId,+ familyKey,+ });++ return isDefined(widgetHeaderCount);+ },+ });diff --git a/packages/twenty-front/src/modules/page-layout/widgets/states/widgetHeaderInfoComponentFamilyState.ts b/packages/twenty-front/src/modules/page-layout/widgets/states/widgetHeaderCountComponentFamilyState.tssimilarity index 56%rename from packages/twenty-front/src/modules/page-layout/widgets/states/widgetHeaderInfoComponentFamilyState.tsrename to packages/twenty-front/src/modules/page-layout/widgets/states/widgetHeaderCountComponentFamilyState.tsindex 72113422fd2..906000f8270 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/states/widgetHeaderInfoComponentFamilyState.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/states/widgetHeaderCountComponentFamilyState.ts@@ -1,10 +1,9 @@import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';-import { type WidgetHeaderInfo } from '@/page-layout/widgets/types/WidgetHeaderInfo';import { createAtomComponentFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomComponentFamilyState';-export const widgetHeaderInfoComponentFamilyState =- createAtomComponentFamilyState<WidgetHeaderInfo | null, string>({- key: 'widgetHeaderInfoComponentFamilyState',+export const widgetHeaderCountComponentFamilyState =+ createAtomComponentFamilyState<number | null, string>({+ key: 'widgetHeaderCountComponentFamilyState',defaultValue: null,componentInstanceContext: PageLayoutComponentInstanceContext,});diff --git a/packages/twenty-front/src/modules/page-layout/widgets/tasks/components/WidgetActionTaskCreate.tsx b/packages/twenty-front/src/modules/page-layout/widgets/tasks/components/WidgetActionTaskCreate.tsxnew file mode 100644index 00000000000..2c7be68c3cd--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/tasks/components/WidgetActionTaskCreate.tsx@@ -0,0 +1,10 @@+import { WidgetActionActivityCreate } from '@/page-layout/widgets/components/WidgetActionActivityCreate';+import { t } from '@lingui/core/macro';+import { CoreObjectNameSingular } from 'twenty-shared/types';++export const WidgetActionTaskCreate = () => (+ <WidgetActionActivityCreate+ activityObjectNameSingular={CoreObjectNameSingular.Task}+ label={t`New task`}+ />+);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/types/WidgetAction.ts b/packages/twenty-front/src/modules/page-layout/widgets/types/WidgetAction.tsdeleted file mode 100644index 1a0de8335d8..00000000000--- a/packages/twenty-front/src/modules/page-layout/widgets/types/WidgetAction.ts+++ /dev/null@@ -1,6 +0,0 @@-export type WidgetActionId = 'edit' | 'see-all';--export type WidgetAction = {- id: WidgetActionId;- position: number;-};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/types/WidgetHeaderInfo.ts b/packages/twenty-front/src/modules/page-layout/widgets/types/WidgetHeaderInfo.tsdeleted file mode 100644index d5c1c27edaf..00000000000--- a/packages/twenty-front/src/modules/page-layout/widgets/types/WidgetHeaderInfo.ts+++ /dev/null@@ -1,17 +0,0 @@-import { type IconComponent } from 'twenty-ui/icon';--export type WidgetHeaderPrimaryAction = {- Icon: IconComponent;- label: string;- onClick: () => void;- disabled?: boolean;-};--// Header information a widget's content publishes to the widget chrome: a-// count rendered in grey next to the title and an optional primary action-// rendered on the right. Published at runtime so any widget, including-// third-party ones, can contribute without new widget-type branches.-export type WidgetHeaderInfo = {- count?: number;- primaryAction?: WidgetHeaderPrimaryAction;-};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsxindex ed8a7268039..bdfff79ae93 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx@@ -1,30 +1,29 @@import { useNumberFormat } from '@/localization/hooks/useNumberFormat';-import { WidgetActionRenderer } from '@/page-layout/widgets/components/WidgetActionRenderer';import { widgetCardHoveredComponentFamilyState } from '@/page-layout/widgets/states/widgetCardHoveredComponentFamilyState';-import { widgetHeaderInfoComponentFamilyState } from '@/page-layout/widgets/states/widgetHeaderInfoComponentFamilyState';-import { type WidgetAction } from '@/page-layout/widgets/types/WidgetAction';+import { widgetHeaderCountComponentFamilyState } from '@/page-layout/widgets/states/widgetHeaderCountComponentFamilyState';+import { WidgetCardHeaderActionsRenderer } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionsRenderer';import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { type ReactNode, useContext } from 'react';import { IconTrash } from 'twenty-ui/icon';import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';-import { IconButton, LightIconButton } from 'twenty-ui/input';+import { IconButton } from 'twenty-ui/input';import { type WidgetCardVariant } from '@/page-layout/widgets/types/WidgetCardVariant';import { WidgetGrip } from '@/page-layout/widgets/widget-card/components/WidgetGrip';import { AnimatePresence, motion } from 'framer-motion';-import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';+import { isDefined } from 'twenty-shared/utils';import { themeCssVariables, ThemeContext } from 'twenty-ui/theme-constants';export type WidgetCardHeaderProps = {variant: WidgetCardVariant;widgetId: string;isInEditMode: boolean;isEmpty?: boolean;+ hasAccess?: boolean;title: string;onRemove?: (e?: React.MouseEvent) => void;forbiddenDisplay?: ReactNode;- actions?: WidgetAction[];className?: string;isResizing?: boolean;isReorderEnabled?: boolean;@@ -71,12 +70,6 @@ const StyledRightContainer = styled.div`gap: ${themeCssVariables.spacing[0.5]};`;-const StyledActionsContainer = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[1]};-`;-const StyledIconButtonContainerBase = styled.div`align-items: center;display: flex;@@ -89,13 +82,13 @@ export const WidgetCardHeader = ({variant,isEmpty = false,isInEditMode = false,+ hasAccess = true,isResizing = false,isReorderEnabled = true,isDeletingWidgetEnabled = true,title,onRemove,forbiddenDisplay,- actions,className,}: WidgetCardHeaderProps) => {const { theme } = useContext(ThemeContext);@@ -105,14 +98,11 @@ export const WidgetCardHeader = ({widgetId,);- const widgetHeaderInfo = useAtomComponentFamilyStateValue(- widgetHeaderInfoComponentFamilyState,+ const widgetHeaderCount = useAtomComponentFamilyStateValue(+ widgetHeaderCountComponentFamilyState,widgetId,);- const count = widgetHeaderInfo?.count;- const primaryAction = widgetHeaderInfo?.primaryAction;-return (<StyledWidgetCardHeader variant={variant} className={className}><AnimatePresence initial={false}>@@ -125,27 +115,12 @@ export const WidgetCardHeader = ({</AnimatePresence><StyledTitleContainer variant={variant}><OverflowingTextWithTooltip text={isEmpty ? t`Add Widget` : title} />- {isDefined(count) && <StyledCount>{formatNumber(count)}</StyledCount>}+ {isDefined(widgetHeaderCount) && (+ <StyledCount>{formatNumber(widgetHeaderCount)}</StyledCount>+ )}</StyledTitleContainer><StyledRightContainer>- {!isInEditMode && isDefined(primaryAction) && (- <LightIconButton- Icon={primaryAction.Icon}- aria-label={primaryAction.label}- title={primaryAction.label}- accent="tertiary"- size="small"- onClick={primaryAction.onClick}- disabled={primaryAction.disabled}- />- )}- {isNonEmptyArray(actions) && (- <StyledActionsContainer>- {actions.map((action) => (- <WidgetActionRenderer key={action.id} action={action} />- ))}- </StyledActionsContainer>- )}+ {hasAccess && <WidgetCardHeaderActionsRenderer />}{isDefined(forbiddenDisplay) && forbiddenDisplay}<AnimatePresence initial={false}>{!isResizing &&diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton.tsxnew file mode 100644index 00000000000..085400ee157--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton.tsx@@ -0,0 +1,26 @@+import { type IconComponent } from 'twenty-ui/icon';+import { LightIconButton } from 'twenty-ui/input';++type WidgetCardHeaderActionButtonProps = {+ Icon: IconComponent;+ label: string;+ onClick: () => void;+ disabled?: boolean;+};++export const WidgetCardHeaderActionButton = ({+ Icon,+ label,+ onClick,+ disabled,+}: WidgetCardHeaderActionButtonProps) => (+ <LightIconButton+ Icon={Icon}+ aria-label={label}+ title={label}+ accent="tertiary"+ size="small"+ onClick={onClick}+ disabled={disabled}+ />+);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderActionsRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderActionsRenderer.tsxnew file mode 100644index 00000000000..caf1cdd9296--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderActionsRenderer.tsx@@ -0,0 +1,44 @@+import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';+import { WIDGET_HEADER_ACTION_COMPONENT_BY_WIDGET_TYPE } from '@/page-layout/widgets/constants/WidgetHeaderActionComponentByWidgetType';+import { useCurrentWidgetOrNull } from '@/page-layout/widgets/hooks/useCurrentWidgetOrNull';+import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';+import { styled } from '@linaria/react';+import { isDefined } from 'twenty-shared/utils';+import { themeCssVariables } from 'twenty-ui/theme-constants';+import { WidgetType } from '~/generated-metadata/graphql';++const StyledActionsContainer = styled.div`+ align-items: center;+ display: flex;+ gap: ${themeCssVariables.spacing[1]};+`;++export const WidgetCardHeaderActionsRenderer = () => {+ const widget = useCurrentWidgetOrNull();+ const { targetRecordIdentifier } = useLayoutRenderingContext();+ const isPageLayoutInEditMode = useIsPageLayoutInEditMode();++ if (!isDefined(widget) || !isDefined(targetRecordIdentifier)) {+ return null;+ }++ // Activity actions create records, so they hide while the layout is being+ // arranged. Field widgets keep their actions: see-all is a read-only link,+ // and edit hides itself through useFieldWidgetActionVisibility.+ if (isPageLayoutInEditMode && widget.type !== WidgetType.FIELD) {+ return null;+ }++ const HeaderActionComponent =+ WIDGET_HEADER_ACTION_COMPONENT_BY_WIDGET_TYPE[widget.type];++ if (!isDefined(HeaderActionComponent)) {+ return null;+ }++ return (+ <StyledActionsContainer>+ <HeaderActionComponent widget={widget} />+ </StyledActionsContainer>+ );+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderHoverReveal.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderHoverReveal.tsxnew file mode 100644index 00000000000..2b62db7c175--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeaderHoverReveal.tsx@@ -0,0 +1,39 @@+import { widgetCardHoveredComponentFamilyState } from '@/page-layout/widgets/states/widgetCardHoveredComponentFamilyState';+import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';+import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext';+import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';+import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';+import { styled } from '@linaria/react';+import { type ReactNode } from 'react';+import { themeCssVariables } from 'twenty-ui/theme-constants';++const StyledHoverReveal = styled.div<{ isVisible: boolean }>`+ opacity: ${({ isVisible }) => (isVisible ? '1' : '0')};+ pointer-events: ${({ isVisible }) => (isVisible ? 'auto' : 'none')};+ transition: opacity ${themeCssVariables.animation.duration.instant}s ease;+`;++type WidgetCardHeaderHoverRevealProps = {+ children: ReactNode;+};++// Touch devices have no hover, so the content stays visible on mobile.+export const WidgetCardHeaderHoverReveal = ({+ children,+}: WidgetCardHeaderHoverRevealProps) => {+ const widgetComponentInstanceId = useComponentInstanceStateContext(+ WidgetComponentInstanceContext,+ );+ const isMobile = useIsMobile();++ const widgetCardHovered = useAtomComponentFamilyStateValue(+ widgetCardHoveredComponentFamilyState,+ widgetComponentInstanceId?.instanceId ?? '',+ );++ return (+ <StyledHoverReveal isVisible={isMobile || widgetCardHovered}>+ {children}+ </StyledHoverReveal>+ );+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCardHeader.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCardHeader.stories.tsxnew file mode 100644index 00000000000..fa347920bd6--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCardHeader.stories.tsx@@ -0,0 +1,154 @@+import {+ PAGE_LAYOUT_TEST_INSTANCE_ID,+ PageLayoutTestWrapper,+} from '@/page-layout/hooks/__tests__/PageLayoutTestWrapper';+import { WidgetHeaderCountEffect } from '@/page-layout/widgets/components/WidgetHeaderCountEffect';+import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';+import { WidgetCardHeader } from '@/page-layout/widgets/widget-card/components/WidgetCardHeader';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { useState } from 'react';+import { expect, userEvent, waitFor, within } from 'storybook/test';+import { CatalogDecorator, type CatalogStory } from 'twenty-ui/testing';+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';++const WIDGET_ID = 'widget-card-header-story';++type WidgetCardHeaderStoryProps = {+ title: string;+ isInEditMode: boolean;+ count?: number;+ widgetId?: string;+};++const WidgetCardHeaderStory = ({+ title,+ isInEditMode,+ count,+ widgetId = WIDGET_ID,+}: WidgetCardHeaderStoryProps) => (+ <PageLayoutTestWrapper instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}>+ <WidgetComponentInstanceContext.Provider value={{ instanceId: widgetId }}>+ <WidgetHeaderCountEffect count={count} />+ <WidgetCardHeader+ widgetId={widgetId}+ variant="dashboard"+ isInEditMode={isInEditMode}+ title={title}+ />+ </WidgetComponentInstanceContext.Provider>+ </PageLayoutTestWrapper>+);++const meta: Meta<typeof WidgetCardHeaderStory> = {+ title: 'Modules/PageLayout/Widgets/WidgetCardHeader',+ component: WidgetCardHeaderStory,+ decorators: [MemoryRouterDecorator],+ args: {+ title: 'Call recordings',+ isInEditMode: false,+ },+};++export default meta;+type Story = StoryObj<typeof WidgetCardHeaderStory>;++export const Catalog: CatalogStory<Story, typeof WidgetCardHeaderStory> = {+ decorators: [CatalogDecorator],+ args: {+ count: 42,+ },+ parameters: {+ catalog: {+ dimensions: [+ {+ name: 'header state',+ values: ['count', 'no count', 'edit mode'],+ props: (headerStateVariant: string) => {+ switch (headerStateVariant) {+ case 'no count':+ return { count: undefined, widgetId: `${WIDGET_ID}-no-count` };+ case 'edit mode':+ return {+ count: 5,+ isInEditMode: true,+ widgetId: `${WIDGET_ID}-edit-mode`,+ };+ default:+ return { count: 42, widgetId: `${WIDGET_ID}-count` };+ }+ },+ },+ ],+ },+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ expect(await canvas.findByText('42')).toBeVisible();+ expect(await canvas.findByText('5')).toBeVisible();+ },+};++const UnmountingContentStory = () => {+ const [isContentMounted, setIsContentMounted] = useState(true);++ return (+ <PageLayoutTestWrapper instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}>+ <WidgetComponentInstanceContext.Provider+ value={{ instanceId: `${WIDGET_ID}-unmount` }}+ >+ {isContentMounted && <WidgetHeaderCountEffect count={42} />}+ <WidgetCardHeader+ widgetId={`${WIDGET_ID}-unmount`}+ variant="dashboard"+ isInEditMode={false}+ title="Call recordings"+ />+ <button onClick={() => setIsContentMounted(false)}>+ Unmount content+ </button>+ </WidgetComponentInstanceContext.Provider>+ </PageLayoutTestWrapper>+ );+};++export const CountClearsWhenContentUnmounts: Story = {+ render: () => <UnmountingContentStory />,+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ expect(await canvas.findByText('42')).toBeVisible();++ await userEvent.click(+ canvas.getByRole('button', { name: 'Unmount content' }),+ );++ await waitFor(() => {+ expect(canvas.queryByText('42')).toBeNull();+ });+ },+};++export const CountEffectNoOpsOutsideWidget: Story = {+ render: () => (+ <PageLayoutTestWrapper instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}>+ <WidgetHeaderCountEffect count={7} />+ <WidgetComponentInstanceContext.Provider+ value={{ instanceId: `${WIDGET_ID}-outside` }}+ >+ <WidgetCardHeader+ widgetId={`${WIDGET_ID}-outside`}+ variant="dashboard"+ isInEditMode={false}+ title="Call recordings"+ />+ </WidgetComponentInstanceContext.Provider>+ </PageLayoutTestWrapper>+ ),+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ expect(await canvas.findByText('Call recordings')).toBeVisible();+ expect(canvas.queryByText('7')).toBeNull();+ },+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCardHeaderActionButton.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCardHeaderActionButton.stories.tsxnew file mode 100644index 00000000000..2db3f0db3aa--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCardHeaderActionButton.stories.tsx@@ -0,0 +1,46 @@+import { WidgetCardHeaderActionButton } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, fn, within } from 'storybook/test';+import { IconPlus } from 'twenty-ui/icon';+import { CatalogDecorator, type CatalogStory } from 'twenty-ui/testing';++const meta: Meta<typeof WidgetCardHeaderActionButton> = {+ title: 'Modules/PageLayout/Widgets/WidgetCardHeaderActionButton',+ component: WidgetCardHeaderActionButton,+ args: {+ Icon: IconPlus,+ label: 'New task',+ onClick: fn(),+ },+};++export default meta;+type Story = StoryObj<typeof WidgetCardHeaderActionButton>;++export const Catalog: CatalogStory<Story, typeof WidgetCardHeaderActionButton> =+ {+ decorators: [CatalogDecorator],+ parameters: {+ catalog: {+ dimensions: [+ {+ name: 'state',+ values: ['default', 'disabled'],+ props: (stateVariant: string) => ({+ disabled: stateVariant === 'disabled',+ }),+ },+ ],+ },+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ const buttons = await canvas.findAllByRole('button', {+ name: 'New task',+ });++ expect(buttons).toHaveLength(2);+ expect(buttons[1]).toBeDisabled();+ },+ };