From 9bb966015e71d7b62828700044ba248546320f33 Mon Sep 17 00:00:00 2001
From: Mikael Karlsson <43226266+Micke-K@users.noreply.github.com>
Date: Sun, 28 Sep 2025 14:20:28 +1000
Subject: [PATCH] 3.10.1.3

Issue 364 - Conditional Access policies does not support paging.
---
 Extensions/EndpointManager.psm1 | 10 +++++++---
 Extensions/MSGraph.psm1         |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Extensions/EndpointManager.psm1 b/Extensions/EndpointManager.psm1
index b6da6d6..7cc1229 100644
--- a/Extensions/EndpointManager.psm1
+++ b/Extensions/EndpointManager.psm1
@@ -156,8 +156,8 @@ function Invoke-InitializeModule
         ImportExtension = { Add-ConditionalAccessImportExtensions @args }
         PreImportCommand = { Start-PreImportConditionalAccess @args }
         PostExportCommand = { Start-PostExportConditionalAccess  @args }
-        ExpandAssignmentsList = $false
-        PageSize = "Skip"
+        ExpandAssignmentsList = $false        
+        SupportsPageSize = $false
     })
 
     Add-ViewItem (New-Object PSObject -Property @{
@@ -171,7 +171,8 @@ function Invoke-InitializeModule
         Permissons=@("Agreement.ReadWrite.All")
         PreImportCommand = { Start-PreImportTermsOfUse @args }
         PostExportCommand = { Start-PostExportTermsOfUse  @args }
-        GroupId = "ConditionalAccess"        
+        GroupId = "ConditionalAccess"
+        SupportsPageSize = $false
     })
 
     Add-ViewItem (New-Object PSObject -Property @{
@@ -183,6 +184,7 @@ function Invoke-InitializeModule
         ImportOrder = 50
         GroupId = "ConditionalAccess"
         ExpandAssignmentsList = $false
+        SupportsPageSize = $false
     })
 
     Add-ViewItem (New-Object PSObject -Property @{
@@ -819,6 +821,7 @@ function Invoke-InitializeModule
         ExpandAssignmentsList = $false
         Icon = "ConditionalAccess"
         GroupId = "EndpointSecurity"
+        SupportsPageSize = $false
     })
 
     Add-ViewItem (New-Object PSObject -Property @{
@@ -834,6 +837,7 @@ function Invoke-InitializeModule
         ExpandAssignmentsList = $false
         Icon = "ConditionalAccess"
         GroupId = "EndpointSecurity"
+        SupportsPageSize = $false
     })
     
     Add-ViewItem (New-Object PSObject -Property @{
diff --git a/Extensions/MSGraph.psm1 b/Extensions/MSGraph.psm1
index 1429127..d1e5f61 100644
--- a/Extensions/MSGraph.psm1
+++ b/Extensions/MSGraph.psm1
@@ -859,7 +859,7 @@ function Show-GraphObjects
         $tmpPageSize = Get-SettingValue "GraphPageSize"
     }
 
-    if($tmpPageSize -eq "Skip") {
+    if($global:curObjectType.SupportsPageSize -eq $false) {
         # Do nothing - use default page size from API
     }
     elseif ($tmpPageSize -eq "All")