From f5fa137e7dde9ece29a25c4afc82b7f10d588992 Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Wed, 8 May 2024 11:39:52 +0400
Subject: [PATCH 01/14] EVEREST-953-backups-and-PITR-dbwizard-combining:
 BackupsActionableAlert

---
 .../BackupsActionableAlert.messages.ts                         | 3 +--
 .../backups-actionable-alert/BackupsActionableAlert.tsx        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/apps/everest/src/components/actionable-alert/backups-actionable-alert/BackupsActionableAlert.messages.ts b/ui/apps/everest/src/components/actionable-alert/backups-actionable-alert/BackupsActionableAlert.messages.ts
index 3c837cb5f..5a4d87537 100644
--- a/ui/apps/everest/src/components/actionable-alert/backups-actionable-alert/BackupsActionableAlert.messages.ts
+++ b/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',
 };
diff --git a/ui/apps/everest/src/components/actionable-alert/backups-actionable-alert/BackupsActionableAlert.tsx b/ui/apps/everest/src/components/actionable-alert/backups-actionable-alert/BackupsActionableAlert.tsx
index 4d25cb2de..dba70bd24 100644
--- a/ui/apps/everest/src/components/actionable-alert/backups-actionable-alert/BackupsActionableAlert.tsx
+++ b/ui/apps/everest/src/components/actionable-alert/backups-actionable-alert/BackupsActionableAlert.tsx
@@ -36,7 +36,7 @@ const BackupsActionableAlert = ({ namespace }: BackupsActionableAlertProps) => {
   return (
     <>
       <ActionableAlert
-        message={Messages.noStoragesMessage(namespace)}
+        message={Messages.noStoragesMessage}
         buttonMessage={Messages.addStorage}
         data-testid="no-storage-message"
         onClick={() => setOpenCreateEditModal(true)}

From a2c98863ac1de207fe8a12d487918c65fddc698d Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Wed, 8 May 2024 11:43:40 +0400
Subject: [PATCH 02/14] EVEREST-953-backups-and-PITR-dbwizard-combining: fix
 margins

---
 .../advanced-configurations.tsx                 |  2 +-
 .../steps/first/first-step.tsx                  |  2 +-
 .../database-form-body/steps/index.ts           |  3 +--
 .../steps/resources/resources-step.tsx          |  2 +-
 .../steps/step-header/step-header.tsx           |  2 +-
 .../design/src/themes/base/BaseTheme.tsx        |  9 +++++++++
 .../src/labeled-content/labeled-content.tsx     | 17 ++++++++++-------
 7 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/advanced-configurations/advanced-configurations.tsx b/ui/apps/everest/src/pages/database-form/database-form-body/steps/advanced-configurations/advanced-configurations.tsx
index 48eb7c77d..614fbf7bf 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/advanced-configurations/advanced-configurations.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/advanced-configurations/advanced-configurations.tsx
@@ -33,7 +33,7 @@ export const AdvancedConfigurations = () => {
   return (
     <>
       <StepHeader pageTitle={Messages.advanced} />
-      <FormGroup sx={{ mt: 2 }}>
+      <FormGroup sx={{ mt: 3 }}>
         <SwitchInput
           label={Messages.enableExternalAccess.title}
           labelCaption={Messages.enableExternalAccess.caption}
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/first/first-step.tsx b/ui/apps/everest/src/pages/database-form/database-form-body/steps/first/first-step.tsx
index 8951ea4a4..637d1aa1b 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/first/first-step.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/first/first-step.tsx
@@ -220,7 +220,7 @@ export const FirstStep = ({ loadingDefaultsForEdition }: StepProps) => {
         pageTitle={Messages.pageTitle}
         pageDescription={Messages.pageDescription}
       />
-      <FormGroup sx={{ mt: 2 }}>
+      <FormGroup sx={{ mt: 3 }}>
         <AutoCompleteInput
           labelProps={{
             sx: { mt: 1 },
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/index.ts b/ui/apps/everest/src/pages/database-form/database-form-body/steps/index.ts
index 910e68588..2ac6f74ba 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/index.ts
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/index.ts
@@ -12,18 +12,17 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 import { FirstStep } from './first/first-step.tsx';
 import { ResourcesStep } from './resources/resources-step.tsx';
 import { Backups } from './backups/backups.tsx';
 import { AdvancedConfigurations } from './advanced-configurations/advanced-configurations.tsx';
 import { Monitoring } from './monitoring/monitoring.tsx';
-import PITRStep from './pitr/index.ts';
 
 export const steps = [
   FirstStep,
   ResourcesStep,
   Backups,
-  PITRStep,
   AdvancedConfigurations,
   Monitoring,
 ];
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/resources/resources-step.tsx b/ui/apps/everest/src/pages/database-form/database-form-body/steps/resources/resources-step.tsx
index ba6a62a79..3018830a6 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/resources/resources-step.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/resources/resources-step.tsx
@@ -100,7 +100,7 @@ export const ResourcesStep = () => {
         pageTitle={Messages.pageTitle}
         pageDescription={Messages.pageDescription}
       />
-      <FormGroup sx={{ mt: 2 }}>
+      <FormGroup sx={{ mt: 3 }}>
         <ToggleButtonGroupInput
           name={DbWizardFormFields.numberOfNodes}
           label={Messages.labels.numberOfNodes}
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/step-header/step-header.tsx b/ui/apps/everest/src/pages/database-form/database-form-body/steps/step-header/step-header.tsx
index b1a1dbe91..b8acb3e35 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/step-header/step-header.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/step-header/step-header.tsx
@@ -16,7 +16,7 @@ export const StepHeader = ({ pageTitle, pageDescription }: StepHeaderProps) => {
         <Typography
           data-testid="step-description"
           variant="subtitle2"
-          sx={{ mt: 1 }}
+          sx={{ mt: 1, mb: 2 }}
         >
           {pageDescription}
         </Typography>
diff --git a/ui/packages/design/src/themes/base/BaseTheme.tsx b/ui/packages/design/src/themes/base/BaseTheme.tsx
index d11f2e5ef..6d904e30a 100644
--- a/ui/packages/design/src/themes/base/BaseTheme.tsx
+++ b/ui/packages/design/src/themes/base/BaseTheme.tsx
@@ -557,6 +557,15 @@ const baseThemeOptions = (mode: PaletteMode): ThemeOptions => ({
         }),
       },
     },
+    MuiFormGroup: {
+      styleOverrides: {
+        root: () => ({
+          '> *:first-child': {
+            marginTop: 0,
+          },
+        }),
+      },
+    },
     MuiFormControl: {
       styleOverrides: {
         root: ({ theme }) => ({
diff --git a/ui/packages/ui-lib/src/labeled-content/labeled-content.tsx b/ui/packages/ui-lib/src/labeled-content/labeled-content.tsx
index 6fb5723d3..74d5c0876 100644
--- a/ui/packages/ui-lib/src/labeled-content/labeled-content.tsx
+++ b/ui/packages/ui-lib/src/labeled-content/labeled-content.tsx
@@ -35,17 +35,20 @@ const LabeledContent = ({
         '.MuiAutocomplete-root': {
           mt: 1.5,
         },
+        mt: 2,
+        ...sx,
       }}
     >
-      <Stack direction="row">
+      <Stack
+        sx={{
+          flexDirection: 'row',
+          alignItems: 'center',
+          marginBottom: actionButtonProps ? 1 : 0.5,
+        }}
+      >
         <Typography
           // @ts-ignore
           variant="sectionHeading"
-          sx={{
-            mt: 3,
-            mb: 0.5,
-            ...sx,
-          }}
           {...typographyProps}
         >
           {label}
@@ -54,7 +57,7 @@ const LabeledContent = ({
         {actionButtonProps && (
           <Button
             variant="text"
-            size="medium"
+            size="small"
             startIcon={<AddIcon />}
             sx={{
               width: 'fit-content',

From 6679382dbd25c492d17dfacabfb7deaabc2c67ab Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Wed, 8 May 2024 11:44:55 +0400
Subject: [PATCH 03/14] EVEREST-953-backups-and-PITR-dbwizard-combining:
 preview

---
 .../database-preview/sections/backups-section.tsx      | 10 ++++++++--
 .../database-preview/sections/constants.ts             |  2 --
 .../database-form/database-preview/sections/index.tsx  |  2 --
 .../database-preview/sections/pitr-section.tsx         |  8 --------
 4 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 ui/apps/everest/src/pages/database-form/database-preview/sections/pitr-section.tsx

diff --git a/ui/apps/everest/src/pages/database-form/database-preview/sections/backups-section.tsx b/ui/apps/everest/src/pages/database-form/database-preview/sections/backups-section.tsx
index 778ac8371..7206672c8 100644
--- a/ui/apps/everest/src/pages/database-form/database-preview/sections/backups-section.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-preview/sections/backups-section.tsx
@@ -4,7 +4,7 @@ import { BackupStepType } from '../../database-form-schema.ts';
 import { getFormValuesFromCronExpression } from 'components/time-selection/time-selection.utils.ts';
 
 export const BackupsPreviewSection = (backupsSection: BackupStepType) => {
-  const { schedules } = backupsSection;
+  const { schedules, pitrEnabled } = backupsSection;
   const schedulesPreviewList = schedules.map((item) =>
     getTimeSelectionPreviewMessage(
       getFormValuesFromCronExpression(item.schedule)
@@ -18,8 +18,14 @@ export const BackupsPreviewSection = (backupsSection: BackupStepType) => {
           <PreviewContentText key={`${item}`} text={item} />
         ))
       ) : (
-        <PreviewContentText text="Disabled" dataTestId="empty-backups" />
+        <PreviewContentText
+          text="Backups disabled"
+          dataTestId="empty-backups"
+        />
       )}
+      <PreviewContentText
+        text={pitrEnabled ? 'PITR Enabled' : 'PITR disabled'}
+      />
     </>
   );
 };
diff --git a/ui/apps/everest/src/pages/database-form/database-preview/sections/constants.ts b/ui/apps/everest/src/pages/database-form/database-preview/sections/constants.ts
index 2ff5d8ca4..989de4962 100644
--- a/ui/apps/everest/src/pages/database-form/database-preview/sections/constants.ts
+++ b/ui/apps/everest/src/pages/database-form/database-preview/sections/constants.ts
@@ -3,13 +3,11 @@ import { BackupsPreviewSection } from './backups-section.tsx';
 import { AdvancedConfigurationsPreviewSection } from './advanced-configurations-section';
 import { PreviewSectionOne } from './section-one';
 import { ResourcesPreviewSection } from './resources-section.tsx';
-import { PITRSection } from './pitr-section';
 
 export const previewSections = [
   PreviewSectionOne,
   ResourcesPreviewSection,
   BackupsPreviewSection,
-  PITRSection,
   AdvancedConfigurationsPreviewSection,
   PreviewSectionFive,
 ];
diff --git a/ui/apps/everest/src/pages/database-form/database-preview/sections/index.tsx b/ui/apps/everest/src/pages/database-form/database-preview/sections/index.tsx
index 857c7a80e..0224fb7d6 100644
--- a/ui/apps/everest/src/pages/database-form/database-preview/sections/index.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-preview/sections/index.tsx
@@ -3,13 +3,11 @@ import { AdvancedConfigurationsPreviewSection } from './advanced-configurations-
 import { PreviewSectionOne } from './section-one';
 import { BackupsPreviewSection } from './backups-section';
 import { ResourcesPreviewSection } from './resources-section.tsx';
-import { PITRSection } from './pitr-section';
 
 export {
   PreviewSectionOne,
   ResourcesPreviewSection,
   BackupsPreviewSection,
-  PITRSection,
   AdvancedConfigurationsPreviewSection,
   PreviewSectionFive,
 };
diff --git a/ui/apps/everest/src/pages/database-form/database-preview/sections/pitr-section.tsx b/ui/apps/everest/src/pages/database-form/database-preview/sections/pitr-section.tsx
deleted file mode 100644
index e8cc8230a..000000000
--- a/ui/apps/everest/src/pages/database-form/database-preview/sections/pitr-section.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { PreviewContentText } from '../preview-section';
-import { PITRStepType } from '../../database-form-schema';
-
-export const PITRSection = ({ pitrEnabled }: PITRStepType) => (
-  <>
-    <PreviewContentText text={pitrEnabled ? 'Enabled' : 'Disabled'} />
-  </>
-);

From 211eeae42b9517cb8511bac44b28c5babf912bd5 Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Wed, 8 May 2024 14:02:04 +0400
Subject: [PATCH 04/14] EVEREST-953-backups-and-PITR-dbwizard-combining

---
 .../steps/backups/backups.tsx                 | 35 +++++----
 .../steps/backups/pitr/index.ts               |  1 +
 .../steps/{ => backups}/pitr/pitr-storage.tsx |  8 +-
 .../steps/{ => backups}/pitr/pitr.messages.ts | 16 +++-
 .../pitr-step.tsx => backups/pitr/pitr.tsx}   | 73 ++++++++++---------
 .../backups/schedules/schedules.messages.ts   |  2 +
 .../steps/backups/schedules/schedules.tsx     | 17 ++++-
 .../database-form-body/steps/pitr/index.ts    |  1 -
 .../database-form/database-form-schema.ts     | 10 +--
 9 files changed, 96 insertions(+), 67 deletions(-)
 create mode 100644 ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/index.ts
 rename ui/apps/everest/src/pages/database-form/database-form-body/steps/{ => backups}/pitr/pitr-storage.tsx (90%)
 rename ui/apps/everest/src/pages/database-form/database-form-body/steps/{ => backups}/pitr/pitr.messages.ts (75%)
 rename ui/apps/everest/src/pages/database-form/database-form-body/steps/{pitr/pitr-step.tsx => backups/pitr/pitr.tsx} (56%)
 delete mode 100644 ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/index.ts

diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/backups.tsx b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/backups.tsx
index da08348c2..edaa61ead 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/backups.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/backups.tsx
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Alert, Box } from '@mui/material';
+import { FormGroup } from '@mui/material';
 import { useBackupStoragesByNamespace } from 'hooks/api/backup-storages/useBackupStorages';
 import { useFormContext } from 'react-hook-form';
 import { DbWizardFormFields } from '../../../database-form.types.ts';
@@ -21,37 +21,36 @@ import BackupsActionableAlert from 'components/actionable-alert/backups-actionab
 import { StepHeader } from '../step-header/step-header.tsx';
 import { Messages } from './backups.messages.ts';
 import Schedules from './schedules';
+import PITR from './pitr';
 
 export const Backups = () => {
   const { watch } = useFormContext();
 
-  const [selectedNamespace, schedules] = watch([
+  const [selectedNamespace] = watch([
     DbWizardFormFields.k8sNamespace,
     DbWizardFormFields.schedules,
   ]);
-  const { data: backupStorages = [] } =
+  const { data: backupStorages = [], isLoading } =
     useBackupStoragesByNamespace(selectedNamespace);
 
   return (
-    <Box sx={{ display: 'flex', flexDirection: 'column' }}>
+    <>
       <StepHeader
         pageTitle={Messages.backups}
         pageDescription={Messages.captionBackups}
       />
-      {backupStorages.length > 0 ? (
-        <Schedules />
-      ) : (
-        <BackupsActionableAlert namespace={selectedNamespace} />
+      {!isLoading && (
+        <>
+          {backupStorages?.length > 0 ? (
+            <FormGroup sx={{ mt: 3 }}>
+              <Schedules />
+              <PITR />
+            </FormGroup>
+          ) : (
+            <BackupsActionableAlert namespace={selectedNamespace} />
+          )}
+        </>
       )}
-      {schedules?.length === 0 && (
-        <Alert
-          sx={{ mt: 1 }}
-          severity="info"
-          data-testid="pitr-no-backup-alert"
-        >
-          {Messages.pitrAlert}
-        </Alert>
-      )}
-    </Box>
+    </>
   );
 };
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/index.ts b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/index.ts
new file mode 100644
index 000000000..da9cff25b
--- /dev/null
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/index.ts
@@ -0,0 +1 @@
+export { default } from './pitr';
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/pitr-storage.tsx b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/pitr-storage.tsx
similarity index 90%
rename from ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/pitr-storage.tsx
rename to ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/pitr-storage.tsx
index f794071ac..690156e9d 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/pitr-storage.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/pitr-storage.tsx
@@ -19,10 +19,14 @@ const PitrStorage = () => {
     useBackupStoragesByNamespace(selectedNamespace);
 
   useEffect(() => {
-    if (!pitrStorageLocation && backupStorages[0]) {
+    if (
+      pitrStorageLocation !== null &&
+      !pitrStorageLocation &&
+      backupStorages[0]
+    ) {
       setValue(DbWizardFormFields.pitrStorageLocation, backupStorages[0]);
     }
-  }, [pitrStorageLocation, backupStorages[0]]);
+  }, [pitrStorageLocation, backupStorages]);
 
   if (!pitrEnabled) {
     return null;
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/pitr.messages.ts b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/pitr.messages.ts
similarity index 75%
rename from ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/pitr.messages.ts
rename to ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/pitr.messages.ts
index aaf569973..3446b9531 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/pitr.messages.ts
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/pitr.messages.ts
@@ -13,8 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { DbType } from '@percona/types';
+
 export const Messages = {
-  header: 'Point-in-time Recovery (PITR)',
+  sectionHeader: 'Point-in-time Recovery',
   description:
     'PITR provides continuous backups of your database, enabling you to restore it to a specific point in time, in case of accidental writes or deletes.',
   enablePitr: 'Enable PITR',
@@ -25,4 +27,16 @@ export const Messages = {
   captionPitr:
     'Point-in-time recovery provides continuous backups on your database to protect against accidental writes or deletes.',
   pitrCreateHeader: 'Create PitrStep backup every',
+  pitrSwitchLabelCaption: (dbType: DbType, storageName: string) => {
+    switch (dbType) {
+      case DbType.Mongo: {
+        return storageName ? `Storage: ${storageName}` : '';
+      }
+      case DbType.Postresql: {
+        return Messages.enablePitrCaption;
+      }
+      default:
+        return undefined;
+    }
+  },
 };
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/pitr-step.tsx b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/pitr.tsx
similarity index 56%
rename from ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/pitr-step.tsx
rename to ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/pitr.tsx
index a04a26ee6..6b55bb783 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/pitr-step.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/pitr/pitr.tsx
@@ -13,19 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Alert, Box } from '@mui/material';
+import { Stack, Typography } from '@mui/material';
+import { Messages } from './pitr.messages';
+import { LabeledContent, SwitchInput } from '@percona/ui-lib';
 import { DbType } from '@percona/types';
-import { SwitchInput } from '@percona/ui-lib';
-import { useEffect } from 'react';
+import { DbWizardFormFields } from '../../../../database-form.types';
 import { useFormContext } from 'react-hook-form';
-import { DbWizardFormFields } from '../../../database-form.types';
-import { StepHeader } from '../step-header/step-header';
 import PitrStorage from './pitr-storage';
-import { Messages } from './pitr.messages';
+import { useEffect } from 'react';
 
-const PITRStep = () => {
+const PITR = () => {
   const { control, watch, setValue } = useFormContext();
-
   const [dbType, schedules] = watch([
     DbWizardFormFields.dbType,
     DbWizardFormFields.schedules,
@@ -48,34 +46,39 @@ const PITRStep = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [backupsEnabled]);
 
+  useEffect(() => {
+    if (dbType !== DbType.Mysql && schedules?.length > 0) {
+      setValue(
+        DbWizardFormFields.pitrStorageLocation,
+        schedules[0]?.backupStorageName
+      );
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [schedules, dbType]);
+
   return (
-    <Box sx={{ display: 'flex', flexDirection: 'column' }}>
-      <StepHeader
-        pageTitle={Messages.header}
-        pageDescription={Messages.description}
-      />
-      {!backupsEnabled && (
-        <Alert severity="info" sx={{ mt: 1 }}>
-          {Messages.toEnablePitr}
-        </Alert>
-      )}
-      <SwitchInput
-        control={control}
-        label={Messages.enablePitr}
-        labelCaption={
-          dbType === DbType.Postresql ? Messages.enablePitrCaption : undefined
-        }
-        name={DbWizardFormFields.pitrEnabled}
-        switchFieldProps={{
-          disabled: pitrDisabled,
-        }}
-        formControlLabelProps={{
-          sx: { my: 1 },
-        }}
-      />
-      <PitrStorage />
-    </Box>
+    <Stack sx={{ mt: 7 }}>
+      <LabeledContent label={Messages.sectionHeader} sx={{ mt: 0 }}>
+        <Typography variant="body2">{Messages.description}</Typography>
+        <SwitchInput
+          control={control}
+          label={Messages.enablePitr}
+          labelCaption={Messages.pitrSwitchLabelCaption(
+            dbType,
+            schedules[0]?.backupStorageName || ''
+          )}
+          name={DbWizardFormFields.pitrEnabled}
+          switchFieldProps={{
+            disabled: pitrDisabled,
+          }}
+          formControlLabelProps={{
+            sx: { my: 1 },
+          }}
+        />
+        <PitrStorage />
+      </LabeledContent>
+    </Stack>
   );
 };
 
-export default PITRStep;
+export default PITR;
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.messages.ts b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.messages.ts
index 01e10c302..763ff5899 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.messages.ts
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.messages.ts
@@ -16,4 +16,6 @@ export const Messages = {
   label: 'Backup schedules',
   create: 'Create backup schedule',
   noSchedules: 'You don’t have any backup schedules yet.',
+  mongoDb:
+    'The backup storage you select for your first backup schedule will be used for all subsequent schedules and PITR.',
 };
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.tsx b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.tsx
index 09b730ebc..062aea49f 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.tsx
@@ -17,7 +17,7 @@ import { Stack, Typography } from '@mui/material';
 import EditableItem from 'components/editable-item/editable-item';
 import { LabeledContent } from '@percona/ui-lib';
 import { Messages } from './schedules.messages';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { DbWizardFormFields } from '../../../../database-form.types';
 import { useFormContext } from 'react-hook-form';
 import { Schedule } from 'shared-types/dbCluster.types';
@@ -30,6 +30,7 @@ import { ScheduleFormDialog } from 'components/schedule-form-dialog';
 import { ScheduleFormDialogContext } from 'components/schedule-form-dialog/schedule-form-dialog-context/schedule-form-dialog.context';
 import { ScheduleFormData } from 'components/schedule-form-dialog/schedule-form/schedule-form-schema';
 import { dbTypeToDbEngine } from '@percona/utils';
+import { DbType } from '@percona/types';
 
 const Schedules = () => {
   const { watch, setValue } = useFormContext();
@@ -43,6 +44,16 @@ const Schedules = () => {
     DbWizardFormFields.schedules,
   ]);
 
+  const [activeStorage, setActiveStorage] = useState(undefined);
+
+  useEffect(() => {
+    if (schedules?.length > 0 && dbType === DbType.Mongo) {
+      setActiveStorage(schedules[0]?.backupStorageName);
+    } else {
+      setActiveStorage(undefined);
+    }
+  }, [schedules, dbType]);
+
   const handleDelete = (name: string) => {
     setValue(
       DbWizardFormFields.schedules,
@@ -86,6 +97,9 @@ const Schedules = () => {
         }}
       >
         <Stack>
+          {dbType === DbType.Mongo && (
+            <Typography variant="caption">{Messages.mongoDb}</Typography>
+          )}
           {schedules.map((item: Schedule) => (
             <EditableItem
               key={item.name}
@@ -128,6 +142,7 @@ const Schedules = () => {
               schedules,
               namespace: k8sNamespace,
               dbEngine: dbTypeToDbEngine(dbType),
+              activeStorage,
             },
           }}
         >
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/index.ts b/ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/index.ts
deleted file mode 100644
index 988760562..000000000
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/pitr/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './pitr-step';
diff --git a/ui/apps/everest/src/pages/database-form/database-form-schema.ts b/ui/apps/everest/src/pages/database-form/database-form-schema.ts
index 4f1df5c8c..e6a30b135 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-schema.ts
+++ b/ui/apps/everest/src/pages/database-form/database-form-schema.ts
@@ -62,11 +62,6 @@ const backupsStepSchema = z
         schedule: z.string(),
       })
     ),
-  })
-  .passthrough();
-
-const pitrStepSchema = z
-  .object({
     [DbWizardFormFields.pitrEnabled]: z.boolean(),
     [DbWizardFormFields.pitrStorageLocation]: z
       .string()
@@ -135,7 +130,6 @@ export const getDBWizardSchema = (activeStep: number) => {
     basicInfoSchema,
     stepTwoSchema,
     backupsStepSchema,
-    pitrStepSchema,
     advancedConfigurationsSchema,
     stepFiveSchema,
   ];
@@ -148,12 +142,10 @@ export type AdvancedConfigurationType = z.infer<
   typeof advancedConfigurationsSchema
 >;
 export type BackupStepType = z.infer<typeof backupsStepSchema>;
-export type PITRStepType = z.infer<typeof pitrStepSchema>;
 export type StepFiveType = z.infer<typeof stepFiveSchema>;
 
 export type DbWizardType = BasicInfoType &
   StepTwoType &
   StepFiveType &
   AdvancedConfigurationType &
-  BackupStepType &
-  PITRStepType;
+  BackupStepType;

From a94b725a6d0fb19bd506532060e64a294bd7f6e7 Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Mon, 13 May 2024 09:10:02 +0400
Subject: [PATCH 05/14] EVEREST-953-backups-and-PITR-dbwizard-combining: fix
 small errors + tests

---
 .../create-db-cluster.e2e.ts                  | 23 +++-------------
 .../create-db-cluster/steps/backups-step.ts   | 15 +++++++++++
 .../create-db-cluster/steps/pitr-step.ts      | 27 -------------------
 .../db-cluster/db-wizard/db-wizard-utils.ts   | 10 +++++--
 .../{pitr-step.e2e.ts => pitr.e2e.ts}         |  0
 ...schedules-step.e2e.ts => schedules.e2e.ts} |  0
 .../backups/schedules/schedules.messages.ts   |  1 +
 .../steps/backups/schedules/schedules.tsx     |  8 +++++-
 .../database.preview.messages.ts              |  1 -
 9 files changed, 35 insertions(+), 50 deletions(-)
 delete mode 100644 ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/pitr-step.ts
 rename ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/{pitr-step.e2e.ts => pitr.e2e.ts} (100%)
 rename ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/{schedules-step.e2e.ts => schedules.e2e.ts} (100%)

diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/create-db-cluster.e2e.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/create-db-cluster.e2e.ts
index e8de8dad5..5fb7663ae 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/create-db-cluster.e2e.ts
+++ b/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';
 
 test.describe('DB Cluster creation', () => {
   let engineVersions = {
@@ -138,9 +137,6 @@ test.describe('DB Cluster creation', () => {
 
     await moveForward(page);
 
-    await pitrStepCheck(page);
-    await moveForward(page);
-
     await advancedConfigurationStepCheck(page);
     await moveForward(page);
 
@@ -164,9 +160,6 @@ test.describe('DB Cluster creation', () => {
     await page.getByTestId('mongodb-toggle-button').click();
     await expect(page.getByText('Number of nodes: 3')).toBeVisible();
     await page.getByTestId('button-edit-preview-backups').click();
-
-    expect(page.getByTestId('radio-option-logical')).not.toBeVisible;
-
     await page.getByTestId('button-edit-preview-monitoring').click();
 
     // await monitoringStepCheck(page, monitoringInstancesList);
@@ -226,21 +219,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();
@@ -308,9 +295,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')
@@ -327,17 +311,18 @@ test.describe('DB Cluster creation', () => {
     await page.getByTestId('form-dialog-create').click();
     await expect(page.getByText('2 active schedules')).toBeVisible();
 
+    // Move to edit
     // We disable PITR
     await page.goto('/databases');
     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);
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/backups-step.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/backups-step.ts
index e29e5a78e..8cbfab6d1 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/backups-step.ts
+++ b/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();
 };
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/pitr-step.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/pitr-step.ts
deleted file mode 100644
index 8908234da..000000000
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/pitr-step.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// everest
-// Copyright (C) 2023 Percona LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-import { expect, Page } from '@playwright/test';
-
-export const pitrStepCheck = async (page: Page) => {
-  await expect(page.getByTestId('step-header')).toHaveText(
-    'Point-in-time Recovery (PITR)'
-  );
-
-  const enabledPitrCheckbox = page
-    .getByTestId('switch-input-pitr-enabled-label')
-    .getByRole('checkbox');
-
-  await expect(enabledPitrCheckbox).not.toBeChecked();
-};
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/db-wizard-utils.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/db-wizard-utils.ts
index e8ad26cab..fe28f459c 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/db-wizard-utils.ts
+++ b/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) => {
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr-step.e2e.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
similarity index 100%
rename from ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr-step.e2e.ts
rename to ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules-step.e2e.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts
similarity index 100%
rename from ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules-step.e2e.ts
rename to ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.messages.ts b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.messages.ts
index 763ff5899..361140c0a 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.messages.ts
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.messages.ts
@@ -18,4 +18,5 @@ export const Messages = {
   noSchedules: 'You don’t have any backup schedules yet.',
   mongoDb:
     'The backup storage you select for your first backup schedule will be used for all subsequent schedules and PITR.',
+  pg: 'Note: Maximum 3 schedules for PostgreSQL',
 };
diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.tsx b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.tsx
index 062aea49f..0b1d5a73b 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/schedules/schedules.tsx
@@ -44,6 +44,9 @@ const Schedules = () => {
     DbWizardFormFields.schedules,
   ]);
 
+  const createButtonDisabled =
+    openScheduleModal ||
+    (dbType === DbType.Postresql && schedules?.length >= 3);
   const [activeStorage, setActiveStorage] = useState(undefined);
 
   useEffect(() => {
@@ -92,7 +95,7 @@ const Schedules = () => {
         actionButtonProps={{
           dataTestId: 'create-schedule',
           buttonText: 'Create backup schedule',
-          disabled: openScheduleModal,
+          disabled: createButtonDisabled,
           onClick: () => handleCreate(),
         }}
       >
@@ -100,6 +103,9 @@ const Schedules = () => {
           {dbType === DbType.Mongo && (
             <Typography variant="caption">{Messages.mongoDb}</Typography>
           )}
+          {dbType === DbType.Postresql && (
+            <Typography variant="caption">{Messages.pg}</Typography>
+          )}
           {schedules.map((item: Schedule) => (
             <EditableItem
               key={item.name}
diff --git a/ui/apps/everest/src/pages/database-form/database-preview/database.preview.messages.ts b/ui/apps/everest/src/pages/database-form/database-preview/database.preview.messages.ts
index dcabc6ebc..b50d798a6 100644
--- a/ui/apps/everest/src/pages/database-form/database-preview/database.preview.messages.ts
+++ b/ui/apps/everest/src/pages/database-form/database-preview/database.preview.messages.ts
@@ -26,7 +26,6 @@ export const Messages = {
     'Basic Information',
     'Resources',
     'Backups',
-    'Point-in-time Recovery',
     'Advanced Configurations',
     'Monitoring',
   ],

From 3eaf0ee7096d02a46e83cdb63aa102331d637fe4 Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Mon, 13 May 2024 11:31:03 +0400
Subject: [PATCH 06/14] EVEREST-953-backups-and-PITR-dbwizard-combining: tests
 fix

---
 .../db-wizard/edit-db-cluster/pitr.e2e.ts     | 133 +++++++++++++-----
 .../edit-db-cluster/schedules.e2e.ts          |   5 -
 ui/apps/everest/.e2e/utils/db-wizard.ts       |   2 -
 .../sections/backups-section.tsx              |   2 +-
 4 files changed, 99 insertions(+), 43 deletions(-)

diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
index 34dccab10..4f735cbac 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
@@ -23,6 +23,7 @@ import {
   findDbAndClickRow,
 } from '../../../utils/db-clusters-list';
 import {
+  goToStep,
   moveForward,
   storageLocationAutocompleteEmptyValidationCheck,
 } from '../../../utils/db-wizard';
@@ -31,8 +32,9 @@ import {
   checkSuccessOfUpdateAndGoToDbClustersList,
 } from './edit-db-cluster.utils';
 import { STORAGE_NAMES } from '../../../constants';
+import { addFirstScheduleInDBWizard } from '../db-wizard-utils';
 
-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 }) => {
@@ -67,14 +69,8 @@ test.describe.serial('DB Cluster Editing PITR Step', async () => {
     await page.goto('/databases');
     await findDbAndClickActions(page, mySQLName, 'Edit', 'UP');
 
-    // Go to Resources step
-    await moveForward(page);
-    // Go to Backups step
-    await moveForward(page);
-    // Go to PITR step
-    await moveForward(page);
+    await goToStep(page, 'backups');
 
-    // Check PITR form
     const pitrCheckbox = page
       .getByTestId('switch-input-pitr-enabled')
       .getByRole('checkbox');
@@ -98,11 +94,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 +112,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 page.goto('/databases');
     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);
-
     // Check PITR step
+    await goToStep(page, 'backups');
     const pitrCheckbox = page
       .getByTestId('switch-input-pitr-enabled')
       .getByRole('checkbox');
@@ -153,16 +140,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 +160,80 @@ 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('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();
+  });
+});
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts
index 5687c992d..821836a32 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts
@@ -56,9 +56,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
@@ -90,8 +87,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
diff --git a/ui/apps/everest/.e2e/utils/db-wizard.ts b/ui/apps/everest/.e2e/utils/db-wizard.ts
index a340c5dd0..3a8f867bb 100644
--- a/ui/apps/everest/.e2e/utils/db-wizard.ts
+++ b/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();
diff --git a/ui/apps/everest/src/pages/database-form/database-preview/sections/backups-section.tsx b/ui/apps/everest/src/pages/database-form/database-preview/sections/backups-section.tsx
index 7206672c8..803a8108b 100644
--- a/ui/apps/everest/src/pages/database-form/database-preview/sections/backups-section.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-preview/sections/backups-section.tsx
@@ -24,7 +24,7 @@ export const BackupsPreviewSection = (backupsSection: BackupStepType) => {
         />
       )}
       <PreviewContentText
-        text={pitrEnabled ? 'PITR Enabled' : 'PITR disabled'}
+        text={pitrEnabled ? 'PITR Enabled' : 'PITR Disabled'}
       />
     </>
   );

From 5bea00416fa54a8eeea71f0be1920886e6891bb1 Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Mon, 13 May 2024 11:43:58 +0400
Subject: [PATCH 07/14] EVEREST-953-backups-and-PITR-dbwizard-combining: unit
 tests fix

---
 .../database-form/database-preview/database-preview.test.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/apps/everest/src/pages/database-form/database-preview/database-preview.test.tsx b/ui/apps/everest/src/pages/database-form/database-preview/database-preview.test.tsx
index 26291a867..83e0cba20 100644
--- a/ui/apps/everest/src/pages/database-form/database-preview/database-preview.test.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-preview/database-preview.test.tsx
@@ -37,7 +37,7 @@ describe('DatabasePreview', () => {
     );
 
     expect(screen.getAllByTestId(/^section-*/, { exact: false })).toHaveLength(
-      6
+      5
     );
   });
 

From 4350562dcd846b9bbc7d735a1026bcf6e41fc65a Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Tue, 14 May 2024 17:55:01 +0400
Subject: [PATCH 08/14] EVEREST-953-backups-and-PITR-dbwizard-combining: tests
 fix typo

---
 .../create-db-cluster/steps/advanced-configuration-step.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/advanced-configuration-step.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/advanced-configuration-step.ts
index 1c6869210..3a0ce92bd 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/advanced-configuration-step.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/advanced-configuration-step.ts
@@ -45,5 +45,5 @@ export const advancedConfigurationStepCheck = async (page: Page) => {
 
   await page
     .getByTestId('text-input-engine-parameters')
-    .fill('max_alllowed_packet=128M');
+    .fill('max_allowed_packet=128M');
 };

From 3dbe6626a50f9bf188c43d2c2616095fe4fa3afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Silva?= <ffjs1993@gmail.com>
Date: Thu, 16 May 2024 10:04:53 +0100
Subject: [PATCH 09/14] fix: e2e tentative (#299)

---
 .../on-demand-backup.e2e.ts                   |  3 +-
 .../.e2e/db-cluster-details/schedules.e2e.ts  | 19 +++--
 .../create-db-cluster.e2e.ts                  |  9 ++-
 .../steps/advanced-configuration-step.ts      |  2 +-
 .../steps/basic-information-step.ts           | 18 +++--
 .../steps/monitoring-step.ts                  |  9 ++-
 .../create-db-cluster/steps/resources-step.ts |  7 +-
 .../db-wizard/edit-db-cluster/pitr.e2e.ts     | 11 ++-
 .../edit-db-cluster/resources-step.e2e.ts     | 12 +--
 .../edit-db-cluster/schedules.e2e.ts          |  8 +-
 .../db-cluster-restore-action.e2e.ts          | 22 +++---
 .../db-restore-to-new-cluster.e2e.ts          | 22 +++---
 ui/apps/everest/.e2e/global.setup.ts          | 75 +++++++++++++------
 ui/apps/everest/.e2e/global.teardown.ts       |  4 +-
 .../multinamespaces/storage-location.e2e.ts   |  1 +
 .../.e2e/settings/monitoring-list.e2e.ts      |  4 +
 .../.e2e/settings/namespaces-list.e2e.ts      |  7 +-
 .../everest/.e2e/utils/db-clusters-list.ts    |  1 -
 ui/apps/everest/.e2e/utils/table.ts           |  9 ++-
 .../DatabaseFormSideDrawer.tsx                |  2 +
 .../DatabaseFormSideDrawer.types.ts           |  1 +
 .../src/pages/database-form/database-form.tsx |  7 +-
 .../database-preview/database-preview.tsx     |  2 +
 .../database-preview.types.ts                 |  2 +
 .../database-preview/preview-section.tsx      |  4 +-
 .../monitoring-endpoints.tsx                  |  9 ++-
 26 files changed, 184 insertions(+), 86 deletions(-)

diff --git a/ui/apps/everest/.e2e/db-cluster-details/on-demand-backup.e2e.ts b/ui/apps/everest/.e2e/db-cluster-details/on-demand-backup.e2e.ts
index 9d4483f40..beaff7ae2 100644
--- a/ui/apps/everest/.e2e/db-cluster-details/on-demand-backup.e2e.ts
+++ b/ui/apps/everest/.e2e/db-cluster-details/on-demand-backup.e2e.ts
@@ -2,6 +2,7 @@ import { expect, test } from '@playwright/test';
 import { gotoDbClusterBackups } from '../utils/db-clusters-list';
 import { createDbClusterFn, deleteDbClusterFn } from '../utils/db-cluster';
 import { clickOnDemandBackup } from './utils';
+import { STORAGE_NAMES } from '../constants';
 
 test.describe('On-demand backup', async () => {
   const mySQLName = 'on-demand-mysql';
@@ -15,7 +16,7 @@ test.describe('On-demand backup', async () => {
         enabled: true,
         schedules: [
           {
-            backupStorageName: 'test-storage-1',
+            backupStorageName: STORAGE_NAMES[0],
             enabled: true,
             name: 'backup-1',
             schedule: '0 * * * *',
diff --git a/ui/apps/everest/.e2e/db-cluster-details/schedules.e2e.ts b/ui/apps/everest/.e2e/db-cluster-details/schedules.e2e.ts
index 12ece7c94..d1a163e3f 100644
--- a/ui/apps/everest/.e2e/db-cluster-details/schedules.e2e.ts
+++ b/ui/apps/everest/.e2e/db-cluster-details/schedules.e2e.ts
@@ -22,8 +22,11 @@ import {
   gotoDbClusterBackups,
 } from '../utils/db-clusters-list';
 import { storageLocationAutocompleteEmptyValidationCheck } from '../utils/db-wizard';
+import { STORAGE_NAMES } from '../constants';
+import { waitForInitializingState } from '../utils/table';
 
-test.describe.serial('Schedules List', async () => {
+// TODO uncomment when PATCH method is implemented
+test.describe.skip('Schedules List', async () => {
   let scheduleName = 'test-name';
   const mySQLName = 'schedule-mysql';
 
@@ -36,7 +39,7 @@ test.describe.serial('Schedules List', async () => {
         enabled: true,
         schedules: [
           {
-            backupStorageName: 'test-storage-1',
+            backupStorageName: STORAGE_NAMES[0],
             enabled: true,
             name: 'backup-1',
             schedule: '0 * * * *',
@@ -46,12 +49,16 @@ test.describe.serial('Schedules List', async () => {
     });
   });
 
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/databases');
+    await waitForInitializingState(page, mySQLName);
+  });
+
   test.afterAll(async ({ request }) => {
     await deleteDbClusterFn(request, mySQLName);
   });
 
   test('Create schedule', async ({ page }) => {
-    await page.goto('/databases');
     await findDbAndClickRow(page, mySQLName);
 
     const backupsTab = await page.getByTestId(DBClusterDetailsTabs.backups);
@@ -141,19 +148,19 @@ test.describe.serial('Schedules List', async () => {
         enabled: true,
         schedules: [
           {
-            backupStorageName: 'test-storage-1',
+            backupStorageName: STORAGE_NAMES[0],
             enabled: true,
             name: 'backup-1',
             schedule: '0 * * * *',
           },
           {
-            backupStorageName: 'test-storage-1',
+            backupStorageName: STORAGE_NAMES[0],
             enabled: true,
             name: 'backup-2',
             schedule: '0 * * * *',
           },
           {
-            backupStorageName: 'test-storage-1',
+            backupStorageName: STORAGE_NAMES[0],
             enabled: true,
             name: 'backup-3',
             schedule: '0 * * * *',
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/create-db-cluster.e2e.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/create-db-cluster.e2e.ts
index 5fb7663ae..11d4ec69a 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/create-db-cluster.e2e.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/create-db-cluster.e2e.ts
@@ -36,6 +36,7 @@ import {
 import { EVEREST_CI_NAMESPACES } from '../../../constants';
 import { addFirstScheduleInDBWizard } from '../db-wizard-utils';
 import { findDbAndClickActions } from '../../../utils/db-clusters-list';
+import { waitForInitializingState } from '../../../utils/table';
 
 test.describe('DB Cluster creation', () => {
   let engineVersions = {
@@ -194,8 +195,8 @@ test.describe('DB Cluster creation', () => {
     expect(['600m', '0.6']).toContain(
       addedCluster?.spec.engine.resources?.cpu.toString()
     );
-    expect(addedCluster?.spec.engine.resources?.memory.toString()).toBe('32G');
-    expect(addedCluster?.spec.engine.storage.size.toString()).toBe('150G');
+    expect(addedCluster?.spec.engine.resources?.memory.toString()).toBe('1G');
+    expect(addedCluster?.spec.engine.storage.size.toString()).toBe('1G');
     expect(addedCluster?.spec.proxy.expose.type).toBe('internal');
     expect(addedCluster?.spec.proxy.replicas).toBe(3);
     // expect(addedCluster?.spec.proxy.expose.ipSourceRanges).toEqual([
@@ -278,6 +279,7 @@ test.describe('DB Cluster creation', () => {
   });
 
   test('Multiple Mongo schedules', async ({ page, request }) => {
+    test.slow();
     const clusterName = 'multi-schedule-test';
     const recommendedEngineVersions = await getEnginesLatestRecommendedVersions(
       namespace,
@@ -305,6 +307,8 @@ test.describe('DB Cluster creation', () => {
     await submitWizard(page);
     await expect(page.getByTestId('db-wizard-goto-db-clusters')).toBeVisible();
 
+    await page.goto('/databases');
+    await waitForInitializingState(page, clusterName);
     await page.goto(`/databases/${namespace}/${clusterName}/backups`);
     await page.getByTestId('menu-button').click();
     await page.getByTestId('schedule-menu-item').click();
@@ -314,6 +318,7 @@ test.describe('DB Cluster creation', () => {
     // Move to edit
     // We disable PITR
     await page.goto('/databases');
+    await waitForInitializingState(page, clusterName);
     await findDbAndClickActions(page, clusterName, 'Edit');
     await goToStep(page, 'backups');
     await setPitrEnabledStatus(page, false);
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/advanced-configuration-step.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/advanced-configuration-step.ts
index 3a0ce92bd..8dafae1b1 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/advanced-configuration-step.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/advanced-configuration-step.ts
@@ -45,5 +45,5 @@ export const advancedConfigurationStepCheck = async (page: Page) => {
 
   await page
     .getByTestId('text-input-engine-parameters')
-    .fill('max_allowed_packet=128M');
+    .fill('max_allowed_packet: 128M');
 };
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/basic-information-step.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/basic-information-step.ts
index 39ba377ec..91aa5d92f 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/basic-information-step.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/basic-information-step.ts
@@ -38,10 +38,11 @@ export const basicInformationStepCheck = async (
 
   const dbVersionOptions = page.getByRole('option');
 
-  engineVersions.psmdb.forEach((version) =>
-    expect(
-      dbVersionOptions.filter({ hasText: new RegExp(`^${version}$`) })
-    ).toBeVisible()
+  engineVersions.psmdb.forEach(
+    async (version) =>
+      await expect(
+        dbVersionOptions.filter({ hasText: new RegExp(`^${version}$`) })
+      ).toBeVisible()
   );
 
   const defaultOption = await page.getByRole('option', { selected: true });
@@ -55,10 +56,11 @@ export const basicInformationStepCheck = async (
 
   const storageClassOptions = page.getByRole('option');
 
-  storageClasses.forEach((className) =>
-    expect(
-      storageClassOptions.filter({ hasText: new RegExp(`^${className}$`) })
-    ).toBeVisible()
+  storageClasses.forEach(
+    async (className) =>
+      await expect(
+        storageClassOptions.filter({ hasText: new RegExp(`^${className}$`) })
+      ).toBeVisible()
   );
 
   await page.getByRole('option').first().click();
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/monitoring-step.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/monitoring-step.ts
index 64c91eb44..fc5622f20 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/monitoring-step.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/monitoring-step.ts
@@ -28,10 +28,11 @@ export const monitoringStepCheck = async (
   await page.getByTestId('text-input-monitoring-instance').click();
   const monitoringOptions = page.getByRole('option');
 
-  monitoringInstancesList.forEach((option) =>
-    expect(
-      monitoringOptions.filter({ hasText: `${option.name} (${option.url})` })
-    ).toBeVisible()
+  monitoringInstancesList.forEach(
+    async (option) =>
+      await expect(
+        monitoringOptions.filter({ hasText: `${option.name} (${option.url})` })
+      ).toBeVisible()
   );
 
   await monitoringOptions
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/resources-step.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/resources-step.ts
index b2e39f2c6..695c29726 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/resources-step.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/create-db-cluster/steps/resources-step.ts
@@ -21,10 +21,11 @@ export const resourcesStepCheck = async (page: Page) => {
 
   await page.getByTestId('toggle-button-large').click();
   await page.getByTestId('text-input-cpu').fill('0.6');
-  await page.getByTestId('text-input-disk').fill('150');
+  await page.getByTestId('text-input-memory').fill('1');
+  await page.getByTestId('text-input-disk').fill('1');
 
   expect(await page.getByText('x 3 nodes').count()).toBe(3);
   await expect(page.getByTestId('cpu-resource-sum')).toHaveText('= 1.8 CPU');
-  await expect(page.getByTestId('memory-resource-sum')).toHaveText('= 96 GB');
-  await expect(page.getByTestId('disk-resource-sum')).toHaveText(' = 450 GB');
+  await expect(page.getByTestId('memory-resource-sum')).toHaveText('= 3 GB');
+  await expect(page.getByTestId('disk-resource-sum')).toHaveText(' = 3 GB');
 };
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
index 4f735cbac..643a30d83 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
@@ -33,6 +33,7 @@ import {
 } from './edit-db-cluster.utils';
 import { STORAGE_NAMES } from '../../../constants';
 import { addFirstScheduleInDBWizard } from '../db-wizard-utils';
+import { waitForInitializingState } from '../../../utils/table';
 
 test.describe.serial('MySQL PITR editing', async () => {
   const mySQLName = 'db-pitr-mysql';
@@ -49,7 +50,7 @@ test.describe.serial('MySQL PITR editing', async () => {
         enabled: true,
         schedules: [
           {
-            backupStorageName: 'test-storage-1',
+            backupStorageName: STORAGE_NAMES[0],
             enabled: true,
             name: 'backup-1',
             schedule: '0 * * * *',
@@ -59,6 +60,11 @@ test.describe.serial('MySQL PITR editing', async () => {
     });
   });
 
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/databases');
+    await waitForInitializingState(page, mySQLName);
+  });
+
   test.afterAll(async ({ request }) => {
     await deleteDbClusterFn(request, mySQLName);
   });
@@ -66,7 +72,6 @@ test.describe.serial('MySQL PITR editing', async () => {
   test('Enable PITR to database during editing in dbWizard', async ({
     page,
   }) => {
-    await page.goto('/databases');
     await findDbAndClickActions(page, mySQLName, 'Edit', 'UP');
 
     await goToStep(page, 'backups');
@@ -122,8 +127,8 @@ test.describe.serial('MySQL PITR editing', async () => {
   test('Disable PITR for database during editing in dbWizard', async ({
     page,
   }) => {
-    await page.goto('/databases');
     await findDbAndClickActions(page, mySQLName, 'Edit');
+    await expect(page.getByTestId('mysql-toggle-button')).toBeVisible();
 
     // Check PITR step
     await goToStep(page, 'backups');
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/resources-step.e2e.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/resources-step.e2e.ts
index 5e785ff09..d283610da 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/resources-step.e2e.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/resources-step.e2e.ts
@@ -25,7 +25,7 @@ import { moveForward } from '../../../utils/db-wizard';
 test.describe('DB Cluster Editing Resources Step (Mongo)', () => {
   const mongoDBName = 'mongo-db';
 
-  test.beforeEach(async ({ request }) => {
+  test.beforeAll(async ({ request }) => {
     await createDbClusterFn(request, {
       dbName: mongoDBName,
       dbType: DbType.Mongo,
@@ -33,18 +33,21 @@ test.describe('DB Cluster Editing Resources Step (Mongo)', () => {
     });
   });
 
-  test.afterEach(async ({ request }) => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/databases');
+  });
+
+  test.afterAll(async ({ request }) => {
     await deleteDbClusterFn(request, mongoDBName);
   });
 
   test('Show the correct number of nodes during editing', async ({ page }) => {
-    await page.goto('/databases');
     await findDbAndClickActions(page, mongoDBName, 'Edit');
 
     // Go to Resources step
     await moveForward(page);
 
-    expect(page.getByTestId('toggle-button-nodes-5')).toBeVisible();
+    await expect(page.getByTestId('toggle-button-nodes-5')).toBeVisible();
     const a = page
       .getByRole('button', { pressed: true })
       .filter({ hasText: '5 nodes' });
@@ -52,7 +55,6 @@ test.describe('DB Cluster Editing Resources Step (Mongo)', () => {
   });
 
   test('Disable disk resize during edition', async ({ page }) => {
-    await page.goto('/databases');
     await findDbAndClickActions(page, mongoDBName, 'Edit');
     await page.getByTestId('button-edit-preview-resources').click();
     await expect(page.getByTestId('text-input-disk')).toBeDisabled();
diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts
index 821836a32..5d3531055 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/schedules.e2e.ts
@@ -32,6 +32,7 @@ import {
   addFirstScheduleInDBWizard,
   addScheduleInDbWizard,
 } from '../db-wizard-utils';
+import { waitForInitializingState } from '../../../utils/table';
 
 test.describe.serial('DB Cluster Editing Backups Step', async () => {
   const mySQLName = 'db-backup-mysql';
@@ -44,6 +45,11 @@ test.describe.serial('DB Cluster Editing Backups Step', async () => {
     });
   });
 
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/databases');
+    await waitForInitializingState(page, mySQLName);
+  });
+
   test.afterAll(async ({ request }) => {
     await deleteDbClusterFn(request, mySQLName);
   });
@@ -51,7 +57,6 @@ test.describe.serial('DB Cluster Editing Backups Step', async () => {
   test('Add schedule to database with no schedule during editing in dbWizard', async ({
     page,
   }) => {
-    await page.goto('/databases');
     await findDbAndClickActions(page, mySQLName, 'Edit');
 
     await goToStep(page, 'backups');
@@ -79,7 +84,6 @@ test.describe.serial('DB Cluster Editing Backups Step', async () => {
   });
 
   test('Adding multi schedules during dbWizard editing', async ({ page }) => {
-    await page.goto('/databases');
     await findDbAndClickActions(page, mySQLName, 'Edit');
 
     await goToStep(page, 'backups');
diff --git a/ui/apps/everest/.e2e/db-restore/db-cluster-restore-action.e2e.ts b/ui/apps/everest/.e2e/db-restore/db-cluster-restore-action.e2e.ts
index ecc7c038c..3c0bd1d90 100644
--- a/ui/apps/everest/.e2e/db-restore/db-cluster-restore-action.e2e.ts
+++ b/ui/apps/everest/.e2e/db-restore/db-cluster-restore-action.e2e.ts
@@ -20,12 +20,12 @@ import {
   findDbAndClickActions,
   findDbAndClickRow,
 } from '../utils/db-clusters-list';
-import { getTokenFromLocalStorage } from '../utils/localStorage';
-test.describe('DB Cluster Restore', () => {
-  const dbClusterName = 'mysql-test-ui-restore';
+import { STORAGE_NAMES } from '../constants';
 
-  test.beforeEach(async ({ request, page }) => {
-    await page.goto('/databases');
+const dbClusterName = 'restore-db';
+
+test.describe('DB Cluster Restore', () => {
+  test.beforeAll(async ({ request }) => {
     await createDbClusterFn(request, {
       dbName: dbClusterName,
       dbType: 'mysql',
@@ -34,7 +34,7 @@ test.describe('DB Cluster Restore', () => {
         enabled: true,
         schedules: [
           {
-            backupStorageName: 'test-storage-1',
+            backupStorageName: STORAGE_NAMES[0],
             enabled: true,
             name: 'backup-1',
             schedule: '0 * * * *',
@@ -44,11 +44,15 @@ test.describe('DB Cluster Restore', () => {
     });
   });
 
-  test.afterEach(async ({ request }) => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/databases');
+  });
+
+  test.afterAll(async ({ request }) => {
     await deleteDbClusterFn(request, dbClusterName);
   });
 
-  test('DB cluster list restore action', async ({ page }) => {
+  test('DB cluster list restore action', async ({ page }, {}) => {
     await findDbAndClickActions(page, dbClusterName, 'Restore from a backup');
     await expect(
       page
@@ -57,7 +61,7 @@ test.describe('DB Cluster Restore', () => {
     ).toBeVisible();
   });
 
-  test('DB cluster detail restore action', async ({ page }) => {
+  test('DB cluster detail restore action', async ({ page }, {}) => {
     await findDbAndClickRow(page, dbClusterName);
     const actionButton = page.getByTestId('actions-button');
     await actionButton.click();
diff --git a/ui/apps/everest/.e2e/db-restore/db-restore-to-new-cluster.e2e.ts b/ui/apps/everest/.e2e/db-restore/db-restore-to-new-cluster.e2e.ts
index b83d80e02..3f556af06 100644
--- a/ui/apps/everest/.e2e/db-restore/db-restore-to-new-cluster.e2e.ts
+++ b/ui/apps/everest/.e2e/db-restore/db-restore-to-new-cluster.e2e.ts
@@ -20,13 +20,12 @@ import {
   findDbAndClickActions,
   findDbAndClickRow,
 } from '../utils/db-clusters-list';
-import { getTokenFromLocalStorage } from '../utils/localStorage';
+import { STORAGE_NAMES } from '../constants';
 
-test.describe('DB Cluster Restore to the new cluster', () => {
-  const dbClusterName = 'mysql-restore-to-new';
+const dbClusterName = 'restore-to-new-cluster';
 
-  test.beforeEach(async ({ request, page }) => {
-    await page.goto('/databases');
+test.describe('DB Cluster Restore to the new cluster', () => {
+  test.beforeAll(async ({ request }) => {
     await createDbClusterFn(request, {
       dbName: dbClusterName,
       dbType: 'mysql',
@@ -35,7 +34,7 @@ test.describe('DB Cluster Restore to the new cluster', () => {
         enabled: true,
         schedules: [
           {
-            backupStorageName: 'test-storage-1',
+            backupStorageName: STORAGE_NAMES[0],
             enabled: true,
             name: 'backup-1',
             schedule: '0 * * * *',
@@ -45,11 +44,14 @@ test.describe('DB Cluster Restore to the new cluster', () => {
     });
   });
 
-  test.afterEach(async ({ request }) => {
-    await deleteDbClusterFn(request, dbClusterName);
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/databases');
   });
 
-  test('DB cluster list restore action', async ({ page }) => {
+  test.afterAll(async ({ request }) => {
+    await deleteDbClusterFn(request, dbClusterName);
+  });
+  test('DB cluster list restore action', async ({ page }, {}) => {
     await findDbAndClickActions(page, dbClusterName, 'Create DB from a backup');
 
     await expect(
@@ -59,7 +61,7 @@ test.describe('DB Cluster Restore to the new cluster', () => {
     ).toBeVisible();
   });
 
-  test('DB cluster detail restore action', async ({ page }) => {
+  test('DB cluster detail restore action', async ({ page }, { testId }) => {
     await findDbAndClickRow(page, dbClusterName);
     const actionButton = page.getByTestId('actions-button');
     await actionButton.click();
diff --git a/ui/apps/everest/.e2e/global.setup.ts b/ui/apps/everest/.e2e/global.setup.ts
index ff1772123..c31eb90eb 100644
--- a/ui/apps/everest/.e2e/global.setup.ts
+++ b/ui/apps/everest/.e2e/global.setup.ts
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { test as setup, expect } from '@playwright/test';
+import { test as setup, APIResponse } from '@playwright/test';
 import 'dotenv/config';
 import { STORAGE_NAMES } from './constants';
 import { getTokenFromLocalStorage } from './utils/localStorage';
@@ -26,37 +26,66 @@ const {
   EVEREST_LOCATION_URL,
 } = process.env;
 
+const doBackupCall = async (fn: () => Promise<APIResponse>, retries = 3) => {
+  if (retries === 0) {
+    return Promise.reject();
+  }
+
+  try {
+    const response = await fn();
+    const statusText = await response.json();
+    const ok = response.ok();
+
+    if (ok) {
+      return Promise.resolve();
+    }
+
+    if (statusText && statusText.message) {
+      if (statusText.message.includes('already exists')) {
+        return Promise.resolve();
+      } else if (statusText.message.includes('Could not read')) {
+        if (retries > 0) {
+          return doBackupCall(fn, retries - 1);
+        }
+      }
+    }
+    return Promise.reject();
+  } catch (error) {
+    return Promise.reject();
+  }
+};
+
 setup('Backup storages', async ({ request }) => {
   const token = await getTokenFromLocalStorage();
   const namespaces = await getNamespacesFn(token, request);
-  const promises = [];
+  const promises: Promise<any>[] = [];
 
   STORAGE_NAMES.forEach(async (storage) => {
     promises.push(
-      request.post('/v1/backup-storages/', {
-        data: {
-          name: storage,
-          description: 'CI test bucket',
-          type: 's3',
-          bucketName: EVEREST_LOCATION_BUCKET_NAME,
-          secretKey: EVEREST_LOCATION_SECRET_KEY,
-          accessKey: EVEREST_LOCATION_ACCESS_KEY,
-          allowedNamespaces: [namespaces[0]],
-          url: EVEREST_LOCATION_URL,
-          region: EVEREST_LOCATION_REGION,
-          verifyTLS: false,
-          forcePathStyle: false,
-        },
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
-      })
+      doBackupCall(() =>
+        request.post('/v1/backup-storages/', {
+          data: {
+            name: storage,
+            description: 'CI test bucket',
+            type: 's3',
+            bucketName: EVEREST_LOCATION_BUCKET_NAME,
+            secretKey: EVEREST_LOCATION_SECRET_KEY,
+            accessKey: EVEREST_LOCATION_ACCESS_KEY,
+            allowedNamespaces: [namespaces[0]],
+            url: EVEREST_LOCATION_URL,
+            region: EVEREST_LOCATION_REGION,
+            verifyTLS: false,
+            forcePathStyle: false,
+          },
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        })
+      )
     );
   });
 
-  await (
-    await Promise.all(promises)
-  ).map((response) => expect(response.ok()).toBeTruthy());
+  await Promise.all(promises);
 });
 
 setup('Close modal permanently', async ({ page }) => {
diff --git a/ui/apps/everest/.e2e/global.teardown.ts b/ui/apps/everest/.e2e/global.teardown.ts
index 338eb3cf3..0bc7ed2e9 100644
--- a/ui/apps/everest/.e2e/global.teardown.ts
+++ b/ui/apps/everest/.e2e/global.teardown.ts
@@ -32,9 +32,7 @@ setup.describe.serial('Teardown', () => {
       );
     });
 
-    await (
-      await Promise.all(promises)
-    ).map((response) => expect(response.ok()).toBeTruthy());
+    await Promise.all(promises);
   });
 
   // setup('Delete monitoring instances', async ({ request }) => {
diff --git a/ui/apps/everest/.e2e/multinamespaces/storage-location.e2e.ts b/ui/apps/everest/.e2e/multinamespaces/storage-location.e2e.ts
index adb7f103d..004c31476 100644
--- a/ui/apps/everest/.e2e/multinamespaces/storage-location.e2e.ts
+++ b/ui/apps/everest/.e2e/multinamespaces/storage-location.e2e.ts
@@ -86,6 +86,7 @@ test.describe.serial('Namespaces: Backup Storage availability', () => {
     await page
       .getByRole('option', { name: EVEREST_CI_NAMESPACES.PXC_ONLY })
       .click();
+    await expect(page.getByTestId('mysql-toggle-button')).toBeVisible();
 
     // Resources Step
     await moveForward(page);
diff --git a/ui/apps/everest/.e2e/settings/monitoring-list.e2e.ts b/ui/apps/everest/.e2e/settings/monitoring-list.e2e.ts
index 2e9591b7c..900bf06e3 100644
--- a/ui/apps/everest/.e2e/settings/monitoring-list.e2e.ts
+++ b/ui/apps/everest/.e2e/settings/monitoring-list.e2e.ts
@@ -15,6 +15,7 @@
 
 import { expect, test } from '@playwright/test';
 import { findRowAndClickActions } from '../utils/table';
+import { EVEREST_CI_NAMESPACES } from '../constants';
 const { MONITORING_URL, MONITORING_USER, MONITORING_PASSWORD } = process.env;
 
 test.describe.serial('Monitoring List', () => {
@@ -29,6 +30,9 @@ test.describe.serial('Monitoring List', () => {
     await page.getByTestId('text-input-name').fill(monitoringEndpointName);
     const namespaces = page.getByTestId('text-input-allowed-namespaces');
     await namespaces.click();
+    await expect(
+      page.getByText(EVEREST_CI_NAMESPACES.EVEREST_UI)
+    ).toBeVisible();
     await page.getByRole('option').last().click();
     await page.getByTestId('text-input-url').fill(MONITORING_URL);
     await page.getByTestId('text-input-user').fill(MONITORING_USER);
diff --git a/ui/apps/everest/.e2e/settings/namespaces-list.e2e.ts b/ui/apps/everest/.e2e/settings/namespaces-list.e2e.ts
index 3423ddeca..53afd2354 100644
--- a/ui/apps/everest/.e2e/settings/namespaces-list.e2e.ts
+++ b/ui/apps/everest/.e2e/settings/namespaces-list.e2e.ts
@@ -16,6 +16,7 @@
 import { test, expect } from '@playwright/test';
 import { getTokenFromLocalStorage } from '../utils/localStorage';
 import { getNamespacesFn } from '../utils/namespaces';
+import { EVEREST_CI_NAMESPACES } from '../constants';
 
 test.describe('Namespaces List', () => {
   let namespaces = [];
@@ -33,8 +34,12 @@ test.describe('Namespaces List', () => {
     page,
   }) => {
     await page.goto('/settings/namespaces');
+    await expect(page.getByText('Operator')).toBeVisible();
+    await expect(page.getByText('No namespaces added')).not.toBeVisible();
     const rows = page.locator('.MuiTableRow-root');
-    await expect(rows.first()).toBeVisible();
+    await expect(
+      page.getByText(EVEREST_CI_NAMESPACES.EVEREST_UI)
+    ).toBeVisible();
     expect(await rows.count()).toBe(5);
     expect(await page.getByRole('row', { name: 'pxc' }).count()).toBe(2);
     expect(await page.getByRole('row', { name: 'psmdb' }).count()).toBe(2);
diff --git a/ui/apps/everest/.e2e/utils/db-clusters-list.ts b/ui/apps/everest/.e2e/utils/db-clusters-list.ts
index 6fe9f229e..4ad95e449 100644
--- a/ui/apps/everest/.e2e/utils/db-clusters-list.ts
+++ b/ui/apps/everest/.e2e/utils/db-clusters-list.ts
@@ -32,7 +32,6 @@ export const getDBClustersList = async (
 
 export const findDbAndClickRow = async (page: Page, dbName: string) => {
   const dbRow = page.getByRole('row').filter({ hasText: dbName });
-  page.getByTestId(`${dbName}-status`).filter({ hasText: 'Initializing' });
 
   await dbRow.click();
 };
diff --git a/ui/apps/everest/.e2e/utils/table.ts b/ui/apps/everest/.e2e/utils/table.ts
index 143e95929..9038ace7b 100644
--- a/ui/apps/everest/.e2e/utils/table.ts
+++ b/ui/apps/everest/.e2e/utils/table.ts
@@ -1,4 +1,4 @@
-import { Page } from '@playwright/test';
+import { Page, expect } from '@playwright/test';
 
 export const findRowAndClickActions = async (
   page: Page,
@@ -16,3 +16,10 @@ export const findRowAndClickActions = async (
     await page.getByRole('menuitem', { name: nameOfAction }).click();
   }
 };
+
+// TODO remove after DB Cluster's PATCH method is implemented
+export const waitForInitializingState = async (page: Page, name: string) => {
+  const dbRow = page.getByRole('row').filter({ hasText: name });
+  await expect(dbRow).toBeVisible();
+  await expect(dbRow.getByText('Unknown')).not.toBeVisible({ timeout: 15000 });
+};
diff --git a/ui/apps/everest/src/pages/database-form/database-form-side-drawer/DatabaseFormSideDrawer.tsx b/ui/apps/everest/src/pages/database-form/database-form-side-drawer/DatabaseFormSideDrawer.tsx
index 0243bf40c..7e86107f4 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-side-drawer/DatabaseFormSideDrawer.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-side-drawer/DatabaseFormSideDrawer.tsx
@@ -8,6 +8,7 @@ const DatabaseFormSideDrawer = ({
   activeStep,
   longestAchievedStep,
   handleSectionEdit,
+  disabled,
 }: DatabaseFormSideDrawerProps) => {
   const theme = useTheme();
   const { isDesktop } = useActiveBreakpoint();
@@ -15,6 +16,7 @@ const DatabaseFormSideDrawer = ({
   const PreviewContent = useMemo(
     () => (
       <DatabasePreview
+        disabled={disabled}
         activeStep={activeStep}
         longestAchievedStep={longestAchievedStep}
         onSectionEdit={handleSectionEdit}
diff --git a/ui/apps/everest/src/pages/database-form/database-form-side-drawer/DatabaseFormSideDrawer.types.ts b/ui/apps/everest/src/pages/database-form/database-form-side-drawer/DatabaseFormSideDrawer.types.ts
index b2c694602..65fbd7bf0 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-side-drawer/DatabaseFormSideDrawer.types.ts
+++ b/ui/apps/everest/src/pages/database-form/database-form-side-drawer/DatabaseFormSideDrawer.types.ts
@@ -1,5 +1,6 @@
 export type DatabaseFormSideDrawerProps = {
   activeStep: number;
   longestAchievedStep: number;
+  disabled: boolean;
   handleSectionEdit: (section: number) => void;
 };
diff --git a/ui/apps/everest/src/pages/database-form/database-form.tsx b/ui/apps/everest/src/pages/database-form/database-form.tsx
index a4ed3d339..8202e5ae6 100644
--- a/ui/apps/everest/src/pages/database-form/database-form.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form.tsx
@@ -43,7 +43,11 @@ export const DatabasePage = () => {
   const { state } = useLocation();
   const { isDesktop } = useActiveBreakpoint();
   const mode = useDatabasePageMode();
-  const { defaultValues, dbClusterData } = useDatabasePageDefaultValues(mode);
+  const {
+    defaultValues,
+    dbClusterData,
+    isFetching: loadingClusterValues,
+  } = useDatabasePageDefaultValues(mode);
 
   const validationSchema = useDbValidationSchema(activeStep);
 
@@ -174,6 +178,7 @@ export const DatabasePage = () => {
             handlePreviousStep={handleBack}
           />
           <DatabaseFormSideDrawer
+            disabled={loadingClusterValues}
             activeStep={activeStep}
             longestAchievedStep={longestAchievedStep}
             handleSectionEdit={handleSectionEdit}
diff --git a/ui/apps/everest/src/pages/database-form/database-preview/database-preview.tsx b/ui/apps/everest/src/pages/database-form/database-preview/database-preview.tsx
index 943a3e59c..a41b1cba2 100644
--- a/ui/apps/everest/src/pages/database-form/database-preview/database-preview.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-preview/database-preview.tsx
@@ -12,6 +12,7 @@ export const DatabasePreview = ({
   activeStep,
   longestAchievedStep,
   onSectionEdit = () => {},
+  disabled,
   sx,
   ...stackProps
 }: DatabasePreviewProps) => {
@@ -37,6 +38,7 @@ export const DatabasePreview = ({
               hasBeenReached={longestAchievedStep >= idx || mode === 'edit'}
               active={activeStep === idx}
               onEditClick={() => onSectionEdit(idx + 1)}
+              disabled={disabled}
               sx={{
                 mt: idx === 0 ? 2 : 0,
               }}
diff --git a/ui/apps/everest/src/pages/database-form/database-preview/database-preview.types.ts b/ui/apps/everest/src/pages/database-form/database-preview/database-preview.types.ts
index 0c40bce71..6c3a84ebe 100644
--- a/ui/apps/everest/src/pages/database-form/database-preview/database-preview.types.ts
+++ b/ui/apps/everest/src/pages/database-form/database-preview/database-preview.types.ts
@@ -19,6 +19,7 @@ export type DatabasePreviewProps = {
   activeStep: number;
   longestAchievedStep: number;
   onSectionEdit?: (order: number) => void;
+  disabled?: boolean;
 } & StackProps;
 
 export type PreviewSectionProps = {
@@ -27,6 +28,7 @@ export type PreviewSectionProps = {
   children: React.ReactNode;
   active?: boolean;
   hasBeenReached?: boolean;
+  disabled?: boolean;
   onEditClick?: () => void;
 } & StackProps;
 
diff --git a/ui/apps/everest/src/pages/database-form/database-preview/preview-section.tsx b/ui/apps/everest/src/pages/database-form/database-preview/preview-section.tsx
index ae078d7ec..2c0e285ce 100644
--- a/ui/apps/everest/src/pages/database-form/database-preview/preview-section.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-preview/preview-section.tsx
@@ -14,6 +14,7 @@ export const PreviewSection = ({
   children,
   hasBeenReached = false,
   active = false,
+  disabled,
   sx,
   ...stackProps
 }: PreviewSectionProps) => {
@@ -59,6 +60,8 @@ export const PreviewSection = ({
               position: 'absolute',
               top: theme.spacing(-1),
             }}
+            color="primary"
+            disabled={disabled}
             onClick={onEditClick}
             data-testid={`button-edit-preview-${kebabize(
               title.replace(/\s/g, '')
@@ -66,7 +69,6 @@ export const PreviewSection = ({
           >
             <EditOutlinedIcon
               fontSize="small"
-              color="primary"
               sx={{
                 verticalAlign: 'text-bottom',
               }}
diff --git a/ui/apps/everest/src/pages/settings/monitoring-endpoints/monitoring-endpoints.tsx b/ui/apps/everest/src/pages/settings/monitoring-endpoints/monitoring-endpoints.tsx
index ed5780493..26cebb400 100644
--- a/ui/apps/everest/src/pages/settings/monitoring-endpoints/monitoring-endpoints.tsx
+++ b/ui/apps/everest/src/pages/settings/monitoring-endpoints/monitoring-endpoints.tsx
@@ -28,7 +28,11 @@ export const MonitoringEndpoints = () => {
   const [openDeleteDialog, setOpenDeleteDialog] = useState(false);
   const [selectedInstance, setSelectedInstance] =
     useState<MonitoringInstance>();
-  const { data: monitoringInstances = [] } = useMonitoringInstancesList();
+  const {
+    data: monitoringInstances = [],
+    isFetching: loadingMonitoringEndpoint,
+  } = useMonitoringInstancesList();
+
   const { mutate: createMonitoringInstance, isPending: creatingInstance } =
     useCreateMonitoringInstance();
   const { mutate: deleteMonitoringInstance, isPending: removingInstance } =
@@ -155,6 +159,9 @@ export const MonitoringEndpoints = () => {
         hideExpandAllIcon
         data={monitoringInstances}
         columns={columns}
+        state={{
+          isLoading: loadingMonitoringEndpoint,
+        }}
         enableRowActions
         noDataMessage="No monitoring endpoint added"
         renderTopToolbarCustomActions={() => (

From 19db3adf76bb8011b471104324a755fdc08991be Mon Sep 17 00:00:00 2001
From: Alexander Volkov <117294450+X6uddy@users.noreply.github.com>
Date: Thu, 16 May 2024 13:27:27 +0300
Subject: [PATCH 10/14] =?UTF-8?q?[UI]=20EVEREST-1005-Expand-divider-in-tab?=
 =?UTF-8?q?s-component=20changing=20the=20width=20=E2=80=A6=20(#242)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [UI]EVEREST-1005-Expand-divider-in-tabs-component changing the width of the borderBottom
---------
Co-authored-by: Fábio Silva <ffjs1993@gmail.com>
Co-authored-by: Danila <officialdannisimo@gmail.com>
Co-authored-by: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
---
 .../src/pages/db-cluster-details/db-cluster-details.tsx       | 1 -
 ui/apps/everest/src/pages/settings/settings.tsx               | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ui/apps/everest/src/pages/db-cluster-details/db-cluster-details.tsx b/ui/apps/everest/src/pages/db-cluster-details/db-cluster-details.tsx
index 27774d9ed..7ba4463ad 100644
--- a/ui/apps/everest/src/pages/db-cluster-details/db-cluster-details.tsx
+++ b/ui/apps/everest/src/pages/db-cluster-details/db-cluster-details.tsx
@@ -93,7 +93,6 @@ export const DbClusterDetails = () => {
           borderBottom: 1,
           borderColor: 'divider',
           mb: 1,
-          width: 'fit-content',
         }}
       >
         <Tabs
diff --git a/ui/apps/everest/src/pages/settings/settings.tsx b/ui/apps/everest/src/pages/settings/settings.tsx
index 01b195e39..1e21b0d18 100644
--- a/ui/apps/everest/src/pages/settings/settings.tsx
+++ b/ui/apps/everest/src/pages/settings/settings.tsx
@@ -14,9 +14,7 @@ export const Settings = () => {
 
   return (
     <Box sx={{ width: '100%' }}>
-      <Box
-        sx={{ borderBottom: 1, borderColor: 'divider', width: 'fit-content' }}
-      >
+      <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
         <Tabs
           value={currentTab}
           variant="scrollable"

From df5ae0c2d67a2d7ca1cedcb0914c017e140065ea Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Thu, 16 May 2024 18:20:01 +0400
Subject: [PATCH 11/14] EVEREST-953-backups-and-PITR-dbwizard-combining: e2e
 tests fix

---
 .../everest/.e2e/multinamespaces/monitoring.e2e.ts  | 13 ++-----------
 .../.e2e/multinamespaces/storage-location.e2e.ts    |  3 ---
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/ui/apps/everest/.e2e/multinamespaces/monitoring.e2e.ts b/ui/apps/everest/.e2e/multinamespaces/monitoring.e2e.ts
index 83892df4b..240b6c89b 100644
--- a/ui/apps/everest/.e2e/multinamespaces/monitoring.e2e.ts
+++ b/ui/apps/everest/.e2e/multinamespaces/monitoring.e2e.ts
@@ -18,7 +18,7 @@ import {
   createBackupStorageFn,
   deleteStorageLocationFn,
 } from '../utils/backup-storage';
-import { moveForward } from '../utils/db-wizard';
+import { goToStep } from '../utils/db-wizard';
 import { EVEREST_CI_NAMESPACES } from '../constants';
 import { getTokenFromLocalStorage } from '../utils/localStorage';
 import { deleteMonitoringInstance } from '../utils/monitoring-instance';
@@ -53,16 +53,7 @@ test.describe('Namespaces: Monitoring availability', () => {
     // setting everest-pxc namespace
     await setNamespace(page, EVEREST_CI_NAMESPACES.PXC_ONLY);
 
-    // Resources Step
-    await moveForward(page);
-    // Backups step
-    await moveForward(page);
-    // PITR step
-    await moveForward(page);
-    // Advanced Configuration step
-    await moveForward(page);
-    // Monitoring Step
-    await moveForward(page);
+    await goToStep(page, 'monitoring');
 
     // check monitoring is not available
     await expect(page.getByTestId('monitoring-warning')).toBeVisible();
diff --git a/ui/apps/everest/.e2e/multinamespaces/storage-location.e2e.ts b/ui/apps/everest/.e2e/multinamespaces/storage-location.e2e.ts
index 004c31476..aa4a9d56c 100644
--- a/ui/apps/everest/.e2e/multinamespaces/storage-location.e2e.ts
+++ b/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');

From f9f3069b342e15a82c03230d1edf84a115af5531 Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Tue, 21 May 2024 18:27:40 +0400
Subject: [PATCH 12/14] EVEREST-953-backups-and-PITR-dbwizard-combining: fix
 monitoring test failing

---
 .../everest/.e2e/multinamespaces/monitoring.e2e.ts    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/apps/everest/.e2e/multinamespaces/monitoring.e2e.ts b/ui/apps/everest/.e2e/multinamespaces/monitoring.e2e.ts
index 240b6c89b..98e351ec3 100644
--- a/ui/apps/everest/.e2e/multinamespaces/monitoring.e2e.ts
+++ b/ui/apps/everest/.e2e/multinamespaces/monitoring.e2e.ts
@@ -18,7 +18,7 @@ import {
   createBackupStorageFn,
   deleteStorageLocationFn,
 } from '../utils/backup-storage';
-import { goToStep } from '../utils/db-wizard';
+import { moveForward } from '../utils/db-wizard';
 import { EVEREST_CI_NAMESPACES } from '../constants';
 import { getTokenFromLocalStorage } from '../utils/localStorage';
 import { deleteMonitoringInstance } from '../utils/monitoring-instance';
@@ -53,7 +53,14 @@ test.describe('Namespaces: Monitoring availability', () => {
     // setting everest-pxc namespace
     await setNamespace(page, EVEREST_CI_NAMESPACES.PXC_ONLY);
 
-    await goToStep(page, 'monitoring');
+    // Resources Step
+    await moveForward(page);
+    // Backups step
+    await moveForward(page);
+    // Advanced Configuration step
+    await moveForward(page);
+    // Monitoring Step
+    await moveForward(page);
 
     // check monitoring is not available
     await expect(page.getByTestId('monitoring-warning')).toBeVisible();

From 6049cf2a96aca23b8abbc76a7096505cfd4dd07d Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Wed, 22 May 2024 13:59:57 +0400
Subject: [PATCH 13/14] EVEREST-953-backups-and-PITR-dbwizard-combining: fix
 initializing

---
 .../.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
index f143f67ee..e125760db 100644
--- a/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
+++ b/ui/apps/everest/.e2e/db-cluster/db-wizard/edit-db-cluster/pitr.e2e.ts
@@ -183,6 +183,11 @@ test.describe.serial('MongoDb PITR editing', async () => {
     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,
   }) => {

From 4a064e8350b421e78f2ebd3379c6aeb4633393c6 Mon Sep 17 00:00:00 2001
From: solovevayaroslavna <iaroslavna.kozlova@simbirsoft.com>
Date: Mon, 27 May 2024 16:38:02 +0400
Subject: [PATCH 14/14] EVEREST-953-backups-and-PITR-dbwizard-combining: format

---
 .../steps/backups/backups.tsx                 | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/backups.tsx b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/backups.tsx
index aeeea6f42..ff1f78706 100644
--- a/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/backups.tsx
+++ b/ui/apps/everest/src/pages/database-form/database-form-body/steps/backups/backups.tsx
@@ -46,16 +46,16 @@ export const Backups = () => {
           <Skeleton />
         </>
       ) : (
-              <>
-                  {backupStorages?.length > 0 ? (
-                      <FormGroup sx={{ mt: 3 }}>
-                          <Schedules />
-                          <PITR />
-                      </FormGroup>
-                  ) : (
-                      <BackupsActionableAlert namespace={selectedNamespace} />
-                  )}
-              </>
+        <>
+          {backupStorages?.length > 0 ? (
+            <FormGroup sx={{ mt: 3 }}>
+              <Schedules />
+              <PITR />
+            </FormGroup>
+          ) : (
+            <BackupsActionableAlert namespace={selectedNamespace} />
+          )}
+        </>
       )}
     </Box>
   );