Skip to content
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

Jump to bottom

PMM-12443: filter for backups #685

Merged
merged 9 commits into from
Nov 27, 2023
Merged

PMM-12443: filter for backups #685

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0ec3d35
Added Filter for All Backups table
doracretu3pillar Aug 25, 2023
945a114
Added filter for Restore, ScheduledBackups and StorageLocations
doracretu3pillar Aug 29, 2023
c31e6de
Filters for StorageLocation, RestoreHistory and BackupInventory
doracretu3pillar Sep 6, 2023
c5e4751
Merge branch 'main' into PMM-12443_filter_for_backups
doracretu3pillar Sep 7, 2023
97e0c93
Fixed UI tests
doracretu3pillar Sep 12, 2023
b0294f7
Fixed lint
doracretu3pillar Sep 12, 2023
5241864
Fixed test
doracretu3pillar Sep 13, 2023
abcf41a
Merge branch 'main' into PMM-12443_filter_for_backups
doracretu3pillar Sep 20, 2023
6cecbe1
Merge branch 'main' into PMM-12443_filter_for_backups
doracretu3pillar Nov 27, 2023
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
66 changes: 61 additions & 5 deletions public/app/percona/backup/components/BackupInventory/BackupInventory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
/* eslint-disable react/display-name */
import { CancelToken } from 'axios';
import React, { FC, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { Column, Row } from 'react-table';
import { Row } from 'react-table';

import { AppEvents } from '@grafana/data';
import { AppEvents, SelectableValue } from '@grafana/data';
import { locationService } from '@grafana/runtime';
import { Alert, LinkButton, useStyles2 } from '@grafana/ui';
import appEvents from 'app/core/app_events';
import { OldPage } from 'app/core/components/Page/Page';
import { BackupStatus } 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 { Table } from 'app/percona/shared/components/Elements/Table';
import { ExtendedColumn, FilterFieldTypes, Table } from 'app/percona/shared/components/Elements/Table';
import { useCancelToken } from 'app/percona/shared/components/hooks/cancelToken.hook';
import { usePerconaNavModel } from 'app/percona/shared/components/hooks/perconaNavModel';
import { ApiVerboseError, Databases, DATABASE_LABELS } from 'app/percona/shared/core';
Expand Down Expand Up @@ -46,6 +47,7 @@ export const BackupInventory: FC = () => {
const [deleteModalVisible, setDeleteModalVisible] = useState(false);
const [logsModalVisible, setLogsModalVisible] = useState(false);
const [data, setData] = useState<Backup[]>([]);
const [serviceModes, setServiceModes] = useState<Array<SelectableValue<string>>>([]);
const dispatch = useAppDispatch();
const [restoreErrors, setRestoreErrors] = useState<ApiVerboseError[]>([]);
const backupLocationMap = useRef<Record<string, StorageLocation | undefined>>({});
Expand All @@ -55,11 +57,50 @@ export const BackupInventory: FC = () => {
const { result: locations = [] } = useSelector(getBackupLocations);

const columns = useMemo(
(): Array<Column<Backup>> => [
(): Array<ExtendedColumn<Backup>> => [
{
Header: Messages.backupInventory.table.columns.status,
accessor: 'status',
type: FilterFieldTypes.DROPDOWN,
width: '100px',
options: [
{
label: 'Success',
doracretu3pillar marked this conversation as resolved.
Show resolved Hide resolved
value: BackupStatus.BACKUP_STATUS_SUCCESS,
},
{
label: 'Error',
value: BackupStatus.BACKUP_STATUS_ERROR,
},
{
label: 'Pending',
value: BackupStatus.BACKUP_STATUS_PENDING,
},
{
label: 'Paused',
value: BackupStatus.BACKUP_STATUS_PAUSED,
},
{
label: 'Invalid',
value: BackupStatus.BACKUP_STATUS_INVALID,
},
{
label: 'In Progress',
value: BackupStatus.BACKUP_STATUS_IN_PROGRESS,
},
{
label: 'Failed To Delete',
value: BackupStatus.BACKUP_STATUS_FAILED_TO_DELETE,
},
{
label: 'Failed Not Supported By Agent',
value: BackupStatus.BACKUP_STATUS_FAILED_NOT_SUPPORTED_BY_AGENT,
},
{
label: 'Deleting',
value: BackupStatus.BACKUP_STATUS_DELETING,
},
],
Cell: ({ value, row }) => (
<Status
showLogsAction={row.original.vendor === Databases.mongodb}
Expand All @@ -72,30 +113,37 @@ export const BackupInventory: FC = () => {
Header: Messages.backupInventory.table.columns.name,
accessor: 'name',
id: 'name',
type: FilterFieldTypes.TEXT,
},
{
Header: Messages.backupInventory.table.columns.service,
accessor: 'serviceName',
type: FilterFieldTypes.DROPDOWN,
options: serviceModes,
},
{
Header: Messages.backupInventory.table.columns.vendor,
accessor: ({ vendor }: Backup) => DATABASE_LABELS[vendor],
width: '150px',
type: FilterFieldTypes.TEXT,
},
{
Header: Messages.backupInventory.table.columns.created,
accessor: 'created',
width: '200px',
type: FilterFieldTypes.TEXT,
Cell: ({ value }) => <DetailedDate date={value} />,
},
{
Header: Messages.backupInventory.table.columns.type,
accessor: 'mode',
type: FilterFieldTypes.TEXT,
Cell: ({ value }) => formatBackupMode(value),
},
{
Header: Messages.backupInventory.table.columns.location,
accessor: 'locationName',
type: FilterFieldTypes.TEXT,
width: '250px',
Cell: ({ row, value }) => (
<span>
Expand All @@ -106,6 +154,7 @@ export const BackupInventory: FC = () => {
{
Header: Messages.backupInventory.table.columns.actions,
accessor: 'id',
type: FilterFieldTypes.TEXT,
Cell: ({ row }) => (
<BackupInventoryActions
row={row}
Expand All @@ -119,7 +168,7 @@ export const BackupInventory: FC = () => {
},
],
// eslint-disable-next-line react-hooks/exhaustive-deps
[backupLocationMap]
[backupLocationMap, serviceModes]
);
const styles = useStyles2(getStyles);

Expand Down Expand Up @@ -176,6 +225,12 @@ export const BackupInventory: FC = () => {
);
}
});
setServiceModes(
backups.map((item) => ({
label: item.serviceName,
value: item.serviceName,
}))
);
setData(backups);
} catch (e) {
if (isApiCancelError(e)) {
Expand Down Expand Up @@ -265,6 +320,7 @@ export const BackupInventory: FC = () => {
autoResetExpanded={false}
renderExpandedRow={renderSelectedSubRow}
getRowId={useCallback((row: Backup) => row.id, [])}
showFilter
></Table>
{restoreModalVisible && (
<RestoreBackupModal
Expand Down
1 change: 1 addition & 0 deletions public/app/percona/backup/components/BackupInventory/BackupInventory.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface Backup {
vendor: Databases;
mode: BackupMode;
folder: string;
type?: Databases | 'external';
}

export interface RawBackup {
Expand Down
86 changes: 82 additions & 4 deletions public/app/percona/backup/components/RestoreHistory/RestoreHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/* eslint-disable react/display-name */
import { CancelToken } from 'axios';
import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
import { Column, Row } from 'react-table';
import { Row } from 'react-table';

import { OldPage } from 'app/core/components/Page/Page';
import { BackupStatus } from 'app/percona/backup/Backup.types';
import { FeatureLoader } from 'app/percona/shared/components/Elements/FeatureLoader';
import { Table } from 'app/percona/shared/components/Elements/Table';
import { ExtendedColumn, FilterFieldTypes, Table } from 'app/percona/shared/components/Elements/Table';
import { useCancelToken } from 'app/percona/shared/components/hooks/cancelToken.hook';
import { usePerconaNavModel } from 'app/percona/shared/components/hooks/perconaNavModel';
import { Databases, DATABASE_LABELS } from 'app/percona/shared/core';
Expand Down Expand Up @@ -43,10 +44,49 @@ export const RestoreHistory: FC = () => {
const locationsByLocationId = useMemo(() => formatLocationsToMap(locations), [locations]);

const columns = useMemo(
(): Array<Column<Restore>> => [
(): Array<ExtendedColumn<Restore>> => [
{
Header: Messages.backupInventory.table.columns.status,
accessor: 'status',
options: [
{
label: 'Success',
value: BackupStatus.BACKUP_STATUS_SUCCESS,
},
{
label: 'Error',
value: BackupStatus.BACKUP_STATUS_ERROR,
},
{
label: 'Pending',
value: BackupStatus.BACKUP_STATUS_PENDING,
},
{
label: 'Paused',
value: BackupStatus.BACKUP_STATUS_PAUSED,
},
{
label: 'Invalid',
value: BackupStatus.BACKUP_STATUS_INVALID,
},
{
label: 'In Progress',
value: BackupStatus.BACKUP_STATUS_IN_PROGRESS,
},
{
label: 'Failed To Delete',
value: BackupStatus.BACKUP_STATUS_FAILED_TO_DELETE,
},
{
label: 'Failed Not Supported By Agent',
value: BackupStatus.BACKUP_STATUS_FAILED_NOT_SUPPORTED_BY_AGENT,
},
{
label: 'Deleting',
value: BackupStatus.BACKUP_STATUS_DELETING,
},
],
type: FilterFieldTypes.DROPDOWN,
Cell: ({ value, row }) => (
<Status
showLogsAction={row.original.vendor === Databases.mongodb}
Expand All @@ -60,31 +100,67 @@ export const RestoreHistory: FC = () => {
Header: Messages.backupInventory.table.columns.name,
accessor: 'name',
id: 'name',
type: FilterFieldTypes.TEXT,
},
{
Header: Messages.backupInventory.table.columns.vendor,
accessor: ({ vendor }: Restore) => DATABASE_LABELS[vendor],
width: '150px',
type: FilterFieldTypes.DROPDOWN,
options: [
{
label: 'MongoDB',
doracretu3pillar marked this conversation as resolved.
Show resolved Hide resolved
value: DATABASE_LABELS.mongodb,
},
{
label: 'HaProxy',
value: DATABASE_LABELS.haproxy,
},
{
label: 'MariaDB',
value: DATABASE_LABELS.mariadb,
},
{
label: 'MySQL',
value: DATABASE_LABELS.mysql,
},
{
label: 'PostgresSQL',
value: DATABASE_LABELS.postgresql,
},
{
label: 'ProxySQL',
value: DATABASE_LABELS.proxysql,
},
],
},
{
Header: Messages.restoreHistory.table.columns.started,
accessor: 'started',
Cell: ({ value }) => <DetailedDate dataTestId="restore-started" date={value} />,
width: '200px',
type: FilterFieldTypes.TEXT,
},
{
Header: Messages.restoreHistory.table.columns.finished,
accessor: 'finished',
Cell: ({ value }) => (value ? <DetailedDate dataTestId="restore-finished" date={value} /> : null),
width: '200px',
type: FilterFieldTypes.TEXT,
},
{
Header: Messages.restoreHistory.table.columns.targetService,
accessor: 'serviceName',
type: FilterFieldTypes.TEXT,
},
{
Header: Messages.backupInventory.table.columns.location,
accessor: 'locationName',
type: FilterFieldTypes.DROPDOWN,
options: locations.map((item) => ({
label: item.name,
value: item.name,
})),
Cell: ({ row, value }) => (
<span>
{value} ({locationsByLocationId[row.original.locationId]?.type})
Expand All @@ -95,11 +171,12 @@ export const RestoreHistory: FC = () => {
Header: Messages.restoreHistory.table.columns.actions,
accessor: 'id',
width: '100px',
type: FilterFieldTypes.TEXT,
Cell: ({ row }) => <RestoreHistoryActions row={row} />,
},
],
// eslint-disable-next-line react-hooks/exhaustive-deps
[locationsByLocationId]
[locationsByLocationId, locations]
);

const renderSelectedSubRow = React.useCallback(
Expand Down Expand Up @@ -166,6 +243,7 @@ export const RestoreHistory: FC = () => {
autoResetExpanded={false}
renderExpandedRow={renderSelectedSubRow}
getRowId={useCallback((row: Restore) => row.id, [])}
showFilter
/>
{logsModalVisible && (
<RestoreLogsModal
Expand Down
Loading
Loading