Merge pull request KelvinTegelaar#3542 from KelvinTegelaar/dev

Dev to hotfix

Author: JohnDuprey

Tools/Start-CippDevEmulators.ps1

@@ -1,8 +1,14 @@
-Write-Host 'Starting CIPP Dev Emulators'
+Get-Command wt -ErrorAction Stop | Out-Null
 Get-Process node -ErrorAction SilentlyContinue | Stop-Process -ErrorAction SilentlyContinue
 $Path = (Get-Item $PSScriptRoot).Parent.Parent.FullName
 
-$Process = Read-Host -Prompt 'Start Process Function (y/N)?'
+pwsh -file (Join-Path $PSScriptRoot 'Start-CippDevInstallation.ps1')
+
+Write-Host 'Starting CIPP Dev Emulators'
+
+if (Test-Path (Join-Path $Path 'CIPP-API-Processor')) {
+  $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 dev`; 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

Tools/Start-CippDevInstallation.ps1

@@ -1,32 +1,32 @@
 $Path = (Get-Item $PSScriptRoot).Parent.Parent.FullName
 
-if (-not(Get-Command npm)) {
-  throw 'npm is required to install the CIPP development environment'
+if (-not((Get-Command npm -ErrorAction SilentlyContinue) -or (Get-Command yarn -ErrorAction SilentlyContinue))) {
+  throw 'npm or yarn is required to install the CIPP development environment.'
 }
 
-if (-not(Get-Command azurite)) {
+if (-not(Get-Command yarn -ErrorAction SilentlyContinue)) {
+  Write-Host 'Installing Yarn'
+  npm install --global yarn
+}
+
+if (-not(Get-Command azurite -ErrorAction SilentlyContinue)) {
   Write-Host 'Installing Azurite'
-  npm install --global 'azurite'
+  yarn global add 'azurite'
 }
 
-if (-not(Get-Command swa)) {
+if (-not(Get-Command swa -ErrorAction SilentlyContinue)) {
   Write-Host 'Installing @azure/static-web-apps-cli'
-  npm install --global '@azure/static-web-apps-cli'
+  yarn global add '@azure/static-web-apps-cli'
 }
 
-if (-not(Get-Command func)) {
+if (-not(Get-Command func -ErrorAction SilentlyContinue)) {
   Write-Host 'Installing Azure Functions Core Tools'
-  npm install --global 'azure-functions-core-tools@4' --unsafe-perms true
-}
-
-if (-not(Get-Command yarn)) {
-  Write-Host 'Installing Yarn'
-  npm install --global yarn
+  yarn global add 'azure-functions-core-tools@4'
 }
 
-if (-not(yarn list --global --pattern 'next' | Select-String -Pattern 'next')) {
+if (-not(yarn global list | Select-String -Pattern 'next')) {
   Write-Host 'Installing Next.js'
-  yarn install --global next --network-timeout 500000
+  yarn global add 'next'
 }
 
 yarn install --cwd (Join-Path $Path "CIPP") --network-timeout 500000

generate-placeholders.js

@@ -35,11 +35,11 @@ const pages = [
   { title: "Backup Wizard", path: "/tenant/backup/backup-wizard" },
   { title: "Restore Wizard", path: "/tenant/backup/restore-wizard" },
   { title: "Tools", path: "/tenant/administration" },
-  { title: "Graph Explorer", path: "/tenant/administration/graph-explorer" },
-  { title: "Application Approval", path: "/tenant/administration/appapproval" },
+  { title: "Graph Explorer", path: "/tenant/tools/graph-explorer" },
+  { title: "Application Approval", path: "/tenant/tools/appapproval" },
   { title: "IP Database", path: "/tenant/tools/geoiplookup" },
   { title: "Tenant Lookup", path: "/tenant/administration/tenantlookup" },
-  { title: "Individual Domain Check", path: "/tenant/standards/individual-domains" },
+  { title: "Individual Domain Check", path: "/tenant/tools/individual-domains" },
   { title: "BPA Report Builder", path: "/tenant/tools/bpa-report-builder" },
   { title: "Standards", path: "/tenant/standards" },
   { title: "Edit Standards", path: "/tenant/standards/list-applied-standards" },
@@ -82,7 +82,7 @@ const pages = [
   { title: "Add Profile", path: "/endpoint/autopilot/add-profile" },
   { title: "Status Pages", path: "/endpoint/autopilot/list-status-pages" },
   { title: "Add Status Page", path: "/endpoint/autopilot/add-status-page" },
-  { title: "Devices", path: "/endpoint/reports/devices" },
+  { title: "Devices", path: "/endpoint/MEM/devices" },
   { title: "Configuration Policies", path: "/endpoint/MEM/list-policies" },
   { title: "Compliance Policies", path: "/endpoint/MEM/list-compliance-policies" },
   { title: "Protection Policies", path: "/endpoint/MEM/list-appprotection-policies" },
@@ -108,9 +108,9 @@ const pages = [
   { title: "Transport rules", path: "/email/transport/list-rules" },
   { title: "Deploy Transport rule", path: "/email/transport/deploy-rules" },
   { title: "Transport Templates", path: "/email/transport/list-templates" },
-  { title: "Connectors", path: "/email/connectors/list-connectors" },
+  { title: "Connectors", path: "/email/transport/list-connectors" },
   { title: "Deploy Connector Templates", path: "/email/connectors/deploy-connector" },
-  { title: "Connector Templates", path: "/email/connectors/list-connector-templates" },
+  { title: "Connector Templates", path: "/email/transport/list-connector-templates" },
   { title: "Spamfilter", path: "/email/spamfilter/list-spamfilter" },
   { title: "Apply Spamfilter Template", path: "/email/spamfilter/deploy" },
   { title: "Templates", path: "/email/spamfilter/list-templates" },

package.json

@@ -1,14 +1,14 @@
 {
   "name": "cipp",
-  "version": "7.0.0",
+  "version": "7.1.3",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
     "url": "https://github.com/KelvinTegelaar/CIPP/issues"
   },
   "license": "AGPL-3.0",
   "engines": {
-    "node": "^18.17.0"
+    "node": "^20.18.1"
   },
   "repository": {
     "type": "git",

public/assets/integrations/github.png

@@ -1,3 +1,3 @@
 {
-  "version": "7.1.2"
+  "version": "7.1.3"
 }

public/assets/integrations/github_dark.png

@@ -91,6 +91,11 @@ export const CippUserInfoCard = (props) => {
             )
           }
         />
+        <PropertyListItem
+          divider
+          label="User ID"
+          value={isFetching ? <Skeleton variant="text" width={120} /> : user?.id || "N/A"}
+        />
         <PropertyListItem
           divider
           label="Email Address"

public/discord-mark-blue.svg

@@ -79,7 +79,6 @@ export const CippApiDialog = (props) => {
     } else {
       Object.keys(dataObject).forEach((key) => {
         const value = dataObject[key];
-
         if (typeof value === "string" && value.startsWith("!")) {
           newData[key] = value.slice(1);
         } else if (typeof value === "string") {
@@ -208,6 +207,40 @@ export const CippApiDialog = (props) => {
   const onSubmit = (data) => handleActionClick(row, api, data);
   const selectedType = api.type === "POST" ? actionPostRequest : actionGetRequest;
 
+  if (api?.setDefaultValues) {
+    fields.map((field) => {
+      if (
+        ((typeof row[field.name] === "string" && field.type === "textField") ||
+          (typeof row[field.name] === "boolean" && field.type === "switch")) &&
+        row[field.name] !== undefined &&
+        row[field.name] !== null &&
+        row[field.name] !== ""
+      ) {
+        formHook.setValue(field.name, row[field.name]);
+      } else if (Array.isArray(row[field.name]) && field.type === "autoComplete") {
+        var values = [];
+        row[field.name].map((element) => {
+          values.push({
+            label: element,
+            value: element,
+          });
+        });
+        formHook.setValue(field.name, values);
+      } else if (
+        field.type === "autoComplete" &&
+        row[field.name] !== undefined &&
+        row[field.name] !== null &&
+        row[field.name] !== "" &&
+        typeof row[field.name] === "string"
+      ) {
+        formHook.setValue(field.name, {
+          label: row[field.name],
+          value: row[field.name],
+        });
+      }
+    });
+  }
+
   // Handling link navigation
   if (api.link) {
     const getNestedValue = (obj, path) => {