Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI]Everest 1004 max width for content container #287

Draft
wants to merge 16 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6fe0f7a
[UI]EVEREST-1004-maxWidth-for-content-container changed the maximum w…
X6uddy Apr 26, 2024
463e946
EVEREST-1004-maxWidth-for-content-container removing unused styles
X6uddy Apr 29, 2024
1a457ed
EVEREST-1004-maxWidth-for-content-container setting the maxWidth of 1…
X6uddy Apr 29, 2024
1c73793
Merge branch 'main' into EVEREST-1004-maxWidth-for-content-container
solovevayaroslavna May 13, 2024
7372e4f
Merge branch 'main' into EVEREST-1004-maxWidth-for-content-container
solovevayaroslavna May 16, 2024
2cd7f68
Merge branch 'main' into EVEREST-1004-maxWidth-for-content-container
solovevayaroslavna May 16, 2024
ebb0ebf
Merge branch 'main' into EVEREST-1004-maxWidth-for-content-container
solovevayaroslavna May 16, 2024
995a399
Merge branch 'main' into EVEREST-1004-maxWidth-for-content-container
fabio-silva May 17, 2024
2d0531d
Merge branch 'main' into EVEREST-1004-maxWidth-for-content-container
fabio-silva May 25, 2024
1e07fcc
Merge branch 'main' into EVEREST-1004-maxWidth-for-content-container
Daninda Jun 19, 2024
cc2bf8f
EVEREST-1004 design review fix
Daninda Jun 24, 2024
02680d7
Merge remote-tracking branch 'origin/EVEREST-1004-maxWidth-for-conten…
Daninda Jun 24, 2024
f20945b
EVEREST-1004 removing min monitoring instance column size in db table
Daninda Jun 25, 2024
41e62da
Merge branch 'main' into EVEREST-1004-maxWidth-for-content-container
Daninda Jun 25, 2024
fe1ada3
Merge branch 'main' into EVEREST-1004-maxWidth-for-content-container
solovevayaroslavna Jul 1, 2024
e83e2b3
Merge branch 'main' into EVEREST-1004-maxWidth-for-content-container
fabio-silva Jul 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
import { Divider, Drawer, Toolbar, useTheme } from '@mui/material';
import { Divider, Drawer, useTheme } from '@mui/material';
import { useActiveBreakpoint } from 'hooks/utils/useActiveBreakpoint';
import { DatabasePreview } from '../database-preview/database-preview';
import { DatabaseFormSideDrawerProps } from './DatabaseFormSideDrawer.types';
Expand All @@ -21,7 +21,6 @@ const DatabaseFormSideDrawer = ({
longestAchievedStep={longestAchievedStep}
onSectionEdit={handleSectionEdit}
sx={{
mt: 2,
...(!isDesktop && {
padding: 0,
}),
Expand All @@ -37,19 +36,15 @@ const DatabaseFormSideDrawer = ({
variant="permanent"
anchor="right"
sx={{
// MuiDrawer-paper will take 25% of the whole screen because it has a "fixed" positioning
// Hence, we must use vw here to have the same calculation
// We subtract the padding
width: (theme) => `calc(25vw - ${theme.spacing(4)})`,
width: '25%',
flexShrink: 0,
ml: 3,
[`& .MuiDrawer-paper`]: {
width: '25%',
position: 'relative',
boxSizing: 'border-box',
},
}}
>
<Toolbar />
{PreviewContent}
</Drawer>
);
Expand Down
6 changes: 3 additions & 3 deletions ui/apps/everest/src/pages/database-form/database-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import { useEffect, useState } from 'react';
import { useLocation } from 'react-router-dom';
import { zodResolver } from '@hookform/resolvers/zod';
import { Stack, Step, StepLabel } from '@mui/material';
import { Box, Stack, Step, StepLabel } from '@mui/material';
import { Stepper } from '@percona/ui-lib';
import { FormProvider, SubmitHandler, useForm } from 'react-hook-form';
import { useCreateDbCluster } from 'hooks/api/db-cluster/useCreateDbCluster';
Expand Down Expand Up @@ -156,7 +156,7 @@ export const DatabasePage = () => {
return formSubmitted ? (
<ConfirmationScreen />
) : (
<>
<Box sx={{ maxWidth: '1280px', mx: 'auto' }}>
<Stepper noConnector activeStep={activeStep} sx={{ marginBottom: 4 }}>
{steps.map((_, idx) => (
<Step key={`step-${idx + 1}`}>
Expand Down Expand Up @@ -189,6 +189,6 @@ export const DatabasePage = () => {
open={cancelModalOpen}
onClose={() => setCancelModalOpen(false)}
/>
</>
</Box>
);
};
11 changes: 10 additions & 1 deletion ui/apps/everest/src/pages/databases/DbClusterView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,16 @@ export const DbClusterView = () => {
[]
);
return (
<Stack direction="column" alignItems="center">
<Stack
direction="column"
alignItems="center"
sx={{
width: 'fit-content',
minWidth: 'min(100%, 1280px)',
maxWidth: '100%',
mx: 'auto',
}}
>
<Box sx={{ width: '100%' }}>
<Table
tableName="dbClusterView"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const DbClusterDetails = () => {

// All clear, show the cluster data
return (
<Box sx={{ width: '100%' }}>
<Box sx={{ maxWidth: '1280px', mx: 'auto' }}>
<Box
sx={{
display: 'flex',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
getOperatorVersions,
} from 'api/dbEngineApi';
import EngineLowerContent from './engine-lower-content';
import { Box } from '@mui/material';

const NamespaceDetails = () => {
const queryClient = useQueryClient();
Expand Down Expand Up @@ -135,7 +136,7 @@ const NamespaceDetails = () => {
}

return (
<>
<Box sx={{ maxWidth: '1280px', mx: 'auto' }}>
<BackNavigationText
text={namespaceName}
onBackClick={() => navigate('/settings/namespaces')}
Expand Down Expand Up @@ -192,7 +193,7 @@ const NamespaceDetails = () => {
onClose={() => setModalOpen(false)}
onConfirm={() => performUpgrade(selectedEngine!.name)}
/>
</>
</Box>
);
};

Expand Down
2 changes: 1 addition & 1 deletion ui/apps/everest/src/pages/settings/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const Settings = () => {
}

return (
<Box sx={{ width: '100%' }}>
<Box sx={{ maxWidth: '1280px', mx: 'auto' }}>
<Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
<Tabs
value={currentTab}
Expand Down
Loading