Skip to content

Commit 588f9ad

Browse files
pull[bot]pull[bot]
authored
Merge pull request #14 from KelvinTegelaar/main
[pull] main from KelvinTegelaar:main
2 parents 158ca32 + e4f978a commit 588f9ad

63 files changed

Lines changed: 3717 additions & 2230 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/auto_comments.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# 1) If the comment includes '!notasponsor', delete it using GitHub Script
1818
- name: Delete !notasponsor comment
1919
if: contains(github.event.comment.body, '!notasponsor')
20-
uses: actions/github-script@v8
20+
uses: actions/github-script@v9
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
2323
script: |

‎.github/workflows/cipp_frontend_build.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ jobs:
3838
- name: Build Project
3939
run: npm run build
4040

41+
# Update version.json with commit hash
42+
- name: Update version.json
43+
run: |
44+
VERSION=$(jq -r '.version' public/version.json)
45+
SHORT_SHA="${GITHUB_SHA::7}"
46+
echo "{\"version\": \"${VERSION}\", \"commit\": \"${SHORT_SHA}\"}" > out/version.json
47+
4148
# Create ZIP File in a New Source Directory
4249
- name: Prepare and Zip Build Files
4350
run: |

‎.github/workflows/pr_check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
github.event.pull_request.head.repo.fork == true &&
2626
((github.event.pull_request.head.ref == 'main' || github.event.pull_request.head.ref == 'master') ||
2727
(github.event.pull_request.base.ref == 'main' || github.event.pull_request.base.ref == 'master'))
28-
uses: actions/github-script@v8
28+
uses: actions/github-script@v9
2929
with:
3030
github-token: ${{ secrets.GITHUB_TOKEN }}
3131
script: |

‎.vscode/launch.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@
3535
"cwd": "${cwd}",
3636
"script": ". '${cwd}\\Tools\\Start-CIPPDevEmulators.ps1'"
3737
},
38+
{
39+
"type": "PowerShell",
40+
"name": "Launch in Windows Terminal with Offloading Proc and HTTP only workers",
41+
"request": "launch",
42+
"cwd": "${cwd}",
43+
"script": ". '${cwd}\\Tools\\Start-CippOffloadSimulation.ps1'"
44+
},
3845
{
3946
"type": "PowerShell",
4047
"name": "Launch in Kitty Terminal",

‎Tests/Shapes/ListTests.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,23 +103,19 @@
103103
"ExoAcceptedDomains": "number",
104104
"ExoAdminAuditLogConfig": "number",
105105
"ExoAntiPhishPolicies": "number",
106-
"ExoAntiPhishPolicy": "number",
107106
"ExoAntiPhishRules": "number",
108107
"ExoAtpPolicyForO365": "number",
109108
"ExoDkimSigningConfig": "number",
110109
"ExoHostedContentFilterPolicy": "number",
111110
"ExoHostedOutboundSpamFilterPolicy": "number",
112111
"ExoMalwareFilterPolicies": "number",
113-
"ExoMalwareFilterPolicy": "number",
114112
"ExoMalwareFilterRules": "number",
115113
"ExoOrganizationConfig": "number",
116114
"ExoQuarantinePolicy": "number",
117115
"ExoRemoteDomain": "number",
118116
"ExoSafeAttachmentPolicies": "number",
119-
"ExoSafeAttachmentPolicy": "number",
120117
"ExoSafeAttachmentRules": "number",
121118
"ExoSafeLinksPolicies": "number",
122-
"ExoSafeLinksPolicy": "number",
123119
"ExoSafeLinksRules": "number",
124120
"ExoSharingPolicy": "number",
125121
"ExoTenantAllowBlockList": "number",

‎Tools/Start-CippDevEmulators.ps1‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,35 @@ Write-Host 'Starting emulators...' -ForegroundColor Cyan
1818

1919
# Build commands with error handling
2020
$azuriteCommand = 'try { azurite } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
21-
$apiCommand = 'try { func start } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
21+
$apiCommand = @'
22+
try {
23+
# Use a stable local identity so timer node selection treats this as the catch-all host.
24+
$env:WEBSITE_SITE_NAME = "cipp"
25+
$env:CIPP_PROCESSOR = "false"
26+
$env:AzureFunctionsWebHost__hostid = "cipp-single"
27+
28+
# Ensure prior offload simulation env overrides do not disable triggers in this shell.
29+
Remove-Item -Path "Env:AzureWebJobs.CIPPTimer.Disabled" -ErrorAction SilentlyContinue
30+
Remove-Item -Path "Env:AzureWebJobs.CIPPActivityFunction.Disabled" -ErrorAction SilentlyContinue
31+
Remove-Item -Path "Env:AzureWebJobs.CIPPOrchestrator.Disabled" -ErrorAction SilentlyContinue
32+
Remove-Item -Path "Env:AzureWebJobs.CIPPQueueTrigger.Disabled" -ErrorAction SilentlyContinue
33+
Remove-Item -Path "Env:AzureWebJobs.CIPPHttpTrigger.Disabled" -ErrorAction SilentlyContinue
34+
35+
func start
36+
} catch {
37+
Write-Error $_.Exception.Message
38+
} finally {
39+
Read-Host "Press Enter to exit"
40+
}
41+
'@
2242
$frontendCommand = 'try { npm run dev } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
2343
$swaCommand = 'try { npm run start-swa } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
2444

45+
# Encode commands to avoid parsing issues with multi-line strings
46+
$azuriteEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($azuriteCommand))
47+
$apiEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($apiCommand))
48+
$frontendEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($frontendCommand))
49+
$swaEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($swaCommand))
50+
2551
# Start Windows Terminal with all tabs
26-
wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c $azuriteCommand`; new-tab --title 'FunctionApp' -d $ApiPath pwsh -c $apiCommand`; new-tab --title 'CIPP Frontend' -d $FrontendPath pwsh -c $frontendCommand`; new-tab --title 'SWA' -d $FrontendPath pwsh -c $swaCommand
52+
wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -EncodedCommand $azuriteEncoded`; new-tab --title 'FunctionApp' -d $ApiPath pwsh -EncodedCommand $apiEncoded`; new-tab --title 'CIPP Frontend' -d $FrontendPath pwsh -EncodedCommand $frontendEncoded`; new-tab --title 'SWA' -d $FrontendPath pwsh -EncodedCommand $swaEncoded

