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

+ 2 - 2
packages/app/src/components/InAppNotification/AllInAppNotifications.tsx

@@ -3,7 +3,7 @@ import React, { FC, useState, useEffect } from 'react';
 import AppContainer from '../../client/services/AppContainer';
 import AppContainer from '../../client/services/AppContainer';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
 
 
-import InAppNotificationContents from './InAppNotificationContents';
+import InAppNotificationList from './InAppNotificationList';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import { withUnstatedContainers } from '../UnstatedUtils';
 
 
 const logger = loggerFactory('growi:ALlInAppnotification');
 const logger = loggerFactory('growi:ALlInAppnotification');
@@ -37,7 +37,7 @@ const AllInAppNotifications: FC<Props> = (props: Props) => {
   };
   };
 
 
   return (
   return (
-    <InAppNotificationContents notifications={notifications} isLoaded={isLoaded} />
+    <InAppNotificationList notifications={notifications} isLoaded={isLoaded} />
   );
   );
 };
 };
 
 

+ 2 - 2
packages/app/src/components/InAppNotification/InAppNotificationDropdown.tsx

@@ -6,7 +6,7 @@ import loggerFactory from '~/utils/logger';
 
 
 import AppContainer from '../../client/services/AppContainer';
 import AppContainer from '../../client/services/AppContainer';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import { withUnstatedContainers } from '../UnstatedUtils';
-import InAppNotificationContents from './InAppNotificationContents';
+import InAppNotificationList from './InAppNotificationList';
 import SocketIoContainer from '../../client/services/SocketIoContainer';
 import SocketIoContainer from '../../client/services/SocketIoContainer';
 
 
 const logger = loggerFactory('growi:InAppNotificationDropdown');
 const logger = loggerFactory('growi:InAppNotificationDropdown');
@@ -103,7 +103,7 @@ const InAppNotificationDropdown: FC<Props> = (props: Props) => {
         </button>
         </button>
       </DropdownToggle>
       </DropdownToggle>
       <DropdownMenu className="px-2" right>
       <DropdownMenu className="px-2" right>
-        <InAppNotificationContents notifications={notifications} isLoaded={isLoaded} />
+        <InAppNotificationList notifications={notifications} isLoaded={isLoaded} />
         <DropdownItem divider />
         <DropdownItem divider />
         {/* TODO: Able to show all notifications by #79317 */}
         {/* TODO: Able to show all notifications by #79317 */}
         <a className="dropdown-item d-flex justify-content-center" href="/me/all-in-app-notifications">See All</a>
         <a className="dropdown-item d-flex justify-content-center" href="/me/all-in-app-notifications">See All</a>

+ 2 - 5
packages/app/src/components/InAppNotification/InAppNotificationContents.tsx → packages/app/src/components/InAppNotification/InAppNotificationList.tsx

@@ -8,7 +8,7 @@ type Props = {
   isLoaded: boolean;
   isLoaded: boolean;
 };
 };
 
 
-const InAppNotificationContents: FC<Props> = (props: Props) => {
+const InAppNotificationList: FC<Props> = (props: Props) => {
   const { notifications } = props;
   const { notifications } = props;
 
 
   const notificationClickHandler = async(notification: Notification) => {
   const notificationClickHandler = async(notification: Notification) => {
@@ -36,9 +36,6 @@ const InAppNotificationContents: FC<Props> = (props: Props) => {
   };
   };
 
 
   const RenderInAppNotificationList = () => {
   const RenderInAppNotificationList = () => {
-    console.log('notificationsHoge', notifications);
-
-
     if (notifications.length === 0) {
     if (notifications.length === 0) {
       return <RenderEmptyInAppNotification />;
       return <RenderEmptyInAppNotification />;
     }
     }
@@ -60,4 +57,4 @@ const InAppNotificationContents: FC<Props> = (props: Props) => {
 };
 };
 
 
 
 
-export default InAppNotificationContents;
+export default InAppNotificationList;