Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(editor): disable at menu member group for collaborator #11208

Merged
merged 1 commit into from
Mar 27, 2025
Merged

fix(editor): disable at menu member group for collaborator #11208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions blocksuite/affine/blocks/block-root/src/widgets/linked-doc/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ export type LinkedMenuGroup = {
loading?: boolean | Signal<boolean>;
// copywriting when display quantity exceeds
overflowText?: string | Signal<string>;
// hide the group
hidden?: boolean | Signal<boolean>;
};

export type LinkedDocContext = {
Expand Down
9 changes: 7 additions & 2 deletions blocksuite/affine/blocks/block-root/src/widgets/linked-doc/linked-doc-popover.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,17 +260,22 @@ export class LinkedDocPopover extends SignalWatcher(
});

const actionGroups = this._actionGroup.map(group => {
// Check if the group is loading
// Check if the group is loading or hidden
const isLoading = resolveSignal(group.loading);
const isHidden = resolveSignal(group.hidden);
return {
...group,
isLoading,
isHidden,
};
});

return html`<div class="linked-doc-popover" style="${style}">
${actionGroups
.filter(group => group.items.length || group.isLoading)
.filter(
group =>
(group.items.length > 0 || group.isLoading) && !group.isHidden
)
.map((group, idx) => {
return html`
<div class="divider" ?hidden=${idx === 0}></div>
Expand Down
3 changes: 2 additions & 1 deletion packages/frontend/core/src/modules/at-menu-config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { DocsService } from '../doc';
import { DocDisplayMetaService } from '../doc-display-meta';
import { EditorSettingService } from '../editor-setting';
import { JournalService } from '../journal';
import { MemberSearchService } from '../permissions';
import { GuardService, MemberSearchService } from '../permissions';
import { SearchMenuService } from '../search-menu/services';
import { WorkspaceScope } from '../workspace';
import { AtMenuConfigService } from './services';
Expand All @@ -23,5 +23,6 @@ export function configAtMenuConfigModule(framework: Framework) {
SearchMenuService,
WorkspaceServerService,
MemberSearchService,
GuardService,
]);
}
217 changes: 124 additions & 93 deletions packages/frontend/core/src/modules/at-menu-config/services/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
NewXxxEdgelessIcon,
NewXxxPageIcon,
} from '@blocksuite/icons/lit';
import { computed, Signal, signal } from '@preact/signals-core';
import { computed, Signal } from '@preact/signals-core';
import { Service } from '@toeverything/infra';
import { cssVarV2 } from '@toeverything/theme/v2';
import { html } from 'lit';
Expand All @@ -42,7 +42,7 @@ import type { DocDisplayMetaService } from '../../doc-display-meta';
import type { EditorSettingService } from '../../editor-setting';
import { type JournalService, suggestJournalDate } from '../../journal';
import { NotificationService } from '../../notification';
import type { Member, MemberSearchService } from '../../permissions';
import type { GuardService, MemberSearchService } from '../../permissions';
import type { SearchMenuService } from '../../search-menu/services';

