Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Workspace] Add global search bar into left nav #8538

Merged
merged 20 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/8538.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
feat:
- [Workspace] Add global search bar into left nav ([#8538](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8538))
6 changes: 6 additions & 0 deletions src/core/public/chrome/chrome_service.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
getNavGroupEnabled: jest.fn(),
registerNavGroupUpdater: jest.fn(),
},
globalSearch: {
registerSearchStrategy: jest.fn(),
},
};
};

Expand Down Expand Up @@ -83,6 +86,9 @@
getCurrentNavGroup$: jest.fn(() => new BehaviorSubject(undefined)),
setCurrentNavGroup: jest.fn(),
},
globalSearch: {
getAllSearchStrategies: jest.fn(() => []),

Check warning on line 90 in src/core/public/chrome/chrome_service.mock.ts

View check run for this annotation

Codecov / codecov/patch

src/core/public/chrome/chrome_service.mock.ts#L90

Added line #L90 was not covered by tests
},
setAppTitle: jest.fn(),
setIsVisible: jest.fn(),
getIsVisible$: jest.fn(),
Expand Down
18 changes: 17 additions & 1 deletion src/core/public/chrome/chrome_service.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ import {
ChromeNavGroupServiceSetupContract,
ChromeNavGroupServiceStartContract,
} from './nav_group';
import {
GlobalSearchService,
GlobalSearchServiceSetupContract,
GlobalSearchServiceStartContract,
} from './global_search';

export { ChromeNavControls, ChromeRecentlyAccessed, ChromeDocTitle };

