Skip to content

The open alternative to Salesforce, designed for AI.

Collapse page-layout twin hooks, widget factories and relation cards (#25259)

Félix Malfait8afea746d035
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCanMovePageLayoutWidget.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCanMovePageLayoutWidget.test.tsx
new file mode 100644
index 00000000000..8e727d2c289
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCanMovePageLayoutWidget.test.tsx
@@ -0,0 +1,235 @@
+import { useCanMovePageLayoutWidget } from '@/page-layout/hooks/useCanMovePageLayoutWidget';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import {
+ makeDraft,
+ makeTab,
+ makeWidget,
+} from '@/page-layout/testing/pageLayoutDraftFixtures';
+import { renderHook } from '@testing-library/react';
+import { createStore } from 'jotai';
+import { type ReactNode } from 'react';
+import {
+ PageLayoutTabLayoutMode,
+ WidgetType,
+} from '~/generated-metadata/graphql';
+import {
+ PAGE_LAYOUT_TEST_INSTANCE_ID,
+ PageLayoutTestWrapper,
+} from './PageLayoutTestWrapper';
+
+type DirectionCase = {
+ direction: 'up' | 'down';
+ adjacentPosition: 'above' | 'below';
+ edgePosition: 'first' | 'last';
+ movableWidgetId: string;
+ edgeWidgetId: string;
+};
+
+const DIRECTION_CASES: DirectionCase[] = [
+ {
+ direction: 'up',
+ adjacentPosition: 'above',
+ edgePosition: 'first',
+ movableWidgetId: 'widget-b',
+ edgeWidgetId: 'widget-a',
+ },
+ {
+ direction: 'down',
+ adjacentPosition: 'below',
+ edgePosition: 'last',
+ movableWidgetId: 'widget-a',
+ edgeWidgetId: 'widget-b',
+ },
+];
+
+describe('useCanMovePageLayoutWidget', () => {
+ const getWrapper =
+ (store = createStore()) =>
+ ({ children }: { children: ReactNode }) => (
+ <PageLayoutTestWrapper
+ store={store}
+ instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}
+ >
+ {children}
+ </PageLayoutTestWrapper>
+ );
+
+ const getDraftAtom = () =>
+ pageLayoutDraftComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ });
+
+ const renderCanMoveHook = (store: ReturnType<typeof createStore>) =>
+ renderHook(() => useCanMovePageLayoutWidget(PAGE_LAYOUT_TEST_INSTANCE_ID), {
+ wrapper: getWrapper(store),
+ });
+
+ const makeTimelineWidget = (index: number) => ({
+ ...makeWidget('timeline-widget', index),
+ type: WidgetType.TIMELINE,
+ });
+
+ describe.each(DIRECTION_CASES)(
+ '$direction',
+ ({
+ direction,
+ adjacentPosition,
+ edgePosition,
+ movableWidgetId,
+ edgeWidgetId,
+ }) => {
+ it(`should return true when widget is not the ${edgePosition} one`, () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+ const widgetB = makeWidget('widget-b', 1);
+
+ store.set(
+ getDraftAtom(),
+ makeDraft([makeTab('tab-1', [widgetA, widgetB])]),
+ );
+
+ const { result } = renderCanMoveHook(store);
+
+ expect(
+ result.current.canMovePageLayoutWidget(movableWidgetId, direction),
+ ).toBe(true);
+ });
+
+ it(`should return false when widget is the ${edgePosition} one`, () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+ const widgetB = makeWidget('widget-b', 1);
+
+ store.set(
+ getDraftAtom(),
+ makeDraft([makeTab('tab-1', [widgetA, widgetB])]),
+ );
+
+ const { result } = renderCanMoveHook(store);
+
+ expect(
+ result.current.canMovePageLayoutWidget(edgeWidgetId, direction),
+ ).toBe(false);
+ });
+
+ it('should return false when widget is not found', () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+
+ store.set(getDraftAtom(), makeDraft([makeTab('tab-1', [widgetA])]));
+
+ const { result } = renderCanMoveHook(store);
+
+ expect(
+ result.current.canMovePageLayoutWidget('non-existent', direction),
+ ).toBe(false);
+ });
+
+ it('should return false for non-VERTICAL_LIST tab', () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+ const widgetB = makeWidget('widget-b', 1);
+
+ store.set(
+ getDraftAtom(),
+ makeDraft([
+ makeTab(
+ 'tab-1',
+ [widgetA, widgetB],
+ 0,
+ PageLayoutTabLayoutMode.CANVAS,
+ ),
+ ]),
+ );
+
+ const { result } = renderCanMoveHook(store);
+
+ expect(
+ result.current.canMovePageLayoutWidget(movableWidgetId, direction),
+ ).toBe(false);
+ });
+
+ it('should return false for a FILL_VIEWPORT widget', () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+ const timelineWidget = makeTimelineWidget(1);
+ const widgetB = makeWidget('widget-b', 2);
+
+ store.set(
+ getDraftAtom(),
+ makeDraft([makeTab('tab-1', [widgetA, timelineWidget, widgetB])]),
+ );
+
+ const { result } = renderCanMoveHook(store);
+
+ expect(
+ result.current.canMovePageLayoutWidget('timeline-widget', direction),
+ ).toBe(false);
+ });
+
+ it(`should ignore viewport-filling widgets when resolving the fit-content widget ${adjacentPosition}`, () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+ const timelineWidget = makeTimelineWidget(1);
+ const widgetB = makeWidget('widget-b', 2);
+
+ store.set(
+ getDraftAtom(),
+ makeDraft([makeTab('tab-1', [widgetA, timelineWidget, widgetB])]),
+ );
+
+ const { result } = renderCanMoveHook(store);
+
+ expect(
+ result.current.canMovePageLayoutWidget(movableWidgetId, direction),
+ ).toBe(true);
+ expect(
+ result.current.canMovePageLayoutWidget(edgeWidgetId, direction),
+ ).toBe(false);
+ });
+ },
+ );
+
+ it('should not let a preceding viewport-filling widget make the first fit-content widget movable up', () => {
+ const store = createStore();
+
+ const timelineWidget = makeTimelineWidget(0);
+ const widgetA = makeWidget('widget-a', 1);
+ const widgetB = makeWidget('widget-b', 2);
+
+ store.set(
+ getDraftAtom(),
+ makeDraft([makeTab('tab-1', [timelineWidget, widgetA, widgetB])]),
+ );
+
+ const { result } = renderCanMoveHook(store);
+
+ expect(result.current.canMovePageLayoutWidget('widget-a', 'up')).toBe(
+ false,
+ );
+ });
+
+ it('should return false for moving the last fit-content widget before a viewport-filling widget down', () => {
+ const store = createStore();
+
+ const fieldsWidget = makeWidget('fields-widget', 0);
+ const timelineWidget = makeTimelineWidget(1);
+
+ store.set(
+ getDraftAtom(),
+ makeDraft([makeTab('tab-1', [fieldsWidget, timelineWidget])]),
+ );
+
+ const { result } = renderCanMoveHook(store);
+
+ expect(
+ result.current.canMovePageLayoutWidget('fields-widget', 'down'),
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCanMovePageLayoutWidgetDown.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCanMovePageLayoutWidgetDown.test.tsx
deleted file mode 100644
index b101e4174ed..00000000000
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCanMovePageLayoutWidgetDown.test.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import { useCanMovePageLayoutWidgetDown } from '@/page-layout/hooks/useCanMovePageLayoutWidgetDown';
-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import {
- makeDraft,
- makeTab,
- makeWidget,
-} from '@/page-layout/testing/pageLayoutDraftFixtures';
-import { renderHook } from '@testing-library/react';
-import { createStore } from 'jotai';
-import { type ReactNode } from 'react';
-import {
- PageLayoutTabLayoutMode,
- WidgetType,
-} from '~/generated-metadata/graphql';
-import {
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- PageLayoutTestWrapper,
-} from './PageLayoutTestWrapper';
-
-describe('useCanMovePageLayoutWidgetDown', () => {
- const getWrapper =
- (store = createStore()) =>
- ({ children }: { children: ReactNode }) => (
- <PageLayoutTestWrapper
- store={store}
- instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}
- >
- {children}
- </PageLayoutTestWrapper>
- );
-
- const getDraftAtom = () =>
- pageLayoutDraftComponentState.atomFamily({
- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
- });
-
- it('should return true when widget is not the last one', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const widgetB = makeWidget('widget-b', 1);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, widgetB])]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetDown('widget-a')).toBe(true);
- });
-
- it('should return false when widget is the last one', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const widgetB = makeWidget('widget-b', 1);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, widgetB])]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetDown('widget-b')).toBe(false);
- });
-
- it('should return false when widget is not found', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
-
- store.set(getDraftAtom(), makeDraft([makeTab('tab-1', [widgetA])]));
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetDown('non-existent')).toBe(
- false,
- );
- });
-
- it('should return false for non-VERTICAL_LIST tab', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const widgetB = makeWidget('widget-b', 1);
-
- store.set(
- getDraftAtom(),
- makeDraft([
- makeTab('tab-1', [widgetA, widgetB], 0, PageLayoutTabLayoutMode.CANVAS),
- ]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetDown('widget-a')).toBe(false);
- });
-
- it('should return false for a FILL_VIEWPORT widget', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const timelineWidget = {
- ...makeWidget('timeline-widget', 0),
- type: WidgetType.TIMELINE,
- };
- const widgetB = makeWidget('widget-b', 1);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [timelineWidget, widgetB])]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetDown('timeline-widget')).toBe(
- false,
- );
- });
-
- it('should return false for the last fit-content widget before a viewport-filling widget', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const fieldsWidget = makeWidget('fields-widget', 0);
- const timelineWidget = {
- ...makeWidget('timeline-widget', 1),
- type: WidgetType.TIMELINE,
- };
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [fieldsWidget, timelineWidget])]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetDown('fields-widget')).toBe(
- false,
- );
- });
-
- it('should ignore viewport-filling widgets when resolving the fit-content widget below', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const timelineWidget = {
- ...makeWidget('timeline-widget', 1),
- type: WidgetType.TIMELINE,
- };
- const widgetB = makeWidget('widget-b', 2);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, timelineWidget, widgetB])]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetDown('widget-a')).toBe(true);
- expect(result.current.canMovePageLayoutWidgetDown('widget-b')).toBe(false);
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCanMovePageLayoutWidgetUp.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCanMovePageLayoutWidgetUp.test.tsx
deleted file mode 100644
index 11eaa7e5966..00000000000
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCanMovePageLayoutWidgetUp.test.tsx
+++ /dev/null
@@ -1,190 +0,0 @@
-import { useCanMovePageLayoutWidgetUp } from '@/page-layout/hooks/useCanMovePageLayoutWidgetUp';
-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import {
- makeDraft,
- makeTab,
- makeWidget,
-} from '@/page-layout/testing/pageLayoutDraftFixtures';
-import { renderHook } from '@testing-library/react';
-import { createStore } from 'jotai';
-import { type ReactNode } from 'react';
-import {
- PageLayoutTabLayoutMode,
- WidgetType,
-} from '~/generated-metadata/graphql';
-import {
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- PageLayoutTestWrapper,
-} from './PageLayoutTestWrapper';
-
-describe('useCanMovePageLayoutWidgetUp', () => {
- const getWrapper =
- (store = createStore()) =>
- ({ children }: { children: ReactNode }) => (
- <PageLayoutTestWrapper
- store={store}
- instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}
- >
- {children}
- </PageLayoutTestWrapper>
- );
-
- const getDraftAtom = () =>
- pageLayoutDraftComponentState.atomFamily({
- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
- });
-
- it('should return true when widget is not the first one', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const widgetB = makeWidget('widget-b', 1);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, widgetB])]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetUp('widget-b')).toBe(true);
- });
-
- it('should return false when widget is the first one', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const widgetB = makeWidget('widget-b', 1);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, widgetB])]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetUp('widget-a')).toBe(false);
- });
-
- it('should return false when widget is not found', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
-
- store.set(getDraftAtom(), makeDraft([makeTab('tab-1', [widgetA])]));
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetUp('non-existent')).toBe(
- false,
- );
- });
-
- it('should return false for non-VERTICAL_LIST tab', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const widgetB = makeWidget('widget-b', 1);
-
- store.set(
- getDraftAtom(),
- makeDraft([
- makeTab('tab-1', [widgetA, widgetB], 0, PageLayoutTabLayoutMode.CANVAS),
- ]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetUp('widget-b')).toBe(false);
- });
-
- it('should return false for a FILL_VIEWPORT widget', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const timelineWidget = {
- ...makeWidget('timeline-widget', 1),
- type: WidgetType.TIMELINE,
- };
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, timelineWidget])]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetUp('timeline-widget')).toBe(
- false,
- );
- });
-
- it('should ignore viewport-filling widgets when resolving the fit-content widget above', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const timelineWidget = {
- ...makeWidget('timeline-widget', 1),
- type: WidgetType.TIMELINE,
- };
- const widgetB = makeWidget('widget-b', 2);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, timelineWidget, widgetB])]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetUp('widget-b')).toBe(true);
- expect(result.current.canMovePageLayoutWidgetUp('widget-a')).toBe(false);
- });
-
- it('should not let a preceding viewport-filling widget make the first fit-content widget movable', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const timelineWidget = {
- ...makeWidget('timeline-widget', 0),
- type: WidgetType.TIMELINE,
- };
- const widgetA = makeWidget('widget-a', 1);
- const widgetB = makeWidget('widget-b', 2);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [timelineWidget, widgetA, widgetB])]),
- );
-
- const { result } = renderHook(
- () => useCanMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- expect(result.current.canMovePageLayoutWidgetUp('widget-a')).toBe(false);
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutGraphWidget.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutGraphWidget.test.tsx
index dbdcc5bdba0..bfbd0d520f7 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutGraphWidget.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutGraphWidget.test.tsx
@@ -1,17 +1,22 @@
import { useCreatePageLayoutGraphWidget } from '@/page-layout/hooks/useCreatePageLayoutGraphWidget';
import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { type GraphWidgetFieldSelection } from '@/page-layout/types/GraphWidgetFieldSelection';
+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
+import {
+ makeDraft,
+ makeTab,
+} from '@/page-layout/testing/pageLayoutDraftFixtures';
+import { buildDefaultBarChartConfiguration } from '@/page-layout/utils/buildDefaultBarChartConfiguration';
+import { buildDraftPageLayoutWidget } from '@/page-layout/utils/buildDraftPageLayoutWidget';
import { getTabListInstanceIdFromPageLayoutId } from '@/page-layout/utils/getTabListInstanceIdFromPageLayoutId';
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { act, renderHook } from '@testing-library/react';
-import { useSetAtom } from 'jotai';
-import { isDefined } from 'twenty-shared/utils';
+import { createStore } from 'jotai';
+import { type ReactNode } from 'react';
import {
+ BarChartLayout,
+ PageLayoutTabLayoutMode,
PageLayoutType,
- WidgetConfigurationType,
WidgetType,
} from '~/generated-metadata/graphql';
import {
@@ -24,250 +29,124 @@ jest.mock('uuid', () => ({
v4: jest.fn(() => 'mock-uuid'),
}));
-describe('useCreatePageLayoutGraphWidget', () => {
- beforeEach(() => {
- jest.clearAllMocks();
+const TAB_LIST_INSTANCE_ID = getTabListInstanceIdFromPageLayoutId(
+ PAGE_LAYOUT_TEST_INSTANCE_ID,
+);
+
+const makeBarChartWidget = (id: string, layout: BarChartLayout) =>
+ buildDraftPageLayoutWidget({
+ id,
+ pageLayoutTabId: 'tab-1',
+ title: id,
+ type: WidgetType.GRAPH,
+ configuration: { ...buildDefaultBarChartConfiguration({}), layout },
+ position: {
+ layoutMode: PageLayoutTabLayoutMode.GRID,
+ row: 0,
+ column: 0,
+ rowSpan: 2,
+ columnSpan: 2,
+ },
});
- it('should create widget in the correct tab with isolated layouts', () => {
- const { result } = renderHook(
- () => {
- const setActiveTabId = useSetAtom(
- activeTabIdComponentState.atomFamily({
- instanceId: `${PAGE_LAYOUT_TEST_INSTANCE_ID}-tab-list`,
- }),
- );
- const setPageLayoutDraft = useSetAtomComponentState(
- pageLayoutDraftComponentState,
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- );
- const pageLayoutDraft = useAtomComponentStateValue(
- pageLayoutDraftComponentState,
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- );
- const allWidgets = pageLayoutDraft.tabs.flatMap((tab) => tab.widgets);
- const pageLayoutCurrentLayouts = useAtomComponentStateValue(
- pageLayoutCurrentLayoutsComponentState,
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- );
- const createWidget = useCreatePageLayoutGraphWidget({
- pageLayoutId: PAGE_LAYOUT_TEST_INSTANCE_ID,
- tabListInstanceId: getTabListInstanceIdFromPageLayoutId(
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- ),
- });
- return {
- setActiveTabId,
- setPageLayoutDraft,
- allWidgets,
- pageLayoutCurrentLayouts,
- createWidget,
- };
- },
- {
- wrapper: PageLayoutTestWrapper,
- },
- );
-
- act(() => {
- result.current.setPageLayoutDraft({
- id: 'test-layout',
- name: 'Test Layout',
- type: PageLayoutType.DASHBOARD,
- isFirstTabPinned: true,
- objectMetadataId: null,
- tabs: [
- {
- isSystemSideEffect: false,
- universalIdentifier: 'universal-identifier-mock',
- id: 'tab-1',
- applicationId: '',
- title: 'Tab 1',
- isActive: true,
- position: 0,
- pageLayoutId: '',
- widgets: [],
- createdAt: new Date().toISOString(),
- updatedAt: new Date().toISOString(),
- deletedAt: null,
- },
- ],
- });
- result.current.setActiveTabId('tab-1');
+describe('useCreatePageLayoutGraphWidget', () => {
+ const getDraftAtom = () =>
+ pageLayoutDraftComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
});
- act(() => {
- result.current.createWidget.createPageLayoutGraphWidget({
- fieldSelection: {
- groupByFieldMetadataIdX: 'test-groupby-field-id',
- aggregateFieldMetadataId: 'test-aggregate-field-id',
- },
- });
+ const getCurrentLayoutsAtom = () =>
+ pageLayoutCurrentLayoutsComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
});
- expect(result.current.allWidgets).toHaveLength(1);
- expect(result.current.allWidgets[0].pageLayoutTabId).toBe('tab-1');
+ const createStoreWithWidgets = (widgets: PageLayoutWidget[]) => {
+ const store = createStore();
- expect(result.current.pageLayoutCurrentLayouts['tab-1']).toBeDefined();
- expect(
- result.current.pageLayoutCurrentLayouts['tab-1'].desktop,
- ).toHaveLength(1);
- expect(result.current.pageLayoutCurrentLayouts['tab-2']).toBeUndefined();
- });
+ store.set(getDraftAtom(), {
+ ...makeDraft([
+ makeTab('tab-1', widgets, 0, PageLayoutTabLayoutMode.GRID),
+ ]),
+ type: PageLayoutType.DASHBOARD,
+ });
+ store.set(
+ activeTabIdComponentState.atomFamily({
+ instanceId: TAB_LIST_INSTANCE_ID,
+ }),
+ 'tab-1',
+ );
+
+ return store;
+ };
- it('should handle different graph types', () => {
- const { result } = renderHook(
- () => {
- const setPageLayoutDraft = useSetAtomComponentState(
- pageLayoutDraftComponentState,
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- );
- const setActiveTabId = useSetAtom(
- activeTabIdComponentState.atomFamily({
- instanceId: `${PAGE_LAYOUT_TEST_INSTANCE_ID}-tab-list`,
- }),
- );
- const pageLayoutDraft = useAtomComponentStateValue(
- pageLayoutDraftComponentState,
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- );
- const allWidgets = pageLayoutDraft.tabs.flatMap((tab) => tab.widgets);
- const pageLayoutCurrentLayouts = useAtomComponentStateValue(
- pageLayoutCurrentLayoutsComponentState,
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- );
- const createWidget = useCreatePageLayoutGraphWidget({
+ const renderCreateGraphHook = (store: ReturnType<typeof createStore>) =>
+ renderHook(
+ () =>
+ useCreatePageLayoutGraphWidget({
pageLayoutId: PAGE_LAYOUT_TEST_INSTANCE_ID,
- tabListInstanceId: getTabListInstanceIdFromPageLayoutId(
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- ),
- });
- return {
- setPageLayoutDraft,
- setActiveTabId,
- pageLayoutDraft,
- allWidgets,
- pageLayoutCurrentLayouts,
- createWidget,
- };
- },
+ tabListInstanceId: TAB_LIST_INSTANCE_ID,
+ }),
{
- wrapper: PageLayoutTestWrapper,
+ wrapper: ({ children }: { children: ReactNode }) => (
+ <PageLayoutTestWrapper store={store}>
+ {children}
+ </PageLayoutTestWrapper>
+ ),
},
);
+ it('should create a vertical bar chart from the field selection with the bar chart size', () => {
+ const store = createStoreWithWidgets([]);
+ const { result } = renderCreateGraphHook(store);
+
act(() => {
- result.current.setPageLayoutDraft({
- id: 'test-layout',
- name: 'Test Layout',
- type: PageLayoutType.DASHBOARD,
- isFirstTabPinned: true,
- objectMetadataId: null,
- tabs: [
- {
- isSystemSideEffect: false,
- universalIdentifier: 'universal-identifier-mock',
- id: 'tab-1',
- applicationId: '',
- title: 'Tab 1',
- isActive: true,
- position: 0,
- pageLayoutId: '',
- widgets: [],
- createdAt: new Date().toISOString(),
- updatedAt: new Date().toISOString(),
- deletedAt: null,
- },
- ],
+ result.current.createPageLayoutGraphWidget({
+ fieldSelection: {
+ objectMetadataId: 'object-1',
+ groupByFieldMetadataIdX: 'field-2',
+ aggregateFieldMetadataId: 'field-1',
+ },
});
- result.current.setActiveTabId('tab-1');
});
- const widgetConfigurationTypes = [
- WidgetConfigurationType.AGGREGATE_CHART,
- WidgetConfigurationType.PIE_CHART,
- WidgetConfigurationType.BAR_CHART,
- ];
-
- const mockFieldSelections: Partial<
- Record<WidgetConfigurationType, GraphWidgetFieldSelection>
- > = {
- [WidgetConfigurationType.AGGREGATE_CHART]: {
- objectMetadataId: 'test-object-id',
- aggregateFieldMetadataId: 'test-aggregate-field-id',
+ const widgets = store.get(getDraftAtom()).tabs[0].widgets;
+
+ expect(widgets).toHaveLength(1);
+ expect(widgets[0]).toMatchObject({
+ id: 'mock-uuid',
+ pageLayoutTabId: 'tab-1',
+ type: WidgetType.GRAPH,
+ title: 'Vertical Bar Chart 1',
+ objectMetadataId: 'object-1',
+ configuration: {
+ __typename: 'BarChartConfiguration',
+ layout: BarChartLayout.VERTICAL,
+ primaryAxisGroupByFieldMetadataId: 'field-2',
+ aggregateFieldMetadataId: 'field-1',
},
- [WidgetConfigurationType.BAR_CHART]: {
- objectMetadataId: 'test-object-id',
- groupByFieldMetadataIdX: 'test-groupby-field-id',
- aggregateFieldMetadataId: 'test-aggregate-field-id',
- },
- };
-
- widgetConfigurationTypes.forEach((widgetConfigurationType) => {
- act(() => {
- const fieldSelection =
- mockFieldSelections[
- widgetConfigurationType as keyof typeof mockFieldSelections
- ];
- result.current.createWidget.createPageLayoutGraphWidget({
- fieldSelection,
- });
- });
});
+ expect(store.get(getCurrentLayoutsAtom())['tab-1'].desktop).toEqual([
+ { i: 'mock-uuid', x: 0, y: 0, w: 6, h: 6, minW: 4, minH: 4 },
+ ]);
+ });
- expect(result.current.allWidgets).toHaveLength(3);
-
- widgetConfigurationTypes.forEach((widgetConfigurationType, index) => {
- const widget = result.current.allWidgets[index];
- expect(widget.type).toBe(WidgetType.GRAPH);
- expect(widget.pageLayoutTabId).toBe('tab-1');
-
- if (
- isDefined(widget.configuration) &&
- 'graphType' in widget.configuration
- ) {
- expect(widget.configuration.configurationType).toBe(
- widgetConfigurationType,
- );
- }
+ it('should number the title after the existing vertical bar charts only', () => {
+ const store = createStoreWithWidgets([
+ makeBarChartWidget('vertical-chart', BarChartLayout.VERTICAL),
+ makeBarChartWidget('horizontal-chart', BarChartLayout.HORIZONTAL),
+ ]);
+ const { result } = renderCreateGraphHook(store);
- expect(widget.id).toBe('mock-uuid');
+ act(() => {
+ result.current.createPageLayoutGraphWidget({});
});
- expect(result.current.pageLayoutCurrentLayouts['tab-1']).toBeDefined();
- expect(
- result.current.pageLayoutCurrentLayouts['tab-1'].desktop,
- ).toHaveLength(3);
- expect(
- result.current.pageLayoutCurrentLayouts['tab-1'].mobile,
- ).toHaveLength(3);
-
- expect(result.current.pageLayoutDraft.tabs[0].widgets).toHaveLength(3);
- });
+ const widgets = store.get(getDraftAtom()).tabs[0].widgets;
- it('should throw an error when activeTabId is null', () => {
- const { result } = renderHook(
- () => {
- const createWidget = useCreatePageLayoutGraphWidget({
- pageLayoutId: PAGE_LAYOUT_TEST_INSTANCE_ID,
- tabListInstanceId: getTabListInstanceIdFromPageLayoutId(
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- ),
- });
- return { createWidget };
- },
- {
- wrapper: PageLayoutTestWrapper,
- },
- );
-
- expect(() => {
- result.current.createWidget.createPageLayoutGraphWidget({
- fieldSelection: {
- groupByFieldMetadataIdX: 'test-groupby-field-id',
- aggregateFieldMetadataId: 'test-aggregate-field-id',
- },
- });
- }).toThrow('A tab must be selected to create a new graph widget');
+ expect(widgets).toHaveLength(3);
+ expect(widgets[2]).toMatchObject({
+ title: 'Vertical Bar Chart 2',
+ objectMetadataId: null,
+ });
});
});
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutWidget.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutWidget.test.tsx
new file mode 100644
index 00000000000..d11a93ffe1c
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutWidget.test.tsx
@@ -0,0 +1,185 @@
+import { useCreatePageLayoutWidget } from '@/page-layout/hooks/useCreatePageLayoutWidget';
+import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';
+import {
+ makeDraft,
+ makeTab,
+} from '@/page-layout/testing/pageLayoutDraftFixtures';
+import { buildDefaultBarChartConfiguration } from '@/page-layout/utils/buildDefaultBarChartConfiguration';
+import { getTabListInstanceIdFromPageLayoutId } from '@/page-layout/utils/getTabListInstanceIdFromPageLayoutId';
+import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
+import { act, renderHook } from '@testing-library/react';
+import { createStore } from 'jotai';
+import { type ReactNode } from 'react';
+import {
+ PageLayoutTabLayoutMode,
+ PageLayoutType,
+ WidgetConfigurationType,
+ WidgetType,
+} from '~/generated-metadata/graphql';
+import {
+ PAGE_LAYOUT_TEST_INSTANCE_ID,
+ PageLayoutTestWrapper,
+} from './PageLayoutTestWrapper';
+
+jest.mock('uuid', () => ({
+ ...jest.requireActual('uuid'),
+ v4: jest.fn(() => 'mock-uuid'),
+}));
+
+const TAB_LIST_INSTANCE_ID = getTabListInstanceIdFromPageLayoutId(
+ PAGE_LAYOUT_TEST_INSTANCE_ID,
+);
+
+const IFRAME_WIDGET_PARAMS = {
+ type: WidgetType.IFRAME,
+ title: 'Untitled iFrame',
+ configuration: {
+ configurationType: WidgetConfigurationType.IFRAME,
+ url: null,
+ },
+};
+
+describe('useCreatePageLayoutWidget', () => {
+ const getDraftAtom = () =>
+ pageLayoutDraftComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ });
+
+ const getCurrentLayoutsAtom = () =>
+ pageLayoutCurrentLayoutsComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ });
+
+ const getDraggedAreaAtom = () =>
+ pageLayoutDraggedAreaComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ });
+
+ const getActiveTabIdAtom = () =>
+ activeTabIdComponentState.atomFamily({
+ instanceId: TAB_LIST_INSTANCE_ID,
+ });
+
+ const createStoreWithActiveGridTab = () => {
+ const store = createStore();
+
+ store.set(getDraftAtom(), {
+ ...makeDraft([makeTab('tab-1', [], 0, PageLayoutTabLayoutMode.GRID)]),
+ type: PageLayoutType.DASHBOARD,
+ });
+ store.set(getActiveTabIdAtom(), 'tab-1');
+
+ return store;
+ };
+
+ const renderCreateHook = (store: ReturnType<typeof createStore>) =>
+ renderHook(
+ () =>
+ useCreatePageLayoutWidget({
+ pageLayoutId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ tabListInstanceId: TAB_LIST_INSTANCE_ID,
+ }),
+ {
+ wrapper: ({ children }: { children: ReactNode }) => (
+ <PageLayoutTestWrapper store={store}>
+ {children}
+ </PageLayoutTestWrapper>
+ ),
+ },
+ );
+
+ it('should add the widget to the active tab with its type default size and isolated layouts', () => {
+ const store = createStoreWithActiveGridTab();
+ const { result } = renderCreateHook(store);
+
+ act(() => {
+ result.current.createPageLayoutWidget(IFRAME_WIDGET_PARAMS);
+ });
+
+ const widgets = store.get(getDraftAtom()).tabs[0].widgets;
+
+ expect(widgets).toHaveLength(1);
+ expect(widgets[0]).toMatchObject({
+ id: 'mock-uuid',
+ pageLayoutTabId: 'tab-1',
+ type: WidgetType.IFRAME,
+ title: 'Untitled iFrame',
+ configuration: IFRAME_WIDGET_PARAMS.configuration,
+ objectMetadataId: null,
+ position: {
+ __typename: 'PageLayoutWidgetGridPosition',
+ layoutMode: PageLayoutTabLayoutMode.GRID,
+ row: 0,
+ column: 0,
+ rowSpan: 6,
+ columnSpan: 6,
+ },
+ });
+
+ const currentLayouts = store.get(getCurrentLayoutsAtom());
+
+ expect(currentLayouts['tab-1'].desktop).toEqual([
+ { i: 'mock-uuid', x: 0, y: 0, w: 6, h: 6, minW: 4, minH: 5 },
+ ]);
+ expect(currentLayouts['tab-2']).toBeUndefined();
+ });
+
+ it('should place the widget on the dragged area, grown to the type minimum, then clear the area', () => {
+ const store = createStoreWithActiveGridTab();
+ store.set(getDraggedAreaAtom(), { x: 2, y: 3, w: 2, h: 2 });
+ const { result } = renderCreateHook(store);
+
+ act(() => {
+ result.current.createPageLayoutWidget(IFRAME_WIDGET_PARAMS);
+ });
+
+ expect(store.get(getDraftAtom()).tabs[0].widgets[0].position).toMatchObject(
+ { row: 3, column: 2, rowSpan: 5, columnSpan: 4 },
+ );
+ expect(store.get(getDraggedAreaAtom())).toBeNull();
+ });
+
+ it('should fall back to the configuration size for a type without a widget size', () => {
+ const store = createStoreWithActiveGridTab();
+ const { result } = renderCreateHook(store);
+
+ act(() => {
+ result.current.createPageLayoutWidget({
+ type: WidgetType.GRAPH,
+ title: 'Vertical Bar Chart 1',
+ configuration: buildDefaultBarChartConfiguration({}),
+ });
+ });
+
+ expect(store.get(getCurrentLayoutsAtom())['tab-1'].desktop).toEqual([
+ { i: 'mock-uuid', x: 0, y: 0, w: 6, h: 6, minW: 4, minH: 4 },
+ ]);
+ });
+
+ it('should accumulate one layout per created widget on desktop and mobile', () => {
+ const store = createStoreWithActiveGridTab();
+ const { result } = renderCreateHook(store);
+
+ act(() => {
+ result.current.createPageLayoutWidget(IFRAME_WIDGET_PARAMS);
+ result.current.createPageLayoutWidget(IFRAME_WIDGET_PARAMS);
+ result.current.createPageLayoutWidget(IFRAME_WIDGET_PARAMS);
+ });
+
+ const currentLayouts = store.get(getCurrentLayoutsAtom());
+
+ expect(store.get(getDraftAtom()).tabs[0].widgets).toHaveLength(3);
+ expect(currentLayouts['tab-1'].desktop).toHaveLength(3);
+ expect(currentLayouts['tab-1'].mobile).toHaveLength(3);
+ });
+
+ it('should throw when no tab is active', () => {
+ const { result } = renderCreateHook(createStore());
+
+ expect(() => {
+ result.current.createPageLayoutWidget(IFRAME_WIDGET_PARAMS);
+ }).toThrow('A tab must be selected to create a new IFRAME widget');
+ });
+});
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutWidget.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutWidget.test.tsx
new file mode 100644
index 00000000000..8fdfbd7e364
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutWidget.test.tsx
@@ -0,0 +1,225 @@
+import { useMovePageLayoutWidget } from '@/page-layout/hooks/useMovePageLayoutWidget';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import {
+ makeDraft,
+ makeTab,
+ makeWidget,
+} from '@/page-layout/testing/pageLayoutDraftFixtures';
+import { act, renderHook } from '@testing-library/react';
+import { createStore } from 'jotai';
+import { type ReactNode } from 'react';
+import { WidgetType } from '~/generated-metadata/graphql';
+import {
+ PAGE_LAYOUT_TEST_INSTANCE_ID,
+ PageLayoutTestWrapper,
+} from './PageLayoutTestWrapper';
+
+type DirectionCase = {
+ direction: 'up' | 'down';
+ adjacentPosition: 'above' | 'below';
+ edgePosition: 'top' | 'bottom';
+ movedWidgetId: string;
+ edgeWidgetId: string;
+};
+
+const DIRECTION_CASES: DirectionCase[] = [
+ {
+ direction: 'up',
+ adjacentPosition: 'above',
+ edgePosition: 'top',
+ movedWidgetId: 'widget-b',
+ edgeWidgetId: 'widget-a',
+ },
+ {
+ direction: 'down',
+ adjacentPosition: 'below',
+ edgePosition: 'bottom',
+ movedWidgetId: 'widget-a',
+ edgeWidgetId: 'widget-b',
+ },
+];
+
+describe('useMovePageLayoutWidget', () => {
+ const getWrapper =
+ (store = createStore()) =>
+ ({ children }: { children: ReactNode }) => (
+ <PageLayoutTestWrapper
+ store={store}
+ instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}
+ >
+ {children}
+ </PageLayoutTestWrapper>
+ );
+
+ const getDraftAtom = () =>
+ pageLayoutDraftComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ });
+
+ const renderMoveHook = (store: ReturnType<typeof createStore>) =>
+ renderHook(() => useMovePageLayoutWidget(PAGE_LAYOUT_TEST_INSTANCE_ID), {
+ wrapper: getWrapper(store),
+ });
+
+ const makeTimelineWidget = (index: number) => ({
+ ...makeWidget('timeline-widget', index),
+ type: WidgetType.TIMELINE,
+ });
+
+ describe.each(DIRECTION_CASES)(
+ '$direction',
+ ({
+ direction,
+ adjacentPosition,
+ edgePosition,
+ movedWidgetId,
+ edgeWidgetId,
+ }) => {
+ it(`should swap widget with the one ${adjacentPosition} it`, () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+ const widgetB = makeWidget('widget-b', 1);
+ const widgetC = makeWidget('widget-c', 2);
+
+ store.set(
+ getDraftAtom(),
+ makeDraft([makeTab('tab-1', [widgetA, widgetB, widgetC])]),
+ );
+
+ const { result } = renderMoveHook(store);
+
+ act(() => {
+ result.current.movePageLayoutWidget(movedWidgetId, direction);
+ });
+
+ const widgets = store.get(getDraftAtom()).tabs[0].widgets;
+
+ const widgetAPosition = widgets.find(
+ (widget) => widget.id === 'widget-a',
+ )?.position;
+ const widgetBPosition = widgets.find(
+ (widget) => widget.id === 'widget-b',
+ )?.position;
+
+ expect(widgetBPosition).toEqual(expect.objectContaining({ index: 0 }));
+ expect(widgetAPosition).toEqual(expect.objectContaining({ index: 1 }));
+ });
+
+ it(`should move relative to the fit-content widget ${adjacentPosition} and canonicalize the list`, () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+ const timelineWidget = makeTimelineWidget(1);
+ const widgetB = makeWidget('widget-b', 2);
+
+ store.set(
+ getDraftAtom(),
+ makeDraft([makeTab('tab-1', [widgetA, timelineWidget, widgetB])]),
+ );
+
+ const { result } = renderMoveHook(store);
+
+ act(() => {
+ result.current.movePageLayoutWidget(movedWidgetId, direction);
+ });
+
+ const draft = store.get(getDraftAtom());
+
+ expect(draft.tabs[0].widgets.map((widget) => widget.id)).toEqual([
+ 'widget-b',
+ 'widget-a',
+ 'timeline-widget',
+ ]);
+ expect(
+ draft.tabs[0].widgets.map((widget) =>
+ widget.position && 'index' in widget.position
+ ? widget.position.index
+ : undefined,
+ ),
+ ).toEqual([0, 1, 2]);
+ });
+
+ it('should not move a viewport-filling widget', () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+ const timelineWidget = makeTimelineWidget(1);
+ const widgetB = makeWidget('widget-b', 2);
+ const initialDraft = makeDraft([
+ makeTab('tab-1', [widgetA, timelineWidget, widgetB]),
+ ]);
+
+ store.set(getDraftAtom(), initialDraft);
+
+ const { result } = renderMoveHook(store);
+
+ act(() => {
+ result.current.movePageLayoutWidget('timeline-widget', direction);
+ });
+
+ expect(store.get(getDraftAtom())).toBe(initialDraft);
+ });
+
+ it(`should not change draft when widget is already at the ${edgePosition}`, () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+ const widgetB = makeWidget('widget-b', 1);
+
+ const initialDraft = makeDraft([makeTab('tab-1', [widgetA, widgetB])]);
+ store.set(getDraftAtom(), initialDraft);
+
+ const { result } = renderMoveHook(store);
+
+ act(() => {
+ result.current.movePageLayoutWidget(edgeWidgetId, direction);
+ });
+
+ expect(store.get(getDraftAtom())).toBe(initialDraft);
+ });
+
+ it('should not change draft when widget is not found', () => {
+ const store = createStore();
+
+ const widgetA = makeWidget('widget-a', 0);
+ const initialDraft = makeDraft([makeTab('tab-1', [widgetA])]);
+ store.set(getDraftAtom(), initialDraft);
+
+ const { result } = renderMoveHook(store);
+
+ act(() => {
+ result.current.movePageLayoutWidget('non-existent', direction);
+ });
+
+ expect(store.get(getDraftAtom())).toBe(initialDraft);
+ });
+
+ it('should only modify the correct tab', () => {
+ const store = createStore();
+
+ const tab1WidgetA = makeWidget('widget-a', 0, 'tab-1');
+ const tab1WidgetB = makeWidget('widget-b', 1, 'tab-1');
+ const tab2WidgetX = makeWidget('widget-x', 0, 'tab-2');
+
+ store.set(
+ getDraftAtom(),
+ makeDraft([
+ makeTab('tab-1', [tab1WidgetA, tab1WidgetB], 0),
+ makeTab('tab-2', [tab2WidgetX], 1),
+ ]),
+ );
+
+ const { result } = renderMoveHook(store);
+
+ act(() => {
+ result.current.movePageLayoutWidget(movedWidgetId, direction);
+ });
+
+ expect(store.get(getDraftAtom()).tabs[1].widgets[0].id).toBe(
+ 'widget-x',
+ );
+ });
+ },
+ );
+});
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutWidgetDown.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutWidgetDown.test.tsx
deleted file mode 100644
index 01d6f9816d2..00000000000
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutWidgetDown.test.tsx
+++ /dev/null
@@ -1,210 +0,0 @@
-import { useMovePageLayoutWidgetDown } from '@/page-layout/hooks/useMovePageLayoutWidgetDown';
-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import {
- makeDraft,
- makeTab,
- makeWidget,
-} from '@/page-layout/testing/pageLayoutDraftFixtures';
-import { act, renderHook } from '@testing-library/react';
-import { createStore } from 'jotai';
-import { type ReactNode } from 'react';
-import { WidgetType } from '~/generated-metadata/graphql';
-import {
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- PageLayoutTestWrapper,
-} from './PageLayoutTestWrapper';
-
-describe('useMovePageLayoutWidgetDown', () => {
- const getWrapper =
- (store = createStore()) =>
- ({ children }: { children: ReactNode }) => (
- <PageLayoutTestWrapper
- store={store}
- instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}
- >
- {children}
- </PageLayoutTestWrapper>
- );
-
- const getDraftAtom = () =>
- pageLayoutDraftComponentState.atomFamily({
- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
- });
-
- it('should swap widget with the one below it', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const widgetB = makeWidget('widget-b', 1);
- const widgetC = makeWidget('widget-c', 2);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, widgetB, widgetC])]),
- );
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetDown('widget-a');
- });
-
- const draft = store.get(getDraftAtom());
- const widgets = draft.tabs[0].widgets;
-
- const widgetAPosition = widgets.find((w) => w.id === 'widget-a')?.position;
- const widgetBPosition = widgets.find((w) => w.id === 'widget-b')?.position;
-
- expect(widgetAPosition).toEqual(expect.objectContaining({ index: 1 }));
- expect(widgetBPosition).toEqual(expect.objectContaining({ index: 0 }));
- });
-
- it('should move relative to the fit-content widget below and canonicalize the list', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const timelineWidget = {
- ...makeWidget('timeline-widget', 1),
- type: WidgetType.TIMELINE,
- };
- const widgetB = makeWidget('widget-b', 2);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, timelineWidget, widgetB])]),
- );
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetDown('widget-a');
- });
-
- const draft = store.get(getDraftAtom());
-
- expect(draft.tabs[0].widgets.map((widget) => widget.id)).toEqual([
- 'widget-b',
- 'widget-a',
- 'timeline-widget',
- ]);
- expect(
- draft.tabs[0].widgets.map((widget) =>
- widget.position && 'index' in widget.position
- ? widget.position.index
- : undefined,
- ),
- ).toEqual([0, 1, 2]);
- });
-
- it('should not move a viewport-filling widget', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const timelineWidget = {
- ...makeWidget('timeline-widget', 1),
- type: WidgetType.TIMELINE,
- };
- const widgetB = makeWidget('widget-b', 2);
- const initialDraft = makeDraft([
- makeTab('tab-1', [widgetA, timelineWidget, widgetB]),
- ]);
-
- store.set(getDraftAtom(), initialDraft);
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetDown('timeline-widget');
- });
-
- expect(store.get(getDraftAtom())).toBe(initialDraft);
- });
-
- it('should not change draft when widget is at the bottom', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const widgetB = makeWidget('widget-b', 1);
-
- const initialDraft = makeDraft([makeTab('tab-1', [widgetA, widgetB])]);
- store.set(getDraftAtom(), initialDraft);
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetDown('widget-b');
- });
-
- const draft = store.get(getDraftAtom());
-
- expect(draft).toBe(initialDraft);
- });
-
- it('should not change draft when widget is not found', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const initialDraft = makeDraft([makeTab('tab-1', [widgetA])]);
- store.set(getDraftAtom(), initialDraft);
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetDown('non-existent');
- });
-
- const draft = store.get(getDraftAtom());
-
- expect(draft).toBe(initialDraft);
- });
-
- it('should only modify the correct tab', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const tab1WidgetA = makeWidget('widget-a', 0, 'tab-1');
- const tab1WidgetB = makeWidget('widget-b', 1, 'tab-1');
- const tab2WidgetX = makeWidget('widget-x', 0, 'tab-2');
-
- store.set(
- getDraftAtom(),
- makeDraft([
- makeTab('tab-1', [tab1WidgetA, tab1WidgetB], 0),
- makeTab('tab-2', [tab2WidgetX], 1),
- ]),
- );
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetDown(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetDown('widget-a');
- });
-
- const draft = store.get(getDraftAtom());
-
- expect(draft.tabs[1].widgets[0].id).toBe('widget-x');
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutWidgetUp.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutWidgetUp.test.tsx
deleted file mode 100644
index d6a5747955e..00000000000
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutWidgetUp.test.tsx
+++ /dev/null
@@ -1,210 +0,0 @@
-import { useMovePageLayoutWidgetUp } from '@/page-layout/hooks/useMovePageLayoutWidgetUp';
-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import {
- makeDraft,
- makeTab,
- makeWidget,
-} from '@/page-layout/testing/pageLayoutDraftFixtures';
-import { act, renderHook } from '@testing-library/react';
-import { createStore } from 'jotai';
-import { type ReactNode } from 'react';
-import { WidgetType } from '~/generated-metadata/graphql';
-import {
- PAGE_LAYOUT_TEST_INSTANCE_ID,
- PageLayoutTestWrapper,
-} from './PageLayoutTestWrapper';
-
-describe('useMovePageLayoutWidgetUp', () => {
- const getWrapper =
- (store = createStore()) =>
- ({ children }: { children: ReactNode }) => (
- <PageLayoutTestWrapper
- store={store}
- instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}
- >
- {children}
- </PageLayoutTestWrapper>
- );
-
- const getDraftAtom = () =>
- pageLayoutDraftComponentState.atomFamily({
- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
- });
-
- it('should swap widget with the one above it', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const widgetB = makeWidget('widget-b', 1);
- const widgetC = makeWidget('widget-c', 2);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, widgetB, widgetC])]),
- );
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetUp('widget-b');
- });
-
- const draft = store.get(getDraftAtom());
- const widgets = draft.tabs[0].widgets;
-
- const widgetAPosition = widgets.find((w) => w.id === 'widget-a')?.position;
- const widgetBPosition = widgets.find((w) => w.id === 'widget-b')?.position;
-
- expect(widgetBPosition).toEqual(expect.objectContaining({ index: 0 }));
- expect(widgetAPosition).toEqual(expect.objectContaining({ index: 1 }));
- });
-
- it('should move relative to the fit-content widget above and canonicalize the list', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const timelineWidget = {
- ...makeWidget('timeline-widget', 1),
- type: WidgetType.TIMELINE,
- };
- const widgetB = makeWidget('widget-b', 2);
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', [widgetA, timelineWidget, widgetB])]),
- );
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetUp('widget-b');
- });
-
- const draft = store.get(getDraftAtom());
-
- expect(draft.tabs[0].widgets.map((widget) => widget.id)).toEqual([
- 'widget-b',
- 'widget-a',
- 'timeline-widget',
- ]);
- expect(
- draft.tabs[0].widgets.map((widget) =>
- widget.position && 'index' in widget.position
- ? widget.position.index
- : undefined,
- ),
- ).toEqual([0, 1, 2]);
- });
-
- it('should not move a viewport-filling widget', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const timelineWidget = {
- ...makeWidget('timeline-widget', 1),
- type: WidgetType.TIMELINE,
- };
- const widgetB = makeWidget('widget-b', 2);
- const initialDraft = makeDraft([
- makeTab('tab-1', [widgetA, timelineWidget, widgetB]),
- ]);
-
- store.set(getDraftAtom(), initialDraft);
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetUp('timeline-widget');
- });
-
- expect(store.get(getDraftAtom())).toBe(initialDraft);
- });
-
- it('should not change draft when widget is already at the top', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const widgetB = makeWidget('widget-b', 1);
-
- const initialDraft = makeDraft([makeTab('tab-1', [widgetA, widgetB])]);
- store.set(getDraftAtom(), initialDraft);
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetUp('widget-a');
- });
-
- const draft = store.get(getDraftAtom());
-
- expect(draft).toBe(initialDraft);
- });
-
- it('should not change draft when widget is not found', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const widgetA = makeWidget('widget-a', 0);
- const initialDraft = makeDraft([makeTab('tab-1', [widgetA])]);
- store.set(getDraftAtom(), initialDraft);
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetUp('non-existent');
- });
-
- const draft = store.get(getDraftAtom());
-
- expect(draft).toBe(initialDraft);
- });
-
- it('should only modify the correct tab', () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const tab1WidgetA = makeWidget('widget-a', 0, 'tab-1');
- const tab1WidgetB = makeWidget('widget-b', 1, 'tab-1');
- const tab2WidgetX = makeWidget('widget-x', 0, 'tab-2');
-
- store.set(
- getDraftAtom(),
- makeDraft([
- makeTab('tab-1', [tab1WidgetA, tab1WidgetB], 0),
- makeTab('tab-2', [tab2WidgetX], 1),
- ]),
- );
-
- const { result } = renderHook(
- () => useMovePageLayoutWidgetUp(PAGE_LAYOUT_TEST_INSTANCE_ID),
- { wrapper },
- );
-
- act(() => {
- result.current.movePageLayoutWidgetUp('widget-b');
- });
-
- const draft = store.get(getDraftAtom());
-
- expect(draft.tabs[1].widgets[0].id).toBe('widget-x');
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidgetDown.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidget.ts
similarity index 88%
rename from packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidgetDown.ts
rename to packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidget.ts
index 11693f7df25..a5137ddecdb 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidgetDown.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidget.ts
@@ -9,9 +9,7 @@ import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
-export const useCanMovePageLayoutWidgetDown = (
- pageLayoutIdFromProps?: string,
-) => {
+export const useCanMovePageLayoutWidget = (pageLayoutIdFromProps?: string) => {
const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
PageLayoutComponentInstanceContext,
pageLayoutIdFromProps,
@@ -24,8 +22,8 @@ export const useCanMovePageLayoutWidgetDown = (
const store = useStore();
- const canMovePageLayoutWidgetDown = useCallback(
- (widgetId: string) => {
+ const canMovePageLayoutWidget = useCallback(
+ (widgetId: string, direction: 'up' | 'down') => {
const draft = store.get(pageLayoutDraftState);
const tab = draft.tabs.find((candidateTab) =>
@@ -46,12 +44,12 @@ export const useCanMovePageLayoutWidgetDown = (
getAdjacentFitContentWidgetIndex({
widgets: sortedWidgets,
widgetIndex,
- direction: 'down',
+ direction,
}),
);
},
[pageLayoutDraftState, store],
);
- return { canMovePageLayoutWidgetDown };
+ return { canMovePageLayoutWidget };
};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidgetUp.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidgetUp.ts
deleted file mode 100644
index e46b6a2cf24..00000000000
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidgetUp.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { getAdjacentFitContentWidgetIndex } from '@/page-layout/utils/getAdjacentFitContentWidgetIndex';
-import { sortWidgetsByVerticalListPosition } from '@/page-layout/utils/sortWidgetsByVerticalListPosition';
-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-import { useStore } from 'jotai';
-import { useCallback } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
-
-export const useCanMovePageLayoutWidgetUp = (
- pageLayoutIdFromProps?: string,
-) => {
- const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
- PageLayoutComponentInstanceContext,
- pageLayoutIdFromProps,
- );
-
- const pageLayoutDraftState = useAtomComponentStateCallbackState(
- pageLayoutDraftComponentState,
- pageLayoutId,
- );
-
- const store = useStore();
-
- const canMovePageLayoutWidgetUp = useCallback(
- (widgetId: string) => {
- const draft = store.get(pageLayoutDraftState);
-
- const tab = draft.tabs.find((candidateTab) =>
- candidateTab.widgets.some((widget) => widget.id === widgetId),
- );
-
- if (!tab || tab.layoutMode !== PageLayoutTabLayoutMode.VERTICAL_LIST) {
- return false;
- }
-
- const sortedWidgets = sortWidgetsByVerticalListPosition(tab.widgets);
-
- const widgetIndex = sortedWidgets.findIndex(
- (widget) => widget.id === widgetId,
- );
-
- return isDefined(
- getAdjacentFitContentWidgetIndex({
- widgets: sortedWidgets,
- widgetIndex,
- direction: 'up',
- }),
- );
- },
- [pageLayoutDraftState, store],
- );
-
- return { canMovePageLayoutWidgetUp };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutFrontComponentWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutFrontComponentWidget.ts
deleted file mode 100644
index 353e267f108..00000000000
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutFrontComponentWidget.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import { WIDGET_SIZES } from '@/page-layout/constants/WidgetSizes';
-import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
-import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';
-import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-import { addWidgetToTab } from '@/page-layout/utils/addWidgetToTab';
-import { createDefaultFrontComponentWidget } from '@/page-layout/utils/createDefaultFrontComponentWidget';
-import { getDefaultWidgetPosition } from '@/page-layout/utils/getDefaultWidgetPosition';
-import { getUpdatedTabLayouts } from '@/page-layout/utils/getUpdatedTabLayouts';
-import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useStore } from 'jotai';
-import { useCallback } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-import { v4 as uuidv4 } from 'uuid';
-import {
- PageLayoutTabLayoutMode,
- WidgetType,
-} from '~/generated-metadata/graphql';
-
-export const useCreatePageLayoutFrontComponentWidget = ({
- pageLayoutId: pageLayoutIdFromProps,
- tabListInstanceId,
-}: {
- pageLayoutId: string;
- tabListInstanceId: string;
-}) => {
- const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
- PageLayoutComponentInstanceContext,
- pageLayoutIdFromProps,
- );
-
- const activeTabId = useAtomComponentStateValue(
- activeTabIdComponentState,
- tabListInstanceId,
- );
-
- const pageLayoutCurrentLayoutsState = useAtomComponentStateCallbackState(
- pageLayoutCurrentLayoutsComponentState,
- pageLayoutId,
- );
-
- const pageLayoutDraggedAreaState = useAtomComponentStateCallbackState(
- pageLayoutDraggedAreaComponentState,
- pageLayoutId,
- );
-
- const pageLayoutDraftState = useAtomComponentStateCallbackState(
- pageLayoutDraftComponentState,
- pageLayoutId,
- );
-
- const store = useStore();
-
- const createPageLayoutFrontComponentWidget = useCallback(
- (title: string, frontComponentId: string): PageLayoutWidget => {
- const allTabLayouts = store.get(pageLayoutCurrentLayoutsState);
-
- const pageLayoutDraggedArea = store.get(pageLayoutDraggedAreaState);
-
- if (!isDefined(activeTabId)) {
- throw new Error(
- 'A tab must be selected to create a new front component widget',
- );
- }
-
- const widgetId = uuidv4();
- const frontComponentSize = WIDGET_SIZES[WidgetType.FRONT_COMPONENT]!;
- const defaultSize = frontComponentSize.default;
- const minimumSize = frontComponentSize.minimum;
- const position = getDefaultWidgetPosition(
- pageLayoutDraggedArea,
- defaultSize,
- minimumSize,
- );
-
- const newWidget = createDefaultFrontComponentWidget(
- widgetId,
- activeTabId,
- title,
- frontComponentId,
- {
- layoutMode: PageLayoutTabLayoutMode.GRID,
- row: position.y,
- column: position.x,
- rowSpan: position.h,
- columnSpan: position.w,
- },
- );
-
- const newLayout = {
- i: widgetId,
- x: position.x,
- y: position.y,
- w: position.w,
- h: position.h,
- minW: minimumSize.w,
- minH: minimumSize.h,
- };
-
- const updatedLayouts = getUpdatedTabLayouts(
- allTabLayouts,
- activeTabId,
- newLayout,
- );
-
- store.set(pageLayoutCurrentLayoutsState, updatedLayouts);
-
- store.set(pageLayoutDraftState, (prev) => ({
- ...prev,
- tabs: addWidgetToTab(prev.tabs, activeTabId, newWidget),
- }));
-
- store.set(pageLayoutDraggedAreaState, null);
-
- return newWidget;
- },
- [
- activeTabId,
- pageLayoutCurrentLayoutsState,
- pageLayoutDraftState,
- pageLayoutDraggedAreaState,
- store,
- ],
- );
-
- return { createPageLayoutFrontComponentWidget };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutGraphWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutGraphWidget.ts
index 3d407bd58a1..8bf09e692ff 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutGraphWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutGraphWidget.ts
@@ -1,27 +1,18 @@
import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';
+import { useCreatePageLayoutWidget } from '@/page-layout/hooks/useCreatePageLayoutWidget';
import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
-import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';
import { type GraphWidgetFieldSelection } from '@/page-layout/types/GraphWidgetFieldSelection';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-import { addWidgetToTab } from '@/page-layout/utils/addWidgetToTab';
-import { createDefaultGraphWidget } from '@/page-layout/utils/createDefaultGraphWidget';
-import { getDefaultWidgetPosition } from '@/page-layout/utils/getDefaultWidgetPosition';
-import { getUpdatedTabLayouts } from '@/page-layout/utils/getUpdatedTabLayouts';
-import { getWidgetSize } from '@/page-layout/utils/getWidgetSize';
+import { buildDefaultBarChartConfiguration } from '@/page-layout/utils/buildDefaultBarChartConfiguration';
import { getWidgetTitle } from '@/page-layout/utils/getWidgetTitle';
import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';
-import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
import { useStore } from 'jotai';
import { useCallback } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-import { v4 as uuidv4 } from 'uuid';
import {
BarChartLayout,
- PageLayoutTabLayoutMode,
WidgetConfigurationType,
WidgetType,
} from '~/generated-metadata/graphql';
@@ -38,23 +29,18 @@ export const useCreatePageLayoutGraphWidget = ({
pageLayoutIdFromProps,
);
- const store = useStore();
- const { timeZone, calendarStartDay } = useDateTimeFormat();
-
const pageLayoutDraftState = useAtomComponentStateCallbackState(
pageLayoutDraftComponentState,
pageLayoutId,
);
- const pageLayoutCurrentLayoutsState = useAtomComponentStateCallbackState(
- pageLayoutCurrentLayoutsComponentState,
- pageLayoutId,
- );
+ const store = useStore();
+ const { timeZone, calendarStartDay } = useDateTimeFormat();
- const pageLayoutDraggedAreaState = useAtomComponentStateCallbackState(
- pageLayoutDraggedAreaComponentState,
+ const { createPageLayoutWidget } = useCreatePageLayoutWidget({
pageLayoutId,
- );
+ tabListInstanceId,
+ });
const createPageLayoutGraphWidget = useCallback(
({
@@ -62,112 +48,42 @@ export const useCreatePageLayoutGraphWidget = ({
}: {
fieldSelection?: GraphWidgetFieldSelection;
}): PageLayoutWidget => {
- const activeTabId = store.get(
- activeTabIdComponentState.atomFamily({
- instanceId: tabListInstanceId,
+ const existingVerticalBarChartCount = store
+ .get(pageLayoutDraftState)
+ .tabs.flatMap((tab) => tab.widgets)
+ .filter(
+ (widget) =>
+ widget.type === WidgetType.GRAPH &&
+ isWidgetConfigurationOfType(
+ widget.configuration,
+ 'BarChartConfiguration',
+ ) &&
+ widget.configuration.layout === BarChartLayout.VERTICAL,
+ ).length;
+
+ return createPageLayoutWidget({
+ type: WidgetType.GRAPH,
+ title: getWidgetTitle(
+ {
+ configurationType: WidgetConfigurationType.BAR_CHART,
+ layout: BarChartLayout.VERTICAL,
+ },
+ existingVerticalBarChartCount,
+ ),
+ configuration: buildDefaultBarChartConfiguration({
+ fieldSelection,
+ timezone: timeZone,
+ firstDayOfTheWeek: calendarStartDay,
}),
- );
-
- if (!isDefined(activeTabId)) {
- throw new Error('A tab must be selected to create a new graph widget');
- }
-
- const pageLayoutDraft = store.get(pageLayoutDraftState);
-
- const allTabLayouts = store.get(pageLayoutCurrentLayoutsState);
-
- const pageLayoutDraggedArea = store.get(pageLayoutDraggedAreaState);
-
- const allWidgets = pageLayoutDraft.tabs.flatMap((tab) => tab.widgets);
- const existingWidgetCount = allWidgets.filter((widget) => {
- if (widget.type !== WidgetType.GRAPH) {
- return false;
- }
-
- if (
- !isWidgetConfigurationOfType(
- widget.configuration,
- 'BarChartConfiguration',
- )
- ) {
- return false;
- }
- return widget.configuration.layout === BarChartLayout.VERTICAL;
- }).length;
-
- const title = getWidgetTitle(
- {
- configurationType: WidgetConfigurationType.BAR_CHART,
- layout: BarChartLayout.VERTICAL,
- },
- existingWidgetCount,
- );
- const widgetId = uuidv4();
-
- const defaultSize = getWidgetSize(
- WidgetConfigurationType.BAR_CHART,
- 'default',
- );
- const minimumSize = getWidgetSize(
- WidgetConfigurationType.BAR_CHART,
- 'minimum',
- );
- const position = getDefaultWidgetPosition(
- pageLayoutDraggedArea,
- defaultSize,
- minimumSize,
- );
-
- const newWidget = createDefaultGraphWidget({
- id: widgetId,
- pageLayoutTabId: activeTabId,
- title,
- position: {
- layoutMode: PageLayoutTabLayoutMode.GRID,
- row: position.y,
- column: position.x,
- rowSpan: position.h,
- columnSpan: position.w,
- },
- fieldSelection,
- timezone: timeZone,
- firstDayOfTheWeek: calendarStartDay,
+ objectMetadataId: fieldSelection?.objectMetadataId,
});
-
- const newLayout = {
- i: widgetId,
- x: position.x,
- y: position.y,
- w: position.w,
- h: position.h,
- minW: minimumSize.w,
- minH: minimumSize.h,
- };
-
- const updatedLayouts = getUpdatedTabLayouts(
- allTabLayouts,
- activeTabId,
- newLayout,
- );
- store.set(pageLayoutCurrentLayoutsState, updatedLayouts);
-
- store.set(pageLayoutDraftState, (prev) => ({
- ...prev,
- tabs: addWidgetToTab(prev.tabs, activeTabId, newWidget),
- }));
-
- store.set(pageLayoutDraggedAreaState, null);
-
- return newWidget;
},
[
- tabListInstanceId,
- pageLayoutCurrentLayoutsState,
- pageLayoutDraftState,
- pageLayoutDraggedAreaState,
- timeZone,
calendarStartDay,
+ createPageLayoutWidget,
+ pageLayoutDraftState,
store,
+ timeZone,
],
);
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutIframeWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutIframeWidget.ts
deleted file mode 100644
index 9c3415da022..00000000000
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutIframeWidget.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { WIDGET_SIZES } from '@/page-layout/constants/WidgetSizes';
-import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
-import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';
-import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-import { addWidgetToTab } from '@/page-layout/utils/addWidgetToTab';
-import { createDefaultIframeWidget } from '@/page-layout/utils/createDefaultIframeWidget';
-import { getDefaultWidgetPosition } from '@/page-layout/utils/getDefaultWidgetPosition';
-import { getUpdatedTabLayouts } from '@/page-layout/utils/getUpdatedTabLayouts';
-import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useStore } from 'jotai';
-import { useCallback } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-import { v4 as uuidv4 } from 'uuid';
-import {
- PageLayoutTabLayoutMode,
- WidgetType,
-} from '~/generated-metadata/graphql';
-
-export const useCreatePageLayoutIframeWidget = ({
- pageLayoutId: pageLayoutIdFromProps,
- tabListInstanceId,
-}: {
- pageLayoutId: string;
- tabListInstanceId: string;
-}) => {
- const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
- PageLayoutComponentInstanceContext,
- pageLayoutIdFromProps,
- );
-
- const activeTabId = useAtomComponentStateValue(
- activeTabIdComponentState,
- tabListInstanceId,
- );
-
- const pageLayoutCurrentLayoutsState = useAtomComponentStateCallbackState(
- pageLayoutCurrentLayoutsComponentState,
- pageLayoutId,
- );
-
- const pageLayoutDraggedAreaState = useAtomComponentStateCallbackState(
- pageLayoutDraggedAreaComponentState,
- pageLayoutId,
- );
-
- const pageLayoutDraftState = useAtomComponentStateCallbackState(
- pageLayoutDraftComponentState,
- pageLayoutId,
- );
-
- const store = useStore();
-
- const createPageLayoutIframeWidget = useCallback(
- (title: string, url: string | null): PageLayoutWidget => {
- const allTabLayouts = store.get(pageLayoutCurrentLayoutsState);
-
- const pageLayoutDraggedArea = store.get(pageLayoutDraggedAreaState);
-
- if (!isDefined(activeTabId)) {
- throw new Error('A tab must be selected to create a new iframe widget');
- }
-
- const widgetId = uuidv4();
- const iframeSize = WIDGET_SIZES[WidgetType.IFRAME]!;
- const defaultIframeSize = iframeSize.default;
- const minimumSize = iframeSize.minimum;
- const position = getDefaultWidgetPosition(
- pageLayoutDraggedArea,
- defaultIframeSize,
- minimumSize,
- );
-
- const newWidget = createDefaultIframeWidget(
- widgetId,
- activeTabId,
- title,
- url,
- {
- layoutMode: PageLayoutTabLayoutMode.GRID,
- row: position.y,
- column: position.x,
- rowSpan: position.h,
- columnSpan: position.w,
- },
- );
-
- const newLayout = {
- i: widgetId,
- x: position.x,
- y: position.y,
- w: position.w,
- h: position.h,
- minW: minimumSize.w,
- minH: minimumSize.h,
- };
-
- const updatedLayouts = getUpdatedTabLayouts(
- allTabLayouts,
- activeTabId,
- newLayout,
- );
-
- store.set(pageLayoutCurrentLayoutsState, updatedLayouts);
-
- store.set(pageLayoutDraftState, (prev) => ({
- ...prev,
- tabs: addWidgetToTab(prev.tabs, activeTabId, newWidget),
- }));
-
- store.set(pageLayoutDraggedAreaState, null);
-
- return newWidget;
- },
- [
- activeTabId,
- pageLayoutCurrentLayoutsState,
- pageLayoutDraftState,
- pageLayoutDraggedAreaState,
- store,
- ],
- );
-
- return { createPageLayoutIframeWidget };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutRecordTableWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutRecordTableWidget.ts
deleted file mode 100644
index 2a0d1f108bc..00000000000
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutRecordTableWidget.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { WIDGET_SIZES } from '@/page-layout/constants/WidgetSizes';
-import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
-import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';
-import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-import { addWidgetToTab } from '@/page-layout/utils/addWidgetToTab';
-import { createDefaultRecordTableWidget } from '@/page-layout/utils/createDefaultRecordTableWidget';
-import { getDefaultWidgetPosition } from '@/page-layout/utils/getDefaultWidgetPosition';
-import { getTabListInstanceIdFromPageLayoutId } from '@/page-layout/utils/getTabListInstanceIdFromPageLayoutId';
-import { getUpdatedTabLayouts } from '@/page-layout/utils/getUpdatedTabLayouts';
-import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useStore } from 'jotai';
-import { useCallback } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-import { v4 as uuidv4 } from 'uuid';
-import {
- PageLayoutTabLayoutMode,
- PageLayoutType,
- WidgetType,
-} from '~/generated-metadata/graphql';
-
-export const useCreatePageLayoutRecordTableWidget = (
- pageLayoutIdFromProps?: string,
-) => {
- const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
- PageLayoutComponentInstanceContext,
- pageLayoutIdFromProps,
- );
-
- const activeTabId = useAtomComponentStateValue(
- activeTabIdComponentState,
- getTabListInstanceIdFromPageLayoutId(pageLayoutId),
- );
-
- const pageLayoutCurrentLayoutsState = useAtomComponentStateCallbackState(
- pageLayoutCurrentLayoutsComponentState,
- pageLayoutId,
- );
-
- const pageLayoutDraggedAreaState = useAtomComponentStateCallbackState(
- pageLayoutDraggedAreaComponentState,
- pageLayoutId,
- );
-
- const pageLayoutDraftState = useAtomComponentStateCallbackState(
- pageLayoutDraftComponentState,
- pageLayoutId,
- );
-
- const store = useStore();
-
- const createPageLayoutRecordTableWidget = useCallback(
- (
- objectMetadata?: Pick<EnrichedObjectMetadataItem, 'id' | 'labelPlural'>,
- ): PageLayoutWidget => {
- const allTabLayouts = store.get(pageLayoutCurrentLayoutsState);
- const pageLayoutDraggedArea = store.get(pageLayoutDraggedAreaState);
-
- if (!isDefined(activeTabId)) {
- throw new Error(
- 'A tab must be selected to create a new record table widget',
- );
- }
-
- const widgetId = uuidv4();
- const recordTableSize = WIDGET_SIZES[WidgetType.RECORD_TABLE]!;
- const defaultSize = recordTableSize.default;
- const minimumSize = recordTableSize.minimum;
- const position = getDefaultWidgetPosition(
- pageLayoutDraggedArea,
- defaultSize,
- minimumSize,
- );
-
- const pageLayoutDraft = store.get(pageLayoutDraftState);
-
- const newWidget = createDefaultRecordTableWidget({
- id: widgetId,
- pageLayoutTabId: activeTabId,
- title: objectMetadata?.labelPlural ?? 'Record Table',
- position: {
- layoutMode: PageLayoutTabLayoutMode.GRID,
- row: position.y,
- column: position.x,
- rowSpan: position.h,
- columnSpan: position.w,
- },
- objectMetadataId: objectMetadata?.id,
- isUIEditable: pageLayoutDraft.type === PageLayoutType.RECORD_PAGE,
- });
-
- const newLayout = {
- i: widgetId,
- x: position.x,
- y: position.y,
- w: position.w,
- h: position.h,
- minW: minimumSize.w,
- minH: minimumSize.h,
- };
-
- const updatedLayouts = getUpdatedTabLayouts(
- allTabLayouts,
- activeTabId,
- newLayout,
- );
-
- store.set(pageLayoutCurrentLayoutsState, updatedLayouts);
-
- store.set(pageLayoutDraftState, (prev) => ({
- ...prev,
- tabs: addWidgetToTab(prev.tabs, activeTabId, newWidget),
- }));
-
- store.set(pageLayoutDraggedAreaState, null);
-
- return newWidget;
- },
- [
- activeTabId,
- pageLayoutCurrentLayoutsState,
- pageLayoutDraftState,
- pageLayoutDraggedAreaState,
- store,
- ],
- );
-
- return { createPageLayoutRecordTableWidget };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutStandaloneRichTextWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutWidget.ts
similarity index 72%
rename from packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutStandaloneRichTextWidget.ts
rename to packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutWidget.ts
index 0b59420333e..faf42a8689f 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutStandaloneRichTextWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutWidget.ts
@@ -3,10 +3,12 @@ import { PageLayoutComponentInstanceContext } from '@/page-layout/states/context
import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';
+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { addWidgetToTab } from '@/page-layout/utils/addWidgetToTab';
-import { createDefaultStandaloneRichTextWidget } from '@/page-layout/utils/createDefaultStandaloneRichTextWidget';
+import { buildDraftPageLayoutWidget } from '@/page-layout/utils/buildDraftPageLayoutWidget';
import { getDefaultWidgetPosition } from '@/page-layout/utils/getDefaultWidgetPosition';
import { getUpdatedTabLayouts } from '@/page-layout/utils/getUpdatedTabLayouts';
+import { getWidgetSize } from '@/page-layout/utils/getWidgetSize';
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
@@ -16,12 +18,17 @@ import { isDefined } from 'twenty-shared/utils';
import { v4 as uuidv4 } from 'uuid';
import {
PageLayoutTabLayoutMode,
- type PageLayoutWidget,
- type RichTextBody,
- WidgetType,
+ type WidgetType,
} from '~/generated-metadata/graphql';
-export const useCreatePageLayoutStandaloneRichTextWidget = ({
+type CreatePageLayoutWidgetParams = {
+ type: WidgetType;
+ title: string;
+ configuration: PageLayoutWidget['configuration'];
+ objectMetadataId?: string | null;
+};
+
+export const useCreatePageLayoutWidget = ({
pageLayoutId: pageLayoutIdFromProps,
tabListInstanceId,
}: {
@@ -33,8 +40,6 @@ export const useCreatePageLayoutStandaloneRichTextWidget = ({
pageLayoutIdFromProps,
);
- const store = useStore();
-
const pageLayoutCurrentLayoutsState = useAtomComponentStateCallbackState(
pageLayoutCurrentLayoutsComponentState,
pageLayoutId,
@@ -50,8 +55,15 @@ export const useCreatePageLayoutStandaloneRichTextWidget = ({
pageLayoutId,
);
- const createPageLayoutStandaloneRichTextWidget = useCallback(
- (body: RichTextBody): PageLayoutWidget => {
+ const store = useStore();
+
+ const createPageLayoutWidget = useCallback(
+ ({
+ type,
+ title,
+ configuration,
+ objectMetadataId,
+ }: CreatePageLayoutWidgetParams): PageLayoutWidget => {
const activeTabId = store.get(
activeTabIdComponentState.atomFamily({
instanceId: tabListInstanceId,
@@ -60,28 +72,32 @@ export const useCreatePageLayoutStandaloneRichTextWidget = ({
if (!isDefined(activeTabId)) {
throw new Error(
- 'A tab must be selected to create a new rich text widget',
+ `A tab must be selected to create a new ${type} widget`,
);
}
const allTabLayouts = store.get(pageLayoutCurrentLayoutsState);
-
const pageLayoutDraggedArea = store.get(pageLayoutDraggedAreaState);
- const widgetId = uuidv4();
- const richTextSize = WIDGET_SIZES[WidgetType.STANDALONE_RICH_TEXT]!;
- const defaultRichTextSize = richTextSize.default;
- const minimumSize = richTextSize.minimum;
+ const widgetSizeConfig = WIDGET_SIZES[type] ?? {
+ default: getWidgetSize(configuration.configurationType, 'default'),
+ minimum: getWidgetSize(configuration.configurationType, 'minimum'),
+ };
+ const minimumSize = widgetSizeConfig.minimum;
const position = getDefaultWidgetPosition(
pageLayoutDraggedArea,
- defaultRichTextSize,
+ widgetSizeConfig.default,
minimumSize,
);
- const newWidget = createDefaultStandaloneRichTextWidget({
+ const widgetId = uuidv4();
+
+ const newWidget = buildDraftPageLayoutWidget({
id: widgetId,
pageLayoutTabId: activeTabId,
- body,
+ title,
+ type,
+ configuration,
position: {
layoutMode: PageLayoutTabLayoutMode.GRID,
row: position.y,
@@ -89,6 +105,7 @@ export const useCreatePageLayoutStandaloneRichTextWidget = ({
rowSpan: position.h,
columnSpan: position.w,
},
+ objectMetadataId,
});
const newLayout = {
@@ -101,14 +118,11 @@ export const useCreatePageLayoutStandaloneRichTextWidget = ({
minH: minimumSize.h,
};
- const updatedLayouts = getUpdatedTabLayouts(
- allTabLayouts,
- activeTabId,
- newLayout,
+ store.set(
+ pageLayoutCurrentLayoutsState,
+ getUpdatedTabLayouts(allTabLayouts, activeTabId, newLayout),
);
- store.set(pageLayoutCurrentLayoutsState, updatedLayouts);
-
store.set(pageLayoutDraftState, (prev) => ({
...prev,
tabs: addWidgetToTab(prev.tabs, activeTabId, newWidget),
@@ -119,13 +133,13 @@ export const useCreatePageLayoutStandaloneRichTextWidget = ({
return newWidget;
},
[
- tabListInstanceId,
pageLayoutCurrentLayoutsState,
pageLayoutDraftState,
pageLayoutDraggedAreaState,
store,
+ tabListInstanceId,
],
);
- return { createPageLayoutStandaloneRichTextWidget };
+ return { createPageLayoutWidget };
};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidgetUp.ts b/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidget.ts
similarity index 89%
rename from packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidgetUp.ts
rename to packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidget.ts
index fe9e702e269..643f7c4c8cd 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidgetUp.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidget.ts
@@ -9,7 +9,7 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
-export const useMovePageLayoutWidgetUp = (pageLayoutIdFromProps?: string) => {
+export const useMovePageLayoutWidget = (pageLayoutIdFromProps?: string) => {
const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
PageLayoutComponentInstanceContext,
pageLayoutIdFromProps,
@@ -22,8 +22,8 @@ export const useMovePageLayoutWidgetUp = (pageLayoutIdFromProps?: string) => {
const store = useStore();
- const movePageLayoutWidgetUp = useCallback(
- (widgetId: string) => {
+ const movePageLayoutWidget = useCallback(
+ (widgetId: string, direction: 'up' | 'down') => {
store.set(pageLayoutDraftState, (prev) => {
const tab = prev.tabs.find((candidateTab) =>
candidateTab.widgets.some((widget) => widget.id === widgetId),
@@ -40,7 +40,7 @@ export const useMovePageLayoutWidgetUp = (pageLayoutIdFromProps?: string) => {
const targetIndex = getAdjacentFitContentWidgetIndex({
widgets: sortedWidgets,
widgetIndex: currentIndex,
- direction: 'up',
+ direction,
});
if (!isDefined(targetIndex)) {
@@ -57,5 +57,5 @@ export const useMovePageLayoutWidgetUp = (pageLayoutIdFromProps?: string) => {
[pageLayoutDraftState, store],
);
- return { movePageLayoutWidgetUp };
+ return { movePageLayoutWidget };
};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidgetDown.ts b/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidgetDown.ts
deleted file mode 100644
index 71bd75dd8c9..00000000000
--- a/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidgetDown.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
-import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { getAdjacentFitContentWidgetIndex } from '@/page-layout/utils/getAdjacentFitContentWidgetIndex';
-import { moveWidgetWithinTabInDraft } from '@/page-layout/utils/moveWidgetWithinTabInDraft';
-import { sortWidgetsByVerticalListPosition } from '@/page-layout/utils/sortWidgetsByVerticalListPosition';
-import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-import { useStore } from 'jotai';
-import { useCallback } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-
-export const useMovePageLayoutWidgetDown = (pageLayoutIdFromProps?: string) => {
- const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
- PageLayoutComponentInstanceContext,
- pageLayoutIdFromProps,
- );
-
- const pageLayoutDraftState = useAtomComponentStateCallbackState(
- pageLayoutDraftComponentState,
- pageLayoutId,
- );
-
- const store = useStore();
-
- const movePageLayoutWidgetDown = useCallback(
- (widgetId: string) => {
- store.set(pageLayoutDraftState, (prev) => {
- const tab = prev.tabs.find((candidateTab) =>
- candidateTab.widgets.some((widget) => widget.id === widgetId),
- );
-
- if (!tab) {
- return prev;
- }
-
- const sortedWidgets = sortWidgetsByVerticalListPosition(tab.widgets);
- const currentIndex = sortedWidgets.findIndex(
- (widget) => widget.id === widgetId,
- );
- const targetIndex = getAdjacentFitContentWidgetIndex({
- widgets: sortedWidgets,
- widgetIndex: currentIndex,
- direction: 'down',
- });
-
- if (!isDefined(targetIndex)) {
- return prev;
- }
-
- return moveWidgetWithinTabInDraft(prev, {
- tabId: tab.id,
- fromIndex: currentIndex,
- toIndex: targetIndex,
- });
- });
- },
- [pageLayoutDraftState, store],
- );
-
- return { movePageLayoutWidgetDown };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/buildDefaultBarChartConfiguration.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/buildDefaultBarChartConfiguration.test.ts
new file mode 100644
index 00000000000..48bcc61975a
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/buildDefaultBarChartConfiguration.test.ts
@@ -0,0 +1,46 @@
+import { buildDefaultBarChartConfiguration } from '@/page-layout/utils/buildDefaultBarChartConfiguration';
+import {
+ AggregateOperations,
+ AxisNameDisplay,
+ BarChartLayout,
+ GraphOrderBy,
+ WidgetConfigurationType,
+} from '~/generated-metadata/graphql';
+
+describe('buildDefaultBarChartConfiguration', () => {
+ it('should build a vertical bar chart configuration from the field selection', () => {
+ const configuration = buildDefaultBarChartConfiguration({
+ fieldSelection: {
+ aggregateFieldMetadataId: 'field-1',
+ groupByFieldMetadataIdX: 'field-2',
+ },
+ timezone: 'Europe/Paris',
+ firstDayOfTheWeek: 1,
+ });
+
+ expect(configuration).toEqual({
+ __typename: 'BarChartConfiguration',
+ configurationType: WidgetConfigurationType.BAR_CHART,
+ layout: BarChartLayout.VERTICAL,
+ displayDataLabel: true,
+ displayLegend: true,
+ color: 'auto',
+ primaryAxisGroupByFieldMetadataId: 'field-2',
+ aggregateFieldMetadataId: 'field-1',
+ aggregateOperation: AggregateOperations.SUM,
+ primaryAxisOrderBy: GraphOrderBy.FIELD_POSITION_ASC,
+ axisNameDisplay: AxisNameDisplay.NONE,
+ timezone: 'Europe/Paris',
+ firstDayOfTheWeek: 1,
+ });
+ });
+
+ it('should leave the field metadata ids empty without a field selection', () => {
+ const configuration = buildDefaultBarChartConfiguration({});
+
+ expect(configuration).toMatchObject({
+ primaryAxisGroupByFieldMetadataId: '',
+ aggregateFieldMetadataId: '',
+ });
+ });
+});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/buildDraftPageLayoutWidget.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/buildDraftPageLayoutWidget.test.ts
new file mode 100644
index 00000000000..31ff9536ea8
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/buildDraftPageLayoutWidget.test.ts
@@ -0,0 +1,114 @@
+import { buildDraftPageLayoutWidget } from '@/page-layout/utils/buildDraftPageLayoutWidget';
+import {
+ PageLayoutTabLayoutMode,
+ WidgetConfigurationType,
+ WidgetType,
+} from '~/generated-metadata/graphql';
+
+describe('buildDraftPageLayoutWidget', () => {
+ const gridPosition = {
+ layoutMode: PageLayoutTabLayoutMode.GRID,
+ row: 2,
+ column: 3,
+ rowSpan: 4,
+ columnSpan: 6,
+ };
+
+ it('should fill the shared widget skeleton around the given type and configuration', () => {
+ const widget = buildDraftPageLayoutWidget({
+ id: 'widget-1',
+ pageLayoutTabId: 'tab-1',
+ title: 'My Component',
+ type: WidgetType.FRONT_COMPONENT,
+ configuration: {
+ __typename: 'FrontComponentConfiguration',
+ configurationType: WidgetConfigurationType.FRONT_COMPONENT,
+ frontComponentId: 'front-comp-1',
+ },
+ position: gridPosition,
+ });
+
+ expect(widget).toMatchObject({
+ __typename: 'PageLayoutWidget',
+ id: 'widget-1',
+ applicationId: '',
+ universalIdentifier: 'widget-1',
+ isSystemSideEffect: false,
+ pageLayoutTabId: 'tab-1',
+ title: 'My Component',
+ isActive: true,
+ type: WidgetType.FRONT_COMPONENT,
+ configuration: {
+ __typename: 'FrontComponentConfiguration',
+ configurationType: WidgetConfigurationType.FRONT_COMPONENT,
+ frontComponentId: 'front-comp-1',
+ },
+ objectMetadataId: null,
+ deletedAt: null,
+ });
+ expect(widget.createdAt).toBeDefined();
+ expect(widget.updatedAt).toBeDefined();
+ });
+
+ it('should stamp the grid position typename', () => {
+ const widget = buildDraftPageLayoutWidget({
+ id: 'widget-1',
+ pageLayoutTabId: 'tab-1',
+ title: 'My Record Table',
+ type: WidgetType.RECORD_TABLE,
+ configuration: {
+ configurationType: WidgetConfigurationType.RECORD_TABLE,
+ },
+ position: gridPosition,
+ });
+
+ expect(widget.position).toEqual({
+ __typename: 'PageLayoutWidgetGridPosition',
+ layoutMode: PageLayoutTabLayoutMode.GRID,
+ row: 2,
+ column: 3,
+ rowSpan: 4,
+ columnSpan: 6,
+ });
+ });
+
+ it('should stamp the vertical list position typename', () => {
+ const widget = buildDraftPageLayoutWidget({
+ id: 'note-widget',
+ pageLayoutTabId: 'record-tab',
+ title: 'Note',
+ type: WidgetType.STANDALONE_RICH_TEXT,
+ configuration: {
+ configurationType: WidgetConfigurationType.STANDALONE_RICH_TEXT,
+ body: { blocknote: '', markdown: null },
+ },
+ position: {
+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
+ index: 2,
+ },
+ });
+
+ expect(widget.position).toEqual({
+ __typename: 'PageLayoutWidgetVerticalListPosition',
+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
+ index: 2,
+ });
+ });
+
+ it('should keep a provided objectMetadataId', () => {
+ const widget = buildDraftPageLayoutWidget({
+ id: 'widget-1',
+ pageLayoutTabId: 'tab-1',
+ title: 'Dashboard guidance',
+ type: WidgetType.STANDALONE_RICH_TEXT,
+ configuration: {
+ configurationType: WidgetConfigurationType.STANDALONE_RICH_TEXT,
+ body: { blocknote: '[]' },
+ },
+ position: gridPosition,
+ objectMetadataId: 'object-1',
+ });
+
+ expect(widget.objectMetadataId).toBe('object-1');
+ });
+});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultFrontComponentWidget.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultFrontComponentWidget.test.ts
deleted file mode 100644
index 8653c75e0f4..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultFrontComponentWidget.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { createDefaultFrontComponentWidget } from '@/page-layout/utils/createDefaultFrontComponentWidget';
-import {
- PageLayoutTabLayoutMode,
- type PageLayoutWidgetGridPosition,
- WidgetConfigurationType,
- WidgetType,
-} from '~/generated-metadata/graphql';
-
-describe('createDefaultFrontComponentWidget', () => {
- it('should return a FRONT_COMPONENT widget with grid position mapped to position', () => {
- const position: PageLayoutWidgetGridPosition = {
- layoutMode: PageLayoutTabLayoutMode.GRID,
- __typename: 'PageLayoutWidgetGridPosition',
- row: 2,
- column: 3,
- rowSpan: 4,
- columnSpan: 6,
- };
-
- const widget = createDefaultFrontComponentWidget(
- 'widget-1',
- 'tab-1',
- 'My Component',
- 'front-comp-1',
- position,
- );
-
- expect(widget).toMatchObject({
- __typename: 'PageLayoutWidget',
- id: 'widget-1',
- pageLayoutTabId: 'tab-1',
- title: 'My Component',
- isActive: true,
- type: WidgetType.FRONT_COMPONENT,
- configuration: {
- __typename: 'FrontComponentConfiguration',
- configurationType: WidgetConfigurationType.FRONT_COMPONENT,
- frontComponentId: 'front-comp-1',
- },
- position: {
- __typename: 'PageLayoutWidgetGridPosition',
- layoutMode: PageLayoutTabLayoutMode.GRID,
- row: 2,
- column: 3,
- rowSpan: 4,
- columnSpan: 6,
- },
- objectMetadataId: null,
- deletedAt: null,
- });
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultGraphWidget.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultGraphWidget.test.ts
deleted file mode 100644
index 8b9cdc203ac..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultGraphWidget.test.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import {
- AggregateOperations,
- AxisNameDisplay,
- BarChartLayout,
- GraphOrderBy,
- PageLayoutTabLayoutMode,
- WidgetConfigurationType,
-} from '~/generated-metadata/graphql';
-import { createDefaultGraphWidget } from '@/page-layout/utils/createDefaultGraphWidget';
-
-describe('createDefaultGraphWidget', () => {
- const baseParams = {
- id: 'widget-1',
- pageLayoutTabId: 'tab-1',
- title: 'Test Widget',
- position: {
- __typename: 'PageLayoutWidgetGridPosition' as const,
- layoutMode: PageLayoutTabLayoutMode.GRID,
- row: 0,
- column: 0,
- rowSpan: 2,
- columnSpan: 2,
- },
- objectMetadataId: 'object-1',
- };
-
- describe('VERTICAL_BAR graph type', () => {
- it('should create widget with bar chart configuration when all fields are provided', () => {
- const widget = createDefaultGraphWidget({
- ...baseParams,
- fieldSelection: {
- aggregateFieldMetadataId: 'field-1',
- groupByFieldMetadataIdX: 'field-2',
- },
- });
-
- expect(widget.configuration).toEqual({
- __typename: 'BarChartConfiguration',
- configurationType: WidgetConfigurationType.BAR_CHART,
- layout: BarChartLayout.VERTICAL,
- displayDataLabel: true,
- displayLegend: true,
- color: 'auto',
- primaryAxisGroupByFieldMetadataId: 'field-2',
- aggregateFieldMetadataId: 'field-1',
- aggregateOperation: AggregateOperations.SUM,
- primaryAxisOrderBy: GraphOrderBy.FIELD_POSITION_ASC,
- axisNameDisplay: AxisNameDisplay.NONE,
- });
- });
-
- it('should use objectMetadataId from fieldSelection over params', () => {
- const widget = createDefaultGraphWidget({
- ...baseParams,
- objectMetadataId: 'object-1',
- fieldSelection: {
- aggregateFieldMetadataId: 'field-1',
- objectMetadataId: 'object-2',
- },
- });
-
- expect(widget.objectMetadataId).toBe('object-2');
- });
-
- it('should set timestamps and common widget properties', () => {
- const widget = createDefaultGraphWidget({
- ...baseParams,
- fieldSelection: {
- aggregateFieldMetadataId: 'field-1',
- },
- });
-
- expect(widget.__typename).toBe('PageLayoutWidget');
- expect(widget.id).toBe('widget-1');
- expect(widget.pageLayoutTabId).toBe('tab-1');
- expect(widget.title).toBe('Test Widget');
- expect(widget.position).toEqual(baseParams.position);
- expect(widget.position).toEqual({
- __typename: 'PageLayoutWidgetGridPosition',
- layoutMode: PageLayoutTabLayoutMode.GRID,
- row: 0,
- column: 0,
- rowSpan: 2,
- columnSpan: 2,
- });
- expect(widget.createdAt).toBeDefined();
- expect(widget.updatedAt).toBeDefined();
- expect(widget.deletedAt).toBeNull();
- });
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultRecordTableWidget.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultRecordTableWidget.test.ts
deleted file mode 100644
index 8283c13f0eb..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultRecordTableWidget.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { createDefaultRecordTableWidget } from '@/page-layout/utils/createDefaultRecordTableWidget';
-import {
- PageLayoutTabLayoutMode,
- WidgetConfigurationType,
- WidgetType,
-} from '~/generated-metadata/graphql';
-
-describe('createDefaultRecordTableWidget', () => {
- const widgetId = 'widget-id-1';
- const pageLayoutTabId = 'tab-id-1';
- const title = 'My Record Table';
- const position = {
- __typename: 'PageLayoutWidgetGridPosition' as const,
- layoutMode: PageLayoutTabLayoutMode.GRID as const,
- row: 1,
- column: 2,
- rowSpan: 3,
- columnSpan: 4,
- };
-
- const widget = createDefaultRecordTableWidget({
- id: widgetId,
- pageLayoutTabId,
- title,
- position,
- });
-
- it('should return correct shape with all required fields', () => {
- expect(widget.__typename).toBe('PageLayoutWidget');
- expect(widget.id).toBe(widgetId);
- expect(widget.pageLayoutTabId).toBe(pageLayoutTabId);
- expect(widget.title).toBe(title);
- expect(widget.createdAt).toBeDefined();
- expect(widget.updatedAt).toBeDefined();
- expect(widget.deletedAt).toBeNull();
- });
-
- it('should set type to WidgetType.RECORD_TABLE', () => {
- expect(widget.type).toBe(WidgetType.RECORD_TABLE);
- });
-
- it('should set configuration.configurationType to WidgetConfigurationType.RECORD_TABLE', () => {
- expect(widget.configuration).toEqual({
- configurationType: WidgetConfigurationType.RECORD_TABLE,
- });
- });
-
- it('should correctly map grid position values to both position and position fields', () => {
- expect(widget.position).toEqual(position);
- expect(widget.position).toEqual({
- __typename: 'PageLayoutWidgetGridPosition',
- layoutMode: PageLayoutTabLayoutMode.GRID,
- row: position.row,
- column: position.column,
- rowSpan: position.rowSpan,
- columnSpan: position.columnSpan,
- });
- });
-
- it('should set objectMetadataId to null', () => {
- expect(widget.objectMetadataId).toBeNull();
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/buildDefaultBarChartConfiguration.ts b/packages/twenty-front/src/modules/page-layout/utils/buildDefaultBarChartConfiguration.ts
new file mode 100644
index 00000000000..cd5a00b2eba
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/utils/buildDefaultBarChartConfiguration.ts
@@ -0,0 +1,35 @@
+import { type GraphWidgetFieldSelection } from '@/page-layout/types/GraphWidgetFieldSelection';
+import { type GraphColor } from '@/page-layout/widgets/graph/types/GraphColor';
+import {
+ AggregateOperations,
+ AxisNameDisplay,
+ type BarChartConfiguration,
+ BarChartLayout,
+ GraphOrderBy,
+ WidgetConfigurationType,
+} from '~/generated-metadata/graphql';
+
+export const buildDefaultBarChartConfiguration = ({
+ fieldSelection,
+ timezone,
+ firstDayOfTheWeek,
+}: {
+ fieldSelection?: GraphWidgetFieldSelection;
+ timezone?: string;
+ firstDayOfTheWeek?: number;
+}): BarChartConfiguration => ({
+ __typename: 'BarChartConfiguration',
+ configurationType: WidgetConfigurationType.BAR_CHART,
+ layout: BarChartLayout.VERTICAL,
+ displayDataLabel: true,
+ displayLegend: true,
+ color: 'auto' satisfies GraphColor,
+ primaryAxisGroupByFieldMetadataId:
+ fieldSelection?.groupByFieldMetadataIdX ?? '',
+ aggregateFieldMetadataId: fieldSelection?.aggregateFieldMetadataId ?? '',
+ aggregateOperation: AggregateOperations.SUM,
+ primaryAxisOrderBy: GraphOrderBy.FIELD_POSITION_ASC,
+ axisNameDisplay: AxisNameDisplay.NONE,
+ timezone,
+ firstDayOfTheWeek,
+});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/buildDraftPageLayoutWidget.ts b/packages/twenty-front/src/modules/page-layout/utils/buildDraftPageLayoutWidget.ts
new file mode 100644
index 00000000000..d67fc91d2ab
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/utils/buildDraftPageLayoutWidget.ts
@@ -0,0 +1,45 @@
+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
+import { isVerticalListPosition } from '@/page-layout/utils/isVerticalListPosition';
+import {
+ type PageLayoutWidgetGridPosition,
+ type PageLayoutWidgetVerticalListPosition,
+ type WidgetType,
+} from '~/generated-metadata/graphql';
+
+type BuildDraftPageLayoutWidgetParams = {
+ id: string;
+ pageLayoutTabId: string;
+ title: string;
+ type: WidgetType;
+ configuration: PageLayoutWidget['configuration'];
+ position: PageLayoutWidgetGridPosition | PageLayoutWidgetVerticalListPosition;
+ objectMetadataId?: string | null;
+};
+
+export const buildDraftPageLayoutWidget = ({
+ id,
+ pageLayoutTabId,
+ title,
+ type,
+ configuration,
+ position,
+ objectMetadataId,
+}: BuildDraftPageLayoutWidgetParams): PageLayoutWidget => ({
+ __typename: 'PageLayoutWidget',
+ id,
+ applicationId: '',
+ universalIdentifier: id,
+ isSystemSideEffect: false,
+ pageLayoutTabId,
+ title,
+ isActive: true,
+ type,
+ configuration,
+ position: isVerticalListPosition(position)
+ ? { ...position, __typename: 'PageLayoutWidgetVerticalListPosition' }
+ : { ...position, __typename: 'PageLayoutWidgetGridPosition' },
+ objectMetadataId: objectMetadataId ?? null,
+ createdAt: new Date().toISOString(),
+ updatedAt: new Date().toISOString(),
+ deletedAt: null,
+});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/createDefaultFieldWidget.ts b/packages/twenty-front/src/modules/page-layout/utils/createDefaultFieldWidget.ts
index 7195d5a0cf5..3dcaf10f422 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/createDefaultFieldWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/createDefaultFieldWidget.ts
@@ -1,4 +1,5 @@
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
+import { buildDraftPageLayoutWidget } from '@/page-layout/utils/buildDraftPageLayoutWidget';
import {
FieldDisplayMode,
PageLayoutTabLayoutMode,
@@ -22,16 +23,11 @@ export const createDefaultFieldWidget = ({
fieldDisplayMode?: FieldDisplayMode;
objectMetadataId: string;
positionIndex: number;
-}): PageLayoutWidget => {
- return {
- __typename: 'PageLayoutWidget',
+}): PageLayoutWidget =>
+ buildDraftPageLayoutWidget({
id,
- applicationId: '',
- universalIdentifier: id,
- isSystemSideEffect: false,
pageLayoutTabId,
title,
- isActive: true,
type: WidgetType.FIELD,
configuration: {
__typename: 'FieldConfiguration',
@@ -40,13 +36,8 @@ export const createDefaultFieldWidget = ({
fieldDisplayMode,
},
position: {
- __typename: 'PageLayoutWidgetVerticalListPosition',
layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
index: positionIndex,
},
- objectMetadataId: objectMetadataId ?? null,
- createdAt: new Date().toISOString(),
- updatedAt: new Date().toISOString(),
- deletedAt: null,
- };
-};
+ objectMetadataId,
+ });
diff --git a/packages/twenty-front/src/modules/page-layout/utils/createDefaultFieldsWidget.ts b/packages/twenty-front/src/modules/page-layout/utils/createDefaultFieldsWidget.ts
index 146c606ac25..deb51429904 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/createDefaultFieldsWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/createDefaultFieldsWidget.ts
@@ -1,4 +1,5 @@
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
+import { buildDraftPageLayoutWidget } from '@/page-layout/utils/buildDraftPageLayoutWidget';
import {
PageLayoutTabLayoutMode,
WidgetConfigurationType,
@@ -17,16 +18,11 @@ export const createDefaultFieldsWidget = ({
viewId: string;
objectMetadataId: string;
positionIndex: number;
-}): PageLayoutWidget => {
- return {
- __typename: 'PageLayoutWidget',
+}): PageLayoutWidget =>
+ buildDraftPageLayoutWidget({
id,
- applicationId: '',
- universalIdentifier: id,
- isSystemSideEffect: false,
pageLayoutTabId,
title: 'Fields',
- isActive: true,
type: WidgetType.FIELDS,
configuration: {
__typename: 'FieldsConfiguration',
@@ -35,13 +31,8 @@ export const createDefaultFieldsWidget = ({
newFieldDefaultVisibility: true,
},
position: {
- __typename: 'PageLayoutWidgetVerticalListPosition',
layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
index: positionIndex,
},
- objectMetadataId: objectMetadataId ?? null,
- createdAt: new Date().toISOString(),
- updatedAt: new Date().toISOString(),
- deletedAt: null,
- };
-};
+ objectMetadataId,
+ });
diff --git a/packages/twenty-front/src/modules/page-layout/utils/createDefaultFrontComponentWidget.ts b/packages/twenty-front/src/modules/page-layout/utils/createDefaultFrontComponentWidget.ts
deleted file mode 100644
index 097f8eae120..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/createDefaultFrontComponentWidget.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {
- type PageLayoutWidgetGridPosition,
- WidgetConfigurationType,
- WidgetType,
-} from '~/generated-metadata/graphql';
-import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-
-export const createDefaultFrontComponentWidget = (
- id: string,
- pageLayoutTabId: string,
- title: string,
- frontComponentId: string,
- position: PageLayoutWidgetGridPosition,
-): PageLayoutWidget => {
- return {
- __typename: 'PageLayoutWidget',
- id,
- applicationId: '',
- universalIdentifier: id,
- isSystemSideEffect: false,
- pageLayoutTabId,
- title,
- isActive: true,
- type: WidgetType.FRONT_COMPONENT,
- configuration: {
- __typename: 'FrontComponentConfiguration',
- configurationType: WidgetConfigurationType.FRONT_COMPONENT,
- frontComponentId,
- },
- position: {
- ...position,
- __typename: 'PageLayoutWidgetGridPosition',
- },
- objectMetadataId: null,
- createdAt: new Date().toISOString(),
- updatedAt: new Date().toISOString(),
- deletedAt: null,
- };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/createDefaultGraphWidget.ts b/packages/twenty-front/src/modules/page-layout/utils/createDefaultGraphWidget.ts
deleted file mode 100644
index 7e341bdd493..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/createDefaultGraphWidget.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import {
- AggregateOperations,
- AxisNameDisplay,
- BarChartLayout,
- GraphOrderBy,
- type PageLayoutWidget,
- type PageLayoutWidgetGridPosition,
- type WidgetConfiguration,
- WidgetConfigurationType,
- WidgetType,
-} from '~/generated-metadata/graphql';
-
-import { type GraphWidgetFieldSelection } from '@/page-layout/types/GraphWidgetFieldSelection';
-import { type GraphColor } from '@/page-layout/widgets/graph/types/GraphColor';
-
-const createDefaultGraphConfiguration = (
- fieldSelection?: GraphWidgetFieldSelection,
- timezone?: string,
- firstDayOfTheWeek?: number,
-): WidgetConfiguration => {
- return {
- __typename: 'BarChartConfiguration',
- configurationType: WidgetConfigurationType.BAR_CHART,
- layout: BarChartLayout.VERTICAL,
- displayDataLabel: true,
- displayLegend: true,
- color: 'auto' satisfies GraphColor,
- primaryAxisGroupByFieldMetadataId:
- fieldSelection?.groupByFieldMetadataIdX ?? '',
- aggregateFieldMetadataId: fieldSelection?.aggregateFieldMetadataId ?? '',
- aggregateOperation: AggregateOperations.SUM,
- primaryAxisOrderBy: GraphOrderBy.FIELD_POSITION_ASC,
- axisNameDisplay: AxisNameDisplay.NONE,
- timezone,
- firstDayOfTheWeek,
- };
-};
-
-type CreateDefaultGraphWidgetParams = {
- id: string;
- pageLayoutTabId: string;
- title: string;
- position: PageLayoutWidgetGridPosition;
- objectMetadataId?: string | null;
- fieldSelection?: GraphWidgetFieldSelection;
- timezone?: string;
- firstDayOfTheWeek?: number;
-};
-
-export const createDefaultGraphWidget = ({
- id,
- pageLayoutTabId,
- title,
- position,
- objectMetadataId,
- fieldSelection,
- timezone,
- firstDayOfTheWeek,
-}: CreateDefaultGraphWidgetParams): PageLayoutWidget => {
- const resolvedObjectMetadataId =
- fieldSelection?.objectMetadataId ?? objectMetadataId ?? null;
-
- const configuration = createDefaultGraphConfiguration(
- fieldSelection,
- timezone,
- firstDayOfTheWeek,
- );
-
- return {
- __typename: 'PageLayoutWidget',
- id,
- applicationId: '',
- universalIdentifier: id,
- isSystemSideEffect: false,
- pageLayoutTabId,
- title,
- isActive: true,
- type: WidgetType.GRAPH,
- configuration,
- position: {
- ...position,
- __typename: 'PageLayoutWidgetGridPosition',
- },
- objectMetadataId: resolvedObjectMetadataId,
- createdAt: new Date().toISOString(),
- updatedAt: new Date().toISOString(),
- deletedAt: null,
- };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/createDefaultIframeWidget.ts b/packages/twenty-front/src/modules/page-layout/utils/createDefaultIframeWidget.ts
deleted file mode 100644
index 5b29b5a42e8..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/createDefaultIframeWidget.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {
- type PageLayoutWidget,
- type PageLayoutWidgetGridPosition,
- WidgetConfigurationType,
- WidgetType,
-} from '~/generated-metadata/graphql';
-
-export const createDefaultIframeWidget = (
- id: string,
- pageLayoutTabId: string,
- title: string,
- url: string | null,
- position: PageLayoutWidgetGridPosition,
- objectMetadataId?: string | null,
-): PageLayoutWidget => {
- return {
- __typename: 'PageLayoutWidget',
- id,
- applicationId: '',
- universalIdentifier: id,
- isSystemSideEffect: false,
- pageLayoutTabId,
- title,
- isActive: true,
- type: WidgetType.IFRAME,
- configuration: {
- configurationType: WidgetConfigurationType.IFRAME,
- url,
- },
- position: {
- ...position,
- __typename: 'PageLayoutWidgetGridPosition',
- },
- objectMetadataId: objectMetadataId ?? null,
- createdAt: new Date().toISOString(),
- updatedAt: new Date().toISOString(),
- deletedAt: null,
- };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/createDefaultRecordTableWidget.ts b/packages/twenty-front/src/modules/page-layout/utils/createDefaultRecordTableWidget.ts
deleted file mode 100644
index 8710cf7d6e2..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/createDefaultRecordTableWidget.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {
- type PageLayoutWidget,
- type PageLayoutWidgetGridPosition,
- WidgetConfigurationType,
- WidgetType,
-} from '~/generated-metadata/graphql';
-
-export const createDefaultRecordTableWidget = ({
- id,
- pageLayoutTabId,
- title,
- position,
- objectMetadataId,
- isUIEditable,
-}: {
- id: string;
- pageLayoutTabId: string;
- title: string;
- position: PageLayoutWidgetGridPosition;
- objectMetadataId?: string;
- isUIEditable?: boolean;
-}): PageLayoutWidget => {
- return {
- __typename: 'PageLayoutWidget',
- id,
- applicationId: '',
- universalIdentifier: id,
- isSystemSideEffect: false,
- pageLayoutTabId,
- title,
- isActive: true,
- type: WidgetType.RECORD_TABLE,
- configuration: {
- configurationType: WidgetConfigurationType.RECORD_TABLE,
- isUIEditable,
- },
- position: {
- ...position,
- __typename: 'PageLayoutWidgetGridPosition',
- },
- objectMetadataId: objectMetadataId ?? null,
- isOverridden: false,
- createdAt: new Date().toISOString(),
- updatedAt: new Date().toISOString(),
- deletedAt: null,
- };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/createDefaultStandaloneRichTextWidget.ts b/packages/twenty-front/src/modules/page-layout/utils/createDefaultStandaloneRichTextWidget.ts
index 5054b04fbff..756f55d48dc 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/createDefaultStandaloneRichTextWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/createDefaultStandaloneRichTextWidget.ts
@@ -1,5 +1,5 @@
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-import { isVerticalListPosition } from '@/page-layout/utils/isVerticalListPosition';
+import { buildDraftPageLayoutWidget } from '@/page-layout/utils/buildDraftPageLayoutWidget';
import {
type PageLayoutWidgetGridPosition,
type PageLayoutWidgetVerticalListPosition,
@@ -24,27 +24,16 @@ export const createDefaultStandaloneRichTextWidget = ({
position,
objectMetadataId,
title = 'Untitled Rich Text',
-}: CreateDefaultStandaloneRichTextWidgetParams): PageLayoutWidget => {
- return {
- __typename: 'PageLayoutWidget',
+}: CreateDefaultStandaloneRichTextWidgetParams): PageLayoutWidget =>
+ buildDraftPageLayoutWidget({
id,
- applicationId: '',
- universalIdentifier: id,
- isSystemSideEffect: false,
pageLayoutTabId,
title,
- isActive: true,
type: WidgetType.STANDALONE_RICH_TEXT,
configuration: {
configurationType: WidgetConfigurationType.STANDALONE_RICH_TEXT,
body,
},
- position: isVerticalListPosition(position)
- ? { ...position, __typename: 'PageLayoutWidgetVerticalListPosition' }
- : { ...position, __typename: 'PageLayoutWidgetGridPosition' },
- objectMetadataId: objectMetadataId ?? null,
- createdAt: new Date().toISOString(),
- updatedAt: new Date().toISOString(),
- deletedAt: null,
- };
-};
+ position,
+ objectMetadataId,
+ });
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidget.tsx
deleted file mode 100644
index 368faa74224..00000000000
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidget.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { CallRecordingWidgetUnavailableDisplay } from '@/page-layout/widgets/call-recording/components/CallRecordingWidgetUnavailableDisplay';
-import { useCallRecordingWidgetUnavailableReason } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetUnavailableReason';
-import { CallRecordingSummaryWidgetContent } from '@/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidgetContent';
-import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';
-import { isDefined } from 'twenty-shared/utils';
-
-export const CallRecordingSummaryWidget = () => {
- const unavailableReason = useCallRecordingWidgetUnavailableReason();
-
- if (isDefined(unavailableReason)) {
- return (
- <StyledWidgetScrollContainer>
- <CallRecordingWidgetUnavailableDisplay reason={unavailableReason} />
- </StyledWidgetScrollContainer>
- );
- }
-
- return (
- <StyledWidgetScrollContainer>
- <CallRecordingSummaryWidgetContent />
- </StyledWidgetScrollContainer>
- );
-};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidgetContent.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidgetContent.tsx
index f585f0566c0..c4c4669c72b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidgetContent.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidgetContent.tsx
@@ -1,13 +1,13 @@
+import { useCallRecordingWidgetData } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetData';
import { useCallRecordingWidgetTarget } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetTarget';
import { CallRecordingSummaryBody } from '@/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryBody';
-import { useCallRecordingSummaryWidgetData } from '@/page-layout/widgets/call-recording-summary/hooks/useCallRecordingSummaryWidgetData';
import { WidgetHeaderCountEffect } from '@/page-layout/widgets/components/WidgetHeaderCountEffect';
import { isDefined } from 'twenty-shared/utils';
export const CallRecordingSummaryWidgetContent = () => {
const callRecordingWidgetTarget = useCallRecordingWidgetTarget();
const { callRecording, callRecordingsCount, loading, error, restriction } =
- useCallRecordingSummaryWidgetData();
+ useCallRecordingWidgetData({ kind: 'summary' });
const canExposeCallRecordingCount =
!loading && !isDefined(error) && !isDefined(restriction);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/WidgetActionCallRecordingSummary.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/WidgetActionCallRecordingSummary.tsx
index 45ba2c7a30f..60a5210dac4 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/WidgetActionCallRecordingSummary.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/WidgetActionCallRecordingSummary.tsx
@@ -1,5 +1,5 @@
import { WidgetActionCallRecordingSeeAll } from '@/page-layout/widgets/call-recording/components/WidgetActionCallRecordingSeeAll';
-import { useCallRecordingForSummary } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingForSummary';
+import { useCallRecordingForWidget } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingForWidget';
import { getCallRecordingSummaryMarkdown } from '@/page-layout/widgets/call-recording-summary/utils/getCallRecordingSummaryMarkdown';
import { WidgetCardHeaderActionButton } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton';
import { t } from '@lingui/core/macro';
@@ -9,7 +9,7 @@ import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
export const WidgetActionCallRecordingSummary = () => {
const { callRecording, loading, error, restriction } =
- useCallRecordingForSummary();
+ useCallRecordingForWidget({ kind: 'summary' });
const { copyToClipboard } = useCopyToClipboard();
const summaryMarkdown =
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidgetContent.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidgetContent.tsx
index c4f287caa70..e3f8a095cb7 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidgetContent.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidgetContent.tsx
@@ -1,7 +1,7 @@
+import { useCallRecordingWidgetData } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetData';
import { useCallRecordingWidgetTarget } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetTarget';
import { getCallRecordingVideoFileUrl } from '@/page-layout/widgets/call-recording/utils/getCallRecordingVideoFileUrl';
import { CallRecordingTranscriptBody } from '@/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptBody';
-import { useCallRecordingTranscriptWidgetData } from '@/page-layout/widgets/call-recording-transcript/hooks/useCallRecordingTranscriptWidgetData';
import { WidgetHeaderCountEffect } from '@/page-layout/widgets/components/WidgetHeaderCountEffect';
import { useMemo } from 'react';
import {
@@ -18,7 +18,7 @@ export const CallRecordingTranscriptWidgetContent = () => {
error,
restriction,
refetchCallRecordingWidget,
- } = useCallRecordingTranscriptWidgetData();
+ } = useCallRecordingWidgetData({ kind: 'transcript' });
const canExposeCallRecordingData =
!loading && !isDefined(error) && !isDefined(restriction);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/WidgetActionCallRecordingTranscript.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/WidgetActionCallRecordingTranscript.tsx
index a206c92531d..2ed5459948d 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/WidgetActionCallRecordingTranscript.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/WidgetActionCallRecordingTranscript.tsx
@@ -1,5 +1,5 @@
import { WidgetActionCallRecordingSeeAll } from '@/page-layout/widgets/call-recording/components/WidgetActionCallRecordingSeeAll';
-import { useCallRecordingForTranscript } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingForTranscript';
+import { useCallRecordingForWidget } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingForWidget';
import { getCallRecordingVideoFileUrl } from '@/page-layout/widgets/call-recording/utils/getCallRecordingVideoFileUrl';
import { buildCallRecordingTranscriptPlainText } from '@/page-layout/widgets/call-recording-transcript/utils/buildCallRecordingTranscriptPlainText';
import { WidgetCardHeaderActionButton } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionButton';
@@ -15,7 +15,7 @@ import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
export const WidgetActionCallRecordingTranscript = () => {
const { callRecording, loading, error, restriction } =
- useCallRecordingForTranscript();
+ useCallRecordingForWidget({ kind: 'transcript' });
const { copyToClipboard } = useCopyToClipboard();
const canExposeCallRecording =
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/hooks/useCallRecordingTranscriptWidgetData.ts b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/hooks/useCallRecordingTranscriptWidgetData.ts
deleted file mode 100644
index c2768130848..00000000000
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/hooks/useCallRecordingTranscriptWidgetData.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { useCallRecordingForTranscript } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingForTranscript';
-import { useCallRecordingWidgetCount } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetCount';
-import { useSubscribeToCallRecordingWidgetUpdates } from '@/page-layout/widgets/call-recording/hooks/useSubscribeToCallRecordingWidgetUpdates';
-import { useCallback } from 'react';
-
-export const useCallRecordingTranscriptWidgetData = () => {
- const {
- callRecording,
- loading: callRecordingLoading,
- error: callRecordingError,
- restriction,
- refetchCallRecording,
- } = useCallRecordingForTranscript();
- const {
- callRecordingsCount,
- loading: callRecordingCountLoading,
- error: callRecordingCountError,
- refetchCallRecordingsCount,
- } = useCallRecordingWidgetCount({
- restriction,
- });
-
- const refetchCallRecordingWidget = useCallback(async () => {
- await Promise.all([refetchCallRecording(), refetchCallRecordingsCount()]);
- }, [refetchCallRecording, refetchCallRecordingsCount]);
-
- useSubscribeToCallRecordingWidgetUpdates({
- restriction,
- refetchCallRecordingWidget,
- });
-
- return {
- callRecording,
- callRecordingsCount,
- loading: callRecordingLoading || callRecordingCountLoading,
- error: callRecordingError ?? callRecordingCountError,
- restriction,
- refetchCallRecordingWidget,
- };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/components/CallRecordingWidget.tsx
similarity index 63%
rename from packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidget.tsx
rename to packages/twenty-front/src/modules/page-layout/widgets/call-recording/components/CallRecordingWidget.tsx
index 1298e303d19..db9d0c77029 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/components/CallRecordingWidget.tsx
@@ -1,10 +1,16 @@
import { CallRecordingWidgetUnavailableDisplay } from '@/page-layout/widgets/call-recording/components/CallRecordingWidgetUnavailableDisplay';
import { useCallRecordingWidgetUnavailableReason } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetUnavailableReason';
+import { type CallRecordingWidgetKind } from '@/page-layout/widgets/call-recording/types/CallRecordingWidgetKind';
+import { CallRecordingSummaryWidgetContent } from '@/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidgetContent';
import { CallRecordingTranscriptWidgetContent } from '@/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidgetContent';
import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';
import { isDefined } from 'twenty-shared/utils';
-export const CallRecordingTranscriptWidget = () => {
+type CallRecordingWidgetProps = {
+ kind: CallRecordingWidgetKind;
+};
+
+export const CallRecordingWidget = ({ kind }: CallRecordingWidgetProps) => {
const unavailableReason = useCallRecordingWidgetUnavailableReason();
if (isDefined(unavailableReason)) {
@@ -17,7 +23,11 @@ export const CallRecordingTranscriptWidget = () => {
return (
<StyledWidgetScrollContainer>
- <CallRecordingTranscriptWidgetContent />
+ {kind === 'summary' ? (
+ <CallRecordingSummaryWidgetContent />
+ ) : (
+ <CallRecordingTranscriptWidgetContent />
+ )}
</StyledWidgetScrollContainer>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForSummary.ts b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForSummary.ts
deleted file mode 100644
index 1956301c204..00000000000
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForSummary.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
-import { useCallRecordingIdForWidget } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingIdForWidget';
-import { useCallRecordingWidgetRestriction } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetRestriction';
-import { type WidgetCallRecordingCandidate } from '@/page-layout/widgets/call-recording/types/WidgetCallRecordingCandidate';
-import { type WidgetAccessDenialInfo } from '@/page-layout/widgets/types/WidgetAccessDenialInfo';
-import { useCallback } from 'react';
-import {
- CoreObjectNameSingular,
- type RecordGqlOperationGqlRecordFields,
-} from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-
-const CALL_RECORDING_SUMMARY_RECORD_FIELDS = {
- id: true,
- status: true,
- summary: true,
-} as const satisfies RecordGqlOperationGqlRecordFields;
-
-export const useCallRecordingForSummary = (): {
- callRecording: WidgetCallRecordingCandidate | undefined;
- loading: boolean;
- error: Error | undefined;
- restriction: WidgetAccessDenialInfo | undefined;
- refetchCallRecording: () => Promise<void>;
-} => {
- const { restriction } = useCallRecordingWidgetRestriction({
- requiredFieldNames: ['status', 'summary'],
- });
- const shouldSkipQuery = isDefined(restriction);
-
- const {
- callRecordingId,
- targetKind,
- loading: callRecordingIdLoading,
- error: callRecordingIdError,
- refetchCallRecordingId,
- } = useCallRecordingIdForWidget({ skip: shouldSkipQuery });
-
- const {
- record: callRecording,
- loading: callRecordingLoading,
- error: callRecordingError,
- refetch: refetchCallRecordingRecord,
- } = useFindOneRecord<WidgetCallRecordingCandidate>({
- objectNameSingular: CoreObjectNameSingular.CallRecording,
- objectRecordId: callRecordingId,
- recordGqlFields: CALL_RECORDING_SUMMARY_RECORD_FIELDS,
- withSoftDeleted: targetKind === 'callRecording',
- skip: shouldSkipQuery || !isDefined(callRecordingId),
- });
-
- const refetchCallRecording = useCallback(async () => {
- await Promise.all([
- refetchCallRecordingId(),
- isDefined(callRecordingId)
- ? refetchCallRecordingRecord()
- : Promise.resolve(),
- ]);
- }, [refetchCallRecordingRecord, refetchCallRecordingId, callRecordingId]);
-
- return {
- callRecording,
- loading: callRecordingIdLoading || callRecordingLoading,
- error: callRecordingIdError ?? callRecordingError,
- restriction,
- refetchCallRecording,
- };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForTranscript.ts b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForWidget.ts
similarity index 67%
rename from packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForTranscript.ts
rename to packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForWidget.ts
index 3ad4b620283..957383777dc 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForTranscript.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingForWidget.ts
@@ -1,6 +1,7 @@
import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
import { useCallRecordingIdForWidget } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingIdForWidget';
import { useCallRecordingWidgetRestriction } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetRestriction';
+import { type CallRecordingWidgetKind } from '@/page-layout/widgets/call-recording/types/CallRecordingWidgetKind';
import { type WidgetCallRecordingCandidate } from '@/page-layout/widgets/call-recording/types/WidgetCallRecordingCandidate';
import { type WidgetAccessDenialInfo } from '@/page-layout/widgets/types/WidgetAccessDenialInfo';
import { useCallback } from 'react';
@@ -10,18 +11,19 @@ import {
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-const CALL_RECORDING_TRANSCRIPT_RECORD_FIELDS = {
- id: true,
- status: true,
- transcript: true,
-} as const satisfies RecordGqlOperationGqlRecordFields;
+const CALL_RECORDING_RECORD_FIELDS_BY_WIDGET_KIND = {
+ summary: { id: true, status: true, summary: true },
+ transcript: { id: true, status: true, transcript: true },
+} as const satisfies Record<
+ CallRecordingWidgetKind,
+ RecordGqlOperationGqlRecordFields
+>;
-const CALL_RECORDING_TRANSCRIPT_WITH_VIDEO_RECORD_FIELDS = {
- ...CALL_RECORDING_TRANSCRIPT_RECORD_FIELDS,
- video: true,
-} as const satisfies RecordGqlOperationGqlRecordFields;
-
-export const useCallRecordingForTranscript = (): {
+export const useCallRecordingForWidget = ({
+ kind,
+}: {
+ kind: CallRecordingWidgetKind;
+}): {
callRecording: WidgetCallRecordingCandidate | undefined;
loading: boolean;
error: Error | undefined;
@@ -29,7 +31,7 @@ export const useCallRecordingForTranscript = (): {
refetchCallRecording: () => Promise<void>;
} => {
const { restriction, isFieldRestricted } = useCallRecordingWidgetRestriction({
- requiredFieldNames: ['status', 'transcript'],
+ requiredFieldNames: ['status', kind],
});
const shouldSkipQuery = isDefined(restriction);
@@ -41,6 +43,13 @@ export const useCallRecordingForTranscript = (): {
refetchCallRecordingId,
} = useCallRecordingIdForWidget({ skip: shouldSkipQuery });
+ // The transcript widget plays the video, but requesting a field the role
+ // cannot read fails the whole query.
+ const recordGqlFields =
+ kind === 'transcript' && !isFieldRestricted('video')
+ ? CALL_RECORDING_TRANSCRIPT_RECORD_FIELDS_WITH_VIDEO
+ : CALL_RECORDING_RECORD_FIELDS_BY_WIDGET_KIND[kind];
+
const {
record: callRecording,
loading: callRecordingLoading,
@@ -49,9 +58,7 @@ export const useCallRecordingForTranscript = (): {
} = useFindOneRecord<WidgetCallRecordingCandidate>({
objectNameSingular: CoreObjectNameSingular.CallRecording,
objectRecordId: callRecordingId,
- recordGqlFields: isFieldRestricted('video')
- ? CALL_RECORDING_TRANSCRIPT_RECORD_FIELDS
- : CALL_RECORDING_TRANSCRIPT_WITH_VIDEO_RECORD_FIELDS,
+ recordGqlFields,
withSoftDeleted: targetKind === 'callRecording',
skip: shouldSkipQuery || !isDefined(callRecordingId),
});
@@ -73,3 +80,10 @@ export const useCallRecordingForTranscript = (): {
refetchCallRecording,
};
};
+
+// Selected between stable maps so the query hook's memoised fields do not
+// change identity on every render.
+const CALL_RECORDING_TRANSCRIPT_RECORD_FIELDS_WITH_VIDEO = {
+ ...CALL_RECORDING_RECORD_FIELDS_BY_WIDGET_KIND.transcript,
+ video: true,
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/hooks/useCallRecordingSummaryWidgetData.ts b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetData.ts
similarity index 76%
rename from packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/hooks/useCallRecordingSummaryWidgetData.ts
rename to packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetData.ts
index b5bbf88832b..6ff06f20eb9 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/hooks/useCallRecordingSummaryWidgetData.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetData.ts
@@ -1,16 +1,21 @@
-import { useCallRecordingForSummary } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingForSummary';
+import { useCallRecordingForWidget } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingForWidget';
import { useCallRecordingWidgetCount } from '@/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetCount';
import { useSubscribeToCallRecordingWidgetUpdates } from '@/page-layout/widgets/call-recording/hooks/useSubscribeToCallRecordingWidgetUpdates';
+import { type CallRecordingWidgetKind } from '@/page-layout/widgets/call-recording/types/CallRecordingWidgetKind';
import { useCallback } from 'react';
-export const useCallRecordingSummaryWidgetData = () => {
+export const useCallRecordingWidgetData = ({
+ kind,
+}: {
+ kind: CallRecordingWidgetKind;
+}) => {
const {
callRecording,
loading: callRecordingLoading,
error: callRecordingError,
restriction,
refetchCallRecording,
- } = useCallRecordingForSummary();
+ } = useCallRecordingForWidget({ kind });
const {
callRecordingsCount,
loading: callRecordingCountLoading,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/types/CallRecordingWidgetKind.ts b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/types/CallRecordingWidgetKind.ts
new file mode 100644
index 00000000000..0cff585c6b3
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/types/CallRecordingWidgetKind.ts
@@ -0,0 +1,2 @@
+// Named after the call recording field each widget shows
+export type CallRecordingWidgetKind = 'summary' | 'transcript';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentRenderer.tsx
index 58f8cc168d3..7c2e300ea0b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentRenderer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentRenderer.tsx
@@ -1,7 +1,6 @@
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { CalendarWidget } from '@/page-layout/widgets/calendar/components/CalendarWidget';
-import { CallRecordingSummaryWidget } from '@/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidget';
-import { CallRecordingTranscriptWidget } from '@/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidget';
+import { CallRecordingWidget } from '@/page-layout/widgets/call-recording/components/CallRecordingWidget';
import { EmailThreadWidget } from '@/page-layout/widgets/email-thread/components/EmailThreadWidget';
import { EmailWidget } from '@/page-layout/widgets/emails/components/EmailWidget';
import { FieldRichTextWidgetRenderer } from '@/page-layout/widgets/field-rich-text/components/FieldRichTextWidgetRenderer';
@@ -88,10 +87,10 @@ export const WidgetContentRenderer = ({
return <MessageCampaignBodyWidget />;
case WidgetType.CALL_RECORDING_SUMMARY:
- return <CallRecordingSummaryWidget />;
+ return <CallRecordingWidget kind="summary" />;
case WidgetType.CALL_RECORDING_TRANSCRIPT:
- return <CallRecordingTranscriptWidget />;
+ return <CallRecordingWidget kind="transcript" />;
default:
return null;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsx
index c5093afd9e9..f0158ee556c 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsx
@@ -1,37 +1,8 @@
-import { styled } from '@linaria/react';
-import { Fragment, useState } from 'react';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
-import { RecordDetailRecordsListContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListContainer';
-import { RecordDetailRelationRecordsListItem } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem';
-import { RecordDetailRelationRecordsListItemEffect } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItemEffect';
-import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
-import {
- FieldInputEventContext,
- type FieldInputEvent,
-} from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
-import { usePersistField } from '@/object-record/record-field/ui/hooks/usePersistField';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { extractTargetRecordsFromJunction } from '@/object-record/record-field/ui/utils/junction/extractTargetRecordsFromJunction';
import { type ValidResolvedJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig';
-import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';
-import { FieldWidgetShowMoreButton } from '@/page-layout/widgets/field/components/FieldWidgetShowMoreButton';
-import { FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardInitialVisibleItems';
-import { FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardLoadMoreIncrement';
-import { generateFieldWidgetInstanceId } from '@/page-layout/widgets/field/utils/generateFieldWidgetInstanceId';
-import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
-import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
-import { isDefined } from 'twenty-shared/utils';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-const StyledShowMoreButtonContainer = styled.div`
- padding-top: ${themeCssVariables.spacing[2]};
-`;
+import { FieldWidgetRelationRecordsCard } from '@/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard';
+import { useFieldWidgetJunctionRelationRecords } from '@/page-layout/widgets/field/hooks/useFieldWidgetJunctionRelationRecords';
type FieldWidgetJunctionRelationCardProps = {
fieldDefinition: FieldDefinition<FieldRelationMetadata>;
@@ -46,152 +17,24 @@ export const FieldWidgetJunctionRelationCard = ({
isInSidePanel,
junctionConfig,
}: FieldWidgetJunctionRelationCardProps) => {
- const widget = useCurrentWidget();
-
- const [expandedItem, setExpandedItem] = useState('');
- const [visibleItemsCount, setVisibleItemsCount] = useState(
- FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS,
- );
- const targetRecord = useTargetRecord();
-
- const instanceId = generateFieldWidgetInstanceId({
- widgetId: widget.id,
- recordId: targetRecord.id,
- fieldName: fieldDefinition.metadata.fieldName,
- isInSidePanel,
+ const junctionRelationRecords = useFieldWidgetJunctionRelationRecords({
+ relationValue,
+ junctionConfig,
});
- const handleItemClick = (id: string) =>
- setExpandedItem(id === expandedItem ? '' : id);
-
- const handleShowMore = () => {
- setVisibleItemsCount(
- (prevCount) => prevCount + FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT,
- );
- };
-
- const { objectMetadataItems } = useObjectMetadataItems();
-
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: targetRecord.targetObjectNameSingular,
- });
-
- const { updateOneRecord } = useUpdateOneRecord();
-
- const useUpdateOneObjectRecordMutation = () => {
- const updateEntity = ({
- variables,
- }: {
- variables: {
- where: { id: string };
- updateOneRecordInput: Record<string, unknown>;
- };
- }) => {
- updateOneRecord({
- objectNameSingular: targetRecord.targetObjectNameSingular,
- idToUpdate: variables.where.id,
- updateOneRecordInput: variables.updateOneRecordInput,
- });
- };
- return [updateEntity, { loading: false }] as [
- (params: any) => void,
- { loading: boolean },
- ];
- };
-
- const persistField = usePersistField({
- objectMetadataItemId: objectMetadataItem.id,
- });
-
- const handleSubmit: FieldInputEvent = ({ newValue }) => {
- persistField({
- recordId: targetRecord.id,
- fieldDefinition,
- valueToPersist: newValue,
- });
- };
-
- const junctionRecords = Array.isArray(relationValue) ? relationValue : [];
-
- const extractedRecords = extractTargetRecordsFromJunction({
- junctionRecords,
- targetFields: junctionConfig.targetFields,
- objectMetadataItems,
- includeRecord: true,
- });
-
- const targetRecordsWithMetadata = extractedRecords
- .map((extracted) => {
- const objectMetadata = objectMetadataItems.find(
- (item) => item.id === extracted.objectMetadataId,
- );
- if (!objectMetadata || !extracted.record) {
- return null;
- }
- return {
- record: extracted.record,
- objectNameSingular: objectMetadata.nameSingular,
- };
- })
- .filter(isDefined);
-
- if (targetRecordsWithMetadata.length === 0) {
- return null;
- }
-
- const visibleRecords = targetRecordsWithMetadata.slice(0, visibleItemsCount);
- const remainingCount = targetRecordsWithMetadata.length - visibleItemsCount;
- const hasMoreRecords = remainingCount > 0;
-
+ // Detach/delete in RecordDetailRelationRecordsListItem assumes a direct
+ // relation, so junction cards are forced read-only to prevent data corruption.
return (
- <SidePanelProvider value={{ isInSidePanel }}>
- <RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>
- <FieldContext.Provider
- value={{
- recordId: targetRecord.id,
- isLabelIdentifier: false,
- fieldDefinition,
- useUpdateRecord: useUpdateOneObjectRecordMutation,
- // Junction card detach/delete logic in RecordDetailRelationRecordsListItem
- // assumes direct relations. Force read-only to prevent data corruption.
- isRecordFieldReadOnly: true,
- }}
- >
- <FieldInputEventContext.Provider value={{ onSubmit: handleSubmit }}>
- <StyledWidgetContentContainer>
- <RecordDetailRecordsListContainer>
- {visibleRecords.map((item) => (
- <Fragment key={item.record.id}>
- <RecordDetailRelationRecordsListItemEffect
- relationRecordId={item.record.id}
- relationObjectMetadataNameSingular={
- item.objectNameSingular
- }
- />
- <RecordDetailRelationRecordsListItem
- isExpanded={expandedItem === item.record.id}
- onClick={handleItemClick}
- relationRecord={item.record}
- relationObjectMetadataNameSingular={
- item.objectNameSingular
- }
- relationFieldMetadataId=""
- />
- </Fragment>
- ))}
- {hasMoreRecords && (
- <StyledShowMoreButtonContainer>
- <FieldWidgetShowMoreButton
- remainingCount={remainingCount}
- onClick={handleShowMore}
- />
- </StyledShowMoreButtonContainer>
- )}
- </RecordDetailRecordsListContainer>
- </StyledWidgetContentContainer>
- </FieldInputEventContext.Provider>
- </FieldContext.Provider>
- </RecordFieldsScopeContextProvider>
- </SidePanelProvider>
+ <FieldWidgetRelationRecordsCard
+ fieldDefinition={fieldDefinition}
+ relationRecords={junctionRelationRecords.map(
+ (junctionRelationRecord) => ({
+ ...junctionRelationRecord,
+ fieldMetadataId: '',
+ }),
+ )}
+ isInSidePanel={isInSidePanel}
+ isReadOnly
+ />
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationField.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationField.tsx
index c76dc31ff09..08785e83c97 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationField.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationField.tsx
@@ -1,23 +1,6 @@
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { RecordChip } from '@/object-record/components/RecordChip';
-import { extractTargetRecordsFromJunction } from '@/object-record/record-field/ui/utils/junction/extractTargetRecordsFromJunction';
import { type ValidResolvedJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig';
-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
-import { styled } from '@linaria/react';
-import { isDefined } from 'twenty-shared/utils';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-const StyledContainer = styled.div`
- box-sizing: border-box;
- padding: ${themeCssVariables.spacing[1]};
- width: 100%;
-`;
-
-const StyledRelationChipsContainer = styled.div`
- display: flex;
- flex-wrap: wrap;
- gap: ${themeCssVariables.spacing[1]};
-`;
+import { FieldWidgetRelationRecordChips } from '@/page-layout/widgets/field/components/FieldWidgetRelationRecordChips';
+import { useFieldWidgetJunctionRelationRecords } from '@/page-layout/widgets/field/hooks/useFieldWidgetJunctionRelationRecords';
type FieldWidgetJunctionRelationFieldProps = {
relationValue: any;
@@ -30,46 +13,19 @@ export const FieldWidgetJunctionRelationField = ({
isInSidePanel,
junctionConfig,
}: FieldWidgetJunctionRelationFieldProps) => {
- const { objectMetadataItems } = useObjectMetadataItems();
-
- const junctionRecords = Array.isArray(relationValue) ? relationValue : [];
-
- const extractedRecords = extractTargetRecordsFromJunction({
- junctionRecords,
- targetFields: junctionConfig.targetFields,
- objectMetadataItems,
- includeRecord: true,
+ const junctionRelationRecords = useFieldWidgetJunctionRelationRecords({
+ relationValue,
+ junctionConfig,
});
- const targetRecordsWithMetadata = extractedRecords
- .map((extracted) => {
- const objectMetadata = objectMetadataItems.find(
- (item) => item.id === extracted.objectMetadataId,
- );
- if (!objectMetadata || !extracted.record) {
- return null;
- }
- return { record: extracted.record, objectMetadata };
- })
- .filter(isDefined);
-
- if (targetRecordsWithMetadata.length === 0) {
+ if (junctionRelationRecords.length === 0) {
return null;
}
return (
- <SidePanelProvider value={{ isInSidePanel }}>
- <StyledContainer>
- <StyledRelationChipsContainer>
- {targetRecordsWithMetadata.map(({ record, objectMetadata }) => (
- <RecordChip
- key={record.id}
- objectNameSingular={objectMetadata.nameSingular}
- record={record}
- />
- ))}
- </StyledRelationChipsContainer>
- </StyledContainer>
- </SidePanelProvider>
+ <FieldWidgetRelationRecordChips
+ relationRecords={junctionRelationRecords}
+ isInSidePanel={isInSidePanel}
+ />
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationCard.tsx
index bdef98db8d5..5ef2687f13a 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationCard.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationCard.tsx
@@ -1,36 +1,8 @@
-import { styled } from '@linaria/react';
-import { Fragment, useState } from 'react';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { useIsRecordFieldReadOnly } from '@/object-record/read-only/hooks/useIsRecordFieldReadOnly';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
-import { RecordDetailRecordsListContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListContainer';
-import { RecordDetailRelationRecordsListItem } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem';
-import { RecordDetailRelationRecordsListItemEffect } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItemEffect';
import { useGetMorphRelationRelatedRecordsWithObjectNameSingular } from '@/object-record/record-field-list/record-detail-section/relation/components/hooks/useGetMorphRelationRelatedRecordsWithObjectNameSingular';
-import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
-import {
- FieldInputEventContext,
- type FieldInputEvent,
-} from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
-import { usePersistField } from '@/object-record/record-field/ui/hooks/usePersistField';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldMorphRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';
-import { FieldWidgetShowMoreButton } from '@/page-layout/widgets/field/components/FieldWidgetShowMoreButton';
-import { FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardInitialVisibleItems';
-import { FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardLoadMoreIncrement';
-import { generateFieldWidgetInstanceId } from '@/page-layout/widgets/field/utils/generateFieldWidgetInstanceId';
-import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
-import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
+import { FieldWidgetRelationRecordsCard } from '@/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard';
import { isDefined } from 'twenty-shared/utils';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-const StyledShowMoreButtonContainer = styled.div`
- padding-top: ${themeCssVariables.spacing[2]};
-`;
type FieldWidgetMorphRelationCardProps = {
fieldDefinition: FieldDefinition<FieldMorphRelationMetadata>;
@@ -43,142 +15,23 @@ export const FieldWidgetMorphRelationCard = ({
recordId,
isInSidePanel,
}: FieldWidgetMorphRelationCardProps) => {
- const widget = useCurrentWidget();
-
- const [expandedItem, setExpandedItem] = useState('');
- const [visibleItemsCount, setVisibleItemsCount] = useState(
- FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS,
- );
- const targetRecord = useTargetRecord();
-
- const instanceId = generateFieldWidgetInstanceId({
- widgetId: widget.id,
- recordId: targetRecord.id,
- fieldName: fieldDefinition.metadata.fieldName,
- isInSidePanel,
- });
-
- const handleItemClick = (id: string) =>
- setExpandedItem(id === expandedItem ? '' : id);
-
- const handleShowMore = () => {
- setVisibleItemsCount(
- (prevCount) => prevCount + FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT,
- );
- };
-
- const fieldMetadata = fieldDefinition.metadata;
-
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: targetRecord.targetObjectNameSingular,
- });
-
- const { updateOneRecord } = useUpdateOneRecord();
-
- const useUpdateOneObjectRecordMutation = () => {
- const updateEntity = ({
- variables,
- }: {
- variables: {
- where: { id: string };
- updateOneRecordInput: Record<string, unknown>;
- };
- }) => {
- updateOneRecord({
- objectNameSingular: targetRecord.targetObjectNameSingular,
- idToUpdate: variables.where.id,
- updateOneRecordInput: variables.updateOneRecordInput,
- });
- };
- return [updateEntity, { loading: false }] as [
- (params: any) => void,
- { loading: boolean },
- ];
- };
-
- const isRecordFieldReadOnly = useIsRecordFieldReadOnly({
- recordId: targetRecord.id,
- fieldMetadataId: fieldDefinition.fieldMetadataId,
- objectMetadataId: objectMetadataItem.id,
- });
-
- const persistField = usePersistField({
- objectMetadataItemId: objectMetadataItem.id,
- });
-
- const handleSubmit: FieldInputEvent = ({ newValue }) => {
- persistField({
- recordId: targetRecord.id,
- fieldDefinition,
- valueToPersist: newValue,
- });
- };
-
const recordsWithObjectNameSingular =
useGetMorphRelationRelatedRecordsWithObjectNameSingular({
recordId,
- morphRelations: fieldMetadata.morphRelations,
+ morphRelations: fieldDefinition.metadata.morphRelations,
});
- const validRecords = recordsWithObjectNameSingular.filter((item) =>
- isDefined(item.value),
- );
-
- if (validRecords.length === 0) {
- return null;
- }
-
- const visibleRecords = validRecords.slice(0, visibleItemsCount);
- const remainingCount = validRecords.length - visibleItemsCount;
- const hasMoreRecords = remainingCount > 0;
-
return (
- <SidePanelProvider value={{ isInSidePanel }}>
- <RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>
- <FieldContext.Provider
- value={{
- recordId: targetRecord.id,
- isLabelIdentifier: false,
- fieldDefinition,
- useUpdateRecord: useUpdateOneObjectRecordMutation,
- isRecordFieldReadOnly,
- }}
- >
- <FieldInputEventContext.Provider value={{ onSubmit: handleSubmit }}>
- <StyledWidgetContentContainer>
- <RecordDetailRecordsListContainer>
- {visibleRecords.map((item) => (
- <Fragment key={`${item.value.id}-${item.fieldMetadataId}`}>
- <RecordDetailRelationRecordsListItemEffect
- relationRecordId={item.value.id}
- relationObjectMetadataNameSingular={
- item.objectNameSingular
- }
- />
- <RecordDetailRelationRecordsListItem
- isExpanded={expandedItem === item.value.id}
- onClick={handleItemClick}
- relationRecord={item.value}
- relationObjectMetadataNameSingular={
- item.objectNameSingular
- }
- relationFieldMetadataId={item.fieldMetadataId}
- />
- </Fragment>
- ))}
- {hasMoreRecords && (
- <StyledShowMoreButtonContainer>
- <FieldWidgetShowMoreButton
- remainingCount={remainingCount}
- onClick={handleShowMore}
- />
- </StyledShowMoreButtonContainer>
- )}
- </RecordDetailRecordsListContainer>
- </StyledWidgetContentContainer>
- </FieldInputEventContext.Provider>
- </FieldContext.Provider>
- </RecordFieldsScopeContextProvider>
- </SidePanelProvider>
+ <FieldWidgetRelationRecordsCard
+ fieldDefinition={fieldDefinition}
+ relationRecords={recordsWithObjectNameSingular
+ .filter((item) => isDefined(item.value))
+ .map((item) => ({
+ record: item.value,
+ objectNameSingular: item.objectNameSingular,
+ fieldMetadataId: item.fieldMetadataId,
+ }))}
+ isInSidePanel={isInSidePanel}
+ />
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationField.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationField.tsx
index c46b2122e1e..e5f319369aa 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationField.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationField.tsx
@@ -1,22 +1,7 @@
-import { RecordChip } from '@/object-record/components/RecordChip';
import { useGetMorphRelationRelatedRecordsWithObjectNameSingular } from '@/object-record/record-field-list/record-detail-section/relation/components/hooks/useGetMorphRelationRelatedRecordsWithObjectNameSingular';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldMorphRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
-import { styled } from '@linaria/react';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-const StyledContainer = styled.div`
- box-sizing: border-box;
- padding: ${themeCssVariables.spacing[1]};
- width: 100%;
-`;
-
-const StyledRelationChipsContainer = styled.div`
- display: flex;
- flex-wrap: wrap;
- gap: ${themeCssVariables.spacing[1]};
-`;
+import { FieldWidgetRelationRecordChips } from '@/page-layout/widgets/field/components/FieldWidgetRelationRecordChips';
type FieldWidgetMorphRelationFieldProps = {
fieldDefinition: FieldDefinition<FieldMorphRelationMetadata>;
@@ -29,12 +14,10 @@ export const FieldWidgetMorphRelationField = ({
recordId,
isInSidePanel,
}: FieldWidgetMorphRelationFieldProps) => {
- const fieldMetadata = fieldDefinition.metadata;
-
const recordsWithObjectNameSingular =
useGetMorphRelationRelatedRecordsWithObjectNameSingular({
recordId,
- morphRelations: fieldMetadata.morphRelations,
+ morphRelations: fieldDefinition.metadata.morphRelations,
});
if (recordsWithObjectNameSingular.length === 0) {
@@ -42,18 +25,12 @@ export const FieldWidgetMorphRelationField = ({
}
return (
- <SidePanelProvider value={{ isInSidePanel }}>
- <StyledContainer>
- <StyledRelationChipsContainer>
- {recordsWithObjectNameSingular.map((morphItem, index) => (
- <RecordChip
- key={morphItem.value?.id ?? index}
- objectNameSingular={morphItem.objectNameSingular}
- record={morphItem.value}
- />
- ))}
- </StyledRelationChipsContainer>
- </StyledContainer>
- </SidePanelProvider>
+ <FieldWidgetRelationRecordChips
+ relationRecords={recordsWithObjectNameSingular.map((morphItem) => ({
+ record: morphItem.value,
+ objectNameSingular: morphItem.objectNameSingular,
+ }))}
+ isInSidePanel={isInSidePanel}
+ />
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx
index 2fda3e9627e..0dafb567b11 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx
@@ -1,35 +1,8 @@
-import { styled } from '@linaria/react';
-import { Fragment, useState } from 'react';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { useIsRecordFieldReadOnly } from '@/object-record/read-only/hooks/useIsRecordFieldReadOnly';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
-import { RecordDetailRecordsListContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListContainer';
-import { RecordDetailRelationRecordsListItem } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem';
-import { RecordDetailRelationRecordsListItemEffect } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItemEffect';
-import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
-import {
- FieldInputEventContext,
- type FieldInputEvent,
-} from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
-import { usePersistField } from '@/object-record/record-field/ui/hooks/usePersistField';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';
-import { FieldWidgetShowMoreButton } from '@/page-layout/widgets/field/components/FieldWidgetShowMoreButton';
-import { FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardInitialVisibleItems';
-import { FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardLoadMoreIncrement';
-import { generateFieldWidgetInstanceId } from '@/page-layout/widgets/field/utils/generateFieldWidgetInstanceId';
-import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
-import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { FieldWidgetRelationRecordsCard } from '@/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard';
import { isDefined } from 'twenty-shared/utils';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-const StyledShowMoreButtonContainer = styled.div`
- padding-top: ${themeCssVariables.spacing[2]};
-`;
type FieldWidgetRelationCardProps = {
fieldDefinition: FieldDefinition<FieldRelationMetadata>;
@@ -42,141 +15,24 @@ export const FieldWidgetRelationCard = ({
relationValue,
isInSidePanel,
}: FieldWidgetRelationCardProps) => {
- const widget = useCurrentWidget();
-
- const [expandedItem, setExpandedItem] = useState('');
- const [visibleItemsCount, setVisibleItemsCount] = useState(
- FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS,
- );
- const targetRecord = useTargetRecord();
-
- const instanceId = generateFieldWidgetInstanceId({
- widgetId: widget.id,
- recordId: targetRecord.id,
- fieldName: fieldDefinition.metadata.fieldName,
- isInSidePanel,
- });
-
- const handleItemClick = (recordId: string) =>
- setExpandedItem(recordId === expandedItem ? '' : recordId);
-
- const handleShowMore = () => {
- setVisibleItemsCount(
- (prevCount) => prevCount + FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT,
- );
- };
-
- const fieldMetadata = fieldDefinition.metadata;
- const relationObjectNameSingular =
- fieldMetadata.relationObjectMetadataNameSingular;
- const relationFieldMetadataId = fieldMetadata.relationFieldMetadataId;
+ const { relationObjectMetadataNameSingular, relationFieldMetadataId } =
+ fieldDefinition.metadata;
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: targetRecord.targetObjectNameSingular,
- });
-
- const { updateOneRecord } = useUpdateOneRecord();
-
- const useUpdateOneObjectRecordMutation = () => {
- const updateEntity = ({
- variables,
- }: {
- variables: {
- where: { id: string };
- updateOneRecordInput: Record<string, unknown>;
- };
- }) => {
- updateOneRecord({
- objectNameSingular: targetRecord.targetObjectNameSingular,
- idToUpdate: variables.where.id,
- updateOneRecordInput: variables.updateOneRecordInput,
- });
- };
- return [updateEntity, { loading: false }] as [
- (params: any) => void,
- { loading: boolean },
- ];
- };
-
- const isRecordFieldReadOnly = useIsRecordFieldReadOnly({
- recordId: targetRecord.id,
- fieldMetadataId: fieldDefinition.fieldMetadataId,
- objectMetadataId: objectMetadataItem.id,
- });
-
- const persistField = usePersistField({
- objectMetadataItemId: objectMetadataItem.id,
- });
-
- const handleSubmit: FieldInputEvent = ({ newValue }) => {
- persistField({
- recordId: targetRecord.id,
- fieldDefinition,
- valueToPersist: newValue,
- });
- };
-
- const records = Array.isArray(relationValue)
+ const records: ObjectRecord[] = Array.isArray(relationValue)
? relationValue
: isDefined(relationValue)
? [relationValue]
: [];
- if (records.length === 0) {
- return null;
- }
-
- const visibleRecords = records.slice(0, visibleItemsCount);
- const remainingCount = records.length - visibleItemsCount;
- const hasMoreRecords = remainingCount > 0;
-
return (
- <SidePanelProvider value={{ isInSidePanel }}>
- <RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>
- <FieldContext.Provider
- value={{
- recordId: targetRecord.id,
- isLabelIdentifier: false,
- fieldDefinition,
- useUpdateRecord: useUpdateOneObjectRecordMutation,
- isRecordFieldReadOnly,
- }}
- >
- <FieldInputEventContext.Provider value={{ onSubmit: handleSubmit }}>
- <StyledWidgetContentContainer>
- <RecordDetailRecordsListContainer>
- {visibleRecords.map((record) => (
- <Fragment key={record.id}>
- <RecordDetailRelationRecordsListItemEffect
- relationRecordId={record.id}
- relationObjectMetadataNameSingular={
- relationObjectNameSingular
- }
- />
- <RecordDetailRelationRecordsListItem
- isExpanded={expandedItem === record.id}
- onClick={handleItemClick}
- relationRecord={record}
- relationObjectMetadataNameSingular={
- relationObjectNameSingular
- }
- relationFieldMetadataId={relationFieldMetadataId}
- />
- </Fragment>
- ))}
- {hasMoreRecords && (
- <StyledShowMoreButtonContainer>
- <FieldWidgetShowMoreButton
- remainingCount={remainingCount}
- onClick={handleShowMore}
- />
- </StyledShowMoreButtonContainer>
- )}
- </RecordDetailRecordsListContainer>
- </StyledWidgetContentContainer>
- </FieldInputEventContext.Provider>
- </FieldContext.Provider>
- </RecordFieldsScopeContextProvider>
- </SidePanelProvider>
+ <FieldWidgetRelationRecordsCard
+ fieldDefinition={fieldDefinition}
+ relationRecords={records.map((record) => ({
+ record,
+ objectNameSingular: relationObjectMetadataNameSingular,
+ fieldMetadataId: relationFieldMetadataId,
+ }))}
+ isInSidePanel={isInSidePanel}
+ />
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationField.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationField.tsx
index 548e4ceebd0..d6bd2cd7915 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationField.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationField.tsx
@@ -1,22 +1,8 @@
-import { RecordChip } from '@/object-record/components/RecordChip';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
-import { styled } from '@linaria/react';
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { FieldWidgetRelationRecordChips } from '@/page-layout/widgets/field/components/FieldWidgetRelationRecordChips';
import { isDefined } from 'twenty-shared/utils';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-const StyledContainer = styled.div`
- box-sizing: border-box;
- padding: ${themeCssVariables.spacing[1]};
- width: 100%;
-`;
-
-const StyledRelationChipsContainer = styled.div`
- display: flex;
- flex-wrap: wrap;
- gap: ${themeCssVariables.spacing[1]};
-`;
type FieldWidgetRelationFieldProps = {
fieldDefinition: FieldDefinition<FieldRelationMetadata>;
@@ -42,34 +28,17 @@ export const FieldWidgetRelationField = ({
return null;
}
- if (isOneToMany) {
- return (
- <SidePanelProvider value={{ isInSidePanel }}>
- <StyledContainer>
- <StyledRelationChipsContainer>
- {relationValue.map((relatedRecord: any) => (
- <RecordChip
- key={relatedRecord.id}
- objectNameSingular={relationObjectNameSingular}
- record={relatedRecord}
- />
- ))}
- </StyledRelationChipsContainer>
- </StyledContainer>
- </SidePanelProvider>
- );
- }
+ const relatedRecords: ObjectRecord[] = isOneToMany
+ ? relationValue
+ : [relationValue];
return (
- <SidePanelProvider value={{ isInSidePanel }}>
- <StyledContainer>
- <StyledRelationChipsContainer>
- <RecordChip
- objectNameSingular={relationObjectNameSingular}
- record={relationValue}
- />
- </StyledRelationChipsContainer>
- </StyledContainer>
- </SidePanelProvider>
+ <FieldWidgetRelationRecordChips
+ relationRecords={relatedRecords.map((record) => ({
+ record,
+ objectNameSingular: relationObjectNameSingular,
+ }))}
+ isInSidePanel={isInSidePanel}
+ />
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationRecordChips.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationRecordChips.tsx
new file mode 100644
index 00000000000..0b01806d345
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationRecordChips.tsx
@@ -0,0 +1,47 @@
+import { RecordChip } from '@/object-record/components/RecordChip';
+import { type FieldWidgetRelationRecord } from '@/page-layout/widgets/field/types/FieldWidgetRelationRecord';
+import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
+import { styled } from '@linaria/react';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+const StyledContainer = styled.div`
+ box-sizing: border-box;
+ padding: ${themeCssVariables.spacing[1]};
+ width: 100%;
+`;
+
+const StyledRelationChipsContainer = styled.div`
+ display: flex;
+ flex-wrap: wrap;
+ gap: ${themeCssVariables.spacing[1]};
+`;
+
+type FieldWidgetRelationRecordChipsProps = {
+ relationRecords: FieldWidgetRelationRecord[];
+ isInSidePanel: boolean;
+};
+
+export const FieldWidgetRelationRecordChips = ({
+ relationRecords,
+ isInSidePanel,
+}: FieldWidgetRelationRecordChipsProps) => {
+ if (relationRecords.length === 0) {
+ return null;
+ }
+
+ return (
+ <SidePanelProvider value={{ isInSidePanel }}>
+ <StyledContainer>
+ <StyledRelationChipsContainer>
+ {relationRecords.map(({ record, objectNameSingular }) => (
+ <RecordChip
+ key={`${objectNameSingular}-${record.id}`}
+ objectNameSingular={objectNameSingular}
+ record={record}
+ />
+ ))}
+ </StyledRelationChipsContainer>
+ </StyledContainer>
+ </SidePanelProvider>
+ );
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard.tsx
new file mode 100644
index 00000000000..320e9f92b68
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard.tsx
@@ -0,0 +1,178 @@
+import { styled } from '@linaria/react';
+import { Fragment, useState } from 'react';
+
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { useIsRecordFieldReadOnly } from '@/object-record/read-only/hooks/useIsRecordFieldReadOnly';
+import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
+import { RecordDetailRecordsListContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListContainer';
+import { RecordDetailRelationRecordsListItem } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem';
+import { RecordDetailRelationRecordsListItemEffect } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItemEffect';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import {
+ FieldInputEventContext,
+ type FieldInputEvent,
+} from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
+import { usePersistField } from '@/object-record/record-field/ui/hooks/usePersistField';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+ type FieldMorphRelationMetadata,
+ type FieldRelationMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
+import { FieldWidgetShowMoreButton } from '@/page-layout/widgets/field/components/FieldWidgetShowMoreButton';
+import { FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardInitialVisibleItems';
+import { FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardLoadMoreIncrement';
+import { type FieldWidgetRelationCardRecord } from '@/page-layout/widgets/field/types/FieldWidgetRelationCardRecord';
+import { generateFieldWidgetInstanceId } from '@/page-layout/widgets/field/utils/generateFieldWidgetInstanceId';
+import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
+import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';
+import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
+import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+const StyledShowMoreButtonContainer = styled.div`
+ padding-top: ${themeCssVariables.spacing[2]};
+`;
+
+type FieldWidgetRelationRecordsCardProps = {
+ fieldDefinition: FieldDefinition<
+ FieldRelationMetadata | FieldMorphRelationMetadata
+ >;
+ relationRecords: FieldWidgetRelationCardRecord[];
+ isInSidePanel: boolean;
+ isReadOnly?: boolean;
+};
+
+export const FieldWidgetRelationRecordsCard = ({
+ fieldDefinition,
+ relationRecords,
+ isInSidePanel,
+ isReadOnly = false,
+}: FieldWidgetRelationRecordsCardProps) => {
+ const widget = useCurrentWidget();
+
+ const [expandedItem, setExpandedItem] = useState('');
+ const [visibleItemsCount, setVisibleItemsCount] = useState(
+ FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS,
+ );
+ const targetRecord = useTargetRecord();
+
+ const instanceId = generateFieldWidgetInstanceId({
+ widgetId: widget.id,
+ recordId: targetRecord.id,
+ fieldName: fieldDefinition.metadata.fieldName,
+ isInSidePanel,
+ });
+
+ const handleItemClick = (recordId: string) =>
+ setExpandedItem(recordId === expandedItem ? '' : recordId);
+
+ const handleShowMore = () => {
+ setVisibleItemsCount(
+ (prevCount) => prevCount + FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT,
+ );
+ };
+
+ const { objectMetadataItem } = useObjectMetadataItem({
+ objectNameSingular: targetRecord.targetObjectNameSingular,
+ });
+
+ const { updateOneRecord } = useUpdateOneRecord();
+
+ const useUpdateOneObjectRecordMutation = () => {
+ const updateEntity = ({
+ variables,
+ }: {
+ variables: {
+ where: { id: string };
+ updateOneRecordInput: Record<string, unknown>;
+ };
+ }) => {
+ updateOneRecord({
+ objectNameSingular: targetRecord.targetObjectNameSingular,
+ idToUpdate: variables.where.id,
+ updateOneRecordInput: variables.updateOneRecordInput,
+ });
+ };
+ return [updateEntity, { loading: false }] as [
+ (params: any) => void,
+ { loading: boolean },
+ ];
+ };
+
+ const isRecordFieldReadOnly = useIsRecordFieldReadOnly({
+ recordId: targetRecord.id,
+ fieldMetadataId: fieldDefinition.fieldMetadataId,
+ objectMetadataId: objectMetadataItem.id,
+ });
+
+ const persistField = usePersistField({
+ objectMetadataItemId: objectMetadataItem.id,
+ });
+
+ const handleSubmit: FieldInputEvent = ({ newValue }) => {
+ persistField({
+ recordId: targetRecord.id,
+ fieldDefinition,
+ valueToPersist: newValue,
+ });
+ };
+
+ if (relationRecords.length === 0) {
+ return null;
+ }
+
+ const visibleRelationRecords = relationRecords.slice(0, visibleItemsCount);
+ const remainingCount = relationRecords.length - visibleItemsCount;
+ const hasMoreRecords = remainingCount > 0;
+
+ return (
+ <SidePanelProvider value={{ isInSidePanel }}>
+ <RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>
+ <FieldContext.Provider
+ value={{
+ recordId: targetRecord.id,
+ isLabelIdentifier: false,
+ fieldDefinition,
+ useUpdateRecord: useUpdateOneObjectRecordMutation,
+ isRecordFieldReadOnly: isReadOnly || isRecordFieldReadOnly,
+ }}
+ >
+ <FieldInputEventContext.Provider value={{ onSubmit: handleSubmit }}>
+ <StyledWidgetContentContainer>
+ <RecordDetailRecordsListContainer>
+ {visibleRelationRecords.map(
+ ({ record, objectNameSingular, fieldMetadataId }) => (
+ <Fragment
+ key={`${objectNameSingular}-${record.id}-${fieldMetadataId}`}
+ >
+ <RecordDetailRelationRecordsListItemEffect
+ relationRecordId={record.id}
+ relationObjectMetadataNameSingular={objectNameSingular}
+ />
+ <RecordDetailRelationRecordsListItem
+ isExpanded={expandedItem === record.id}
+ onClick={handleItemClick}
+ relationRecord={record}
+ relationObjectMetadataNameSingular={objectNameSingular}
+ relationFieldMetadataId={fieldMetadataId}
+ />
+ </Fragment>
+ ),
+ )}
+ {hasMoreRecords && (
+ <StyledShowMoreButtonContainer>
+ <FieldWidgetShowMoreButton
+ remainingCount={remainingCount}
+ onClick={handleShowMore}
+ />
+ </StyledShowMoreButtonContainer>
+ )}
+ </RecordDetailRecordsListContainer>
+ </StyledWidgetContentContainer>
+ </FieldInputEventContext.Provider>
+ </FieldContext.Provider>
+ </RecordFieldsScopeContextProvider>
+ </SidePanelProvider>
+ );
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetJunctionRelationRecords.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetJunctionRelationRecords.ts
new file mode 100644
index 00000000000..ace62d8f0a4
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetJunctionRelationRecords.ts
@@ -0,0 +1,44 @@
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { extractTargetRecordsFromJunction } from '@/object-record/record-field/ui/utils/junction/extractTargetRecordsFromJunction';
+import { type ValidResolvedJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig';
+import { type FieldWidgetRelationRecord } from '@/page-layout/widgets/field/types/FieldWidgetRelationRecord';
+import { isDefined } from 'twenty-shared/utils';
+
+export const useFieldWidgetJunctionRelationRecords = ({
+ relationValue,
+ junctionConfig,
+}: {
+ relationValue: any;
+ junctionConfig: ValidResolvedJunctionConfig;
+}): FieldWidgetRelationRecord[] => {
+ const { objectMetadataItems } = useObjectMetadataItems();
+
+ const junctionRecords = Array.isArray(relationValue) ? relationValue : [];
+
+ const extractedRecords = extractTargetRecordsFromJunction({
+ junctionRecords,
+ targetFields: junctionConfig.targetFields,
+ objectMetadataItems,
+ includeRecord: true,
+ });
+
+ return extractedRecords
+ .map((extractedRecord) => {
+ const objectMetadataItem = objectMetadataItems.find(
+ (candidate) => candidate.id === extractedRecord.objectMetadataId,
+ );
+
+ if (
+ !isDefined(objectMetadataItem) ||
+ !isDefined(extractedRecord.record)
+ ) {
+ return null;
+ }
+
+ return {
+ record: extractedRecord.record,
+ objectNameSingular: objectMetadataItem.nameSingular,
+ };
+ })
+ .filter(isDefined);
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/types/FieldWidgetRelationCardRecord.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/types/FieldWidgetRelationCardRecord.ts
new file mode 100644
index 00000000000..5bf4e581857
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/types/FieldWidgetRelationCardRecord.ts
@@ -0,0 +1,5 @@
+import { type FieldWidgetRelationRecord } from '@/page-layout/widgets/field/types/FieldWidgetRelationRecord';
+
+export type FieldWidgetRelationCardRecord = FieldWidgetRelationRecord & {
+ fieldMetadataId: string;
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/types/FieldWidgetRelationRecord.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/types/FieldWidgetRelationRecord.ts
new file mode 100644
index 00000000000..4167189ed86
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/types/FieldWidgetRelationRecord.ts
@@ -0,0 +1,6 @@
+import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
+
+export type FieldWidgetRelationRecord = {
+ record: ObjectRecord;
+ objectNameSingular: string;
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/__tests__/useAddDraftViewForRecordTableWidget.test.tsx b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/__tests__/useAddDraftViewForRecordTableWidget.test.tsx
index 58ee6db766d..00bf4d403ab 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/__tests__/useAddDraftViewForRecordTableWidget.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/__tests__/useAddDraftViewForRecordTableWidget.test.tsx
@@ -4,8 +4,7 @@ import {
makeDraft,
makeTab,
} from '@/page-layout/testing/pageLayoutDraftFixtures';
-import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-import { createDefaultRecordTableWidget } from '@/page-layout/utils/createDefaultRecordTableWidget';
+import { buildDraftPageLayoutWidget } from '@/page-layout/utils/buildDraftPageLayoutWidget';
import { useAddDraftViewForRecordTableWidget } from '@/page-layout/widgets/record-table/hooks/useAddDraftViewForRecordTableWidget';
import { act, renderHook } from '@testing-library/react';
import { createStore, Provider as JotaiProvider } from 'jotai';
@@ -13,6 +12,7 @@ import { type ReactNode } from 'react';
import {
PageLayoutTabLayoutMode,
WidgetConfigurationType,
+ WidgetType,
} from '~/generated-metadata/graphql';
import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
@@ -45,29 +45,26 @@ describe('useAddDraftViewForRecordTableWidget', () => {
instanceId: PAGE_LAYOUT_ID,
});
- const recordTableWidget: PageLayoutWidget = {
- ...createDefaultRecordTableWidget({
- id: WIDGET_ID,
- pageLayoutTabId: 'tab-id',
- title: 'Companies',
- objectMetadataId: 'object-metadata-id',
- isUIEditable: true,
- position: {
- __typename: 'PageLayoutWidgetGridPosition',
- layoutMode: PageLayoutTabLayoutMode.GRID,
- row: 0,
- column: 0,
- rowSpan: 4,
- columnSpan: 4,
- },
- }),
+ const recordTableWidget = buildDraftPageLayoutWidget({
+ id: WIDGET_ID,
+ pageLayoutTabId: 'tab-id',
+ title: 'Companies',
+ type: WidgetType.RECORD_TABLE,
+ objectMetadataId: 'object-metadata-id',
+ position: {
+ layoutMode: PageLayoutTabLayoutMode.GRID,
+ row: 0,
+ column: 0,
+ rowSpan: 4,
+ columnSpan: 4,
+ },
configuration: {
configurationType: WidgetConfigurationType.RECORD_TABLE,
viewId: 'previous-view-id',
recordLimit: 12,
isUIEditable: true,
},
- };
+ });
store.set(
pageLayoutDraftState,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx
index 52de79d8e0a..8d1f000309d 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutDashboardWidgetTypeSelect.tsx
@@ -1,11 +1,8 @@
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
import { FIND_MANY_FRONT_COMPONENTS } from '@/front-components/graphql/queries/findManyFrontComponents';
import { useReadableObjectMetadataItems } from '@/object-metadata/hooks/useReadableObjectMetadataItems';
-import { useCreatePageLayoutFrontComponentWidget } from '@/page-layout/hooks/useCreatePageLayoutFrontComponentWidget';
import { useCreatePageLayoutGraphWidget } from '@/page-layout/hooks/useCreatePageLayoutGraphWidget';
-import { useCreatePageLayoutIframeWidget } from '@/page-layout/hooks/useCreatePageLayoutIframeWidget';
-import { useCreatePageLayoutRecordTableWidget } from '@/page-layout/hooks/useCreatePageLayoutRecordTableWidget';
-import { useCreatePageLayoutStandaloneRichTextWidget } from '@/page-layout/hooks/useCreatePageLayoutStandaloneRichTextWidget';
+import { useCreatePageLayoutWidget } from '@/page-layout/hooks/useCreatePageLayoutWidget';
import { useOpportunityDefaultChartConfig } from '@/page-layout/hooks/useOpportunityDefaultChartConfig';
import { useRemovePageLayoutWidgetAndPreservePosition } from '@/page-layout/hooks/useRemovePageLayoutWidgetAndPreservePosition';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
@@ -33,7 +30,12 @@ import {
IconFrame,
IconTable,
} from 'twenty-ui/icon';
-import { type FrontComponent, WidgetType } from '~/generated-metadata/graphql';
+import {
+ type FrontComponent,
+ PageLayoutType,
+ WidgetConfigurationType,
+ WidgetType,
+} from '~/generated-metadata/graphql';
export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {
const { pageLayoutId, recordId } = usePageLayoutIdFromContextStore();
@@ -60,26 +62,11 @@ export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {
tabListInstanceId,
});
- const { createPageLayoutIframeWidget } = useCreatePageLayoutIframeWidget({
+ const { createPageLayoutWidget } = useCreatePageLayoutWidget({
pageLayoutId,
tabListInstanceId,
});
- const { createPageLayoutStandaloneRichTextWidget } =
- useCreatePageLayoutStandaloneRichTextWidget({
- pageLayoutId,
- tabListInstanceId,
- });
-
- const { createPageLayoutFrontComponentWidget } =
- useCreatePageLayoutFrontComponentWidget({
- pageLayoutId,
- tabListInstanceId,
- });
-
- const { createPageLayoutRecordTableWidget } =
- useCreatePageLayoutRecordTableWidget(pageLayoutId);
-
const { removePageLayoutWidgetAndPreservePosition } =
useRemovePageLayoutWidgetAndPreservePosition(pageLayoutId);
@@ -156,7 +143,14 @@ export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {
removePageLayoutWidgetAndPreservePosition(pageLayoutEditingWidgetId);
}
- const newWidget = createPageLayoutIframeWidget(t`Untitled iFrame`, null);
+ const newWidget = createPageLayoutWidget({
+ type: WidgetType.IFRAME,
+ title: t`Untitled iFrame`,
+ configuration: {
+ configurationType: WidgetConfigurationType.IFRAME,
+ url: null,
+ },
+ });
setPageLayoutEditingWidgetId(newWidget.id);
}
@@ -177,9 +171,13 @@ export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {
removePageLayoutWidgetAndPreservePosition(pageLayoutEditingWidgetId);
}
- const newWidget = createPageLayoutStandaloneRichTextWidget({
- blocknote: '',
- markdown: null,
+ const newWidget = createPageLayoutWidget({
+ type: WidgetType.STANDALONE_RICH_TEXT,
+ title: 'Untitled Rich Text',
+ configuration: {
+ configurationType: WidgetConfigurationType.STANDALONE_RICH_TEXT,
+ body: { blocknote: '', markdown: null },
+ },
});
setPageLayoutEditingWidgetId(newWidget.id);
}
@@ -198,9 +196,15 @@ export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {
removePageLayoutWidgetAndPreservePosition(pageLayoutEditingWidgetId);
}
- const newRecordTableWidget = createPageLayoutRecordTableWidget(
- firstAvailableObjectMetadataItem,
- );
+ const newRecordTableWidget = createPageLayoutWidget({
+ type: WidgetType.RECORD_TABLE,
+ title: firstAvailableObjectMetadataItem?.labelPlural ?? 'Record Table',
+ configuration: {
+ configurationType: WidgetConfigurationType.RECORD_TABLE,
+ isUIEditable: pageLayoutDraft.type === PageLayoutType.RECORD_PAGE,
+ },
+ objectMetadataId: firstAvailableObjectMetadataItem?.id,
+ });
setPageLayoutEditingWidgetId(newRecordTableWidget.id);
@@ -227,10 +231,15 @@ export const SidePanelPageLayoutDashboardWidgetTypeSelect = () => {
removePageLayoutWidgetAndPreservePosition(pageLayoutEditingWidgetId);
}
- const newWidget = createPageLayoutFrontComponentWidget(
- frontComponent.name,
- frontComponent.id,
- );
+ const newWidget = createPageLayoutWidget({
+ type: WidgetType.FRONT_COMPONENT,
+ title: frontComponent.name,
+ configuration: {
+ __typename: 'FrontComponentConfiguration',
+ configurationType: WidgetConfigurationType.FRONT_COMPONENT,
+ frontComponentId: frontComponent.id,
+ },
+ });
setPageLayoutEditingWidgetId(newWidget.id);
}
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx
index e83d92baf8c..997ea5d7988 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsPlacementSection.tsx
@@ -1,7 +1,6 @@
import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
import { CommandMenuItemDropdown } from '@/command-menu/components/CommandMenuItemDropdown';
-import { useMovePageLayoutWidgetDown } from '@/page-layout/hooks/useMovePageLayoutWidgetDown';
-import { useMovePageLayoutWidgetUp } from '@/page-layout/hooks/useMovePageLayoutWidgetUp';
+import { useMovePageLayoutWidget } from '@/page-layout/hooks/useMovePageLayoutWidget';
import { widgetInsertionContextComponentState } from '@/page-layout/states/widgetInsertionContextComponentState';
import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';
import { MoveToTabDropdownContent } from '@/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent';
@@ -44,9 +43,7 @@ export const WidgetSettingsPlacementSection = ({
const store = useStore();
- const { movePageLayoutWidgetUp } = useMovePageLayoutWidgetUp(pageLayoutId);
- const { movePageLayoutWidgetDown } =
- useMovePageLayoutWidgetDown(pageLayoutId);
+ const { movePageLayoutWidget } = useMovePageLayoutWidget(pageLayoutId);
const { navigatePageLayoutSidePanel } = useNavigatePageLayoutSidePanel();
if (!isPlacementSectionVisible || !isDefined(pageLayoutEditingWidgetId)) {
@@ -54,11 +51,11 @@ export const WidgetSettingsPlacementSection = ({
}
const handleMoveUp = () => {
- movePageLayoutWidgetUp(pageLayoutEditingWidgetId);
+ movePageLayoutWidget(pageLayoutEditingWidgetId, 'up');
};
const handleMoveDown = () => {
- movePageLayoutWidgetDown(pageLayoutEditingWidgetId);
+ movePageLayoutWidget(pageLayoutEditingWidgetId, 'down');
};
const handleAddWidgetAbove = () => {
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement.ts b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement.ts
index 1fa96f2d864..2c7556a1e4d 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement.ts
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/hooks/useWidgetSettingsPlacement.ts
@@ -1,5 +1,4 @@
-import { useCanMovePageLayoutWidgetDown } from '@/page-layout/hooks/useCanMovePageLayoutWidgetDown';
-import { useCanMovePageLayoutWidgetUp } from '@/page-layout/hooks/useCanMovePageLayoutWidgetUp';
+import { useCanMovePageLayoutWidget } from '@/page-layout/hooks/useCanMovePageLayoutWidget';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
import { shouldShowAddWidgetBelow } from '@/side-panel/pages/page-layout/utils/shouldShowAddWidgetBelow';
@@ -28,10 +27,7 @@ export const useWidgetSettingsPlacement = (
pageLayoutId,
);
- const { canMovePageLayoutWidgetUp } =
- useCanMovePageLayoutWidgetUp(pageLayoutId);
- const { canMovePageLayoutWidgetDown } =
- useCanMovePageLayoutWidgetDown(pageLayoutId);
+ const { canMovePageLayoutWidget } = useCanMovePageLayoutWidget(pageLayoutId);
const currentTabAndWidget = pageLayoutDraft.tabs
.map((tab) => ({
@@ -65,7 +61,7 @@ export const useWidgetSettingsPlacement = (
isPlacementSectionVisible: true,
pageLayoutEditingWidgetId,
showAddWidgetBelow: shouldShowAddWidgetBelow(currentWidget),
- showMoveDown: canMovePageLayoutWidgetDown(pageLayoutEditingWidgetId),
- showMoveUp: canMovePageLayoutWidgetUp(pageLayoutEditingWidgetId),
+ showMoveDown: canMovePageLayoutWidget(pageLayoutEditingWidgetId, 'down'),
+ showMoveUp: canMovePageLayoutWidget(pageLayoutEditingWidgetId, 'up'),
};
};