Merge pull request KelvinTegelaar#4154 from KelvinTegelaar/dev

Dev to release

Author: KelvinTegelaar

cspell.json

@@ -4,28 +4,61 @@
     "dictionaryDefinitions": [],
     "dictionaries": [],
     "words": [
-      "CIPP",
-      "CIPP-API",
-      "Entra",
-      "Intune",
-      "GDAP",
-      "OBEE",
-      "AITM",
-      "Passwordless",
-      "Yubikey",
-      "Sherweb",
-      "Autotask",
-      "Datto",
-      "Syncro",
-      "ImmyBot",
-      "Choco",
+        "ADMS",
+        "AITM",
+        "Augmentt",
+        "Autotask",
+        "Choco",
+        "CIPP",
+        "CIPP-API",
+        "Datto",
+        "Entra",
+        "ESET",
+        "GDAP",
+        "HIBP",
+        "Hudu",
+        "ImmyBot",
+        "Intune",
+        "LCID",
+        "OBEE",
+        "Passwordless",
+        "pwpush",
+        "Rewst",
+        "Sherweb",
+        "Syncro",
+        "Yubikey"
     ],
     "ignoreWords": [
-      "CIPPAPI",
-      "locationcipp",
-      "TNEF",
-      "winmail",
-      "PSTN",
+        "Addins",
+        "CIPPAPI",
+        "PSTN",
+        "TNEF",
+        "exo_individualsharing",
+        "exo_mailboxaudit",
+        "exo_mailtipsenabled",
+        "exo_outlookaddins",
+        "exo_storageproviderrestricted",
+        "locationcipp",
+        "mdo_antiphishingpolicies",
+        "mdo_autoforwardingmode",
+        "mdo_blockmailforward",
+        "mdo_commonattachmentsfilter",
+        "mdo_highconfidencephishaction",
+        "mdo_highconfidencespamaction",
+        "mdo_phishthresholdlevel",
+        "mdo_phisspamacation",
+        "mdo_safeattachmentpolicy",
+        "mdo_safeattachments",
+        "mdo_safedocuments",
+        "mdo_safelinksforOfficeApps",
+        "mdo_safelinksforemail",
+        "mdo_spam_notifications_only_for_admins",
+        "mdo_zapmalware",
+        "mdo_zapphish",
+        "mdo_zapspam",
+        "microsoftonline",
+        "mip_search_auditlog",
+        "winmail"
     ],
     "import": []
 }

package.json

@@ -38,8 +38,10 @@
     "@musement/iso-duration": "^1.0.0",
     "@react-pdf/renderer": "4.3.0",
     "@reduxjs/toolkit": "2.6.1",
+    "@tanstack/query-sync-storage-persister": "^5.76.0",
     "@tanstack/react-query": "^5.51.11",
     "@tanstack/react-query-devtools": "^5.51.11",
+    "@tanstack/react-query-persist-client": "^5.76.0",
     "@tanstack/react-table": "^8.19.2",
     "@tiptap/core": "^2.9.1",
     "@tiptap/extension-heading": "^2.9.1",

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

@@ -1,3 +1,3 @@
 {
-  "version": "7.5.3"
-}
+  "version": "8.0.0"
+}

public/version.json

@@ -1,4 +1,10 @@
-import { keepPreviousData, useInfiniteQuery, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+  keepPreviousData,
+  useInfiniteQuery,
+  useMutation,
+  useQuery,
+  useQueryClient,
+} from "@tanstack/react-query";
 import axios, { isAxiosError } from "axios";
 import { useDispatch } from "react-redux";
 import { showToast } from "../store/toasts";
@@ -15,7 +21,7 @@ export function ApiGetCall(props) {
     bulkRequest = false,
     toast = false,
     onResult,
-    staleTime = 600000, // 10 minutes
+    staleTime = 300000,
     refetchOnWindowFocus = false,
     refetchOnMount = true,
     refetchOnReconnect = true,
@@ -212,7 +218,7 @@ export function ApiGetCallWithPagination({
       }
       return lastPage?.Metadata?.nextLink ? { nextLink: lastPage.Metadata.nextLink } : undefined;
     },
-    staleTime: 600000, // 10 minutes
+    staleTime: 300000,
     refetchOnWindowFocus: false,
     retry: retryFn,
   });

src/api/ApiCall.jsx

