Fix for PSGraph hidden node

rebelinux · Feb 15, 2024 · f554025 · f554025
1 parent b3d8da0
commit f554025
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/Src/Private/Get-DiagBackupToFileProxy.ps1 b/Src/Private/Get-DiagBackupToFileProxy.ps1
@@ -64,9 +64,9 @@ function Get-DiagBackupToFileProxy {
                     }
 
                     if ($Dir -eq 'LR') {
-                        Edge $BackupServerInfo.Name -To DummyFileProxy @{minlen = 3; lhead = "clusterMainSubGraph"}
+                        Edge $BackupServerInfo.Name -To DummyFileProxy @{minlen = 3}
                     } else {
-                        Edge $BackupServerInfo.Name -To DummyFileProxy @{minlen = 3; lhead = "clusterMainSubGraph"}
+                        Edge $BackupServerInfo.Name -To DummyFileProxy @{minlen = 3}
                     }
                 }
             }

diff --git a/Src/Private/Get-DiagBackupToHvProxy.ps1 b/Src/Private/Get-DiagBackupToHvProxy.ps1
@@ -63,9 +63,9 @@ function Get-DiagBackupToHvProxy {
                 }
 
                 if ($Dir -eq 'LR') {
-                    Edge $BackupServerInfo.Name -To DummyHyperVProxy @{minlen = 3; lhead = "clusterMainSubGraph" }
+                    Edge $BackupServerInfo.Name -To DummyHyperVProxy @{minlen = 3 }
                 } else {
-                    Edge $BackupServerInfo.Name -To DummyHyperVProxy @{minlen = 3; lhead = "clusterMainSubGraph" }
+                    Edge $BackupServerInfo.Name -To DummyHyperVProxy @{minlen = 3 }
                 }
             }
         } catch {

diff --git a/Src/Private/Get-DiagBackupToRepo.ps1 b/Src/Private/Get-DiagBackupToRepo.ps1
@@ -209,7 +209,7 @@ function Get-DiagBackupToRepo {
                         }
                     }
 
-                    Edge -From $BackupServerInfo.Name -To BackupRepository @{minlen = 3; lhead = "clusterMainSubGraph" }
+                    Edge -From $BackupServerInfo.Name -To BackupRepository @{minlen = 3 }
                 }
             }
         } catch {

diff --git a/Src/Private/Get-DiagBackupToSobr.ps1 b/Src/Private/Get-DiagBackupToSobr.ps1
@@ -80,7 +80,7 @@ function Get-DiagBackupToSobr {
                             Edge -From DummySOBREPO -To $SOBROBJ.Name @{minlen = 1; style = $EdgeDebug.style; color = $EdgeDebug.color }
                         }
                     }
-                    Edge -From $BackupServerInfo.Name -To DummySOBREPO @{minlen = 3; lhead = "clusterMainSubGraph"}
+                    Edge -From $BackupServerInfo.Name -To DummySOBREPO @{minlen = 3}
 
                 }
             }

diff --git a/Src/Private/Get-DiagBackupToViProxy.ps1 b/Src/Private/Get-DiagBackupToViProxy.ps1
@@ -64,9 +64,9 @@ function Get-DiagBackupToViProxy {
                     }
 
                     if ($Dir -eq 'LR') {
-                        Edge $BackupServerInfo.Name -To DummyVMwareProxy @{minlen = 3; lhead = "clusterMainSubGraph" }
+                        Edge $BackupServerInfo.Name -To DummyVMwareProxy @{minlen = 3 }
                     } else {
-                        Edge $BackupServerInfo.Name -To DummyVMwareProxy @{minlen = 3; lhead = "clusterMainSubGraph" }
+                        Edge $BackupServerInfo.Name -To DummyVMwareProxy @{minlen = 3 }
                     }
                     # $VirtObjs = Get-VBRServer | Where-Object {$_.Type -eq 'VC'}
                     # $EsxiObjs = Get-VBRServer | Where-Object {$_.Type -eq 'Esxi' -and $_.IsStandaloneEsx() -eq 'True'}

