Merge branch 'KelvinTegelaar:main' into main

Tools/Start-CippDevEmulators.ps1

@@ -1,4 +1,12 @@
-Write-Host "Starting CIPP Dev Emulators"
+Write-Host 'Starting CIPP Dev Emulators'
+Get-Process node -ErrorAction SilentlyContinue | Stop-Process -ErrorAction SilentlyContinue
 $Path = (Get-Item $PSScriptRoot).Parent.Parent.FullName
-wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c azurite`; new-tab --title 'FunctionApp' -d $Path\CIPP-API pwsh -c func start`; new-tab --title 'CIPP Frontend' -d $Path\CIPP pwsh -c npm run start`; new-tab --title 'SWA' -d $Path\CIPP pwsh -c npm run start-swa
+
+$Process = Read-Host -Prompt 'Start Process Function (y/N)?'
+
+if ($Process -eq 'y') {
+    wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c azurite`; new-tab --title 'FunctionApp' -d $Path\CIPP-API pwsh -c func start`; new-tab --title 'CIPP Frontend' -d $Path\CIPP pwsh -c npm run start`; new-tab --title 'SWA' -d $Path\CIPP pwsh -c npm run start-swa`; new-tab --title 'CIPP-API-Processor' -d $Path\CIPP-API-Processor pwsh -c func start --port 7072
+} else {
+    wt --title CIPP`; new-tab --title 'Azurite' -d $Path pwsh -c azurite`; new-tab --title 'FunctionApp' -d $Path\CIPP-API pwsh -c func start`; new-tab --title 'CIPP Frontend' -d $Path\CIPP pwsh -c npm run start`; new-tab --title 'SWA' -d $Path\CIPP pwsh -c npm run start-swa
+}
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "6.1.0",
+  "version": "6.3.0",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -50,6 +50,8 @@
     "chart.js": "^3.5.1",
     "classnames": "^2.3.1",
     "core-js": "^3.18.3",
+    "dompurify": "^3.1.6",
+    "eml-parse-js": "^1.1.14",
     "enzyme": "^3.11.0",
     "final-form": "^4.20.4",
     "final-form-arrays": "^3.1.0",
@@ -69,11 +71,13 @@
     "react-data-table-component": "^7.4.5",
     "react-datepicker": "^4.10.0",
     "react-dom": "^18.2.0",
+    "react-dropzone": "^14.2.3",
     "react-final-form": "^6.5.9",
     "react-final-form-arrays": "^3.1.4",
     "react-final-form-listeners": "^1.0.3",
     "react-helmet-async": "^1.3.0",
     "react-hotkeys-hook": "^3.4.4",
+    "react-html-parser": "^2.0.2",
     "react-loading-skeleton": "^3.1.0",
     "react-masonry-component": "^6.3.0",
     "react-media-hook": "^0.4.9",
@@ -88,7 +92,7 @@
     "redux-persist": "^6.0.0",
     "simplebar-react": "^2.3.6",
     "source-map-loader": "^3.0.0",
-    "styled-components": "^5.3.3"
+    "styled-components": "^5.3.11"
   },
   "devDependencies": {
     "@types/react": "^18.2.39",

public/version_latest.txt

@@ -1 +1 @@
-6.1.0
+6.3.0