Skip to content

Commit 19ff0c5

Browse files
KelvinTegelaarKelvinTegelaar
authored
Merge pull request #4154 from KelvinTegelaar/dev
Dev to release
2 parents a9fadb8 + dfd4a41 commit 19ff0c5

File tree

209 files changed

+9778
-3049
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+9778
-3049
lines changed

‎cspell.json

Lines changed: 53 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,61 @@
44
"dictionaryDefinitions": [],
55
"dictionaries": [],
66
"words": [
7-
"CIPP",
8-
"CIPP-API",
9-
"Entra",
10-
"Intune",
11-
"GDAP",
12-
"OBEE",
13-
"AITM",
14-
"Passwordless",
15-
"Yubikey",
16-
"Sherweb",
17-
"Autotask",
18-
"Datto",
19-
"Syncro",
20-
"ImmyBot",
21-
"Choco",
7+
"ADMS",
8+
"AITM",
9+
"Augmentt",
10+
"Autotask",
11+
"Choco",
12+
"CIPP",
13+
"CIPP-API",
14+
"Datto",
15+
"Entra",
16+
"ESET",
17+
"GDAP",
18+
"HIBP",
19+
"Hudu",
20+
"ImmyBot",
21+
"Intune",
22+
"LCID",
23+
"OBEE",
24+
"Passwordless",
25+
"pwpush",
26+
"Rewst",
27+
"Sherweb",
28+
"Syncro",
29+
"Yubikey"
2230
],
2331
"ignoreWords": [
24-
"CIPPAPI",
25-
"locationcipp",
26-
"TNEF",
27-
"winmail",
28-
"PSTN",
32+
"Addins",
33+
"CIPPAPI",
34+
"PSTN",
35+
"TNEF",
36+
"exo_individualsharing",
37+
"exo_mailboxaudit",
38+
"exo_mailtipsenabled",
39+
"exo_outlookaddins",
40+
"exo_storageproviderrestricted",
41+
"locationcipp",
42+
"mdo_antiphishingpolicies",
43+
"mdo_autoforwardingmode",
44+
"mdo_blockmailforward",
45+
"mdo_commonattachmentsfilter",
46+
"mdo_highconfidencephishaction",
47+
"mdo_highconfidencespamaction",
48+
"mdo_phishthresholdlevel",
49+
"mdo_phisspamacation",
50+
"mdo_safeattachmentpolicy",
51+
"mdo_safeattachments",
52+
"mdo_safedocuments",
53+
"mdo_safelinksforOfficeApps",
54+
"mdo_safelinksforemail",
55+
"mdo_spam_notifications_only_for_admins",
56+
"mdo_zapmalware",
57+
"mdo_zapphish",
58+
"mdo_zapspam",
59+
"microsoftonline",
60+
"mip_search_auditlog",
61+
"winmail"
2962
],
3063
"import": []
3164
}

‎package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@
3838
"@musement/iso-duration": "^1.0.0",
3939
"@react-pdf/renderer": "4.3.0",
4040
"@reduxjs/toolkit": "2.6.1",
41+
"@tanstack/query-sync-storage-persister": "^5.76.0",
4142
"@tanstack/react-query": "^5.51.11",
4243
"@tanstack/react-query-devtools": "^5.51.11",
44+
"@tanstack/react-query-persist-client": "^5.76.0",
4345
"@tanstack/react-table": "^8.19.2",
4446
"@tiptap/core": "^2.9.1",
4547
"@tiptap/extension-heading": "^2.9.1",

‎public/assets/illustrations/undraw-into-the-night-nd84.svg

Lines changed: 1 addition & 0 deletions
Loading

‎public/version.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "7.5.3"
3-
}
2+
"version": "8.0.0"
3+
}

‎src/api/ApiCall.jsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { keepPreviousData, useInfiniteQuery, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
1+
import {
2+
keepPreviousData,
3+
useInfiniteQuery,
4+
useMutation,
5+
useQuery,
6+
useQueryClient,
7+
} from "@tanstack/react-query";
28
import axios, { isAxiosError } from "axios";
39
import { useDispatch } from "react-redux";
410
import { showToast } from "../store/toasts";
@@ -15,7 +21,7 @@ export function ApiGetCall(props) {
1521
bulkRequest = false,
1622
toast = false,
1723
onResult,
18-
staleTime = 600000, // 10 minutes
24+
staleTime = 300000,
1925
refetchOnWindowFocus = false,
2026
refetchOnMount = true,
2127
refetchOnReconnect = true,
@@ -212,7 +218,7 @@ export function ApiGetCallWithPagination({
212218
}
213219
return lastPage?.Metadata?.nextLink ? { nextLink: lastPage.Metadata.nextLink } : undefined;
214220
},
215-
staleTime: 600000, // 10 minutes
221+
staleTime: 300000,
216222
refetchOnWindowFocus: false,
217223
retry: retryFn,
218224
});