diff --git a/Src/Public/New-VeeamDiagram.ps1 b/Src/Public/New-VeeamDiagram.ps1
@@ -393,71 +393,71 @@ function New-VeeamDiagram {
                         if ($DiagramType -eq 'Backup-to-HyperV-Proxy') {
                             $BackuptoHyperVProxy = Get-DiagBackupToHvProxy
                             if ($BackuptoHyperVProxy) {
-                                $BackuptoHyperVProxy
+                                $BackuptoHyperVProxy | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                             } else {
                                 Write-Warning "No HyperV Proxy Infrastructure available to diagram"
                             }
                         } elseif ($DiagramType -eq 'Backup-to-vSphere-Proxy') {
                             $BackuptovSphereProxy = Get-DiagBackupToViProxy
                             if ($BackuptovSphereProxy) {
-                                $BackuptovSphereProxy
+                                $BackuptovSphereProxy | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                             } else {
                                 Write-Warning "No vSphere Proxy Infrastructure available to diagram"
                             }
                         } elseif ($DiagramType -eq 'Backup-to-File-Proxy') {
                             $BackuptoFileProxy = Get-DiagBackupToFileProxy
                             if ($BackuptoFileProxy) {
-                                $BackuptoFileProxy
+                                $BackuptoFileProxy | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                             } else {
                                 Write-Warning "No File Proxy Infrastructure available to diagram"
                             }
                         } elseif ($DiagramType -eq 'Backup-to-WanAccelerator') {
                             $BackuptoWanAccelerator = Get-DiagBackupToWanAccel
                             if ($BackuptoWanAccelerator) {
-                                $BackuptoWanAccelerator
+                                $BackuptoWanAccelerator | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                             } else {
                                 Write-Warning "No Wan Accelerators available to diagram"
                             }
                         } elseif ($DiagramType -eq 'Backup-to-Repository') {
                             $BackuptoRepository = Get-DiagBackupToRepo
                             if ($BackuptoRepository) {
-                                $BackuptoRepository
+                                $BackuptoRepository | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                             } else {
                                 throw "No Backup Repository available to diagram"
                             }
                         } elseif ($DiagramType -eq 'Backup-to-ProtectedGroup') {
                             $BackuptoProtectedGroup = Get-DiagBackupToProtectedGroup
                             if ($BackuptoProtectedGroup) {
-                                $BackuptoProtectedGroup
+                                $BackuptoProtectedGroup | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                             } else {
                                 throw "No Backup Protected Group available to diagram"
                             }
                         } elseif ($DiagramType -eq 'Backup-to-Tape') {
                             $BackupToTape = Get-DiagBackupToTape
                             if ($BackupToTape) {
-                                $BackupToTape
+                                $BackupToTape | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                             } else {
                                 Write-Warning "No Tape Infrastructure available to diagram"
                             }
                         } elseif ($DiagramType -eq 'Backup-to-Sobr') {
                             $BackuptoSobr = Get-DiagBackupToSobr
                             if ($BackuptoSobr) {
-                                $BackuptoSobr
+                                $BackuptoSobr | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                             } else {
                                 throw "No Scale-Out Backup Repository available to diagram"
                             }
                         } elseif ($DiagramType -eq 'Backup-to-All') {
                             if (Get-DiagBackupToHvProxy) {
-                                Get-DiagBackupToHvProxy
+                                Get-DiagBackupToHvProxy | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                             } else { Write-Warning "No HyperV Proxy Infrastructure available to diagram" }
                             if (Get-DiagBackupToViProxy) {
-                                Get-DiagBackupToViProxy
+                                Get-DiagBackupToViProxy | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                             } else { Write-Warning "No vSphere Proxy Infrastructure available to diagram" }
 
-                            Get-DiagBackupToWanAccel
-                            Get-DiagBackupToRepo
-                            Get-DiagBackupToSobr
-                            Get-DiagBackupToTape
+                            Get-DiagBackupToWanAccel | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
+                            Get-DiagBackupToRepo | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
+                            Get-DiagBackupToSobr | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
+                            Get-DiagBackupToTape | Select-String -Pattern '"([A-Z])\w+"\s\[label="";style="invis";shape="point";]' -NotMatch
                         }
                     }
                 }