Skip to content

Commit 7b9be3e

Browse files
Add delete policy option
1 parent 2e486cb commit 7b9be3e

File tree

1 file changed

+10
-27
lines changed
  • src/pages/tenant/standards/manage-drift

1 file changed

+10
-27
lines changed

src/pages/tenant/standards/manage-drift/index.js

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,6 @@ const ManageDriftPage = () => {
328328
status = "Accepted";
329329
actionText = "accept";
330330
break;
331-
case "deny-remove":
332-
status = "Denied";
333-
actionText = "deny and remove";
334-
break;
335331
case "deny-delete":
336332
status = "DeniedDelete";
337333
actionText = "deny and delete";
@@ -554,7 +550,8 @@ const ManageDriftPage = () => {
554550
const deviationItemsWithActions = deviationItems.map((item) => {
555551
// Check if this is a template that supports delete action
556552
const supportsDelete =
557-
item.standardName === "ConditionalAccessTemplate" || item.standardName === "IntuneTemplate";
553+
item.standardName?.includes("ConditionalAccessTemplate") ||
554+
item.standardName?.includes("IntuneTemplate");
558555

559556
return {
560557
...item,
@@ -584,7 +581,7 @@ const ManageDriftPage = () => {
584581
{supportsDelete && (
585582
<MenuItem onClick={() => handleAction("deny-delete", item.id)}>
586583
<Block sx={{ mr: 1, color: "error.main" }} />
587-
Deny Deviation - Delete
584+
Deny Deviation - Delete Policy
588585
</MenuItem>
589586
)}
590587
<MenuItem onClick={() => handleAction("deny-remediate", item.id)}>
@@ -601,7 +598,8 @@ const ManageDriftPage = () => {
601598
const acceptedDeviationItemsWithActions = acceptedDeviationItems.map((item) => {
602599
// Check if this is a template that supports delete action
603600
const supportsDelete =
604-
item.standardName === "ConditionalAccessTemplate" || item.standardName === "IntuneTemplate";
601+
item.standardName?.includes("ConditionalAccessTemplate") ||
602+
item.standardName?.includes("IntuneTemplate");
605603

606604
return {
607605
...item,
@@ -623,7 +621,7 @@ const ManageDriftPage = () => {
623621
{supportsDelete && (
624622
<MenuItem onClick={() => handleDeviationAction("deny-delete", item)}>
625623
<Block sx={{ mr: 1, color: "error.main" }} />
626-
Deny - Delete
624+
Deny - Delete Policy
627625
</MenuItem>
628626
)}
629627
<MenuItem onClick={() => handleDeviationAction("deny-remediate", item)}>
@@ -644,7 +642,8 @@ const ManageDriftPage = () => {
644642
const customerSpecificDeviationItemsWithActions = customerSpecificDeviationItems.map((item) => {
645643
// Check if this is a template that supports delete action
646644
const supportsDelete =
647-
item.standardName === "ConditionalAccessTemplate" || item.standardName === "IntuneTemplate";
645+
item.standardName?.includes("ConditionalAccessTemplate") ||
646+
item.standardName?.includes("IntuneTemplate");
648647

649648
return {
650649
...item,
@@ -861,8 +860,8 @@ const ManageDriftPage = () => {
861860
{/* Only show delete option if there are template deviations that support deletion */}
862861
{processedDriftData.currentDeviations.some(
863862
(deviation) =>
864-
deviation.standardName === "ConditionalAccessTemplate" ||
865-
deviation.standardName === "IntuneTemplate"
863+
deviation.standardName?.includes("ConditionalAccessTemplate") ||
864+
deviation.standardName?.includes("IntuneTemplate")
866865
) && (
867866
<MenuItem onClick={() => handleBulkAction("deny-all-delete")}>
868867
<Block sx={{ mr: 1, color: "error.main" }} />
@@ -878,22 +877,6 @@ const ManageDriftPage = () => {
878877
Remove Drift Customization
879878
</MenuItem>
880879
</Menu>
881-
882-
<Menu
883-
anchorEl={whatIfAnchorEl}
884-
open={Boolean(whatIfAnchorEl)}
885-
onClose={() => setWhatIfAnchorEl(null)}
886-
>
887-
{availableStandards.map((standard) => (
888-
<MenuItem
889-
key={standard.id}
890-
onClick={() => handleWhatIfAction(standard.id)}
891-
>
892-
<Science sx={{ mr: 1, color: "primary.main" }} />
893-
{standard.name}
894-
</MenuItem>
895-
))}
896-
</Menu>
897880
</Box>
898881
</Box>
899882
<CippBannerListCard

0 commit comments

Comments
 (0)