Merge branch 'PMM-12710-API-Fixes'

percona · Jul 30, 2024 · d6f386a · d6f386a
2 parents 75b8b55 + 5c57693
commit d6f386a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/public/app/percona/backup/components/ScheduledBackups/ScheduledBackups.tsx b/public/app/percona/backup/components/ScheduledBackups/ScheduledBackups.tsx
@@ -8,6 +8,7 @@ import { locationService } from '@grafana/runtime';
 import { LinkButton, useStyles } from '@grafana/ui';
 import { appEvents } from 'app/core/app_events';
 import { Page } from 'app/core/components/Page/Page';
+import { BackupType } from "app/percona/backup/Backup.types";
 import { DeleteModal } from 'app/percona/shared/components/Elements/DeleteModal';
 import { FeatureLoader } from 'app/percona/shared/components/Elements/FeatureLoader';
 import { ExtendedColumn, FilterFieldTypes, Table } from 'app/percona/shared/components/Elements/Table';
@@ -241,7 +242,7 @@ export const ScheduledBackups: FC = () => {
   };
 
   const onEditClick = (backup: ScheduledBackup) => {
-    locationService.push(`/backup/${backup.type}/${backup.id}/edit`);
+    locationService.push(`/backup/${BackupType.SCHEDULED}/${backup.id}/edit`);
   };
 
   const getCellProps = useCallback(

diff --git a/public/app/percona/pmm-dump/PMMDump.tsx b/public/app/percona/pmm-dump/PMMDump.tsx
@@ -12,6 +12,9 @@ import { DumpStatus, DumpStatusColor, DumpStatusText, PMMDumpServices } from 'ap
 import { DetailsRow } from 'app/percona/shared/components/Elements/DetailsRow/DetailsRow';
 import { Action } from 'app/percona/shared/components/Elements/MultipleActions';
 import { ExtendedColumn, FilterFieldTypes, Table } from 'app/percona/shared/components/Elements/Table';
+import {
+  PMM_DUMP_PAGE,
+} from "app/percona/shared/components/PerconaBootstrapper/PerconaNavigation";
 import { usePerconaNavModel } from 'app/percona/shared/components/hooks/perconaNavModel';
 import {
   deletePmmDumpAction,
@@ -44,7 +47,6 @@ export const PMMDump = () => {
   const [selectedDump, setSelectedDump] = useState<PMMDumpServices | null>(null);
   const [isSendToSupportModalOpened, setIsSendToSupportModalOpened] = useState(false);
   const [logsModalVisible, setLogsModalVisible] = useState(false);
-  const navModel = usePerconaNavModel('pmm-dump');
 
   const loadData = useCallback(async () => {
     try {
@@ -280,7 +282,10 @@ export const PMMDump = () => {
   );
 
   return (
-    <Page navId="pmmdump" navModel={navModel}>
+    <Page navModel={{
+      main: PMM_DUMP_PAGE,
+      node: PMM_DUMP_PAGE,
+    }}>
       <Page.Contents>
         <div className={styles.createDatasetArea}>
           {selectedRows.length > 0 ? (

diff --git a/public/app/percona/pmm-dump/components/ExportDataset/ExportDataset.tsx b/public/app/percona/pmm-dump/components/ExportDataset/ExportDataset.tsx
@@ -91,7 +91,6 @@ const ExportDataset: FC<GrafanaRouteComponentProps<{ type: string; id: string }>
       serviceList = [];
     }
 
-    console.log(data);
     await dispatch(
       triggerDumpAction({
         serviceNames: serviceList,