Skip to content

The open alternative to Salesforce, designed for AI.

Clean up the conversations, Ask and 2.44 chat-thread code (#26931)

Félix Malfaitc811965c305d
diff --git a/packages/twenty-front/src/modules/page-layout/constants/WidgetTypeRequiredFeatureFlag.ts b/packages/twenty-front/src/modules/page-layout/constants/WidgetTypeRequiredFeatureFlag.ts
deleted file mode 100644
index a16a42c9b80..00000000000
--- a/packages/twenty-front/src/modules/page-layout/constants/WidgetTypeRequiredFeatureFlag.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { FeatureFlagKey, WidgetType } from '~/generated-metadata/graphql';
-
-// A widget type still rolling out renders only where its flag is on, whatever
-// layout holds it, including one shipped by an app.
-export const WIDGET_TYPE_REQUIRED_FEATURE_FLAG: Partial<
- Record<WidgetType, FeatureFlagKey>
-> = {
- [WidgetType.CHAT_THREADS]: FeatureFlagKey.IS_CONVERSATIONS_TAB_ENABLED,
-};
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
index df307bdc612..8e727d2c289 100644
--- 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
@@ -2,7 +2,6 @@ import { useCanMovePageLayoutWidget } from '@/page-layout/hooks/useCanMovePageLa
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
import {
makeDraft,
- makeFlagGatedWidget,
makeTab,
makeWidget,
} from '@/page-layout/testing/pageLayoutDraftFixtures';
@@ -115,32 +114,6 @@ describe('useCanMovePageLayoutWidget', () => {
).toBe(false);
});
- it(`should return false when only a widget feature flags hide is ${adjacentPosition} it`, () => {
- const store = createStore();
-
- const flagGatedWidgets = {
- up: [
- makeFlagGatedWidget('flag-gated-widget', 0),
- makeWidget('widget-a', 1),
- ],
- down: [
- makeWidget('widget-a', 0),
- makeFlagGatedWidget('flag-gated-widget', 1),
- ],
- };
-
- store.set(
- getDraftAtom(),
- makeDraft([makeTab('tab-1', flagGatedWidgets[direction])]),
- );
-
- const { result } = renderCanMoveHook(store);
-
- expect(
- result.current.canMovePageLayoutWidget('widget-a', direction),
- ).toBe(false);
- });
-
it('should return false when widget is not found', () => {
const store = createStore();
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutTab.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutTab.test.tsx
index 4a9e1df5b71..074c1dfe9db 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutTab.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useMovePageLayoutTab.test.tsx
@@ -1,13 +1,9 @@
import { useMovePageLayoutTab } from '@/page-layout/hooks/useMovePageLayoutTab';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';
import {
makeDraft,
- makeFlagGatedWidget,
makeTab,
- makeWidget,
} from '@/page-layout/testing/pageLayoutDraftFixtures';
-import { type PageLayout } from '@/page-layout/types/PageLayout';
import { sortTabsByPosition } from '@/page-layout/utils/sortTabsByPosition';
import { act, renderHook } from '@testing-library/react';
import { createStore } from 'jotai';
@@ -18,10 +14,7 @@ import {
PageLayoutTestWrapper,
} from './PageLayoutTestWrapper';
-const renderUseMovePageLayoutTab = (
- tabs: ReturnType<typeof makeTab>[],
- persistedTabs: ReturnType<typeof makeTab>[] = tabs,
-) => {
+const renderUseMovePageLayoutTab = (tabs: ReturnType<typeof makeTab>[]) => {
const store = createStore();
store.set(
@@ -30,12 +23,6 @@ const renderUseMovePageLayoutTab = (
}),
makeDraft(tabs),
);
- store.set(
- pageLayoutPersistedComponentState.atomFamily({
- instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
- }),
- makeDraft(persistedTabs) as PageLayout,
- );
const { result } = renderHook(() => useMovePageLayoutTab(), {
wrapper: ({ children }: { children: ReactNode }) => (
@@ -92,51 +79,6 @@ describe('useMovePageLayoutTab', () => {
expect(getActiveTabIds()).toEqual(['tab-3', 'tab-1']);
});
- it('should skip a tab feature flags hide standing between two rendered tabs', () => {
- const { result, getActiveTabIds } = renderUseMovePageLayoutTab([
- makeTab('tab-1', [], 0),
- makeTab(
- 'flag-gated-tab',
- [makeFlagGatedWidget('flag-gated-widget', 0, 'flag-gated-tab')],
- 1,
- ),
- makeTab('tab-3', [], 2),
- ]);
-
- act(() => result.current.moveLeft('tab-3'));
-
- expect(getActiveTabIds()).toEqual(['tab-3', 'flag-gated-tab', 'tab-1']);
- });
-
- it('should still swap with a tab the edit left with only flag-gated widgets', () => {
- const flagGatedWidget = makeFlagGatedWidget(
- 'flag-gated-widget',
- 0,
- 'tab-2',
- );
-
- const { result, getActiveTabIds } = renderUseMovePageLayoutTab(
- [
- makeTab('tab-1', [], 0),
- makeTab('tab-2', [flagGatedWidget], 1),
- makeTab('tab-3', [], 2),
- ],
- [
- makeTab('tab-1', [], 0),
- makeTab(
- 'tab-2',
- [flagGatedWidget, makeWidget('widget', 1, 'tab-2')],
- 1,
- ),
- makeTab('tab-3', [], 2),
- ],
- );
-
- act(() => result.current.moveLeft('tab-3'));
-
- expect(getActiveTabIds()).toEqual(['tab-1', 'tab-3', 'tab-2']);
- });
-
it('should leave the first and last rendered tabs where they are', () => {
const { result, getActiveTabIds } = renderUseMovePageLayoutTab([
makeTab('tab-1', [], 0),
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
index 28cc6f310c9..8fdfbd7e364 100644
--- 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
@@ -2,7 +2,6 @@ import { useMovePageLayoutWidget } from '@/page-layout/hooks/useMovePageLayoutWi
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
import {
makeDraft,
- makeFlagGatedWidget,
makeTab,
makeWidget,
} from '@/page-layout/testing/pageLayoutDraftFixtures';
@@ -141,34 +140,6 @@ describe('useMovePageLayoutWidget', () => {
).toEqual([0, 1, 2]);
});
- it('should skip a widget feature flags hide', () => {
- const store = createStore();
-
- store.set(
- getDraftAtom(),
- makeDraft([
- makeTab('tab-1', [
- makeWidget('widget-a', 0),
- makeFlagGatedWidget('flag-gated-widget', 1),
- makeWidget('widget-b', 2),
- ]),
- ]),
- );
-
- const { result } = renderMoveHook(store);
-
- act(() => {
- result.current.movePageLayoutWidget(movedWidgetId, direction);
- });
-
- expect(
- store
- .get(getDraftAtom())
- .tabs[0].widgets.map((widget) => widget.id)
- .filter((widgetId) => widgetId !== 'flag-gated-widget'),
- ).toEqual(['widget-b', 'widget-a']);
- });
-
it('should not move a viewport-filling widget', () => {
const store = createStore();
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidget.ts
index 76a7889f885..a5137ddecdb 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCanMovePageLayoutWidget.ts
@@ -1,9 +1,9 @@
import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { getWidgetMoveWithinTab } from '@/page-layout/utils/getWidgetMoveWithinTab';
+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 { useWorkspaceFeatureFlagsMap } from '@/workspace/hooks/useWorkspaceFeatureFlagsMap';
import { useStore } from 'jotai';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
@@ -22,8 +22,6 @@ export const useCanMovePageLayoutWidget = (pageLayoutIdFromProps?: string) => {
const store = useStore();
- const featureFlags = useWorkspaceFeatureFlagsMap();
-
const canMovePageLayoutWidget = useCallback(
(widgetId: string, direction: 'up' | 'down') => {
const draft = store.get(pageLayoutDraftState);
@@ -36,16 +34,21 @@ export const useCanMovePageLayoutWidget = (pageLayoutIdFromProps?: string) => {
return false;
}
+ const sortedWidgets = sortWidgetsByVerticalListPosition(tab.widgets);
+
+ const widgetIndex = sortedWidgets.findIndex(
+ (widget) => widget.id === widgetId,
+ );
+
return isDefined(
- getWidgetMoveWithinTab({
- widgets: tab.widgets,
- widgetId,
+ getAdjacentFitContentWidgetIndex({
+ widgets: sortedWidgets,
+ widgetIndex,
direction,
- featureFlags,
}),
);
},
- [featureFlags, pageLayoutDraftState, store],
+ [pageLayoutDraftState, store],
);
return { canMovePageLayoutWidget };
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCurrentPageLayout.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCurrentPageLayout.ts
index be2a383a9d8..4b1c4ba210c 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCurrentPageLayout.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCurrentPageLayout.ts
@@ -23,5 +23,5 @@ export const useCurrentPageLayout = () => {
: pageLayoutPersisted
: pageLayoutPersisted;
- return { currentPageLayout, pageLayoutPersisted };
+ return { currentPageLayout };
};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCurrentPageLayoutOrThrow.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCurrentPageLayoutOrThrow.ts
index 279f29f77aa..6d3e720027d 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCurrentPageLayoutOrThrow.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCurrentPageLayoutOrThrow.ts
@@ -2,11 +2,11 @@ import { useCurrentPageLayout } from '@/page-layout/hooks/useCurrentPageLayout';
import { isDefined } from 'twenty-shared/utils';
export const useCurrentPageLayoutOrThrow = () => {
- const { currentPageLayout, pageLayoutPersisted } = useCurrentPageLayout();
+ const { currentPageLayout } = useCurrentPageLayout();
if (!isDefined(currentPageLayout)) {
throw new Error('No current page layout found');
}
- return { currentPageLayout, pageLayoutPersisted };
+ return { currentPageLayout };
};
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useDeletePageLayoutTab.ts b/packages/twenty-front/src/modules/page-layout/hooks/useDeletePageLayoutTab.ts
index ad421b2de81..5f4e016a239 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useDeletePageLayoutTab.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useDeletePageLayoutTab.ts
@@ -1,12 +1,9 @@
import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';
-import { isPageLayoutTabHiddenByFeatureFlags } from '@/page-layout/utils/isPageLayoutTabHiddenByFeatureFlags';
import { sortTabsByPosition } from '@/page-layout/utils/sortTabsByPosition';
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 { useWorkspaceFeatureFlagsMap } from '@/workspace/hooks/useWorkspaceFeatureFlagsMap';
import { useStore } from 'jotai';
import { useCallback } from 'react';
@@ -27,15 +24,8 @@ export const useDeletePageLayoutTab = ({
pageLayoutId,
);
- const pageLayoutPersistedState = useAtomComponentStateCallbackState(
- pageLayoutPersistedComponentState,
- pageLayoutId,
- );
-
const store = useStore();
- const featureFlags = useWorkspaceFeatureFlagsMap();
-
const activeTabIdAtom = activeTabIdComponentState.atomFamily({
instanceId: tabListInstanceId,
});
@@ -43,18 +33,7 @@ export const useDeletePageLayoutTab = ({
const deleteTab = useCallback(
(tabId: string) => {
const draft = store.get(pageLayoutDraftState);
- const persistedTabs = store.get(pageLayoutPersistedState)?.tabs;
- // A tab feature flags hide can neither be the last one standing nor take
- // over as the active tab.
- const activeTabs = draft.tabs.filter(
- (t) =>
- t.isActive &&
- !isPageLayoutTabHiddenByFeatureFlags({
- tabId: t.id,
- persistedTabs,
- featureFlags,
- }),
- );
+ const activeTabs = draft.tabs.filter((t) => t.isActive);
if (activeTabs.length <= 1) {
return;
@@ -79,13 +58,7 @@ export const useDeletePageLayoutTab = ({
store.set(activeTabIdAtom, nextActiveId);
}
},
- [
- pageLayoutDraftState,
- pageLayoutPersistedState,
- activeTabIdAtom,
- featureFlags,
- store,
- ],
+ [pageLayoutDraftState, activeTabIdAtom, store],
);
return { deleteTab };
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutTab.ts b/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutTab.ts
index e23cefc0db7..36885d3b588 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutTab.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutTab.ts
@@ -1,11 +1,8 @@
import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';
-import { isPageLayoutTabHiddenByFeatureFlags } from '@/page-layout/utils/isPageLayoutTabHiddenByFeatureFlags';
import { sortTabsByPosition } from '@/page-layout/utils/sortTabsByPosition';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
-import { useWorkspaceFeatureFlagsMap } from '@/workspace/hooks/useWorkspaceFeatureFlagsMap';
import { useStore } from 'jotai';
import { useCallback } from 'react';
@@ -20,33 +17,16 @@ export const useMovePageLayoutTab = (pageLayoutIdFromProps?: string) => {
pageLayoutId,
);
- const pageLayoutPersistedState = useAtomComponentStateCallbackState(
- pageLayoutPersistedComponentState,
- pageLayoutId,
- );
-
const store = useStore();
- const featureFlags = useWorkspaceFeatureFlagsMap();
-
- // Deleting a tab only deactivates it in the draft and feature flags can hide
- // one, so only a rendered tab may become the neighbour a move swaps
- // positions with: any other would leave the rendered order untouched.
+ // Deleting a tab only deactivates it in the draft, so an inactive tab must
+ // not become the neighbour a move swaps positions with: that would leave the
+ // rendered order untouched.
const swapWithNeighborTab = useCallback(
(tabId: string, offset: -1 | 1) => {
- const persistedTabs = store.get(pageLayoutPersistedState)?.tabs;
-
store.set(pageLayoutDraftState, (prev) => {
const sortedActiveTabs = sortTabsByPosition(
- prev.tabs.filter(
- (tab) =>
- tab.isActive &&
- !isPageLayoutTabHiddenByFeatureFlags({
- tabId: tab.id,
- persistedTabs,
- featureFlags,
- }),
- ),
+ prev.tabs.filter((tab) => tab.isActive),
);
const index = sortedActiveTabs.findIndex((tab) => tab.id === tabId);
const neighborIndex = index + offset;
@@ -76,7 +56,7 @@ export const useMovePageLayoutTab = (pageLayoutIdFromProps?: string) => {
};
});
},
- [featureFlags, pageLayoutDraftState, pageLayoutPersistedState, store],
+ [pageLayoutDraftState, store],
);
const moveLeft = useCallback(
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidget.ts
index d74301d8877..643f7c4c8cd 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useMovePageLayoutWidget.ts
@@ -1,10 +1,10 @@
import { PageLayoutComponentInstanceContext } from '@/page-layout/states/contexts/PageLayoutComponentInstanceContext';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { getWidgetMoveWithinTab } from '@/page-layout/utils/getWidgetMoveWithinTab';
+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 { useWorkspaceFeatureFlagsMap } from '@/workspace/hooks/useWorkspaceFeatureFlagsMap';
import { useStore } from 'jotai';
import { useCallback } from 'react';
import { isDefined } from 'twenty-shared/utils';
@@ -22,8 +22,6 @@ export const useMovePageLayoutWidget = (pageLayoutIdFromProps?: string) => {
const store = useStore();
- const featureFlags = useWorkspaceFeatureFlagsMap();
-
const movePageLayoutWidget = useCallback(
(widgetId: string, direction: 'up' | 'down') => {
store.set(pageLayoutDraftState, (prev) => {
@@ -35,24 +33,28 @@ export const useMovePageLayoutWidget = (pageLayoutIdFromProps?: string) => {
return prev;
}
- const widgetMove = getWidgetMoveWithinTab({
- widgets: tab.widgets,
- widgetId,
+ const sortedWidgets = sortWidgetsByVerticalListPosition(tab.widgets);
+ const currentIndex = sortedWidgets.findIndex(
+ (widget) => widget.id === widgetId,
+ );
+ const targetIndex = getAdjacentFitContentWidgetIndex({
+ widgets: sortedWidgets,
+ widgetIndex: currentIndex,
direction,
- featureFlags,
});
- if (!isDefined(widgetMove)) {
+ if (!isDefined(targetIndex)) {
return prev;
}
return moveWidgetWithinTabInDraft(prev, {
tabId: tab.id,
- ...widgetMove,
+ fromIndex: currentIndex,
+ toIndex: targetIndex,
});
});
},
- [featureFlags, pageLayoutDraftState, store],
+ [pageLayoutDraftState, store],
);
return { movePageLayoutWidget };
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutRenderableTabs.ts b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutRenderableTabs.ts
index 853718f77f9..23565aa4a0f 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutRenderableTabs.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutRenderableTabs.ts
@@ -17,8 +17,7 @@ export const usePageLayoutRenderableTabs = () => {
const isMobile = useIsMobile();
const { targetRecordIdentifier } = useLayoutRenderingContext();
const isInSidePanel = useWorkspaceSurface().type === 'side-panel';
- const { currentPageLayout, pageLayoutPersisted } =
- useCurrentPageLayoutOrThrow();
+ const { currentPageLayout } = useCurrentPageLayoutOrThrow();
const isPageLayoutInEditMode = useIsPageLayoutInEditMode();
const { objectMetadataItems } = useObjectMetadataItems();
const widgetVisibilityContext = useWidgetVisibilityContext();
@@ -32,7 +31,6 @@ export const usePageLayoutRenderableTabs = () => {
const tabsWithVisibleWidgets = getTabsWithVisibleWidgets({
tabs: currentPageLayout.tabs,
- persistedTabs: pageLayoutPersisted?.tabs,
isEditMode: isPageLayoutInEditMode,
context: widgetVisibilityContext,
});
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutTabWithVisibleWidgetsOrThrow.ts b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutTabWithVisibleWidgetsOrThrow.ts
index 0afe0d0237a..02d07545b3a 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutTabWithVisibleWidgetsOrThrow.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutTabWithVisibleWidgetsOrThrow.ts
@@ -3,7 +3,6 @@ import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutIn
import { useWidgetVisibilityContext } from '@/page-layout/hooks/useWidgetVisibilityContext';
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
import { filterVisibleWidgets } from '@/page-layout/utils/filterVisibleWidgets';
-import { isWidgetEnabledByFeatureFlags } from '@/page-layout/utils/isWidgetEnabledByFeatureFlags';
import { sortWidgetsByVerticalListPosition } from '@/page-layout/utils/sortWidgetsByVerticalListPosition';
import { useMemo } from 'react';
import { isDefined } from 'twenty-shared/utils';
@@ -28,12 +27,7 @@ export const usePageLayoutTabWithVisibleWidgetsOrThrow = (
const activeWidgets = tab.widgets.filter((widget) => widget.isActive);
const widgets = isPageLayoutInEditMode
- ? activeWidgets.filter((widget) =>
- isWidgetEnabledByFeatureFlags({
- widget,
- featureFlags: widgetVisibilityContext.featureFlags,
- }),
- )
+ ? activeWidgets
: filterVisibleWidgets({
widgets: activeWidgets,
context: widgetVisibilityContext,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutWidgetDragAndDrop.ts b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutWidgetDragAndDrop.ts
index 5be270b32ed..40484799661 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutWidgetDragAndDrop.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutWidgetDragAndDrop.ts
@@ -6,7 +6,6 @@ import { PageLayoutComponentInstanceContext } from '@/page-layout/states/context
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
import { pageLayoutDraggingWidgetIdComponentState } from '@/page-layout/states/pageLayoutDraggingWidgetIdComponentState';
import { type PageLayoutWidgetDndData } from '@/page-layout/types/PageLayoutWidgetDndData';
-import { getWidgetIndexInDraftTab } from '@/page-layout/utils/getWidgetIndexInDraftTab';
import { moveWidgetToTabInDraft } from '@/page-layout/utils/moveWidgetToTabInDraft';
import { moveWidgetWithinTabInDraft } from '@/page-layout/utils/moveWidgetWithinTabInDraft';
import { reorderTabInDraft } from '@/page-layout/utils/reorderTabInDraft';
@@ -125,7 +124,7 @@ export const usePageLayoutWidgetDragAndDrop = (
sourceData?.type === 'widget' &&
isDefined(targetData)
) {
- const { widgetId, tabId: sourceTabId } = sourceData;
+ const { widgetId, tabId: sourceTabId, index: sourceIndex } = sourceData;
if (targetData.type === 'tab-widget-drop') {
const destinationTabId = targetData.tabId;
@@ -154,7 +153,7 @@ export const usePageLayoutWidgetDragAndDrop = (
return moveWidgetWithinTabInDraft(prev, {
tabId: sourceTabId,
- fromIndex: getWidgetIndexInDraftTab({ tab, widgetId }),
+ fromIndex: sourceIndex,
toIndex: tab.widgets.length - 1,
});
});
@@ -168,47 +167,15 @@ export const usePageLayoutWidgetDragAndDrop = (
});
if (isDefined(resolvedDrop)) {
- const isDroppedAfterTarget =
- resolvedDrop.dropTargetIndex > targetData.index;
-
- // The rendered list leaves out the widgets feature flags hide, so
- // its indices are carried over to the draft through the widgets
- // they point at.
- store.set(pageLayoutDraftState, (prev) => {
- const sourceTab = prev.tabs.find(
- (candidateTab) => candidateTab.id === sourceTabId,
- );
- const destinationTab = prev.tabs.find(
- (candidateTab) => candidateTab.id === destinationTabId,
- );
-
- if (!isDefined(sourceTab) || !isDefined(destinationTab)) {
- return prev;
- }
-
- const sourceIndex = getWidgetIndexInDraftTab({
- tab: sourceTab,
- widgetId,
- });
- const targetIndex = getWidgetIndexInDraftTab({
- tab: destinationTab,
- widgetId: targetData.widgetId,
- });
-
- if (sourceIndex < 0 || targetIndex < 0) {
- return prev;
- }
-
- const destinationIndex = getDestinationIndex({
- dropTargetIndex: isDroppedAfterTarget
- ? targetIndex + 1
- : targetIndex,
- sourceIndex,
- sourceDroppableId: sourceTabId,
- destinationDroppableId: destinationTabId,
- });
+ const destinationIndex = getDestinationIndex({
+ dropTargetIndex: resolvedDrop.dropTargetIndex,
+ sourceIndex,
+ sourceDroppableId: sourceTabId,
+ destinationDroppableId: destinationTabId,
+ });
- return destinationTabId === sourceTabId
+ store.set(pageLayoutDraftState, (prev) =>
+ destinationTabId === sourceTabId
? moveWidgetWithinTabInDraft(prev, {
tabId: sourceTabId,
fromIndex: sourceIndex,
@@ -218,8 +185,8 @@ export const usePageLayoutWidgetDragAndDrop = (
widgetId,
destinationTabId,
destinationIndex,
- });
- });
+ }),
+ );
}
}
}
diff --git a/packages/twenty-front/src/modules/page-layout/testing/pageLayoutDraftFixtures.ts b/packages/twenty-front/src/modules/page-layout/testing/pageLayoutDraftFixtures.ts
index 0aaeca6dd7a..b6a3bcffcee 100644
--- a/packages/twenty-front/src/modules/page-layout/testing/pageLayoutDraftFixtures.ts
+++ b/packages/twenty-front/src/modules/page-layout/testing/pageLayoutDraftFixtures.ts
@@ -4,7 +4,6 @@ import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import {
PageLayoutTabLayoutMode,
PageLayoutType,
- PageLayoutWidgetVerticalListHeightBehavior,
WidgetType,
} from '~/generated-metadata/graphql';
@@ -30,25 +29,6 @@ export const makeWidget = (
deletedAt: null,
}) as unknown as PageLayoutWidget;
-// Hidden unless the workspace has the flag, which no test store sets. Fit
-// content, since moves already skip a viewport-filling widget, flag or not.
-export const makeFlagGatedWidget = (
- id: string,
- index: number,
- tabId = 'tab-1',
-): PageLayoutWidget =>
- ({
- ...makeWidget(id, index, tabId),
- type: WidgetType.CHAT_THREADS,
- configuration: { __typename: 'ChatThreadsConfiguration' as const },
- position: {
- __typename: 'PageLayoutWidgetVerticalListPosition' as const,
- layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
- index,
- heightBehavior: PageLayoutWidgetVerticalListHeightBehavior.FIT_CONTENT,
- },
- }) as unknown as PageLayoutWidget;
-
export const makeTab = (
id: string,
widgets: PageLayoutWidget[],
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getIsSingleWidgetTab.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getIsSingleWidgetTab.test.ts
index e165013fcb8..6d109465b18 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getIsSingleWidgetTab.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getIsSingleWidgetTab.test.ts
@@ -1,7 +1,4 @@
-import {
- makeFlagGatedWidget,
- makeWidget,
-} from '@/page-layout/testing/pageLayoutDraftFixtures';
+import { makeWidget } from '@/page-layout/testing/pageLayoutDraftFixtures';
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { getIsSingleWidgetTab } from '@/page-layout/utils/getIsSingleWidgetTab';
@@ -21,7 +18,6 @@ describe('getIsSingleWidgetTab', () => {
it('returns true for a list tab holding a single active widget', () => {
expect(
getIsSingleWidgetTab({
- featureFlags: {},
tab: tabWith(PageLayoutTabLayoutMode.VERTICAL_LIST, [
widget('widget-1', true),
]),
@@ -32,7 +28,6 @@ describe('getIsSingleWidgetTab', () => {
it('ignores inactive widgets', () => {
expect(
getIsSingleWidgetTab({
- featureFlags: {},
tab: tabWith(PageLayoutTabLayoutMode.VERTICAL_LIST, [
widget('widget-1', true),
widget('widget-2', false),
@@ -41,22 +36,9 @@ describe('getIsSingleWidgetTab', () => {
).toBe(true);
});
- it('ignores widgets feature flags hide', () => {
- expect(
- getIsSingleWidgetTab({
- featureFlags: {},
- tab: tabWith(PageLayoutTabLayoutMode.VERTICAL_LIST, [
- makeFlagGatedWidget('flag-gated-widget', 0),
- widget('widget-1', true),
- ]),
- }),
- ).toBe(true);
- });
-
it('returns false when several widgets are active', () => {
expect(
getIsSingleWidgetTab({
- featureFlags: {},
tab: tabWith(PageLayoutTabLayoutMode.VERTICAL_LIST, [
widget('widget-1', true),
widget('widget-2', true),
@@ -68,7 +50,6 @@ describe('getIsSingleWidgetTab', () => {
it('returns false for an empty tab', () => {
expect(
getIsSingleWidgetTab({
- featureFlags: {},
tab: tabWith(PageLayoutTabLayoutMode.VERTICAL_LIST, []),
}),
).toBe(false);
@@ -77,7 +58,6 @@ describe('getIsSingleWidgetTab', () => {
it('returns false for grid tabs', () => {
expect(
getIsSingleWidgetTab({
- featureFlags: {},
tab: tabWith(PageLayoutTabLayoutMode.GRID, [widget('widget-1', true)]),
}),
).toBe(false);
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts
index b69186815ba..af97a5d7d02 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts
@@ -443,140 +443,4 @@ describe('getTabsWithVisibleWidgets', () => {
expect(result[0].id).toBe('always');
});
});
- describe('with feature flags', () => {
- const createChatThreadsWidget = (
- id: string,
- ): PageLayoutTab['widgets'][0] => ({
- ...createMockWidget(id),
- type: WidgetType.CHAT_THREADS,
- });
-
- const buildTabs = () => [
- createMockTab('emails', [createMockWidget('emails-widget')]),
- createMockTab('conversations', [
- createChatThreadsWidget('conversations-widget'),
- ]),
- ];
-
- const getRenderedWidgetIds = (tabs: PageLayoutTab[]) =>
- tabs.map((tab) => [tab.id, tab.widgets.map((widget) => widget.id)]);
-
- it('should hide the conversations tab while the flag is off', () => {
- const result = getTabsWithVisibleWidgets({
- tabs: buildTabs(),
- isEditMode: false,
- context: buildWidgetVisibilityContext({
- isMobile: false,
- isInSidePanel: false,
- }),
- });
-
- expect(getRenderedWidgetIds(result)).toEqual([
- ['emails', ['emails-widget']],
- ]);
- });
-
- it('should show the conversations tab while the flag is on', () => {
- const result = getTabsWithVisibleWidgets({
- tabs: buildTabs(),
- isEditMode: false,
- context: buildWidgetVisibilityContext({
- isMobile: false,
- isInSidePanel: false,
- featureFlags: { IS_CONVERSATIONS_TAB_ENABLED: true },
- }),
- });
-
- expect(getRenderedWidgetIds(result)).toEqual([
- ['emails', ['emails-widget']],
- ['conversations', ['conversations-widget']],
- ]);
- });
-
- it('should apply feature flags in edit mode but keep device conditions and empty tabs', () => {
- const tabs = [
- ...buildTabs(),
- createMockTab('mobile-only', [
- {
- ...createMockWidget('mobile-widget'),
- conditionalAvailabilityExpression: 'device == "MOBILE"',
- },
- ]),
- createMockTab('empty', []),
- ];
-
- const result = getTabsWithVisibleWidgets({
- tabs,
- persistedTabs: tabs,
- isEditMode: true,
- context: buildWidgetVisibilityContext({
- isMobile: false,
- isInSidePanel: false,
- }),
- });
-
- expect(getRenderedWidgetIds(result)).toEqual([
- ['emails', ['emails-widget']],
- ['mobile-only', ['mobile-widget']],
- ['empty', []],
- ]);
- });
-
- it('should keep a tab in edit mode once the edit leaves it with only flag-gated widgets', () => {
- const conversationsWidget = createChatThreadsWidget(
- 'conversations-widget',
- );
- const persistedTabs = [
- createMockTab('emails', [
- conversationsWidget,
- createMockWidget('emails-widget'),
- ]),
- ];
-
- const result = getTabsWithVisibleWidgets({
- tabs: [createMockTab('emails', [conversationsWidget])],
- persistedTabs,
- isEditMode: true,
- context: buildWidgetVisibilityContext({
- isMobile: false,
- isInSidePanel: false,
- }),
- });
-
- expect(getRenderedWidgetIds(result)).toEqual([['emails', []]]);
- });
-
- it('should hide a chat threads widget without the flag, whatever its layout', () => {
- const tabs = [
- createMockTab('tab-1', [
- createMockWidget('fields-widget'),
- createChatThreadsWidget('conversations-widget'),
- ]),
- ];
-
- const readResult = getTabsWithVisibleWidgets({
- tabs,
- isEditMode: false,
- context: buildWidgetVisibilityContext({
- isMobile: false,
- isInSidePanel: false,
- }),
- });
- const editResult = getTabsWithVisibleWidgets({
- tabs,
- isEditMode: true,
- context: buildWidgetVisibilityContext({
- isMobile: false,
- isInSidePanel: false,
- }),
- });
-
- expect(getRenderedWidgetIds(readResult)).toEqual([
- ['tab-1', ['fields-widget']],
- ]);
- expect(getRenderedWidgetIds(editResult)).toEqual([
- ['tab-1', ['fields-widget']],
- ]);
- });
- });
});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getWidgetIndexInDraftTab.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getWidgetIndexInDraftTab.test.ts
deleted file mode 100644
index c8680bbcc7d..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getWidgetIndexInDraftTab.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { makeWidget } from '@/page-layout/testing/pageLayoutDraftFixtures';
-import { getWidgetIndexInDraftTab } from '@/page-layout/utils/getWidgetIndexInDraftTab';
-
-describe('getWidgetIndexInDraftTab', () => {
- const tab = {
- widgets: [
- makeWidget('widget-c', 2),
- makeWidget('widget-a', 0),
- makeWidget('widget-b', 1),
- ],
- };
-
- it('should index a widget by its vertical list position', () => {
- expect(getWidgetIndexInDraftTab({ tab, widgetId: 'widget-a' })).toBe(0);
- expect(getWidgetIndexInDraftTab({ tab, widgetId: 'widget-c' })).toBe(2);
- });
-
- it('should return -1 for a widget outside the tab', () => {
- expect(getWidgetIndexInDraftTab({ tab, widgetId: 'widget-d' })).toBe(-1);
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getWidgetMoveWithinTab.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getWidgetMoveWithinTab.test.ts
deleted file mode 100644
index f3932b4de8d..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getWidgetMoveWithinTab.test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {
- makeFlagGatedWidget,
- makeWidget,
-} from '@/page-layout/testing/pageLayoutDraftFixtures';
-import { getWidgetMoveWithinTab } from '@/page-layout/utils/getWidgetMoveWithinTab';
-import { WidgetType } from '~/generated-metadata/graphql';
-
-describe('getWidgetMoveWithinTab', () => {
- const widgets = [
- makeWidget('widget-a', 0),
- makeFlagGatedWidget('flag-gated-widget', 1),
- makeWidget('widget-b', 2),
- { ...makeWidget('timeline-widget', 3), type: WidgetType.TIMELINE },
- ];
-
- it('should move past a widget feature flags hide to the rendered neighbour', () => {
- expect(
- getWidgetMoveWithinTab({
- widgets,
- widgetId: 'widget-b',
- direction: 'up',
- featureFlags: {},
- }),
- ).toEqual({ fromIndex: 2, toIndex: 0 });
- expect(
- getWidgetMoveWithinTab({
- widgets,
- widgetId: 'widget-a',
- direction: 'down',
- featureFlags: {},
- }),
- ).toEqual({ fromIndex: 0, toIndex: 2 });
- });
-
- it('should swap with the adjacent widget once the flag is on', () => {
- expect(
- getWidgetMoveWithinTab({
- widgets,
- widgetId: 'widget-b',
- direction: 'up',
- featureFlags: { IS_CONVERSATIONS_TAB_ENABLED: true },
- }),
- ).toEqual({ fromIndex: 2, toIndex: 1 });
- });
-
- it('should not move past the viewport-filling widget or the list ends', () => {
- expect(
- getWidgetMoveWithinTab({
- widgets,
- widgetId: 'widget-b',
- direction: 'down',
- featureFlags: {},
- }),
- ).toBeUndefined();
- expect(
- getWidgetMoveWithinTab({
- widgets,
- widgetId: 'widget-a',
- direction: 'up',
- featureFlags: {},
- }),
- ).toBeUndefined();
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/isPageLayoutTabHiddenByFeatureFlags.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/isPageLayoutTabHiddenByFeatureFlags.test.ts
deleted file mode 100644
index 422180bb6e5..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/isPageLayoutTabHiddenByFeatureFlags.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {
- makeFlagGatedWidget,
- makeTab,
- makeWidget,
-} from '@/page-layout/testing/pageLayoutDraftFixtures';
-import { isPageLayoutTabHiddenByFeatureFlags } from '@/page-layout/utils/isPageLayoutTabHiddenByFeatureFlags';
-
-describe('isPageLayoutTabHiddenByFeatureFlags', () => {
- it('should hide a tab every widget of which waits on a missing flag', () => {
- expect(
- isPageLayoutTabHiddenByFeatureFlags({
- tabId: 'tab-1',
- persistedTabs: [
- makeTab('tab-1', [
- makeFlagGatedWidget('flag-gated-widget-1', 0),
- makeFlagGatedWidget('flag-gated-widget-2', 1),
- ]),
- ],
- featureFlags: {},
- }),
- ).toBe(true);
- });
-
- it('should keep a tab once its flag is on', () => {
- expect(
- isPageLayoutTabHiddenByFeatureFlags({
- tabId: 'tab-1',
- persistedTabs: [
- makeTab('tab-1', [makeFlagGatedWidget('flag-gated-widget', 0)]),
- ],
- featureFlags: { IS_CONVERSATIONS_TAB_ENABLED: true },
- }),
- ).toBe(false);
- });
-
- it('should keep a tab that loaded with another widget, whatever the edit left in it', () => {
- expect(
- isPageLayoutTabHiddenByFeatureFlags({
- tabId: 'tab-1',
- persistedTabs: [
- makeTab('tab-1', [
- makeFlagGatedWidget('flag-gated-widget', 0),
- makeWidget('widget', 1),
- ]),
- ],
- featureFlags: {},
- }),
- ).toBe(false);
- });
-
- it('should keep an empty tab so it can still be filled', () => {
- expect(
- isPageLayoutTabHiddenByFeatureFlags({
- tabId: 'tab-1',
- persistedTabs: [makeTab('tab-1', [])],
- featureFlags: {},
- }),
- ).toBe(false);
- });
-
- it('should keep a tab created during the edit, even a copy holding only flag-gated widgets', () => {
- expect(
- isPageLayoutTabHiddenByFeatureFlags({
- tabId: 'tab-copy',
- persistedTabs: [
- makeTab('tab-1', [makeFlagGatedWidget('flag-gated-widget', 0)]),
- ],
- featureFlags: {},
- }),
- ).toBe(false);
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/isWidgetEnabledByFeatureFlags.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/isWidgetEnabledByFeatureFlags.test.ts
deleted file mode 100644
index f74a0d90386..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/isWidgetEnabledByFeatureFlags.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { isWidgetEnabledByFeatureFlags } from '@/page-layout/utils/isWidgetEnabledByFeatureFlags';
-import { WidgetType } from '~/generated-metadata/graphql';
-
-describe('isWidgetEnabledByFeatureFlags', () => {
- it('should hide a chat threads widget unless its flag is on', () => {
- const widget = { type: WidgetType.CHAT_THREADS };
-
- expect(isWidgetEnabledByFeatureFlags({ widget, featureFlags: {} })).toBe(
- false,
- );
- expect(
- isWidgetEnabledByFeatureFlags({
- widget,
- featureFlags: { IS_CONVERSATIONS_TAB_ENABLED: false },
- }),
- ).toBe(false);
- expect(
- isWidgetEnabledByFeatureFlags({
- widget,
- featureFlags: { IS_CONVERSATIONS_TAB_ENABLED: true },
- }),
- ).toBe(true);
- });
-
- it('should enable widget types that need no flag', () => {
- expect(
- isWidgetEnabledByFeatureFlags({
- widget: { type: WidgetType.EMAILS },
- featureFlags: {},
- }),
- ).toBe(true);
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/filterVisibleWidgets.ts b/packages/twenty-front/src/modules/page-layout/utils/filterVisibleWidgets.ts
index 8851befdcac..8710221050a 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/filterVisibleWidgets.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/filterVisibleWidgets.ts
@@ -1,7 +1,6 @@
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
import { type WidgetVisibilityContext } from '@/page-layout/types/WidgetVisibilityContext';
import { evaluateWidgetVisibility } from '@/page-layout/utils/evaluateWidgetVisibility';
-import { isWidgetEnabledByFeatureFlags } from '@/page-layout/utils/isWidgetEnabledByFeatureFlags';
import { isFieldWidget } from '@/page-layout/widgets/field/utils/isFieldWidget';
type FilterVisibleWidgetsParams = {
@@ -19,15 +18,6 @@ export const filterVisibleWidgets = ({
context.hiddenFieldMetadataIdsOrNames ?? [];
return widgets.filter((widget) => {
- if (
- !isWidgetEnabledByFeatureFlags({
- widget,
- featureFlags: context.featureFlags,
- })
- ) {
- return false;
- }
-
if (
isFieldWidget(widget) &&
hiddenFieldMetadataIdsOrNames.includes(
diff --git a/packages/twenty-front/src/modules/page-layout/utils/getIsSingleWidgetTab.ts b/packages/twenty-front/src/modules/page-layout/utils/getIsSingleWidgetTab.ts
index 61e535041e1..579c5da75db 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/getIsSingleWidgetTab.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/getIsSingleWidgetTab.ts
@@ -1,19 +1,12 @@
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
-import { isWidgetEnabledByFeatureFlags } from '@/page-layout/utils/isWidgetEnabledByFeatureFlags';
import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
type GetIsSingleWidgetTabParams = {
tab: Pick<PageLayoutTab, 'layoutMode' | 'widgets'>;
- featureFlags: Record<string, boolean>;
};
export const getIsSingleWidgetTab = ({
tab,
- featureFlags,
}: GetIsSingleWidgetTabParams): boolean =>
tab.layoutMode !== PageLayoutTabLayoutMode.GRID &&
- tab.widgets.filter(
- (widget) =>
- widget.isActive &&
- isWidgetEnabledByFeatureFlags({ widget, featureFlags }),
- ).length === 1;
+ tab.widgets.filter((widget) => widget.isActive).length === 1;
diff --git a/packages/twenty-front/src/modules/page-layout/utils/getTabsWithVisibleWidgets.ts b/packages/twenty-front/src/modules/page-layout/utils/getTabsWithVisibleWidgets.ts
index b96a4f5769d..a5a86238373 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/getTabsWithVisibleWidgets.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/getTabsWithVisibleWidgets.ts
@@ -1,43 +1,22 @@
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
import { type WidgetVisibilityContext } from '@/page-layout/types/WidgetVisibilityContext';
import { filterVisibleWidgets } from '@/page-layout/utils/filterVisibleWidgets';
-import { isPageLayoutTabHiddenByFeatureFlags } from '@/page-layout/utils/isPageLayoutTabHiddenByFeatureFlags';
-import { isWidgetEnabledByFeatureFlags } from '@/page-layout/utils/isWidgetEnabledByFeatureFlags';
type GetTabsWithVisibleWidgetsParams = {
tabs: PageLayoutTab[];
- persistedTabs?: PageLayoutTab[];
isEditMode: boolean;
context: WidgetVisibilityContext;
};
export const getTabsWithVisibleWidgets = ({
tabs,
- persistedTabs,
isEditMode,
context,
}: GetTabsWithVisibleWidgetsParams): PageLayoutTab[] => {
const activeTabs = tabs.filter((tab) => tab.isActive);
if (isEditMode) {
- return activeTabs
- .filter(
- (tab) =>
- !isPageLayoutTabHiddenByFeatureFlags({
- tabId: tab.id,
- persistedTabs,
- featureFlags: context.featureFlags,
- }),
- )
- .map((tab) => ({
- ...tab,
- widgets: tab.widgets.filter((widget) =>
- isWidgetEnabledByFeatureFlags({
- widget,
- featureFlags: context.featureFlags,
- }),
- ),
- }));
+ return activeTabs;
}
const tabsWithFilteredWidgets = activeTabs.map((tab) => ({
diff --git a/packages/twenty-front/src/modules/page-layout/utils/getWidgetIndexInDraftTab.ts b/packages/twenty-front/src/modules/page-layout/utils/getWidgetIndexInDraftTab.ts
deleted file mode 100644
index c5f99eb63af..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/getWidgetIndexInDraftTab.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
-import { sortWidgetsByVerticalListPosition } from '@/page-layout/utils/sortWidgetsByVerticalListPosition';
-
-type GetWidgetIndexInDraftTabParams = {
- tab: Pick<PageLayoutTab, 'widgets'>;
- widgetId: string;
-};
-
-export const getWidgetIndexInDraftTab = ({
- tab,
- widgetId,
-}: GetWidgetIndexInDraftTabParams): number =>
- sortWidgetsByVerticalListPosition(tab.widgets).findIndex(
- (widget) => widget.id === widgetId,
- );
diff --git a/packages/twenty-front/src/modules/page-layout/utils/getWidgetMoveWithinTab.ts b/packages/twenty-front/src/modules/page-layout/utils/getWidgetMoveWithinTab.ts
deleted file mode 100644
index baebe49c0ba..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/getWidgetMoveWithinTab.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-import { getAdjacentFitContentWidgetIndex } from '@/page-layout/utils/getAdjacentFitContentWidgetIndex';
-import { isWidgetEnabledByFeatureFlags } from '@/page-layout/utils/isWidgetEnabledByFeatureFlags';
-import { sortWidgetsByVerticalListPosition } from '@/page-layout/utils/sortWidgetsByVerticalListPosition';
-import { isDefined } from 'twenty-shared/utils';
-
-type GetWidgetMoveWithinTabParams = {
- widgets: PageLayoutWidget[];
- widgetId: string;
- direction: 'up' | 'down';
- featureFlags: Record<string, boolean>;
-};
-
-// The neighbour is picked among the widgets edit mode renders, then both are
-// addressed in the tab's full order: swapping with a widget a feature flag
-// hides would leave the rendered order untouched.
-export const getWidgetMoveWithinTab = ({
- widgets,
- widgetId,
- direction,
- featureFlags,
-}: GetWidgetMoveWithinTabParams):
- | { fromIndex: number; toIndex: number }
- | undefined => {
- const sortedWidgets = sortWidgetsByVerticalListPosition(widgets);
- const renderedWidgets = sortedWidgets.filter((widget) =>
- isWidgetEnabledByFeatureFlags({ widget, featureFlags }),
- );
-
- const neighborRenderedIndex = getAdjacentFitContentWidgetIndex({
- widgets: renderedWidgets,
- widgetIndex: renderedWidgets.findIndex((widget) => widget.id === widgetId),
- direction,
- });
-
- if (!isDefined(neighborRenderedIndex)) {
- return undefined;
- }
-
- const neighborWidgetId = renderedWidgets[neighborRenderedIndex].id;
-
- return {
- fromIndex: sortedWidgets.findIndex((widget) => widget.id === widgetId),
- toIndex: sortedWidgets.findIndex(
- (widget) => widget.id === neighborWidgetId,
- ),
- };
-};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/isPageLayoutTabHiddenByFeatureFlags.ts b/packages/twenty-front/src/modules/page-layout/utils/isPageLayoutTabHiddenByFeatureFlags.ts
deleted file mode 100644
index de065caa630..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/isPageLayoutTabHiddenByFeatureFlags.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
-import { isWidgetEnabledByFeatureFlags } from '@/page-layout/utils/isWidgetEnabledByFeatureFlags';
-import { isDefined } from 'twenty-shared/utils';
-
-type IsPageLayoutTabHiddenByFeatureFlagsParams = {
- tabId: string;
- persistedTabs: Pick<PageLayoutTab, 'id' | 'widgets'>[] | undefined;
- featureFlags: Record<string, boolean>;
-};
-
-// A tab only flag-gated widgets fill goes with them, while one left empty on
-// purpose stays so it can still be filled. Tabs are judged as loaded, so an
-// edit that leaves one with only flag-gated widgets cannot make it vanish, and
-// a tab created during the edit, even a copy holding some, was visible then.
-export const isPageLayoutTabHiddenByFeatureFlags = ({
- tabId,
- persistedTabs,
- featureFlags,
-}: IsPageLayoutTabHiddenByFeatureFlagsParams): boolean => {
- const persistedTab = persistedTabs?.find((tab) => tab.id === tabId);
-
- if (!isDefined(persistedTab)) {
- return false;
- }
-
- return (
- persistedTab.widgets.length > 0 &&
- persistedTab.widgets.every(
- (widget) => !isWidgetEnabledByFeatureFlags({ widget, featureFlags }),
- )
- );
-};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/isWidgetEnabledByFeatureFlags.ts b/packages/twenty-front/src/modules/page-layout/utils/isWidgetEnabledByFeatureFlags.ts
deleted file mode 100644
index 30d499315eb..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/isWidgetEnabledByFeatureFlags.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { WIDGET_TYPE_REQUIRED_FEATURE_FLAG } from '@/page-layout/constants/WidgetTypeRequiredFeatureFlag';
-import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-import { isDefined } from 'twenty-shared/utils';
-
-type IsWidgetEnabledByFeatureFlagsParams = {
- widget: Pick<PageLayoutWidget, 'type'>;
- featureFlags: Record<string, boolean>;
-};
-
-// Feature flags describe what the workspace has, not what one viewer sees, so
-// unlike device or record conditions they also apply while a layout is edited.
-export const isWidgetEnabledByFeatureFlags = ({
- widget,
- featureFlags,
-}: IsWidgetEnabledByFeatureFlagsParams): boolean => {
- const requiredFeatureFlag = WIDGET_TYPE_REQUIRED_FEATURE_FLAG[widget.type];
-
- if (isDefined(requiredFeatureFlag) && !featureFlags[requiredFeatureFlag]) {
- return false;
- }
-
- return true;
-};
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts
index 2857c675cdf..220021cfee6 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts
@@ -12,7 +12,6 @@ import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/h
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
-import { useWorkspaceFeatureFlagsMap } from '@/workspace/hooks/useWorkspaceFeatureFlagsMap';
import { t } from '@lingui/core/macro';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
@@ -49,8 +48,6 @@ export const useOpenWidgetSettingsInSidePanel = (
pageLayoutId,
);
- const featureFlags = useWorkspaceFeatureFlagsMap();
-
const openWidgetSettingsInSidePanel = useCallback(
({
widgetId,
@@ -133,7 +130,7 @@ export const useOpenWidgetSettingsInSidePanel = (
const isContainingTabSingleWidget =
isDefined(containingTab) &&
- getIsSingleWidgetTab({ tab: containingTab, featureFlags });
+ getIsSingleWidgetTab({ tab: containingTab });
const widgetInContainingTab = containingTab?.widgets.find(
(widget) => widget.id === widgetId,
@@ -166,7 +163,6 @@ export const useOpenWidgetSettingsInSidePanel = (
[
isDashboardPageLayout,
pageLayoutDraft,
- featureFlags,
setPageLayoutEditingWidgetId,
setPageLayoutTabSettingsOpenTabId,
navigatePageLayoutSidePanel,
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettingsContent.tsx
index 8d6ae2d988b..ed1384c8b78 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettingsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettingsContent.tsx
@@ -6,13 +6,10 @@ import { useResetPageLayoutTabToDefault } from '@/page-layout/hooks/useResetPage
import { useSetAsPinnedTab } from '@/page-layout/hooks/useSetAsPinnedTab';
import { useUnpinTab } from '@/page-layout/hooks/useUnpinTab';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
-import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';
import { pageLayoutTabSettingsOpenTabIdComponentState } from '@/page-layout/states/pageLayoutTabSettingsOpenTabIdComponentState';
import { getIsFirstTabPinned } from '@/page-layout/utils/getIsFirstTabPinned';
import { getIsSingleWidgetTab } from '@/page-layout/utils/getIsSingleWidgetTab';
import { getTabListInstanceIdFromPageLayoutAndRecord } from '@/page-layout/utils/getTabListInstanceIdFromPageLayoutAndRecord';
-import { isPageLayoutTabHiddenByFeatureFlags } from '@/page-layout/utils/isPageLayoutTabHiddenByFeatureFlags';
-import { isWidgetEnabledByFeatureFlags } from '@/page-layout/utils/isWidgetEnabledByFeatureFlags';
import { sortTabsByPosition } from '@/page-layout/utils/sortTabsByPosition';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { RegularTabSettingsContent } from '@/side-panel/pages/page-layout/components/RegularTabSettingsContent';
@@ -22,7 +19,6 @@ import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomC
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
-import { getWorkspaceFeatureFlagsMap } from '@/workspace/utils/getWorkspaceFeatureFlagsMap';
import { isNonEmptyString } from '@sniptt/guards';
import { useNavigate } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
@@ -48,11 +44,6 @@ export const SidePanelPageLayoutTabSettingsContent = ({
pageLayoutId,
);
- const pageLayoutPersisted = useAtomComponentStateValue(
- pageLayoutPersistedComponentState,
- pageLayoutId,
- );
-
const tabListInstanceId = getTabListInstanceIdFromPageLayoutAndRecord({
pageLayoutId,
layoutType: pageLayoutDraft.type,
@@ -88,23 +79,10 @@ export const SidePanelPageLayoutTabSettingsContent = ({
return null;
}
- const featureFlags = getWorkspaceFeatureFlagsMap(
- currentWorkspace?.featureFlags,
- );
-
- // Deleting a tab only deactivates it in the draft and feature flags can hide
- // one, while the placement actions have to line up with the tabs the layout
- // actually renders.
+ // Deleting a tab only deactivates it in the draft, and the placement actions
+ // have to line up with the tabs the layout actually renders.
const tabsSorted = sortTabsByPosition(
- pageLayoutDraft.tabs.filter(
- (draftTab) =>
- draftTab.isActive &&
- !isPageLayoutTabHiddenByFeatureFlags({
- tabId: draftTab.id,
- persistedTabs: pageLayoutPersisted?.tabs,
- featureFlags,
- }),
- ),
+ pageLayoutDraft.tabs.filter((draftTab) => draftTab.isActive),
);
const currentIndex = tabsSorted.findIndex(
(tabItem) => tabItem.id === pageLayoutTabSettingsOpenTabId,
@@ -144,19 +122,15 @@ export const SidePanelPageLayoutTabSettingsContent = ({
navigate(`#${tab.id}`);
};
- const renderedWidgets = tab.widgets.filter(
- (widget) =>
- widget.isActive &&
- isWidgetEnabledByFeatureFlags({ widget, featureFlags }),
- );
+ const activeWidgets = tab.widgets.filter((widget) => widget.isActive);
- const isSingleWidgetTab = getIsSingleWidgetTab({ tab, featureFlags });
+ const isSingleWidgetTab = getIsSingleWidgetTab({ tab });
if (isSingleWidgetTab) {
return (
<SingleWidgetTabSettingsContent
pageLayoutId={pageLayoutId}
- singleWidget={renderedWidgets.at(0)!}
+ singleWidget={activeWidgets.at(0)!}
canSetAsPinned={canSetAsPinned}
canUnpin={canUnpin}
canMoveLeft={canMoveLeft}
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx
index 4e57135084c..b51c9f44978 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/MoveToTabDropdownContent.tsx
@@ -2,14 +2,11 @@ import { ListItem } from 'twenty-ui/primitives/navigation';
import { useMoveWidgetToTab } from '@/page-layout/hooks/useMoveWidgetToTab';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
-import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';
import { canVerticalListAcceptWidget } from '@/page-layout/utils/canVerticalListAcceptWidget';
-import { isPageLayoutTabHiddenByFeatureFlags } from '@/page-layout/utils/isPageLayoutTabHiddenByFeatureFlags';
import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { useWorkspaceFeatureFlagsMap } from '@/workspace/hooks/useWorkspaceFeatureFlagsMap';
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
@@ -22,11 +19,6 @@ export const MoveToTabDropdownContent = () => {
pageLayoutId,
);
- const pageLayoutPersisted = useAtomComponentStateValue(
- pageLayoutPersistedComponentState,
- pageLayoutId,
- );
-
const pageLayoutEditingWidgetId = useAtomComponentStateValue(
pageLayoutEditingWidgetIdComponentState,
pageLayoutId,
@@ -34,8 +26,6 @@ export const MoveToTabDropdownContent = () => {
const { moveWidgetToTab } = useMoveWidgetToTab(pageLayoutId);
- const featureFlags = useWorkspaceFeatureFlagsMap();
-
const { closeDropdown } = useCloseDropdown();
const currentTab = isDefined(pageLayoutEditingWidgetId)
@@ -52,11 +42,6 @@ export const MoveToTabDropdownContent = () => {
(tab) =>
tab.layoutMode === PageLayoutTabLayoutMode.VERTICAL_LIST &&
tab.id !== currentTab?.id &&
- !isPageLayoutTabHiddenByFeatureFlags({
- tabId: tab.id,
- persistedTabs: pageLayoutPersisted?.tabs,
- featureFlags,
- }) &&
isDefined(currentWidget) &&
canVerticalListAcceptWidget({
destinationWidgets: tab.widgets,
diff --git a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
index 049b67ed6e6..dad01d0b073 100644
--- a/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
+++ b/packages/twenty-server/src/database/commands/agent-history/__tests__/agent-history-migration.postgres.spec.ts
@@ -232,7 +232,6 @@ const SCHEMA = getWorkspaceSchemaName(WORKSPACE_ID);
{} as never,
{} as never,
{ broadcast: jest.fn().mockResolvedValue(undefined) } as never,
- {} as never,
{
getThreadWithAccess: ({
workspaceId,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts
index f30d0e206f9..8eda754a3ba 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-upgrade-version-command.module.ts
@@ -15,6 +15,7 @@ import { SyncDeactivateWorkflowAvailabilityCommand } from 'src/database/commands
import { RemoveAddNodeWorkflowCommandMenuItemCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790607921000-remove-add-node-workflow-command-menu-item.command';
import { OpenAgentChatThreadArchivedAtWritabilityCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790672076234-open-agent-chat-thread-archived-at-writability.command';
import { AddInputAskObjectCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790681093095-add-input-ask-object.command';
+import { GateConversationsWidgetOnFeatureFlagCommand } from 'src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790700866168-gate-conversations-widget-on-feature-flag.command';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/workspace-migration-runner.module';
@@ -39,6 +40,7 @@ import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/wor
SyncShortLinkObjectCommand,
OpenAgentChatThreadArchivedAtWritabilityCommand,
AddInputAskObjectCommand,
+ GateConversationsWidgetOnFeatureFlagCommand,
],
})
export class V2_44_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790607161319-add-workflow-run-to-chat-threads.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790607161319-add-workflow-run-to-chat-threads.command.ts
index 63cddab5266..e4ef4b916e9 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790607161319-add-workflow-run-to-chat-threads.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790607161319-add-workflow-run-to-chat-threads.command.ts
@@ -139,9 +139,8 @@ export class AddWorkflowRunToChatThreadsCommand extends ProvisionedWorkspaceComm
});
}
- // Only threads already under common sharing (2.43) inherit: SYSTEM
- // threads are still owner-only and have no owner grants yet, so making
- // them inherit would lock owners out of their own chats.
+ // verify-common-record-sharing has already refused SYSTEM threads, so
+ // anything but PRIVATE here is a re-run
if (threadObject.readability !== MetadataReadability.PRIVATE) {
this.logger.log(
`agentChatThread readability is ${threadObject.readability} for workspace ${workspaceId}, leaving it`,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790672076234-open-agent-chat-thread-archived-at-writability.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790672076234-open-agent-chat-thread-archived-at-writability.command.ts
index ce02de929be..d9d00da56f0 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790672076234-open-agent-chat-thread-archived-at-writability.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790672076234-open-agent-chat-thread-archived-at-writability.command.ts
@@ -1,11 +1,12 @@
import { Command } from 'nest-commander';
import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
-import { isNonEmptyArray } from 'twenty-shared/utils';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { MetadataWritability } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
-import { buildAgentChatThreadArchivedAtWritabilityUpdate } from 'src/database/commands/upgrade-version-command/2-44/utils/build-agent-chat-thread-archived-at-writability-update.util';
import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
@@ -31,36 +32,35 @@ export class OpenAgentChatThreadArchivedAtWritabilityCommand extends Provisioned
}
async up(args: RunOnWorkspaceArgs): Promise<void> {
- await this.syncWritability(args, 'up');
+ await this.setWritability(args, MetadataWritability.OPEN);
}
async down(args: RunOnWorkspaceArgs): Promise<void> {
- await this.syncWritability(args, 'down');
+ await this.setWritability(args, MetadataWritability.SYSTEM);
}
- private async syncWritability(
+ private async setWritability(
{ workspaceId, options }: RunOnWorkspaceArgs,
- direction: 'up' | 'down',
+ writability: MetadataWritability,
): Promise<void> {
const { flatFieldMetadataMaps } =
await this.workspaceCacheService.getOrRecompute(workspaceId, [
'flatFieldMetadataMaps',
]);
+ const archivedAtField =
+ flatFieldMetadataMaps.byUniversalIdentifier[
+ STANDARD_OBJECTS.agentChatThread.fields.archivedAt.universalIdentifier
+ ];
- const flatFieldMetadatasToUpdate =
- buildAgentChatThreadArchivedAtWritabilityUpdate({
- flatFieldMetadatasByUniversalIdentifier:
- flatFieldMetadataMaps.byUniversalIdentifier,
- now: new Date().toISOString(),
- direction,
- });
-
- if (!isNonEmptyArray(flatFieldMetadatasToUpdate)) {
+ if (
+ !isDefined(archivedAtField) ||
+ archivedAtField.writability === writability
+ ) {
return;
}
this.logger.log(
- `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId}: setting agentChatThread.archivedAt writability to ${flatFieldMetadatasToUpdate[0].writability}`,
+ `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId}: setting agentChatThread.archivedAt writability to ${writability}`,
);
if (options.dryRun) {
@@ -78,7 +78,13 @@ export class OpenAgentChatThreadArchivedAtWritabilityCommand extends Provisioned
fieldMetadata: {
flatEntityToCreate: [],
flatEntityToDelete: [],
- flatEntityToUpdate: flatFieldMetadatasToUpdate,
+ flatEntityToUpdate: [
+ {
+ ...archivedAtField,
+ writability,
+ updatedAt: new Date().toISOString(),
+ },
+ ],
},
},
},
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790700866168-gate-conversations-widget-on-feature-flag.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790700866168-gate-conversations-widget-on-feature-flag.command.ts
new file mode 100644
index 00000000000..6b7fb903930
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/2-44-workspace-command-1790700866168-gate-conversations-widget-on-feature-flag.command.ts
@@ -0,0 +1,113 @@
+import { Command } from 'nest-commander';
+import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
+import { STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS } from 'twenty-shared/metadata';
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+
+const CONVERSATIONS_WIDGET_EXPRESSION =
+ 'featureFlags.IS_CONVERSATIONS_TAB_ENABLED';
+
+const CONVERSATIONS_WIDGET_UNIVERSAL_IDENTIFIERS = [
+ STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS.companyRecordPage.tabs
+ .conversations.widgets.conversations.universalIdentifier,
+ STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS.personRecordPage.tabs.conversations
+ .widgets.conversations.universalIdentifier,
+ STANDARD_PAGE_LAYOUT_UNIVERSAL_IDENTIFIERS.opportunityRecordPage.tabs
+ .conversations.widgets.conversations.universalIdentifier,
+];
+
+// Workspaces created before the Conversations widget carried its flag as an
+// expression hold it ungated
+@RegisteredWorkspaceCommand('2.44.0', 1790700866168)
+@Command({
+ name: 'upgrade:2-44:gate-conversations-widget-on-feature-flag',
+ description:
+ 'Hide the standard Conversations widget unless IS_CONVERSATIONS_TAB_ENABLED is on',
+})
+export class GateConversationsWidgetOnFeatureFlagCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.up(args);
+ }
+
+ async up(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.setExpression(args, CONVERSATIONS_WIDGET_EXPRESSION);
+ }
+
+ async down(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.setExpression(args, null);
+ }
+
+ private async setExpression(
+ { workspaceId, options }: RunOnWorkspaceArgs,
+ conditionalAvailabilityExpression: string | null,
+ ): Promise<void> {
+ const { flatPageLayoutWidgetMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatPageLayoutWidgetMaps',
+ ]);
+ const now = new Date().toISOString();
+ const widgetsToUpdate = CONVERSATIONS_WIDGET_UNIVERSAL_IDENTIFIERS.map(
+ (universalIdentifier) =>
+ flatPageLayoutWidgetMaps.byUniversalIdentifier[universalIdentifier],
+ )
+ .filter(isDefined)
+ .filter(
+ (widget) =>
+ widget.conditionalAvailabilityExpression !==
+ conditionalAvailabilityExpression,
+ )
+ .map((widget) => ({
+ ...widget,
+ conditionalAvailabilityExpression,
+ updatedAt: now,
+ }));
+
+ if (!isNonEmptyArray(widgetsToUpdate)) {
+ return;
+ }
+
+ this.logger.log(
+ `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId}: updating ${widgetsToUpdate.length} Conversations widget(s)`,
+ );
+
+ if (options.dryRun) {
+ return;
+ }
+
+ const result =
+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
+ {
+ workspaceId,
+ isSystemBuild: true,
+ applicationUniversalIdentifier:
+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
+ allFlatEntityOperationByMetadataName: {
+ pageLayoutWidget: {
+ flatEntityToCreate: [],
+ flatEntityToDelete: [],
+ flatEntityToUpdate: widgetsToUpdate,
+ },
+ },
+ },
+ );
+
+ if (result.status === 'fail') {
+ throw new WorkspaceMigrationBuilderException(result);
+ }
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/constants/agent-chat-thread-archived-at-field-universal-identifier.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/constants/agent-chat-thread-archived-at-field-universal-identifier.constant.ts
deleted file mode 100644
index 87074456b23..00000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/constants/agent-chat-thread-archived-at-field-universal-identifier.constant.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// Pinned so later changes to the standard definitions cannot retarget the command
-export const AGENT_CHAT_THREAD_ARCHIVED_AT_FIELD_UNIVERSAL_IDENTIFIER =
- 'b42eaf6f-240f-41ef-af61-51d5ac9cde7d';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/constants/legacy-chat-thread-owner-field-universal-identifier.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/constants/legacy-chat-thread-owner-field-universal-identifier.constant.ts
index c409b5b1365..ca1f96e4d4d 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/constants/legacy-chat-thread-owner-field-universal-identifier.constant.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/constants/legacy-chat-thread-owner-field-universal-identifier.constant.ts
@@ -1,4 +1,4 @@
-// Pinned here rather than read from the standard objects, which drop the
-// legacy owner column: commands using it must still build and run without it.
+// Pinned so the command still builds once the standard objects drop the legacy
+// owner field
export const LEGACY_CHAT_THREAD_OWNER_FIELD_UNIVERSAL_IDENTIFIER =
'bf830886-b6dc-46e9-a229-eecbb0e66032';
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/utils/__tests__/build-agent-chat-thread-archived-at-writability-update.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/utils/__tests__/build-agent-chat-thread-archived-at-writability-update.util.spec.ts
deleted file mode 100644
index 52466362611..00000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/utils/__tests__/build-agent-chat-thread-archived-at-writability-update.util.spec.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { FieldMetadataType, MetadataWritability } from 'twenty-shared/types';
-
-import { AGENT_CHAT_THREAD_ARCHIVED_AT_FIELD_UNIVERSAL_IDENTIFIER } from 'src/database/commands/upgrade-version-command/2-44/constants/agent-chat-thread-archived-at-field-universal-identifier.constant';
-import { buildAgentChatThreadArchivedAtWritabilityUpdate } from 'src/database/commands/upgrade-version-command/2-44/utils/build-agent-chat-thread-archived-at-writability-update.util';
-import { getFlatFieldMetadataMock } from 'src/engine/metadata-modules/flat-field-metadata/__mocks__/get-flat-field-metadata.mock';
-
-const NOW = '2026-09-29T10:00:00.000Z';
-
-const buildFieldsByUniversalIdentifier = (writability: MetadataWritability) => ({
- [AGENT_CHAT_THREAD_ARCHIVED_AT_FIELD_UNIVERSAL_IDENTIFIER]:
- getFlatFieldMetadataMock({
- universalIdentifier: AGENT_CHAT_THREAD_ARCHIVED_AT_FIELD_UNIVERSAL_IDENTIFIER,
- objectMetadataId: 'agent-chat-thread-object-id',
- type: FieldMetadataType.DATE_TIME,
- name: 'archivedAt',
- writability,
- updatedAt: '2026-01-01T00:00:00.000Z',
- }),
-});
-
-describe('buildAgentChatThreadArchivedAtWritabilityUpdate', () => {
- it('opens archivedAt on the way up', () => {
- expect(
- buildAgentChatThreadArchivedAtWritabilityUpdate({
- flatFieldMetadatasByUniversalIdentifier:
- buildFieldsByUniversalIdentifier(MetadataWritability.SYSTEM),
- now: NOW,
- direction: 'up',
- }),
- ).toEqual([
- expect.objectContaining({
- name: 'archivedAt',
- writability: MetadataWritability.OPEN,
- updatedAt: NOW,
- }),
- ]);
- });
-
- it('closes archivedAt again on the way down', () => {
- expect(
- buildAgentChatThreadArchivedAtWritabilityUpdate({
- flatFieldMetadatasByUniversalIdentifier:
- buildFieldsByUniversalIdentifier(MetadataWritability.OPEN),
- now: NOW,
- direction: 'down',
- }),
- ).toEqual([
- expect.objectContaining({ writability: MetadataWritability.SYSTEM }),
- ]);
- });
-
- it('changes nothing when the field is already in place or missing', () => {
- expect(
- buildAgentChatThreadArchivedAtWritabilityUpdate({
- flatFieldMetadatasByUniversalIdentifier:
- buildFieldsByUniversalIdentifier(MetadataWritability.OPEN),
- now: NOW,
- direction: 'up',
- }),
- ).toEqual([]);
- expect(
- buildAgentChatThreadArchivedAtWritabilityUpdate({
- flatFieldMetadatasByUniversalIdentifier: {},
- now: NOW,
- direction: 'up',
- }),
- ).toEqual([]);
- });
-});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/utils/build-agent-chat-thread-archived-at-writability-update.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/utils/build-agent-chat-thread-archived-at-writability-update.util.ts
deleted file mode 100644
index ddcc0d12b31..00000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-44/utils/build-agent-chat-thread-archived-at-writability-update.util.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { MetadataWritability } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-
-import { AGENT_CHAT_THREAD_ARCHIVED_AT_FIELD_UNIVERSAL_IDENTIFIER } from 'src/database/commands/upgrade-version-command/2-44/constants/agent-chat-thread-archived-at-field-universal-identifier.constant';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
-
-export const buildAgentChatThreadArchivedAtWritabilityUpdate = ({
- flatFieldMetadatasByUniversalIdentifier,
- now,
- direction,
-}: {
- flatFieldMetadatasByUniversalIdentifier: Partial<
- Record<string, FlatFieldMetadata>
- >;
- now: string;
- direction: 'up' | 'down';
-}): FlatFieldMetadata[] => {
- const archivedAtField =
- flatFieldMetadatasByUniversalIdentifier[
- AGENT_CHAT_THREAD_ARCHIVED_AT_FIELD_UNIVERSAL_IDENTIFIER
- ];
-
- const writability =
- direction === 'up'
- ? MetadataWritability.OPEN
- : MetadataWritability.SYSTEM;
-
- if (
- !isDefined(archivedAtField) ||
- archivedAtField.writability === writability
- ) {
- return [];
- }
-
- return [{ ...archivedAtField, writability, updatedAt: now }];
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/__tests__/agent-turn-evaluation.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/__tests__/agent-turn-evaluation.spec.ts
index fcbe1df0dd6..62163304f6a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/__tests__/agent-turn-evaluation.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/__tests__/agent-turn-evaluation.spec.ts
@@ -1,64 +1,50 @@
import { AgentTurnResolver } from 'src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver';
-import { LEGACY_CHAT_THREAD_OWNER_FIELD_UNIVERSAL_IDENTIFIER } from 'src/engine/metadata-modules/ai/ai-chat/constants/legacy-chat-thread-owner-field-universal-identifier.constant';
-it.each([true, false])(
- 'creates private evaluation history before and after owner contraction (%s)',
- async (hasLegacyOwner) => {
- const turn = { id: 'turn', threadId: 'thread' };
- const turns = {
- insertAndReturnOne: jest.fn().mockResolvedValue(turn),
- findOne: jest.fn().mockResolvedValue(turn),
- };
- const threads = {
- insertAndReturnOne: jest.fn().mockResolvedValue({ id: 'thread' }),
- };
- const cache = {
- getOrRecompute: jest.fn().mockResolvedValue({
- flatFieldMetadataMaps: {
- byUniversalIdentifier: hasLegacyOwner
- ? { [LEGACY_CHAT_THREAD_OWNER_FIELD_UNIVERSAL_IDENTIFIER]: {} }
- : {},
- },
- }),
- };
- const queue = { add: jest.fn() };
- const agent = {
- findOneAgentById: jest.fn().mockResolvedValue({ id: 'agent' }),
- };
- const resolver = new AgentTurnResolver(
- turns as never,
- threads as never,
- cache as never,
- queue as never,
- {} as never,
- agent as never,
- );
+it('creates private evaluation history', async () => {
+ const turn = { id: 'turn', threadId: 'thread' };
+ const turns = {
+ insertAndReturnOne: jest.fn().mockResolvedValue(turn),
+ findOne: jest.fn().mockResolvedValue(turn),
+ };
+ const threads = {
+ insertAndReturnOne: jest.fn().mockResolvedValue({ id: 'thread' }),
+ };
+ const queue = { add: jest.fn() };
+ const agent = {
+ findOneAgentById: jest.fn().mockResolvedValue({ id: 'agent' }),
+ };
+ const resolver = new AgentTurnResolver(
+ turns as never,
+ threads as never,
+ queue as never,
+ {} as never,
+ agent as never,
+ );
- await expect(
- resolver.runEvaluationInput(
- 'agent',
- 'Evaluate this',
- { id: 'workspace' } as never,
- 'member',
- 'membership',
- ),
- ).resolves.toEqual(turn);
- expect(threads.insertAndReturnOne).toHaveBeenCalledWith('workspace', {
- workspaceMemberId: 'member',
- ...(hasLegacyOwner ? { userWorkspaceId: 'membership' } : {}),
- title: 'Eval: Evaluate this...',
- });
- expect(agent.findOneAgentById).toHaveBeenCalledWith({
- id: 'agent',
+ await expect(
+ resolver.runEvaluationInput(
+ 'agent',
+ 'Evaluate this',
+ { id: 'workspace' } as never,
+ 'member',
+ 'membership',
+ ),
+ ).resolves.toEqual(turn);
+ expect(threads.insertAndReturnOne).toHaveBeenCalledWith('workspace', {
+ workspaceMemberId: 'member',
+ userWorkspaceId: 'membership',
+ title: 'Eval: Evaluate this...',
+ });
+ expect(agent.findOneAgentById).toHaveBeenCalledWith({
+ id: 'agent',
+ workspaceId: 'workspace',
+ });
+ expect(queue.add).toHaveBeenCalledWith(
+ 'RunEvaluationInputJob',
+ expect.objectContaining({
workspaceId: 'workspace',
- });
- expect(queue.add).toHaveBeenCalledWith(
- 'RunEvaluationInputJob',
- expect.objectContaining({
- workspaceId: 'workspace',
- threadId: 'thread',
- turnId: 'turn',
- }),
- );
- },
-);
+ threadId: 'thread',
+ turnId: 'turn',
+ }),
+ );
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
index baeec89c05d..b5741957247 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
@@ -24,8 +24,6 @@ import { RunEvaluationInputJob } from 'src/engine/metadata-modules/ai/ai-agent-m
import { AgentTurnGraderService } from 'src/engine/metadata-modules/ai/ai-agent-monitor/services/agent-turn-grader.service';
import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.service';
import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';
-import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-import { hasLegacyChatThreadOwnerField } from 'src/engine/metadata-modules/ai/ai-chat/utils/has-legacy-chat-thread-owner-field.util';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
@@ -43,7 +41,6 @@ export class AgentTurnResolver {
private readonly turnRepository: AgentHistoryRepository<AgentTurnWorkspaceEntity>,
@InjectAgentHistoryRepository('agentChatThread')
private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,
- private readonly workspaceCacheService: WorkspaceCacheService,
@InjectMessageQueue(MessageQueue.aiQueue)
private readonly messageQueueService: MessageQueueService,
private readonly graderService: AgentTurnGraderService,
@@ -105,16 +102,12 @@ export class AgentTurnResolver {
workspaceId: workspace.id,
});
- const writesLegacyOwner = await hasLegacyChatThreadOwnerField(
- workspace.id,
- this.workspaceCacheService,
- );
// Evaluation history stays outside the user's chat list: no share or broadcast.
const savedThread = await this.threadRepository.insertAndReturnOne(
workspace.id,
{
workspaceMemberId,
- ...(writesLegacyOwner ? { userWorkspaceId } : {}),
+ userWorkspaceId,
title: `Eval: ${input.substring(0, 50)}...`,
},
);
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/agent-chat-thread-lifecycle.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/agent-chat-thread-lifecycle.module.ts
index 4ce8d4844f6..5c23f103805 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/agent-chat-thread-lifecycle.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/agent-chat-thread-lifecycle.module.ts
@@ -1,6 +1,6 @@
import { Module } from '@nestjs/common';
-import { AgentChatThreadDestroyedListener } from 'src/engine/metadata-modules/ai/ai-chat/listeners/agent-chat-thread-destroyed.listener';
+import { AgentChatThreadLifecycleListener } from 'src/engine/metadata-modules/ai/ai-chat/listeners/agent-chat-thread-lifecycle.listener';
import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service';
import { AgentChatThreadRecordEventService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-record-event.service';
import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
@@ -11,7 +11,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
@Module({
imports: [AgentHistoryModule, WorkspaceCacheModule],
providers: [
- AgentChatThreadDestroyedListener,
+ AgentChatThreadLifecycleListener,
AgentChatThreadLifecycleService,
AgentChatThreadRecordEventService,
],
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/legacy-chat-thread-owner-field-universal-identifier.constant.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/legacy-chat-thread-owner-field-universal-identifier.constant.ts
deleted file mode 100644
index ca6661ddc48..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/constants/legacy-chat-thread-owner-field-universal-identifier.constant.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const LEGACY_CHAT_THREAD_OWNER_FIELD_UNIVERSAL_IDENTIFIER =
- 'bf830886-b6dc-46e9-a229-eecbb0e66032';
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/listeners/agent-chat-thread-destroyed.listener.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/listeners/agent-chat-thread-lifecycle.listener.ts
similarity index 80%
rename from packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/listeners/agent-chat-thread-destroyed.listener.ts
rename to packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/listeners/agent-chat-thread-lifecycle.listener.ts
index 0088fec0dcb..9d180ea42a5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/listeners/agent-chat-thread-destroyed.listener.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/listeners/agent-chat-thread-lifecycle.listener.ts
@@ -9,10 +9,10 @@ import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/
import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';
import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
-// Destroy query hooks only see the selected columns of a row that is already
-// gone, so the running stream is read from the event snapshot
+// Destroys reach here from both the record API and the chat mutations, and a
+// destroy hook only sees the selected columns of a row that is already gone
@Injectable()
-export class AgentChatThreadDestroyedListener {
+export class AgentChatThreadLifecycleListener {
constructor(
private readonly threadLifecycleService: AgentChatThreadLifecycleService,
) {}
@@ -32,6 +32,10 @@ export class AgentChatThreadDestroyedListener {
streamId: activeStreamId,
});
}
+ this.threadLifecycleService.releaseThreadSandboxBestEffort({
+ workspaceId: payload.workspaceId,
+ threadId: id,
+ });
}
}
}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-many.post-query.hook.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-many.post-query.hook.ts
deleted file mode 100644
index 5ee1d2402d6..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-many.post-query.hook.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { type WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
-
-import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
-import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service';
-import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';
-
-@Injectable()
-@WorkspaceQueryHook({
- key: `agentChatThread.destroyMany`,
- type: WorkspaceQueryHookType.POST_HOOK,
-})
-export class AgentChatThreadDestroyManyPostQueryHook implements WorkspacePostQueryHookInstance {
- constructor(
- private readonly threadLifecycleService: AgentChatThreadLifecycleService,
- ) {}
-
- async execute(
- authContext: WorkspaceAuthContext,
- _objectName: string,
- payload: Pick<AgentChatThreadWorkspaceEntity, 'id'>[],
- ): Promise<void> {
- this.threadLifecycleService.releaseDestroyedThreadSandboxes({
- workspaceId: authContext.workspace.id,
- threadIds: payload.map((thread) => thread.id),
- });
- }
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-one.post-query.hook.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-one.post-query.hook.ts
deleted file mode 100644
index cb688df83ca..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-one.post-query.hook.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-import { type WorkspacePostQueryHookInstance } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/interfaces/workspace-query-hook.interface';
-
-import { WorkspaceQueryHook } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/decorators/workspace-query-hook.decorator';
-import { WorkspaceQueryHookType } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/types/workspace-query-hook.type';
-import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service';
-import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';
-
-@Injectable()
-@WorkspaceQueryHook({
- key: `agentChatThread.destroyOne`,
- type: WorkspaceQueryHookType.POST_HOOK,
-})
-export class AgentChatThreadDestroyOnePostQueryHook implements WorkspacePostQueryHookInstance {
- constructor(
- private readonly threadLifecycleService: AgentChatThreadLifecycleService,
- ) {}
-
- async execute(
- authContext: WorkspaceAuthContext,
- _objectName: string,
- payload: Pick<AgentChatThreadWorkspaceEntity, 'id'>[],
- ): Promise<void> {
- this.threadLifecycleService.releaseDestroyedThreadSandboxes({
- workspaceId: authContext.workspace.id,
- threadIds: payload.map((thread) => thread.id),
- });
- }
-}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-query-hook.module.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-query-hook.module.ts
index 3565c367628..c18547b1f1b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-query-hook.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-query-hook.module.ts
@@ -5,8 +5,6 @@ import { AgentChatThreadCreateOnePostQueryHook } from 'src/engine/metadata-modul
import { AgentChatThreadCreateManyPostQueryHook } from 'src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-create-many.post-query.hook';
import { AgentChatThreadUpdateOnePostQueryHook } from 'src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-update-one.post-query.hook';
import { AgentChatThreadUpdateManyPostQueryHook } from 'src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-update-many.post-query.hook';
-import { AgentChatThreadDestroyOnePostQueryHook } from 'src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-one.post-query.hook';
-import { AgentChatThreadDestroyManyPostQueryHook } from 'src/engine/metadata-modules/ai/ai-chat/query-hooks/agent-chat-thread-destroy-many.post-query.hook';
@Module({
imports: [AgentChatThreadLifecycleModule],
@@ -15,8 +13,6 @@ import { AgentChatThreadDestroyManyPostQueryHook } from 'src/engine/metadata-mod
AgentChatThreadCreateManyPostQueryHook,
AgentChatThreadUpdateOnePostQueryHook,
AgentChatThreadUpdateManyPostQueryHook,
- AgentChatThreadDestroyOnePostQueryHook,
- AgentChatThreadDestroyManyPostQueryHook,
],
})
export class AgentChatThreadQueryHookModule {}
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-chat.resolver.sharing.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-chat.resolver.sharing.spec.ts
index d44b8c2cf71..718dd58fcb3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-chat.resolver.sharing.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/__tests__/agent-chat.resolver.sharing.spec.ts
@@ -3,6 +3,7 @@ import {
AiExceptionCode,
} from 'src/engine/metadata-modules/ai/ai.exception';
import { AgentChatResolver } from 'src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver';
+import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service';
import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';
const WORKSPACE_ID = 'workspace';
@@ -56,9 +57,6 @@ const buildResolver = () => {
deleteThreadWithAccess: jest.fn(),
};
const broadcaster = { broadcast: jest.fn() };
- const sandbox = {
- releaseThreadSandboxBestEffort: jest.fn(),
- };
const recordEvents = {
emitThreadCreated: jest.fn(),
emitThreadUpdated: jest.fn(),
@@ -72,7 +70,6 @@ const buildResolver = () => {
{} as never,
{} as never,
broadcaster as never,
- sandbox as never,
sharing as never,
recordEvents as never,
);
@@ -90,6 +87,13 @@ const buildResolver = () => {
.mockResolvedValue({ chunks: [], maxSeq: 0 }),
};
const redis = { getClient: jest.fn() };
+ const threadLifecycle = new AgentChatThreadLifecycleService(
+ threadRepository as never,
+ redis as never,
+ {} as never,
+ {} as never,
+ recordEvents as never,
+ );
const workflowQuestions = { answer: jest.fn() };
const resolver = new AgentChatResolver(
chatService,
@@ -102,9 +106,8 @@ const buildResolver = () => {
getAvailableModels: () => ['model'],
validateModelAvailability: jest.fn(),
} as never,
- redis as never,
workflowQuestions as never,
- threadRepository as never,
+ threadLifecycle,
);
return {
resolver,
@@ -116,12 +119,12 @@ const buildResolver = () => {
events,
redis,
broadcaster,
- sandbox,
+ recordEvents,
};
};
describe('Shared conversation API boundaries', () => {
- it('does not announce deletion or release a sandbox when the transaction rolls back', async () => {
+ it('does not announce deletion when the transaction rolls back', async () => {
const context = buildResolver();
context.threadRepository.findOne.mockResolvedValue({
id: THREAD_ID,
@@ -139,9 +142,7 @@ describe('Shared conversation API boundaries', () => {
}),
).rejects.toThrow('delete failed');
expect(context.broadcaster.broadcast).not.toHaveBeenCalled();
- expect(
- context.sandbox.releaseThreadSandboxBestEffort,
- ).not.toHaveBeenCalled();
+ expect(context.recordEvents.emitThreadDestroyed).not.toHaveBeenCalled();
});
it('returns readable threads and catchup to viewers without granting ownership', async () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
index a13949cc995..faa695cfb03 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/resolvers/agent-chat.resolver.ts
@@ -1,10 +1,9 @@
import { AuthWorkspaceMemberId } from 'src/engine/decorators/auth/auth-workspace-member-id.decorator';
import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
+import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service';
import { AgentChatSharingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service';
import { AgentChatWorkflowQuestionService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-workflow-question.service';
import { isWorkflowRunThread } from 'src/engine/metadata-modules/ai/ai-chat/utils/is-workflow-run-thread.util';
-import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
-import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { UseFilters, UseGuards, UseInterceptors } from '@nestjs/common';
import {
Args,
@@ -21,7 +20,6 @@ import { isDefined, isNonEmptyString } from 'twenty-shared/utils';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-import { RedisClientService } from 'src/engine/core-modules/redis-client/redis-client.service';
import { toDisplayCredits } from 'src/engine/core-modules/usage/utils/to-display-credits.util';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
@@ -42,7 +40,6 @@ import { AgentChatEventPublisherService } from 'src/engine/metadata-modules/ai/a
import { AgentChatStreamingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service';
import { AgentChatService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service';
import { SystemPromptBuilderService } from 'src/engine/metadata-modules/ai/ai-chat/services/system-prompt-builder.service';
-import { getCancelChannel } from 'src/engine/metadata-modules/ai/ai-chat/utils/get-cancel-channel.util';
import { tagAiChatStreamScope } from 'src/engine/metadata-modules/ai/ai-chat/utils/tag-ai-chat-stream-scope.util';
import { UsageOperationType } from 'src/engine/core-modules/usage/enums/usage-operation-type.enum';
import { AiBillingService } from 'src/engine/metadata-modules/ai/ai-billing/services/ai-billing.service';
@@ -78,10 +75,8 @@ export class AgentChatResolver {
private readonly systemPromptBuilderService: SystemPromptBuilderService,
private readonly aiBillingService: AiBillingService,
private readonly aiModelRegistryService: AiModelRegistryService,
- private readonly redisClientService: RedisClientService,
private readonly agentChatWorkflowQuestionService: AgentChatWorkflowQuestionService,
- @InjectAgentHistoryRepository('agentChatThread')
- private readonly threadRepository: AgentHistoryRepository<AgentChatThreadWorkspaceEntity>,
+ private readonly threadLifecycleService: AgentChatThreadLifecycleService,
) {}
@Query(() => [AgentChatThreadDTO])
@@ -452,22 +447,8 @@ export class AgentChatResolver {
workspaceMemberId,
workspaceId,
});
- if (!isNonEmptyString(thread.activeStreamId)) {
- return true;
- }
-
- const redis = this.redisClientService.getClient();
- await redis.publish(
- getCancelChannel(threadId, thread.activeStreamId),
- 'cancel',
- );
-
- await this.threadRepository.update(
- workspaceId,
- { id: threadId, activeStreamId: thread.activeStreamId },
- { activeStreamId: null },
- );
+ await this.threadLifecycleService.stopStreamIfAny({ workspaceId, thread });
return true;
}
@@ -495,22 +476,18 @@ export class AgentChatResolver {
@AuthWorkspaceMemberId() workspaceMemberId: string,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
): Promise<AgentChatThreadWorkspaceEntity> {
- await this.sharingService.getThreadWithAccess({
+ const thread = await this.agentChatService.archiveThread({
threadId: id,
workspaceMemberId,
workspaceId,
- operationType: 'soft-delete',
- });
- await this.agentChatService.cancelActiveStreamIfAny({
- threadId: id,
- workspaceId,
});
- return this.agentChatService.archiveThread({
- threadId: id,
- workspaceMemberId,
+ await this.threadLifecycleService.stopArchivedThreads({
workspaceId,
+ threadIds: [id],
});
+
+ return thread;
}
@Mutation(() => AgentChatThreadDTO)
@@ -534,17 +511,6 @@ export class AgentChatResolver {
@AuthWorkspaceMemberId() workspaceMemberId: string,
@AuthWorkspace() { id: workspaceId }: WorkspaceEntity,
): Promise<boolean> {
- await this.sharingService.getThreadWithAccess({
- threadId: id,
- workspaceMemberId,
- workspaceId,
- operationType: 'delete',
- });
- await this.agentChatService.cancelActiveStreamIfAny({
- threadId: id,
- workspaceId,
- });
-
await this.agentChatService.hardDeleteThread({
threadId: id,
workspaceMemberId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-sharing.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-sharing.service.spec.ts
index 6967f602ded..4995a7ad5bf 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-sharing.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat-sharing.service.spec.ts
@@ -16,7 +16,7 @@ const args = {
workspaceMemberId: 'reader',
};
-const buildService = (legacyOwnerFieldPresent = true) => {
+const buildService = () => {
const query = jest.fn().mockResolvedValue([{ id: THREAD_ID }]);
const thread: Record<string, unknown> = {
id: THREAD_ID,
@@ -62,9 +62,7 @@ const buildService = (legacyOwnerFieldPresent = true) => {
readability: MetadataReadability.PRIVATE,
};
const flatFieldMetadataMaps = {
- byUniversalIdentifier: (legacyOwnerFieldPresent
- ? { 'bf830886-b6dc-46e9-a229-eecbb0e66032': { id: 'legacy' } }
- : {}) as Record<string, unknown>,
+ byUniversalIdentifier: {} as Record<string, unknown>,
};
const cache = {
getOrRecompute: jest.fn().mockResolvedValue({
@@ -119,30 +117,25 @@ const buildService = (legacyOwnerFieldPresent = true) => {
};
describe('Conversation common record access', () => {
- it.each([true, false])(
- 'creates threads before and after legacy owner contraction (legacy field: %s)',
- async (legacyOwnerFieldPresent) => {
- const { service, query } = buildService(legacyOwnerFieldPresent);
- await expect(
- service.createThread({
- workspaceId: WORKSPACE_ID,
- workspaceMemberId: 'reader',
- id: THREAD_ID,
- }),
- ).resolves.toMatchObject({ id: THREAD_ID });
- const [insert, parameters] = query.mock.calls[0];
- expect(insert).toContain('"workspaceMemberId"');
- expect(insert.includes('"userWorkspaceId"')).toBe(
- legacyOwnerFieldPresent,
- );
- expect(parameters).toEqual([
- THREAD_ID,
- null,
- 'reader',
- ...(legacyOwnerFieldPresent ? ['reader-membership'] : []),
- ]);
- },
- );
+ it('creates threads owned by the member, with the legacy owner', async () => {
+ const { service, query } = buildService();
+ await expect(
+ service.createThread({
+ workspaceId: WORKSPACE_ID,
+ workspaceMemberId: 'reader',
+ id: THREAD_ID,
+ }),
+ ).resolves.toMatchObject({ id: THREAD_ID });
+ const [insert, parameters] = query.mock.calls[0];
+ expect(insert).toContain('"workspaceMemberId"');
+ expect(insert).toContain('"userWorkspaceId"');
+ expect(parameters).toEqual([
+ THREAD_ID,
+ null,
+ 'reader',
+ 'reader-membership',
+ ]);
+ });
it('uses the common record policy for a non-owner reader', async () => {
const { service, repository } = buildService();
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.get-messages.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.get-messages.spec.ts
index 7fa8cd336d7..cbc5b2839c1 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.get-messages.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.get-messages.spec.ts
@@ -18,7 +18,6 @@ const buildService = () => {
{} as never,
{} as never,
{} as never,
- {} as never,
{
getThreadWithAccess: jest.fn().mockResolvedValue({ id: THREAD_ID }),
getReadableThread: jest.fn().mockResolvedValue({ id: THREAD_ID }),
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.ts
index 12f7bebb278..22bebe0a095 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.kickoff-message.spec.ts
@@ -35,7 +35,6 @@ const buildService = ({ existingHiddenMessage = null as unknown } = {}) => {
{} as never,
{} as never,
{} as never,
- {} as never,
{
getReadableThread: jest.fn().mockResolvedValue({ id: THREAD_ID }),
} as never,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.resolve-pending-question.spec.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.resolve-pending-question.spec.ts
index 2bcd83cd044..2c750743d23 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.resolve-pending-question.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/__tests__/agent-chat.service.resolve-pending-question.spec.ts
@@ -46,7 +46,6 @@ const buildService = () => {
{} as never,
{} as never,
{} as never,
- {} as never,
);
return { service, threadRepository, messagePartRepository };
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
index 75a15023ebb..fef7fe2ce95 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts
@@ -1,4 +1,3 @@
-import { hasLegacyChatThreadOwnerField } from 'src/engine/metadata-modules/ai/ai-chat/utils/has-legacy-chat-thread-owner-field.util';
import { lockAgentChatThread } from 'src/engine/metadata-modules/ai/ai-chat/utils/lock-agent-chat-thread.util';
import { IsNull } from 'typeorm';
import { type AgentHistoryStorageContext } from 'src/engine/metadata-modules/ai/ai-history/services/agent-history-workspace-storage.service';
@@ -149,10 +148,6 @@ export class AgentChatSharingService {
}): Promise<AgentChatThreadWorkspaceEntity> {
const authContext = await this.getAuthContext(args);
const objectMetadata = await this.getThreadObjectMetadata(args.workspaceId);
- const writesLegacyOwner = await hasLegacyChatThreadOwnerField(
- args.workspaceId,
- this.workspaceCacheService,
- );
await this.workspaceOrmManager.executeInWorkspaceContext(
() =>
@@ -170,13 +165,13 @@ export class AgentChatSharingService {
args.workspaceId,
async ({ manager, table }) => {
const records = await manager.query<AgentChatThreadWorkspaceEntity[]>(
- `INSERT INTO ${table('agentChatThread')} (id, title, "workspaceMemberId"${writesLegacyOwner ? ', "userWorkspaceId"' : ''})
- VALUES ($1, $2, $3${writesLegacyOwner ? ', $4' : ''}) RETURNING *`,
+ `INSERT INTO ${table('agentChatThread')} (id, title, "workspaceMemberId", "userWorkspaceId")
+ VALUES ($1, $2, $3, $4) RETURNING *`,
[
args.id ?? randomUUID(),
args.title ?? null,
authContext.workspaceMemberId,
- ...(writesLegacyOwner ? [authContext.userWorkspaceId] : []),
+ authContext.userWorkspaceId,
],
);
const record = records[0];
@@ -209,9 +204,7 @@ export class AgentChatSharingService {
...args
}: ThreadAccessArgs & {
operationType: 'update' | 'soft-delete' | 'restore';
- changes:
- | { title: string }
- | { archivedAt: Date | null; activeStreamId?: null };
+ changes: { title: string } | { archivedAt: Date | null };
}): Promise<AgentChatThreadWorkspaceEntity> {
return this.mutateThreadWithAccess({
...args,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
index 8c322125b04..2b9533f1f83 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-streaming.service.ts
@@ -570,11 +570,9 @@ export class AgentChatStreamingService {
await this.streamHeartbeatService.markClaimed(streamId);
- let resolved: {
- answerText: string;
- turnId: string | null;
- rollback: { partId: string; previousOutput: Record<string, unknown> };
- };
+ let resolved: Awaited<
+ ReturnType<AgentChatService['resolvePendingQuestion']>
+ >;
try {
resolved = await this.agentChatService.resolvePendingQuestion({
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service.ts
index 9af73ed786d..68a9b266262 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service.ts
@@ -10,7 +10,6 @@ import { CodeInterpreterService } from 'src/engine/core-modules/code-interpreter
import { RedisClientService } from 'src/engine/core-modules/redis-client/redis-client.service';
import { AgentChatThreadRecordEventService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-record-event.service';
import { getCancelChannel } from 'src/engine/metadata-modules/ai/ai-chat/utils/get-cancel-channel.util';
-import { hasLegacyChatThreadOwnerField } from 'src/engine/metadata-modules/ai/ai-chat/utils/has-legacy-chat-thread-owner-field.util';
import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/agent-history-repository';
import { AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';
@@ -30,24 +29,6 @@ export class AgentChatThreadLifecycleService {
private readonly threadRecordEventService: AgentChatThreadRecordEventService,
) {}
- async cancelActiveStreamIfAny({
- workspaceId,
- threadId,
- }: {
- workspaceId: string;
- threadId: string;
- }): Promise<void> {
- const thread = await this.threadRepository.findOne(workspaceId, {
- where: { id: threadId },
- });
-
- if (!isDefined(thread) || !isNonEmptyString(thread.activeStreamId)) {
- return;
- }
-
- await this.cancelStream({ threadId, streamId: thread.activeStreamId });
- }
-
async cancelStream({
threadId,
streamId,
@@ -78,8 +59,7 @@ export class AgentChatThreadLifecycleService {
);
}
- // Archiving sets archivedAt rather than soft deleting, so it reaches the
- // update hooks, which only know which rows they touched
+ // Awaited by the archive paths so the stream is stopped before they respond
async stopArchivedThreads({
workspaceId,
threadIds,
@@ -105,20 +85,6 @@ export class AgentChatThreadLifecycleService {
}
}
- // Sharing grants stay, as for any destroyed record, so that the destroy
- // event still reaches the thread's audience
- releaseDestroyedThreadSandboxes({
- workspaceId,
- threadIds,
- }: {
- workspaceId: string;
- threadIds: string[];
- }): void {
- for (const threadId of threadIds) {
- this.releaseThreadSandboxBestEffort({ workspaceId, threadId });
- }
- }
-
// The owner field is not writable through the record API. Owned and
// workflow-run threads are skipped so an upsert cannot reassign them
async assignCreatedThreadsToCreator({
@@ -137,10 +103,6 @@ export class AgentChatThreadLifecycleService {
await this.workspaceCacheService.getOrRecompute(workspaceId, [
'flatFieldMetadataMaps',
]);
- const writesLegacyOwner = await hasLegacyChatThreadOwnerField(
- workspaceId,
- this.workspaceCacheService,
- );
const unassignedThreadCriteria = {
workspaceMemberId: IsNull(),
...(hasWorkflowRunThreadFields(flatFieldMetadataMaps)
@@ -165,9 +127,7 @@ export class AgentChatThreadLifecycleService {
},
{
workspaceMemberId: authContext.workspaceMemberId,
- ...(writesLegacyOwner
- ? { userWorkspaceId: authContext.userWorkspaceId }
- : {}),
+ userWorkspaceId: authContext.userWorkspaceId,
},
);
@@ -196,7 +156,7 @@ export class AgentChatThreadLifecycleService {
}
}
- private async stopStreamIfAny({
+ async stopStreamIfAny({
workspaceId,
thread,
}: {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-workflow-question.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-workflow-question.service.ts
index 5a2dd287caa..d53073335f5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-workflow-question.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-workflow-question.service.ts
@@ -1,6 +1,5 @@
import { Injectable, Logger } from '@nestjs/common';
-import { isNonEmptyString } from '@sniptt/guards';
import { PermissionFlagType } from 'twenty-shared/constants';
import { type AskQuestionAnswer } from 'twenty-shared/ai';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
@@ -55,13 +54,6 @@ export class AgentChatWorkflowQuestionService {
}): Promise<void> {
const { workflowRunId } = thread;
- if (!isNonEmptyString(workflowRunId)) {
- throw new AiException(
- 'This conversation does not belong to a workflow run',
- AiExceptionCode.QUESTION_NOT_PENDING,
- );
- }
-
// Only the answer's text is recorded for the resumed agent, so an
// attachment would be dropped without the agent ever seeing it.
if (isNonEmptyArray(fileAttachments)) {
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
index 7c1040f9622..c9e57053fa4 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat.service.ts
@@ -38,7 +38,6 @@ import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { serializeAgentChatThreadForBroadcast } from 'src/engine/metadata-modules/ai/ai-chat/utils/serialize-agent-chat-thread-for-broadcast.util';
import { AiChatFileAttachment } from 'src/engine/metadata-modules/ai/ai-chat/types/ai-chat-file-attachment.type';
-import { AgentChatThreadLifecycleService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-lifecycle.service';
import { AgentChatThreadRecordEventService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-record-event.service';
import { AgentTitleGenerationService } from './agent-title-generation.service';
import { AgentChatThreadDTO } from '../dtos/agent-chat-thread.dto';
@@ -65,7 +64,6 @@ export class AgentChatService {
private readonly fileRepository: WorkspaceScopedRepository<FileEntity>,
private readonly titleGenerationService: AgentTitleGenerationService,
private readonly workspaceEventBroadcaster: WorkspaceEventBroadcaster,
- private readonly threadLifecycleService: AgentChatThreadLifecycleService,
private readonly sharingService: AgentChatSharingService,
private readonly threadRecordEventService: AgentChatThreadRecordEventService,
) {}
@@ -416,21 +414,6 @@ export class AgentChatService {
});
}
- async hasMessageById({
- id,
- workspaceId,
- }: {
- id: string;
- workspaceId: string;
- }): Promise<boolean> {
- const existingMessage = await this.messageRepository.findOne(workspaceId, {
- where: { id },
- select: ['id'],
- });
-
- return isDefined(existingMessage);
- }
-
async getMessagesForThread({
threadId,
workspaceMemberId,
@@ -1059,101 +1042,73 @@ export class AgentChatService {
);
}
- const threadBefore = await this.findThreadForRecordEvent({
- workspaceId,
- threadId,
- });
- const updated = await this.sharingService.updateThreadWithAccess({
+ return this.updateThread({
threadId,
workspaceMemberId,
workspaceId,
operationType: 'update',
changes: { title: trimmed },
+ broadcastFields: ['title'],
});
-
- await this.broadcastThreadUpdated(
- updated,
- workspaceId,
- ['title'],
- workspaceMemberId,
- );
- if (isDefined(threadBefore)) {
- await this.threadRecordEventService.emitThreadUpdated({
- workspaceId,
- threadBefore,
- });
- }
-
- return updated;
}
- async archiveThread({
- threadId,
- workspaceMemberId,
- workspaceId,
- }: {
+ async archiveThread(args: {
threadId: string;
workspaceMemberId: string;
workspaceId: string;
}): Promise<AgentChatThreadWorkspaceEntity> {
- const threadBefore = await this.findThreadForRecordEvent({
- workspaceId,
- threadId,
- });
- const thread = await this.sharingService.updateThreadWithAccess({
- threadId,
- workspaceMemberId,
- workspaceId,
+ return this.updateThread({
+ ...args,
operationType: 'soft-delete',
- changes: { archivedAt: new Date(), activeStreamId: null },
+ changes: { archivedAt: new Date() },
+ broadcastFields: ['deletedAt'],
});
+ }
- await this.broadcastThreadUpdated(
- thread,
- workspaceId,
- ['deletedAt'],
- workspaceMemberId,
- );
- if (isDefined(threadBefore)) {
- await this.threadRecordEventService.emitThreadUpdated({
- workspaceId,
- threadBefore,
- });
- }
-
- this.threadLifecycleService.releaseThreadSandboxBestEffort({
- workspaceId,
- threadId,
+ async unarchiveThread(args: {
+ threadId: string;
+ workspaceMemberId: string;
+ workspaceId: string;
+ }): Promise<AgentChatThreadWorkspaceEntity> {
+ return this.updateThread({
+ ...args,
+ operationType: 'restore',
+ changes: { archivedAt: null },
+ broadcastFields: ['deletedAt'],
});
-
- return thread;
}
- async unarchiveThread({
+ private async updateThread({
threadId,
workspaceMemberId,
workspaceId,
+ operationType,
+ changes,
+ broadcastFields,
}: {
threadId: string;
workspaceMemberId: string;
workspaceId: string;
+ operationType: 'update' | 'soft-delete' | 'restore';
+ changes: { title: string } | { archivedAt: Date | null };
+ broadcastFields: (keyof AgentChatThreadDTO)[];
}): Promise<AgentChatThreadWorkspaceEntity> {
- const threadBefore = await this.findThreadForRecordEvent({
- workspaceId,
- threadId,
+ // Access-checked writes return raw rows; record events carry ORM records
+ const threadBefore = await this.threadRepository.findOne(workspaceId, {
+ where: { id: threadId },
});
const thread = await this.sharingService.updateThreadWithAccess({
threadId,
workspaceMemberId,
workspaceId,
- operationType: 'restore',
- changes: { archivedAt: null },
+ operationType,
+ changes,
});
await this.broadcastThreadUpdated(
thread,
workspaceId,
- ['deletedAt'],
+ broadcastFields,
workspaceMemberId,
);
if (isDefined(threadBefore)) {
@@ -1220,37 +1175,6 @@ export class AgentChatService {
workspaceId,
threadBefore: thread,
});
-
- this.threadLifecycleService.releaseThreadSandboxBestEffort({
- workspaceId,
- threadId,
- });
- }
-
- async cancelActiveStreamIfAny({
- threadId,
- workspaceId,
- }: {
- threadId: string;
- workspaceId: string;
- }): Promise<void> {
- await this.threadLifecycleService.cancelActiveStreamIfAny({
- workspaceId,
- threadId,
- });
- }
-
- // Access-checked writes return raw rows; record events carry ORM records
- private findThreadForRecordEvent({
- workspaceId,
- threadId,
- }: {
- workspaceId: string;
- threadId: string;
- }): Promise<AgentChatThreadWorkspaceEntity | null> {
- return this.threadRepository.findOne(workspaceId, {
- where: { id: threadId },
- });
}
async notifyThreadActivityUpdated({
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/has-legacy-chat-thread-owner-field.util.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/has-legacy-chat-thread-owner-field.util.ts
deleted file mode 100644
index c1218e2565f..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/utils/has-legacy-chat-thread-owner-field.util.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { isDefined } from 'twenty-shared/utils';
-
-import { LEGACY_CHAT_THREAD_OWNER_FIELD_UNIVERSAL_IDENTIFIER } from 'src/engine/metadata-modules/ai/ai-chat/constants/legacy-chat-thread-owner-field-universal-identifier.constant';
-import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
-
-// The owner contract removes this required column per workspace during deployment.
-export const hasLegacyChatThreadOwnerField = async (
- workspaceId: string,
- workspaceCacheService: WorkspaceCacheService,
-): Promise<boolean> => {
- const { flatFieldMetadataMaps } = await workspaceCacheService.getOrRecompute(
- workspaceId,
- ['flatFieldMetadataMaps'],
- );
- return isDefined(
- flatFieldMetadataMaps.byUniversalIdentifier[
- LEGACY_CHAT_THREAD_OWNER_FIELD_UNIVERSAL_IDENTIFIER
- ],
- );
-};
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout-tabs.template.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout-tabs.template.ts
index cad03869c18..fd6142f7b55 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout-tabs.template.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-page-layout-tabs.template.ts
@@ -190,6 +190,8 @@ export const WIDGET_PROPS = {
),
type: WidgetType.CHAT_THREADS,
position: VERTICAL_LIST_LAYOUT_POSITIONS.FIRST,
+ conditionalAvailabilityExpression:
+ 'featureFlags.IS_CONVERSATIONS_TAB_ENABLED',
},
calendar: {
title: 'Calendar',
diff --git a/packages/twenty-server/src/modules/input-ask/standard-objects/input-ask.workspace-entity.ts b/packages/twenty-server/src/modules/input-ask/standard-objects/input-ask.workspace-entity.ts
index 93d21224aba..aa9c67b123e 100644
--- a/packages/twenty-server/src/modules/input-ask/standard-objects/input-ask.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/input-ask/standard-objects/input-ask.workspace-entity.ts
@@ -1,3 +1,5 @@
+import { type AskQuestionItem } from 'twenty-shared/ai';
+
import { type AgentChatThreadWorkspaceEntity } from 'src/engine/metadata-modules/ai/ai-history/standard-objects/agent-chat-thread.workspace-entity';
import { type InputAskStatus } from 'src/modules/input-ask/enums/input-ask-status.enum';
import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
@@ -13,7 +15,10 @@ export class InputAskWorkspaceEntity extends BaseWorkspaceEntity {
// The questions are snapshotted rather than read back from the step: a
// workflow version can be edited or discarded after the Ask goes out, and
// what someone was asked has to stay what they were asked.
- form: { fields: FormFieldMetadata[] } | null;
+ form:
+ | { fields: FormFieldMetadata[] }
+ | { questions: AskQuestionItem[] }
+ | null;
response: Record<string, unknown> | null;
answeredAt: string | null;
stepId: string | null;
diff --git a/packages/twenty-server/src/modules/input-ask/workspace-services/input-ask.workspace-service.ts b/packages/twenty-server/src/modules/input-ask/workspace-services/input-ask.workspace-service.ts
index 6866503b517..479e5c6a123 100644
--- a/packages/twenty-server/src/modules/input-ask/workspace-services/input-ask.workspace-service.ts
+++ b/packages/twenty-server/src/modules/input-ask/workspace-services/input-ask.workspace-service.ts
@@ -1,5 +1,6 @@
import { Injectable } from '@nestjs/common';
+import { type AskQuestionItem } from 'twenty-shared/ai';
import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
import { isDefined, isPlainObject } from 'twenty-shared/utils';
import { StepStatus, type WorkflowRunStepInfo } from 'twenty-shared/workflow';
@@ -72,14 +73,6 @@ export class InputAskWorkspaceService {
return;
}
- const existingInputAsk = await inputAskRepository.findOne({
- where: { workflowRunId, stepId, toolCallId: IsNull() },
- });
-
- if (isDefined(existingInputAsk)) {
- return;
- }
-
const position = await this.recordPositionService.buildRecordPosition({
value: 'first',
objectMetadata: { isCustom: false, nameSingular: 'inputAsk' },
@@ -96,8 +89,8 @@ export class InputAskWorkspaceService {
position,
});
} catch (error) {
- // Two workers can clear the read above at the same time, and the loser
- // of that race wants the winner's row rather than a failed step.
+ // The row is already pending, whether from an earlier execution or a
+ // concurrent worker
if (!isDuplicateEntry(error)) {
throw error;
}
@@ -160,7 +153,7 @@ export class InputAskWorkspaceService {
threadId: string;
toolCallId: string;
name: string;
- questions: unknown[];
+ questions: AskQuestionItem[];
}): Promise<void> {
if (!(await this.hasInputAskObject(workspaceId))) {
return;
@@ -195,6 +188,7 @@ export class InputAskWorkspaceService {
// An agent can ask several times in one conversation, so the answer is
// matched to its question by tool call, never to whichever Ask is pending.
+ // The run may already have ended and canceled it after taking the answer.
async answerForToolCall({
workspaceId,
threadId,
@@ -215,7 +209,7 @@ export class InputAskWorkspaceService {
await this.executeAsSystem(workspaceId, async (inputAskRepository) => {
await inputAskRepository.update(
- { threadId, toolCallId, status: InputAskStatus.PENDING },
+ { threadId, toolCallId, status: Not(InputAskStatus.ANSWERED) },
{
status: InputAskStatus.ANSWERED,
response,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts
index 3c1e2eb2929..716794d98ba 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/ai-agent.workflow-action.ts
@@ -97,7 +97,7 @@ export class AiAgentWorkflowAction implements WorkflowAction {
// The conversation is a record of the step, not part of its outcome, so a
// failure to write it must not fail a step whose agent did its work.
const recordConversation = (
- executionResult?: AgentExecutionResult,
+ executionResult: AgentExecutionResult,
): Promise<RecordedConversation | null> =>
(isDefined(resumedThreadId)
? this.workflowAgentConversationService.recordContinuation({
@@ -132,43 +132,36 @@ export class AiAgentWorkflowAction implements WorkflowAction {
const startedAtMs = Date.now();
- const executionResult = await this.aiAgentExecutionService
- .executeAgent({
- agent,
- ...(isDefined(resumedThreadId)
- ? {
- messages: [],
- priorModelMessages:
- await this.workflowAgentConversationService.loadModelMessages({
- workspaceId,
- threadId: resumedThreadId,
- }),
- }
- : { messages: [{ role: 'user', content: resolvedPrompt }] }),
- baseSystemPrompt: isAskingQuestionsAllowed
- ? `${WORKFLOW_BASE_SYSTEM_PROMPT}\n\n${WORKFLOW_AGENT_ASK_QUESTIONS_PROMPT}`
- : WORKFLOW_BASE_SYSTEM_PROMPT,
- pausingTools: isAskingQuestionsAllowed
- ? {
- [ASK_QUESTIONS_TOOL_NAME]: createAskQuestionsTool({
- isWorkspaceSetupThread: false,
+ const executionResult = await this.aiAgentExecutionService.executeAgent({
+ agent,
+ ...(isDefined(resumedThreadId)
+ ? {
+ messages: [],
+ priorModelMessages:
+ await this.workflowAgentConversationService.loadModelMessages({
+ workspaceId,
+ threadId: resumedThreadId,
}),
- }
- : {},
- actorContext: executionContext.isActingOnBehalfOfUser
- ? executionContext.initiator
- : undefined,
- authContext: executionContext.authContext,
- workspaceId,
- userWorkspaceId,
- operationType: UsageOperationType.AI_WORKFLOW_TOKEN,
- })
- .catch(async (error: unknown) => {
- if (isDefined(resumedThreadId)) {
- await recordConversation();
- }
- throw error;
- });
+ }
+ : { messages: [{ role: 'user', content: resolvedPrompt }] }),
+ baseSystemPrompt: isAskingQuestionsAllowed
+ ? `${WORKFLOW_BASE_SYSTEM_PROMPT}\n\n${WORKFLOW_AGENT_ASK_QUESTIONS_PROMPT}`
+ : WORKFLOW_BASE_SYSTEM_PROMPT,
+ pausingTools: isAskingQuestionsAllowed
+ ? {
+ [ASK_QUESTIONS_TOOL_NAME]: createAskQuestionsTool({
+ isWorkspaceSetupThread: false,
+ }),
+ }
+ : {},
+ actorContext: executionContext.isActingOnBehalfOfUser
+ ? executionContext.initiator
+ : undefined,
+ authContext: executionContext.authContext,
+ workspaceId,
+ userWorkspaceId,
+ operationType: UsageOperationType.AI_WORKFLOW_TOKEN,
+ });
const durationMs = Date.now() - startedAtMs;
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts
index b61ba87963f..557cb07d092 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/ai-agent/services/workflow-agent-conversation.workspace-service.ts
@@ -1,4 +1,3 @@
-import { InputAskWorkspaceService } from 'src/modules/input-ask/workspace-services/input-ask.workspace-service';
import { Injectable } from '@nestjs/common';
import { randomUUID } from 'node:crypto';
@@ -26,6 +25,7 @@ import { AgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-histor
import { InjectAgentHistoryRepository } from 'src/engine/metadata-modules/ai/ai-history/repositories/inject-agent-history-repository.decorator';
import { hasWorkflowRunThreadFields } from 'src/engine/metadata-modules/ai/ai-history/utils/has-workflow-run-thread-fields.util';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { InputAskWorkspaceService } from 'src/modules/input-ask/workspace-services/input-ask.workspace-service';
import { WorkflowRunWorkspaceService } from 'src/modules/workflow/workflow-runner/workflow-run/workflow-run.workspace-service';
type RecordedExecutionResult = {
@@ -76,7 +76,7 @@ export class WorkflowAgentConversationWorkspaceService {
agentId: string | null;
prompt: string;
initiatorUserWorkspaceId: string | null;
- executionResult?: RecordedExecutionResult;
+ executionResult: RecordedExecutionResult;
}): Promise<RecordedConversation | null> {
const { flatFieldMetadataMaps } =
await this.workspaceCacheService.getOrRecompute(workspaceId, [
@@ -143,7 +143,7 @@ export class WorkflowAgentConversationWorkspaceService {
stepId: string;
threadId: string;
agentId: string | null;
- executionResult?: RecordedExecutionResult;
+ executionResult: RecordedExecutionResult;
}): Promise<RecordedConversation> {
const turnId = await this.insertTurn({ workspaceId, threadId, agentId });
@@ -202,9 +202,9 @@ export class WorkflowAgentConversationWorkspaceService {
threadId: string;
turnId: string;
agentId: string | null;
- executionResult?: RecordedExecutionResult;
+ executionResult: RecordedExecutionResult;
}): Promise<boolean> {
- const replyParts = mapAiStepsToUiMessageParts(executionResult?.steps ?? []);
+ const replyParts = mapAiStepsToUiMessageParts(executionResult.steps ?? []);
if (replyParts.length === 0) {
return false;
@@ -220,7 +220,7 @@ export class WorkflowAgentConversationWorkspaceService {
parts: replyParts,
});
- const pendingQuestionPart = executionResult?.isPaused
+ const pendingQuestionPart = executionResult.isPaused
? findPendingQuestionPart(replyParts)
: undefined;