-
-
- Frontend Version
-
-
-
- Latest: {isSuccessVersion ? versions.RemoteCIPPVersion : }
- Current: {isSuccessVersion ? versions.LocalCIPPVersion : }
-
-
-
-
-
-
- API Version
-
-
-
- Latest: {isSuccessVersion ? versions.RemoteCIPPAPIVersion : }
- Current: {isSuccessVersion ? versions.LocalCIPPAPIVersion : }
-
-
+
-
-
-
- Permissions Check
-
+
+
+
- Click the button below to start a permissions check.
+ Permissions Check
+ Click the button below to start a permissions check.
checkPermissions()}
disabled={permissionsResult.isFetching}
- className="mt-3"
+ className="mb-3 me-2"
>
{permissionsResult.isFetching && (
@@ -386,6 +397,22 @@ const GeneralSettings = () => {
{permissionsResult.isSuccess && (
<>
+ {permissionsResult.data.Results?.AccessTokenDetails?.Name !== '' && (
+ <>
+ setTokenOffcanvasVisible(true)}>
+ Details
+
+ setTokenOffcanvasVisible(false)}
+ />
+
+ )}
@@ -402,7 +429,8 @@ const GeneralSettings = () => {
documentation on how to add permissions{' '}
here
@@ -414,106 +442,86 @@ const GeneralSettings = () => {
)}
- {permissionsResult.data.Results?.MissingGroups.length > 0 && (
- <>
- Your SAM User is missing the following group memberships.
-
- {permissionsResult.data.Results?.MissingGroups?.map((r, index) => (
- {r}
- ))}
-
-
- )}
- {permissionsResult.data.Results?.CIPPGroupCount == 0 && (
- <>
- NOTE: Your M365 GDAP groups were not set up by CIPP. Please check the groups
- below to see if you have the correct GDAP permissions, or execute an access
- check.
-
- )}
- {permissionsResult.data.Results?.AccessTokenDetails?.Name !== '' && (
- <>
- setTokenOffcanvasVisible(true)}>
- Details
-
- setTokenOffcanvasVisible(false)}
- />
-
- )}
- {permissionsResult.data.Results?.Memberships !== '' && (
- <>
- p['@odata.type'] == '#microsoft.graph.group',
- )}
- title="Groups"
- />
- p['@odata.type'] == '#microsoft.graph.directoryRole',
- )}
- title="Roles"
- />
-
- )}
)}
-
-
-
- Clear Cache
-
+
+
+
-
- Click the button below to clear the application cache. You can clear only the tenant
- cache, or all caches.
-
- handleClearCache()}
- disabled={clearCacheResult.isFetching}
- className="me-3 mt-3"
- >
- {clearCacheResult.isFetching && (
-
- )}
- Clear All Caches
-
+ GDAP Check
+ Click the button below to start a check for general GDAP settings.
handleClearCacheTenant()}
- disabled={clearCacheResult.isFetching}
- className="me-3 mt-3"
+ onClick={() => checkGDAP({ path: '/api/ExecAccessChecks?GDAP=true' })}
+ disabled={GDAPResult.isFetching}
+ className="mb-3 me-2"
>
- {clearCacheResult.isFetching && (
+ {GDAPResult.isFetching && (
)}
- Clear Tenant Cache
+ Run GDAP Check
- {clearCacheResult.isSuccess && (
- {clearCacheResult.data?.Results}
+ {GDAPResult.isSuccess && (
+ <>
+ p['@odata.type'] == '#microsoft.graph.group',
+ )}
+ title="Groups"
+ />
+ p['@odata.type'] == '#microsoft.graph.directoryRole',
+ )}
+ title="Roles"
+ />
+
)}
+
+
+ {GDAPResult.isSuccess && GDAPResult.data.Results.GDAPIssues?.length > 0 && (
+
+ )}
+ {GDAPResult.isSuccess && GDAPResult.data.Results.GDAPIssues?.length === 0 && (
+
+ No relationships with issues found. Please perform a Permissions Check or
+ Tenant Access Check if you are experiencing issues.
+
+ )}
+
+
-
-
-
- Tenant Access Check
-
+
+
+
+ Tenant Access Check
@@ -539,6 +547,7 @@ const GeneralSettings = () => {
)}
+
{
-
-
-
)
@@ -602,12 +608,14 @@ const ExcludedTenantsSettings = () => {
onConfirm: () => removeExcludeTenant(domain),
})
- const handleCPVPermissions = (domain) =>
+ const handleCPVPermissions = (domain, resetsp = false) =>
ModalService.confirm({
title: 'Refresh Permissions',
body: Are you sure you want to refresh permissions for {domain.defaultDomainName}?
,
onConfirm: () =>
- refreshPermissions({ path: `/api/ExecCPVPermissions?TenantFilter=${domain.customerId}` }),
+ refreshPermissions({
+ path: `/api/ExecCPVPermissions?TenantFilter=${domain.customerId}&ResetSP=${resetsp}`,
+ }),
})
const handleConfirmExcludeTenant = (tenant) => {
ModalService.confirm({
@@ -615,7 +623,6 @@ const ExcludedTenantsSettings = () => {
body: Are you sure you want to exclude this tenant?
,
onConfirm: () => addExcludeTenant(tenant),
})
-
.unwrap()
.then(() => {
dispatch(setCurrentTenant({}))
@@ -644,6 +651,7 @@ const ExcludedTenantsSettings = () => {
Add Excluded Tenant
)
+
function StatusIcon(graphErrorCount) {
if (graphErrorCount > 0) {
return
@@ -688,7 +696,12 @@ const ExcludedTenantsSettings = () => {
)}
- handleCPVPermissions(row)}>
+ handleCPVPermissions(row, false)}
+ >
@@ -806,11 +819,34 @@ const ExcludedTenantsSettings = () => {
modalMessage:
'Are you sure you want to refresh the CPV permissions for these tenants?',
},
+ {
+ label: 'Reset CPV Permissions',
+ modal: true,
+ modalUrl: `/api/ExecCPVPermissions?TenantFilter=!customerId&ResetSP=true`,
+ modalMessage:
+ 'Are you sure you want to reset the CPV permissions for these tenants? (This will delete the Service Principal and re-add it.)',
+ },
],
},
+ isModal: true,
filterlist: [
- { filterName: 'Excluded Tenants', filter: '"Excluded":true' },
- { filterName: 'Included Tenants', filter: '"Excluded":false' },
+ {
+ filterName: 'Excluded Tenants',
+ filter: 'Complex: Excluded eq true',
+ },
+ {
+ filterName: 'Included Tenants',
+ filter: 'Complex: Excluded eq false',
+ },
+ {
+ filterName: 'GDAP & DAP',
+ filter:
+ 'Complex: delegatedPrivilegeStatus eq delegatedAndGranularDelegetedAdminPrivileges',
+ },
+ {
+ filterName: 'GDAP Only',
+ filter: 'Complex: delegatedPrivilegeStatus eq granularDelegatedAdminPrivileges',
+ },
],
keyField: 'id',
columns,
@@ -1122,18 +1158,36 @@ const NotificationsSettings = () => {
{ value: 'Updates', name: 'Updates Status' },
{ value: 'Standards', name: 'All Standards' },
{ value: 'TokensUpdater', name: 'Token Events' },
- { value: 'ExecDnsConfig', name: 'Changing DNS Settings' },
- { value: 'ExecExcludeLicenses', name: 'Adding excluded licenses' },
- { value: 'ExecExcludeTenant', name: 'Adding excluded tenants' },
+ {
+ value: 'ExecDnsConfig',
+ name: 'Changing DNS Settings',
+ },
+ {
+ value: 'ExecExcludeLicenses',
+ name: 'Adding excluded licenses',
+ },
+ {
+ value: 'ExecExcludeTenant',
+ name: 'Adding excluded tenants',
+ },
{ value: 'EditUser', name: 'Editing a user' },
- { value: 'ChocoApp', name: 'Adding or deploying applications' },
- { value: 'AddAPDevice', name: 'Adding autopilot devices' },
+ {
+ value: 'ChocoApp',
+ name: 'Adding or deploying applications',
+ },
+ {
+ value: 'AddAPDevice',
+ name: 'Adding autopilot devices',
+ },
{ value: 'EditTenant', name: 'Editing a tenant' },
{ value: 'AddMSPApp', name: 'Adding an MSP app' },
{ value: 'AddUser', name: 'Adding a user' },
{ value: 'AddGroup', name: 'Adding a group' },
{ value: 'NewTenant', name: 'Adding a tenant' },
- { value: 'ExecOffboardUser', name: 'Executing the offboard wizard' },
+ {
+ value: 'ExecOffboardUser',
+ name: 'Executing the offboard wizard',
+ },
]}
/>
@@ -1357,9 +1411,26 @@ const DNSSettings = () => {
const [getDnsConfig, getDnsConfigResult] = useLazyGetDnsConfigQuery()
const [editDnsConfig, editDnsConfigResult] = useLazyEditDnsConfigQuery()
const inputRef = useRef(null)
+ const [clearCache, clearCacheResult] = useLazyExecClearCacheQuery()
+ const { data: versions, isSuccess: isSuccessVersion } = useLoadVersionsQuery()
const [alertVisible, setAlertVisible] = useState(false)
-
+ const downloadTxtFile = (data) => {
+ const txtdata = [JSON.stringify(RunBackupResult.data.backup)]
+ const file = new Blob(txtdata, { type: 'text/plain' })
+ const element = document.createElement('a')
+ element.href = URL.createObjectURL(file)
+ element.download = 'CIPP-Backup' + Date.now() + '.json'
+ document.body.appendChild(element)
+ element.click()
+ }
+ const handleChange = (e) => {
+ const fileReader = new FileReader()
+ fileReader.readAsText(e.target.files[0], 'UTF-8')
+ fileReader.onload = (e) => {
+ restoreBackup({ path: '/api/ExecRestoreBackup', values: e.target.result })
+ }
+ }
const switchResolver = (resolver) => {
editDnsConfig({ resolver })
getDnsConfig()
@@ -1368,7 +1439,20 @@ const DNSSettings = () => {
setAlertVisible(false)
}, 2000)
}
+ const handleClearCache = useConfirmModal({
+ body: Are you sure you want to clear the cache?
,
+ onConfirm: () => {
+ clearCache({ tenantsOnly: false })
+ localStorage.clear()
+ },
+ })
+ const handleClearCacheTenant = useConfirmModal({
+ body: Are you sure you want to clear the cache?
,
+ onConfirm: () => {
+ clearCache({ tenantsOnly: true })
+ },
+ })
const resolvers = ['Google', 'Cloudflare', 'Quad9']
return (
@@ -1376,85 +1460,132 @@ const DNSSettings = () => {
{getDnsConfigResult.isUninitialized && getDnsConfig()}
{getDnsConfigResult.isSuccess && (
-
- Application Settings
-
+
- DNS Resolver
-
- {resolvers.map((r, index) => (
+
+
+
+
+
+ DNS Resolver
+
+ {resolvers.map((r, index) => (
+ switchResolver(r)}
+ color={r === getDnsConfigResult.data.Resolver ? 'primary' : 'secondary'}
+ key={index}
+ >
+ {r}
+
+ ))}
+
+ {(editDnsConfigResult.isSuccess || editDnsConfigResult.isError) && (
+
+ {editDnsConfigResult.isSuccess
+ ? editDnsConfigResult.data.Results
+ : 'Error setting resolver'}
+
+ )}
+
+
+ Frontend Version
+
+ Latest: {isSuccessVersion ? versions.RemoteCIPPVersion : }
+
+ Current: {isSuccessVersion ? versions.LocalCIPPVersion : }
+
+
+
+ Clear Caches
switchResolver(r)}
- color={r === getDnsConfigResult.data.Resolver ? 'primary' : 'secondary'}
- key={index}
+ className="me-2 mb-2"
+ onClick={() => handleClearCache()}
+ disabled={clearCacheResult.isFetching}
>
- {r}
+ {clearCacheResult.isFetching && (
+
+ )}
+ Clear All Cache
- ))}
-
- {(editDnsConfigResult.isSuccess || editDnsConfigResult.isError) && (
-
- {editDnsConfigResult.isSuccess
- ? editDnsConfigResult.data.Results
- : 'Error setting resolver'}
-
- )}
-
-
-
-
- Settings Backup
- runBackup({ path: '/api/ExecRunBackup' })}
- disabled={RunBackupResult.isFetching}
- className="me-3 mt-3"
- >
- {RunBackupResult.isFetching && (
-
+ handleClearCacheTenant()}
+ disabled={clearCacheResult.isFetching}
+ >
+ {clearCacheResult.isFetching && (
+
+ )}
+ Clear Tenant Cache
+
+ {clearCacheResult.isSuccess && (
+ {clearCacheResult.data?.Results}
)}
- Run backup
-
- handleChange(e)}
- />
- inputRef.current.click()}
- disabled={restoreBackupResult.isFetching}
- className="me-3 mt-3"
- >
- {restoreBackupResult.isFetching && (
-
+
+
+ Settings Backup
+ runBackup({ path: '/api/ExecRunBackup' })}
+ disabled={RunBackupResult.isFetching}
+ >
+ {RunBackupResult.isFetching && (
+
+ )}
+ Run backup
+
+ handleChange(e)}
+ />
+ inputRef.current.click()}
+ disabled={restoreBackupResult.isFetching}
+ >
+ {restoreBackupResult.isFetching && (
+
+ )}
+ Restore backup
+
+ {restoreBackupResult.isSuccess && (
+ <>
+ {restoreBackupResult.data.Results}
+
)}
- Restore backup
-
- {restoreBackupResult.isSuccess && (
- <>
- {restoreBackupResult.data.Results}
-
- )}
- {RunBackupResult.isSuccess && (
- <>
-
- downloadTxtFile(RunBackupResult.data.backup)}
- className="m-1"
- >
- Download Backup
-
-
-
- )}
-
+ {RunBackupResult.isSuccess && (
+ <>
+
+ downloadTxtFile(RunBackupResult.data.backup)}>
+ Download Backup
+
+
+
+ )}
+
+
+ Backend API Version
+
+ Latest: {isSuccessVersion ? versions.RemoteCIPPAPIVersion : }
+
+ Current: {isSuccessVersion ? versions.LocalCIPPAPIVersion : }
+
+
+
)}
@@ -1493,9 +1624,7 @@ const ExtensionsTab = () => {
Results
- <>
- {listSyncExtensionResult.data.Results}
-
+ {listSyncExtensionResult.data.Results}
)}
@@ -1525,8 +1654,8 @@ const ExtensionsTab = () => {
)}
- {Extensions.map((integration) => (
-
+ {Extensions.map((integration, idx) => (
+
{integration.name}
@@ -1542,9 +1671,9 @@ const ExtensionsTab = () => {
{integration.SettingOptions.map(
- (integrationOptions) =>
+ (integrationOptions, idx) =>
integrationOptions.type === 'input' && (
-
+
{
),
)}
{integration.SettingOptions.map(
- (integrationOptions) =>
+ (integrationOptions, idx) =>
integrationOptions.type === 'checkbox' && (
-
+
{
const MappingsTab = () => {
const [listHaloBackend, listBackendHaloResult = []] = useLazyGenericGetRequestQuery()
+ const [listNinjaOrgsBackend, listBackendNinjaOrgsResult] = useLazyGenericGetRequestQuery()
+ const [listNinjaFieldsBackend, listBackendNinjaFieldsResult] = useLazyGenericGetRequestQuery()
const [setHaloExtensionconfig, extensionHaloConfigResult = []] = useLazyGenericPostRequestQuery()
+ const [setNinjaOrgsExtensionconfig, extensionNinjaOrgsConfigResult] =
+ useLazyGenericPostRequestQuery()
+ const [setNinjaOrgsExtensionAutomap, extensionNinjaOrgsAutomapResult] =
+ useLazyGenericPostRequestQuery()
+ const [setNinjaFieldsExtensionconfig, extensionNinjaFieldsConfigResult] =
+ useLazyGenericPostRequestQuery()
const onHaloSubmit = (values) => {
setHaloExtensionconfig({
@@ -1645,10 +1782,38 @@ const MappingsTab = () => {
values: { mappings: values },
})
}
+ const onNinjaOrgsSubmit = (values) => {
+ setNinjaOrgsExtensionconfig({
+ path: 'api/ExecExtensionMapping?AddMapping=NinjaOrgs',
+ values: { mappings: values },
+ })
+ }
+
+ const onNinjaOrgsAutomap = async (values) => {
+ await setNinjaOrgsExtensionAutomap({
+ path: 'api/ExecExtensionMapping?AutoMapping=NinjaOrgs',
+ values: { mappings: values },
+ })
+ await listNinjaOrgsBackend({
+ path: 'api/ExecExtensionMapping?List=NinjaOrgs',
+ })
+ }
+
+ const onNinjaFieldsSubmit = (values) => {
+ setNinjaFieldsExtensionconfig({
+ path: 'api/ExecExtensionMapping?AddMapping=NinjaFields',
+
+ values: { mappings: values },
+ })
+ }
return (
{listBackendHaloResult.isUninitialized &&
listHaloBackend({ path: 'api/ExecExtensionMapping?List=Halo' })}
+ {listBackendNinjaOrgsResult.isUninitialized &&
+ listNinjaOrgsBackend({ path: 'api/ExecExtensionMapping?List=NinjaOrgs' })}
+ {listBackendNinjaFieldsResult.isUninitialized &&
+ listNinjaFieldsBackend({ path: 'api/ExecExtensionMapping?List=NinjaFields' })}
<>
@@ -1702,6 +1867,154 @@ const MappingsTab = () => {
)}
+
+
+ NinjaOne Field Mapping Table
+
+
+ {listBackendNinjaFieldsResult.isFetching ? (
+
+ ) : (
+
+
+
+
+ NinjaOne Organization Mapping Table
+
+
+ {listBackendNinjaOrgsResult.isFetching ? (
+
+ ) : (
+
+
{children}
+}
+
+Lazy.propTypes = {
+ visible: PropTypes.bool,
+ children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
+}
+
const MailboxSettings = () => {
const dispatch = useDispatch()
let query = useQuery()
const userId = query.get('userId')
const tenantDomain = query.get('tenantDomain')
const [active, setActive] = useState(1)
- const {
- data: usercal = {},
- isFetching: usercalIsFetching,
- error: usercalError,
- } = useListCalendarPermissionsQuery({ tenantDomain, userId })
const columnsCal = [
{
name: 'User',
@@ -100,12 +105,6 @@ const MailboxSettings = () => {
},
]
- const {
- data: user = {},
- isFetching: userIsFetching,
- error: userError,
- } = useListMailboxPermissionsQuery({ tenantDomain, userId })
-
return (
@@ -129,16 +128,24 @@ const MailboxSettings = () => {
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
@@ -151,20 +158,20 @@ const MailboxSettings = () => {
{active === 1 && (
- <>
- {userIsFetching && }
- {!userIsFetching && (
-
- )}
-
+
)}
{active === 2 && (
- <>
- {usercalIsFetching && }
- {!usercalIsFetching && (
-
- )}
-
+
)}
{active === 3 && (
<>
@@ -200,7 +207,15 @@ const MailboxPermissions = () => {
data: users = [],
isFetching: usersIsFetching,
error: usersError,
- } = useListUsersQuery({ tenantDomain })
+ } = useGenericGetRequestQuery({
+ path: '/api/ListGraphRequest',
+ params: {
+ Endpoint: 'users',
+ TenantFilter: tenantDomain,
+ $filter: 'assignedLicenses/$count ne 0 and accountEnabled eq true',
+ $count: true,
+ },
+ })
useEffect(() => {
if (!userId || !tenantDomain) {
@@ -259,7 +274,7 @@ const MailboxPermissions = () => {
multi={true}
label="Remove Full Access"
disabled={formDisabled}
- values={users?.map((user) => ({
+ values={users?.Results?.map((user) => ({
value: user.mail,
name: `${user.displayName} - ${user.mail} `,
}))}
@@ -273,7 +288,7 @@ const MailboxPermissions = () => {
multi={true}
label="Add Full Access - Automapping Enabled"
disabled={formDisabled}
- values={users?.map((user) => ({
+ values={users?.Results?.map((user) => ({
value: user.mail,
name: `${user.displayName} - ${user.mail} `,
}))}
@@ -287,7 +302,7 @@ const MailboxPermissions = () => {
multi={true}
label="Add Full Access - Automapping Disabled"
disabled={formDisabled}
- values={users?.map((user) => ({
+ values={users?.Results?.map((user) => ({
value: user.mail,
name: `${user.displayName} - ${user.mail} `,
}))}
@@ -301,7 +316,7 @@ const MailboxPermissions = () => {
multi={true}
label="Add Send-as permissions"
disabled={formDisabled}
- values={users?.map((user) => ({
+ values={users?.Results?.map((user) => ({
value: user.mail,
name: `${user.displayName} - ${user.mail} `,
}))}
@@ -315,7 +330,7 @@ const MailboxPermissions = () => {
multi={true}
label="Remove Send-as permissions"
disabled={formDisabled}
- values={users?.map((user) => ({
+ values={users?.Results?.map((user) => ({
value: user.mail,
name: `${user.displayName} - ${user.mail} `,
}))}
@@ -329,7 +344,7 @@ const MailboxPermissions = () => {
multi={true}
label="Add Send On Behalf permissions"
disabled={formDisabled}
- values={users?.map((user) => ({
+ values={users?.Results?.map((user) => ({
value: user.mail,
name: `${user.displayName} - ${user.mail} `,
}))}
@@ -343,7 +358,7 @@ const MailboxPermissions = () => {
multi={true}
label="Remove Send On Behalf permissions"
disabled={formDisabled}
- values={users?.map((user) => ({
+ values={users?.Results?.map((user) => ({
value: user.mail,
name: `${user.displayName} - ${user.mail} `,
}))}
@@ -396,16 +411,22 @@ const CalendarPermissions = () => {
const [queryError, setQueryError] = useState(false)
const {
- data: user = {},
+ data: user = [],
isFetching: userIsFetching,
error: userError,
- } = useListCalendarPermissionsQuery({ tenantDomain, userId })
+ } = useGenericGetRequestQuery({
+ path: '/api/ListCalendarPermissions',
+ params: { TenantFilter: tenantDomain, UserId: userId },
+ })
const {
data: users = [],
isFetching: usersIsFetching,
error: usersError,
- } = useListMailboxesQuery({ tenantDomain })
+ } = useGenericGetRequestQuery({
+ path: '/api/ListMailboxes',
+ params: { TenantFilter: tenantDomain, SkipLicense: true },
+ })
useEffect(() => {
if (!userId || !tenantDomain) {
@@ -444,21 +465,18 @@ const CalendarPermissions = () => {
return (
<>
+ {queryError && (
+
+
+
+ {/* @todo add more descriptive help message here */}
+ Failed to load user
+
+
+
+ )}
{!queryError && (
<>
- {postResults.isSuccess && (
- {postResults.data?.Results}
- )}
- {queryError && (
-
-
-
- {/* @todo add more descriptive help message here */}
- Failed to load user
-
-
-
- )}
{userIsFetching && }
@@ -500,10 +518,21 @@ const CalendarPermissions = () => {
{ value: 'Contributor', name: 'Contributor' },
{ value: 'Editor', name: 'Editor' },
{ value: 'Owner', name: 'Owner' },
- { value: 'NonEditingAuthor', name: 'Non Editing Author' },
- { value: 'PublishingAuthor', name: 'Publishing Author' },
- { value: 'PublishingEditor', name: 'Publishing Editor' },
+ {
+ value: 'NonEditingAuthor',
+ name: 'Non Editing Author',
+ },
+ {
+ value: 'PublishingAuthor',
+ name: 'Publishing Author',
+ },
+ {
+ value: 'PublishingEditor',
+ name: 'Publishing Editor',
+ },
{ value: 'Reviewer', name: 'Reviewer' },
+ { value: 'LimitedDetails', name: 'Limited Details' },
+ { value: 'AvailabilityOnly', name: 'Availability Only' },
]}
placeholder="Select a permission level"
name="Permissions"
@@ -563,10 +592,18 @@ const MailboxForwarding = () => {
data: users = [],
isFetching: usersIsFetching,
error: usersError,
- } = useListUsersQuery({ tenantDomain })
-
+ } = useGenericGetRequestQuery({
+ path: '/api/ListGraphRequest',
+ params: {
+ Endpoint: 'users',
+ TenantFilter: tenantDomain,
+ $filter: 'assignedLicenses/$count ne 0 and accountEnabled eq true',
+ $count: true,
+ },
+ })
useEffect(() => {
if (postResults.isSuccess) {
+ // @TODO do something here?
}
if (!userId || !tenantDomain) {
ModalService.open({
@@ -594,23 +631,6 @@ const MailboxForwarding = () => {
...user,
}
- const columns = [
- {
- name: 'User',
- selector: (row) => row.User,
- sortable: true,
- wrap: true,
- exportSelector: 'User',
- },
- {
- name: 'Permissions',
- selector: (row) => row['Permissions'],
- sortable: true,
- wrap: true,
- exportSelector: 'Permissions',
- },
- ]
-
const formDisabled = queryError === true
return (
@@ -655,7 +675,7 @@ const MailboxForwarding = () => {
({
+ values={users?.Results?.map((user) => ({
value: user.mail,
name: `${user.displayName} - ${user.mail} `,
}))}
@@ -799,10 +819,18 @@ const OutOfOffice = () => {
data: users = [],
isFetching: usersIsFetching,
error: usersError,
- } = useListUsersQuery({ tenantDomain })
-
+ } = useGenericGetRequestQuery({
+ path: '/api/ListGraphRequest',
+ params: {
+ Endpoint: 'users',
+ TenantFilter: tenantDomain,
+ $filter: 'assignedLicenses/$count ne 0 and accountEnabled eq true',
+ $count: true,
+ },
+ })
useEffect(() => {
if (postResults.isSuccess) {
+ // @TODO do something here?
}
if (!userId || !tenantDomain) {
ModalService.open({
@@ -927,11 +955,7 @@ const OutOfOffice = () => {
{postResults.isSuccess && (
-
- {postResults.data.Results.map((result, idx) => (
- {result}
- ))}
-
+ {postResults.data?.Results}
)}
)
diff --git a/src/views/email-exchange/administration/MailboxRuleList.js b/src/views/email-exchange/administration/MailboxRuleList.jsx
similarity index 100%
rename from src/views/email-exchange/administration/MailboxRuleList.js
rename to src/views/email-exchange/administration/MailboxRuleList.jsx
diff --git a/src/views/email-exchange/administration/MailboxesList.js b/src/views/email-exchange/administration/MailboxesList.jsx
similarity index 98%
rename from src/views/email-exchange/administration/MailboxesList.js
rename to src/views/email-exchange/administration/MailboxesList.jsx
index cc4015b9708e..d3a7c92463a7 100644
--- a/src/views/email-exchange/administration/MailboxesList.js
+++ b/src/views/email-exchange/administration/MailboxesList.jsx
@@ -8,6 +8,7 @@ import { Link } from 'react-router-dom'
import { CippActionsOffcanvas } from 'src/components/utilities'
import { TitleButton } from 'src/components/buttons'
import { CellTip } from 'src/components/tables'
+import { cellGenericFormatter } from 'src/components/tables/CellGenericFormat'
const MailboxList = () => {
const tenant = useSelector((state) => state.app.currentTenant)
@@ -219,10 +220,10 @@ const MailboxList = () => {
},
{
name: 'Additional Email Addresses',
- selector: (row) => 'Click to Expand',
+ selector: (row) => row.AdditionalEmailAddresses,
exportSelector: 'AdditionalEmailAddresses',
sortable: true,
- omit: true,
+ cell: cellGenericFormatter(),
},
{
name: 'Actions',
diff --git a/src/views/email-exchange/administration/QuarantineList.js b/src/views/email-exchange/administration/QuarantineList.jsx
similarity index 100%
rename from src/views/email-exchange/administration/QuarantineList.js
rename to src/views/email-exchange/administration/QuarantineList.jsx
diff --git a/src/views/email-exchange/administration/ViewMobileDevices.js b/src/views/email-exchange/administration/ViewMobileDevices.jsx
similarity index 100%
rename from src/views/email-exchange/administration/ViewMobileDevices.js
rename to src/views/email-exchange/administration/ViewMobileDevices.jsx
diff --git a/src/views/email-exchange/connectors/AddConnectorTemplate.js b/src/views/email-exchange/connectors/AddConnectorTemplate.jsx
similarity index 100%
rename from src/views/email-exchange/connectors/AddConnectorTemplate.js
rename to src/views/email-exchange/connectors/AddConnectorTemplate.jsx
diff --git a/src/views/email-exchange/connectors/ConnectorList.js b/src/views/email-exchange/connectors/ConnectorList.jsx
similarity index 96%
rename from src/views/email-exchange/connectors/ConnectorList.js
rename to src/views/email-exchange/connectors/ConnectorList.jsx
index 2b818a2734d5..e4e887adbd71 100644
--- a/src/views/email-exchange/connectors/ConnectorList.js
+++ b/src/views/email-exchange/connectors/ConnectorList.jsx
@@ -143,7 +143,10 @@ const ConnectorList = () => {
title="Connector List"
titleButton={
<>
-
+
}
tenantSelector={true}
diff --git a/src/views/email-exchange/connectors/DeployConnector.js b/src/views/email-exchange/connectors/DeployConnector.jsx
similarity index 98%
rename from src/views/email-exchange/connectors/DeployConnector.js
rename to src/views/email-exchange/connectors/DeployConnector.jsx
index fee824106b2b..16ebec88e10a 100644
--- a/src/views/email-exchange/connectors/DeployConnector.js
+++ b/src/views/email-exchange/connectors/DeployConnector.jsx
@@ -64,6 +64,11 @@ const DeployConnectorTemplate = () => {
)
+ WhenFieldChanges.propTypes = {
+ field: PropTypes.node,
+ set: PropTypes.string,
+ }
+
const formValues = {
TemplateType: 'Admin',
}
@@ -84,6 +89,7 @@ const DeployConnectorTemplate = () => {
+ {/* eslint-disable react/prop-types */}
{(props) => (
{
if (tenant.defaultDomainName !== 'AllTenants') {
setTenantColumn(true)
}
- }, [tenantColumnSet])
+ }, [tenant.defaultDomainName, tenantColumnSet])
return (
{
)
+ WhenFieldChanges.propTypes = {
+ field: PropTypes.node,
+ set: PropTypes.string,
+ }
+
const formValues = {
TemplateType: 'Admin',
}
@@ -158,6 +163,7 @@ const SpamFilterAdd = () => {
{!postResults.isSuccess && (
+ {/* eslint-disable react/prop-types */}
{(props) => {
return (
<>
diff --git a/src/views/email-exchange/spamfilter/ListSpamfilterTemplates.js b/src/views/email-exchange/spamfilter/ListSpamfilterTemplates.jsx
similarity index 96%
rename from src/views/email-exchange/spamfilter/ListSpamfilterTemplates.js
rename to src/views/email-exchange/spamfilter/ListSpamfilterTemplates.jsx
index 076a7879c423..eb5bad83bbc3 100644
--- a/src/views/email-exchange/spamfilter/ListSpamfilterTemplates.js
+++ b/src/views/email-exchange/spamfilter/ListSpamfilterTemplates.jsx
@@ -1,6 +1,5 @@
import React, { useState } from 'react'
import { useSelector } from 'react-redux'
-import { CippCodeBlock, CippOffcanvas } from 'src/components/utilities'
import { CellTip } from 'src/components/tables'
import { CButton, CCallout, CSpinner } from '@coreui/react'
import { faEye, faTrash } from '@fortawesome/free-solid-svg-icons'
@@ -8,7 +7,6 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { useLazyGenericGetRequestQuery } from 'src/store/api/app'
import { CippPageList } from 'src/components/layout'
import { ModalService } from 'src/components/utilities'
-import { TitleButton } from 'src/components/buttons'
import CippCodeOffCanvas from 'src/components/utilities/CippCodeOffcanvas'
const SpamFilterListTemplates = () => {
diff --git a/src/views/email-exchange/spamfilter/Spamfilter.js b/src/views/email-exchange/spamfilter/Spamfilter.jsx
similarity index 95%
rename from src/views/email-exchange/spamfilter/Spamfilter.js
rename to src/views/email-exchange/spamfilter/Spamfilter.jsx
index f250ea4ef58a..75757fe835c6 100644
--- a/src/views/email-exchange/spamfilter/Spamfilter.js
+++ b/src/views/email-exchange/spamfilter/Spamfilter.jsx
@@ -6,6 +6,7 @@ import { useSelector } from 'react-redux'
import { CippPageList } from 'src/components/layout'
import { CippActionsOffcanvas } from 'src/components/utilities'
import { cellBooleanFormatter, cellDateFormatter, CellTip } from 'src/components/tables'
+import { TitleButton } from 'src/components/buttons'
const Offcanvas = (row, rowIndex, formatExtraData) => {
const tenant = useSelector((state) => state.app.currentTenant)
@@ -172,6 +173,14 @@ const SpamFilterList = () => {
return (
+
+
+ }
tenantSelector={true}
datatable={{
reportName: `${tenant?.defaultDomainName}-Spamfilter-list`,
diff --git a/src/views/email-exchange/tools/MailboxRestoreWizard.jsx b/src/views/email-exchange/tools/MailboxRestoreWizard.jsx
new file mode 100644
index 000000000000..490c7d54f98d
--- /dev/null
+++ b/src/views/email-exchange/tools/MailboxRestoreWizard.jsx
@@ -0,0 +1,223 @@
+import React, { useState } from 'react'
+import { CCallout, CCol, CListGroup, CListGroupItem, CRow, CSpinner } from '@coreui/react'
+import { Field, FormSpy } from 'react-final-form'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faExclamationTriangle, faTimes, faCheck } from '@fortawesome/free-solid-svg-icons'
+import { useSelector } from 'react-redux'
+import { CippWizard } from 'src/components/layout'
+import PropTypes from 'prop-types'
+import {
+ RFFCFormCheck,
+ RFFCFormInput,
+ RFFCFormSelect,
+ RFFCFormSwitch,
+ RFFSelectSearch,
+} from 'src/components/forms'
+import { TenantSelector } from 'src/components/utilities'
+import { useListUsersQuery } from 'src/store/api/users'
+import { useGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
+
+const Error = ({ name }) => (
+
+ touched && error ? (
+
+
+ {error}
+
+ ) : null
+ }
+ />
+)
+
+Error.propTypes = {
+ name: PropTypes.string.isRequired,
+}
+
+const MailboxRestoreWizard = () => {
+ const tenantDomain = useSelector((state) => state.app.currentTenant.defaultDomainName)
+ const [anrFilter, setAnrFilter] = useState('')
+ const {
+ data: sourceMailboxes = [],
+ isFetching: sMailboxesIsFetching,
+ error: sMailboxError,
+ } = useGenericGetRequestQuery({
+ path: '/api/ListMailboxes',
+ params: {
+ TenantFilter: tenantDomain,
+ SoftDeletedMailbox: true,
+ SkipLicense: true,
+ },
+ })
+ const {
+ data: targetMailboxes = [],
+ isFetching: tMailboxesIsFetching,
+ error: tMailboxError,
+ } = useGenericGetRequestQuery({
+ path: '/api/ListMailboxes',
+ params: { TenantFilter: tenantDomain, Anr: anrFilter, SkipLicense: true },
+ })
+ const currentSettings = useSelector((state) => state.app)
+ const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
+
+ const handleSubmit = async (values) => {
+ const shippedValues = {
+ TenantFilter: tenantDomain,
+ RequestName: values.RequestName,
+ SourceMailbox: values.SourceMailbox.value,
+ TargetMailbox: values.TargetMailbox.value,
+ BadItemLimit: values.BadItemLimit,
+ LargeItemLimit: values.LargeItemLimit,
+ AcceptLargeDataLoss: values.AcceptLargeDataLoss,
+ }
+
+ //alert(JSON.stringify(values, null, 2))
+ genericPostRequest({ path: '/api/ExecMailboxRestore', values: shippedValues })
+ }
+
+ return (
+
+
+
+ Step 1
+ Choose a tenant
+
+
+ {(props) => }
+
+
+
+
+ Step 2
+ Select a soft deleted mailbox to restore.
+
+
+
+ ({
+ value: mbx.ExchangeGuid,
+ name: `${mbx.displayName} <${mbx.UPN}>`,
+ }))}
+ placeholder={!sMailboxesIsFetching ? 'Select mailbox' : 'Loading...'}
+ name="SourceMailbox"
+ isLoading={sMailboxesIsFetching}
+ />
+ {sMailboxError && Failed to load source mailboxes}
+
+
+
+
+
+ Step 2
+ Select a mailbox to restore to.
+
+
+
+ ({
+ value: mbx.ExchangeGuid,
+ name: `${mbx.displayName} <${mbx.UPN}>`,
+ }))}
+ retainInput={true}
+ onInputChange={setAnrFilter}
+ isLoading={tMailboxesIsFetching}
+ />
+ {sMailboxError && Failed to load source mailboxes}
+
+
+
+
+
+ Step 3
+ Enter Restore Request Options
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Step 4
+ Confirm and apply
+
+
+
+ {postResults.isFetching && (
+
+ Loading
+
+ )}
+ {postResults.isSuccess && (
+
+ {postResults.data.Results.map((message, idx) => {
+ return {message}
+ })}
+
+ )}
+ {!postResults.isSuccess && (
+
+ {/* eslint-disable react/prop-types */}
+ {(props) => (
+ <>
+
+
+
+
+ Selected Tenant:
+ {tenantDomain}
+
+
+ Source Mailbox:
+ {props.values.SourceMailbox.label}
+
+
+ Target Mailbox:
+ {props.values.TargetMailbox.label}
+
+
+
+
+
+ )}
+
+ )}
+
+
+
+
+ )
+}
+
+export default MailboxRestoreWizard
diff --git a/src/views/email-exchange/tools/MailboxRestores.jsx b/src/views/email-exchange/tools/MailboxRestores.jsx
new file mode 100644
index 000000000000..3a12702dd2ce
--- /dev/null
+++ b/src/views/email-exchange/tools/MailboxRestores.jsx
@@ -0,0 +1,179 @@
+import { CButton } from '@coreui/react'
+import { faEllipsisV } from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import React, { useState } from 'react'
+import { useSelector } from 'react-redux'
+import { CippPageList } from 'src/components/layout'
+import { cellDateFormatter } from 'src/components/tables'
+import { CippActionsOffcanvas } from 'src/components/utilities'
+import { useLazyGenericGetRequestQuery } from 'src/store/api/app'
+import Skeleton from 'react-loading-skeleton'
+import { cellGenericFormatter } from 'src/components/tables/CellGenericFormat'
+
+const Actions = (row, rowIndex, formatExtraData) => {
+ const [ocVisible, setOCVisible] = useState(false)
+ const [getMailboxRestoreStats, mailboxRestoreStats] = useLazyGenericGetRequestQuery()
+ const tenant = useSelector((state) => state.app.currentTenant)
+
+ function statProperty(mailboxRestoreStats, propertyName) {
+ return (
+ <>
+ {mailboxRestoreStats.isFetching && }
+ {!mailboxRestoreStats.isFetching &&
+ mailboxRestoreStats.isSuccess &&
+ (mailboxRestoreStats?.data[0][propertyName]?.toString() ?? ' ')}
+
+ )
+ }
+
+ function loadOffCanvasDetails(id) {
+ setOCVisible(true)
+ getMailboxRestoreStats({
+ path: 'api/ListMailboxRestores',
+ params: {
+ TenantFilter: tenant.defaultDomainName,
+ Identity: id,
+ Statistics: true,
+ IncludeReport: true,
+ },
+ })
+ }
+ var extendedInfo = [
+ { label: 'Status', value: statProperty(mailboxRestoreStats, 'Status') },
+ { label: 'Status Detail', value: statProperty(mailboxRestoreStats, 'StatusDetail') },
+ { label: 'Sync Stage', value: statProperty(mailboxRestoreStats, 'SyncStage') },
+ { label: 'Data Consistency', value: statProperty(mailboxRestoreStats, 'DataConsistencyScore') },
+ {
+ label: 'Estimated Transfer',
+ value: statProperty(mailboxRestoreStats, 'EstimatedTransferSize'),
+ },
+ {
+ label: 'Bytes Transferred',
+ value: statProperty(mailboxRestoreStats, 'BytesTransferred'),
+ },
+ {
+ label: 'Percent Complete',
+ value: statProperty(mailboxRestoreStats, 'PercentComplete'),
+ },
+ {
+ label: 'Estimated Item Count',
+ value: statProperty(mailboxRestoreStats, 'EstimatedTransferItemCount'),
+ },
+ {
+ label: 'Transferred Items',
+ value: statProperty(mailboxRestoreStats, 'ItemsTransferred'),
+ },
+ ]
+
+ return (
+ <>
+ loadOffCanvasDetails(row.Identity)}>
+
+
+ setOCVisible(false)}
+ />
+
+ )
+}
+
+const MailboxRestores = () => {
+ const tenant = useSelector((state) => state.app.currentTenant)
+ const columns = [
+ {
+ name: 'Name',
+ selector: (row) => row['Name'],
+ sortable: true,
+ exportSelector: 'Name',
+ cell: cellGenericFormatter(),
+ },
+ {
+ name: 'Status',
+ selector: (row) => row['Status'],
+ sortable: true,
+ exportSelector: 'Status',
+ cell: cellGenericFormatter(),
+ },
+ {
+ name: 'Target Mailbox',
+ selector: (row) => row['TargetMailbox'],
+ sortable: true,
+ exportSelector: 'TargetMailbox',
+ cell: cellGenericFormatter(),
+ },
+ {
+ name: 'Created',
+ selector: (row) => row['WhenCreated'],
+ sortable: true,
+ exportSelector: 'WhenCreated',
+ cell: cellDateFormatter({ format: 'short' }),
+ },
+ {
+ name: 'Changed',
+ selector: (row) => row['WhenChanged'],
+ sortable: true,
+ exportSelector: 'WhenChanged',
+ cell: cellDateFormatter({ format: 'short' }),
+ },
+ {
+ name: 'Actions',
+ cell: Actions,
+ maxWidth: '80px',
+ },
+ ]
+ return (
+
+
+
+ )
+}
+
+export default MailboxRestores
diff --git a/src/views/email-exchange/transport/AddTransportTemplate.js b/src/views/email-exchange/transport/AddTransportTemplate.jsx
similarity index 100%
rename from src/views/email-exchange/transport/AddTransportTemplate.js
rename to src/views/email-exchange/transport/AddTransportTemplate.jsx
diff --git a/src/views/email-exchange/transport/DeployTransport.js b/src/views/email-exchange/transport/DeployTransport.jsx
similarity index 98%
rename from src/views/email-exchange/transport/DeployTransport.js
rename to src/views/email-exchange/transport/DeployTransport.jsx
index e53991072fa2..4ba34de996b4 100644
--- a/src/views/email-exchange/transport/DeployTransport.js
+++ b/src/views/email-exchange/transport/DeployTransport.jsx
@@ -41,7 +41,6 @@ const AddPolicy = () => {
values.TemplateType = values.Type
genericPostRequest({ path: '/api/AddTransportRule', values: values })
}
- //* eslint-disable react/prop-types */
const WhenFieldChanges = ({ field, set }) => (
{(
@@ -65,6 +64,11 @@ const AddPolicy = () => {
)
+ WhenFieldChanges.propTypes = {
+ field: PropTypes.node,
+ set: PropTypes.string,
+ }
+
const formValues = {
TemplateType: 'Admin',
}
@@ -85,6 +89,7 @@ const AddPolicy = () => {
+ {/* eslint-disable react/prop-types */}
{(props) => (
{
tenantSelector={true}
titleButton={
<>
-
+
}
datatable={{
diff --git a/src/views/endpoint/applications/ApplicationsAddChocoApp.js b/src/views/endpoint/applications/ApplicationsAddChocoApp.jsx
similarity index 98%
rename from src/views/endpoint/applications/ApplicationsAddChocoApp.js
rename to src/views/endpoint/applications/ApplicationsAddChocoApp.jsx
index 6f518d6f5d07..7d4ef791b391 100644
--- a/src/views/endpoint/applications/ApplicationsAddChocoApp.js
+++ b/src/views/endpoint/applications/ApplicationsAddChocoApp.jsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useRef } from 'react'
import {
CCol,
CRow,
@@ -27,7 +27,6 @@ import {
} from 'src/components/forms'
import { useLazyGenericPostRequestQuery } from 'src/store/api/app'
import { OnChange } from 'react-final-form-listeners'
-import { useRef } from 'react'
const Error = ({ name }) => (
{
)}
)
+
+ WhenFieldChanges.propTypes = {
+ field: PropTypes.node,
+ set: PropTypes.string,
+ }
+
return (
{
{!postResults.isSuccess && (
+ {/* eslint-disable react/prop-types */}
{(props) => {
return (
<>
diff --git a/src/views/endpoint/applications/ApplicationsAddOffice.js b/src/views/endpoint/applications/ApplicationsAddOffice.jsx
similarity index 99%
rename from src/views/endpoint/applications/ApplicationsAddOffice.js
rename to src/views/endpoint/applications/ApplicationsAddOffice.jsx
index 5fcd8c673b07..a3cb1890bbff 100644
--- a/src/views/endpoint/applications/ApplicationsAddOffice.js
+++ b/src/views/endpoint/applications/ApplicationsAddOffice.jsx
@@ -197,6 +197,7 @@ const AddOffice = () => {
{!postResults.isSuccess && (
+ {/* eslint-disable react/prop-types */}
{(props) => {
return (
<>
diff --git a/src/views/endpoint/applications/ApplicationsAddRMM.js b/src/views/endpoint/applications/ApplicationsAddRMM.jsx
similarity index 99%
rename from src/views/endpoint/applications/ApplicationsAddRMM.js
rename to src/views/endpoint/applications/ApplicationsAddRMM.jsx
index da43bbca5a29..a6583e00fd4c 100644
--- a/src/views/endpoint/applications/ApplicationsAddRMM.js
+++ b/src/views/endpoint/applications/ApplicationsAddRMM.jsx
@@ -129,6 +129,7 @@ const AddRMM = () => {
+ {/* eslint-disable react/prop-types */}
{(props) => {
return (
<>
diff --git a/src/views/endpoint/applications/ApplicationsAddWinGet.js b/src/views/endpoint/applications/ApplicationsAddWinGet.jsx
similarity index 98%
rename from src/views/endpoint/applications/ApplicationsAddWinGet.js
rename to src/views/endpoint/applications/ApplicationsAddWinGet.jsx
index 72a1dc7937f4..dda13eecf7c6 100644
--- a/src/views/endpoint/applications/ApplicationsAddWinGet.js
+++ b/src/views/endpoint/applications/ApplicationsAddWinGet.jsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useRef } from 'react'
import {
CCol,
CRow,
@@ -23,10 +23,8 @@ import {
RFFCFormInput,
RFFCFormRadio,
RFFCFormSelect,
- RFFCFormSwitch,
} from 'src/components/forms'
import { useLazyGenericPostRequestQuery } from 'src/store/api/app'
-import { useRef } from 'react'
import { OnChange } from 'react-final-form-listeners'
const Error = ({ name }) => (
@@ -103,6 +101,11 @@ const AddWinGet = () => {
)
+ WhenFieldChanges.propTypes = {
+ field: PropTypes.node,
+ set: PropTypes.string,
+ }
+
return (
{
{!postResults.isSuccess && (
+ {/* eslint-disable react/prop-types */}
{(props) => {
return (
<>
diff --git a/src/views/endpoint/applications/ApplicationsList.js b/src/views/endpoint/applications/ApplicationsList.jsx
similarity index 85%
rename from src/views/endpoint/applications/ApplicationsList.js
rename to src/views/endpoint/applications/ApplicationsList.jsx
index 547f036da607..6df4a06d221a 100644
--- a/src/views/endpoint/applications/ApplicationsList.js
+++ b/src/views/endpoint/applications/ApplicationsList.jsx
@@ -6,6 +6,7 @@ import { CippPageList } from 'src/components/layout'
import { faEllipsisV, faGlobeEurope, faPager, faUser } from '@fortawesome/free-solid-svg-icons'
import { CippActionsOffcanvas } from 'src/components/utilities'
import { CellTip } from 'src/components/tables'
+import { TitleButton } from 'src/components/buttons'
const Offcanvas = (row, rowIndex, formatExtraData) => {
const tenant = useSelector((state) => state.app.currentTenant)
@@ -125,9 +126,39 @@ const columns = [
const ApplicationsList = () => {
const tenant = useSelector((state) => state.app.currentTenant)
+ const titleButtons = (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{!postResults.isSuccess && (
+ {/* eslint-disable react/prop-types */}
{(props) => {
return (
<>
diff --git a/src/views/endpoint/autopilot/AutopilotAddStatusPage.js b/src/views/endpoint/autopilot/AutopilotAddStatusPage.jsx
similarity index 99%
rename from src/views/endpoint/autopilot/AutopilotAddStatusPage.js
rename to src/views/endpoint/autopilot/AutopilotAddStatusPage.jsx
index 516ee21de8be..85f83fd385a3 100644
--- a/src/views/endpoint/autopilot/AutopilotAddStatusPage.js
+++ b/src/views/endpoint/autopilot/AutopilotAddStatusPage.jsx
@@ -140,6 +140,7 @@ const ApplyStandard = () => {
{!postResults.isSuccess && (
+ {/* eslint-disable react/prop-types */}
{(props) => {
return (
<>
diff --git a/src/views/endpoint/autopilot/AutopilotListDevices.js b/src/views/endpoint/autopilot/AutopilotListDevices.jsx
similarity index 94%
rename from src/views/endpoint/autopilot/AutopilotListDevices.js
rename to src/views/endpoint/autopilot/AutopilotListDevices.jsx
index da2f8698be7d..92a9ca7382eb 100644
--- a/src/views/endpoint/autopilot/AutopilotListDevices.js
+++ b/src/views/endpoint/autopilot/AutopilotListDevices.jsx
@@ -7,6 +7,7 @@ import { CippPageList } from 'src/components/layout'
import { ModalService } from 'src/components/utilities'
import { useLazyGenericGetRequestQuery } from 'src/store/api/app'
import { CellTip } from 'src/components/tables'
+import { TitleButton } from 'src/components/buttons'
const AutopilotListDevices = () => {
const tenant = useSelector((state) => state.app.currentTenant)
@@ -100,6 +101,11 @@ const AutopilotListDevices = () => {
)}
+
+
+ }
datatable={{
keyField: 'id',
reportName: `${tenant?.defaultDomainName}-AutopilotDevices-List`,
diff --git a/src/views/endpoint/autopilot/AutopilotListProfiles.js b/src/views/endpoint/autopilot/AutopilotListProfiles.jsx
similarity index 89%
rename from src/views/endpoint/autopilot/AutopilotListProfiles.js
rename to src/views/endpoint/autopilot/AutopilotListProfiles.jsx
index a553dd63b825..659ef1a81d15 100644
--- a/src/views/endpoint/autopilot/AutopilotListProfiles.js
+++ b/src/views/endpoint/autopilot/AutopilotListProfiles.jsx
@@ -6,6 +6,7 @@ import { faEye } from '@fortawesome/free-solid-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { CippCodeBlock, CippOffcanvas } from 'src/components/utilities'
import { CippPageList } from 'src/components/layout'
+import { TitleButton } from 'src/components/buttons'
const Offcanvas = (row, rowIndex, formatExtraData) => {
const [visible, setVisible] = useState(false)
@@ -88,6 +89,14 @@ const AutopilotListProfiles = () => {
return (
+
+
+ }
tenantSelector={true}
datatable={{
reportName: `${tenant?.defaultDomainName}-AutopilotProfile-List`,
diff --git a/src/views/endpoint/autopilot/AutopilotListStatusPages.js b/src/views/endpoint/autopilot/AutopilotListStatusPages.jsx
similarity index 87%
rename from src/views/endpoint/autopilot/AutopilotListStatusPages.js
rename to src/views/endpoint/autopilot/AutopilotListStatusPages.jsx
index 04f450f2e205..352ecfee0800 100644
--- a/src/views/endpoint/autopilot/AutopilotListStatusPages.js
+++ b/src/views/endpoint/autopilot/AutopilotListStatusPages.jsx
@@ -2,6 +2,7 @@ import React from 'react'
import { useSelector } from 'react-redux'
import { CellTip, cellBooleanFormatter } from 'src/components/tables'
import { CippPageList } from 'src/components/layout'
+import { TitleButton } from 'src/components/buttons'
const columns = [
{
@@ -61,6 +62,14 @@ const AutopilotListESP = () => {
return (
+
+
+ }
tenantSelector={true}
datatable={{
reportName: `${tenant?.defaultDomainName}-AutopilotStatusPages-List`,
diff --git a/src/views/endpoint/intune/Devices.js b/src/views/endpoint/intune/Devices.jsx
similarity index 100%
rename from src/views/endpoint/intune/Devices.js
rename to src/views/endpoint/intune/Devices.jsx
diff --git a/src/views/endpoint/intune/MEMAddPolicy.js b/src/views/endpoint/intune/MEMAddPolicy.jsx
similarity index 97%
rename from src/views/endpoint/intune/MEMAddPolicy.js
rename to src/views/endpoint/intune/MEMAddPolicy.jsx
index f87f6b87dd2a..6c7efa88c689 100644
--- a/src/views/endpoint/intune/MEMAddPolicy.js
+++ b/src/views/endpoint/intune/MEMAddPolicy.jsx
@@ -79,6 +79,11 @@ const AddPolicy = () => {
)
+ WhenFieldChanges.propTypes = {
+ field: PropTypes.node,
+ set: PropTypes.string,
+ }
+
const formValues = {
TemplateType: 'Admin',
}
@@ -99,6 +104,7 @@ const AddPolicy = () => {
+ {/* eslint-disable react/prop-types */}
{(props) => (
{
Step 2
Enter the raw JSON for this policy. See{' '}
- this for more
+
+ this
+ {' '}
information.
diff --git a/src/views/endpoint/intune/MEMAddPolicyTemplate.js b/src/views/endpoint/intune/MEMAddPolicyTemplate.jsx
similarity index 100%
rename from src/views/endpoint/intune/MEMAddPolicyTemplate.js
rename to src/views/endpoint/intune/MEMAddPolicyTemplate.jsx
diff --git a/src/views/endpoint/intune/MEMCAPolicies.js b/src/views/endpoint/intune/MEMCAPolicies.jsx
similarity index 100%
rename from src/views/endpoint/intune/MEMCAPolicies.js
rename to src/views/endpoint/intune/MEMCAPolicies.jsx
diff --git a/src/views/endpoint/intune/MEMEditPolicy.js b/src/views/endpoint/intune/MEMEditPolicy.jsx
similarity index 100%
rename from src/views/endpoint/intune/MEMEditPolicy.js
rename to src/views/endpoint/intune/MEMEditPolicy.jsx
diff --git a/src/views/endpoint/intune/MEMListPolicies.js b/src/views/endpoint/intune/MEMListPolicies.jsx
similarity index 92%
rename from src/views/endpoint/intune/MEMListPolicies.js
rename to src/views/endpoint/intune/MEMListPolicies.jsx
index 31e138328662..b5e47974e0c8 100644
--- a/src/views/endpoint/intune/MEMListPolicies.js
+++ b/src/views/endpoint/intune/MEMListPolicies.jsx
@@ -6,6 +6,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { CippPageList } from 'src/components/layout'
import { Link } from 'react-router-dom'
import { CippActionsOffcanvas } from 'src/components/utilities'
+import { TitleButton } from 'src/components/buttons'
const Actions = (row, rowIndex, formatExtraData) => {
const [ocVisible, setOCVisible] = useState(false)
@@ -95,6 +96,14 @@ const IntuneList = () => {
return (
+
+
+ }
tenantSelector={true}
datatable={{
path: '/api/ListIntunePolicy?type=ESP',
diff --git a/src/views/endpoint/intune/MEMListPolicyTemplates.js b/src/views/endpoint/intune/MEMListPolicyTemplates.jsx
similarity index 98%
rename from src/views/endpoint/intune/MEMListPolicyTemplates.js
rename to src/views/endpoint/intune/MEMListPolicyTemplates.jsx
index 851c6731bedd..4ca9452daeff 100644
--- a/src/views/endpoint/intune/MEMListPolicyTemplates.js
+++ b/src/views/endpoint/intune/MEMListPolicyTemplates.jsx
@@ -1,6 +1,5 @@
import React, { useState } from 'react'
import { useSelector } from 'react-redux'
-import { CippCodeBlock, CippOffcanvas } from 'src/components/utilities'
import { CellTip, CippDatatable } from 'src/components/tables'
import {
CCardBody,
diff --git a/src/views/home/Home.js b/src/views/home/Home.jsx
similarity index 86%
rename from src/views/home/Home.js
rename to src/views/home/Home.jsx
index 761be7b0d35d..0bf92e0bc991 100644
--- a/src/views/home/Home.js
+++ b/src/views/home/Home.jsx
@@ -29,6 +29,7 @@ import { CellDelegatedPrivilege } from 'src/components/tables/CellDelegatedPrivi
import Portals from 'src/data/portals'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { Link } from 'react-router-dom'
+import { TableModalButton } from 'src/components/buttons'
const Home = () => {
const [visible, setVisible] = useState(false)
@@ -54,6 +55,15 @@ const Home = () => {
params: { tenantFilter: currentTenant.defaultDomainName },
})
+ const GlobalAdminList = useGenericGetRequestQuery({
+ path: '/api/ListGraphRequest',
+ params: {
+ tenantFilter: currentTenant.defaultDomainName,
+ Endpoint: "/directoryRoles(roleTemplateId='62e90394-69f5-4237-9190-012177145e10')/members",
+ $select: 'displayName,userPrincipalName,accountEnabled',
+ },
+ })
+
const {
data: sharepoint,
isLoading: isLoadingSPQuota,
@@ -106,6 +116,11 @@ const Home = () => {
link: `/identity/administration/users?customerId=${currentTenant.customerId}`,
icon: faUser,
},
+ {
+ label: 'List Mailboxes',
+ link: `/email/administration/mailboxes?customerId=${currentTenant.customerId}`,
+ icon: faMailBulk,
+ },
{
label: 'List Groups',
link: `/identity/administration/groups?customerId=${currentTenant.customerId}`,
@@ -133,10 +148,10 @@ const Home = () => {
(p) => p.displayName === 'AllTenants' || p.displayName === currentTenant.defaultDomainName,
)
.flatMap((tenant) => {
- return Object.keys(tenant.standards).map((standard) => {
+ return Object.keys(tenant.standards).map((standard, idx) => {
const standardDisplayname = allStandardsList.filter((p) => p.name.includes(standard))
return (
-
+
{standardDisplayname[0]?.label} ({tenant.displayName})
)
@@ -187,14 +202,20 @@ const Home = () => {
-
-
- {issuccessUserCounts && !isFetchingUserCount ? dashboard?.Gas : }
-
+ {GlobalAdminList.isSuccess ? (
+ <>
+
+
+ ) : (
+
+ )}
@@ -246,7 +267,7 @@ const Home = () => {
{!isLoadingOrg && !isFetchingOrg && organization?.onPremisesSyncEnabled ? (
<>
- Directory Sync:
+ Directory Sync:
{organization?.onPremisesLastSyncDateTime ? (
) : (
@@ -254,7 +275,7 @@ const Home = () => {
)}
- Password Sync:
+ Password Sync:
{organization?.onPremisesLastPasswordSyncDateTime ? (
) : (
@@ -273,7 +294,9 @@ const Home = () => {
{(isLoadingOrg || isFetchingOrg) && }
{!isFetchingOrg &&
issuccessOrg &&
- organization?.verifiedDomains?.map((item) => {item.name})}
+ organization?.verifiedDomains?.map((item, idx) => (
+ {item.name}
+ ))}
Capabilities
@@ -288,12 +311,12 @@ const Home = () => {
}
return plan
}, [])
- .map((plan) => (
- <>
- {plan == 'exchange' && Exchange}
- {plan == 'AADPremiumService' && AAD Premium}
- {plan == 'WindowsDefenderATP' && Windows Defender}
-
+ .map((plan, idx) => (
+
+ {plan === 'exchange' &&
Exchange}
+ {plan === 'AADPremiumService' && AAD Premium}
+ {plan === 'WindowsDefenderATP' && Windows Defender}
+
))}
@@ -329,10 +352,10 @@ const Home = () => {
{(isLoadingPartners || isFetchingPartners) && }
{issuccessPartners &&
!isFetchingPartners &&
- partners?.Results.map((partner) => {
+ partners?.Results.map((partner, idx) => {
if (partner.TenantInfo) {
return (
-
+
{partner.TenantInfo.displayName} (
{partner.TenantInfo.defaultDomainName})
diff --git a/src/views/identity/administration/AddGroup.js b/src/views/identity/administration/AddGroup.jsx
similarity index 61%
rename from src/views/identity/administration/AddGroup.js
rename to src/views/identity/administration/AddGroup.jsx
index 540ddcfa4202..9faa8544bca7 100644
--- a/src/views/identity/administration/AddGroup.js
+++ b/src/views/identity/administration/AddGroup.jsx
@@ -19,10 +19,12 @@ import {
RFFCFormRadio,
RFFCFormSelect,
RFFCFormTextarea,
+ RFFSelectSearch,
} from 'src/components/forms'
import { CippPage } from 'src/components/layout/CippPage'
import { useLazyGenericPostRequestQuery } from 'src/store/api/app'
import { useListDomainsQuery } from 'src/store/api/domains'
+import { useListUsersQuery } from 'src/store/api/users'
import { useSelector } from 'react-redux'
const AddGroup = () => {
@@ -33,6 +35,12 @@ const AddGroup = () => {
error: domainsError,
} = useListDomainsQuery({ tenantDomain })
+ const {
+ data: users = [],
+ isFetching: usersIsFetching,
+ error: usersError,
+ } = useListUsersQuery({ tenantDomain })
+
const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
const onSubmit = (values) => {
const shippedValues = {
@@ -44,10 +52,13 @@ const AddGroup = () => {
groupType: values.groupType,
allowExternal: values.allowExternal,
membershipRules: values.membershipRules,
+ AddMember: values.AddMembers,
+ AddOwner: values.AddOwners,
}
//window.alert(JSON.stringify(shippedValues))
genericPostRequest({ path: '/api/AddGroup', values: shippedValues })
}
+
return (
@@ -90,6 +101,41 @@ const AddGroup = () => {
)}
{domainsError && Failed to load list of domains}
+
+
+
+
+ ({
+ value: user.userPrincipalName,
+ name: `${user.displayName} - ${user.userPrincipalName}`,
+ }))}
+ placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
+ name="AddOwners"
+ />
+ {usersError && Failed to load list of users}
+
+
+
+
+ ({
+ value: user.userPrincipalName,
+ name: `${user.displayName} - ${user.userPrincipalName}`,
+ }))}
+ placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
+ name="AddMembers"
+ />
+ {usersError && Failed to load list of users}
+
+
+
+
+
@@ -103,22 +149,22 @@ const AddGroup = () => {
label="Mail Enabled Security Group"
value="security"
/>
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/src/views/identity/administration/AddGroupTemplate.js b/src/views/identity/administration/AddGroupTemplate.jsx
similarity index 100%
rename from src/views/identity/administration/AddGroupTemplate.js
rename to src/views/identity/administration/AddGroupTemplate.jsx
diff --git a/src/views/identity/administration/AddUser.js b/src/views/identity/administration/AddUser.jsx
similarity index 100%
rename from src/views/identity/administration/AddUser.js
rename to src/views/identity/administration/AddUser.jsx
diff --git a/src/views/identity/administration/Deleted.js b/src/views/identity/administration/Deleted.jsx
similarity index 97%
rename from src/views/identity/administration/Deleted.js
rename to src/views/identity/administration/Deleted.jsx
index 757e3867cc6b..85eb4efc6c64 100644
--- a/src/views/identity/administration/Deleted.js
+++ b/src/views/identity/administration/Deleted.jsx
@@ -40,7 +40,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
color: 'info',
modal: true,
modalUrl: `/api/ExecRestoreDeleted?TenantFilter=${tenant.defaultDomainName}&ID=${row.id}`,
- modalMessage: 'Are you sure you want to create a Temporary Access Pass?',
+ modalMessage: 'Are you sure you want to restore the user?',
},
]}
placement="end"
diff --git a/src/views/identity/administration/DeployGroupTemplate.js b/src/views/identity/administration/DeployGroupTemplate.jsx
similarity index 98%
rename from src/views/identity/administration/DeployGroupTemplate.js
rename to src/views/identity/administration/DeployGroupTemplate.jsx
index 4e89504a72c6..64b730df4d43 100644
--- a/src/views/identity/administration/DeployGroupTemplate.js
+++ b/src/views/identity/administration/DeployGroupTemplate.jsx
@@ -10,7 +10,6 @@ import {
Condition,
RFFCFormCheck,
RFFCFormInput,
- RFFCFormRadio,
RFFCFormSelect,
RFFCFormTextarea,
} from 'src/components/forms'
@@ -71,6 +70,11 @@ const ApplyGroupTemplate = () => {
)
+ WhenFieldChanges.propTypes = {
+ field: PropTypes.node,
+ set: PropTypes.string,
+ }
+
const formValues = {
TemplateType: 'Admin',
}
@@ -91,6 +95,7 @@ const ApplyGroupTemplate = () => {
+ {/* eslint-disable react/prop-types */}
{(props) => (
(
{
+ const currentDate = new Date()
+ const [startDate, setStartDate] = useState(currentDate)
+
const tenantDomain = useSelector((state) => state.app.currentTenant.defaultDomainName)
const {
data: users = [],
@@ -41,6 +52,7 @@ const OffboardingWizard = () => {
const [genericPostRequest, postResults] = useLazyGenericPostRequestQuery()
const handleSubmit = async (values) => {
+ const unixTime = Math.floor(startDate.getTime() / 1000)
const shippedValues = {
TenantFilter: tenantDomain,
OOO: values.OOO ? values.OOO : '',
@@ -61,6 +73,10 @@ const OffboardingWizard = () => {
removeMobile: values.RemoveMobile,
keepCopy: values.keepCopy,
removePermissions: values.removePermissions,
+ Scheduled: values.Scheduled?.enabled ? { enabled: true, date: unixTime } : { enabled: false },
+ PostExecution: values.Scheduled?.enabled
+ ? { webhook: values.webhook, psa: values.psa, email: values.email }
+ : '',
}
//alert(JSON.stringify(values, null, 2))
@@ -77,7 +93,6 @@ const OffboardingWizard = () => {
title="Tenant Choice"
description="Choose the tenant in which to offboard a user"
>
- {console.log(currentSettings.offboardingDefaults)}
Step 1
Choose a tenant
@@ -194,6 +209,34 @@ const OffboardingWizard = () => {
/>
+
+
+
+
+
+
+
+
+
+
+ setStartDate(date)}
+ />
+
+
+
+
+
+
+
+
+