From ce9a3c82ee4367af13dc529f873d005c7239ce3d Mon Sep 17 00:00:00 2001 From: donteatfriedrice Date: Wed, 19 Jun 2024 03:13:19 +0000 Subject: [PATCH] feat: remove new image actions feature flag (#7256) --- .../core/src/blocksuite/presets/ai/_common/config.ts | 9 +++------ .../blocksuite/presets/ai/actions/edgeless-handler.ts | 11 ----------- .../presets/ai/entries/edgeless/actions-config.ts | 7 +++---- .../general-setting/experimental-features/index.tsx | 1 - 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/packages/frontend/core/src/blocksuite/presets/ai/_common/config.ts b/packages/frontend/core/src/blocksuite/presets/ai/_common/config.ts index 6bcc85c55c..0da117dd3b 100644 --- a/packages/frontend/core/src/blocksuite/presets/ai/_common/config.ts +++ b/packages/frontend/core/src/blocksuite/presets/ai/_common/config.ts @@ -453,8 +453,7 @@ export function buildAIImageItemGroups(): AIItemGroupConfig[] { { name: 'AI image filter', icon: ImproveWritingIcon, - showWhen: (_, __, host) => - !!host.doc.awarenessStore.getFlag('enable_new_image_actions'), + showWhen: () => true, subItem: createImageFilterSubItem(blockActionTrackerOptions), subItemOffset: [12, -4], beta: true, @@ -462,8 +461,7 @@ export function buildAIImageItemGroups(): AIItemGroupConfig[] { { name: 'Image processing', icon: AIImageIcon, - showWhen: (_, __, host) => - !!host.doc.awarenessStore.getFlag('enable_new_image_actions'), + showWhen: () => true, subItem: createImageProcessingSubItem(blockActionTrackerOptions), subItemOffset: [12, -6], beta: true, @@ -471,8 +469,7 @@ export function buildAIImageItemGroups(): AIItemGroupConfig[] { { name: 'Generate a caption', icon: AIPenIcon, - showWhen: (_, __, host) => - !!host.doc.awarenessStore.getFlag('enable_new_image_actions'), + showWhen: () => true, beta: true, handler: actionToHandler( 'generateCaption', diff --git a/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-handler.ts b/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-handler.ts index 05ead0d531..96078de6eb 100644 --- a/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-handler.ts +++ b/packages/frontend/core/src/blocksuite/presets/ai/actions/edgeless-handler.ts @@ -526,17 +526,6 @@ export function imageOnlyShowWhen(_: unknown, __: unknown, host: EditorHost) { return selected.length === 1 && selected[0] instanceof ImageBlockModel; } -export function experimentalImageActionsShowWhen( - _: unknown, - __: unknown, - host: EditorHost -) { - return ( - !!host.doc.awarenessStore.getFlag('enable_new_image_actions') && - imageOnlyShowWhen(_, __, host) - ); -} - export function mindmapRootShowWhen(_: unknown, __: unknown, host: EditorHost) { const selected = getCopilotSelectedElems(host); diff --git a/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/actions-config.ts b/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/actions-config.ts index bf61d403b4..6d3d9b172e 100644 --- a/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/actions-config.ts +++ b/packages/frontend/core/src/blocksuite/presets/ai/entries/edgeless/actions-config.ts @@ -31,7 +31,6 @@ import { } from '../../_common/icons.js'; import { actionToHandler, - experimentalImageActionsShowWhen, imageOnlyShowWhen, mindmapChildShowWhen, mindmapRootShowWhen, @@ -469,7 +468,7 @@ const generateGroup: AIItemGroupConfig = { { name: 'AI image filter', icon: ImproveWritingIcon, - showWhen: experimentalImageActionsShowWhen, + showWhen: imageOnlyShowWhen, subItem: imageFilterSubItem, subItemOffset: [12, -4], beta: true, @@ -477,7 +476,7 @@ const generateGroup: AIItemGroupConfig = { { name: 'Image processing', icon: AIImageIcon, - showWhen: experimentalImageActionsShowWhen, + showWhen: imageOnlyShowWhen, subItem: imageProcessingSubItem, subItemOffset: [12, -6], beta: true, @@ -485,7 +484,7 @@ const generateGroup: AIItemGroupConfig = { { name: 'Generate a caption', icon: AIPenIcon, - showWhen: experimentalImageActionsShowWhen, + showWhen: imageOnlyShowWhen, beta: true, handler: actionToHandler( 'generateCaption', diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx index 012ff58727..e8002f17eb 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx @@ -126,7 +126,6 @@ const blocksuiteFeatureFlags: Partial> = { enable_expand_database_block: 'Enable Expand Database Block', enable_database_statistics: 'Enable Database Block Statistics', enable_block_query: 'Enable Todo Block Query', - enable_new_image_actions: 'Enable New Image Actions', enable_edgeless_text: 'Enable New Edgeless Text', };