From 4af6223dc348ca8fc623f43870c436be38b4f93f Mon Sep 17 00:00:00 2001 From: JimmFly <447268514@qq.com> Date: Thu, 27 Jun 2024 06:30:28 +0000 Subject: [PATCH] chore(core): removed obsolete TODO (#7337) Cleaned up some TODOs that no longer need to be done --- packages/frontend/core/src/commands/affine-updates.tsx | 6 +++++- .../new-workspace-setting-detail/labels.tsx | 4 ---- .../affine/share-page-modal/share-menu/index.css.ts | 1 - .../page-list/collections/collection-list-item.css.ts | 1 - .../page-list/collections/collection-list-item.tsx | 1 - .../src/components/page-list/docs/page-list-item.css.ts | 1 - .../core/src/components/page-list/docs/page-list-item.tsx | 1 - .../core/src/components/page-list/tags/tag-list-item.css.ts | 1 - .../core/src/components/page-list/tags/tag-list-item.tsx | 1 - packages/frontend/core/src/components/page-list/types.ts | 4 +--- .../core/src/pages/workspace/detail-page/detail-page.css.ts | 1 - 11 files changed, 6 insertions(+), 16 deletions(-) diff --git a/packages/frontend/core/src/commands/affine-updates.tsx b/packages/frontend/core/src/commands/affine-updates.tsx index 2f632db6f..2d4315094 100644 --- a/packages/frontend/core/src/commands/affine-updates.tsx +++ b/packages/frontend/core/src/commands/affine-updates.tsx @@ -1,3 +1,4 @@ +import { notify } from '@affine/component'; import { updateReadyAtom } from '@affine/core/hooks/use-app-updater'; import { apis } from '@affine/electron-api'; import type { useI18n } from '@affine/i18n'; @@ -24,7 +25,10 @@ export function registerAffineUpdatesCommands({ preconditionStrategy: () => !!store.get(updateReadyAtom), run() { apis?.updater.quitAndInstall().catch(err => { - // TODO(@JimmFly): add error toast here + notify.error({ + title: 'Failed to restart to upgrade', + message: 'Please restart the app manually to upgrade.', + }); console.error(err); }); }, diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/labels.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/labels.tsx index 5cb6fdc3e..45ac0374c 100644 --- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/labels.tsx +++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/labels.tsx @@ -81,10 +81,6 @@ export const LabelsPanel = () => { condition: workspace.flavour === 'affine-cloud', label: 'syncCloud', }, - //TODO(@JimmFly): add these labels - // { status==="synced", label: 'availableOffline' } - // { workspace.flavour === 'affine-Docker', label: 'syncDocker' } - // { workspace.flavour === 'self-hosted', label: 'selfHosted' } ]; return ( diff --git a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/index.css.ts b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/index.css.ts index 459676cf5..86ad7d0c7 100644 --- a/packages/frontend/core/src/components/affine/share-page-modal/share-menu/index.css.ts +++ b/packages/frontend/core/src/components/affine/share-page-modal/share-menu/index.css.ts @@ -29,7 +29,6 @@ export const descriptionStyle = style({ }); export const buttonStyle = style({ marginTop: '18px', - // todo(@JimmFly): new color scheme should be used }); export const actionsStyle = style({ display: 'flex', diff --git a/packages/frontend/core/src/components/page-list/collections/collection-list-item.css.ts b/packages/frontend/core/src/components/page-list/collections/collection-list-item.css.ts index 51bfc2ae5..994389b12 100644 --- a/packages/frontend/core/src/components/page-list/collections/collection-list-item.css.ts +++ b/packages/frontend/core/src/components/page-list/collections/collection-list-item.css.ts @@ -66,7 +66,6 @@ globalStyle(`[data-draggable=true][data-dragging=true] ${dndCell}:before`, { opacity: 1, }); -// TODO(@JimmFly): remove global style globalStyle(`${root} > :first-child`, { paddingLeft: '16px', }); diff --git a/packages/frontend/core/src/components/page-list/collections/collection-list-item.tsx b/packages/frontend/core/src/components/page-list/collections/collection-list-item.tsx index 871b22d37..73b097536 100644 --- a/packages/frontend/core/src/components/page-list/collections/collection-list-item.tsx +++ b/packages/frontend/core/src/components/page-list/collections/collection-list-item.tsx @@ -109,7 +109,6 @@ export const CollectionListItem = (props: CollectionListItemProps) => { props.title, ]); - // TODO(@JimmFly): use getDropItemId const { setNodeRef, attributes, listeners, isDragging } = useDraggable({ id: getDNDId('collection-list', 'collection', props.collectionId), data: { diff --git a/packages/frontend/core/src/components/page-list/docs/page-list-item.css.ts b/packages/frontend/core/src/components/page-list/docs/page-list-item.css.ts index b097b481b..560f2ba72 100644 --- a/packages/frontend/core/src/components/page-list/docs/page-list-item.css.ts +++ b/packages/frontend/core/src/components/page-list/docs/page-list-item.css.ts @@ -66,7 +66,6 @@ globalStyle(`[data-draggable=true][data-dragging=true] ${dndCell}:before`, { opacity: 1, }); -// TODO(@JimmFly): remove global style globalStyle(`${root} > :first-child`, { paddingLeft: '16px', }); diff --git a/packages/frontend/core/src/components/page-list/docs/page-list-item.tsx b/packages/frontend/core/src/components/page-list/docs/page-list-item.tsx index 4460ccf45..0c3b07c7f 100644 --- a/packages/frontend/core/src/components/page-list/docs/page-list-item.tsx +++ b/packages/frontend/core/src/components/page-list/docs/page-list-item.tsx @@ -167,7 +167,6 @@ export const PageListItem = (props: PageListItemProps) => { props.title, ]); - // TODO(@JimmFly): use getDropItemId const { setNodeRef, attributes, listeners, isDragging } = useDraggable({ id: getDNDId('doc-list', 'doc', props.pageId), data: { diff --git a/packages/frontend/core/src/components/page-list/tags/tag-list-item.css.ts b/packages/frontend/core/src/components/page-list/tags/tag-list-item.css.ts index db5beb0fe..b144ea023 100644 --- a/packages/frontend/core/src/components/page-list/tags/tag-list-item.css.ts +++ b/packages/frontend/core/src/components/page-list/tags/tag-list-item.css.ts @@ -65,7 +65,6 @@ globalStyle(`[data-draggable=true][data-dragging=true] ${dndCell}:before`, { opacity: 1, }); -// TODO(@JimmFly): remove global style globalStyle(`${root} > :first-child`, { paddingLeft: '16px', }); diff --git a/packages/frontend/core/src/components/page-list/tags/tag-list-item.tsx b/packages/frontend/core/src/components/page-list/tags/tag-list-item.tsx index 6ebbd22c6..eed062b77 100644 --- a/packages/frontend/core/src/components/page-list/tags/tag-list-item.tsx +++ b/packages/frontend/core/src/components/page-list/tags/tag-list-item.tsx @@ -98,7 +98,6 @@ export const TagListItem = (props: TagListItemProps) => { ); }, [props.color, props.onSelectedChange, props.selectable, props.selected]); - // TODO(@JimmFly): use getDropItemId const { setNodeRef, attributes, listeners, isDragging } = useDraggable({ id: getDNDId('tag-list', 'tag', props.tagId), data: { diff --git a/packages/frontend/core/src/components/page-list/types.ts b/packages/frontend/core/src/components/page-list/types.ts index 46e079c57..e0bcad302 100644 --- a/packages/frontend/core/src/components/page-list/types.ts +++ b/packages/frontend/core/src/components/page-list/types.ts @@ -74,9 +74,7 @@ export type TagListItemProps = { export interface ItemListHeaderProps {} // TODO(@JimmFly): a temporary solution. may need to be refactored later -export type ItemGroupByType = 'createDate' | 'updatedDate'; // TODO(@JimmFly): can add more later - -// TODO(@JimmFly): a temporary solution. may need to be refactored later +export type ItemGroupByType = 'createDate' | 'updatedDate'; export interface SortBy { key: 'createDate' | 'updatedDate'; order: 'asc' | 'desc'; diff --git a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.css.ts b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.css.ts index e8890271c..10cb6441f 100644 --- a/packages/frontend/core/src/pages/workspace/detail-page/detail-page.css.ts +++ b/packages/frontend/core/src/pages/workspace/detail-page/detail-page.css.ts @@ -22,7 +22,6 @@ export const affineDocViewport = style({ flexDirection: 'column', userSelect: 'none', containerName: 'viewport', - // TODO(@JimmFly): find out what this does in bs containerType: 'inline-size', background: cssVar('backgroundPrimaryColor'), '@media': {