Merge branch 'KelvinTegelaar:main' into main

.github/workflows/dev_deploy.yml

@@ -0,0 +1,45 @@
+name: CIPP Development Frontend CI/CD
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - dev
+
+jobs:
+  build_and_deploy_job:
+    if: github.event.repository.fork == false && github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} # change this to your repository secret name
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: 'upload'
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: '/' # App source code path
+          api_location: '' # Api source code path - optional
+          output_location: '' # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event.repository.fork == false && github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }} # change this to your repository secret name
+          action: 'close'

.prettierignore

@@ -1 +1,4 @@
 dist/
+build/
+importsMap.jsx
+Generate-Import-Map.js

Generate-Import-Map.js

@@ -0,0 +1,35 @@
+// Using ES Module syntax compatible with Node.js 18 and ensuring cross-platform compatibility
+import fs from 'fs/promises'
+import path from 'path'
+import { fileURLToPath } from 'url'
+
+// Convert __dirname equivalent for ES Modules
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+// Adjust the relative path as necessary to point to your routes.json location
+const routesPath = path.join(__dirname, './src/routes.json') // Example path
+
+// Load routes.json with an import assertion for JSON
+const routes = await import(`file://${routesPath}`, { assert: { type: 'json' } }).then(
+  (module) => module.default,
+)
+
+let importsMap = "import React from 'react'\n export const importsMap = {\n"
+
+routes.forEach((route) => {
+  if (route.component) {
+    // Adjust the import path to be relative to the importsMap.js file location
+    const importPath = route.component.replace('views', './views')
+    // Ensure paths are Unix-like for the dynamic import to work cross-platform
+    const unixImportPath = importPath.split(path.sep).join('/')
+    importsMap += `  "${route.path}": React.lazy(() => import('${unixImportPath}')), \n`
+  }
+})
+
+importsMap += '}\nexport default importsMap'
+
+// Specify the output file path for the generated imports map
+const outputPath = path.join(__dirname, './src/importsMap.jsx')
+await fs.writeFile(outputPath, importsMap)
+console.log('Import map generated.')

Importmap.ps1

@@ -0,0 +1,22 @@
+// generate-imports-map.js
+const fs = require('fs')
+const path = require('path')
+const routes = require('./path/to/routes.json')
+
+let importsMap = 'export const importsMap = {\n'
+
+routes.forEach(route => {
+        if (route.component) {
+            // Convert the path to a format that's relative to where you'll be importing from
+            const importPath = route.component.replace('views', './views')
+            const componentName = path.basename(importPath)
+
+            // Create an import statement for the component
+            importsMap += "${route.path}": React.lazy(() = > import('${importPath}')), \n`;
+        }
+    })
+
+importsMap += '};\n'
+
+fs.writeFileSync(path.resolve(__dirname,'./src/importsMap.js'), importsMap)
+console.log('Import map generated.')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "5.4.2",
+  "version": "5.8.0",
   "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -14,6 +14,7 @@
   "license": "AGPL-3.0",
   "author": "CIPP Contributors",
   "scripts": {
+    "prebuild": "node Generate-Import-Map.js",
     "build": "echo react-scripts build && vite build",
     "changelog": "auto-changelog --starting-version 3.0.0 --commit-limit false --hide-credit",
     "lint": "eslint \"src/**/*.js\"",
@@ -43,6 +44,7 @@
     "@rjsf/core": "^5.12.1",
     "@rjsf/utils": "^5.12.1",
     "@rjsf/validator-ajv8": "^5.12.1",
+    "@uiw/react-json-view": "^2.0.0-alpha.23",
     "axios": "^1.6.2",
     "buffer": "^6.0.3",
     "chart.js": "^3.5.1",
@@ -62,6 +64,7 @@
     "react": "^18.2.0",
     "react-app-polyfill": "^2.0.0",
     "react-bootstrap": "^1.6.5",
+    "react-circular-progressbar": "^2.1.0",
     "react-copy-to-clipboard": "^5.1.0",
     "react-data-table-component": "^7.4.5",
     "react-datepicker": "^4.10.0",

public/GDAPRoles.json

@@ -671,6 +671,22 @@
     "Name": "Virtual Visits Administrator",
     "ObjectId": "e300d9e7-4a2b-4295-9eff-f1c78b36cc98"
   },
+  {
+    "ExtensionData": {},
+    "Description": "Manage and configure all aspects of Microsoft Viva Goals.",
+    "IsEnabled": true,
+    "IsSystem": true,
+    "Name": "Viva Goals Administrator",
+    "ObjectId": "92b086b3-e367-4ef2-b869-1de128fb986e"
+  },
+  {
+    "ExtensionData": {},
+    "Description": "Can manage all settings for Microsoft Viva Pulse app.",
+    "IsEnabled": true,
+    "IsSystem": true,
+    "Name": "Viva Pulse Administrator",
+    "ObjectId": "87761b17-1ed2-4af3-9acd-92a150038160"
+  },
   {
     "ExtensionData": {},
     "Description": "Can provision and manage all aspects of Cloud PCs.",

public/version_latest.txt

@@ -1 +1 @@
-5.4.2
+5.8.0