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.

Sign up for GitHub

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

[Stateful sidenav] Hide out solutions result in global search #194279

Merged
merged 18 commits into from
Oct 4, 2024
Merged

[Stateful sidenav] Hide out solutions result in global search #194279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
22535c0
Fix security search result
sebelga Sep 27, 2024
173daeb
Revert changes to security
sebelga Sep 27, 2024
7e54c02
Fix enterprise_search search result
sebelga Sep 27, 2024
d6ef3d2
Fix "logs explorer" appearing in search/security solutions
sebelga Sep 27, 2024
d6753f9
Revert changes to enterprise_search deepLinks
sebelga Sep 27, 2024
5fe5771
Update space client to return disabledFeatures based on space solution
sebelga Sep 27, 2024
63a5790
Revert changes to enterprise_search deepLinks (2)
sebelga Sep 27, 2024
63428c6
Fix jest tests
sebelga Sep 30, 2024
f89aac9
Fix spaces API integration tests
sebelga Sep 30, 2024
9b2c1f0
Add api integration test to fetch a space with solution
sebelga Sep 30, 2024
edf9d66
Add 'observability-logs-explorer' to read privileges
sebelga Oct 1, 2024
e8b9704
Partial fix functional tests
sebelga Oct 1, 2024
a14245f
Fix delete tests
sebelga Oct 1, 2024
c80797b
Revert special treatment for "trial" license
sebelga Oct 1, 2024
5b2bd95
Fix functional test
sebelga Oct 2, 2024
352dcba
Update jest snapshot
sebelga Oct 2, 2024
7213c66
Merge branch 'main' into stateful-sidenav/fix-globalsearch
sebelga Oct 2, 2024
e88dc3e
Merge branch 'main' into stateful-sidenav/fix-globalsearch
sebelga Oct 3, 2024
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
54 changes: 45 additions & 9 deletions x-pack/plugins/enterprise_search/server/utils/connectors_search_result_provider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
* 2.0.
*/

import { NEVER, lastValueFrom } from 'rxjs';
import { NEVER, lastValueFrom, of } from 'rxjs';

import { IScopedClusterClient } from '@kbn/core/server';

import type { GlobalSearchProviderContext } from '@kbn/global-search-plugin/server';

import { ENTERPRISE_SEARCH_CONTENT_PLUGIN } from '../../common/constants';

import { getConnectorsSearchResultProvider } from './connectors_search_result_provider';
Expand Down Expand Up @@ -57,6 +59,24 @@ describe('Enterprise Search - connectors search provider', () => {
},
asInternalUser: {},
};

const getSearchProviderContext = ({
enterpriseSearchEnabled,
}: {
enterpriseSearchEnabled: boolean;
}): GlobalSearchProviderContext => ({
core: {
capabilities: of({
catalogue: { enterpriseSearch: enterpriseSearchEnabled },
management: {},
navLinks: {},
}),
savedObjects: {} as any,
uiSettings: {} as any,
},
});
const mockSearchProviderContext = getSearchProviderContext({ enterpriseSearchEnabled: true });

afterEach(() => {
jest.clearAllMocks();
});
Expand All @@ -74,7 +94,7 @@ describe('Enterprise Search - connectors search provider', () => {
client,
preference: '',
},
{} as any
mockSearchProviderContext
)
);
expect(results).toEqual([{ ...getConnectorSearchData('postgres'), score: 100 }]);
Expand All @@ -90,7 +110,7 @@ describe('Enterprise Search - connectors search provider', () => {
maxResults: 100,
preference: '',
},
{} as any
mockSearchProviderContext
)
);
expect(results).toEqual([
Expand All @@ -110,7 +130,7 @@ describe('Enterprise Search - connectors search provider', () => {
maxResults: 100,
preference: '',
},
{} as any
mockSearchProviderContext
)
);
expect(results).toHaveLength(0);
Expand All @@ -126,7 +146,7 @@ describe('Enterprise Search - connectors search provider', () => {
maxResults: 1,
preference: '',
},
{} as any
mockSearchProviderContext
)
);
expect(results).toEqual([{ ...getConnectorSearchData('postgres'), score: 90 }]);
Expand All @@ -143,7 +163,7 @@ describe('Enterprise Search - connectors search provider', () => {
maxResults: 100,
preference: '',
},
{} as any
mockSearchProviderContext
)
);
expect(results).toEqual([]);
Expand All @@ -159,7 +179,7 @@ describe('Enterprise Search - connectors search provider', () => {
maxResults: 100,
preference: '',
},
{} as any
mockSearchProviderContext
)
);
expect(results).toEqual([]);
Expand All @@ -175,7 +195,7 @@ describe('Enterprise Search - connectors search provider', () => {
maxResults: 100,
preference: '',
},
{} as any
mockSearchProviderContext
)
);
expect(results).toEqual([]);
Expand All @@ -191,7 +211,23 @@ describe('Enterprise Search - connectors search provider', () => {
maxResults: 100,
preference: '',
},
{} as any
mockSearchProviderContext
)
);
expect(results).toEqual([]);
});

