Skip to content

Commit

Permalink
es3: remove search homepage usage
Browse files Browse the repository at this point in the history
Search home page was feature flagged in serverless search. This project
is currently on hold indefinitely, removing usage of the feature flag
until the project starts up again.
  • Loading branch information
TattdCodeMonkey committed Oct 3, 2024
1 parent 790c5ce commit e9dc77c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 52 deletions.
15 changes: 6 additions & 9 deletions config/serverless.es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ xpack.osquery.enabled: false
## Fine-tune the search solution feature privileges. Also, refer to `serverless.yml` for the project-agnostic overrides.
xpack.features.overrides:
### Dashboards feature is moved from Analytics category to the Search one.
dashboard.category: "enterpriseSearch"
dashboard.category: 'enterpriseSearch'
### Dev Tools feature is moved from Analytics category to the Search one.
dev_tools.category: "enterpriseSearch"
dev_tools.category: 'enterpriseSearch'
### Discover feature is moved from Analytics category to the Search one.
discover.category: "enterpriseSearch"
discover.category: 'enterpriseSearch'
### Machine Learning feature is moved from Analytics category to the Management one.
ml.category: "management"
ml.category: 'management'
### Stack Alerts feature is moved from Analytics category to the Search one renamed to simply `Alerts`.
stackAlerts:
name: "Alerts"
category: "enterpriseSearch"
name: 'Alerts'
category: 'enterpriseSearch'

## Cloud settings
xpack.cloud.serverless.project_type: search
Expand Down Expand Up @@ -70,8 +70,5 @@ xpack.searchInferenceEndpoints.ui.enabled: false
# Search Notebooks
xpack.search.notebooks.catalog.url: https://elastic-enterprise-search.s3.us-east-2.amazonaws.com/serverless/catalog.json

# Search Homepage
xpack.search.homepage.ui.enabled: true

# Semantic text UI
xpack.index_management.dev.enableSemanticText: false
11 changes: 2 additions & 9 deletions x-pack/plugins/serverless_search/kibana.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
"id": "serverlessSearch",
"server": true,
"browser": true,
"configPath": [
"xpack",
"serverless",
"search"
],
"configPath": ["xpack", "serverless", "search"],
"requiredPlugins": [
"cloud",
"console",
Expand All @@ -29,13 +25,10 @@
"optionalPlugins": [
"indexManagement",
"searchConnectors",
"searchHomepage",
"searchIndices",
"searchInferenceEndpoints",
"usageCollection"
],
"requiredBundles": [
"kibanaReact"
]
"requiredBundles": ["kibanaReact"]
}
}
4 changes: 2 additions & 2 deletions x-pack/plugins/serverless_search/public/navigation_tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type { NavigationTreeDefinition } from '@kbn/core-chrome-browser';
import { i18n } from '@kbn/i18n';
import { CONNECTORS_LABEL } from '../common/i18n_string';

export const navigationTree = (useSearchHomepage: boolean = false): NavigationTreeDefinition => ({
export const navigationTree = (): NavigationTreeDefinition => ({
body: [
{
type: 'navGroup',
Expand All @@ -25,7 +25,7 @@ export const navigationTree = (useSearchHomepage: boolean = false): NavigationTr
title: i18n.translate('xpack.serverlessSearch.nav.home', {
defaultMessage: 'Home',
}),
link: useSearchHomepage ? 'searchHomepage' : 'serverlessElasticsearch',
link: 'serverlessElasticsearch',
spaceBefore: 'm',
},
{
Expand Down
29 changes: 4 additions & 25 deletions x-pack/plugins/serverless_search/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ export class ServerlessSearchPlugin
core: CoreSetup<ServerlessSearchPluginStartDependencies, ServerlessSearchPluginStart>,
setupDeps: ServerlessSearchPluginSetupDependencies
): ServerlessSearchPluginSetup {
const { searchHomepage } = setupDeps;
const useSearchHomepage = searchHomepage && searchHomepage.isHomepageFeatureEnabled();

const queryClient = new QueryClient({
mutationCache: new MutationCache({
onError: (error) => {
Expand Down Expand Up @@ -77,31 +74,14 @@ export class ServerlessSearchPlugin
defaultMessage: 'Home',
});

if (useSearchHomepage) {
core.application.register({
id: 'serverlessHomeRedirect',
title: homeTitle,
appRoute: '/app/elasticsearch',
euiIconType: 'logoElastic',
category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
visibleIn: [],
async mount({}: AppMountParameters) {
const [coreStart] = await core.getStartServices();
coreStart.chrome.docTitle.change(homeTitle);
coreStart.application.navigateToApp('searchHomepage');
return () => {};
},
});
}

core.application.register({
id: 'serverlessElasticsearch',
title: i18n.translate('xpack.serverlessSearch.app.elasticsearch.title', {
defaultMessage: 'Elasticsearch',
}),
euiIconType: 'logoElastic',
category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
appRoute: useSearchHomepage ? '/app/elasticsearch/getting_started' : '/app/elasticsearch',
appRoute: '/app/elasticsearch',
async mount({ element, history }: AppMountParameters) {
const { renderApp } = await import('./application/elasticsearch');
const [coreStart, services] = await core.getStartServices();
Expand Down Expand Up @@ -149,12 +129,11 @@ export class ServerlessSearchPlugin
core: CoreStart,
services: ServerlessSearchPluginStartDependencies
): ServerlessSearchPluginStart {
const { serverless, management, indexManagement, security, searchHomepage } = services;
const useSearchHomepage = searchHomepage && searchHomepage.isHomepageFeatureEnabled();
const { serverless, management, indexManagement, security } = services;

serverless.setProjectHome(useSearchHomepage ? '/app/elasticsearch/home' : '/app/elasticsearch');
serverless.setProjectHome('/app/elasticsearch');

const navigationTree$ = of(navigationTree(searchHomepage?.isHomepageFeatureEnabled() ?? false));
const navigationTree$ = of(navigationTree());
serverless.initNavigation('search', navigationTree$, { dataTestSubj: 'svlSearchSideNav' });

const extendCardNavDefinitions = serverless.getNavigationCards(
Expand Down
6 changes: 0 additions & 6 deletions x-pack/plugins/serverless_search/public/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ import type { ServerlessPluginSetup, ServerlessPluginStart } from '@kbn/serverle
import type { SharePluginStart } from '@kbn/share-plugin/public';
import type { IndexManagementPluginStart } from '@kbn/index-management-plugin/public';
import type { DiscoverSetup } from '@kbn/discover-plugin/public';
import type {
SearchHomepagePluginSetup,
SearchHomepagePluginStart,
} from '@kbn/search-homepage/public';

// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface ServerlessSearchPluginSetup {}
Expand All @@ -31,7 +27,6 @@ export interface ServerlessSearchPluginSetupDependencies {
management: ManagementSetup;
serverless: ServerlessPluginSetup;
discover: DiscoverSetup;
searchHomepage?: SearchHomepagePluginSetup;
}

export interface ServerlessSearchPluginStartDependencies {
Expand All @@ -44,5 +39,4 @@ export interface ServerlessSearchPluginStartDependencies {
serverless: ServerlessPluginStart;
share: SharePluginStart;
indexManagement?: IndexManagementPluginStart;
searchHomepage?: SearchHomepagePluginStart;
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@ export default function ({ loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('./search_playground/playground_overview'));

loadTestFile(require.resolve('./ml'));
loadTestFile(require.resolve('./search_homepage'));
});
}

0 comments on commit e9dc77c

Please sign in to comment.