From 40a7d2196421c8d668afaceb942a6856c24da75e Mon Sep 17 00:00:00 2001
From: KelvinTegelaar
Date: Fri, 8 Dec 2023 12:00:32 +0100
Subject: [PATCH] added disablement options
---
src/data/standards.json | 9 ++++-
.../tenant/standards/ListAppliedStandards.jsx | 40 ++++++-------------
2 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/src/data/standards.json b/src/data/standards.json
index 2c33e8ac6b3d..ea97773dfb64 100644
--- a/src/data/standards.json
+++ b/src/data/standards.json
@@ -3,6 +3,11 @@
"name": "standards.MailContacts",
"cat": "Global Standards",
"helpText": "Defines the email address to receive general updates and information related to M365 subscriptions. Leave a contact field blank if you do not want to update the contact information.",
+ "disabledFeatures": {
+ "report": false,
+ "warn": false,
+ "remediate": false
+ },
"addedComponent": [
{
"type": "input",
@@ -493,8 +498,8 @@
"helpText": "Blocks login for all accounts that are marked as a shared mailbox. This is Microsoft best practice to prevent direct logons to shared mailboxes.",
"addedComponent": [],
"label": "Disable Shared Mailbox AAD accounts",
- "impact": "High Impact",
- "impactColour": "danger"
+ "impact": "Medium Impact",
+ "impactColour": "warning"
},
{
"name": "standards.intuneDeviceRetirementDays",
diff --git a/src/views/tenant/standards/ListAppliedStandards.jsx b/src/views/tenant/standards/ListAppliedStandards.jsx
index 78e26adfbb0d..19d1adbd1df4 100644
--- a/src/views/tenant/standards/ListAppliedStandards.jsx
+++ b/src/views/tenant/standards/ListAppliedStandards.jsx
@@ -222,7 +222,7 @@ const ListAppliedStandards = () => {
let count = 0
Object.keys(standards).forEach((key) => {
const standard = standards[key]
- // Check if 'Enabled' exists and the specific type is true
+ // Check if 'Enabled' exists and the specific type is true, for non-v2 standards
if (standard?.Enabled && standard?.Enabled[type]) {
count++
} else if (standard && standard[type]) {
@@ -354,12 +354,12 @@ const ListAppliedStandards = () => {
- Warn
+ Report
@@ -369,7 +369,7 @@ const ListAppliedStandards = () => {
name="ignore.ignore2"
disabled={true}
helpText={
- 'Exclude this standard from the All Tenants standard. This will only apply explicitly set standards to this tenant.'
+ 'Alert Generates an alert in the log, if remediate is enabled the log entry will also say if the remediation was successful.'
}
/>
@@ -377,9 +377,7 @@ const ListAppliedStandards = () => {
Remediate
@@ -416,10 +414,11 @@ const ListAppliedStandards = () => {
- Warn
+ Report
@@ -427,7 +426,8 @@ const ListAppliedStandards = () => {
Alert
@@ -435,7 +435,8 @@ const ListAppliedStandards = () => {
Remediate
@@ -516,7 +517,7 @@ const ListAppliedStandards = () => {
Deploy {template.name}
- Warn
+ Report
@@ -582,21 +583,6 @@ const ListAppliedStandards = () => {
)}
- {/*
- {listStandardsAllTenants && (
-
- {getResults.isLoading && }
- {getResults.isSuccess && (
- {getResults.data?.Results}
- )}
-
-
- )}
- */}
>