PMM-13699 Adjustments related to sidebar

public/app/features/dashboard/components/SubMenu/DashboardLinksDashboard.tsx

@@ -5,13 +5,11 @@ import { useAsync } from 'react-use';
 import { GrafanaTheme2, ScopedVars } from '@grafana/data';
 import { sanitize, sanitizeUrl } from '@grafana/data/src/text/sanitize';
 import { selectors } from '@grafana/e2e-selectors';
-import { config } from '@grafana/runtime';
 import { DashboardLink } from '@grafana/schema';
 import { Dropdown, Icon, Button, Menu, ScrollContainer, useStyles2 } from '@grafana/ui';
 import { ButtonLinkProps, LinkButton } from '@grafana/ui/src/components/Button';
 import { getBackendSrv } from 'app/core/services/backend_srv';
 import { DashboardSearchItem } from 'app/features/search/types';
-import { isPmmAdmin } from 'app/percona/shared/helpers/permissions';
 
 import { getLinkSrv } from '../../../panel/panellinks/link_srv';
 
@@ -29,22 +27,7 @@ interface DashboardLinksMenuProps {
 
 function DashboardLinksMenu({ dashboardUID, link }: DashboardLinksMenuProps) {
   const styles = useStyles2(getStyles);
-  let resolvedLinks = useResolvedLinks({ dashboardUID, link });
-
-  // @PERCONA
-  // TODO: PMM-7736 remove it ASAP after migration transition period is finished
-  if (link.title === 'PMM') {
-    if (isPmmAdmin(config.bootData.user)) {
-      resolvedLinks = [
-        { uid: '1000', url: '/graph/add-instance', title: 'PMM Add Instance' },
-        { uid: '1001', url: '/graph/advisors/insights', title: 'PMM Advisors' },
-        { uid: '1002', url: '/graph/inventory', title: 'PMM Inventory' },
-        { uid: '1003', url: '/graph/settings', title: 'PMM Settings' },
-      ];
-    } else {
-      return <></>;
-    }
-  }
+  const resolvedLinks = useResolvedLinks({ dashboardUID, link });
 
   if (!resolvedLinks || resolveLinks.length === 0) {
     return null;

public/app/percona/backup/components/AddBackupPage/AddBackupPage.tsx

@@ -192,7 +192,13 @@ const AddBackupPage: FC = () => {
   );
 
   return (
-    <Page navId="backup-add-edit" layout={PageLayoutType.Custom}>
+    <Page
+      navId="backup-add-edit"
+      pageNav={{
+        text: modalTitle,
+      }}
+      layout={PageLayoutType.Custom}
+    >
       <Overlay isPending={pending}>
         <Form
           initialValues={initialValues}

public/app/percona/shared/components/PerconaBootstrapper/PerconaBootstrapper.tsx

@@ -30,6 +30,7 @@ import { PerconaBootstrapperProps } from './PerconaBootstrapper.types';
 import PerconaNavigation from './PerconaNavigation/PerconaNavigation';
 import PerconaTourBootstrapper from './PerconaTour';
 import PerconaUpdateVersion from './PerconaUpdateVersion/PerconaUpdateVersion';
+import { isPmmNavEnabled } from '../../helpers/plugin';
 
 // This component is only responsible for populating the store with Percona's settings initially
 export const PerconaBootstrapper = ({ onReady }: PerconaBootstrapperProps) => {
@@ -117,10 +118,11 @@ export const PerconaBootstrapper = ({ onReady }: PerconaBootstrapperProps) => {
     <>
       {isSignedIn && <Telemetry />}
       <PerconaNavigation />
-      <PerconaTourBootstrapper />
+      {!isPmmNavEnabled() && <PerconaTourBootstrapper />}
       {updateAvailable && showUpdateModal && !isLoadingUpdates ? (
         <PerconaUpdateVersion />
       ) : (
+        !isPmmNavEnabled() &&
         isSignedIn &&
         showTour && (
           <Modal onDismiss={dismissModal} isOpen={modalIsOpen} title={Messages.title}>

public/app/percona/shared/components/PerconaBootstrapper/PerconaNavigation/PerconaNavigation.constants.ts

@@ -8,6 +8,14 @@ export const WEIGHTS = {
   config: -900,
 };
 
+export const PMM_BACKUP_ADD_EDIT: NavModelItem = {
+  id: 'backup-add-edit',
+  text: 'Create backup',
+  url: `${config.appSubUrl}/backup/new`,
+  hideFromBreadcrumbs: true,
+  isCreateAction: true,
+};
+
 export const PMM_BACKUP_PAGE: NavModelItem = {
   id: 'backup',
   icon: 'history',
@@ -36,6 +44,7 @@ export const PMM_BACKUP_PAGE: NavModelItem = {
       text: 'Storage Locations',
       url: `${config.appSubUrl}/backup/locations`,
     },
+    PMM_BACKUP_ADD_EDIT,
   ],
 };