Merge pull request #156 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/components/CippStandards/CippStandardAccordion.jsx

@@ -168,16 +168,15 @@ const CippStandardAccordion = ({
                         size="small"
                         sx={{ mr: 1 }}
                       />
-                      <Chip
-                        key={index}
-                        label={standard?.impact}
-                        color={standard?.impact === "High Impact" ? "error" : "info"}
-                        variant="outlined"
-                        size="small"
-                        sx={{ mr: 1 }}
-                      />
                     </>
                   ))}
+                  <Chip
+                    label={standard?.impact}
+                    color={standard?.impact === "High Impact" ? "error" : "info"}
+                    variant="outlined"
+                    size="small"
+                    sx={{ mr: 1 }}
+                  />
                 </Stack>
               )}
               {

src/data/GraphExplorerPresets.json

@@ -105,7 +105,8 @@
     "params": {
       "endpoint": "/reports/authenticationMethods/userRegistrationDetails",
       "$filter": "",
-      "$select": ""
+      "$select": "",
+      "AsApp": true
     },
     "isBuiltin": true
   },
@@ -125,7 +126,8 @@
     "params": {
       "endpoint": "/reports/authenticationMethods/userRegistrationDetails",
       "$filter": "IsAdmin eq true",
-      "$select": ""
+      "$select": "",
+      "AsApp": true
     },
     "isBuiltin": true
   },

src/data/standards.json

@@ -3490,8 +3490,8 @@
     "label": "Intune Template",
     "multiple": true,
     "disabledFeatures": {
-      "report": true,
-      "warn": true,
+      "report": false,
+      "warn": false,
       "remediate": false
     },
     "impact": "High Impact",

src/pages/tenant/standards/bpa-report/view.js

@@ -113,7 +113,7 @@ const Page = () => {
         }
       }
     }
-  }, [bpaTemplateList.isSuccess, bpaData.isSuccess, currentTenant, router]);
+  }, [bpaTemplateList.isSuccess, bpaData.isSuccess, bpaData.data, currentTenant, router]);
 
   const pageTitle = `BPA Report Viewer - ${currentTenant}`;
   return (
@@ -221,6 +221,8 @@ const Page = () => {
                           noCard={true}
                           incorrectDataMessage={"No data has been found for this report."}
                           simpleColumns={block?.simpleColumns}
+                          isFetching={bpaData.isFetching}
+                          refreshFunction={() => bpaData.refetch()}
                         />
                       ) : (
                         <Typography variant="h6" color="textPrimary">