Skip to content

Commit 920afa7

Browse files
committed
1 parent b57388f commit 920afa7

File tree

4 files changed

+9
-74
lines changed

4 files changed

+9
-74
lines changed

packages/frontend/component/src/components/disable-public-link/index.tsx

Lines changed: 0 additions & 22 deletions
This file was deleted.

packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx

Lines changed: 7 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { notify, Skeleton } from '@affine/component';
2-
import { PublicLinkDisableModal } from '@affine/component/disable-public-link';
32
import { Button } from '@affine/component/ui/button';
43
import { Menu, MenuItem, MenuTrigger } from '@affine/component/ui/menu';
54
import { openSettingModalAtom } from '@affine/core/atoms';
@@ -14,10 +13,10 @@ import { WorkspaceFlavour } from '@affine/env/workspace';
1413
import { PublicPageMode } from '@affine/graphql';
1514
import { useI18n } from '@affine/i18n';
1615
import {
16+
BlockIcon,
1717
CollaborationIcon,
1818
DoneIcon,
1919
EdgelessIcon,
20-
LinkIcon,
2120
LockIcon,
2221
PageIcon,
2322
SingleSelectSelectSolidIcon,
@@ -26,7 +25,7 @@ import {
2625
import { useLiveData, useService } from '@toeverything/infra';
2726
import { cssVar } from '@toeverything/theme';
2827
import { useSetAtom } from 'jotai';
29-
import { Suspense, useCallback, useEffect, useState } from 'react';
28+
import { Suspense, useCallback, useEffect } from 'react';
3029
import { ErrorBoundary } from 'react-error-boundary';
3130

3231
import { CloudSvg } from '../cloud-svg';
@@ -75,9 +74,6 @@ export const AFFiNESharePage = (props: ShareMenuProps) => {
7574
const baseUrl = useLiveData(serverConfig.config$.map(c => c?.baseUrl));
7675
const isLoading =
7776
isSharedPage === null || sharedMode === null || baseUrl === null;
78-
const [showDisable, setShowDisable] = useState(false);
79-
80-
const currentDocMode = useLiveData(editor.mode$);
8177

8278
const permissionService = useService(WorkspacePermissionService);
8379
const isOwner = useLiveData(permissionService.permission.isOwner$);
@@ -152,15 +148,8 @@ export const AFFiNESharePage = (props: ShareMenuProps) => {
152148
});
153149
console.log(err);
154150
}
155-
setShowDisable(false);
156151
}, [shareInfoService, t]);
157152

158-
const onClickDisable = useCallback(() => {
159-
if (isSharedPage) {
160-
setShowDisable(true);
161-
}
162-
}, [isSharedPage]);
163-
164153
const isMac = environment.isBrowser && environment.isMacOs;
165154

