Everest 953 backups and pitr dbwizard combining

ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/create-db-cluster.e2e.ts

@@ -24,7 +24,6 @@ import { getClusterDetailedInfo } from '../../../utils/storage-class';
 import { advancedConfigurationStepCheck } from './steps/advanced-configuration-step';
 import { backupsStepCheck } from './steps/backups-step';
 import { basicInformationStepCheck } from './steps/basic-information-step';
-import { pitrStepCheck } from './steps/pitr-step';
 import { resourcesStepCheck } from './steps/resources-step';
 import {
   goToLastAndSubmit,
@@ -35,8 +34,8 @@ import {
   submitWizard,
 } from '../../../utils/db-wizard';
 import { EVEREST_CI_NAMESPACES } from '../../../constants';
-import { findDbAndClickActions } from '../../../utils/db-clusters-list';
 import { addFirstScheduleInDBWizard } from '../db-wizard-utils';
+import { findDbAndClickActions } from '../../../utils/db-clusters-list';
 import { waitForInitializingState } from '../../../utils/table';
 
 test.describe('DB Cluster creation', () => {
@@ -139,9 +138,6 @@ test.describe('DB Cluster creation', () => {
 
     await moveForward(page);
 
-    await pitrStepCheck(page);
-    await moveForward(page);
-
     await advancedConfigurationStepCheck(page);
     await moveForward(page);
 
@@ -227,21 +223,15 @@ test.describe('DB Cluster creation', () => {
     await expect(
       page.getByText('You don’t have any backup schedules yet.')
     ).toBeVisible();
-    await expect(page.getByTestId('pitr-no-backup-alert')).toBeVisible();
-
-    await moveForward(page);
     const enabledPitrCheckbox = page
       .getByTestId('switch-input-pitr-enabled-label')
       .getByRole('checkbox');
     await expect(enabledPitrCheckbox).not.toBeChecked();
     await expect(enabledPitrCheckbox).toBeDisabled();
-    await moveBack(page);
     await addFirstScheduleInDBWizard(page);
-    await moveForward(page);
     await expect(enabledPitrCheckbox).not.toBeChecked();
     await expect(enabledPitrCheckbox).not.toBeDisabled();
     await enabledPitrCheckbox.setChecked(true);
-
     await expect(
       page.getByTestId('text-input-pitr-storage-location')
     ).toBeVisible();
@@ -311,9 +301,6 @@ test.describe('DB Cluster creation', () => {
     await resourcesStepCheck(page);
     await moveForward(page);
     await backupsStepCheck(page);
-
-    await moveForward(page);
-    await pitrStepCheck(page);
     await page
       .getByTestId('switch-input-pitr-enabled-label')
       .getByRole('checkbox')
@@ -336,14 +323,14 @@ test.describe('DB Cluster creation', () => {
     await page.goto('/databases');
     await waitForInitializingState(page, clusterName);
     await findDbAndClickActions(page, clusterName, 'Edit');
-    await goToStep(page, 'point-in-time-recovery');
+    await goToStep(page, 'backups');
     await setPitrEnabledStatus(page, false);
     await goToLastAndSubmit(page);
 
     // We turn it back on to make sure nothing breaks
     await page.goto('/databases');
     await findDbAndClickActions(page, clusterName, 'Edit');
-    await goToStep(page, 'point-in-time-recovery');
+    await goToStep(page, 'backups');
     await setPitrEnabledStatus(page, true);
 
     await deleteDbClusterFn(request, clusterName, namespace);

ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/backups-step.ts

@@ -22,5 +22,20 @@ export const backupsStepCheck = async (page: Page) => {
     )
   ).toBeVisible();
 
+  const enabledPitrCheckbox = page
+    .getByTestId('switch-input-pitr-enabled-label')
+    .getByRole('checkbox');
+
+  await expect(enabledPitrCheckbox).not.toBeChecked();
+
   await addFirstScheduleInDBWizard(page);
+
+  await expect(
+    page.getByText('Point-in-time Recovery', { exact: true })
+  ).toBeVisible();
+  await expect(
+    page.getByText(
+      'PITR provides continuous backups of your database, enabling you to restore it to'
+    )
+  ).toBeVisible();
 };

ui/apps/everest/.e2e/db-cluster/db-wizard/db-wizard-utils.ts

@@ -28,12 +28,18 @@ export const addFirstScheduleInDBWizard = async (page: Page) => {
   await openCreateScheduleDialogFromDBWizard(page);
   await fillScheduleModalForm(page);
   await page.getByTestId('form-dialog-create').click();
-
   // checking created schedule in dbWiard schedules list
   await expect(
     page.getByTestId('editable-item').getByText('Monthly on day 10 at 5:05 PM')
   ).toBeVisible();
-  await expect(page.getByText(STORAGE_NAMES[1])).toBeVisible();
+
+  if (await checkDbTypeisVisibleInPreview(page, DbType.Mongo)) {
+    expect(await page.getByText(STORAGE_NAMES[1]).allInnerTexts()).toHaveLength(
+      2
+    );
+  } else {
+    await expect(page.getByText(STORAGE_NAMES[1])).toBeVisible();
+  }
 };
 
 export const addScheduleInDbWizard = async (page: Page) => {

ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr-step.e2e.ts → ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts

@@ -32,9 +32,10 @@ import {
   checkSuccessOfUpdateAndGoToDbClustersList,
 } from './edit-db-cluster.utils';
 import { STORAGE_NAMES } from '../../../constants';
+import { addFirstScheduleInDBWizard } from '../db-wizard-utils';
 import { waitForInitializingState } from '../../../utils/table';
 
-test.describe.serial('DB Cluster Editing PITR Step', async () => {
+test.describe.serial('MySQL PITR editing', async () => {
   const mySQLName = 'db-pitr-mysql';
 
   test.beforeAll(async ({ request }) => {
@@ -72,9 +73,8 @@ test.describe.serial('DB Cluster Editing PITR Step', async () => {
     page,
   }) => {
     await findDbAndClickActions(page, mySQLName, 'Edit', 'UP');
-    await goToStep(page, 'point-in-time-recovery');
+    await goToStep(page, 'backups');
 
-    // Check PITR form
     const pitrCheckbox = page
       .getByTestId('switch-input-pitr-enabled')
       .getByRole('checkbox');
@@ -98,11 +98,13 @@ test.describe.serial('DB Cluster Editing PITR Step', async () => {
     await storageOptions.first().click();
 
     // Check the preview actual value
-    await expect(
-      page
-        .getByTestId('section-Point-in-time Recovery')
+    const pitrPreviewText = (
+      await page
+        .getByTestId('section-Backups')
         .getByTestId('preview-content')
-    ).toHaveText('Enabled');
+        .allInnerTexts()
+    )[1];
+    expect(pitrPreviewText).toBe('PITR Enabled');
 
     // Go to Advanced Configuration step
     await moveForward(page);
@@ -114,32 +116,21 @@ test.describe.serial('DB Cluster Editing PITR Step', async () => {
 
     await findDbAndClickActions(page, mySQLName, 'Edit');
 
-    // Go to Resources step
-    await moveForward(page);
-    // Go to Backups step
-    await moveForward(page);
-
-    // Go to PITR step
-    await moveForward(page);
+    // Go to PITR
+    await goToStep(page, 'backups');
     await expect(pitrCheckbox).toBeChecked();
     await expect(pitrStorageLocation).toBeVisible();
     await expect(pitrStorageLocation).not.toBeEmpty();
   });
 
-  test('Disable PITR for database during editing pitr step in dbWizard', async ({
+  test('Disable PITR for database during editing in dbWizard', async ({
     page,
   }) => {
     await findDbAndClickActions(page, mySQLName, 'Edit');
     await expect(page.getByTestId('mysql-toggle-button')).toBeVisible();
 
-    // Go to Resources step
-    await moveForward(page);
-    // Go to Backups step
-    await moveForward(page);
-    // Go to PITR step
-    await moveForward(page);
-
     // Check PITR step
+    await goToStep(page, 'backups');
     const pitrCheckbox = page
       .getByTestId('switch-input-pitr-enabled')
       .getByRole('checkbox');
@@ -153,16 +144,15 @@ test.describe.serial('DB Cluster Editing PITR Step', async () => {
     // Disable PITR
     await pitrCheckbox.setChecked(false);
     // Check the preview actual value
-    await expect(
-      page
-        .getByTestId('section-Point-in-time Recovery')
+    const pitrPreviewText = (
+      await page
+        .getByTestId('section-Backups')
         .getByTestId('preview-content')
-    ).toHaveText('Disabled');
+        .allInnerTexts()
+    )[1];
+    expect(pitrPreviewText).toBe('PITR Disabled');
 
-    // Go to Advanced Configuration step
-    await moveForward(page);
-    // Go to Monitoring step
-    await moveForward(page);
+    await goToStep(page, 'monitoring');
 
     await checkDbWizardEditSubmitIsAvailableAndClick(page);
     await checkSuccessOfUpdateAndGoToDbClustersList(page);
@@ -174,3 +164,85 @@ test.describe.serial('DB Cluster Editing PITR Step', async () => {
     );
   });
 });
+
+test.describe.serial('MongoDb PITR editing', async () => {
+  const psmdbName = 'db-pitr-psmdb';
+
+  test.beforeAll(async ({ request }) => {
+    await createDbClusterFn(request, {
+      dbName: psmdbName,
+      dbType: 'mongodb',
+      numberOfNodes: '3',
+      cpu: 1,
+      disk: 1,
+      memory: 1,
+    });
+  });
+
+  test.afterAll(async ({ request }) => {
+    await deleteDbClusterFn(request, psmdbName);
+  });
+
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/databases');
+    await waitForInitializingState(page, psmdbName);
+  });
+
+  test('Enable PITR to database during editing in dbWizard', async ({
+    page,
+  }) => {
+    await page.goto('/databases');
+    await findDbAndClickActions(page, psmdbName, 'Edit', 'UP');
+
+    await goToStep(page, 'backups');
+
+    const pitrCheckbox = page
+      .getByTestId('switch-input-pitr-enabled')
+      .getByRole('checkbox');
+    await expect(pitrCheckbox).not.toBeChecked();
+    await expect(pitrCheckbox).toBeDisabled();
+    await addFirstScheduleInDBWizard(page);
+    await expect(pitrCheckbox).not.toBeDisabled();
+    await expect(
+      page
+        .getByTestId('switch-input-pitr-enabled-label')
+        .getByText(`Storage: ${STORAGE_NAMES[1]}`)
+    ).toBeVisible();
+
+    // TODO move to schedules part
+    // MongoDB could create schedules only with the one of storages, so for not first schedules storage should be disabled
+    await expect(
+      page.getByText(
+        'The backup storage you select for your first backup schedule will be used for al'
+      )
+    ).toBeVisible();
+    await page.getByTestId('create-schedule').click();
+    const scheduleStorageLocation = page.getByTestId(
+      'text-input-storage-location'
+    );
+    await expect(scheduleStorageLocation).toBeDisabled();
+    await expect(scheduleStorageLocation).not.toBeEmpty();
+    await page.getByTestId('close-dialog-icon').click();
+
+    // Enable pitr
+    await pitrCheckbox.setChecked(true);
+    await expect(pitrCheckbox).toBeChecked();
+
+    // Check the preview actual value
+    const pitrPreviewText = (
+      await page
+        .getByTestId('section-Backups')
+        .getByTestId('preview-content')
+        .allInnerTexts()
+    )[1];
+    expect(pitrPreviewText).toBe('PITR Enabled');
+
+    await goToStep(page, 'monitoring');
+    await checkDbWizardEditSubmitIsAvailableAndClick(page);
+    await checkSuccessOfUpdateAndGoToDbClustersList(page);
+
+    await findDbAndClickActions(page, psmdbName, 'Edit');
+    await goToStep(page, 'backups');
+    await expect(pitrCheckbox).toBeChecked();
+  });
+});

ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules-step.e2e.ts → ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts

@@ -61,9 +61,6 @@ test.describe.serial('DB Cluster Editing Backups Step', async () => {
 
     await goToStep(page, 'backups');
     await addFirstScheduleInDBWizard(page);
-
-    // Go to Point-in-time Recovery (PITR)
-    await moveForward(page);
     // Go to Advanced Configuration step
     await moveForward(page);
     // Go to Monitoring step
@@ -94,8 +91,6 @@ test.describe.serial('DB Cluster Editing Backups Step', async () => {
     await addScheduleInDbWizard(page);
     await addScheduleInDbWizard(page);
 
-    // Go to Point-in-time Recovery (PITR)
-    await moveForward(page);
     // Go to Advanced Configuration step
     await moveForward(page);
     // Go to Monitoring step

ui/apps/everest/.e2e/multinamespaces/monitoring.e2e.ts

@@ -57,8 +57,6 @@ test.describe('Namespaces: Monitoring availability', () => {
     await moveForward(page);
     // Backups step
     await moveForward(page);
-    // PITR step
-    await moveForward(page);
     // Advanced Configuration step
     await moveForward(page);
     // Monitoring Step

ui/apps/everest/.e2e/multinamespaces/storage-location.e2e.ts

@@ -104,9 +104,6 @@ test.describe.serial('Namespaces: Backup Storage availability', () => {
     await page.getByRole('option', { name: pxcStorageLocationName }).click();
     await page.getByTestId('form-dialog-create').click();
 
-    // PITR step
-    await moveForward(page);
-
     const pitrCheckbox = page
       .getByTestId('switch-input-pitr-enabled')
       .getByRole('checkbox');

ui/apps/everest/.e2e/utils/db-wizard.ts

@@ -1,5 +1,4 @@
 import { expect, Page } from '@playwright/test';
-import { startTransition } from 'react';
 
 export const storageLocationAutocompleteEmptyValidationCheck = async (
   page: Page,
@@ -28,7 +27,6 @@ export const goToStep = (
     | 'basic-information'
     | 'resources'
     | 'backups'
-    | 'point-in-time-recovery'
     | 'advanced-configurations'
     | 'monitoring'
 ) => page.getByTestId(`button-edit-preview-${step}`).click();

ui/apps/everest/src/components/actionable-alert/backups-actionable-alert/BackupsActionableAlert.messages.ts

@@ -1,5 +1,4 @@
 export const Messages = {
-  noStoragesMessage: (namespace: string) =>
-    `To enable scheduled backups for the ${namespace} namespace, first add a backup storage within the same namespace. If you want to proceed without the scheduled backups, disable them.`,
+  noStoragesMessage: `To create backup schedules, you need to add a backup storage first.`,
   addStorage: 'Add storage',
 };