it('if capabilities.catalogue.enterpriseSearch is false', async () => {
const results = await lastValueFrom(
connectorsSearchResultProvider.find(
{ term: 'companyName-postgres-connector-all' },
{
aborted$: NEVER,
client,
maxResults: 100,
preference: '',
},
getSearchProviderContext({ enterpriseSearchEnabled: false })
)
);
expect(results).toEqual([]);
Expand Down
16 changes: 13 additions & 3 deletions x-pack/plugins/enterprise_search/server/utils/connectors_search_result_provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { from, takeUntil } from 'rxjs';
import { from, takeUntil, switchMap, of } from 'rxjs';

import type { IStaticAssets } from '@kbn/core-http-browser';

Expand All @@ -25,7 +25,7 @@ export function getConnectorsSearchResultProvider(
staticAssets: IStaticAssets
): GlobalSearchResultProvider {
return {
find: ({ term, types, tags }, { aborted$, client, maxResults }) => {
find: ({ term, types, tags }, { aborted$, client, maxResults }, { core: { capabilities } }) => {
if (!client || !term || tags || (types && !types.includes('connector'))) {
return from([[]]);
}
Expand All @@ -52,7 +52,17 @@ export function getConnectorsSearchResultProvider(
.slice(0, maxResults);
return searchResults;
};
return from(getConnectorData()).pipe(takeUntil(aborted$));

return capabilities.pipe(
takeUntil(aborted$),
switchMap((caps) => {
if (!caps.catalogue.enterpriseSearch) {
return of([]);
}

return from(getConnectorData());
})
);
},
getSearchableTypes: () => ['connector'],
id: 'enterpriseSearchConnectors',
Expand Down
59 changes: 46 additions & 13 deletions x-pack/plugins/enterprise_search/server/utils/search_result_provider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
* 2.0.
*/

import { NEVER } from 'rxjs';
import { NEVER, of } from 'rxjs';
import { TestScheduler } from 'rxjs/testing';

import type { GlobalSearchProviderContext } from '@kbn/global-search-plugin/server';

import { ENTERPRISE_SEARCH_CONTENT_PLUGIN } from '../../common/constants';

import { getSearchResultProvider } from './search_result_provider';
Expand All @@ -18,6 +20,23 @@ const getTestScheduler = () => {
});
};

const getSearchProviderContext = ({
enterpriseSearchEnabled,
}: {
enterpriseSearchEnabled: boolean;
}): GlobalSearchProviderContext => ({
core: {
capabilities: of({
catalogue: { enterpriseSearch: enterpriseSearchEnabled },
management: {},
navLinks: {},
}),
savedObjects: {} as any,
uiSettings: {} as any,
},
});
const mockSearchProviderContext = getSearchProviderContext({ enterpriseSearchEnabled: true });

const connectors = [
{
categories: [
Expand Down Expand Up @@ -119,7 +138,7 @@ describe('Enterprise Search search provider', () => {
searchResultProvider.find(
{ term: 'crawler' },
{ aborted$: NEVER, maxResults: 100, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: [crawlerResult],
Expand All @@ -133,7 +152,7 @@ describe('Enterprise Search search provider', () => {
searchResultProvider.find(
{ term: '' },
{ aborted$: NEVER, maxResults: 100, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: expect.arrayContaining([
Expand All @@ -150,7 +169,7 @@ describe('Enterprise Search search provider', () => {
searchResultProvider.find(
{ term: '' },
{ aborted$: NEVER, maxResults: 1, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: [{ ...crawlerResult, score: 80 }],
Expand All @@ -173,7 +192,7 @@ describe('Enterprise Search search provider', () => {
searchProvider.find(
{ term: '' },
{ aborted$: NEVER, maxResults: 100, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: expect.not.arrayContaining([{ ...crawlerResult, score: 80 }]),
Expand All @@ -196,7 +215,7 @@ describe('Enterprise Search search provider', () => {
searchProvider.find(
{ term: '' },
{ aborted$: NEVER, maxResults: 100, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: expect.not.arrayContaining([{ mongoResult, score: 80 }]),
Expand All @@ -210,20 +229,34 @@ describe('Enterprise Search search provider', () => {
searchResultProvider.find(
{ tags: ['tag'], term: '' },
{ aborted$: NEVER, maxResults: 1, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: [],
});
});
});

it('returns nothing if unknown type is specified', () => {
getTestScheduler().run(({ expectObservable }) => {
expectObservable(
searchResultProvider.find(
{ term: '', types: ['tag'] },
{ aborted$: NEVER, maxResults: 1, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: [],
});
});
});
it('returns nothing if capabilities.catalogue.enterpriseSearch is false', () => {
getTestScheduler().run(({ expectObservable }) => {
expectObservable(
searchResultProvider.find(
{ term: '', types: ['tag'] },
{ aborted$: NEVER, maxResults: 1, preference: '' },
getSearchProviderContext({ enterpriseSearchEnabled: false })
)
).toBe('(a|)', {
a: [],
Expand All @@ -236,7 +269,7 @@ describe('Enterprise Search search provider', () => {
searchResultProvider.find(
{ term: 'crawler', types: ['integration'] },
{ aborted$: NEVER, maxResults: 1, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: [crawlerResult],
Expand All @@ -249,7 +282,7 @@ describe('Enterprise Search search provider', () => {
searchResultProvider.find(
{ term: 'crawler', types: ['enterprise search'] },
{ aborted$: NEVER, maxResults: 1, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: [crawlerResult],
Expand All @@ -272,7 +305,7 @@ describe('Enterprise Search search provider', () => {
searchProvider.find(
{ term: 'app search' },
{ aborted$: NEVER, maxResults: 1, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: [],
Expand All @@ -295,7 +328,7 @@ describe('Enterprise Search search provider', () => {
searchProvider.find(
{ term: 'workplace search' },
{ aborted$: NEVER, maxResults: 1, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: [],
Expand All @@ -318,7 +351,7 @@ describe('Enterprise Search search provider', () => {
searchProvider.find(
{ term: '' },
{ aborted$: NEVER, maxResults: 100, preference: '' },
{} as any
mockSearchProviderContext
)
).toBe('(a|)', {
a: expect.arrayContaining([
Expand Down
Loading
Loading