mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-07-17 01:56:27 +08:00
feat(core): add notification list (#10480)
This commit is contained in:
@@ -63,7 +63,7 @@ export const postfix = style({
|
||||
opacity: 0,
|
||||
pointerEvents: 'none',
|
||||
selectors: {
|
||||
[`${root}:hover &`]: {
|
||||
[`${root}:hover &, &[data-postfix-display="always"]`]: {
|
||||
justifySelf: 'flex-end',
|
||||
position: 'initial',
|
||||
opacity: 1,
|
||||
|
||||
@@ -15,6 +15,7 @@ export interface MenuItemProps extends React.HTMLAttributes<HTMLDivElement> {
|
||||
// if onCollapsedChange is given, but collapsed is undefined, then we will render the collapse button as disabled
|
||||
onCollapsedChange?: (collapsed: boolean) => void;
|
||||
postfix?: React.ReactElement;
|
||||
postfixDisplay?: 'always' | 'hover';
|
||||
}
|
||||
|
||||
export interface MenuLinkItemProps extends MenuItemProps {
|
||||
@@ -37,6 +38,7 @@ export const MenuItem = React.forwardRef<HTMLDivElement, MenuItemProps>(
|
||||
collapsed,
|
||||
onCollapsedChange,
|
||||
postfix,
|
||||
postfixDisplay = 'hover',
|
||||
...props
|
||||
},
|
||||
ref
|
||||
@@ -80,7 +82,11 @@ export const MenuItem = React.forwardRef<HTMLDivElement, MenuItemProps>(
|
||||
|
||||
<div className={styles.content}>{children}</div>
|
||||
{postfix ? (
|
||||
<div className={styles.postfix} onClick={stopPropagation}>
|
||||
<div
|
||||
className={styles.postfix}
|
||||
data-postfix-display={postfixDisplay}
|
||||
onClick={stopPropagation}
|
||||
>
|
||||
{postfix}
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
import { createEvent } from '@toeverything/infra';
|
||||
|
||||
import type { Server } from '../entities/server';
|
||||
|
||||
export const ServerInitialized = createEvent<Server>('ServerInitialized');
|
||||
@@ -4,7 +4,6 @@ export type { AuthAccountInfo } from './entities/session';
|
||||
export { AccountChanged } from './events/account-changed';
|
||||
export { AccountLoggedIn } from './events/account-logged-in';
|
||||
export { AccountLoggedOut } from './events/account-logged-out';
|
||||
export { ServerInitialized } from './events/server-initialized';
|
||||
export { AuthProvider } from './provider/auth';
|
||||
export { ValidatorProvider } from './provider/validator';
|
||||
export { ServerScope } from './scopes/server';
|
||||
|
||||
@@ -4,7 +4,6 @@ import { nanoid } from 'nanoid';
|
||||
import { Observable, switchMap } from 'rxjs';
|
||||
|
||||
import { Server } from '../entities/server';
|
||||
import { ServerInitialized } from '../events/server-initialized';
|
||||
import { ServerStarted } from '../events/server-started';
|
||||
import type { ServerConfigStore } from '../stores/server-config';
|
||||
import type { ServerListStore } from '../stores/server-list';
|
||||
@@ -30,7 +29,6 @@ export class ServersService extends Service {
|
||||
serverMetadata: metadata,
|
||||
});
|
||||
server.revalidateConfig();
|
||||
this.eventBus.emit(ServerInitialized, server);
|
||||
server.scope.eventBus.emit(ServerStarted, server);
|
||||
const ref = this.serverPool.put(metadata.id, server);
|
||||
return ref;
|
||||
|
||||
@@ -31,6 +31,7 @@ import { configureImportTemplateModule } from './import-template';
|
||||
import { configureJournalModule } from './journal';
|
||||
import { configureLifecycleModule } from './lifecycle';
|
||||
import { configureNavigationModule } from './navigation';
|
||||
import { configureNotificationModule } from './notification';
|
||||
import { configureOpenInApp } from './open-in-app';
|
||||
import { configureOrganizeModule } from './organize';
|
||||
import { configurePDFModule } from './pdf';
|
||||
@@ -102,4 +103,5 @@ export function configureCommonModules(framework: Framework) {
|
||||
configureTemplateDocModule(framework);
|
||||
configureBlobManagementModule(framework);
|
||||
configureImportClipperModule(framework);
|
||||
configureNotificationModule(framework);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
export { NotificationCountService } from './services/count';
|
||||
export { NotificationListService } from './services/list';
|
||||
export type { Notification, NotificationBody } from './stores/notification';
|
||||
export { NotificationType } from './stores/notification';
|
||||
import type { Framework } from '@toeverything/infra';
|
||||
|
||||
import { GraphQLService, ServerScope, ServerService } from '../cloud';
|
||||
import { GlobalSessionState } from '../storage';
|
||||
import { NotificationCountService } from './services/count';
|
||||
import { NotificationListService } from './services/list';
|
||||
import { NotificationStore } from './stores/notification';
|
||||
|
||||
export function configureNotificationModule(framework: Framework) {
|
||||
framework
|
||||
.scope(ServerScope)
|
||||
.service(NotificationCountService, [NotificationStore])
|
||||
.service(NotificationListService, [
|
||||
NotificationStore,
|
||||
NotificationCountService,
|
||||
])
|
||||
.store(NotificationStore, [
|
||||
GraphQLService,
|
||||
ServerService,
|
||||
GlobalSessionState,
|
||||
]);
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
import {
|
||||
catchErrorInto,
|
||||
effect,
|
||||
exhaustMapWithTrailing,
|
||||
fromPromise,
|
||||
LiveData,
|
||||
onComplete,
|
||||
OnEvent,
|
||||
onStart,
|
||||
Service,
|
||||
smartRetry,
|
||||
} from '@toeverything/infra';
|
||||
import { EMPTY, mergeMap, switchMap, timer } from 'rxjs';
|
||||
|
||||
import { ServerStarted } from '../../cloud/events/server-started';
|
||||
import { ApplicationFocused } from '../../lifecycle';
|
||||
import type { NotificationStore } from '../stores/notification';
|
||||
|
||||
@OnEvent(ApplicationFocused, s => s.handleApplicationFocused)
|
||||
@OnEvent(ServerStarted, s => s.handleServerStarted)
|
||||
export class NotificationCountService extends Service {
|
||||
constructor(private readonly store: NotificationStore) {
|
||||
super();
|
||||
}
|
||||
|
||||
readonly count$ = LiveData.from(this.store.watchNotificationCountCache(), 0);
|
||||
readonly isLoading$ = new LiveData(false);
|
||||
readonly error$ = new LiveData<any>(null);
|
||||
|
||||
revalidate = effect(
|
||||
switchMap(() => {
|
||||
return timer(0, 30000); // revalidate every 30 seconds
|
||||
}),
|
||||
exhaustMapWithTrailing(() => {
|
||||
return fromPromise(signal =>
|
||||
this.store.getNotificationCount(signal)
|
||||
).pipe(
|
||||
mergeMap(result => {
|
||||
this.setCount(result ?? 0);
|
||||
return EMPTY;
|
||||
}),
|
||||
smartRetry(),
|
||||
catchErrorInto(this.error$),
|
||||
onStart(() => {
|
||||
this.isLoading$.setValue(true);
|
||||
}),
|
||||
onComplete(() => this.isLoading$.setValue(false))
|
||||
);
|
||||
})
|
||||
);
|
||||
|
||||
handleApplicationFocused() {
|
||||
this.revalidate();
|
||||
}
|
||||
|
||||
handleServerStarted() {
|
||||
this.revalidate();
|
||||
}
|
||||
|
||||
setCount(count: number) {
|
||||
this.store.setNotificationCountCache(count);
|
||||
}
|
||||
|
||||
override dispose(): void {
|
||||
super.dispose();
|
||||
this.revalidate.unsubscribe();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
import {
|
||||
catchErrorInto,
|
||||
effect,
|
||||
fromPromise,
|
||||
LiveData,
|
||||
onComplete,
|
||||
onStart,
|
||||
Service,
|
||||
smartRetry,
|
||||
} from '@toeverything/infra';
|
||||
import { EMPTY, exhaustMap, mergeMap } from 'rxjs';
|
||||
|
||||
import type { Notification, NotificationStore } from '../stores/notification';
|
||||
import type { NotificationCountService } from './count';
|
||||
|
||||
export class NotificationListService extends Service {
|
||||
isLoading$ = new LiveData(false);
|
||||
notifications$ = new LiveData<Notification[]>([]);
|
||||
nextCursor$ = new LiveData<string | undefined>(undefined);
|
||||
hasMore$ = new LiveData(true);
|
||||
error$ = new LiveData<any>(null);
|
||||
|
||||
readonly PAGE_SIZE = 8;
|
||||
|
||||
constructor(
|
||||
private readonly store: NotificationStore,
|
||||
private readonly notificationCount: NotificationCountService
|
||||
) {
|
||||
super();
|
||||
}
|
||||
|
||||
readonly loadMore = effect(
|
||||
exhaustMap(() => {
|
||||
if (!this.hasMore$.value) {
|
||||
return EMPTY;
|
||||
}
|
||||
return fromPromise(signal =>
|
||||
this.store.listNotification(
|
||||
{
|
||||
first: this.PAGE_SIZE,
|
||||
after: this.nextCursor$.value,
|
||||
},
|
||||
signal
|
||||
)
|
||||
).pipe(
|
||||
mergeMap(result => {
|
||||
if (!result) {
|
||||
// If the user is not logged in, we just ignore the result.
|
||||
return EMPTY;
|
||||
}
|
||||
const { edges, pageInfo, totalCount } = result;
|
||||
this.notifications$.next([
|
||||
...this.notifications$.value,
|
||||
...edges.map(edge => edge.node),
|
||||
]);
|
||||
|
||||
// keep the notification count in sync
|
||||
this.notificationCount.setCount(totalCount);
|
||||
|
||||
this.hasMore$.next(pageInfo.hasNextPage);
|
||||
this.nextCursor$.next(pageInfo.endCursor ?? undefined);
|
||||
|
||||
return EMPTY;
|
||||
}),
|
||||
smartRetry(),
|
||||
catchErrorInto(this.error$),
|
||||
onStart(() => {
|
||||
this.isLoading$.setValue(true);
|
||||
}),
|
||||
onComplete(() => this.isLoading$.setValue(false))
|
||||
);
|
||||
})
|
||||
);
|
||||
|
||||
reset() {
|
||||
this.notifications$.setValue([]);
|
||||
this.hasMore$.setValue(true);
|
||||
this.nextCursor$.setValue(undefined);
|
||||
this.isLoading$.setValue(false);
|
||||
this.error$.setValue(null);
|
||||
this.loadMore.reset();
|
||||
}
|
||||
|
||||
async readNotification(id: string) {
|
||||
await this.store.readNotification(id);
|
||||
this.notifications$.next(
|
||||
this.notifications$.value.filter(notification => notification.id !== id)
|
||||
);
|
||||
this.notificationCount.setCount(
|
||||
Math.max(this.notificationCount.count$.value - 1, 0)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
import {
|
||||
type ListNotificationsQuery,
|
||||
listNotificationsQuery,
|
||||
notificationCountQuery,
|
||||
type PaginationInput,
|
||||
readNotificationMutation,
|
||||
type UnionNotificationBodyType,
|
||||
} from '@affine/graphql';
|
||||
import { Store } from '@toeverything/infra';
|
||||
import { map } from 'rxjs';
|
||||
|
||||
import type { GraphQLService, ServerService } from '../../cloud';
|
||||
import type { GlobalSessionState } from '../../storage';
|
||||
|
||||
export type Notification = NonNullable<
|
||||
ListNotificationsQuery['currentUser']
|
||||
>['notifications']['edges'][number]['node'];
|
||||
|
||||
export type NotificationBody = UnionNotificationBodyType;
|
||||
|
||||
export { NotificationType } from '@affine/graphql';
|
||||
|
||||
export class NotificationStore extends Store {
|
||||
constructor(
|
||||
private readonly gqlService: GraphQLService,
|
||||
private readonly serverService: ServerService,
|
||||
private readonly globalSessionState: GlobalSessionState
|
||||
) {
|
||||
super();
|
||||
}
|
||||
|
||||
watchNotificationCountCache() {
|
||||
return this.globalSessionState
|
||||
.watch('notification-count:' + this.serverService.server.id)
|
||||
.pipe(
|
||||
map(count => {
|
||||
if (typeof count === 'number') {
|
||||
return count;
|
||||
}
|
||||
return 0;
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
setNotificationCountCache(count: number) {
|
||||
this.globalSessionState.set(
|
||||
'notification-count:' + this.serverService.server.id,
|
||||
count
|
||||
);
|
||||
}
|
||||
|
||||
async getNotificationCount(signal?: AbortSignal) {
|
||||
const result = await this.gqlService.gql({
|
||||
query: notificationCountQuery,
|
||||
context: {
|
||||
signal,
|
||||
},
|
||||
});
|
||||
|
||||
return result.currentUser?.notificationCount;
|
||||
}
|
||||
|
||||
async listNotification(pagination: PaginationInput, signal?: AbortSignal) {
|
||||
const result = await this.gqlService.gql({
|
||||
query: listNotificationsQuery,
|
||||
variables: {
|
||||
pagination: pagination,
|
||||
},
|
||||
context: {
|
||||
signal,
|
||||
},
|
||||
});
|
||||
|
||||
return result.currentUser?.notifications;
|
||||
}
|
||||
|
||||
readNotification(id: string) {
|
||||
return this.gqlService.gql({
|
||||
query: readNotificationMutation,
|
||||
variables: {
|
||||
id,
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user