‎src/components/CippCards/CippDomainCards.jsx

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React, { useEffect, useState } from "react";
22
import {
3-
Grid,
43
Button,
54
Collapse,
65
Switch,
@@ -13,6 +12,7 @@ import {
1312
Divider,
1413
FormControlLabel,
1514
} from "@mui/material";
15+
import { Grid } from "@mui/system";
1616
import SearchIcon from "@mui/icons-material/Search";
1717
import ClearIcon from "@mui/icons-material/Clear";
1818
import SettingsIcon from "@mui/icons-material/Settings";
@@ -152,7 +152,7 @@ function DomainResultCard({ title, data, isFetching, info, type }) {
152152
? {
153153
children: (
154154
<Grid container spacing={2}>
155-
<Grid item xs={12}>
155+
<Grid item size={{ xs: 12 }}>
156156
{info}
157157
</Grid>
158158
</Grid>
@@ -182,12 +182,11 @@ function DomainResultCard({ title, data, isFetching, info, type }) {
182182
? {
183183
children: (
184184
//4 headers, "Record" and then <CippCodeBlock code={record?.Record} /> under it.
185-
<>
185+
(<>
186186
<Typography variant="h6" gutterBottom>
187187
Record:
188188
</Typography>
189189
<CippCodeBlock code={data?.Record} />
190-
191190
<CippPropertyListCard
192191
title="Settings"
193192
copyItems={true}
@@ -238,7 +237,7 @@ function DomainResultCard({ title, data, isFetching, info, type }) {
238237
value: email,
239238
}))}
240239
/>
241-
</>
240+
</>)
242241
),
243242
}
244243
: type === "SPF"
@@ -362,7 +361,7 @@ function DomainResultCard({ title, data, isFetching, info, type }) {
362361
}
363362
isFetching={isFetching}
364363
>
365-
<Grid item xs={12}>
364+
<Grid item size={{ xs: 12 }}>
366365
{info}
367366
</Grid>
368367
<CippOffCanvas visible={visible} onClose={() => setVisible(false)} {...offCanvasData} />
@@ -484,7 +483,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
484483
return (
485484
<form onSubmit={handleSubmit(onSubmit)}>
486485
<Grid container spacing={3}>
487-
<Grid item xs={fullwidth ? 12 : 4}>
486+
<Grid item size={{ xs: fullwidth ? 12 : 4 }}>
488487
<CippButtonCard
489488
title="Domain Check"
490489
cardSx={{ display: "flex", flexDirection: "column", height: "100%" }}
@@ -497,7 +496,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
497496
}
498497
>
499498
<Grid container spacing={2}>
500-
<Grid item xs={8}>
499+
<Grid item size={{ xs: 8 }}>
501500
<Controller
502501
name="domain"
503502
control={control}
@@ -506,7 +505,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
506505
)}
507506
/>
508507
</Grid>
509-
<Grid item xs={4}>
508+
<Grid item size={{ xs: 4 }}>
510509
<Button type="submit" variant="contained" startIcon={<SearchIcon />}>
511510
Check
512511
</Button>
@@ -563,7 +562,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
563562

