Merge pull request #956 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/pages/identity/administration/jit-admin-templates/add.jsx

@@ -236,6 +236,10 @@ const Page = () => {
                 validators={{ required: "Expiration action is required" }}
               />
             </Grid>
+
+            <Grid size={{ md: 6, xs: 12 }}>
+              <CippFormComponent
+                type="autoComplete"
                 fullWidth
                 label="Default Notification Actions"
                 name="defaultNotificationActions"

src/pages/tenant/manage/drift.js

@@ -1134,6 +1134,17 @@ const ManageDriftPage = () => {
   const handleDeviationAction = (action, deviation) => {
     if (!deviation) return
 
+    const resolvedReceivedValue =
+      deviation.receivedValue ??
+      deviation.CurrentValue ??
+      deviation.currentValue ??
+      deviation.originalDeviation?.receivedValue ??
+      deviation.originalDeviation?.CurrentValue ??
+      deviation.originalDeviation?.currentValue ??
+      deviation.expectedValue ??
+      deviation.ExpectedValue ??
+      null
+
     let status
     let actionText
     switch (action) {
@@ -1168,7 +1179,7 @@ const ManageDriftPage = () => {
           {
             standardName: deviation.standardName, // Use the standardName from the original deviation data
             status: status,
-            receivedValue: deviation.receivedValue,
+            receivedValue: resolvedReceivedValue,
           },
         ],
         tenantFilter: tenantFilter,
@@ -1407,6 +1418,25 @@ const ManageDriftPage = () => {
     ),
   }))
 
+  // Add action buttons to compliant/aligned items so previously denied and now compliant entries
+  // can be denied again or denied with remediation persistence.
+  const alignedItemsWithActions = allAlignedItems.map((item) => ({
+    ...item,
+    cardLabelBoxActions: (
+      <Button
+        variant="outlined"
+        endIcon={<ExpandMore />}
+        onClick={(e) => {
+          e.stopPropagation()
+          handleMenuClick(e, `aligned-${item.id}`)
+        }}
+        size="small"
+      >
+        Actions
+      </Button>
+    ),
+  }))
+
   // Calculate compliance metrics for badges
   // Accepted and Customer Specific deviations count as compliant since they are user-approved
   // Denied deviations are included in total but not in compliant count (they haven't been fixed yet)
@@ -1485,7 +1515,7 @@ const ManageDriftPage = () => {
   const filteredAcceptedItems = applyFilters(acceptedDeviationItemsWithActions)
   const filteredCustomerSpecificItems = applyFilters(customerSpecificDeviationItemsWithActions)
   const filteredDeniedItems = applyFilters(deniedDeviationItemsWithActions)
-  const filteredAlignedItems = applyFilters(allAlignedItems)
+  const filteredAlignedItems = applyFilters(alignedItemsWithActions)
   const filteredLicenseSkippedItems = applyFilters(licenseSkippedItems)
 
   // Helper function to render items grouped by category when category sort is active
@@ -1918,12 +1948,7 @@ const ManageDriftPage = () => {
                       <Typography variant="h6" sx={{ mb: 2 }}>
                         Compliant Standards
                       </Typography>
-                      <CippBannerListCard
-                        items={filteredAlignedItems}
-                        isCollapsible={true}
-                        layout={'single'}
-                        isFetching={driftApi.isFetching}
-                      />
+                      {renderItemsByCategory(filteredAlignedItems)}
                     </Box>
                   )}
 
@@ -2148,6 +2173,15 @@ const ManageDriftPage = () => {
           open={Boolean(anchorEl[`denied-${item.id}`])}
           onClose={() => handleMenuClose(`denied-${item.id}`)}
         >
+          <MenuItem
+            onClick={() => {
+              handleDeviationAction('deny', item)
+              handleMenuClose(`denied-${item.id}`)
+            }}
+          >
+            <Error sx={{ mr: 1, color: 'error.main' }} />
+            Rerun standard to align with template
+          </MenuItem>
           <MenuItem
             onClick={() => {
               handleDeviationAction('deny-remediate', item)
@@ -2178,6 +2212,34 @@ const ManageDriftPage = () => {
         </Menu>
       ))}
 
+      {alignedItemsWithActions.map((item) => (
+        <Menu
+          key={`menu-aligned-${item.id}`}
+          anchorEl={anchorEl[`aligned-${item.id}`]}
+          open={Boolean(anchorEl[`aligned-${item.id}`])}
+          onClose={() => handleMenuClose(`aligned-${item.id}`)}
+        >
+          <MenuItem
+            onClick={() => {
+              handleDeviationAction('deny', item)
+              handleMenuClose(`aligned-${item.id}`)
+            }}
+          >
+            <Error sx={{ mr: 1, color: 'error.main' }} />
+            Rerun standard to align with template
+          </MenuItem>
+          <MenuItem
+            onClick={() => {
+              handleDeviationAction('deny-remediate', item)
+              handleMenuClose(`aligned-${item.id}`)
+            }}
+          >
+            <Cancel sx={{ mr: 1, color: 'error.main' }} />
+            Deny - Remediate to align with template
+          </MenuItem>
+        </Menu>
+      ))}
+
       {/* Hidden ExecutiveReportButton that gets triggered programmatically */}
       <Box sx={{ position: 'absolute', top: -9999, left: -9999 }}>
         <ExecutiveReportButton