‎Tools/Start-CippOffloadSimulation.ps1‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
[CmdletBinding()]
2+
param(
3+
[int]$HttpPort = 7071,
4+
[int]$ProcessorPort = 7072,
5+
[switch]$NoFrontend
6+
)
7+
8+
Write-Host 'Starting CIPP local offload simulation' -ForegroundColor Cyan
9+
10+
# Verify Windows Terminal is available
11+
Get-Command wt -ErrorAction Stop | Out-Null
12+
13+
# Stop any existing node processes
14+
Get-Process node -ErrorAction SilentlyContinue | Stop-Process -ErrorAction SilentlyContinue
15+
16+
# Run installation script to ensure dependencies are installed and updated before starting emulators
17+
pwsh -File (Join-Path $PSScriptRoot 'Start-CippDevInstallation.ps1')
18+
Write-Host 'Starting emulators...' -ForegroundColor Cyan
19+
20+
$repoRoot = (Get-Item $PSScriptRoot).Parent.Parent.FullName
21+
$apiPath = Join-Path -Path $repoRoot -ChildPath 'CIPP-API'
22+
$frontendPath = Join-Path -Path $repoRoot -ChildPath 'CIPP'
23+
24+
if (-not (Test-Path $apiPath)) {
25+
throw "CIPP-API path not found: $apiPath"
26+
}
27+
28+
$azuriteCommand = 'try { azurite } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
29+
30+
$httpHostCommand = @'
31+
try {
32+
$env:WEBSITE_SITE_NAME = "cipp-http"
33+
$env:CIPP_PROCESSOR = "false"
34+
$env:AzureFunctionsWebHost__hostid = "cipp-http"
35+
36+
Set-Item -Path "Env:AzureWebJobs.CIPPTimer.Disabled" -Value "1"
37+
Set-Item -Path "Env:AzureWebJobs.CIPPActivityFunction.Disabled" -Value "1"
38+
Set-Item -Path "Env:AzureWebJobs.CIPPOrchestrator.Disabled" -Value "1"
39+
Set-Item -Path "Env:AzureWebJobs.CIPPQueueTrigger.Disabled" -Value "1"
40+
41+
func start --port {HTTP_PORT}
42+
} catch {
43+
Write-Error $_.Exception.Message
44+
} finally {
45+
Read-Host "Press Enter to exit"
46+
}
47+
'@
48+
49+
$processorHostCommand = @'
50+
try {
51+
$env:WEBSITE_SITE_NAME = "cipp-proc"
52+
$env:CIPP_PROCESSOR = "true"
53+
$env:AzureFunctionsWebHost__hostid = "cipp-proc"
54+
55+
Set-Item -Path "Env:AzureWebJobs.CIPPHttpTrigger.Disabled" -Value "1"
56+
57+
func start --port {PROCESSOR_PORT}
58+
} catch {
59+
Write-Error $_.Exception.Message
60+
} finally {
61+
Read-Host "Press Enter to exit"
62+
}
63+
'@
64+
65+
$httpHostCommand = $httpHostCommand.Replace('{HTTP_PORT}', $HttpPort.ToString())
66+
$processorHostCommand = $processorHostCommand.Replace('{PROCESSOR_PORT}', $ProcessorPort.ToString())
67+
68+
$frontendCommand = 'try { npm run dev } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
69+
$swaCommand = 'try { npm run start-swa } catch { Write-Error $_.Exception.Message } finally { Read-Host "Press Enter to exit" }'
70+
71+
$azuriteEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($azuriteCommand))
72+
$httpHostEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($httpHostCommand))
73+
$processorHostEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($processorHostCommand))
74+
$frontendEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($frontendCommand))
75+
$swaEncoded = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($swaCommand))
76+
77+
if ($NoFrontend) {
78+
wt --title CIPP-Offload-Sim`; new-tab --title 'Azurite' -d $repoRoot pwsh -EncodedCommand $azuriteEncoded`; new-tab --title 'FunctionApp-HTTP' -d $apiPath pwsh -EncodedCommand $httpHostEncoded`; new-tab --title 'FunctionApp-Processor' -d $apiPath pwsh -EncodedCommand $processorHostEncoded
79+
} else {
80+
wt --title CIPP-Offload-Sim`; new-tab --title 'Azurite' -d $repoRoot pwsh -EncodedCommand $azuriteEncoded`; new-tab --title 'FunctionApp-HTTP' -d $apiPath pwsh -EncodedCommand $httpHostEncoded`; new-tab --title 'FunctionApp-Processor' -d $apiPath pwsh -EncodedCommand $processorHostEncoded`; new-tab --title 'CIPP Frontend' -d $frontendPath pwsh -EncodedCommand $frontendEncoded`; new-tab --title 'SWA' -d $frontendPath pwsh -EncodedCommand $swaEncoded
81+
}
82+
83+
Write-Host "Started offload simulation tabs (HTTP:$HttpPort, Processor:$ProcessorPort)." -ForegroundColor Green

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cipp",
3-
"version": "10.3.1",
3+
"version": "10.4.1",
44
"author": "CIPP Contributors",
55
"homepage": "https://cipp.app/",
66
"bugs": {
@@ -31,11 +31,11 @@
3131
"@emotion/styled": "11.14.1",
3232
"@heroicons/react": "2.2.0",
3333
"@monaco-editor/react": "^4.6.0",
34-
"@mui/icons-material": "7.3.7",
34+
"@mui/icons-material": "7.3.10",
3535
"@mui/lab": "7.0.0-beta.17",
36-
"@mui/material": "7.3.7",
37-
"@mui/system": "7.3.2",
38-
"@mui/x-date-pickers": "^8.27.2",
36+
"@mui/material": "7.3.10",
37+
"@mui/system": "7.3.10",
38+
"@mui/x-date-pickers": "^9.0.2",
3939
"@musement/iso-duration": "^1.0.0",
4040
"@nivo/core": "^0.99.0",
4141
"@nivo/sankey": "^0.99.0",
@@ -51,12 +51,12 @@
5151
"@tiptap/extension-image": "^3.20.5",
5252
"@tiptap/extension-table": "^3.19.0",
5353
"@tiptap/pm": "^3.22.3",
54-
"@tiptap/react": "^3.4.1",
54+
"@tiptap/react": "^3.20.5",
5555
"@tiptap/starter-kit": "^3.20.5",
5656
"@uiw/react-json-view": "^2.0.0-alpha.41",
5757
"@vvo/tzdb": "^6.198.0",
5858
"apexcharts": "5.10.4",
59-
"axios": "1.14.0",
59+
"axios": "1.15.0",
6060
"date-fns": "4.1.0",
6161
"diff": "^8.0.3",
6262
"eml-parse-js": "^1.2.0-beta.0",
@@ -100,7 +100,7 @@
100100
"react-redux": "9.2.0",
101101
"react-syntax-highlighter": "^16.1.0",
102102
"react-time-ago": "^7.3.3",
103-
"react-virtuoso": "^4.18.3",
103+
"react-virtuoso": "^4.18.5",
104104
"react-window": "^2.2.7",
105105
"recharts": "^3.7.0",
106106
"redux": "5.0.1",

‎public/version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "10.3.1"
2+
"version": "10.4.1"
33
}

0 commit comments

Comments
 (0)