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.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
fix: modify experimental features to app-level (#6823)
Akumatus4a032eb26054
diff --git a/packages/common/env/src/global.ts b/packages/common/env/src/global.tsindex 12e84c3fc3..279ec822e2 100644--- a/packages/common/env/src/global.ts+++ b/packages/common/env/src/global.ts@@ -23,6 +23,7 @@ export const runtimeFlagsSchema = z.object({enableEnhanceShareMode: z.boolean(),enablePayment: z.boolean(),enablePageHistory: z.boolean(),+ enableExperimentalFeature: z.boolean(),allowLocalWorkspace: z.boolean(),// this is for the electron appserverUrlPrefix: z.string(),diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/arts.css.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/arts.css.tssimilarity index 100%rename from packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/arts.css.tsrename to packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/arts.css.tsdiff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/arts.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/arts.tsxsimilarity index 100%rename from packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/arts.tsxrename to packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/arts.tsxdiff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/dark-art-svg.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/dark-art-svg.tssimilarity index 100%rename from packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/dark-art-svg.tsrename to packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/dark-art-svg.tsdiff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/index.css.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.css.tssimilarity index 100%rename from packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/index.css.tsrename to packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.css.tsdiff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsxsimilarity index 90%rename from packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/index.tsxrename to packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsxindex 3e0b7028e3..6f26a28e68 100644--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/index.tsx@@ -26,7 +26,7 @@ const ExperimentalFeaturesPrompt = ({}, []);return (- <div className={styles.promptRoot}>+ <div className={styles.promptRoot} data-testid="experimental-prompt"><div className={styles.promptTitle}>{t['com.affine.settings.workspace.experimental-features.prompt-header'@@ -49,14 +49,23 @@ const ExperimentalFeaturesPrompt = ({<div className={styles.spacer} /><label className={styles.promptDisclaimer}>- <Checkbox checked={checked} onChange={onChange} />+ <Checkbox+ checked={checked}+ onChange={onChange}+ data-testid="experimental-prompt-disclaimer"+ />{t['com.affine.settings.workspace.experimental-features.prompt-disclaimer']()}</label><div className={styles.promptDisclaimerConfirm}>- <Button disabled={!checked} onClick={onConfirm} type="primary">+ <Button+ disabled={!checked}+ onClick={onConfirm}+ type="primary"+ data-testid="experimental-confirm-button"+ >{t['com.affine.settings.workspace.experimental-features.get-started']()}@@ -158,7 +167,10 @@ const ExperimentalFeaturesMain = () => {'com.affine.settings.workspace.experimental-features.header.plugins']()}/>- <div className={styles.settingsContainer}>+ <div+ className={styles.settingsContainer}+ data-testid="experimental-settings"+ ><SplitViewSettingRow /><BlocksuiteFeatureFlagSettings /></div>diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/light-art-svg.ts b/packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/light-art-svg.tssimilarity index 100%rename from packages/frontend/core/src/components/affine/setting-modal/workspace-setting/experimental-features/light-art-svg.tsrename to packages/frontend/core/src/components/affine/setting-modal/general-setting/experimental-features/light-art-svg.tsdiff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/index.tsxindex 7a57b3991a..b85df46bc8 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/index.tsx@@ -1,17 +1,21 @@+import { UserFeatureService } from '@affine/core/modules/cloud/services/user-feature';import { useAFFiNEI18N } from '@affine/i18n/hooks';import {AppearanceIcon,+ ExperimentIcon,InformationIcon,KeyboardIcon,} from '@blocksuite/icons';-import { useLiveData, useService } from '@toeverything/infra';+import { useLiveData, useServices } from '@toeverything/infra';import type { ReactElement, SVGProps } from 'react';+import { useEffect } from 'react';import { AuthService, ServerConfigService } from '../../../../modules/cloud';import type { GeneralSettingKey } from '../types';import { AboutAffine } from './about';import { AppearanceSettings } from './appearance';import { BillingSettings } from './billing';+import { ExperimentalFeatures } from './experimental-features';import { PaymentIcon, UpgradeIcon } from './icons';import { AFFiNEPricingPlans } from './plans';import { Shortcuts } from './shortcuts';@@ -27,11 +31,22 @@ export type GeneralSettingList = GeneralSettingListItem[];export const useGeneralSettingList = (): GeneralSettingList => {const t = useAFFiNEI18N();- const status = useLiveData(useService(AuthService).session.status$);- const serverConfig = useService(ServerConfigService).serverConfig;+ const { authService, serverConfigService, userFeatureService } = useServices({+ AuthService,+ ServerConfigService,+ UserFeatureService,+ });+ const status = useLiveData(authService.session.status$);const hasPaymentFeature = useLiveData(- serverConfig.features$.map(f => f?.payment)+ serverConfigService.serverConfig.features$.map(f => f?.payment));+ const isEarlyAccess = useLiveData(+ userFeatureService.userFeature.isEarlyAccess$+ );++ useEffect(() => {+ userFeatureService.userFeature.revalidate();+ }, [userFeatureService]);const settings: GeneralSettingListItem[] = [{@@ -71,6 +86,15 @@ export const useGeneralSettingList = (): GeneralSettingList => {}}+ if (isEarlyAccess || runtimeConfig.enableExperimentalFeature) {+ settings.push({+ key: 'experimental-features',+ title: t['com.affine.settings.workspace.experimental-features'](),+ icon: ExperimentIcon,+ testId: 'experimental-features-trigger',+ });+ }+return settings;};@@ -90,6 +114,8 @@ export const GeneralSetting = ({ generalKey }: GeneralSettingProps) => {return <AFFiNEPricingPlans />;case 'billing':return <BillingSettings />;+ case 'experimental-features':+ return <ExperimentalFeatures />;default:return null;}diff --git a/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsxindex 78ef0b83a2..3821d538b4 100644--- a/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx@@ -234,10 +234,6 @@ const subTabConfigs = [key: 'preference',title: 'com.affine.settings.workspace.preferences',},- {- key: 'experimental-features',- title: 'com.affine.settings.workspace.experimental-features',- },{key: 'properties',title: 'com.affine.settings.workspace.properties',@@ -267,9 +263,6 @@ const WorkspaceListItem = ({const currentWorkspace = workspaceService.workspace;const isCurrent = currentWorkspace.id === meta.id;const t = useAFFiNEI18N();- const isEarlyAccess = useLiveData(- userFeatureService.userFeature.isEarlyAccess$- );useEffect(() => {userFeatureService.userFeature.revalidate();@@ -280,30 +273,23 @@ const WorkspaceListItem = ({}, [onClick]);const subTabs = useMemo(() => {- return subTabConfigs- .filter(({ key }) => {- if (key === 'experimental-features') {- return information?.isOwner && isEarlyAccess;- }- return true;- })- .map(({ key, title }) => {- return (- <div- data-testid={`workspace-list-item-${key}`}- onClick={() => {- onClick(key);- }}- className={clsx(style.sidebarSelectSubItem, {- active: activeSubTab === key,- })}- key={key}- >- {t[title]()}- </div>- );- });- }, [activeSubTab, information?.isOwner, isEarlyAccess, onClick, t]);+ return subTabConfigs.map(({ key, title }) => {+ return (+ <div+ data-testid={`workspace-list-item-${key}`}+ onClick={() => {+ onClick(key);+ }}+ className={clsx(style.sidebarSelectSubItem, {+ active: activeSubTab === key,+ })}+ key={key}+ >+ {t[title]()}+ </div>+ );+ });+ }, [activeSubTab, onClick, t]);return (<>diff --git a/packages/frontend/core/src/components/affine/setting-modal/types.ts b/packages/frontend/core/src/components/affine/setting-modal/types.tsindex 8f60d151a5..4226fe09e4 100644--- a/packages/frontend/core/src/components/affine/setting-modal/types.ts+++ b/packages/frontend/core/src/components/affine/setting-modal/types.ts@@ -4,14 +4,11 @@ export const GeneralSettingKeys = ['about','plans','billing',-] as const;--export const WorkspaceSubTabs = [- 'preference','experimental-features',- 'properties',] as const;+export const WorkspaceSubTabs = ['preference', 'properties'] as const;+export type GeneralSettingKey = (typeof GeneralSettingKeys)[number];export type WorkspaceSubTab = (typeof WorkspaceSubTabs)[number];diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/index.tsxindex a39854222b..34ae66ce7a 100644--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/index.tsx@@ -1,6 +1,6 @@import type { WorkspaceMetadata } from '@toeverything/infra';-import { ExperimentalFeatures } from './experimental-features';+import type { WorkspaceSubTab } from '../types';import { WorkspaceSettingDetail } from './new-workspace-setting-detail';import { WorkspaceSettingProperties } from './properties';@@ -9,13 +9,11 @@ export const WorkspaceSetting = ({subTab,}: {workspaceMetadata: WorkspaceMetadata;- subTab: 'preference' | 'experimental-features' | 'properties';+ subTab: WorkspaceSubTab;}) => {switch (subTab) {case 'preference':return <WorkspaceSettingDetail workspaceMetadata={workspaceMetadata} />;- case 'experimental-features':- return <ExperimentalFeatures />;case 'properties':return (<WorkspaceSettingProperties workspaceMetadata={workspaceMetadata} />diff --git a/packages/frontend/i18n/src/resources/en.json b/packages/frontend/i18n/src/resources/en.jsonindex 0b3c8d27c9..6b1bf98798 100644--- a/packages/frontend/i18n/src/resources/en.json+++ b/packages/frontend/i18n/src/resources/en.json@@ -1129,7 +1129,7 @@"com.affine.settings.translucent-style-description": "Use transparency effect on the sidebar.","com.affine.settings.workspace": "Workspace","com.affine.settings.workspace.description": "You can view current workspace's information here.",- "com.affine.settings.workspace.experimental-features": "Plugins",+ "com.affine.settings.workspace.experimental-features": "Experimental Features","com.affine.settings.workspace.experimental-features.get-started": "Get Started","com.affine.settings.workspace.experimental-features.header.plugins": "Experimental Features","com.affine.settings.workspace.experimental-features.prompt-disclaimer": "I am aware of the risks, and I am willing to continue to use it.",diff --git a/tests/affine-local/e2e/settings.spec.ts b/tests/affine-local/e2e/settings.spec.tsindex 6a0f2d0383..0143481f0e 100644--- a/tests/affine-local/e2e/settings.spec.ts+++ b/tests/affine-local/e2e/settings.spec.ts@@ -2,8 +2,10 @@ import { test } from '@affine-test/kit/playwright';import { openHomePage } from '@affine-test/kit/utils/load-page';import { waitForEditorLoad } from '@affine-test/kit/utils/page-logic';import {+ confirmExperimentalPrompt,openAboutPanel,openAppearancePanel,+ openExperimentalFeaturesPanel,openSettingModal,openShortcutsPanel,} from '@affine-test/kit/utils/setting';@@ -87,6 +89,18 @@ test('Open about panel', async ({ page }) => {await expect(title).toBeVisible();});+test('Open experimental features panel', async ({ page }) => {+ await openHomePage(page);+ await waitForEditorLoad(page);+ await openSettingModal(page);+ await openExperimentalFeaturesPanel(page);+ const prompt = page.getByTestId('experimental-prompt');+ await expect(prompt).toBeVisible();+ await confirmExperimentalPrompt(page);+ const settings = page.getByTestId('experimental-settings');+ await expect(settings).toBeVisible();+});+test('Different workspace should have different name in the setting panel', async ({page,}) => {diff --git a/tests/kit/utils/setting.ts b/tests/kit/utils/setting.tsindex 07d709613d..37a4eb091e 100644--- a/tests/kit/utils/setting.ts+++ b/tests/kit/utils/setting.ts@@ -24,6 +24,15 @@ export async function openAboutPanel(page: Page) {await page.getByTestId('about-panel-trigger').click();}+export async function openExperimentalFeaturesPanel(page: Page) {+ await page.getByTestId('experimental-features-trigger').click();+}++export async function confirmExperimentalPrompt(page: Page) {+ await page.getByTestId('experimental-prompt-disclaimer').click();+ await page.getByTestId('experimental-confirm-button').click();+}+export async function openWorkspaceSettingPanel(page: Page,workspaceName: stringdiff --git a/tools/cli/src/webpack/runtime-config.ts b/tools/cli/src/webpack/runtime-config.tsindex 69c36141e3..588a7e6735 100644--- a/tools/cli/src/webpack/runtime-config.ts+++ b/tools/cli/src/webpack/runtime-config.ts@@ -22,6 +22,7 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {enableEnhanceShareMode: false,enablePayment: true,enablePageHistory: true,+ enableExperimentalFeature: false,allowLocalWorkspace: buildFlags.distribution === 'desktop' ? true : false,serverUrlPrefix: 'https://app.affine.pro',appVersion: packageJson.version,@@ -61,6 +62,7 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {enableEnhanceShareMode: false,enablePayment: true,enablePageHistory: true,+ enableExperimentalFeature: true,allowLocalWorkspace: buildFlags.distribution === 'desktop' ? true : false,serverUrlPrefix: 'https://affine.fail',appVersion: packageJson.version,