mirror of
https://github.com/grafana/grafana.git
synced 2025-02-14 17:43:35 -06:00
* update react 18 related deps * fix some types * make sure we're on react-router-dom >= 5.3.3 * Use new root API * Remove StrictMode for now - react 18 double rendering causes issues * fix + ignore some @grafana/ui types * fix some more types * use renderHook from @testing-library/react in almost all cases * fix storybook types * rewrite useDashboardSave to not use useEffect * make props optional * only render if props are provided * add correct type for useCallback * make resourcepicker tests more robust * fix ModalManager rendering * fix some more unit tests * store the click coordinates in a ref as setState is NOT synchronous * fix remaining e2e tests * rewrite dashboardpage tests to avoid act warnings * undo lint ignores * fix ExpanderCell types * set SymbolCell type correctly * fix QueryAndExpressionsStep * looks like the types were actually wrong instead :D * undo this for now... * remove spinner waits * more robust tests * rewrite errorboundary test to not explicitly count the number of renders * make urlParam expect async * increase timeout in waitFor * revert ExplorePage test changes * Update public/app/features/dashboard/containers/DashboardPage.test.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Update public/app/features/dashboard/containers/PublicDashboardPage.test.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Update public/app/features/dashboard/containers/PublicDashboardPage.test.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Update public/app/features/dashboard/containers/PublicDashboardPage.test.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * skip fakeTimer test, ignore table types for now + other review comments * update package peerDeps * small tweak to resourcepicker test * update lockfile... * increase timeout in sharepublicdashboard tests * ensure ExplorePaneContainer passes correct queries to initializeExplore * fix LokiContextUI test * fix unit tests * make importDashboard flow more consistent * wait for dashboard name before continuing * more test fixes * readd dashboard name to variable e2e tests * wait for switches to be enabled before clicking * fix modal rendering * don't use @testing-library/dom directly * quick fix for rendering of panels in firefox * make PromQueryField test more robust * don't wait for chartData - in react 18 this can happen before the wait code even gets executed --------- Co-authored-by: kay delaney <kay@grafana.com> Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
103 lines
2.8 KiB
TypeScript
103 lines
2.8 KiB
TypeScript
import React from 'react';
|
|
import { createRoot } from 'react-dom/client';
|
|
|
|
import { textUtil } from '@grafana/data';
|
|
import { config, CopyPanelEvent } from '@grafana/runtime';
|
|
import { ConfirmModal, ConfirmModalProps } from '@grafana/ui';
|
|
import appEvents from 'app/core/app_events';
|
|
import { copyPanel } from 'app/features/dashboard/utils/panel';
|
|
|
|
import {
|
|
ShowConfirmModalEvent,
|
|
ShowConfirmModalPayload,
|
|
ShowModalReactEvent,
|
|
ShowModalReactPayload,
|
|
} from '../../types/events';
|
|
import { AngularModalProxy } from '../components/modals/AngularModalProxy';
|
|
import { provideTheme } from '../utils/ConfigProvider';
|
|
|
|
export class ModalManager {
|
|
reactModalRoot = document.body;
|
|
reactModalNode = document.createElement('div');
|
|
root = createRoot(this.reactModalNode);
|
|
|
|
init() {
|
|
appEvents.subscribe(ShowConfirmModalEvent, (e) => this.showConfirmModal(e.payload));
|
|
appEvents.subscribe(ShowModalReactEvent, (e) => this.showModalReact(e.payload));
|
|
appEvents.subscribe(CopyPanelEvent, (e) => copyPanel(e.payload));
|
|
}
|
|
|
|
showModalReact(options: ShowModalReactPayload) {
|
|
const { component, props } = options;
|
|
const modalProps = {
|
|
component,
|
|
props: {
|
|
...props,
|
|
isOpen: true,
|
|
onDismiss: this.onReactModalDismiss,
|
|
},
|
|
};
|
|
|
|
const elem = React.createElement(provideTheme(AngularModalProxy, config.theme2), modalProps);
|
|
this.reactModalRoot.appendChild(this.reactModalNode);
|
|
this.root.render(elem);
|
|
}
|
|
|
|
onReactModalDismiss = () => {
|
|
this.root.render(null);
|
|
this.reactModalRoot.removeChild(this.reactModalNode);
|
|
};
|
|
|
|
showConfirmModal(payload: ShowConfirmModalPayload) {
|
|
const {
|
|
confirmText,
|
|
onConfirm = () => undefined,
|
|
onDismiss,
|
|
text2,
|
|
altActionText,
|
|
onAltAction,
|
|
noText,
|
|
text,
|
|
text2htmlBind,
|
|
yesText = 'Yes',
|
|
icon,
|
|
title = 'Confirm',
|
|
yesButtonVariant,
|
|
} = payload;
|
|
const props: ConfirmModalProps = {
|
|
confirmText: yesText,
|
|
confirmButtonVariant: yesButtonVariant,
|
|
confirmationText: confirmText,
|
|
icon,
|
|
title,
|
|
body: text,
|
|
description: text2 && text2htmlBind ? textUtil.sanitize(text2) : text2,
|
|
isOpen: true,
|
|
dismissText: noText,
|
|
onConfirm: () => {
|
|
onConfirm();
|
|
this.onReactModalDismiss();
|
|
},
|
|
onDismiss: () => {
|
|
onDismiss?.();
|
|
this.onReactModalDismiss();
|
|
},
|
|
onAlternative: onAltAction
|
|
? () => {
|
|
onAltAction();
|
|
this.onReactModalDismiss();
|
|
}
|
|
: undefined,
|
|
alternativeText: altActionText,
|
|
};
|
|
const modalProps = {
|
|
component: ConfirmModal,
|
|
props,
|
|
};
|
|
|
|
const elem = React.createElement(provideTheme(AngularModalProxy, config.theme2), modalProps);
|
|
this.reactModalRoot.appendChild(this.reactModalNode);
|
|
this.root.render(elem);
|
|
}
|
|
}
|