function resolveSignal<T>(data: T | Signal<T>): T {
Expand All @@ -64,7 +64,8 @@ export class AtMenuConfigService extends Service {
private readonly docsService: DocsService,
private readonly searchMenuService: SearchMenuService,
private readonly workspaceServerService: WorkspaceServerService,
private readonly memberSearchService: MemberSearchService
private readonly memberSearchService: MemberSearchService,
private readonly guardService: GuardService
) {
super();
}
Expand Down Expand Up @@ -332,30 +333,23 @@ export class AtMenuConfigService extends Service {
inlineEditor: AffineInlineEditor,
_: AbortSignal
): LinkedMenuGroup {
const inviteItem: LinkedMenuItem = {
key: 'invite',
name: 'Invite...',
icon: MainAvatarIcon(),
action: () => {
close();

this.dialogService.open('setting', {
activeTab: 'workspace:members',
});
},
};
const convertMemberToMenuItem = (member: Member) => {
const { id, name, avatarUrl } = member;
const style = styleMap({
const getMenuItem = (
id: string,
name?: string | null,
avatar?: string | null,
sendNotification: boolean = true
): LinkedMenuItem => {
const avatarStyle = styleMap({
borderRadius: '50%',
border: `1px solid ${cssVarV2('layer/background/overlayPanel')}`,
width: '20px',
height: '20px',
boxSizing: 'border-box',
});
const icon = avatarUrl
? html`<img style=${style} src="${avatarUrl}" />`
const icon = avatar
? html`<img style=${avatarStyle} src="${avatar}" />`
: MainAvatarIcon();

return {
key: id,
name: name ?? 'Unknown',
Expand All @@ -374,11 +368,6 @@ export class AtMenuConfigService extends Service {
const docId = doc.id;
const mode = block.std.get(DocModeProvider).getEditorMode() ?? 'page';

const currentUserId =
this.workspaceServerService.server?.scope.get(AuthService).session
.account$.value?.id;
if (!currentUserId) return;

close();

const inlineRange = inlineEditor.getInlineRange();
Expand All @@ -394,91 +383,133 @@ export class AtMenuConfigService extends Service {
length: 0,
});

if (!sendNotification) return;

const relativePosition = createRelativePositionFromTypeIndex(
inlineEditor.yText,
inlineRange.index + 1
);

if (id !== currentUserId) {
notificationService
.mentionUser(id, workspaceId, {
id: docId,
title: this.docDisplayMetaService.title$(docId).value,
blockId: block.blockId,
mode: mode as GraphqlDocMode,
})
.then(notificationId => {
const doc = inlineEditor.yText.doc;
if (!doc) return;
const absolutePosition =
createAbsolutePositionFromRelativePosition(
relativePosition,
doc
);
if (!absolutePosition) return;
const index = absolutePosition.index;

const delta = inlineEditor.getDeltaByRangeIndex(index);
if (
!delta ||
delta.insert !== ' ' ||
!delta.attributes?.mention ||
delta.attributes.mention.notification ||
delta.attributes.mention.member !== id
)
return;

inlineEditor.formatText(
{
index: index - 1,
length: 1,
},
{
mention: {
member: id,
notification: notificationId,
},
}
notificationService
.mentionUser(id, workspaceId, {
id: docId,
title: this.docDisplayMetaService.title$(docId).value,
blockId: block.blockId,
mode: mode as GraphqlDocMode,
})
.then(notificationId => {
const doc = inlineEditor.yText.doc;
if (!doc) return;
const absolutePosition =
createAbsolutePositionFromRelativePosition(
relativePosition,
doc
);
})
.catch(error => {
const err = UserFriendlyError.fromAny(error);
notify.error({
title: I18n[`error.${err.name}`](err.data),
});
if (!absolutePosition) return;
const index = absolutePosition.index;

const delta = inlineEditor.getDeltaByRangeIndex(index);
if (
!delta ||
delta.insert !== ' ' ||
!delta.attributes?.mention ||
delta.attributes.mention.notification ||
delta.attributes.mention.member !== id
)
return;

inlineEditor.formatText(
{
index: index - 1,
length: 1,
},
{
mention: {
member: id,
notification: notificationId,
},
}
);
})
.catch(error => {
const err = UserFriendlyError.fromAny(error);
notify.error({
title: I18n[`error.${err.name}`](err.data),
});
}
});
},
};
};

if (query.length === 0) {
return {
name: I18n.t('com.affine.editor.at-menu.mention-members'),
items: [
...this.memberSearchService.result$.value
.slice(0, 3)
.map(member => convertMemberToMenuItem(member)),
inviteItem,
],
};
}
this.memberSearchService.reset();

const items = signal<LinkedMenuItem[]>([inviteItem]);
const loading = this.memberSearchService.isLoading$.signal;
this.memberSearchService.result$.subscribe(members => {
items.value = [
...members.map(member => convertMemberToMenuItem(member)),
inviteItem,
const inviteItem: LinkedMenuItem = {
key: 'invite',
name: 'Invite...',
icon: MainAvatarIcon(),
action: () => {
close();
this.dialogService.open('setting', {
activeTab: 'workspace:members',
});
},
};

const items = computed<LinkedMenuItem[]>(() => {
const members = this.memberSearchService.result$.signal.value;
const currentUser =
this.workspaceServerService.server?.scope.get(AuthService).session
.account$.signal.value;
const canUserManage = this.guardService.can$('Workspace_Users_Manage')
.signal.value;

if (query.length === 0) {
return [
...(currentUser
? [
getMenuItem(
currentUser.id,
currentUser.info?.name,
currentUser.info?.avatarUrl,
false
),
]
: []),
...members
.slice(0, 2)
.filter(member => member.id !== currentUser?.id)
.map(member =>
getMenuItem(member.id, member.name, member.avatarUrl)
),
...(canUserManage ? [inviteItem] : []),
];
}

return [
...members.map(member =>
getMenuItem(
member.id,
member.name,
member.avatarUrl,
member.id !== currentUser?.id
)
),
...(canUserManage ? [inviteItem] : []),
];
});
this.memberSearchService.search(query);
const hidden = computed(() => {
const members = this.memberSearchService.result$.signal.value;
const loading = this.memberSearchService.isLoading$.signal.value;
return query.length > 0 && !loading && members.length === 0;
});
const loading = this.memberSearchService.isLoading$.signal.value;

if (query.length > 0) {
this.memberSearchService.search(query);
}

return {
name: I18n.t('com.affine.editor.at-menu.mention-members'),
items,
loading,
hidden,
};
}

Expand Down
Loading