From 759d60b402b10a729eee1d616b21330dbed2dca1 Mon Sep 17 00:00:00 2001
From: Bruce Liu <hy.liu@berkeley.edu>
Date: Sun, 2 Mar 2025 22:00:04 -0800
Subject: [PATCH] refactor log menu as function component

---
 src/components/context-menu.tsx       |   2 +-
 src/components/log-menu.tsx           | 101 ++++++++++++--------------
 src/components/root.tsx               |   4 +-
 src/containers/log-menu-container.tsx |  20 -----
 4 files changed, 50 insertions(+), 77 deletions(-)
 delete mode 100644 src/containers/log-menu-container.tsx

diff --git a/src/components/context-menu.tsx b/src/components/context-menu.tsx
index 25cda323..9377040c 100644
--- a/src/components/context-menu.tsx
+++ b/src/components/context-menu.tsx
@@ -538,7 +538,7 @@ function GroupContextMenu() {
 
 function MarkReadContextMenu() {
     const dispatch = useAppDispatch()
-    
+
     const menuItems: IContextualMenuItem[] = [
         {
             key: "section_1",
diff --git a/src/components/log-menu.tsx b/src/components/log-menu.tsx
index 8f943cb2..8b7c4dad 100644
--- a/src/components/log-menu.tsx
+++ b/src/components/log-menu.tsx
@@ -7,15 +7,10 @@ import {
     DirectionalHint,
     Link,
 } from "@fluentui/react"
-import { AppLog, AppLogType } from "../scripts/models/app"
+import { AppLog, AppLogType, toggleLogMenu } from "../scripts/models/app"
 import Time from "./utils/time"
-
-type LogMenuProps = {
-    display: boolean
-    logs: AppLog[]
-    close: () => void
-    showItem: (iid: number) => void
-}
+import { useAppDispatch, useAppSelector } from "../scripts/reducer"
+import { showItemFromId } from "../scripts/models/page"
 
 function getLogIcon(log: AppLog) {
     switch (log.type) {
@@ -28,58 +23,56 @@ function getLogIcon(log: AppLog) {
     }
 }
 
-class LogMenu extends React.Component<LogMenuProps> {
-    activityItems = () =>
-        this.props.logs
-            .map((l, i) => ({
-                key: i,
-                activityDescription: l.iid ? (
-                    <b>
-                        <Link onClick={() => this.handleArticleClick(l)}>
-                            {l.title}
-                        </Link>
-                    </b>
-                ) : (
-                    <b>{l.title}</b>
-                ),
-                comments: l.details,
-                activityIcon: <Icon iconName={getLogIcon(l)} />,
-                timeStamp: <Time date={l.time} />,
-            }))
-            .reverse()
+function LogMenu() {
+    const dispatch = useAppDispatch()
+    const { display, logs } = useAppSelector(state => state.app.logMenu)
 
-    handleArticleClick = (log: AppLog) => {
-        this.props.close()
-        this.props.showItem(log.iid)
-    }
-
-    render() {
-        return (
-            this.props.display && (
-                <Callout
-                    target="#log-toggle"
-                    role="log-menu"
-                    directionalHint={DirectionalHint.bottomCenter}
-                    calloutWidth={320}
-                    calloutMaxHeight={240}
-                    onDismiss={this.props.close}>
-                    {this.props.logs.length == 0 ? (
-                        <p style={{ textAlign: "center" }}>
-                            {intl.get("log.empty")}
-                        </p>
-                    ) : (
-                        this.activityItems().map(item => (
+    return (
+        display && (
+            <Callout
+                target="#log-toggle"
+                role="log-menu"
+                directionalHint={DirectionalHint.bottomCenter}
+                calloutWidth={320}
+                calloutMaxHeight={240}
+                onDismiss={() => dispatch(toggleLogMenu())}>
+                {logs.length == 0 ? (
+                    <p style={{ textAlign: "center" }}>
+                        {intl.get("log.empty")}
+                    </p>
+                ) : (
+                    logs
+                        .map((l, i) => (
                             <ActivityItem
-                                {...item}
-                                key={item.key}
+                                activityDescription={
+                                    l.iid ? (
+                                        <b>
+                                            <Link
+                                                onClick={() => {
+                                                    dispatch(toggleLogMenu())
+                                                    dispatch(
+                                                        showItemFromId(l.iid)
+                                                    )
+                                                }}>
+                                                {l.title}
+                                            </Link>
+                                        </b>
+                                    ) : (
+                                        <b>{l.title}</b>
+                                    )
+                                }
+                                comments={l.details}
+                                activityIcon={<Icon iconName={getLogIcon(l)} />}
+                                timeStamp={<Time date={l.time} />}
+                                key={i}
                                 style={{ margin: 12 }}
                             />
                         ))
-                    )}
-                </Callout>
-            )
+                        .reverse()
+                )}
+            </Callout>
         )
-    }
+    )
 }
 
 export default LogMenu
diff --git a/src/components/root.tsx b/src/components/root.tsx
index 76b58ac3..8d75667b 100644
--- a/src/components/root.tsx
+++ b/src/components/root.tsx
@@ -4,10 +4,10 @@ import { closeContextMenu } from "../scripts/models/app"
 import PageContainer from "../containers/page-container"
 import MenuContainer from "../containers/menu-container"
 import NavContainer from "../containers/nav-container"
-import LogMenuContainer from "../containers/log-menu-container"
 import SettingsContainer from "../containers/settings-container"
 import { RootState } from "../scripts/reducer"
 import { ContextMenu } from "./context-menu"
+import LogMenu from "./log-menu"
 
 const Root = ({ locale, dispatch }) =>
     locale && (
@@ -17,7 +17,7 @@ const Root = ({ locale, dispatch }) =>
             onMouseDown={() => dispatch(closeContextMenu())}>
             <NavContainer />
             <PageContainer />
-            <LogMenuContainer />
+            <LogMenu />
             <MenuContainer />
             <SettingsContainer />
             <ContextMenu />
diff --git a/src/containers/log-menu-container.tsx b/src/containers/log-menu-container.tsx
deleted file mode 100644
index 247e4195..00000000
--- a/src/containers/log-menu-container.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from "react-redux"
-import { createSelector } from "reselect"
-import { RootState } from "../scripts/reducer"
-import { toggleLogMenu } from "../scripts/models/app"
-import LogMenu from "../components/log-menu"
-import { showItemFromId } from "../scripts/models/page"
-
-const getLogs = (state: RootState) => state.app.logMenu
-
-const mapStateToProps = createSelector(getLogs, logs => logs)
-
-const mapDispatchToProps = dispatch => {
-    return {
-        close: () => dispatch(toggleLogMenu()),
-        showItem: (iid: number) => dispatch(showItemFromId(iid)),
-    }
-}
-
-const LogMenuContainer = connect(mapStateToProps, mapDispatchToProps)(LogMenu)
-export default LogMenuContainer