@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from "react";
 import {
-  Grid,
   Button,
   Collapse,
   Switch,
@@ -13,6 +12,7 @@ import {
   Divider,
   FormControlLabel,
 } from "@mui/material";
+import { Grid } from "@mui/system";
 import SearchIcon from "@mui/icons-material/Search";
 import ClearIcon from "@mui/icons-material/Clear";
 import SettingsIcon from "@mui/icons-material/Settings";
@@ -152,7 +152,7 @@ function DomainResultCard({ title, data, isFetching, info, type }) {
       ? {
           children: (
             <Grid container spacing={2}>
-              <Grid item xs={12}>
+              <Grid item size={{ xs: 12 }}>
                 {info}
               </Grid>
             </Grid>
@@ -182,12 +182,11 @@ function DomainResultCard({ title, data, isFetching, info, type }) {
       ? {
           children: (
             //4 headers, "Record" and then  <CippCodeBlock code={record?.Record} /> under it.
-            <>
+            (<>
               <Typography variant="h6" gutterBottom>
                 Record:
               </Typography>
               <CippCodeBlock code={data?.Record} />
-
               <CippPropertyListCard
                 title="Settings"
                 copyItems={true}
@@ -238,7 +237,7 @@ function DomainResultCard({ title, data, isFetching, info, type }) {
                   value: email,
                 }))}
               />
-            </>
+            </>)
           ),
         }
       : type === "SPF"
@@ -362,7 +361,7 @@ function DomainResultCard({ title, data, isFetching, info, type }) {
       }
       isFetching={isFetching}
     >
-      <Grid item xs={12}>
+      <Grid item size={{ xs: 12 }}>
         {info}
       </Grid>
       <CippOffCanvas visible={visible} onClose={() => setVisible(false)} {...offCanvasData} />
@@ -484,7 +483,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
       <Grid container spacing={3}>
-        <Grid item xs={fullwidth ? 12 : 4}>
+        <Grid item size={{ xs: fullwidth ? 12 : 4 }}>
           <CippButtonCard
             title="Domain Check"
             cardSx={{ display: "flex", flexDirection: "column", height: "100%" }}
@@ -497,7 +496,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
             }
           >
             <Grid container spacing={2}>
-              <Grid item xs={8}>
+              <Grid item size={{ xs: 8 }}>
                 <Controller
                   name="domain"
                   control={control}
@@ -506,7 +505,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
                   )}
                 />
               </Grid>
-              <Grid item xs={4}>
+              <Grid item size={{ xs: 4 }}>
                 <Button type="submit" variant="contained" startIcon={<SearchIcon />}>
                   Check
                 </Button>
@@ -563,7 +562,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
 
         {domain && (
           <>
-            <Grid item xs={12} md={gridItemSize}>
+            <Grid item size={{ md: gridItemSize, xs: 12 }}>
               <DomainResultCard
                 title="Whois Results"
                 type="whois"
@@ -576,7 +575,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
                 }
               />
             </Grid>
-            <Grid item xs={12} md={gridItemSize}>
+            <Grid item size={{ md: gridItemSize, xs: 12 }}>
               <DomainResultCard
                 title="NS Records"
                 data={nsData}
@@ -589,10 +588,10 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
                 }
               />
             </Grid>
-            <Grid item xs={12} md={gridItemSize}>
+            <Grid item size={{ md: gridItemSize, xs: 12 }}>
               <MXResultsCard domain={domain} mxData={mxData} isFetching={mxLoading} />
             </Grid>
-            <Grid item xs={12} md={gridItemSize}>
+            <Grid item size={{ md: gridItemSize, xs: 12 }}>
               <DomainResultCard
                 title="SPF Record"
                 type="SPF"
@@ -611,7 +610,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
                 }
               />
             </Grid>
-            <Grid item xs={12} md={gridItemSize}>
+            <Grid item size={{ md: gridItemSize, xs: 12 }}>
               <DomainResultCard
                 title="DMARC Policy"
                 type="DMARC"
@@ -630,7 +629,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
                 }
               />
             </Grid>
-            <Grid item xs={12} md={gridItemSize}>
+            <Grid item size={{ md: gridItemSize, xs: 12 }}>
               <DomainResultCard
                 title="DKIM Record"
                 data={dkimData}
@@ -649,7 +648,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
                 }
               />
             </Grid>
-            <Grid item xs={12} md={gridItemSize}>
+            <Grid item size={{ md: gridItemSize, xs: 12 }}>
               <DomainResultCard
                 title="DNSSEC"
                 type={"DNSSEC"}
@@ -666,7 +665,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
                 }
               />
             </Grid>
