Skip to content
5 changes: 3 additions & 2 deletions ui/apps/pmm-compat/src/compat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ import {
GRAFANA_SUB_PATH,
PMM_UI_GRAFANA_PATH,
PMM_UI_HELP_PATH,
PMM_UI_PATH,
} from 'lib/constants';
import { applyCustomStyles } from 'styles';
import { changeTheme } from 'theme';
import { adjustToolbar } from 'compat/toolbar';
import { isWithinIframe, getLinkWithVariables } from 'lib/utils';
import { documentTitleObserver } from 'lib/utils/document';
import { isFirstLogin, updateIsFirstLogin } from 'lib/utils/login';
import { isFirstLogin, updateIsFirstLogin, isUserLoggedIn } from 'lib/utils/login';
import { ServiceAddedEvent, ServiceDeletedEvent, SettingsUpdatedEvent } from 'lib/events';

export const initialize = () => {
Expand All @@ -32,7 +33,7 @@ export const initialize = () => {
if (isFirstLogin() && isHomePath) {
updateIsFirstLogin();

window.location.replace(PMM_UI_HELP_PATH);
window.location.replace(isUserLoggedIn() ? PMM_UI_HELP_PATH : PMM_UI_PATH);
} else {
// redirect user to the new UI
window.location.replace(window.location.href.replace(GRAFANA_SUB_PATH, PMM_UI_GRAFANA_PATH));
Expand Down
4 changes: 4 additions & 0 deletions ui/apps/pmm-compat/src/lib/utils/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ export const updateIsFirstLogin = () => {
const userId = window.grafanaBootData?.user?.id;
localStorage.setItem(`pmm-ui.first-login.user-${userId}`, 'false');
};

export const isUserLoggedIn = () => {
return window.grafanaBootData?.user?.isSignedIn === true;
};
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ export const NavigationProvider: FC<PropsWithChildren> = ({ children }) => {

items.push(...addDashboardItems(currentServiceTypes, folders, user));

items.push(NAV_QAN);

if (user && settings) {
items.push(NAV_QAN);

if (settings.frontend.exploreEnabled && user.isEditor) {
items.push(addExplore(settings.frontend));
Expand Down
1 change: 1 addition & 0 deletions ui/apps/pmm/src/lib/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const ALL_SERVICE_TYPES = [
ServiceType.mysql,
ServiceType.posgresql,
ServiceType.proxysql,
ServiceType.valkey,
];

// 5 seconds
Expand Down
Loading