Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

refactor(editor): remove stable feature flags (#10547)

Saul-Mironef23f29610c6d
diff --git a/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-edgeless-linked-doc-block.ts b/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-edgeless-linked-doc-block.ts
index a859006e46..18f2ac6af9 100644
--- a/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-edgeless-linked-doc-block.ts
+++ b/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-edgeless-linked-doc-block.ts
@@ -6,7 +6,6 @@ import {
EMBED_CARD_HEIGHT,
EMBED_CARD_WIDTH,
} from '@blocksuite/affine-shared/consts';
-import { FeatureFlagService } from '@blocksuite/affine-shared/services';
import {
cloneReferenceInfoWithoutAliases,
isNewTabTrigger,
@@ -23,14 +22,6 @@ export class EmbedEdgelessLinkedDocBlockComponent extends toEdgelessEmbedBlock(
override convertToEmbed = () => {
const { id, doc, caption, xywh } = this.model;
- // synced doc entry controlled by flag
- const isSyncedDocEnabled = doc
- .get(FeatureFlagService)
- .getFlag('enable_synced_doc_block');
- if (!isSyncedDocEnabled) {
- return;
- }
-
const style = 'syncedDoc';
const bound = Bound.deserialize(xywh);
bound.w = EMBED_CARD_WIDTH[style];
diff --git a/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-block.ts b/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-block.ts
index 75131e5605..df3c9cbcfd 100644
--- a/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-block.ts
+++ b/blocksuite/affine/block-embed/src/embed-linked-doc-block/embed-linked-doc-block.ts
@@ -14,7 +14,6 @@ import {
import {
DocDisplayMetaProvider,
DocModeProvider,
- FeatureFlagService,
OpenDocExtensionIdentifier,
type OpenDocMode,
ThemeProvider,
@@ -131,14 +130,6 @@ export class EmbedLinkedDocBlockComponent extends EmbedBlockComponent<EmbedLinke
const { doc, caption } = this.model;
- // synced doc entry controlled by flag
- const isSyncedDocEnabled = doc
- .get(FeatureFlagService)
- .getFlag('enable_synced_doc_block');
- if (!isSyncedDocEnabled) {
- return;
- }
-
const parent = doc.getParent(this.model);
if (!parent) {
return;
diff --git a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-embed-card-button.ts b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-embed-card-button.ts
index f415b30cce..cdea84b52d 100644
--- a/blocksuite/affine/block-root/src/widgets/element-toolbar/change-embed-card-button.ts
+++ b/blocksuite/affine/block-root/src/widgets/element-toolbar/change-embed-card-button.ts
@@ -43,7 +43,6 @@ import {
import {
EmbedOptionProvider,
type EmbedOptions,
- FeatureFlagService,
GenerateDocUrlProvider,
type GenerateDocUrlService,
type LinkEventType,
@@ -419,16 +418,6 @@ export class EdgelessChangeEmbedCardButton extends WithDisposable(LitElement) {
private get _canConvertToEmbedView() {
const block = this._blockComponent;
- // synced doc entry controlled by awareness flag
- if (!!block && isEmbedLinkedDocBlock(block.model)) {
- const isSyncedDocEnabled = block.doc
- .get(FeatureFlagService)
- .getFlag('enable_synced_doc_block');
- if (!isSyncedDocEnabled) {
- return false;
- }
- }
-
return (
(block && 'convertToEmbed' in block) ||
this._embedOptions?.viewType === 'embed'
diff --git a/blocksuite/affine/block-root/src/widgets/embed-card-toolbar/embed-card-toolbar.ts b/blocksuite/affine/block-root/src/widgets/embed-card-toolbar/embed-card-toolbar.ts
index 145e36e674..7b25a7dcb1 100644
--- a/blocksuite/affine/block-root/src/widgets/embed-card-toolbar/embed-card-toolbar.ts
+++ b/blocksuite/affine/block-root/src/widgets/embed-card-toolbar/embed-card-toolbar.ts
@@ -44,7 +44,6 @@ import {
import {
EmbedOptionProvider,
type EmbedOptions,
- FeatureFlagService,
GenerateDocUrlProvider,
type GenerateDocUrlService,
type LinkEventType,
@@ -236,16 +235,6 @@ export class EmbedCardToolbar extends WidgetComponent<
cloneGroups(BUILT_IN_GROUPS);
private get _canConvertToEmbedView() {
- // synced doc entry controlled by awareness flag
- if (this.focusModel && isEmbedLinkedDocBlock(this.focusModel)) {
- const isSyncedDocEnabled = this.doc
- .get(FeatureFlagService)
- .getFlag('enable_synced_doc_block');
- if (!isSyncedDocEnabled) {
- return false;
- }
- }
-
if (!this.focusBlock) return false;
return (
diff --git a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-popup.ts b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-popup.ts
index ce337ccee8..d5d25eb3e7 100644
--- a/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-popup.ts
+++ b/blocksuite/affine/components/src/rich-text/inline/presets/nodes/reference-node/reference-popup.ts
@@ -1,6 +1,5 @@
import type { ReferenceInfo } from '@blocksuite/affine-model';
import {
- FeatureFlagService,
GenerateDocUrlProvider,
type LinkEventType,
OpenDocExtensionIdentifier,
@@ -320,10 +319,6 @@ export class ReferencePopup extends WithDisposable(LitElement) {
}
private _viewSelector() {
- // synced doc entry controlled by flag
- const isSyncedDocEnabled = this.doc
- .get(FeatureFlagService)
- .getFlag('enable_synced_doc_block');
const buttons = [];
buttons.push({
@@ -338,17 +333,13 @@ export class ReferencePopup extends WithDisposable(LitElement) {
disabled: this.doc.readonly,
});
- if (isSyncedDocEnabled) {
- buttons.push({
- type: 'embed',
- label: 'Embed view',
- action: () => this._convertToEmbedView(),
- disabled:
- this.doc.readonly ||
- this.isLinkedNode ||
- this._embedViewButtonDisabled,
- });
- }
+ buttons.push({
+ type: 'embed',
+ label: 'Embed view',
+ action: () => this._convertToEmbedView(),
+ disabled:
+ this.doc.readonly || this.isLinkedNode || this._embedViewButtonDisabled,
+ });
return html`
<editor-menu-button
diff --git a/blocksuite/affine/shared/src/services/feature-flag-service.ts b/blocksuite/affine/shared/src/services/feature-flag-service.ts
index f457ad1c54..7f94643bce 100644
--- a/blocksuite/affine/shared/src/services/feature-flag-service.ts
+++ b/blocksuite/affine/shared/src/services/feature-flag-service.ts
@@ -2,8 +2,6 @@ import { type Store, StoreExtension } from '@blocksuite/store';
import { type Signal, signal } from '@preact/signals-core';
export interface BlockSuiteFlags {
- enable_synced_doc_block: boolean;
- enable_pie_menu: boolean;
enable_database_number_formatting: boolean;
enable_database_attachment_note: boolean;
enable_database_full_width: boolean;
@@ -24,8 +22,6 @@ export class FeatureFlagService extends StoreExtension {
static override key = 'feature-flag-server';
private readonly _flags: Signal<BlockSuiteFlags> = signal({
- enable_synced_doc_block: true,
- enable_pie_menu: false,
enable_database_number_formatting: false,
enable_database_attachment_note: false,
enable_database_full_width: false,
diff --git a/blocksuite/integration-test/src/__tests__/utils/setup.ts b/blocksuite/integration-test/src/__tests__/utils/setup.ts
index 6bfd34c7ca..cdc8865eb1 100644
--- a/blocksuite/integration-test/src/__tests__/utils/setup.ts
+++ b/blocksuite/integration-test/src/__tests__/utils/setup.ts
@@ -41,8 +41,6 @@ function createCollectionOptions() {
schema,
idGenerator,
defaultFlags: {
- enable_synced_doc_block: true,
- enable_pie_menu: true,
readonly: {
'doc:home': false,
},
diff --git a/packages/frontend/core/src/modules/feature-flag/constant.ts b/packages/frontend/core/src/modules/feature-flag/constant.ts
index a87431149d..1563fa1119 100644
--- a/packages/frontend/core/src/modules/feature-flag/constant.ts
+++ b/packages/frontend/core/src/modules/feature-flag/constant.ts
@@ -53,16 +53,6 @@ export const AFFINE_FLAGS = {
'com.affine.settings.workspace.experimental-features.enable-block-query.description',
configurable: isCanaryBuild,
},
- enable_synced_doc_block: {
- category: 'blocksuite',
- bsFlag: 'enable_synced_doc_block',
- displayName:
- 'com.affine.settings.workspace.experimental-features.enable-synced-doc-block.name',
- description:
- 'com.affine.settings.workspace.experimental-features.enable-synced-doc-block.description',
- configurable: false,
- defaultState: true,
- },
enable_edgeless_text: {
category: 'blocksuite',
bsFlag: 'enable_edgeless_text',