}
>
{saveTemplate.isPending
- ? "Saving..."
+ ? 'Saving...'
: saveTemplate.isSuccess
- ? editGUID ? "Saved" : "Save Another"
- : `${editGUID ? "Update" : "Save"} Template (${getTotalApps()} app${getTotalApps() !== 1 ? "s" : ""})`}
+ ? editGUID
+ ? 'Saved'
+ : 'Save Another'
+ : `${editGUID ? 'Update' : 'Save'} Template (${getTotalApps()} app${getTotalApps() !== 1 ? 's' : ''})`}
-
-
-
-
-
-
-
-
+ {canViewGdapChecks && (
+ <>
+
+
+
+
+
+
+
+
+
+ )}
);
diff --git a/src/pages/tenant/gdap-management/offboarding.js b/src/pages/tenant/gdap-management/offboarding.js
index d9486f775c25..aa6cddc87d0d 100644
--- a/src/pages/tenant/gdap-management/offboarding.js
+++ b/src/pages/tenant/gdap-management/offboarding.js
@@ -22,60 +22,46 @@ const Page = () => {
return vendor.vendorTenantId;
})
.join(",");
- const vendorGraphFilter = `appOwnerOrganizationId in (${vendorFilter})`;
const tenantId = useWatch({
control: formControl.control,
name: "tenantFilter",
});
const gdapRelationships = ApiGetCall({
- url: "/api/ListGraphRequest",
- data: {
- Endpoint: "tenantRelationships/delegatedAdminRelationships",
- tenantFilter: "",
- $top: 300,
- },
+ url: "/api/ListGDAPRelationships",
queryKey: "ListGDAPRelationship",
});
const cspContracts = ApiGetCall({
- url: "/api/ListGraphRequest",
- data: {
- Endpoint: "contracts",
- tenantFilter: "",
- $top: 300,
- },
+ url: "/api/ListGDAPContracts",
queryKey: "ListContracts",
});
const mspApps = ApiGetCall({
- url: "/api/ListGraphRequest",
+ url: "/api/ListGDAPServicePrincipals",
data: {
- Endpoint: "servicePrincipals",
- TenantFilter: tenantId?.value,
- $filter: `appOwnerOrganizationId eq %partnertenantid%`,
- $select: "id,displayName,appId,appOwnerOrganizationId",
- $count: true,
+ tenantFilter: tenantId?.value,
+ ownerType: "partner",
},
queryKey: "ListMSPApps-" + tenantId?.value,
+ waiting: Boolean(tenantId?.value),
});
const vendorApps = ApiGetCallWithPagination({
- url: "/api/ListGraphRequest",
+ url: "/api/ListGDAPServicePrincipals",
data: {
- Endpoint: "servicePrincipals",
- TenantFilter: tenantId?.value,
- $filter: vendorGraphFilter,
- $select: "id,displayName,appId,appOwnerOrganizationId",
- $count: true,
+ tenantFilter: tenantId?.value,
+ ownerType: "vendor",
+ vendorTenantIds: vendorFilter,
},
queryKey: "ListVendorApps-" + tenantId?.value,
+ waiting: Boolean(tenantId?.value),
});
return (
<>
{
label="Select Tenant to Offboard"
type="autoComplete"
api={{
- url: "/api/ExecExcludeTenant",
- data: {
- ListAll: true,
- },
- queryKey: "ListAllTenants",
+ url: "/api/ListOffboardTenants",
+ queryKey: "ListOffboardTenants",
labelField: (tenant) => {
return `${tenant.displayName} (${tenant.defaultDomainName})`;
},
@@ -205,13 +188,11 @@ const Page = () => {
label="Vendor Applications to Remove"
type="autoComplete"
api={{
- url: "/api/ListGraphRequest",
+ url: "/api/ListGDAPServicePrincipals",
data: {
- Endpoint: "servicePrincipals",
- TenantFilter: tenantId.value,
- $filter: vendorGraphFilter,
- $select: "id,displayName,appId,appOwnerOrganizationId",
- $count: true,
+ tenantFilter: tenantId.value,
+ ownerType: "vendor",
+ vendorTenantIds: vendorFilter,
},
dataKey: "Results",
queryKey: "ListVendorApps-" + tenantId.value,
diff --git a/src/pages/tenant/gdap-management/onboarding/start.js b/src/pages/tenant/gdap-management/onboarding/start.js
index c2908d22a467..c5cf9cf5da3a 100644
--- a/src/pages/tenant/gdap-management/onboarding/start.js
+++ b/src/pages/tenant/gdap-management/onboarding/start.js
@@ -49,11 +49,7 @@ const Page = () => {
});
const relationshipList = ApiGetCall({
- url: "/api/ListGraphRequest",
- data: {
- TenantFilter: "",
- Endpoint: "tenantRelationships/delegatedAdminRelationships",
- },
+ url: "/api/ListGDAPRelationships",
queryKey: "GDAPRelationshipOnboarding",
});
const onboardingList = ApiGetCallWithPagination({
@@ -317,10 +313,7 @@ const Page = () => {
label="Select GDAP Relationship"
type="autoComplete"
api={{
- url: "/api/ListGraphRequest",
- data: {
- Endpoint: "tenantRelationships/delegatedAdminRelationships",
- },
+ url: "/api/ListGDAPRelationships",
excludeTenantFilter: true,
queryKey: "GDAPRelationships",
dataKey: "Results",
diff --git a/src/pages/tenant/gdap-management/relationships/index.js b/src/pages/tenant/gdap-management/relationships/index.js
index 8c3c3da01bc0..f3a3e4f441a7 100644
--- a/src/pages/tenant/gdap-management/relationships/index.js
+++ b/src/pages/tenant/gdap-management/relationships/index.js
@@ -4,8 +4,6 @@ import tabOptions from "../tabOptions";
import CippTablePage from "../../../../components/CippComponents/CippTablePage";
import CippGdapActions from "../../../../components/CippComponents/CippGdapActions";
-const pageTitle = "GDAP Relationships";
-
const actions = CippGdapActions();
const simpleColumns = [
@@ -47,20 +45,12 @@ const offCanvas = {
extendedInfoFields: simpleColumns,
};
-const apiUrl = "/api/ListGraphRequest";
-const apiData = {
- Endpoint: "tenantRelationships/delegatedAdminRelationships",
- tenantFilter: "",
- $top: 300,
-};
-
const Page = () => {
return (
{
const [relationshipData, setRelationshipData] = useState({});
const relationshipRequest = ApiGetCall({
- url: `/api/ListGraphRequest?Endpoint=tenantRelationships/delegatedAdminRelationships/${id}`,
+ url: `/api/ListGDAPRelationships?id=${id}`,
queryKey: `ListRelationships-${id}`,
});
diff --git a/src/pages/tenant/gdap-management/relationships/relationship/mappings.js b/src/pages/tenant/gdap-management/relationships/relationship/mappings.js
index 3ec708b70c66..b9669e3f725f 100644
--- a/src/pages/tenant/gdap-management/relationships/relationship/mappings.js
+++ b/src/pages/tenant/gdap-management/relationships/relationship/mappings.js
@@ -12,7 +12,7 @@ const Page = () => {
const { id } = router.query;
const relationshipRequest = ApiGetCall({
- url: `/api/ListGraphRequest?Endpoint=tenantRelationships/delegatedAdminRelationships/${id}`,
+ url: `/api/ListGDAPRelationships?id=${id}`,
queryKey: `ListRelationships-${id}`,
});
diff --git a/src/pages/tenant/manage/applied-standards.js b/src/pages/tenant/manage/applied-standards.js
index 221f7ca2e335..58cc78f19c88 100644
--- a/src/pages/tenant/manage/applied-standards.js
+++ b/src/pages/tenant/manage/applied-standards.js
@@ -121,6 +121,17 @@ const Page = () => {
enabled: !!templateId, // Only run the query if templateId is available
})
+ // Fetch drift deviation data for drift templates
+ const isDriftTemplate = selectedTemplate?.type === 'drift'
+ const driftApi = ApiGetCall({
+ url: '/api/listTenantDrift',
+ data: {
+ tenantFilter: currentTenant,
+ },
+ queryKey: `TenantDrift-applied-${currentTenant}`,
+ enabled: isDriftTemplate && !!currentTenant,
+ })
+
useEffect(() => {
if (templateId && templateDetails.isSuccess && templateDetails.data) {
const selectedTemplate = templateDetails.data.find((template) => template.GUID === templateId)
@@ -1165,6 +1176,50 @@ const Page = () => {
})
}
+ // For drift templates, cross-reference with drift deviation data
+ if (isDriftTemplate && driftApi.isSuccess && driftApi.data) {
+ const tenantDriftItems = Array.isArray(driftApi.data)
+ ? driftApi.data.filter((item) => item.tenantFilter === currentTenant)
+ : []
+
+ // Build a lookup of standardName -> deviation status
+ const deviationLookup = {}
+ tenantDriftItems.forEach((item) => {
+ if (item.acceptedDeviations) {
+ item.acceptedDeviations.forEach((dev) => {
+ if (dev?.standardName) {
+ deviationLookup[dev.standardName] = 'Accepted'
+ deviationLookup[`standards.${dev.standardName}`] = 'Accepted'
+ }
+ })
+ }
+ if (item.customerSpecificDeviations) {
+ item.customerSpecificDeviations.forEach((dev) => {
+ if (dev?.standardName) {
+ deviationLookup[dev.standardName] = 'CustomerSpecific'
+ deviationLookup[`standards.${dev.standardName}`] = 'CustomerSpecific'
+ }
+ })
+ }
+ })
+
+ // Update compliance status for accepted deviations
+ allStandards.forEach((standard) => {
+ if (standard.complianceStatus === 'Non-Compliant') {
+ const devStatus =
+ deviationLookup[standard.standardId] ||
+ deviationLookup[standard.standardId?.replace(/^standards\./, '')]
+ if (devStatus === 'Accepted') {
+ standard.complianceStatus = 'Accepted Deviation'
+ standard.deviationStatus = 'Accepted'
+ } else if (devStatus === 'CustomerSpecific') {
+ standard.complianceStatus = 'Customer Specific'
+ standard.deviationStatus = 'CustomerSpecific'
+ }
+ }
+ })
+ }
+
setComparisonData(allStandards)
} else {
setComparisonData([])
@@ -1179,6 +1234,10 @@ const Page = () => {
comparisonApi.isSuccess,
comparisonApi.data,
comparisonApi.isError,
+ isDriftTemplate,
+ driftApi.isSuccess,
+ driftApi.data,
+ currentTenant,
])
const comparisonModeOptions = [{ label: 'Compare Tenant to Standard', value: 'standard' }]
@@ -1233,6 +1292,9 @@ const Page = () => {
(filter === 'compliant' && standard.complianceStatus === 'Compliant') ||
(filter === 'nonCompliant' && standard.complianceStatus === 'Non-Compliant') ||
(filter === 'overridden' && standard.complianceStatus === 'Overridden') ||
+ (filter === 'acceptedDeviation' &&
+ (standard.complianceStatus === 'Accepted Deviation' ||
+ standard.complianceStatus === 'Customer Specific')) ||
(filter === 'nonCompliantWithLicense' &&
standard.complianceStatus === 'Non-Compliant' &&
!hasLicenseMissing) ||
@@ -1262,6 +1324,12 @@ const Page = () => {
comparisonData?.filter((standard) => standard.complianceStatus === 'Compliant').length || 0
const nonCompliantCount =
comparisonData?.filter((standard) => standard.complianceStatus === 'Non-Compliant').length || 0
+ const acceptedDeviationCount =
+ comparisonData?.filter(
+ (standard) =>
+ standard.complianceStatus === 'Accepted Deviation' ||
+ standard.complianceStatus === 'Customer Specific'
+ ).length || 0
const reportingDisabledCount =
comparisonData?.filter((standard) => standard.complianceStatus === 'Reporting Disabled')
.length || 0
@@ -1297,7 +1365,9 @@ const Page = () => {
const compliancePercentage =
allCount > 0
? Math.round(
- (compliantCount / (allCount - reportingDisabledCount - overriddenCount || 1)) * 100
+ ((compliantCount + acceptedDeviationCount) /
+ (allCount - reportingDisabledCount - overriddenCount || 1)) *
+ 100
)
: 0
@@ -1371,7 +1441,7 @@ const Page = () => {
backUrl="/tenant/standards"
actions={actions}
actionsData={{}}
- isFetching={comparisonApi.isFetching || templateDetails.isFetching}
+ isFetching={comparisonApi.isFetching || templateDetails.isFetching || driftApi.isFetching}
>
@@ -1606,6 +1676,17 @@ const Page = () => {
combinedScore >= 80 ? 'success' : combinedScore >= 60 ? 'warning' : 'error'
}
/>
+
+ {isDriftTemplate ? : }
+
+ }
+ label={isDriftTemplate ? 'Drift Standard' : 'Classic Standard'}
+ size="small"
+ color={isDriftTemplate ? 'info' : 'default'}
+ variant="outlined"
+ />
)}
))}
+ {alignedItemsWithActions.map((item) => (
+
+ ))}
+
{/* Hidden ExecutiveReportButton that gets triggered programmatically */}
{
- return ;
+ const currentTenant = useSettings().currentTenant;
+ const syncDialog = useDialog();
+ const [syncQueueId, setSyncQueueId] = useState(null);
+
+ const isAllTenants = currentTenant === "AllTenants";
+ const [useReportDB, setUseReportDB] = useState(true);
+
+ useEffect(() => {
+ setUseReportDB(true);
+ }, [currentTenant]);
+
+ const simpleColumns = isAllTenants
+ ? ["Tenant", "Name", "ApplicationID", "ObjectID", "Scope", "StartTime", "CacheTimestamp"]
+ : ["Name", "ApplicationID", "ObjectID", "Scope", "StartTime", "CacheTimestamp"];
+
+ return (
+ <>
+
+ {useReportDB && (
+ <>
+
+
+
+ )}
+
+
+ : }
+ label={useReportDB ? "Cached" : "Live"}
+ color="primary"
+ size="small"
+ onClick={isAllTenants ? undefined : () => setUseReportDB((prev) => !prev)}
+ clickable={!isAllTenants}
+ disabled={isAllTenants}
+ variant="outlined"
+ />
+
+
+
+ }
+ />
+ {
+ if (response?.Metadata?.QueueId) {
+ setSyncQueueId(response.Metadata.QueueId);
+ }
+ },
+ }}
+ />
+
+ );
};
-Page.getLayout = (page) => {page};
+Page.getLayout = (page) => {page};
export default Page;
diff --git a/src/pages/tenant/reports/graph-office-reports/index.js b/src/pages/tenant/reports/graph-office-reports/index.js
index b97505d12ed4..39bb153c06b6 100644
--- a/src/pages/tenant/reports/graph-office-reports/index.js
+++ b/src/pages/tenant/reports/graph-office-reports/index.js
@@ -64,7 +64,7 @@ const Page = () => {
waiting: !!currentTenant,
})
- const reportOptions = (reportListApi.data ?? []).map((r) => ({
+ const reportOptions = (Array.isArray(reportListApi.data) ? reportListApi.data : []).map((r) => ({
label: prettifyReportName(r.name),
value: r.name,
type: r.type ?? null,
@@ -156,7 +156,7 @@ const Page = () => {
) : (
{
const pageTitle = 'Standard & Drift Alignment'
+ const [granular, setGranular] = useState(false)
- const filterList = [
+ const summaryFilterList = [
{
filterName: 'Drift Templates',
value: [{ id: 'standardType', value: 'drift' }],
@@ -21,7 +25,35 @@ const Page = () => {
},
]
- const actions = [
+ const granularFilterList = [
+ {
+ filterName: 'Non-Compliant',
+ value: [{ id: 'complianceStatus', value: 'Non-Compliant' }],
+ type: 'column',
+ },
+ {
+ filterName: 'Compliant',
+ value: [{ id: 'complianceStatus', value: 'Compliant' }],
+ type: 'column',
+ },
+ {
+ filterName: 'Accepted Deviation',
+ value: [{ id: 'complianceStatus', value: 'Accepted Deviation' }],
+ type: 'column',
+ },
+ {
+ filterName: 'Customer Specific',
+ value: [{ id: 'complianceStatus', value: 'Customer Specific' }],
+ type: 'column',
+ },
+ {
+ filterName: 'License Missing',
+ value: [{ id: 'complianceStatus', value: 'License Missing' }],
+ type: 'column',
+ },
+ ]
+
+ const summaryActions = [
{
label: 'View Tenant Report',
link: '/tenant/manage/applied-standards/?tenantFilter=[tenantFilter]&templateId=[standardId]',
@@ -29,6 +61,13 @@ const Page = () => {
color: 'info',
target: '_self',
},
+ {
+ label: 'Edit Template',
+ link: '/tenant/standards/templates/template?id=[standardId]&type=[standardType]',
+ icon: ,
+ color: 'success',
+ target: '_self',
+ },
{
label: 'Manage Drift',
link: '/tenant/manage/drift?templateId=[standardId]&tenantFilter=[tenantFilter]',
@@ -53,22 +92,401 @@ const Page = () => {
},
]
+ const granularActions = [
+ {
+ label: 'View Tenant Report',
+ link: '/tenant/manage/applied-standards/?tenantFilter=[tenantFilter]&templateId=[templateId]',
+ icon: ,
+ color: 'info',
+ target: '_self',
+ },
+ {
+ label: 'Edit Template',
+ link: '/tenant/standards/templates/template?id=[templateId]&type=[templateType]',
+ icon: ,
+ color: 'success',
+ target: '_self',
+ },
+ {
+ label: 'Manage Drift',
+ link: '/tenant/manage/drift?templateId=[templateId]&tenantFilter=[tenantFilter]',
+ icon: ,
+ color: 'info',
+ target: '_self',
+ condition: (row) => row.templateType === 'drift',
+ },
+ ]
+
+ const parseValue = (value) => {
+ if (value === null || value === undefined || value === '') return null
+ if (typeof value === 'string') {
+ try {
+ return JSON.parse(value)
+ } catch {
+ return value
+ }
+ }
+ return value
+ }
+
+ const normalizeObj = (val) => {
+ if (Array.isArray(val)) return val.map(normalizeObj)
+ if (val !== null && typeof val === 'object') {
+ return Object.fromEntries(
+ Object.keys(val)
+ .sort()
+ .map((k) => [k, normalizeObj(val[k])])
+ )
+ }
+ return val
+ }
+
+ const compareValues = (expected, current) => {
+ if (!expected || !current) return null
+ try {
+ const expectedObj = normalizeObj(
+ typeof expected === 'object' ? expected : JSON.parse(expected)
+ )
+ const currentObj = normalizeObj(typeof current === 'object' ? current : JSON.parse(current))
+ if (JSON.stringify(expectedObj) === JSON.stringify(currentObj)) return null
+ const differences = {}
+ const allKeys = new Set([...Object.keys(expectedObj), ...Object.keys(currentObj)])
+ allKeys.forEach((key) => {
+ const e = normalizeObj(expectedObj[key])
+ const c = normalizeObj(currentObj[key])
+ if (JSON.stringify(e) !== JSON.stringify(c)) {
+ differences[key] = { expected: expectedObj[key], current: currentObj[key] }
+ }
+ })
+ return Object.keys(differences).length > 0 ? differences : null
+ } catch {
+ return null
+ }
+ }
+
+ const granularOffCanvas = {
+ size: 'md',
+ title: 'Standard Details',
+ contentPadding: 0,
+ children: (row) => {
+ const expectedParsed = parseValue(row.expectedValue)
+ const currentParsed = parseValue(row.currentValue)
+ const diffs = compareValues(expectedParsed, currentParsed)
+ const baseName = row.standardId?.split('.').slice(0, -1).join('.')
+ const prettyName =
+ standardsData.find((s) => s.name === row.standardId)?.label ??
+ standardsData.find((s) => s.name === baseName)?.label ??
+ row.standardName
+
+ const complianceColors = {
+ compliant: 'success',
+ 'non-compliant': 'error',
+ 'accepted deviation': 'info',
+ 'customer specific': 'info',
+ 'license missing': 'warning',
+ 'reporting disabled': 'default',
+ }
+ const statusColor =
+ complianceColors[String(row.complianceStatus ?? '').toLowerCase()] ?? 'default'
+
+ const properties = [
+ { label: 'Standard', value: prettyName },
+ { label: 'Status', value: row.complianceStatus, color: statusColor },
+ { label: 'Template', value: row.templateName },
+ {
+ label: 'Type',
+ value: row.standardType === 'drift' ? 'Drift Standard' : 'Classic Standard',
+ },
+ {
+ label: 'Last Applied',
+ value: row.latestDataCollection
+ ? new Date(row.latestDataCollection).toLocaleString()
+ : 'N/A',
+ },
+ ]
+
+ return (
+
+ {/* Property list */}
+ }
+ sx={{ borderBottom: '1px solid', borderColor: 'divider' }}
+ >
+ {properties.map(({ label, value, color }) => (
+
+
+ {label}
+
+ {color ? (
+
+ ) : (
+
+ {value ?? 'N/A'}
+
+ )}
+
+ ))}
+
+
+ {/* Diff / value content */}
+ {(expectedParsed || currentParsed) && (
+
+ {diffs ? (
+ <>
+
+ Property Differences
+
+ {Object.entries(diffs).map(([key, { expected, current }]) => (
+
+
+ {key}
+
+
+
+
+ Expected
+
+
+
+ {JSON.stringify(expected, null, 2)}
+
+
+
+
+
+ Current
+
+
+
+ {JSON.stringify(current, null, 2)}
+
+
+
+
+
+ ))}
+
+ ) : (
+ <>
+ {expectedParsed !== null && (
+
+
+ Expected
+
+
+
+ {typeof expectedParsed === 'object'
+ ? JSON.stringify(expectedParsed, null, 2)
+ : String(expectedParsed)}
+
+
+
+ )}
+ {currentParsed !== null && (
+
+
+ Current
+
+
+
+ {typeof currentParsed === 'object'
+ ? JSON.stringify(currentParsed, null, 2)
+ : String(currentParsed)}
+
+
+
+ )}
+
+ )}
+
+ )}
+
+ )
+ },
+ }
+
+ const modeToggle = (
+
+
+
+ ) : (
+
+ )
+ }
+ label={granular ? 'Per Standard' : 'Summary'}
+ onClick={() => setGranular((v) => !v)}
+ color="primary"
+ variant="filled"
+ size="small"
+ clickable
+ />
+
+
+ )
+
return (
)
}
diff --git a/src/pages/tenant/tools/graph-explorer/index.js b/src/pages/tenant/tools/graph-explorer/index.js
index 2cbbd17a3ba1..bf4fde876376 100644
--- a/src/pages/tenant/tools/graph-explorer/index.js
+++ b/src/pages/tenant/tools/graph-explorer/index.js
@@ -18,9 +18,9 @@ const Page = () => {
const apiData = ApiGetCallWithPagination({
url: apiFilter.endpoint ? "/api/ListGraphRequest" : "/api/ListEmptyResults",
- data: apiFilter,
+ data: { tenantFilter, ...apiFilter },
queryKey: queryKey,
- waiting: !!apiFilter.endpoint,
+ waiting: !!apiFilter.endpoint && viewMode === "json",
});
const jsonData = apiData?.data?.pages?.[0]?.Results || apiData?.data || {};
diff --git a/src/pages/tools/community-repos/index.js b/src/pages/tools/community-repos/index.js
index 4213f74127d9..8b09c824d1e1 100644
--- a/src/pages/tools/community-repos/index.js
+++ b/src/pages/tools/community-repos/index.js
@@ -82,6 +82,7 @@ const Page = () => {
icon: ,
multiPost: false,
queryKey: "CommunityRepos",
+ condition: (row) => row.BuiltIn !== true,
},
{
label: "Set Upload Branch",
diff --git a/src/pages/tools/custom-tests/add.jsx b/src/pages/tools/custom-tests/add.jsx
index fb4387bbbdb8..6951fe57c507 100644
--- a/src/pages/tools/custom-tests/add.jsx
+++ b/src/pages/tools/custom-tests/add.jsx
@@ -406,7 +406,7 @@ All UPNs: {{join(Result[*].UserPrincipalName, ", ")}}`,
placeholder: `# Example: Find disabled users with licenses
param($TenantFilter, $DaysThreshold = 30)
-$users = New-CIPPDbRequest -TenantFilter $TenantFilter -Type 'Users'
+$users = Get-CIPPTestData -TenantFilter $TenantFilter -Type 'Users'
$results = $users | Where-Object {
$_.assignedLicenses.Count -gt 0 -and
$_.accountEnabled -eq $false
@@ -655,7 +655,7 @@ return $results`,
Data Access
- Read-only via New-CIPPDbRequest and Get-CIPPDbItem{' '}
+ Read-only via Get-CIPPTestData and Get-CIPPDbItem{' '}
with a -Type parameter.