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
feat(core): integration property ui (#10844)
CatsJuicee4bc43df67da
diff --git a/packages/frontend/core/src/components/doc-properties/table.tsx b/packages/frontend/core/src/components/doc-properties/table.tsxindex 971c2edecb..57c12f785e 100644--- a/packages/frontend/core/src/components/doc-properties/table.tsx+++ b/packages/frontend/core/src/components/doc-properties/table.tsx@@ -15,6 +15,7 @@ import type {DatabaseRow,DatabaseValueCell,} from '@affine/core/modules/doc-info/types';+import { DocIntegrationPropertiesTable } from '@affine/core/modules/integration';import { GuardService } from '@affine/core/modules/permissions';import { ViewService, WorkbenchService } from '@affine/core/modules/workbench';import type { AffineDNDData } from '@affine/core/types/dnd';@@ -448,6 +449,7 @@ const DocPropertiesTableInner = ({onOpenChange={setExpanded}/><Collapsible.Content>+ <DocIntegrationPropertiesTable /><DocWorkspacePropertiesTableBodydefaultOpen={!defaultOpenProperty || defaultOpenProperty.type === 'workspace'diff --git a/packages/frontend/core/src/modules/integration/constant.ts b/packages/frontend/core/src/modules/integration/constant.tsindex 274be6b1be..dce283965a 100644--- a/packages/frontend/core/src/modules/integration/constant.ts+++ b/packages/frontend/core/src/modules/integration/constant.ts@@ -1,5 +1,11 @@import type { I18nString } from '@affine/i18n';-import { ReadwiseLogoDuotoneIcon } from '@blocksuite/icons/rc';+import {+ DateTimeIcon,+ HistoryIcon,+ LinkIcon,+ ReadwiseLogoDuotoneIcon,+ TextIcon,+} from '@blocksuite/icons/rc';import type { SVGProps } from 'react';import type { IntegrationProperty, IntegrationType } from './type';@@ -16,14 +22,32 @@ export const INTEGRATION_PROPERTY_SCHEMA: {} = {readwise: {author: {+ order: '400',label: 'com.affine.integration.readwise-prop.author',key: 'author',type: 'text',+ icon: TextIcon,},source: {+ order: '300',label: 'com.affine.integration.readwise-prop.source',key: 'readwise_url',type: 'source',+ icon: LinkIcon,+ },+ created: {+ order: '100',+ label: 'com.affine.integration.readwise-prop.created',+ key: 'created_at',+ type: 'date',+ icon: DateTimeIcon,+ },+ updated: {+ order: '200',+ label: 'com.affine.integration.readwise-prop.updated',+ key: 'updated_at',+ type: 'date',+ icon: HistoryIcon,},},zotero: {},diff --git a/packages/frontend/core/src/modules/integration/index.ts b/packages/frontend/core/src/modules/integration/index.tsindex e844fd3997..82106f5749 100644--- a/packages/frontend/core/src/modules/integration/index.ts+++ b/packages/frontend/core/src/modules/integration/index.ts@@ -15,6 +15,7 @@ import { ReadwiseStore } from './store/readwise';export { IntegrationService };export { IntegrationTypeIcon } from './views/icon';+export { DocIntegrationPropertiesTable } from './views/properties-table';export function configureIntegrationModule(framework: Framework) {frameworkdiff --git a/packages/frontend/core/src/modules/integration/services/integration-property.ts b/packages/frontend/core/src/modules/integration/services/integration-property.tsindex 99a9f221c9..a2503da7b4 100644--- a/packages/frontend/core/src/modules/integration/services/integration-property.ts+++ b/packages/frontend/core/src/modules/integration/services/integration-property.ts@@ -9,10 +9,18 @@ export class IntegrationPropertyService extends Service {super();}+ integrationType$ = this.docService.doc.properties$.selector(+ p => p.integrationType+ );+schema$ = this.docService.doc.properties$.selector(p => p.integrationType).map(type => (type ? INTEGRATION_PROPERTY_SCHEMA[type] : null));+ integrationProperty$(+ type: IntegrationType,+ key: string+ ): LiveData<Record<string, any> | undefined | null>;integrationProperty$<T extends IntegrationType,Key extends keyof IntegrationDocPropertiesMap[T],diff --git a/packages/frontend/core/src/modules/integration/type.ts b/packages/frontend/core/src/modules/integration/type.tsindex 558d2d3c40..795e961056 100644--- a/packages/frontend/core/src/modules/integration/type.ts+++ b/packages/frontend/core/src/modules/integration/type.ts@@ -1,4 +1,5 @@import type { I18nString } from '@affine/i18n';+import type { ComponentType, SVGProps } from 'react';import type { DocIntegrationRef } from '../db/schema/schema';@@ -11,8 +12,10 @@ export type IntegrationDocPropertiesMap = {export type IntegrationProperty<T extends IntegrationType> = {key: keyof IntegrationDocPropertiesMap[T];- label?: I18nString;+ label: I18nString;type: 'link' | 'text' | 'date' | 'source';+ icon?: ComponentType<SVGProps<SVGSVGElement>>;+ order?: string;};// ===============================diff --git a/packages/frontend/core/src/modules/integration/views/properties-table.tsx b/packages/frontend/core/src/modules/integration/views/properties-table.tsxnew file mode 100644index 0000000000..0fafa7831e--- /dev/null+++ b/packages/frontend/core/src/modules/integration/views/properties-table.tsx@@ -0,0 +1,66 @@+import {+ PropertyCollapsibleContent,+ PropertyCollapsibleSection,+ PropertyName,+ PropertyRoot,+} from '@affine/component';+import { useI18n } from '@affine/i18n';+import { useLiveData, useService } from '@toeverything/infra';+import { useMemo } from 'react';++import { IntegrationPropertyService } from '../services/integration-property';+import type { IntegrationProperty } from '../type';+import { ValueRenderer } from './property-values';++export const DocIntegrationPropertiesTable = () => {+ const t = useI18n();+ const integrationPropertyService = useService(IntegrationPropertyService);++ const integrationType = useLiveData(+ integrationPropertyService.integrationType$+ );+ const schema = useLiveData(integrationPropertyService.schema$);++ const properties = useMemo(+ () =>+ (Object.values(schema || {}) as IntegrationProperty<any>[]).sort(+ (a, b) => {+ const aOrder = a.order ?? '9999';+ const bOrder = b.order ?? '9999';+ return aOrder.localeCompare(bOrder);+ }+ ),+ [schema]+ );++ if (!schema || !integrationType) return null;++ return (+ <PropertyCollapsibleSection+ title={t['com.affine.integration.properties']()}+ >+ <PropertyCollapsibleContent>+ {properties.map(property => {+ const Icon = property.icon;+ const key = property.key as string;+ const label = property.label;+ const displayName =+ typeof label === 'string'+ ? t[label]()+ : t.t(label?.i18nKey, label?.options);++ return (+ <PropertyRoot key={key}>+ <PropertyName name={displayName} icon={Icon ? <Icon /> : null} />+ <ValueRenderer+ integration={integrationType}+ type={property.type}+ propertyKey={key}+ />+ </PropertyRoot>+ );+ })}+ </PropertyCollapsibleContent>+ </PropertyCollapsibleSection>+ );+};diff --git a/packages/frontend/core/src/modules/integration/views/property-values/date-value.tsx b/packages/frontend/core/src/modules/integration/views/property-values/date-value.tsxnew file mode 100644index 0000000000..8eb781250d--- /dev/null+++ b/packages/frontend/core/src/modules/integration/views/property-values/date-value.tsx@@ -0,0 +1,24 @@+import { PropertyValue, Tooltip } from '@affine/component';+import { i18nTime } from '@affine/i18n';+import { useMemo } from 'react';++import * as styles from './styles.css';+import type { PropertyValueProps } from './type';++export const DateValue = ({ value }: PropertyValueProps) => {+ const accuracySecond = useMemo(() => {+ return i18nTime(value, { absolute: { accuracy: 'second' } });+ }, [value]);++ const accuracyDay = useMemo(() => {+ return i18nTime(value, { absolute: { accuracy: 'day' } });+ }, [value]);++ return (+ <PropertyValue className={styles.value} hoverable={false}>+ <Tooltip content={accuracySecond} side="right">+ <span>{accuracyDay}</span>+ </Tooltip>+ </PropertyValue>+ );+};diff --git a/packages/frontend/core/src/modules/integration/views/property-values/index.tsx b/packages/frontend/core/src/modules/integration/views/property-values/index.tsxnew file mode 100644index 0000000000..aed22cecd7--- /dev/null+++ b/packages/frontend/core/src/modules/integration/views/property-values/index.tsx@@ -0,0 +1,51 @@+import { useLiveData, useService } from '@toeverything/infra';+import { type ComponentType, useMemo } from 'react';++import { IntegrationPropertyService } from '../../services/integration-property';+import type { IntegrationProperty } from '../../type';+import { DateValue } from './date-value';+import { LinkValue } from './link-value';+import { SourceValue } from './source-value';+import { TextValue } from './text-value';+import type { PropertyValueProps } from './type';++type IntegrationPropertyType = IntegrationProperty<any>['type'];++const valueRenderers: Record<+ IntegrationPropertyType,+ ComponentType<PropertyValueProps>+> = {+ link: LinkValue,+ source: SourceValue,+ text: TextValue,+ date: DateValue,+};++type ValueRendererProps = {+ type: IntegrationPropertyType;+ propertyKey: string;+} & Pick<PropertyValueProps, 'integration'>;++export const ValueRenderer = ({+ integration,+ type,+ propertyKey,+}: ValueRendererProps) => {+ const Renderer = valueRenderers[type];++ const integrationPropertyService = useService(IntegrationPropertyService);++ const propertyValue = useLiveData(+ useMemo(() => {+ return integrationPropertyService.integrationProperty$(+ integration,+ propertyKey+ );+ }, [integration, integrationPropertyService, propertyKey])+ );++ if (!Renderer) {+ return null;+ }+ return <Renderer integration={integration} value={propertyValue} />;+};diff --git a/packages/frontend/core/src/modules/integration/views/property-values/link-value.tsx b/packages/frontend/core/src/modules/integration/views/property-values/link-value.tsxnew file mode 100644index 0000000000..751a8bb778--- /dev/null+++ b/packages/frontend/core/src/modules/integration/views/property-values/link-value.tsx@@ -0,0 +1,17 @@+import { PropertyValue } from '@affine/component';++import * as styles from './styles.css';+import type { PropertyValueProps } from './type';++export const LinkValue = ({ value }: PropertyValueProps) => {+ return (+ <a+ href={value}+ target="_blank"+ rel="noopener noreferrer"+ className={styles.linkWrapper}+ >+ <PropertyValue className={styles.value}>{value}</PropertyValue>+ </a>+ );+};diff --git a/packages/frontend/core/src/modules/integration/views/property-values/source-value.tsx b/packages/frontend/core/src/modules/integration/views/property-values/source-value.tsxnew file mode 100644index 0000000000..6736c0f159--- /dev/null+++ b/packages/frontend/core/src/modules/integration/views/property-values/source-value.tsx@@ -0,0 +1,25 @@+import { PropertyValue } from '@affine/component';+import { DualLinkIcon } from '@blocksuite/icons/rc';++import { IntegrationTypeIcon } from '../icon';+import * as styles from './styles.css';+import type { PropertyValueProps } from './type';++export const SourceValue = ({ value, integration }: PropertyValueProps) => {+ return (+ <a+ href={value}+ target="_blank"+ rel="noreferrer"+ className={styles.linkWrapper}+ >+ <PropertyValue className={styles.sourceValue}>+ <div className={styles.sourceValueIcon}>+ <IntegrationTypeIcon type={integration} />+ </div>+ {value}+ <DualLinkIcon className={styles.sourceValueLinkIcon} />+ </PropertyValue>+ </a>+ );+};diff --git a/packages/frontend/core/src/modules/integration/views/property-values/styles.css.ts b/packages/frontend/core/src/modules/integration/views/property-values/styles.css.tsnew file mode 100644index 0000000000..2d737c80d6--- /dev/null+++ b/packages/frontend/core/src/modules/integration/views/property-values/styles.css.ts@@ -0,0 +1,36 @@+import { cssVarV2 } from '@toeverything/theme/v2';+import { style } from '@vanilla-extract/css';++export const value = style({+ fontSize: 14,+ fontWeight: 400,+ lineHeight: '22px',+ color: cssVarV2.text.primary,+});++export const linkWrapper = style({+ flex: 1,+});+export const sourceValue = style([+ value,+ {+ display: 'flex',+ alignItems: 'center',+ gap: 6,+ },+]);+export const sourceValueIcon = style({+ fontSize: 18,+ width: 22,+ height: 22,+ borderRadius: 3,+ boxShadow: `0px 0px 0px 1px ${cssVarV2.layer.insideBorder.border}`,+ display: 'flex',+ alignItems: 'center',+ justifyContent: 'center',+ backgroundColor: cssVarV2.integrations.background.iconSolid,+});+export const sourceValueLinkIcon = style({+ fontSize: 18,+ color: cssVarV2.icon.primary,+});diff --git a/packages/frontend/core/src/modules/integration/views/property-values/text-value.tsx b/packages/frontend/core/src/modules/integration/views/property-values/text-value.tsxnew file mode 100644index 0000000000..e1e906346f--- /dev/null+++ b/packages/frontend/core/src/modules/integration/views/property-values/text-value.tsx@@ -0,0 +1,10 @@+import { PropertyValue } from '@affine/component';++import * as styles from './styles.css';+export const TextValue = ({ value }: { value: string }) => {+ return (+ <PropertyValue hoverable={false} className={styles.value}>+ {value}+ </PropertyValue>+ );+};diff --git a/packages/frontend/core/src/modules/integration/views/property-values/type.ts b/packages/frontend/core/src/modules/integration/views/property-values/type.tsnew file mode 100644index 0000000000..4abf388ffe--- /dev/null+++ b/packages/frontend/core/src/modules/integration/views/property-values/type.ts@@ -0,0 +1,6 @@+import type { IntegrationType } from '../../type';++export interface PropertyValueProps {+ value: any;+ integration: IntegrationType;+}diff --git a/packages/frontend/i18n/src/i18n-completenesses.json b/packages/frontend/i18n/src/i18n-completenesses.jsonindex 73827fa8d4..06b4cc9bc6 100644--- a/packages/frontend/i18n/src/i18n-completenesses.json+++ b/packages/frontend/i18n/src/i18n-completenesses.json@@ -2,16 +2,16 @@"ar": 95,"ca": 4,"da": 5,- "de": 96,+ "de": 95,"el-GR": 95,"en": 100,- "es-AR": 96,+ "es-AR": 95,"es-CL": 97,"es": 95,"fa": 95,"fr": 95,"hi": 2,- "it-IT": 96,+ "it-IT": 95,"it": 1,"ja": 95,"ko": 60,diff --git a/packages/frontend/i18n/src/i18n.gen.ts b/packages/frontend/i18n/src/i18n.gen.tsindex 92636b2eb4..566472649d 100644--- a/packages/frontend/i18n/src/i18n.gen.ts+++ b/packages/frontend/i18n/src/i18n.gen.ts@@ -7321,6 +7321,18 @@ export function useAFFiNEI18N(): {* `Source`*/["com.affine.integration.readwise-prop.source"](): string;+ /**+ * `Created`+ */+ ["com.affine.integration.readwise-prop.created"](): string;+ /**+ * `Updated`+ */+ ["com.affine.integration.readwise-prop.updated"](): string;+ /**+ * `Integration properties`+ */+ ["com.affine.integration.properties"](): string;/*** `Notes`*/diff --git a/packages/frontend/i18n/src/resources/en.json b/packages/frontend/i18n/src/resources/en.jsonindex 5df3dcc94b..11124017ea 100644--- a/packages/frontend/i18n/src/resources/en.json+++ b/packages/frontend/i18n/src/resources/en.json@@ -1823,6 +1823,9 @@"com.affine.integration.readwise.import.abort-notify-desc": "Import aborted, with {{finished}} highlights processed","com.affine.integration.readwise-prop.author": "Author","com.affine.integration.readwise-prop.source": "Source",+ "com.affine.integration.readwise-prop.created": "Created",+ "com.affine.integration.readwise-prop.updated": "Updated",+ "com.affine.integration.properties": "Integration properties","com.affine.attachmentViewer.audio.notes": "Notes","com.affine.attachmentViewer.audio.transcribing": "Transcribing","error.INTERNAL_SERVER_ERROR": "An internal error occurred.",