166155
const { onClickCopyLink } = useSharingUrl({
@@ -207,7 +196,7 @@ export const AFFiNESharePage = (props: ShareMenuProps) => {
207196
}}
208197
items={
209198
<>
210-
<MenuItem prefixIcon={<LockIcon />} onSelect={onClickDisable}>
199+
<MenuItem prefixIcon={<LockIcon />} onSelect={onDisablePublic}>
211200
<div className={styles.publicItemRowStyle}>
212201
<div>
213202
{t['com.affine.share-menu.option.link.no-access']()}
@@ -248,20 +237,9 @@ export const AFFiNESharePage = (props: ShareMenuProps) => {
248237
<div className={styles.labelStyle}>
249238
{t['com.affine.share-menu.option.permission.label']()}
250239
</div>
251-
<Menu
252-
contentOptions={{
253-
align: 'end',
254-
}}
255-
items={
256-
<MenuItem>
257-
{t['com.affine.share-menu.option.permission.can-edit']()}
258-
</MenuItem>
259-
}
260-
>
261-
<MenuTrigger className={styles.menuTriggerStyle} disabled>
262-
{t['com.affine.share-menu.option.permission.can-edit']()}
263-
</MenuTrigger>
264-
</Menu>
240+
<Button className={styles.menuTriggerStyle} disabled>
241+
{t['com.affine.share-menu.option.permission.can-edit']()}
242+
</Button>
265243
</div>
266244
</div>
267245
{isOwner && (
@@ -307,14 +285,9 @@ export const AFFiNESharePage = (props: ShareMenuProps) => {
307285
>
308286
{t['com.affine.share-menu.copy.edgeless']()}
309287
</MenuItem>
310-
<MenuItem prefixIcon={<LinkIcon />} onSelect={onCopyBlockLink}>
288+
<MenuItem prefixIcon={<BlockIcon />} onSelect={onCopyBlockLink}>
311289
{t['com.affine.share-menu.copy.block']()}
312290
</MenuItem>
313-
{currentDocMode === 'edgeless' && (
314-
<MenuItem prefixIcon={<LinkIcon />} onSelect={onCopyBlockLink}>
315-
{t['com.affine.share-menu.copy.frame']()}
316-
</MenuItem>
317-
)}
318291
</>
319292
}
320293
>
@@ -327,12 +300,6 @@ export const AFFiNESharePage = (props: ShareMenuProps) => {
327300
/>
328301
</Menu>
329302
</div>
330-
331-
<PublicLinkDisableModal
332-
open={showDisable}
333-
onConfirm={onDisablePublic}
334-
onOpenChange={setShowDisable}
335-
/>
336303
</div>
337304
);
338305
};

packages/frontend/core/src/components/page-list/operation-cell.tsx

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ export const PageOperationCell = ({
8181
);
8282
const currentWorkspace = workspaceService.workspace;
8383
const { setTrashModal } = useTrashModalHelper(currentWorkspace.docCollection);
84-
const [openDisableShared, setOpenDisableShared] = useState(false);
8584
const favourite = useLiveData(favAdapter.isFavorite$(page.id, 'doc'));
8685
const workbench = workbenchService.workbench;
8786
const { duplicate } = useBlockSuiteMetaHelper(currentWorkspace.docCollection);
@@ -94,6 +93,7 @@ export const PageOperationCell = ({
9493
}, []);
9594

9695
const onDisablePublicSharing = useCallback(() => {
96+
//TODO(@EYHN): implement disable public sharing
9797
toast('Successfully disabled', {
9898
portal: document.body,
9999
});
@@ -154,9 +154,7 @@ export const PageOperationCell = ({
154154
{page.isPublic && (
155155
<DisablePublicSharing
156156
data-testid="disable-public-sharing"
157-
onSelect={() => {
158-
setOpenDisableShared(true);
159-
}}
157+
onSelect={onDisablePublicSharing}
160158
/>
161159
)}
162160
{isInAllowList && (
@@ -227,11 +225,6 @@ export const PageOperationCell = ({
227225
docId={blocksuiteDoc.id}
228226
/>
229227
) : null}
230-
<DisablePublicSharing.DisablePublicSharingModal
231-
onConfirm={onDisablePublicSharing}
232-
open={openDisableShared}
233-
onOpenChange={setOpenDisableShared}
234-
/>
235228
</>
236229
);
237230
};

packages/frontend/core/src/components/page-list/operation-menu-items/disable-public-sharing.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { MenuItemProps } from '@affine/component';
22
import { MenuItem } from '@affine/component';
3-
import { PublicLinkDisableModal } from '@affine/component/disable-public-link';
43
import { useI18n } from '@affine/i18n';
54
import { ShareIcon } from '@blocksuite/icons/rc';
65

@@ -12,5 +11,3 @@ export const DisablePublicSharing = (props: MenuItemProps) => {
1211
</MenuItem>
1312
);
1413
};
15-
16-
DisablePublicSharing.DisablePublicSharingModal = PublicLinkDisableModal;

0 commit comments

Comments
 (0)