From a7cc64ca2b30b47c57cae2115e10f34f361c90b9 Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 13 Feb 2021 15:52:44 +0800 Subject: ... --- .../timeline-common/TimelinePageTemplateUI.tsx | 42 ++++++++-------------- 1 file changed, 14 insertions(+), 28 deletions(-) (limited to 'FrontEnd') diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePageTemplateUI.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePageTemplateUI.tsx index ed21d6b5..b0d3fe97 100644 --- a/FrontEnd/src/app/views/timeline-common/TimelinePageTemplateUI.tsx +++ b/FrontEnd/src/app/views/timeline-common/TimelinePageTemplateUI.tsx @@ -3,15 +3,14 @@ import { useTranslation } from "react-i18next"; import { Spinner } from "react-bootstrap"; import { getAlertHost } from "@/services/alert"; -import { TimelineInfo, TimelinePostInfo } from "@/services/timeline"; + +import { HttpTimelineInfo } from "@/http/timeline"; import Timeline from "./Timeline"; import TimelinePostEdit, { TimelinePostSendCallback } from "./TimelinePostEdit"; -import { TimelineSyncStatus } from "./SyncStatusBadge"; export interface TimelineCardComponentProps { - timeline: TimelineInfo; - syncStatus: TimelineSyncStatus; + timeline: HttpTimelineInfo; operations: { onManage?: (item: TManageItems | "property") => void; onMember: () => void; @@ -31,13 +30,11 @@ export interface TimelinePageTemplateUIOperations { export interface TimelinePageTemplateUIProps { timeline?: - | (TimelineInfo & { + | (HttpTimelineInfo & { operations: TimelinePageTemplateUIOperations; - posts?: TimelinePostInfo[] | "forbid"; }) | "notexist" | "offline"; - syncStatus: TimelineSyncStatus; notExistMessageI18nKey: string; CardComponent: React.ComponentType>; } @@ -45,7 +42,7 @@ export interface TimelinePageTemplateUIProps { export default function TimelinePageTemplateUI( props: TimelinePageTemplateUIProps ): React.ReactElement | null { - const { timeline, syncStatus, CardComponent } = props; + const { timeline, CardComponent } = props; const { t } = useTranslation(); @@ -105,35 +102,24 @@ export default function TimelinePageTemplateUI( } else if (timeline === "notexist") { body =

{t(props.notExistMessageI18nKey)}

; } else { - const { operations, posts } = timeline; + const { operations } = timeline; body = ( <> - {posts != null ? ( - posts === "forbid" ? ( -
{t("timeline.messageCantSee")}
- ) : ( -
- -
- ) - ) : ( -
- -
- )} +
+ +
{operations.onPost != null ? ( <>