Skip to content

[TSVB] Remove jQuery dependency from plugins #83809

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

Merged
merged 5 commits into from
Nov 25, 2020
Merged

[TSVB] Remove jQuery dependency from plugins #83809

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3230bf
Use rxjs instead of jquery for eventBus.
VladLasitsa Nov 19, 2020
9e8cd49
Fix comments
VladLasitsa Nov 20, 2020
24e66c0
Removed one check because property is private.
VladLasitsa Nov 20, 2020
b263727
Resolve comments
VladLasitsa Nov 24, 2020
acea4b9
Merge branch 'master' into #83617_tsvb
kibanamachine Nov 24, 2020
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
9 changes: 6 additions & 3 deletions ...ation/visualizations/lib/active_cursor.js → ...ation/visualizations/lib/active_cursor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@
* under the License.
*/

// TODO: Remove bus when action/triggers are available with LegacyPluginApi or metric is converted to Embeddable
import $ from 'jquery';
import { Subject } from 'rxjs';

export const ACTIVE_CURSOR = 'ACTIVE_CURSOR';

export const eventBus = $({});
interface ActiveCursor {
cursor: any;
}

export const activeCursor$ = new Subject<ActiveCursor>();
16 changes: 10 additions & 6 deletions src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
} from '@elastic/charts';
import { EuiIcon } from '@elastic/eui';
import { getTimezone } from '../../../lib/get_timezone';
import { eventBus, ACTIVE_CURSOR } from '../../lib/active_cursor';
import { activeCursor$ } from '../../lib/active_cursor';
import { getUISettings, getChartsSetup } from '../../../../services';
import { GRID_LINE_CONFIG, ICON_TYPES_MAP, STACKED_OPTIONS } from '../../constants';
import { AreaSeriesDecorator } from './decorators/area_decorator';
Expand All @@ -54,7 +54,7 @@ const generateAnnotationData = (values, formatter) =>
const decorateFormatter = (formatter) => ({ value }) => formatter(value);

const handleCursorUpdate = (cursor) => {
eventBus.trigger(ACTIVE_CURSOR, cursor);
activeCursor$.next({ cursor });
};

export const TimeSeries = ({
Expand All @@ -73,16 +73,20 @@ export const TimeSeries = ({
const chartRef = useRef();

useEffect(() => {
const updateCursor = (_, cursor) => {
if (chartRef.current) {
const updateCursor = ({ cursor }) => {
if (
chartRef.current &&
cursor &&
chartRef.current.chartStore.getState().chartId !== cursor.chartId
) {
chartRef.current.dispatchExternalPointerEvent(cursor);
}
};

eventBus.on(ACTIVE_CURSOR, updateCursor);
const subscription = activeCursor$.subscribe(updateCursor);

return () => {
eventBus.off(ACTIVE_CURSOR, undefined, updateCursor);
subscription.unsubscribe();
};
}, []);

Expand Down