Fix the display and jump logic for recent assets

changelogs/fragments/8136.yml

@@ -0,0 +1,2 @@
+fix:
+- Fix the display and jump logic for recent assets ([#8136](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8136))

src/core/public/chrome/chrome_service.tsx

@@ -246,7 +246,7 @@ export class ChromeService {
 
     const navControls = this.navControls.start();
     const navLinks = this.navLinks.start({ application, http });
-    const recentlyAccessed = await this.recentlyAccessed.start({ http, workspaces });
+    const recentlyAccessed = await this.recentlyAccessed.start({ http, workspaces, application });
     const docTitle = this.docTitle.start({ document: window.document });
     const navGroup = await this.navGroup.start({
       navLinks,

src/core/public/chrome/recently_accessed/recently_accessed_service.ts

@@ -29,11 +29,12 @@
  */
 
 import { Observable } from 'rxjs';
-
+import { map } from 'rxjs/operators';
 import { PersistedLog } from './persisted_log';
 import { createLogKey } from './create_log_key';
 import { HttpSetup } from '../../http';
 import { WorkspacesStart } from '../../workspace';
+import { InternalApplicationStart } from '../../application';
 
 /** @public */
 export interface ChromeRecentlyAccessedHistoryItem {
@@ -50,16 +51,18 @@ export interface ChromeRecentlyAccessedHistoryItem {
 interface StartDeps {
   http: HttpSetup;
   workspaces: WorkspacesStart;
+  application: InternalApplicationStart;
 }
 
 /** @internal */
 export class RecentlyAccessedService {
-  async start({ http, workspaces }: StartDeps): Promise<ChromeRecentlyAccessed> {
+  async start({ http, workspaces, application }: StartDeps): Promise<ChromeRecentlyAccessed> {
     const logKey = await createLogKey('recentlyAccessed', http.basePath.getBasePath());
     const history = new PersistedLog<ChromeRecentlyAccessedHistoryItem>(logKey, {
       maxLength: 20,
       isEqual: (oldItem, newItem) => oldItem.id === newItem.id,
     });
+    const workspaceEnabled = application.capabilities.workspaces.enabled;
 
     return {
       /** Adds a new item to the history. */
@@ -81,10 +84,16 @@ export class RecentlyAccessedService {
       },
 
       /** Gets the current array of history items. */
-      get: () => history.get(),
+      get: () => history.get().filter((item) => !!item.workspaceId),
 
       /** Gets an observable of the current array of history items. */
-      get$: () => history.get$(),
+      get$: () => {
+        return history.get$().pipe(
+          map((items) => {
+            return items.filter((item) => (workspaceEnabled ? !!item.workspaceId : true));
+          })
+        );
+      },
     };
   }
 }

src/core/public/chrome/ui/header/nav_link.tsx

@@ -125,13 +125,17 @@ export function createRecentNavLink(
   recentLink: ChromeRecentlyAccessedHistoryItem,
   navLinks: ChromeNavLink[],
   basePath: HttpStart['basePath'],
-  navigateToUrl: InternalApplicationStart['navigateToUrl']
+  navigateToUrl: InternalApplicationStart['navigateToUrl'],
+  workspaceEnabled: boolean = true
 ): RecentNavLink {
   const { link, label, workspaceId } = recentLink;
   const href = relativeToAbsolute(
-    basePath.prepend(formatUrlWithWorkspaceId(link, workspaceId || '', basePath), {
-      withoutClientBasePath: true,
-    })
+    basePath.prepend(
+      formatUrlWithWorkspaceId(link, workspaceEnabled ? workspaceId || '' : '', basePath),
+      {
+        withoutClientBasePath: true,
+      }
+    )
   );
   const navLink = navLinks.find((nl) => href.startsWith(nl.baseUrl));
   let titleAndAriaLabel = label;

src/plugins/saved_objects_management/public/management_section/recent_work.tsx

@@ -232,9 +232,9 @@ export const RecentWork = (props: { core: CoreStart; workspaceEnabled?: boolean
                 recentAccessItem,
                 navLinks,
                 core.http.basePath,
-                core.application.navigateToUrl
+                core.application.navigateToUrl,
+                !!workspaceEnabled
               );
-
               content = (
                 <EuiCard
                   title={