mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-13 12:55:00 +00:00
chore(core): remove template doc feature flag (#10252)
This commit is contained in:
@@ -3,7 +3,6 @@ import { usePageHelper } from '@affine/core/components/blocksuite/block-suite-pa
|
||||
import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
|
||||
import { DocsService } from '@affine/core/modules/doc';
|
||||
import { EditorSettingService } from '@affine/core/modules/editor-setting';
|
||||
import { FeatureFlagService } from '@affine/core/modules/feature-flag';
|
||||
import { TemplateDocService } from '@affine/core/modules/template-doc';
|
||||
import { TemplateListMenuContentScrollable } from '@affine/core/modules/template-doc/view/template-list-menu';
|
||||
import { WorkbenchService } from '@affine/core/modules/workbench';
|
||||
@@ -30,16 +29,11 @@ import * as styles from './index.css';
|
||||
* @return a function to create a new doc, will duplicate the template doc if the page template is enabled
|
||||
*/
|
||||
const useNewDoc = () => {
|
||||
const featureFlagService = useService(FeatureFlagService);
|
||||
const workspaceService = useService(WorkspaceService);
|
||||
const templateDocService = useService(TemplateDocService);
|
||||
const docsService = useService(DocsService);
|
||||
const workbench = useService(WorkbenchService).workbench;
|
||||
|
||||
const enableTemplateDoc = useLiveData(
|
||||
featureFlagService.flags.enable_template_doc.$
|
||||
);
|
||||
|
||||
const currentWorkspace = workspaceService.workspace;
|
||||
const enablePageTemplate = useLiveData(
|
||||
templateDocService.setting.enablePageTemplate$
|
||||
@@ -52,7 +46,7 @@ const useNewDoc = () => {
|
||||
|
||||
const createPage = useAsyncCallback(
|
||||
async (e?: MouseEvent, mode?: DocMode) => {
|
||||
if (enableTemplateDoc && enablePageTemplate && pageTemplateDocId) {
|
||||
if (enablePageTemplate && pageTemplateDocId) {
|
||||
const docId =
|
||||
await docsService.duplicateFromTemplate(pageTemplateDocId);
|
||||
workbench.openDoc(docId, { at: inferOpenMode(e) });
|
||||
@@ -60,14 +54,7 @@ const useNewDoc = () => {
|
||||
pageHelper.createPage(mode, { at: inferOpenMode(e) });
|
||||
}
|
||||
},
|
||||
[
|
||||
docsService,
|
||||
enablePageTemplate,
|
||||
enableTemplateDoc,
|
||||
pageHelper,
|
||||
pageTemplateDocId,
|
||||
workbench,
|
||||
]
|
||||
[docsService, enablePageTemplate, pageHelper, pageTemplateDocId, workbench]
|
||||
);
|
||||
|
||||
return createPage;
|
||||
|
||||
@@ -222,15 +222,6 @@ export const AFFINE_FLAGS = {
|
||||
configurable: !isMobile,
|
||||
defaultState: false,
|
||||
},
|
||||
// TODO(@CatsJuice): remove this flag when ready
|
||||
enable_template_doc: {
|
||||
category: 'affine',
|
||||
displayName: 'Enable template doc',
|
||||
description:
|
||||
'Allow users to mark a doc as a template, and create new docs from it',
|
||||
configurable: true,
|
||||
defaultState: isCanaryBuild,
|
||||
},
|
||||
enable_editor_rtl: {
|
||||
category: 'affine',
|
||||
displayName:
|
||||
|
||||
@@ -2,7 +2,6 @@ import { type Framework } from '@toeverything/infra';
|
||||
|
||||
import { DocScope, DocService, DocsService } from '../doc';
|
||||
import { EditorSettingService } from '../editor-setting';
|
||||
import { FeatureFlagService } from '../feature-flag';
|
||||
import { TemplateDocService } from '../template-doc';
|
||||
import { WorkspaceScope } from '../workspace';
|
||||
import { JournalService } from './services/journal';
|
||||
@@ -25,7 +24,6 @@ export function configureJournalModule(framework: Framework) {
|
||||
DocsService,
|
||||
EditorSettingService,
|
||||
TemplateDocService,
|
||||
FeatureFlagService,
|
||||
])
|
||||
.store(JournalStore, [DocsService])
|
||||
.scope(DocScope)
|
||||
|
||||
@@ -8,7 +8,6 @@ import {
|
||||
} from '../../../blocksuite/initialization';
|
||||
import type { DocsService } from '../../doc';
|
||||
import type { EditorSettingService } from '../../editor-setting';
|
||||
import type { FeatureFlagService } from '../../feature-flag';
|
||||
import type { TemplateDocService } from '../../template-doc';
|
||||
import type { JournalStore } from '../store/journal';
|
||||
|
||||
@@ -21,8 +20,7 @@ export class JournalService extends Service {
|
||||
private readonly store: JournalStore,
|
||||
private readonly docsService: DocsService,
|
||||
private readonly editorSettingService: EditorSettingService,
|
||||
private readonly templateDocService: TemplateDocService,
|
||||
private readonly featureFlagService: FeatureFlagService
|
||||
private readonly templateDocService: TemplateDocService
|
||||
) {
|
||||
super();
|
||||
}
|
||||
@@ -66,8 +64,6 @@ export class JournalService extends Service {
|
||||
.getTime(),
|
||||
});
|
||||
|
||||
const enableTemplateDoc =
|
||||
this.featureFlagService.flags.enable_template_doc.value;
|
||||
const enablePageTemplate =
|
||||
this.templateDocService.setting.enablePageTemplate$.value;
|
||||
const pageTemplateDocId =
|
||||
@@ -75,13 +71,13 @@ export class JournalService extends Service {
|
||||
const journalTemplateDocId =
|
||||
this.templateDocService.setting.journalTemplateDocId$.value;
|
||||
// if journal template configured
|
||||
if (enableTemplateDoc && journalTemplateDocId) {
|
||||
if (journalTemplateDocId) {
|
||||
this.docsService
|
||||
.duplicateFromTemplate(journalTemplateDocId, docRecord.id)
|
||||
.catch(console.error);
|
||||
}
|
||||
// journal template not configured, use page template
|
||||
else if (enableTemplateDoc && enablePageTemplate && pageTemplateDocId) {
|
||||
else if (enablePageTemplate && pageTemplateDocId) {
|
||||
this.docsService
|
||||
.duplicateFromTemplate(pageTemplateDocId, docRecord.id)
|
||||
.catch(console.error);
|
||||
|
||||
Reference in New Issue
Block a user