Filters for StorageLocation, RestoreHistory and BackupInventory

percona · Sep 6, 2023 · c31e6de · c31e6de
1 parent 945a114
commit c31e6de
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 36 deletions.
diff --git a/public/app/percona/backup/Backup.messages.ts b/public/app/percona/backup/Backup.messages.ts
@@ -14,7 +14,20 @@ export const Messages = {
         created: 'Created',
         location: 'Location',
         vendor: 'DB Technology',
-        status: 'Status',
+        status: {
+          name: 'Status',
+          options: {
+            success: 'Success',
+            error: 'Error',
+            pending: 'Pending',
+            paused: 'Paused',
+            invalid: 'Invalid',
+            inProgress: 'In Progress',
+            failedToDelete: 'Failed To Delete',
+            failedNotSupportedByAgent: 'Failed Not Supported By Agent',
+            deleting: 'Deleting',
+          },
+        },
         actions: 'Actions',
         type: 'Type',
       },

diff --git a/public/app/percona/backup/Backup.utils.ts b/public/app/percona/backup/Backup.utils.ts
@@ -34,15 +34,15 @@ export const formatDataModel = (model: DataModel): string => {
   return map[model] ?? '';
 };
 
-export const formatBackupMode = (mode: BackupMode): string => {
-  const map: Record<BackupMode, string> = {
-    [BackupMode.SNAPSHOT]: backupModeMsg.full,
-    [BackupMode.INCREMENTAL]: backupModeMsg.incremental,
-    [BackupMode.PITR]: backupModeMsg.pitr,
-    [BackupMode.INVALID]: backupModeMsg.invalid,
-  };
+export const BackupModeMap: Record<BackupMode, string> = {
+  [BackupMode.SNAPSHOT]: backupModeMsg.full,
+  [BackupMode.INCREMENTAL]: backupModeMsg.incremental,
+  [BackupMode.PITR]: backupModeMsg.pitr,
+  [BackupMode.INVALID]: backupModeMsg.invalid,
+};
 
-  return map[mode] || map[BackupMode.INVALID];
+export const formatBackupMode = (mode: BackupMode): string => {
+  return BackupModeMap[mode] || BackupModeMap[BackupMode.INVALID];
 };
 
 export const formatLocationsToMap = (locations: StorageLocation[]) =>

diff --git a/public/app/percona/backup/components/BackupInventory/BackupInventory.tsx b/public/app/percona/backup/components/BackupInventory/BackupInventory.tsx
@@ -24,7 +24,7 @@ import { useSelector } from 'app/types';
 
 import { NEW_BACKUP_URL, RESTORES_URL } from '../../Backup.constants';
 import { Messages } from '../../Backup.messages';
-import { formatBackupMode } from '../../Backup.utils';
+import { BackupModeMap, formatBackupMode } from '../../Backup.utils';
 import { useRecurringCall } from '../../hooks/recurringCall.hook';
 import { DetailedDate } from '../DetailedDate';
 import { Status } from '../Status';
@@ -59,45 +59,45 @@ export const BackupInventory: FC = () => {
   const columns = useMemo(
     (): Array<ExtendedColumn<Backup>> => [
       {
-        Header: Messages.backupInventory.table.columns.status,
+        Header: Messages.backupInventory.table.columns.status.name,
         accessor: 'status',
         type: FilterFieldTypes.DROPDOWN,
         width: '100px',
         options: [
           {
-            label: 'Success',
+            label: Messages.backupInventory.table.columns.status.options.success,
             value: BackupStatus.BACKUP_STATUS_SUCCESS,
           },
           {
-            label: 'Error',
+            label: Messages.backupInventory.table.columns.status.options.error,
             value: BackupStatus.BACKUP_STATUS_ERROR,
           },
           {
-            label: 'Pending',
+            label: Messages.backupInventory.table.columns.status.options.pending,
             value: BackupStatus.BACKUP_STATUS_PENDING,
           },
           {
-            label: 'Paused',
+            label: Messages.backupInventory.table.columns.status.options.paused,
             value: BackupStatus.BACKUP_STATUS_PAUSED,
           },
           {
-            label: 'Invalid',
+            label: Messages.backupInventory.table.columns.status.options.invalid,
             value: BackupStatus.BACKUP_STATUS_INVALID,
           },
           {
-            label: 'In Progress',
+            label: Messages.backupInventory.table.columns.status.options.inProgress,
             value: BackupStatus.BACKUP_STATUS_IN_PROGRESS,
           },
           {
-            label: 'Failed To Delete',
+            label: Messages.backupInventory.table.columns.status.options.failedToDelete,
             value: BackupStatus.BACKUP_STATUS_FAILED_TO_DELETE,
           },
           {
-            label: 'Failed Not Supported By Agent',
+            label: Messages.backupInventory.table.columns.status.options.failedNotSupportedByAgent,
             value: BackupStatus.BACKUP_STATUS_FAILED_NOT_SUPPORTED_BY_AGENT,
           },
           {
-            label: 'Deleting',
+            label: Messages.backupInventory.table.columns.status.options.deleting,
             value: BackupStatus.BACKUP_STATUS_DELETING,
           },
         ],
@@ -122,10 +122,15 @@ export const BackupInventory: FC = () => {
         options: serviceModes,
       },
       {
-        Header: Messages.backupInventory.table.columns.vendor,
-        accessor: ({ vendor }: Backup) => DATABASE_LABELS[vendor],
+        Header: Messages.scheduledBackups.table.columns.vendor,
+        accessor: 'vendor',
         width: '150px',
-        type: FilterFieldTypes.TEXT,
+        Cell: ({ value }) => DATABASE_LABELS[value],
+        type: FilterFieldTypes.DROPDOWN,
+        options: Object.values(DATABASE_LABELS).map((item: string) => ({
+          label: item,
+          value: item,
+        })),
       },
       {
         Header: Messages.backupInventory.table.columns.created,
@@ -137,8 +142,12 @@ export const BackupInventory: FC = () => {
       {
         Header: Messages.backupInventory.table.columns.type,
         accessor: 'mode',
-        type: FilterFieldTypes.TEXT,
+        type: FilterFieldTypes.DROPDOWN,
         Cell: ({ value }) => formatBackupMode(value),
+        options: Object.entries(BackupModeMap).map(([key, value]) => ({
+          label: value,
+          value: key,
+        })),
       },
       {
         Header: Messages.backupInventory.table.columns.location,

diff --git a/public/app/percona/backup/components/RestoreHistory/RestoreHistory.tsx b/public/app/percona/backup/components/RestoreHistory/RestoreHistory.tsx
@@ -46,43 +46,43 @@ export const RestoreHistory: FC = () => {
   const columns = useMemo(
     (): Array<ExtendedColumn<Restore>> => [
       {
-        Header: Messages.backupInventory.table.columns.status,
+        Header: Messages.backupInventory.table.columns.status.name,
         accessor: 'status',
         options: [
           {
-            label: 'Success',
+            label: Messages.backupInventory.table.columns.status.options.success,
             value: BackupStatus.BACKUP_STATUS_SUCCESS,
           },
           {
-            label: 'Error',
+            label: Messages.backupInventory.table.columns.status.options.error,
             value: BackupStatus.BACKUP_STATUS_ERROR,
           },
           {
-            label: 'Pending',
+            label: Messages.backupInventory.table.columns.status.options.pending,
             value: BackupStatus.BACKUP_STATUS_PENDING,
           },
           {
-            label: 'Paused',
+            label: Messages.backupInventory.table.columns.status.options.paused,
             value: BackupStatus.BACKUP_STATUS_PAUSED,
           },
           {
-            label: 'Invalid',
+            label: Messages.backupInventory.table.columns.status.options.invalid,
             value: BackupStatus.BACKUP_STATUS_INVALID,
           },
           {
-            label: 'In Progress',
+            label: Messages.backupInventory.table.columns.status.options.inProgress,
             value: BackupStatus.BACKUP_STATUS_IN_PROGRESS,
           },
           {
-            label: 'Failed To Delete',
+            label: Messages.backupInventory.table.columns.status.options.failedToDelete,
             value: BackupStatus.BACKUP_STATUS_FAILED_TO_DELETE,
           },
           {
-            label: 'Failed Not Supported By Agent',
+            label: Messages.backupInventory.table.columns.status.options.failedNotSupportedByAgent,
             value: BackupStatus.BACKUP_STATUS_FAILED_NOT_SUPPORTED_BY_AGENT,
           },
           {
-            label: 'Deleting',
+            label: Messages.backupInventory.table.columns.status.options.deleting,
             value: BackupStatus.BACKUP_STATUS_DELETING,
           },
         ],

diff --git a/public/app/percona/backup/components/StorageLocations/StorageLocations.tsx b/public/app/percona/backup/components/StorageLocations/StorageLocations.tsx
@@ -19,7 +19,7 @@ import { RemoveStorageLocationModal } from './RemoveStorageLocationModal';
 import { StorageLocationDetails } from './StorageLocationDetails';
 import { StorageLocationsService } from './StorageLocations.service';
 import { getStyles } from './StorageLocations.styles';
-import { StorageLocation } from './StorageLocations.types';
+import { LocationType, StorageLocation } from './StorageLocations.types';
 import { formatLocationList, formatToRawLocation } from './StorageLocations.utils';
 import { StorageLocationsActions } from './StorageLocationsActions';
 
@@ -46,7 +46,17 @@ export const StorageLocations: FC = () => {
         Header: Messages.storageLocations.table.columns.type,
         accessor: 'type',
         width: '150px',
-        type: FilterFieldTypes.TEXT,
+        type: FilterFieldTypes.DROPDOWN,
+        options: [
+          {
+            value: LocationType.S3,
+            label: LocationType.S3,
+          },
+          {
+            value: LocationType.CLIENT,
+            label: LocationType.CLIENT,
+          },
+        ],
       },
       {
         Header: Messages.storageLocations.table.columns.path,