Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Remove scheduled downloads from export and sidebar, added error message #1831

Merged
merged 1 commit into from
Jan 25, 2024
Merged

Remove scheduled downloads from export and sidebar, added error message #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions netmanager/src/views/layouts/common/Sidebar/Sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,7 @@ const allMainPages = [
},
{
title: 'Export data',
href: '/export-data',
nested: true,
nestItems: [
{ title: 'Export Options', href: '/export-data/options' },
{ title: 'Scheduled', href: '/export-data/scheduled' }
],
href: '/export-data/options',
icon: <CloudDownloadIcon />
},
{
Expand Down Expand Up @@ -366,7 +361,8 @@ const Sidebar = (props) => {
classes={{ paper: classes.drawer }}
onClose={onClose}
open={open}
variant={variant}>
variant={variant}
>
<div {...rest} className={clsx(classes.root, className)}>
<Profile />
<Divider className={classes.divider} />
Expand Down
131 changes: 80 additions & 51 deletions netmanager/src/views/pages/ExportData/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ const ExportData = (props) => {
hidden={value !== index}
id={`data-export-tabpanel-${index}`}
aria-labelledby={`data-export-tab-${index}`}
{...other}>
{...other}
>
{value === index && <div sx={{ p: 3 }}>{children}</div>}
</div>
);
Expand Down Expand Up @@ -626,9 +627,10 @@ const ExportData = (props) => {
paddingBottom={'12px'}
color={'grey.700'}
fontSize={'14px'}
fontWeight={300}>
Customize the data you want to download. We recommend scheduling your downloads for bulky
data/time periods greater than a month to avoid timeouts.
fontWeight={300}
>
Customize the data you want to download. We recommend downloading data for shorter time
periods like a week or a month to avoid timeouts.
</Box>

<Grid container spacing={4}>
Expand All @@ -638,7 +640,8 @@ const ExportData = (props) => {
className={clsx(classes.root, className)}
style={{
overflow: 'visible'
}}>
}}
>
<Tabs
value={value}
onChange={handleChangeTabPanel}
Expand All @@ -649,7 +652,8 @@ const ExportData = (props) => {
classes={{
root: classes.tabs, // Apply custom styles to the root element
indicator: classes.indicator // Apply custom styles to the indicator element
}}>
}}
>
<Tab disableTouchRipple label="Export by Sites" {...a11yProps(0)} />
<Tab disableTouchRipple label="Export by Devices" {...a11yProps(1)} />
<Tab disableTouchRipple label="Export by AirQlouds" {...a11yProps(2)} />
Expand Down Expand Up @@ -766,24 +770,30 @@ const ExportData = (props) => {

<Divider />
<CardActions>
<Box display="flex" justifyContent="center" width="100%" className="step-2">
<Box
display={{
xs: 'block',
md: 'flex'
}}
justifyContent="center"
width={'100%'}
className="step-2"
>
<Button
color="primary"
variant="outlined"
variant="contained"
type="submit"
style={{ marginRight: '15px' }}
disabled={disableDownloadBtn('sites')}>
disabled={disableDownloadBtn('sites')}
>
{' '}
Download Data
</Button>
<Button
color="primary"
variant="outlined"
onClick={scheduleExportData}
disabled={disableDownloadBtn('sites')}>
{' '}
Schedule Download
</Button>
{disableDownloadBtn('sites') && (
<p style={{ marginTop: '10px', color: 'red' }}>
{`Please fill in all the required fields`}
</p>
)}
</Box>
</CardActions>
</form>
Expand Down Expand Up @@ -904,24 +914,30 @@ const ExportData = (props) => {

<Divider />
<CardActions>
<Box display="flex" justifyContent="center" width="100%">
<Box
display={{
xs: 'block',
md: 'flex'
}}
justifyContent="center"
width={'100%'}
className="step-2"
>
<Button
color="primary"
variant="outlined"
variant="contained"
type="submit"
style={{ marginRight: '15px' }}
disabled={disableDownloadBtn('devices')}>
disabled={disableDownloadBtn('devices')}
>
{' '}
Download Data
</Button>
<Button
color="primary"
variant="outlined"
onClick={scheduleExportData}
disabled={disableDownloadBtn('devices')}>
{' '}
Schedule Download
</Button>
{disableDownloadBtn('devices') && (
<p style={{ marginTop: '10px', color: 'red' }}>
{`Please fill in all the required fields`}
</p>
)}
</Box>
</CardActions>
</form>
Expand Down Expand Up @@ -1041,24 +1057,30 @@ const ExportData = (props) => {

<Divider />
<CardActions>
<Box display="flex" justifyContent="center" width="100%">
<Box
display={{
xs: 'block',
md: 'flex'
}}
justifyContent="center"
width={'100%'}
className="step-2"
>
<Button
color="primary"
variant="outlined"
variant="contained"
type="submit"
style={{ marginRight: '15px' }}
disabled={disableDownloadBtn('airqlouds')}>
disabled={disableDownloadBtn('airqlouds')}
>
{' '}
Download Data
</Button>
<Button
color="primary"
variant="outlined"
onClick={scheduleExportData}
disabled={disableDownloadBtn('airqlouds')}>
{' '}
Schedule Download
</Button>
{disableDownloadBtn('airqlouds') && (
<p style={{ marginTop: '10px', color: 'red' }}>
{`Please fill in all the required fields`}
</p>
)}
</Box>
</CardActions>
</form>
Expand Down Expand Up @@ -1178,24 +1200,30 @@ const ExportData = (props) => {

<Divider />
<CardActions>
<Box display="flex" justifyContent="center" width="100%">
<Box
display={{
xs: 'block',
md: 'flex'
}}
justifyContent="center"
width={'100%'}
className="step-2"
>
<Button
color="primary"
variant="outlined"
variant="contained"
type="submit"
style={{ marginRight: '15px' }}
disabled={disableDownloadBtn('regions')}>
disabled={disableDownloadBtn('regions')}
>
{' '}
Download Data
</Button>
<Button
color="primary"
variant="outlined"
onClick={scheduleExportData}
disabled={disableDownloadBtn('regions')}>
{' '}
Schedule Download
</Button>
{disableDownloadBtn('regions') && (
<p style={{ marginTop: '10px', color: 'red' }}>
{`Please fill in all the required fields`}
</p>
)}
</Box>
</CardActions>
</form>
Expand All @@ -1219,7 +1247,8 @@ const ExportData = (props) => {
size="small"
aria-label="close"
color="inherit"
onClick={handleClickSnackbar}>
onClick={handleClickSnackbar}
>
<CloseIcon fontSize="small" />
</IconButton>
</React.Fragment>
Expand Down
Loading