kaori 4 лет назад
Родитель
Сommit
bd769a458d

+ 1 - 1
packages/app/src/components/InAppNotification/InAppNotification.tsx

@@ -16,7 +16,7 @@ export const InAppNotification = (props: Props): JSX.Element => {
   const getActionUsers = () => {
     const latestActionUsers = notification.actionUsers.slice(0, 3);
     const latestUsers = latestActionUsers.map((user) => {
-      return `@${user}`;
+      return `@${user.name}`;
     });
 
     let actionedUsers = '';

+ 1 - 4
packages/app/src/components/InAppNotification/InAppNotificationDropdown.tsx

@@ -133,10 +133,7 @@ const InAppNotificationDropdown: FC<Props> = (props: Props) => {
     }
     const notificationList = notifications.map((notification: IInAppNotification) => {
       return (
-        // temporaly notification list. need to delete by #79077
-        <div key={notification._id}>action: {notification.action} </div>
-        // use this component to show notification list
-        // <InAppNotification key={notification._id} notification={notification} onClick={notificationClickHandler} />
+        <InAppNotification key={notification._id} notification={notification} onClick={notificationClickHandler} />
       );
     });
     return <>{notificationList}</>;

+ 3 - 5
packages/app/src/components/InAppNotification/PageCommentNotification.tsx

@@ -12,11 +12,9 @@ export const PageCommentNotification = (props: Props) => {
 
 
   return (
-    <span>
-      {/* TODO: show page path by #78706 */}
-      <b>{props.actionUsers}</b> commented on {props.notification.target}
-      {/* <PagePath page={notification.target} /> */}
-    </span>
+    <>
+      <b>{props.actionUsers}</b> commented on {props.notification.target.path}
+    </>
   );
 
 };