Skip to content

Pmm 13991 remove popup from randered panels #831

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Pmm 13991 remove popup from randered panels #831

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a78157
PMM-13991 removed popup showing on the rendered panels
ioana-maniga Jun 27, 2025
d26a14b
PMM-13991 add extra check for welcome modal
ioana-maniga Jul 1, 2025
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
16 changes: 12 additions & 4 deletions public/app/percona/shared/components/PerconaBootstrapper/PerconaBootstrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,17 @@ export const PerconaBootstrapper = ({ onReady }: PerconaBootstrapperProps) => {
const dispatch = useAppDispatch();
const { setSteps, startTour: startPerconaTour, endTour } = usePerconaTour();
const [modalIsOpen, setModalIsOpen] = useState(true);
const { user } = config.bootData;
const [showTour, setShowTour] = useState(false);
const [showTourFlag, setShowTourFlag] = useLocalStorage<boolean>(`${user.id}-percona.showTour`, !navigator.webdriver);
const styles = useStyles2(getStyles);
const { user } = config.bootData;

const { isSignedIn } = user;
const theme = useTheme2();
const [modalNewVersionShown, setModalNewVersionShown] = useLocalStorage(`${user.id}-grafana.pmm3.modalShown`, true);
const [modalNewVersionShown, setModalNewVersionShown] = useLocalStorage(
`${user.id}-grafana.pmm3.modalShown`,
!navigator.webdriver
);

const dismissModal = () => {
setModalIsOpen(false);
Expand All @@ -47,6 +52,7 @@ export const PerconaBootstrapper = ({ onReady }: PerconaBootstrapperProps) => {
const finishTour = () => {
setModalIsOpen(false);
setShowTour(false);
setShowTourFlag(false);
endTour(TourType.Product);
};

Expand Down Expand Up @@ -74,6 +80,7 @@ export const PerconaBootstrapper = ({ onReady }: PerconaBootstrapperProps) => {
setShowTour(!details.productTourCompleted);
} catch (e) {
setShowTour(false);
setShowTourFlag(false);
}
};

Expand All @@ -95,7 +102,7 @@ export const PerconaBootstrapper = ({ onReady }: PerconaBootstrapperProps) => {
} else {
onReady();
}
}, [dispatch, isSignedIn, setSteps, onReady, user]);
}, [dispatch, isSignedIn, setSteps, onReady, user, setShowTour, setShowTourFlag]);

const onDismissModalNewVersion = () => {
setModalNewVersionShown(false);
Expand All @@ -110,7 +117,8 @@ export const PerconaBootstrapper = ({ onReady }: PerconaBootstrapperProps) => {
<PerconaNewVersion isOpen={modalNewVersionShown} onDismiss={onDismissModalNewVersion} />
) : (
isSignedIn &&
showTour && (
showTour &&
showTourFlag && (
<Modal onDismiss={dismissModal} isOpen={modalIsOpen} title={Messages.title}>
<div className={styles.iconContainer}>
<Icon type="mono" name={theme.isLight ? 'pmm-logo-light' : 'pmm-logo'} className={styles.svg} />
Expand Down
Loading