[7.x] Fix newsfeed unread notifications always on when reloading Kibana (#100357)

src/plugins/newsfeed/common/constants.ts

@@ -7,11 +7,6 @@
  */
 
 export const NEWSFEED_FALLBACK_LANGUAGE = 'en';
-export const NEWSFEED_FALLBACK_FETCH_INTERVAL = 86400000; // 1 day
-export const NEWSFEED_FALLBACK_MAIN_INTERVAL = 120000; // 2 minutes
-export const NEWSFEED_LAST_FETCH_STORAGE_KEY = 'newsfeed.lastfetchtime';
-export const NEWSFEED_HASH_SET_STORAGE_KEY = 'newsfeed.hashes';
-
 export const NEWSFEED_DEFAULT_SERVICE_BASE_URL = 'https://feeds.elastic.co';
 export const NEWSFEED_DEV_SERVICE_BASE_URL = 'https://feeds-staging.elastic.co';
 export const NEWSFEED_DEFAULT_SERVICE_PATH = '/kibana/v{VERSION}.json';

src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx

@@ -6,71 +6,69 @@
  * Side Public License, v 1.
  */
 
-import React, { useState, Fragment, useEffect } from 'react';
-import * as Rx from 'rxjs';
+import React, { useState, useEffect, useMemo, useCallback } from 'react';
 import { EuiHeaderSectionItemButton, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import type { NewsfeedApi } from '../lib/api';
 import { NewsfeedFlyout } from './flyout_list';
 import { FetchResult } from '../types';
 
 export interface INewsfeedContext {
   setFlyoutVisible: React.Dispatch<React.SetStateAction<boolean>>;
   newsFetchResult: FetchResult | void | null;
 }
-export const NewsfeedContext = React.createContext({} as INewsfeedContext);
 
-export type NewsfeedApiFetchResult = Rx.Observable<void | FetchResult | null>;
+export const NewsfeedContext = React.createContext({} as INewsfeedContext);
 
 export interface Props {
-  apiFetchResult: NewsfeedApiFetchResult;
+  newsfeedApi: NewsfeedApi;
 }
 
-export const NewsfeedNavButton = ({ apiFetchResult }: Props) => {
-  const [showBadge, setShowBadge] = useState<boolean>(false);
+export const NewsfeedNavButton = ({ newsfeedApi }: Props) => {
   const [flyoutVisible, setFlyoutVisible] = useState<boolean>(false);
   const [newsFetchResult, setNewsFetchResult] = useState<FetchResult | null | void>(null);
+  const hasNew = useMemo(() => {
+    return newsFetchResult ? newsFetchResult.hasNew : false;
+  }, [newsFetchResult]);
 
   useEffect(() => {
-    function handleStatusChange(fetchResult: FetchResult | void | null) {
-      if (fetchResult) {
-        setShowBadge(fetchResult.hasNew);
-      }
-      setNewsFetchResult(fetchResult);
-    }
-
-    const subscription = apiFetchResult.subscribe((res) => handleStatusChange(res));
+    const subscription = newsfeedApi.fetchResults$.subscribe((results) => {
+      setNewsFetchResult(results);
+    });
     return () => subscription.unsubscribe();
-  }, [apiFetchResult]);
+  }, [newsfeedApi]);
 
-  function showFlyout() {
-    setShowBadge(false);
+  const showFlyout = useCallback(() => {
+    if (newsFetchResult) {
+      newsfeedApi.markAsRead(newsFetchResult.feedItems.map((item) => item.hash));
+    }
     setFlyoutVisible(!flyoutVisible);
-  }
+  }, [newsfeedApi, newsFetchResult, flyoutVisible]);
 
   return (
     <NewsfeedContext.Provider value={{ setFlyoutVisible, newsFetchResult }}>
-      <Fragment>
+      <>
         <EuiHeaderSectionItemButton
           data-test-subj="newsfeed"
           aria-controls="keyPadMenu"
           aria-expanded={flyoutVisible}
           aria-haspopup="true"
           aria-label={
-            showBadge
+            hasNew
               ? i18n.translate('newsfeed.headerButton.unreadAriaLabel', {
                   defaultMessage: 'Newsfeed menu - unread items available',
                 })
               : i18n.translate('newsfeed.headerButton.readAriaLabel', {
                   defaultMessage: 'Newsfeed menu - all items read',
                 })
           }
-          notification={showBadge ? true : null}
+          notification={hasNew ? true : null}
           onClick={showFlyout}
         >
           <EuiIcon type="cheer" size="m" />
         </EuiHeaderSectionItemButton>
         {flyoutVisible ? <NewsfeedFlyout /> : null}
-      </Fragment>
+      </>
     </NewsfeedContext.Provider>
   );
 };

src/plugins/newsfeed/public/lib/api.test.mocks.ts

@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { storageMock } from './storage.mock';
+import { driverMock } from './driver.mock';
+
+export const storageInstanceMock = storageMock.create();
+jest.doMock('./storage', () => ({
+  NewsfeedStorage: jest.fn().mockImplementation(() => storageInstanceMock),
+}));
+
+export const driverInstanceMock = driverMock.create();
+jest.doMock('./driver', () => ({
+  NewsfeedApiDriver: jest.fn().mockImplementation(() => driverInstanceMock),
+}));