Procházet zdrojové kódy

use unloaded notification component

kaori před 4 roky
rodič
revize
77f31b3ccd

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

@@ -10,7 +10,7 @@ import { InAppNotification as IInAppNotification } from '../../interfaces/in-app
 // import DropdownMenu from './InAppNotificationDropdown/DropdownMenu';
 // import DropdownMenu from './InAppNotificationDropdown/DropdownMenu';
 // import Crowi from 'client/util/Crowi'
 // import Crowi from 'client/util/Crowi'
 // import { Notification } from 'client/types/crowi'
 // import { Notification } from 'client/types/crowi'
-// import { InAppNotification } from './InAppNotification';
+import { InAppNotification } from './InAppNotification';
 import SocketIoContainer from '../../client/services/SocketIoContainer';
 import SocketIoContainer from '../../client/services/SocketIoContainer';
 
 
 const logger = loggerFactory('growi:InAppNotificationDropdown');
 const logger = loggerFactory('growi:InAppNotificationDropdown');
@@ -71,7 +71,6 @@ const InAppNotificationDropdown: FC<Props> = (props: Props) => {
     const limit = 6;
     const limit = 6;
     try {
     try {
       const paginationResult = await appContainer.apiv3Get('/in-app-notification/list', { limit });
       const paginationResult = await appContainer.apiv3Get('/in-app-notification/list', { limit });
-      console.log('paginationResult', paginationResult);
 
 
       setNotifications(paginationResult.data.docs);
       setNotifications(paginationResult.data.docs);
       setIsLoaded(true);
       setIsLoaded(true);
@@ -144,9 +143,9 @@ const InAppNotificationDropdown: FC<Props> = (props: Props) => {
   };
   };
 
 
   const InAppNotificationContents = (): JSX.Element => {
   const InAppNotificationContents = (): JSX.Element => {
-    // if (isLoaded === false) {
-    //   return <RenderUnLoadedInAppNotification />;
-    // }
+    if (isLoaded === false) {
+      return <RenderUnLoadedInAppNotification />;
+    }
     return <RenderInAppNotificationList />;
     return <RenderInAppNotificationList />;
   };
   };