-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '7.x' into backport/7.x/pr-58208
- Loading branch information
Showing
515 changed files
with
5,678 additions
and
3,535 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
examples/state_containers_examples/public/with_data_services/application.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import ReactDOM from 'react-dom'; | ||
| import { createBrowserHistory } from 'history'; | ||
| import { AppMountParameters, CoreStart } from '../../../../src/core/public'; | ||
| import { AppPluginDependencies } from './types'; | ||
| import { StateDemoApp } from './components/app'; | ||
| import { createKbnUrlStateStorage } from '../../../../src/plugins/kibana_utils/public/'; | ||
|
|
||
| export const renderApp = ( | ||
| { notifications, http }: CoreStart, | ||
| { navigation, data }: AppPluginDependencies, | ||
| { appBasePath, element }: AppMountParameters | ||
| ) => { | ||
| const history = createBrowserHistory({ basename: appBasePath }); | ||
| const kbnUrlStateStorage = createKbnUrlStateStorage({ useHash: false, history }); | ||
|
|
||
| ReactDOM.render( | ||
| <StateDemoApp | ||
| notifications={notifications} | ||
| http={http} | ||
| navigation={navigation} | ||
| data={data} | ||
| history={history} | ||
| kbnUrlStateStorage={kbnUrlStateStorage} | ||
| />, | ||
| element | ||
| ); | ||
|
|
||
| return () => ReactDOM.unmountComponentAtNode(element); | ||
| }; |
243 changes: 243 additions & 0 deletions
243
examples/state_containers_examples/public/with_data_services/components/app.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,243 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import React, { useEffect, useRef, useState, useCallback } from 'react'; | ||
| import { History } from 'history'; | ||
| import { FormattedMessage, I18nProvider } from '@kbn/i18n/react'; | ||
| import { Router } from 'react-router-dom'; | ||
|
|
||
| import { | ||
| EuiFieldText, | ||
| EuiPage, | ||
| EuiPageBody, | ||
| EuiPageContent, | ||
| EuiPageHeader, | ||
| EuiTitle, | ||
| } from '@elastic/eui'; | ||
|
|
||
| import { CoreStart } from '../../../../../src/core/public'; | ||
| import { NavigationPublicPluginStart } from '../../../../../src/plugins/navigation/public'; | ||
| import { | ||
| connectToQueryState, | ||
| syncQueryStateWithUrl, | ||
| DataPublicPluginStart, | ||
| IIndexPattern, | ||
| QueryState, | ||
| Filter, | ||
| esFilters, | ||
| Query, | ||
| } from '../../../../../src/plugins/data/public'; | ||
| import { | ||
| BaseState, | ||
| BaseStateContainer, | ||
| createStateContainer, | ||
| createStateContainerReactHelpers, | ||
| IKbnUrlStateStorage, | ||
| ReduxLikeStateContainer, | ||
| syncState, | ||
| } from '../../../../../src/plugins/kibana_utils/public'; | ||
| import { PLUGIN_ID, PLUGIN_NAME } from '../../../common'; | ||
|
|
||
| interface StateDemoAppDeps { | ||
| notifications: CoreStart['notifications']; | ||
| http: CoreStart['http']; | ||
| navigation: NavigationPublicPluginStart; | ||
| data: DataPublicPluginStart; | ||
| history: History; | ||
| kbnUrlStateStorage: IKbnUrlStateStorage; | ||
| } | ||
|
|
||
| interface AppState { | ||
| name: string; | ||
| filters: Filter[]; | ||
| query?: Query; | ||
| } | ||
| const defaultAppState: AppState = { | ||
| name: '', | ||
| filters: [], | ||
| }; | ||
| const { | ||
| Provider: AppStateContainerProvider, | ||
| useState: useAppState, | ||
| useContainer: useAppStateContainer, | ||
| } = createStateContainerReactHelpers<ReduxLikeStateContainer<AppState>>(); | ||
|
|
||
| const App = ({ | ||
| notifications, | ||
| http, | ||
| navigation, | ||
| data, | ||
| history, | ||
| kbnUrlStateStorage, | ||
| }: StateDemoAppDeps) => { | ||
| const appStateContainer = useAppStateContainer(); | ||
| const appState = useAppState(); | ||
|
|
||
| useGlobalStateSyncing(data.query, kbnUrlStateStorage); | ||
| useAppStateSyncing(appStateContainer, data.query, kbnUrlStateStorage); | ||
|
|
||
| const onQuerySubmit = useCallback( | ||
| ({ query }) => { | ||
| appStateContainer.set({ ...appState, query }); | ||
| }, | ||
| [appStateContainer, appState] | ||
| ); | ||
|
|
||
| const indexPattern = useIndexPattern(data); | ||
| if (!indexPattern) | ||
| return <div>No index pattern found. Please create an intex patter before loading...</div>; | ||
|
|
||
| // Render the application DOM. | ||
| // Note that `navigation.ui.TopNavMenu` is a stateful component exported on the `navigation` plugin's start contract. | ||
| return ( | ||
| <Router history={history}> | ||
| <I18nProvider> | ||
| <> | ||
| <navigation.ui.TopNavMenu | ||
| appName={PLUGIN_ID} | ||
| showSearchBar={true} | ||
| indexPatterns={[indexPattern]} | ||
| useDefaultBehaviors={true} | ||
| onQuerySubmit={onQuerySubmit} | ||
| query={appState.query} | ||
| showSaveQuery={true} | ||
| /> | ||
| <EuiPage restrictWidth="1000px"> | ||
| <EuiPageBody> | ||
| <EuiPageHeader> | ||
| <EuiTitle size="l"> | ||
| <h1> | ||
| <FormattedMessage | ||
| id="stateDemo.helloWorldText" | ||
| defaultMessage="{name}!" | ||
| values={{ name: PLUGIN_NAME }} | ||
| /> | ||
| </h1> | ||
| </EuiTitle> | ||
| </EuiPageHeader> | ||
| <EuiPageContent> | ||
| <EuiFieldText | ||
| placeholder="Additional application state: My name is..." | ||
| value={appState.name} | ||
| onChange={e => appStateContainer.set({ ...appState, name: e.target.value })} | ||
| aria-label="My name" | ||
| /> | ||
| </EuiPageContent> | ||
| </EuiPageBody> | ||
| </EuiPage> | ||
| </> | ||
| </I18nProvider> | ||
| </Router> | ||
| ); | ||
| }; | ||
|
|
||
| export const StateDemoApp = (props: StateDemoAppDeps) => { | ||
| const appStateContainer = useCreateStateContainer(defaultAppState); | ||
|
|
||
| return ( | ||
| <AppStateContainerProvider value={appStateContainer}> | ||
| <App {...props} /> | ||
| </AppStateContainerProvider> | ||
| ); | ||
| }; | ||
|
|
||
| function useCreateStateContainer<State extends BaseState>( | ||
| defaultState: State | ||
| ): ReduxLikeStateContainer<State> { | ||
| const stateContainerRef = useRef<ReduxLikeStateContainer<State> | null>(null); | ||
| if (!stateContainerRef.current) { | ||
| stateContainerRef.current = createStateContainer(defaultState); | ||
| } | ||
| return stateContainerRef.current; | ||
| } | ||
|
|
||
| function useIndexPattern(data: DataPublicPluginStart) { | ||
| const [indexPattern, setIndexPattern] = useState<IIndexPattern>(); | ||
| useEffect(() => { | ||
| const fetchIndexPattern = async () => { | ||
| const defaultIndexPattern = await data.indexPatterns.getDefault(); | ||
| if (defaultIndexPattern) { | ||
| setIndexPattern(defaultIndexPattern); | ||
| } | ||
| }; | ||
| fetchIndexPattern(); | ||
| }, [data.indexPatterns]); | ||
|
|
||
| return indexPattern; | ||
| } | ||
|
|
||
| function useGlobalStateSyncing( | ||
| query: DataPublicPluginStart['query'], | ||
| kbnUrlStateStorage: IKbnUrlStateStorage | ||
| ) { | ||
| // setup sync state utils | ||
| useEffect(() => { | ||
| // sync global filters, time filters, refresh interval from data.query to url '_g' | ||
| const { stop } = syncQueryStateWithUrl(query, kbnUrlStateStorage); | ||
| return () => { | ||
| stop(); | ||
| }; | ||
| }, [query, kbnUrlStateStorage]); | ||
| } | ||
|
|
||
| function useAppStateSyncing<AppState extends QueryState>( | ||
| appStateContainer: BaseStateContainer<AppState>, | ||
| query: DataPublicPluginStart['query'], | ||
| kbnUrlStateStorage: IKbnUrlStateStorage | ||
| ) { | ||
| // setup sync state utils | ||
| useEffect(() => { | ||
| // sync app filters with app state container from data.query to state container | ||
| const stopSyncingQueryAppStateWithStateContainer = connectToQueryState( | ||
| query, | ||
| appStateContainer, | ||
| { filters: esFilters.FilterStateStore.APP_STATE } | ||
| ); | ||
|
|
||
| // sets up syncing app state container with url | ||
| const { start: startSyncingAppStateWithUrl, stop: stopSyncingAppStateWithUrl } = syncState({ | ||
| storageKey: '_a', | ||
| stateStorage: kbnUrlStateStorage, | ||
| stateContainer: { | ||
| ...appStateContainer, | ||
| // stateSync utils requires explicit handling of default state ("null") | ||
| set: state => state && appStateContainer.set(state), | ||
| }, | ||
| }); | ||
|
|
||
| // merge initial state from app state container and current state in url | ||
| const initialAppState: AppState = { | ||
| ...appStateContainer.get(), | ||
| ...kbnUrlStateStorage.get<AppState>('_a'), | ||
| }; | ||
| // trigger state update. actually needed in case some data was in url | ||
| appStateContainer.set(initialAppState); | ||
|
|
||
| // set current url to whatever is in app state container | ||
| kbnUrlStateStorage.set<AppState>('_a', initialAppState); | ||
|
|
||
| // finally start syncing state containers with url | ||
| startSyncingAppStateWithUrl(); | ||
|
|
||
| return () => { | ||
| stopSyncingQueryAppStateWithStateContainer(); | ||
| stopSyncingAppStateWithUrl(); | ||
| }; | ||
| }, [query, kbnUrlStateStorage, appStateContainer]); | ||
| } |
Oops, something went wrong.