Skip to content

Commit d94ad75

Browse files
BaalmartBaalmart
authored
Merge pull request #1832 from airqo-platform/staging
move to production
2 parents 77d4f68 + 3f404a8 commit d94ad75

File tree

4 files changed

+85
-60
lines changed

4 files changed

+85
-60
lines changed

‎k8s/inventory/values-prod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
replicaCount: 2
22
image:
33
repository: eu.gcr.io/airqo-250220/airqo-inventory
4-
tag: prod-ead7c21a-1705327678
4+
tag: prod-77d4f68f-1706082903
55
pullPolicy: Always
66
imagePullSecrets: []
77
nameOverride: ''

‎k8s/inventory/values-stage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
replicaCount: 2
22
image:
33
repository: eu.gcr.io/airqo-250220/airqo-stage-inventory
4-
tag: stage-fcff95f3-1705327162
4+
tag: stage-3cacf56a-1706082804
55
pullPolicy: Always
66
imagePullSecrets: []
77
nameOverride: ''

‎netmanager/src/views/layouts/common/Sidebar/Sidebar.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,7 @@ const allMainPages = [
105105
},
106106
{
107107
title: 'Export data',
108-
href: '/export-data',
109-
nested: true,
110-
nestItems: [
111-
{ title: 'Export Options', href: '/export-data/options' },
112-
{ title: 'Scheduled', href: '/export-data/scheduled' }
113-
],
108+
href: '/export-data/options',
114109
icon: <CloudDownloadIcon />
115110
},
116111
{
@@ -366,7 +361,8 @@ const Sidebar = (props) => {
366361
classes={{ paper: classes.drawer }}
367362
onClose={onClose}
368363
open={open}
369-
variant={variant}>
364+
variant={variant}
365+
>
370366
<div {...rest} className={clsx(classes.root, className)}>
371367
<Profile />
372368
<Divider className={classes.divider} />

‎netmanager/src/views/pages/ExportData/index.js

Lines changed: 80 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ const ExportData = (props) => {
246246
hidden={value !== index}
247247
id={`data-export-tabpanel-${index}`}
248248
aria-labelledby={`data-export-tab-${index}`}
249-
{...other}>
249+
{...other}
250+
>
250251
{value === index && <div sx={{ p: 3 }}>{children}</div>}
251252
</div>
252253
);
@@ -626,9 +627,10 @@ const ExportData = (props) => {
626627
paddingBottom={'12px'}
627628
color={'grey.700'}
628629
fontSize={'14px'}
629-
fontWeight={300}>
630-
Customize the data you want to download. We recommend scheduling your downloads for bulky
631-
data/time periods greater than a month to avoid timeouts.
630+
fontWeight={300}
631+
>
632+
Customize the data you want to download. We recommend downloading data for shorter time
633+
periods like a week or a month to avoid timeouts.
632634
</Box>
633635

634636
<Grid container spacing={4}>
@@ -638,7 +640,8 @@ const ExportData = (props) => {
638640
className={clsx(classes.root, className)}
639641
style={{
640642
overflow: 'visible'
641-
}}>
643+
}}
644+
>
642645
<Tabs
643646
value={value}
644647
onChange={handleChangeTabPanel}
@@ -649,7 +652,8 @@ const ExportData = (props) => {
649652
classes={{
650653
root: classes.tabs, // Apply custom styles to the root element
651654
indicator: classes.indicator // Apply custom styles to the indicator element
652-
}}>
655+
}}
656+
>
653657
<Tab disableTouchRipple label="Export by Sites" {...a11yProps(0)} />
654658
<Tab disableTouchRipple label="Export by Devices" {...a11yProps(1)} />
655659
<Tab disableTouchRipple label="Export by AirQlouds" {...a11yProps(2)} />
@@ -766,24 +770,30 @@ const ExportData = (props) => {
766770

767771
<Divider />
768772
<CardActions>
769-
<Box display="flex" justifyContent="center" width="100%" className="step-2">
773+
<Box
774+
display={{
775+
xs: 'block',
776+
md: 'flex'
777+
}}
778+
justifyContent="center"
779+
width={'100%'}
780+
className="step-2"
781+
>
770782
<Button
771783
color="primary"
772-
variant="outlined"
784+
variant="contained"
773785
type="submit"
774786
style={{ marginRight: '15px' }}
775-
disabled={disableDownloadBtn('sites')}>
787+
disabled={disableDownloadBtn('sites')}
788+
>
776789
{' '}
777790
Download Data
778791
</Button>
779-
<Button
780-
color="primary"
781-
variant="outlined"
782-
onClick={scheduleExportData}
783-
disabled={disableDownloadBtn('sites')}>
784-
{' '}
785-
Schedule Download
786-
</Button>
792+
{disableDownloadBtn('sites') && (
793+
<p style={{ marginTop: '10px', color: 'red' }}>
794+
{`Please fill in all the required fields`}
795+
</p>
796+
)}
787797
</Box>
788798
</CardActions>
789799
</form>
@@ -904,24 +914,30 @@ const ExportData = (props) => {
904914

905915
<Divider />
906916
<CardActions>
907-
<Box display="flex" justifyContent="center" width="100%">
917+
<Box
918+
display={{
919+
xs: 'block',
920+
md: 'flex'
921+
}}
922+
justifyContent="center"
923+
width={'100%'}
924+
className="step-2"
925+
>
908926
<Button
909927
color="primary"
910-
variant="outlined"
928+
variant="contained"
911929
type="submit"
912930
style={{ marginRight: '15px' }}
913-
disabled={disableDownloadBtn('devices')}>
931+
disabled={disableDownloadBtn('devices')}
932+
>
914933
{' '}
915934
Download Data
916935
</Button>
917-
<Button
918-
color="primary"
919-
variant="outlined"
920-
onClick={scheduleExportData}
921-
disabled={disableDownloadBtn('devices')}>
922-
{' '}
923-
Schedule Download
924-
</Button>
936+
{disableDownloadBtn('devices') && (
937+
<p style={{ marginTop: '10px', color: 'red' }}>
938+
{`Please fill in all the required fields`}
939+
</p>
940+
)}
925941
</Box>
926942
</CardActions>
927943
</form>
@@ -1041,24 +1057,30 @@ const ExportData = (props) => {
10411057

10421058
<Divider />
10431059
<CardActions>
1044-
<Box display="flex" justifyContent="center" width="100%">
1060+
<Box
1061+
display={{
1062+
xs: 'block',
1063+
md: 'flex'
1064+
}}
1065+
justifyContent="center"
1066+
width={'100%'}
1067+
className="step-2"
1068+
>
10451069
<Button
10461070
color="primary"
1047-
variant="outlined"
1071+
variant="contained"
10481072
type="submit"
10491073
style={{ marginRight: '15px' }}
1050-
disabled={disableDownloadBtn('airqlouds')}>
1074+
disabled={disableDownloadBtn('airqlouds')}
1075+
>
10511076
{' '}
10521077
Download Data
10531078
</Button>
1054-
<Button
1055-
color="primary"
1056-
variant="outlined"
1057-
onClick={scheduleExportData}
1058-
disabled={disableDownloadBtn('airqlouds')}>
1059-
{' '}
1060-
Schedule Download
1061-
</Button>
1079+
{disableDownloadBtn('airqlouds') && (
1080+
<p style={{ marginTop: '10px', color: 'red' }}>
1081+
{`Please fill in all the required fields`}
1082+
</p>
1083+
)}
10621084
</Box>
10631085
</CardActions>
10641086
</form>
@@ -1178,24 +1200,30 @@ const ExportData = (props) => {
11781200

11791201
<Divider />
11801202
<CardActions>
1181-
<Box display="flex" justifyContent="center" width="100%">
1203+
<Box
1204+
display={{
1205+
xs: 'block',
1206+
md: 'flex'
1207+
}}
1208+
justifyContent="center"
1209+
width={'100%'}
1210+
className="step-2"
1211+
>
11821212
<Button
11831213
color="primary"
1184-
variant="outlined"
1214+
variant="contained"
11851215
type="submit"
11861216
style={{ marginRight: '15px' }}
1187-
disabled={disableDownloadBtn('regions')}>
1217+
disabled={disableDownloadBtn('regions')}
1218+
>
11881219
{' '}
11891220
Download Data
11901221
</Button>
1191-
<Button
1192-
color="primary"
1193-
variant="outlined"
1194-
onClick={scheduleExportData}
1195-
disabled={disableDownloadBtn('regions')}>
1196-
{' '}
1197-
Schedule Download
1198-
</Button>
1222+
{disableDownloadBtn('regions') && (
1223+
<p style={{ marginTop: '10px', color: 'red' }}>
1224+
{`Please fill in all the required fields`}
1225+
</p>
1226+
)}
11991227
</Box>
12001228
</CardActions>
12011229
</form>
@@ -1219,7 +1247,8 @@ const ExportData = (props) => {
12191247
size="small"
12201248
aria-label="close"
12211249
color="inherit"
1222-
onClick={handleClickSnackbar}>
1250+
onClick={handleClickSnackbar}
1251+
>
12231252
<CloseIcon fontSize="small" />
12241253
</IconButton>
12251254
</React.Fragment>

0 commit comments

Comments
 (0)