Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
198 commits
Select commit Hold shift + click to select a range
59d9ba8
addition of new options
Zacgoose May 1, 2025
dbdd972
Addition of new languages
Zacgoose May 2, 2025
b89770e
parse raw alert data to populate the configurable input
Zacgoose May 3, 2025
bdd1fe1
Default filter for table, updated mailbox report
Zacgoose May 4, 2025
32f800a
"recipientType" does not exist, conditional enable/disable device
Zacgoose May 5, 2025
73e2182
added all possible options to include WeekDay, WeekendDay and AllDays
Zacgoose May 5, 2025
72fab02
Fixes turning your computer into a heater at the un-authed screen
Zacgoose May 5, 2025
98714bc
new remove after option, validation and helper text
Zacgoose May 6, 2025
76502d9
Less ambiguous wording for mailbox usage
Zacgoose May 6, 2025
d6f3a23
chore: more cSpell words
OfficialEsco May 6, 2025
8d277fc
Merge pull request #4052 from Ren-Roros-Digital/cSpell
KelvinTegelaar May 6, 2025
aa5d654
Merge pull request #4051 from Zacgoose/mailboxusage
KelvinTegelaar May 6, 2025
94ee3cb
Merge pull request #4042 from Zacgoose/devices-actions-change
KelvinTegelaar May 6, 2025
6808f9c
Merge pull request #4037 from Zacgoose/auto-pilot-languages
KelvinTegelaar May 6, 2025
1f267ef
feat: Work from anywhere report
OfficialEsco May 7, 2025
9c73651
fix: fix for disable Out of Office
OfficialEsco May 8, 2025
5652ef9
feat: Editable City and Country
OfficialEsco May 9, 2025
7d7c576
Merge pull request #4043 from Zacgoose/CPUGoBurrrr
KelvinTegelaar May 12, 2025
a204f3e
Merge pull request #4073 from Ren-Roros-Digital/CityAndCountry
KelvinTegelaar May 12, 2025
969d2f5
Merge pull request #4069 from Ren-Roros-Digital/OutOfOffice
KelvinTegelaar May 12, 2025
e7e4898
Merge pull request #4062 from Ren-Roros-Digital/WorkFromAnywhere
KelvinTegelaar May 12, 2025
0028446
Merge pull request #4039 from Zacgoose/scripted-alert-edit
KelvinTegelaar May 12, 2025
2f2e8fb
include groups
KelvinTegelaar May 12, 2025
1a5c9c4
Merge pull request #1 from KelvinTegelaar/dev
Zacgoose May 13, 2025
d39c8b5
Fixes
Zacgoose May 13, 2025
d230026
Indentation fix for timezoneList.json
Zacgoose May 13, 2025
872e2a9
feat: Add new Set Exchange Outbound Spam Limits standard
kris6673 May 13, 2025
4c50e24
add persistor
KelvinTegelaar May 13, 2025
b08b079
added package
KelvinTegelaar May 13, 2025
79eafc6
Next Backup
CHRIS-BRANNON May 13, 2025
892d248
fix early stales
KelvinTegelaar May 13, 2025
2fde8e5
Merge pull request #4086 from CHRIS-BRANNON/dev
KelvinTegelaar May 13, 2025
3ebdcb0
weirdness with dev and tools
KelvinTegelaar May 13, 2025
93c80cb
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 13, 2025
c1c10e7
Add "Edit permissions" action to room management page
kris6673 May 13, 2025
e2f6042
feat: Add validation messages for user selection, policy selection, a…
kris6673 May 13, 2025
ec7f65e
Merge pull request #4088 from kris6673/kris6673/issue4084
KelvinTegelaar May 14, 2025
c39a79d
Merge pull request #4085 from kris6673/issue4068
KelvinTegelaar May 14, 2025
6d917cf
Merge pull request #4081 from Zacgoose/indentation-fix
KelvinTegelaar May 14, 2025
574ace7
Update backup.js
Zacgoose May 14, 2025
f851ca8
update icons import and add permanently delete action
kris6673 May 14, 2025
70dfb40
Enhance user deletion logging
kris6673 May 14, 2025
56cfb64
fix validators prop
lsmith090 May 14, 2025
99e318d
Merge pull request #4097 from lsmith090/fix-validator
KelvinTegelaar May 15, 2025
6c50c23
Merge pull request #4095 from kris6673/fix-del-user-logging
KelvinTegelaar May 15, 2025
9e41644
Merge pull request #4094 from kris6673/feat-perma-delete-action
KelvinTegelaar May 15, 2025
2f6bd1d
Merge pull request #4093 from Zacgoose/backuprestore
KelvinTegelaar May 15, 2025
17b0ab3
Merge pull request #4087 from kris6673/feat-add-edit-permissions
KelvinTegelaar May 15, 2025
1b0474d
Merge pull request #4050 from Zacgoose/tenantallowblock-fix
KelvinTegelaar May 15, 2025
6b3f8b2
Merge pull request #4040 from Zacgoose/default-filter-shared-mailbox
KelvinTegelaar May 15, 2025
2982cf2
Merge pull request #4030 from Zacgoose/Room-Mailboxes
KelvinTegelaar May 15, 2025
4b68491
Update CippWizardOffboarding.jsx
Zacgoose May 15, 2025
89f3717
feat:Add action to set max send/receive size for mailboxes
kris6673 May 15, 2025
8876672
Feat: Add "Change Primary User" action to Intune device management
kris6673 May 15, 2025
77bffa9
MSAL magic
KelvinTegelaar May 16, 2025
1a50daf
Experimentation with new MSAL and creation
KelvinTegelaar May 16, 2025
e9775ca
Fixes view of filtered standards when 3 or less results returned
Zacgoose May 16, 2025
838098b
fix: Skype Consumer Interoperability with Teams is no longer supported
OfficialEsco May 16, 2025
05b9878
Merge pull request #4104 from Ren-Roros-Digital/SkypeFIx
KelvinTegelaar May 16, 2025
1c3f16e
Merge pull request #4103 from Zacgoose/standards-view-fix
KelvinTegelaar May 16, 2025
61876a3
Merge pull request #4101 from kris6673/feat-intune-primary-user
KelvinTegelaar May 16, 2025
526bb53
Merge pull request #4099 from kris6673/feat-max-email-size
KelvinTegelaar May 16, 2025
8eae33a
Merge pull request #4098 from Zacgoose/offboarding-typo
KelvinTegelaar May 16, 2025
6b8f38c
Set 'creatable' to false for some autoCompletes
kris6673 May 16, 2025
dac4c87
Feat: Add EntraConnectSyncStatus alert
kris6673 May 16, 2025
c11fc3d
add psa test option
JohnDuprey May 16, 2025
790dd32
Added standard for Custom Quarantine Policies
ngms-psh May 16, 2025
9115327
feat: Enhance CippExchangeSettingsForm with dynamic permission handli…
Jr7468 May 16, 2025
dced087
Merge pull request #4108 from Jr7468/dev
KelvinTegelaar May 17, 2025
5a261ae
first new wizard step
KelvinTegelaar May 17, 2025
4204310
updates to new sam wizard
KelvinTegelaar May 17, 2025
4592916
Updates for single tenant mode
KelvinTegelaar May 18, 2025
573fc22
changes
KelvinTegelaar May 19, 2025
ff59725
Passthrough default sorting to CippTablePage to use in Tenant Groups …
Zacgoose May 19, 2025
dc16fdc
Revert "Passthrough default sorting to CippTablePage to use in Tenant…
Zacgoose May 19, 2025
dcd2832
Configuration
KelvinTegelaar May 19, 2025
f830836
Entra Group Auth
JohnDuprey May 19, 2025
9de972c
add refresh button
JohnDuprey May 19, 2025
f7a2cd4
Create undraw-into-the-night-nd84.svg
JohnDuprey May 19, 2025
a120df8
persist query client tweaks
JohnDuprey May 19, 2025
3084940
Update account-popover.js
JohnDuprey May 19, 2025
4511530
tenant stuff
KelvinTegelaar May 19, 2025
09f229f
added tenant state
KelvinTegelaar May 19, 2025
3742c4c
tweak auth refresh
JohnDuprey May 19, 2025
8bb150b
auth refresh tweak
JohnDuprey May 19, 2025
6e33095
tweak auth checks
JohnDuprey May 19, 2025
356ba42
application pages
JohnDuprey May 19, 2025
878c104
application permission sets
JohnDuprey May 20, 2025
17c3ac0
app deployment templates
JohnDuprey May 20, 2025
e296686
consistent wording
JohnDuprey May 20, 2025
b2ba518
Update index.js
JohnDuprey May 20, 2025
1a7c50b
add permission preview functionality
JohnDuprey May 20, 2025
855baff
preview improvements
JohnDuprey May 20, 2025
20fa9bf
add save to github action
JohnDuprey May 20, 2025
dfd2886
prettification
JohnDuprey May 20, 2025
c21f956
fix query keys
JohnDuprey May 20, 2025
99eceaf
form tweaks
JohnDuprey May 20, 2025
1c11736
app approval template deployment
JohnDuprey May 20, 2025
9e142bb
conditional fields in standards
JohnDuprey May 20, 2025
03bf5d3
feat: PhishSimSpoofIntelligence replace switch
OfficialEsco May 21, 2025
95e731c
feat: PhishingSimulations replace switch
OfficialEsco May 21, 2025
832cacc
remove logging
KelvinTegelaar May 21, 2025
8b1dea6
chore: conditional input fields
OfficialEsco May 21, 2025
d59ea5c
Merge pull request #4117 from Ren-Roros-Digital/ConditionalFields
JohnDuprey May 21, 2025
b501099
camelCaseFixes
Zacgoose May 21, 2025
af24c2e
cleanup form defaults
JohnDuprey May 21, 2025
1b1984f
notifications form
KelvinTegelaar May 21, 2025
592d7ed
fix query key
JohnDuprey May 21, 2025
8d0d4ee
Merge pull request #4118 from Zacgoose/camelCaseFixes
JohnDuprey May 21, 2025
ccffdc0
Merge pull request #4115 from Ren-Roros-Digital/PhishSimSpoofIntellig…
JohnDuprey May 21, 2025
a336e8e
Merge pull request #4107 from ngms-psh/feat-Custom-QuarantinePolicies
JohnDuprey May 21, 2025
76eb3a1
Merge pull request #4106 from kris6673/feat-EntraConnectSyncStatus-alert
JohnDuprey May 21, 2025
4cf1361
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
JohnDuprey May 21, 2025
a209ea0
Update index.jsx
JohnDuprey May 21, 2025
6ff9a81
layout tweaks
JohnDuprey May 21, 2025
251107d
fix error with null query key
JohnDuprey May 21, 2025
046d873
alert config fixes
JohnDuprey May 21, 2025
c32a66a
api array fix and autosave when testing
KelvinTegelaar May 21, 2025
384dc89
fix: enable all tenants support in JIT Admin layout
kris6673 May 21, 2025
a0fd8cf
Merge pull request #4123 from kris6673/feat-JIT-alltenants
JohnDuprey May 21, 2025
06cf5da
hide api results for CA check
JohnDuprey May 21, 2025
e2ae072
feat: add allTenants support for transport rules page
kris6673 May 21, 2025
6123d22
edit group template support
JohnDuprey May 21, 2025
28e42b7
Update index.js
JohnDuprey May 21, 2025
01fe1b9
JIT admin form validation
JohnDuprey May 22, 2025
9dfecb9
fix console errors
JohnDuprey May 22, 2025
71c49f9
Merge branch 'dev' of https://github.com/Zacgoose/CIPP into dev
Zacgoose May 22, 2025
b7b5f3b
hide bulk requests correctly
Zacgoose May 22, 2025
358daa7
add form validation
JohnDuprey May 22, 2025
a597ce0
Update _app.js
lsmith090 May 22, 2025
5b16c68
set default to contains
JohnDuprey May 22, 2025
4ef55cb
enable form reset after adding a contact
kris6673 May 22, 2025
0a7ec72
fix: update title in CippFormPage to specify 'Guest User'
kris6673 May 22, 2025
3c84136
Feat: Add option to set password never expires in user actions
kris6673 May 23, 2025
d2806ab
feat: add validation and new options to defender deployment
kris6673 May 23, 2025
842ddf5
feat: add 'Warn mode' option to ASR rules too cause why not
kris6673 May 23, 2025
00d6bd6
Merge pull request #4132 from kris6673/guest-user-title
JohnDuprey May 23, 2025
42a6310
change to be the order its listed in the portal to help my crippling …
kris6673 May 23, 2025
3aa6f30
fix: update helpText for GitHub integration fix Repositorities typo
dszp May 23, 2025
42b5e7a
Merge pull request #4140 from dszp/github-integration-typo
JohnDuprey May 23, 2025
79e545e
Merge pull request #4137 from kris6673/issue4100
KelvinTegelaar May 24, 2025
93d6688
Merge pull request #4135 from kris6673/issue4112
KelvinTegelaar May 24, 2025
6d9a6bd
feat: re-add functionality to remove users from groups in edit mode
kris6673 May 24, 2025
11ee6a1
Added option for tooltip in CippInfoBar component
ngms-psh May 24, 2025
6076a73
Added page for list/edit and add Quarantine Policies
ngms-psh May 24, 2025
ddeb80e
Removed unused imports
ngms-psh May 24, 2025
b0c0c2a
wizard steps
KelvinTegelaar May 26, 2025
b4a08bd
wizard changes
KelvinTegelaar May 26, 2025
264bc1a
add goose code: implement user group filtering in CippAddEditUser com…
kris6673 May 26, 2025
9141d66
tenant stuff
KelvinTegelaar May 26, 2025
04cdbe7
push
KelvinTegelaar May 26, 2025
6111962
Merge branch 'feature-onboarding-improvement' into dev
KelvinTegelaar May 26, 2025
44844c5
Update CippNotificationForm.jsx
KelvinTegelaar May 26, 2025
4d0d02f
Merge pull request #4124 from kris6673/feat-TransportRules-alltenants
KelvinTegelaar May 26, 2025
2e2e5b6
Merge pull request #4127 from Zacgoose/bulkactions
KelvinTegelaar May 26, 2025
4758a8e
Merge pull request #4129 from lsmith090/fix-typo
KelvinTegelaar May 26, 2025
89e1c06
Merge pull request #4131 from kris6673/reset-contacts-form
KelvinTegelaar May 26, 2025
bbe7bb5
fixes displayname bug
KelvinTegelaar May 26, 2025
9d764d7
frontend fix for new gdap wizard
KelvinTegelaar May 26, 2025
034074f
test
KelvinTegelaar May 26, 2025
996f12a
Grid prop cleanup - round 1
Zacgoose May 27, 2025
3dc1d1a
pass 2
Zacgoose May 27, 2025
33790ca
Merge pull request #4146 from Zacgoose/grid-prop-cleanup
KelvinTegelaar May 27, 2025
031d0f8
text
KelvinTegelaar May 27, 2025
c7cb69b
Merge branch 'dev' into feat-removeFromGroups
kris6673 May 27, 2025
0f0a8dd
New grid
KelvinTegelaar May 27, 2025
adf04ea
Fix Grid item size prop
kris6673 May 27, 2025
0f18b15
feat: Allow exclude when Group is included
OfficialEsco May 27, 2025
2183736
Fixed link for button 'Deploy Custom Policy'
ngms-psh May 27, 2025
f4127c4
fixes grid
KelvinTegelaar May 27, 2025
63c490d
Merge remote-tracking branch 'upstream/dev' into feat-Custom-Quaranti…
ngms-psh May 27, 2025
aa75ba7
fixes grid.
KelvinTegelaar May 27, 2025
f26edd0
fixes per tenant
KelvinTegelaar May 27, 2025
d1f90a3
onboardfing improvements
KelvinTegelaar May 27, 2025
a99d5fc
logbook improvements
JohnDuprey May 27, 2025
0090d0f
text updates
KelvinTegelaar May 27, 2025
cf127a0
fixes tenant modes
KelvinTegelaar May 27, 2025
1c3de95
prettify filters
JohnDuprey May 27, 2025
15622e8
allow cpv refresh for direct tenant
JohnDuprey May 27, 2025
51670f7
confirm text tweaks
JohnDuprey May 27, 2025
7b08629
form validation
KelvinTegelaar May 28, 2025
13fa84a
text improvements
KelvinTegelaar May 28, 2025
8a5ae8f
remove console.log
KelvinTegelaar May 28, 2025
951efe3
Merge pull request #4143 from ngms-psh/feat-Custom-QuarantinePolicies
KelvinTegelaar May 28, 2025
f5f4e22
Merge pull request #4149 from Ren-Roros-Digital/GroupExclude
KelvinTegelaar May 28, 2025
e47a2f9
errorss only fix
KelvinTegelaar May 28, 2025
fbd16d0
fix for remediation
KelvinTegelaar May 28, 2025
d359b66
Merge pull request #4142 from kris6673/feat-removeFromGroups
KelvinTegelaar May 28, 2025
2905272
fix button groups
JohnDuprey May 28, 2025
e51d698
fix spacing
JohnDuprey May 28, 2025
09d7ffb
remove some wrong conditional stuff
kris6673 May 28, 2025
393b2b1
Merge pull request #4152 from kris6673/exch-conditional
JohnDuprey May 28, 2025
bc4573f
update action text
JohnDuprey May 28, 2025
6d2a974
fix external link property
JohnDuprey May 28, 2025
034460c
text changes
KelvinTegelaar May 28, 2025
bab0117
Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev
KelvinTegelaar May 28, 2025
dfd4a41
push version
KelvinTegelaar May 28, 2025
19ff0c5
Merge pull request #4154 from KelvinTegelaar/dev
KelvinTegelaar May 28, 2025
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
73 changes: 53 additions & 20 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": []
}
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions public/assets/illustrations/undraw-into-the-night-nd84.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/version.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "7.5.3"
}
"version": "8.0.0"
}
12 changes: 9 additions & 3 deletions src/api/ApiCall.jsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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,
Expand Down Expand Up @@ -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,
});
Expand Down
35 changes: 17 additions & 18 deletions src/components/CippCards/CippDomainCards.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { useEffect, useState } from "react";
import {
Grid,
Button,
Collapse,
Switch,
Expand All @@ -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";
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -238,7 +237,7 @@ function DomainResultCard({ title, data, isFetching, info, type }) {
value: email,
}))}
/>
</>
</>)
),
}
: type === "SPF"
Expand Down Expand Up @@ -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} />
Expand Down Expand Up @@ -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%" }}
Expand All @@ -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}
Expand All @@ -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>
Expand Down Expand Up @@ -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"
Expand All @@ -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}
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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}
Expand All @@ -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"}
Expand All @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/components/CippCards/CippExchangeInfoCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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={
Expand Down
57 changes: 37 additions & 20 deletions src/components/CippCards/CippInfoBar.jsx
Original file line number Diff line number Diff line change
@@ -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";

Expand All @@ -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={{
Expand Down Expand Up @@ -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 && (
Expand All @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions src/components/CippCards/CippPropertyListCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export const CippPropertyListCard = (props) => {
</PropertyList>
) : (
// Two-column layout
<Stack
(<Stack
direction={{
xs: "column",
md: "row",
Expand Down Expand Up @@ -142,7 +142,7 @@ export const CippPropertyListCard = (props) => {
))
)}
</PropertyList>
</Stack>
</Stack>)
)}
</CardContent>
<ActionList>
Expand Down
Loading