Merge pull request #11 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
JohnDuprey · Jul 25, 2023 · 4854132 · 4854132
2 parents 4b415d5 + 6dccfc7
commit 4854132
Show file tree

Hide file tree

Showing 11 changed files with 536 additions and 402 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
       "cwd": "${file}"
     },
     {
-      "command": "npm run start-api",
+      "command": "npm run start-swa",
       "name": "Run emulator",
       "request": "launch",
       "type": "node-terminal"

diff --git a/package.json b/package.json
@@ -17,11 +17,11 @@
     "changelog": "auto-changelog --starting-version 3.0.0 --commit-limit false --hide-credit",
     "eject": "react-scripts eject",
     "lint": "eslint \"src/**/*.js\"",
-    "start": "react-scripts start",
+    "start": "set HTTPS=true&&set SSL_CRT_FILE=./.vscode/cert.crt&&set SSL_KEY_FILE=./.vscode/key.key&&react-scripts start",
     "test": "react-scripts test",
     "test:cov": "npm test -- --coverage --watchAll=false",
     "test:debug": "react-scripts --inspect-brk test --runInBand",
-    "start-api": "swa start --ssl --ssl-cert ./.vscode/cert.crt --ssl-key ./.vscode/key.key --swa-config-location .vscode http://localhost:3000 --api-location http://localhost:7071",
+    "start-swa": "swa start --ssl --ssl-cert ./.vscode/cert.crt --ssl-key ./.vscode/key.key --swa-config-location .vscode https://localhost:3000 --api-location http://localhost:7071",
     "prepare": "husky install"
   },
   "config": {
@@ -98,7 +98,7 @@
     "stylelint-order": "^5.0.0"
   },
   "engines": {
-    "node": "16",
+    "node": "18",
     "npm": ">=7"
   }
 }
diff --git a/public/version_latest.txt b/public/version_latest.txt
@@ -1 +1 @@
-3.7.0
+3.8.0
diff --git a/src/data/standards.json b/src/data/standards.json
@@ -366,6 +366,20 @@
     },
     "label": "Set Sharing Level for Default calendar"
   },
+  {
+    "name": "standards.UserSubmissions.enable",
+    "cat": "Exchange",
+    "helpText": "This is the default helptext",
+    "addedComponent": null,
+    "label": "Enable the built-in Report button in Outlook"
+  },
+  {
+    "name": "standards.UserSubmissions.disable",
+    "cat": "Exchange",
+    "helpText": "This is the default helptext",
+    "addedComponent": null,
+    "label": "Disable the built-in Report button in Outlook"
+  },
   {
     "name": "standards.intuneDeviceReg.Enabled",
     "cat": "Intune",

diff --git a/src/views/home/Home.js b/src/views/home/Home.js
@@ -115,7 +115,7 @@ const Home = () => {
     },
     {
       label: 'Azure',
-      link: `https://portal.azure.com/?tid=${currentTenant.defaultDomainName}`,
+      link: `https://portal.azure.com/#@${currentTenant.customerId}`,
       icon: faServer,
     },
     {

diff --git a/src/views/tenant/administration/AlertWizard.js b/src/views/tenant/administration/AlertWizard.js
@@ -126,6 +126,11 @@ const AlertWizard = () => {
               <RFFCFormSwitch name="SharePointQuota" label="Alert on 90% SharePoint quota used" />
               <RFFCFormSwitch name="UnusedLicenses" label="Alert on unused licenses" />
               <RFFCFormSwitch name="OverusedLicenses" label="Alert on overused licenses" />
+              <RFFCFormSwitch
+                name="ExpiringLicenses"
+                label="Alert on licenses expiring in 30 days"
+              />
+
               <RFFCFormSwitch
                 name="AppSecretExpiry"
                 label="Alert on expiring application secrets"

diff --git a/src/views/tenant/administration/ListAlertsQueue.js b/src/views/tenant/administration/ListAlertsQueue.js
@@ -149,6 +149,13 @@ const ListAlertsQueue = () => {
       exportSelector: 'SharepointQuota',
       cell: cellBooleanFormatter(),
     },
+    {
+      name: 'Expiring Licenses',
+      selector: (row) => row['ExpiringLicenses'],
+      sortable: true,
+      exportSelector: 'ExpiringLicenses',
+      cell: cellBooleanFormatter(),
+    },
     {
       name: 'Actions',
       cell: Actions,

diff --git a/src/views/tenant/administration/ListLicences.js b/src/views/tenant/administration/ListLicences.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { useSelector } from 'react-redux'
 import { CippPageList } from 'src/components/layout'
-import { CellTip } from 'src/components/tables'
+import { CellTip, cellBooleanFormatter, cellDateFormatter } from 'src/components/tables'
 
 const columns = [
   {
@@ -38,6 +38,39 @@ const columns = [
     sortable: true,
     exportSelector: 'TotalLicenses',
   },
+  {
+    name: 'Estimated Term',
+    selector: (row) => row['EstTerm'],
+    sortable: true,
+    exportSelector: 'EstTerm',
+  },
+  {
+    name: 'Trial',
+    selector: (row) => row['Trial'],
+    sortable: true,
+    exportSelector: 'Trial',
+    cell: cellBooleanFormatter(),
+  },
+  {
+    name: 'Time until renewal (days)',
+    selector: (row) => row['TimeUntilRenew'],
+    sortable: true,
+    exportSelector: 'TimeUntilRenew',
+  },
+  {
+    name: 'Date Created',
+    selector: (row) => row['dateCreated'],
+    sortable: true,
+    exportSelector: 'dateCreated',
+    cell: cellDateFormatter(),
+  },
+  {
+    name: 'Time until renewal (days)',
+    selector: (row) => row['dateExpires'],
+    sortable: true,
+    exportSelector: 'dateExpires',
+    cell: cellDateFormatter(),
+  },
 ]
 
 const LicenseList = () => {