Expand Down Expand Up @@ -136,6 +141,7 @@ export class ChromeService {
private readonly recentlyAccessed = new RecentlyAccessedService();
private readonly docTitle = new DocTitleService();
private readonly navGroup = new ChromeNavGroupService();
private readonly globalSearch = new GlobalSearchService();
private useUpdatedHeader = false;
private updatedHeaderSubscription: Subscription | undefined;
private collapsibleNavHeaderRender?: CollapsibleNavHeaderRender;
Expand Down Expand Up @@ -198,6 +204,7 @@ export class ChromeService {

public setup({ uiSettings }: SetupDeps): ChromeSetup {
const navGroup = this.navGroup.setup({ uiSettings });
const globalSearch = this.globalSearch.setup();
return {
registerCollapsibleNavHeader: (render: CollapsibleNavHeaderRender) => {
if (this.collapsibleNavHeaderRender) {
Expand All @@ -209,6 +216,7 @@ export class ChromeService {
this.collapsibleNavHeaderRender = render;
},
navGroup,
globalSearch,
};
}

Expand Down Expand Up @@ -255,6 +263,8 @@ export class ChromeService {
workspaces,
});

const globalSearch = this.globalSearch.start();

// erase chrome fields from a previous app while switching to a next app
application.currentAppId$.subscribe(() => {
helpExtension$.next(undefined);
Expand Down Expand Up @@ -346,6 +356,7 @@ export class ChromeService {
docTitle,
logos,
navGroup,
globalSearch,

getHeaderComponent: () => (
<Header
Expand Down Expand Up @@ -388,6 +399,7 @@ export class ChromeService {
workspaceList$={workspaces.workspaceList$}
currentWorkspace$={workspaces.currentWorkspace$}
useUpdatedHeader={this.useUpdatedHeader}
globalSearchStrategies={globalSearch.getAllSearchStrategies()}
/>
),

Expand Down Expand Up @@ -476,6 +488,8 @@ export class ChromeService {
export interface ChromeSetup {
registerCollapsibleNavHeader: (render: CollapsibleNavHeaderRender) => void;
navGroup: ChromeNavGroupServiceSetupContract;
/** {@inheritdoc GlobalSearchService} */
globalSearch: GlobalSearchServiceSetupContract;
}

/**
Expand Down Expand Up @@ -517,6 +531,8 @@ export interface ChromeStart {
navGroup: ChromeNavGroupServiceStartContract;
/** {@inheritdoc Logos} */
readonly logos: Logos;
/** {@inheritdoc GlobalSearchService} */
globalSearch: GlobalSearchServiceStartContract;

/**
* Sets the current app's title
Expand Down Expand Up @@ -605,7 +621,7 @@ export interface ChromeStart {
setCustomNavLink(newCustomNavLink?: Partial<ChromeNavLink>): void;

/**
* Get an observable of the current custom help conttent
* Get an observable of the current custom help content
*/
getHelpExtension$(): Observable<ChromeHelpExtension | undefined>;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

// test global_search_service.ts
import { GlobalSearchService, SearchObjectTypes } from './global_search_service';

describe('GlobalSearchService', () => {
it('registerSearchStrategy', async () => {
const globalSearchService = new GlobalSearchService();
const setup = globalSearchService.setup();
const start = globalSearchService.start();

setup.registerSearchStrategy({
id: 'test1',
type: SearchObjectTypes.PAGES,
doSearch: async (query) => {
return [];
},
});

expect(start.getAllSearchStrategies()).toHaveLength(1);
expect(start.getAllSearchStrategies()[0].id).toEqual('test1');
expect(start.getAllSearchStrategies()[0].type).toEqual(SearchObjectTypes.PAGES);
});

it('registerSearchStrategy with duplicate id', async () => {
Hailong-am marked this conversation as resolved.
Show resolved Hide resolved
const globalSearchService = new GlobalSearchService();
const setup = globalSearchService.setup();
const start = globalSearchService.start();

setup.registerSearchStrategy({
id: 'test2',
type: SearchObjectTypes.PAGES,
doSearch: async (query) => {
return [];
},
});

setup.registerSearchStrategy({
id: 'test2',
type: SearchObjectTypes.SAVED_OBJECTS,
doSearch: async (query) => {
return [];
},
});

// the second one will not overwrite the first one
expect(start.getAllSearchStrategies()).toHaveLength(1);
expect(start.getAllSearchStrategies()[0].id).toEqual('test2');
expect(start.getAllSearchStrategies()[0].type).toEqual(SearchObjectTypes.PAGES);
});
});
84 changes: 84 additions & 0 deletions src/core/public/chrome/global_search/global_search_service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

import { ReactNode } from 'react';

export enum SearchObjectTypes {
PAGES = 'pages',
SAVED_OBJECTS = 'saved_objects',
}
/**
* @experimental
*/
export interface GlobalSearchStrategy {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we not use search strategy as the name? We already have a concept of search strategy in the application. This is used for the actual search queries. Lets call these commands. Here is a really good extensible model that VS code uses for their global search. https://code.visualstudio.com/api/references/contribution-points#contributes.commands

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename it to searchCommand

/**
* unique id of this strategy
Hailong-am marked this conversation as resolved.
Show resolved Hide resolved
*/
id: string;
/**
* search object type
* @type {SearchObjectTypes}
*/
type: SearchObjectTypes;
/**
* do the search and return search result with a React element
* @param value search query
* @param callback callback function when search is done
*/
doSearch(value: string, callback?: () => void): Promise<ReactNode[]>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about run. This works well with the term command too. So it will be command.run(props)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename this method name to run as well

}

export interface GlobalSearchServiceSetupContract {
registerSearchStrategy(searchStrategy: GlobalSearchStrategy): void;
}

export interface GlobalSearchServiceStartContract {
getAllSearchStrategies(): GlobalSearchStrategy[];
}

/**
* {@link GlobalSearchStrategy | APIs} for registering new global search strategy when do search from header search bar .
*
* @example
* Register a GlobalSearchStrategy to search pages
* ```jsx
* chrome.globalSearch.registerSearchStrategy({
* id: 'test',
* type: SearchObjectTypes.PAGES,
* doSearch: async (query) => {
* return [];
* },
* })
* ```
*
* @experimental
*/
export class GlobalSearchService {
private searchStrategies = [] as GlobalSearchStrategy[];

private registerSearchStrategy(searchStrategy: GlobalSearchStrategy) {
const exists = this.searchStrategies.find((item) => {
return item.id === searchStrategy.id;
});
if (exists) {
// eslint-disable-next-line no-console
console.warn('Duplicate SearchStrategy id found');
return;
}
this.searchStrategies.push(searchStrategy);
}

public setup() {
return {
registerSearchStrategy: this.registerSearchStrategy.bind(this),
};
}

public start() {
return {
getAllSearchStrategies: () => this.searchStrategies,
};
}
}
6 changes: 6 additions & 0 deletions src/core/public/chrome/global_search/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

export * from './global_search_service';
1 change: 1 addition & 0 deletions src/core/public/chrome/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ export { ChromeDocTitle } from './doc_title';
export { RightNavigationOrder, HeaderVariant } from './constants';
export { ChromeRegistrationNavLink, ChromeNavGroupUpdater, NavGroupItemInMap } from './nav_group';
export { fulfillRegistrationLinksToChromeNavLinks, LinkItemType, getSortedNavLinks } from './utils';
export { SearchObjectTypes, GlobalSearchStrategy } from './global_search';

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,25 @@
padding: 0 $euiSizeS;
padding-left: $euiSize;
}

.searchBar-wrapper {
padding: $euiSize;
padding-top: $euiSizeS;
background-color: transparent;
flex-grow: 0;

.searchInput {
background-color: transparentize(white, 0.5);
Hailong-am marked this conversation as resolved.
Show resolved Hide resolved
}

.searchInput:focus {
background-color: white;
}
}

.searchBarIcon {
position: fixed;
top: $ouiHeaderChildSize;
left: 0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import useObservable from 'react-use/lib/useObservable';
import * as Rx from 'rxjs';
import classNames from 'classnames';
import { WorkspacesStart } from 'src/core/public/workspace';
import { ChromeNavControl, ChromeNavLink } from '../..';
import { NavGroupType } from '../../../../types';
import { ChromeNavControl, ChromeNavLink } from '../..';
import { InternalApplicationStart } from '../../../application/types';
import { HttpStart } from '../../../http';
import { createEuiListItem } from './nav_link';
Expand All @@ -24,9 +24,11 @@ import {
} from '../../nav_group';
import { fulfillRegistrationLinksToChromeNavLinks, getVisibleUseCases, sortBy } from '../../utils';
import { ALL_USE_CASE_ID, DEFAULT_APP_CATEGORIES } from '../../../../../core/utils';
import { GlobalSearchStrategy } from '../../global_search';
import { CollapsibleNavTop } from './collapsible_nav_group_enabled_top';
import { HeaderNavControls } from './header_nav_controls';
import { NavGroups } from './collapsible_nav_groups';
import { HeaderSearchBar, HeaderSearchBarIcon } from './header_search_bar';

export interface CollapsibleNavGroupEnabledProps {
appId$: InternalApplicationStart['currentAppId$'];
Expand All @@ -47,6 +49,7 @@ export interface CollapsibleNavGroupEnabledProps {
setCurrentNavGroup: ChromeNavGroupServiceStartContract['setCurrentNavGroup'];
capabilities: InternalApplicationStart['capabilities'];
currentWorkspace$: WorkspacesStart['currentWorkspace$'];
globalSearchStrategies?: GlobalSearchStrategy[];
}

const titleForSeeAll = i18n.translate('core.ui.primaryNav.seeAllLabel', {
Expand All @@ -70,6 +73,7 @@ export function CollapsibleNavGroupEnabled({
setCurrentNavGroup,
capabilities,
collapsibleNavHeaderRender,
globalSearchStrategies,
...observables
}: CollapsibleNavGroupEnabledProps) {
const allNavLinks = useObservable(observables.navLinks$, []);
Expand Down Expand Up @@ -214,6 +218,24 @@ export function CollapsibleNavGroupEnabled({
/>
</EuiPanel>
)}
{!isNavOpen ? (
<div className="searchBarIcon euiHeaderSectionItemButton">
{globalSearchStrategies && (
<HeaderSearchBarIcon globalSearchStrategies={globalSearchStrategies} />
)}
</div>
) : (
<EuiPanel
hasBorder={false}
paddingSize="s"
hasShadow={false}
className="searchBar-wrapper"
>
{globalSearchStrategies && (
<HeaderSearchBar globalSearchStrategies={globalSearchStrategies} />
)}
</EuiPanel>
)}
{!isNavOpen ? null : (
<EuiPanel
hasBorder={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { InternalApplicationStart } from 'src/core/public/application';
import { createEuiListItem } from './nav_link';
import { NavGroupItemInMap } from '../../nav_group';
import { ChromeNavLink } from '../../nav_links';

export interface CollapsibleNavTopProps {
collapsibleNavHeaderRender?: () => JSX.Element | null;
homeLink?: ChromeNavLink;
Expand Down
Loading
Loading