564563
{domain && (
565564
<>
566-
<Grid item xs={12} md={gridItemSize}>
565+
<Grid item size={{ md: gridItemSize, xs: 12 }}>
567566
<DomainResultCard
568567
title="Whois Results"
569568
type="whois"
@@ -576,7 +575,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
576575
}
577576
/>
578577
</Grid>
579-
<Grid item xs={12} md={gridItemSize}>
578+
<Grid item size={{ md: gridItemSize, xs: 12 }}>
580579
<DomainResultCard
581580
title="NS Records"
582581
data={nsData}
@@ -589,10 +588,10 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
589588
}
590589
/>
591590
</Grid>
592-
<Grid item xs={12} md={gridItemSize}>
591+
<Grid item size={{ md: gridItemSize, xs: 12 }}>
593592
<MXResultsCard domain={domain} mxData={mxData} isFetching={mxLoading} />
594593
</Grid>
595-
<Grid item xs={12} md={gridItemSize}>
594+
<Grid item size={{ md: gridItemSize, xs: 12 }}>
596595
<DomainResultCard
597596
title="SPF Record"
598597
type="SPF"
@@ -611,7 +610,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
611610
}
612611
/>
613612
</Grid>
614-
<Grid item xs={12} md={gridItemSize}>
613+
<Grid item size={{ md: gridItemSize, xs: 12 }}>
615614
<DomainResultCard
616615
title="DMARC Policy"
617616
type="DMARC"
@@ -630,7 +629,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
630629
}
631630
/>
632631
</Grid>
633-
<Grid item xs={12} md={gridItemSize}>
632+
<Grid item size={{ md: gridItemSize, xs: 12 }}>
634633
<DomainResultCard
635634
title="DKIM Record"
636635
data={dkimData}
@@ -649,7 +648,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
649648
}
650649
/>
651650
</Grid>
652-
<Grid item xs={12} md={gridItemSize}>
651+
<Grid item size={{ md: gridItemSize, xs: 12 }}>
653652
<DomainResultCard
654653
title="DNSSEC"
655654
type={"DNSSEC"}
@@ -666,7 +665,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
666665
}
667666
/>
668667
</Grid>
669-
<Grid item xs={12} md={gridItemSize}>
668+
<Grid item size={{ md: gridItemSize, xs: 12 }}>
670669
<DomainResultCard
671670
title="MTA-STS"
672671
type="MTA-STS"
@@ -686,7 +685,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
686685
/>
687686
</Grid>
688687
{enableHttps && (
689-
<Grid item xs={12} md={gridItemSize}>
688+
<Grid item size={{ md: gridItemSize, xs: 12 }}>
690689
<DomainResultCard
691690
title="HTTPS Certificate"
692691
type="HTTPS"

‎src/components/CippCards/CippExchangeInfoCard.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export const CippExchangeInfoCard = (props) => {
8282
<LinearProgressWithLabel
8383
sx={{ width: "100%" }}
8484
variant="determinate"
85-
addedLabel={`(${Math.round(exchangeData.TotalItemSize)}/${Math.round(
85+
addedLabel={`(${Math.round(exchangeData.TotalItemSize)} GB of ${Math.round(
8686
exchangeData?.ProhibitSendReceiveQuota
8787
)}GB)`}
8888
value={

‎src/components/CippCards/CippInfoBar.jsx

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState } from "react";
2-
import { Box, Card, Stack, SvgIcon, Typography, Skeleton } from "@mui/material";
3-
import Grid from "@mui/material/Grid";
2+
import { Box, Card, Stack, SvgIcon, Typography, Skeleton, Tooltip } from "@mui/material";
3+
import { Grid } from "@mui/system";
44
import { CippOffCanvas } from "../CippComponents/CippOffCanvas";
55
import { CippPropertyListCard } from "./CippPropertyListCard";
66

@@ -13,9 +13,7 @@ export const CippInfoBar = ({ data, isFetching }) => {
1313
{data.map((item, index) => (
1414
<>
1515
<Grid
16-
xs={12}
17-
sm={6}
18-
md={3}
16+
size={{ md: 3, sm: 6, xs: 12 }}
1917
key={item.name}
2018
onClick={item.offcanvas ? () => setVisibleIndex(index) : undefined}
2119
sx={{
@@ -45,20 +43,39 @@ export const CippInfoBar = ({ data, isFetching }) => {
4543
{item.icon}
4644
</SvgIcon>
4745
)}
48-
<Box
49-
sx={() => {
50-
if (!item?.icon) {
51-
return { pl: 2 };
52-
}
53-
}}
54-
>
55-
<Typography color="text.secondary" variant="overline">
56-
{item.name}
57-
</Typography>
58-
<Typography variant="h6">
59-
{isFetching ? <Skeleton width={"100%"} /> : item.data}
60-
</Typography>
61-
</Box>
46+
{item?.toolTip ? (
47+
<Tooltip title={item.toolTip}>
48+
<Box
49+
sx={() => {
50+
if (!item?.icon) {
51+
return { pl: 2 };
52+
}
53+
}}
54+
>
55+
<Typography color="text.secondary" variant="overline">
56+
{item.name}
57+
</Typography>
58+
<Typography variant="h6">
59+
{isFetching ? <Skeleton width={"100%"} /> : item.data}
60+
</Typography>
61+
</Box>
62+
</Tooltip>
63+
) : (
64+
<Box
65+
sx={() => {
66+
if (!item?.icon) {
67+
return { pl: 2 };
68+
}
69+
}}
70+
>
71+
<Typography color="text.secondary" variant="overline">
72+
{item.name}
73+
</Typography>
74+
<Typography variant="h6">
75+
{isFetching ? <Skeleton width={"100%"} /> : item.data}
76+
</Typography>
77+
</Box>
78+
)}
6279
</Stack>
6380
</Grid>
6481
{item.offcanvas && (
@@ -78,7 +95,7 @@ export const CippInfoBar = ({ data, isFetching }) => {
7895
}}
7996
>
8097
<Grid container spacing={1}>
81-
<Grid item xs={12}>
98+
<Grid item size={{ xs: 12 }}>
8299
{item?.offcanvas?.propertyItems?.length > 0 && (
83100
<CippPropertyListCard
84101
isFetching={isFetching}

‎src/components/CippCards/CippPropertyListCard.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export const CippPropertyListCard = (props) => {
8787
</PropertyList>
8888
) : (
8989
// Two-column layout
90-
<Stack
90+
(<Stack
9191
direction={{
9292
xs: "column",
9393
md: "row",
@@ -142,7 +142,7 @@ export const CippPropertyListCard = (props) => {
142142
))
143143
)}
144144
</PropertyList>
145-
</Stack>
145+
</Stack>)
146146
)}
147147
</CardContent>
148148
<ActionList>

0 commit comments

Comments
 (0)