-            <Grid item xs={12} md={gridItemSize}>
+            <Grid item size={{ md: gridItemSize, xs: 12 }}>
               <DomainResultCard
                 title="MTA-STS"
                 type="MTA-STS"
@@ -686,7 +685,7 @@ export const CippDomainCards = ({ domain: propDomain = "", fullwidth = false })
               />
             </Grid>
             {enableHttps && (
-              <Grid item xs={12} md={gridItemSize}>
+              <Grid item size={{ md: gridItemSize, xs: 12 }}>
                 <DomainResultCard
                   title="HTTPS Certificate"
                   type="HTTPS"

src/components/CippCards/CippDomainCards.jsx

@@ -82,7 +82,7 @@ export const CippExchangeInfoCard = (props) => {
               <LinearProgressWithLabel
                 sx={{ width: "100%" }}
                 variant="determinate"
-                addedLabel={`(${Math.round(exchangeData.TotalItemSize)}/${Math.round(
+                addedLabel={`(${Math.round(exchangeData.TotalItemSize)} GB of ${Math.round(
                   exchangeData?.ProhibitSendReceiveQuota
                 )}GB)`}
                 value={

src/components/CippCards/CippExchangeInfoCard.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
-import { Box, Card, Stack, SvgIcon, Typography, Skeleton } from "@mui/material";
-import Grid from "@mui/material/Grid";
+import { Box, Card, Stack, SvgIcon, Typography, Skeleton, Tooltip } from "@mui/material";
+import { Grid } from "@mui/system";
 import { CippOffCanvas } from "../CippComponents/CippOffCanvas";
 import { CippPropertyListCard } from "./CippPropertyListCard";
 
@@ -13,9 +13,7 @@ export const CippInfoBar = ({ data, isFetching }) => {
         {data.map((item, index) => (
           <>
             <Grid
-              xs={12}
-              sm={6}
-              md={3}
+              size={{ md: 3, sm: 6, xs: 12 }}
               key={item.name}
               onClick={item.offcanvas ? () => setVisibleIndex(index) : undefined}
               sx={{
@@ -45,20 +43,39 @@ export const CippInfoBar = ({ data, isFetching }) => {
                     {item.icon}
                   </SvgIcon>
                 )}
-                <Box
-                  sx={() => {
-                    if (!item?.icon) {
-                      return { pl: 2 };
-                    }
-                  }}
-                >
-                  <Typography color="text.secondary" variant="overline">
-                    {item.name}
-                  </Typography>
-                  <Typography variant="h6">
-                    {isFetching ? <Skeleton width={"100%"} /> : item.data}
-                  </Typography>
-                </Box>
+                {item?.toolTip ? (
+                  <Tooltip title={item.toolTip}>
+                    <Box
+                      sx={() => {
+                        if (!item?.icon) {
+                          return { pl: 2 };
+                        }
+                      }}
+                    >
+                      <Typography color="text.secondary" variant="overline">
+                        {item.name}
+                      </Typography>
+                      <Typography variant="h6">
+                        {isFetching ? <Skeleton width={"100%"} /> : item.data}
+                      </Typography>
+                    </Box>
+                  </Tooltip>
+                ) : (
+                  <Box
+                    sx={() => {
+                      if (!item?.icon) {
+                        return { pl: 2 };
+                      }
+                    }}
+                  >
+                    <Typography color="text.secondary" variant="overline">
+                      {item.name}
+                    </Typography>
+                    <Typography variant="h6">
+                      {isFetching ? <Skeleton width={"100%"} /> : item.data}
+                    </Typography>
+                  </Box>
+                )}
               </Stack>
             </Grid>
             {item.offcanvas && (
@@ -78,7 +95,7 @@ export const CippInfoBar = ({ data, isFetching }) => {
                     }}
                   >
                     <Grid container spacing={1}>
-                      <Grid item xs={12}>
+                      <Grid item size={{ xs: 12 }}>
                         {item?.offcanvas?.propertyItems?.length > 0 && (
                           <CippPropertyListCard
                             isFetching={isFetching}

src/components/CippCards/CippInfoBar.jsx

@@ -87,7 +87,7 @@ export const CippPropertyListCard = (props) => {
             </PropertyList>
           ) : (
             // Two-column layout
-            <Stack
+            (<Stack
               direction={{
                 xs: "column",
                 md: "row",
@@ -142,7 +142,7 @@ export const CippPropertyListCard = (props) => {
                   ))
                 )}
               </PropertyList>
-            </Stack>
+            </Stack>)
           )}
         </CardContent>
         <ActionList>