Merge branch 'KelvinTegelaar:dev' into dev

Author: JohnDuprey

public/version_latest.txt

@@ -1 +1 @@
-3.7.0
+3.8.0

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",

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"

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,

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 = () => {