fixes issue with shrinking tables

Author: KelvinTegelaar

Modules/CIPPCore/Public/Get-CIPPAzDatatableEntity.ps1

@@ -12,31 +12,43 @@ function Get-CIPPAzDataTableEntity {
 
     $Results = Get-AzDataTableEntity @PSBoundParameters
     $mergedResults = @{}
+    $rootEntities = @{} # Keyed by "$PartitionKey|$RowKey"
 
-    # First pass: Collect all parts and complete entities
     foreach ($entity in $Results) {
-        if ($entity.OriginalEntityId) {
-            $entityId = $entity.OriginalEntityId
-            $partitionKey = $entity.PartitionKey
-            if (-not $mergedResults.ContainsKey($partitionKey)) {
-                $mergedResults[$partitionKey] = @{}
-            }
-            if (-not $mergedResults[$partitionKey].ContainsKey($entityId)) {
-                $mergedResults[$partitionKey][$entityId] = @{
-                    Parts = [System.Collections.Generic.List[object]]::new()
-                }
-            }
-            $mergedResults[$partitionKey][$entityId]['Parts'].Add($entity)
-        } else {
-            $partitionKey = $entity.PartitionKey
-            if (-not $mergedResults.ContainsKey($partitionKey)) {
-                $mergedResults[$partitionKey] = @{}
-            }
-            $mergedResults[$partitionKey][$entity.RowKey] = @{
+        $partitionKey = $entity.PartitionKey
+        $rowKey = $entity.RowKey
+        $hasOriginalId = $entity.PSObject.Properties.Match('OriginalEntityId') -and $entity.OriginalEntityId
+
+        if (-not $mergedResults.ContainsKey($partitionKey)) {
+            $mergedResults[$partitionKey] = @{}
+        }
+
+        if (-not $hasOriginalId) {
+            # It's a standalone root row
+            $rootEntities["$partitionKey|$rowKey"] = $true
+            $mergedResults[$partitionKey][$rowKey] = @{
                 Entity = $entity
                 Parts  = [System.Collections.Generic.List[object]]::new()
             }
+            continue
+        }
+
+        # It's a part of something else
+        $entityId = $entity.OriginalEntityId
+
+        # Check if this entity's target has a "real" base
+        if ($rootEntities.ContainsKey("$partitionKey|$entityId")) {
+            # Root row exists → skip merging this part
+            continue
+        }
+
+        # Merge it as a part
+        if (-not $mergedResults[$partitionKey].ContainsKey($entityId)) {
+            $mergedResults[$partitionKey][$entityId] = @{
+                Parts = [System.Collections.Generic.List[object]]::new()
+            }
         }
+        $mergedResults[$partitionKey][$entityId]['Parts'].Add($entity)
     }
 
     $finalResults = [System.Collections.Generic.List[object]]::new()