From d57cf9a02a0c7d31db9711efdf6c92049cc96ef6 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:36:44 -0700 Subject: [PATCH 01/14] + gray-ish color for event nodes; node size is 8 by default --- .../Assets/vega.force.directed.layout.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PSGraph.Vega.Extensions/Assets/vega.force.directed.layout.json b/PSGraph.Vega.Extensions/Assets/vega.force.directed.layout.json index e7b36f8..11455cd 100644 --- a/PSGraph.Vega.Extensions/Assets/vega.force.directed.layout.json +++ b/PSGraph.Vega.Extensions/Assets/vega.force.directed.layout.json @@ -97,13 +97,13 @@ "type": "symbol", "encode": { "enter": { - "fill": {"scale": "color", "field": "group"}, + "fill": { "signal": "datum.nodeType === 'BaristaLabs.ChromeDevTools.Runtime.Network.RequestWillBeSentEvent'? '#e0e1dd' : scale('color', datum.group)" }, "stroke": {"value": "white"} }, "update": { "cursor": {"value": "pointer"}, "fill": { - "signal": "hoverIndex === datum.index || indata('adjacentIndices', 'adj', datum.index) ? 'red' : scale('color', datum.group)" + "signal": "hoverIndex === datum.index || indata('adjacentIndices', 'adj', datum.index) ? 'red' : datum.nodeType === 'BaristaLabs.ChromeDevTools.Runtime.Network.RequestWillBeSentEvent'? '#e0e1dd' : scale('color', datum.group)" }, "size": { "signal": "(hoverIndex === datum.index || indata('adjacentIndices', 'adj', datum.index)) ? 2.5 * nodeRadius * nodeRadius : 2 * nodeRadius * nodeRadius" @@ -310,7 +310,7 @@ { "name": "nodeRadius", "bind": {"input": "range", "max": 50, "min": 1, "step": 1}, - "value": 5 + "value": 8 }, { "name": "nodeCharge", From ea8d4ba2dbb6fadc72a0725fd4ec503ab9c21562 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:38:59 -0700 Subject: [PATCH 02/14] + pester tests step --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d2ecde..caa2d00 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,4 +28,7 @@ jobs: run: dotnet build --configuration Debug - name: Test run: dotnet test --verbosity normal - + - name: Pester tests + shell: pwsh + run: | + Invoke-Pester -Path ./PsGraph.Pester.Tests/ From e6d746b1c9c589942c2a4957eab7fbf4a4792d85 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:40:06 -0700 Subject: [PATCH 03/14] remove some folders from build --- .github/workflows/build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index caa2d00..0dfe7c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,8 +3,20 @@ name: psgraph-dev-build on: push: branches: [ "dev" ] + paths-ignore: + - '**/README.md' + - '**/.gitignore' + - 'docs/**' + - '.devcontainer/**' + - '.github/**' pull_request: branches: [ "dev" ] + paths-ignore: + - '**/README.md' + - '**/.gitignore' + - 'docs/**' + - '.devcontainer/**' + - '.github/**' workflow_dispatch: From 51b320da01dcb683acc1d3dce989e128078d5c87 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:41:38 -0700 Subject: [PATCH 04/14] update publish workflow --- .github/workflows/publish.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c903d52..968dc58 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,16 +1,14 @@ name: psgraph-publish on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] + release: + types: [published] workflow_dispatch: jobs: - build: + publish: runs-on: ubuntu-latest strategy: matrix: @@ -28,6 +26,10 @@ jobs: run: dotnet build - name: Test run: dotnet test --verbosity normal + - name: Pester tests + shell: pwsh + run: | + Invoke-Pester -Path ./PsGraph.Pester.Tests/ - name: dotnet publish run: dotnet publish -o "./PSQuickGraph" - name: psgallery publish From 71b007c763fc87c64afe4cc2d9e3f3b9f13f24b8 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 16:53:39 -0700 Subject: [PATCH 05/14] troubleshooting pester tests --- PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 index 620edca..6aefdf1 100644 --- a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 +++ b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 @@ -1,4 +1,5 @@ BeforeAll { + Get-ChildItem Import-Module "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" } From 42e607b3e3b491d2ccb9384271132d3a50cd834c Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:06:30 -0700 Subject: [PATCH 06/14] more troubleshooting --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0dfe7c8..82dcd28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,4 +43,5 @@ jobs: - name: Pester tests shell: pwsh run: | + Get-ChildItem Invoke-Pester -Path ./PsGraph.Pester.Tests/ From b7e78abdcee1f66fe278b28b28fa22dc41e3a54b Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:15:22 -0700 Subject: [PATCH 07/14] still troubleshooting --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82dcd28..f4fb46f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,6 +41,7 @@ jobs: - name: Test run: dotnet test --verbosity normal - name: Pester tests + working-directory: '../' shell: pwsh run: | Get-ChildItem From 8120e5cab366e343c7044fa7c9212b5cbdbac6e7 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:25:17 -0700 Subject: [PATCH 08/14] trying to fix tests to run on github actions --- PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 index 6aefdf1..db819e9 100644 --- a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 +++ b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 @@ -1,6 +1,15 @@ BeforeAll { - Get-ChildItem - Import-Module "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + if (Test-Path "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1") + { + Write-Host "Importing from ./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + Import-Module "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + } + + if (Test-Path "../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1") + { + Write-Host "Importing from ../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + Import-Module "../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + } } Describe 'New-Graph' { From 3b9e79d5f5268ca88d08316c3bbc62d3e5ff9744 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:27:09 -0700 Subject: [PATCH 09/14] another test --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4fb46f..82dcd28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,6 @@ jobs: - name: Test run: dotnet test --verbosity normal - name: Pester tests - working-directory: '../' shell: pwsh run: | Get-ChildItem From 7fa9e1af806910f98f8959f0a9772b21d79bb18f Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:37:08 -0700 Subject: [PATCH 10/14] one more test --- .github/workflows/build.yml | 2 ++ PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 | 12 +++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82dcd28..3e35f11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,8 @@ jobs: run: dotnet restore - name: Build run: dotnet build --configuration Debug + - name: dotnet publish + run: dotnet publish -o "./PSQuickGraph" - name: Test run: dotnet test --verbosity normal - name: Pester tests diff --git a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 index db819e9..310c116 100644 --- a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 +++ b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 @@ -1,14 +1,8 @@ BeforeAll { - if (Test-Path "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1") + if (Test-Path "./PSQuickGraph/PSQuickGraph.psd1") { - Write-Host "Importing from ./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" - Import-Module "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" - } - - if (Test-Path "../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1") - { - Write-Host "Importing from ../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" - Import-Module "../PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" + Write-Host "Importing from ./PSQuickGraph/PSQuickGraph.psd1" + Import-Module "./PSQuickGraph" } } From 8a0c01bc876cef57b3f4487c90dbf479c147bb62 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:43:31 -0700 Subject: [PATCH 11/14] few more tests --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e35f11..8196d36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,5 +45,6 @@ jobs: - name: Pester tests shell: pwsh run: | + $PSVersionTable Get-ChildItem Invoke-Pester -Path ./PsGraph.Pester.Tests/ From 1f8c02ac90a622115aed505db2670696e30cc8e3 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 17:51:45 -0700 Subject: [PATCH 12/14] another attempt --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8196d36..7685ef1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,12 @@ jobs: run: dotnet publish -o "./PSQuickGraph" - name: Test run: dotnet test --verbosity normal + + - name: Install PowerShell + uses: PSModule/install-powershell@v1 + with: + Version: latest + - name: Pester tests shell: pwsh run: | From 2bbca96678b11af320806e714346a63612e51dd5 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 18:01:43 -0700 Subject: [PATCH 13/14] try again --- PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 index 310c116..620edca 100644 --- a/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 +++ b/PsGraph.Pester.Tests/PSGraph.Basic.Tests.ps1 @@ -1,9 +1,5 @@ BeforeAll { - if (Test-Path "./PSQuickGraph/PSQuickGraph.psd1") - { - Write-Host "Importing from ./PSQuickGraph/PSQuickGraph.psd1" - Import-Module "./PSQuickGraph" - } + Import-Module "./PSGraph.Tests/bin/Debug/net9.0/PSQuickGraph.psd1" } Describe 'New-Graph' { From 107803d7fe1622140886be264ee72c127d93f6a5 Mon Sep 17 00:00:00 2001 From: eosfor <9363027+eosfor@users.noreply.github.com> Date: Thu, 26 Jun 2025 18:06:07 -0700 Subject: [PATCH 14/14] few more updates to the workflow --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7685ef1..f9463ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: - '.devcontainer/**' - '.github/**' pull_request: - branches: [ "dev" ] + branches: [ "master" ] paths-ignore: - '**/README.md' - '**/.gitignore' @@ -47,7 +47,6 @@ jobs: uses: PSModule/install-powershell@v1 with: Version: latest - - name: Pester tests shell: pwsh run: |