+
+ setOCVisible(true)}
+ className="me-2"
+ >
+
+
+
{!preset[0]?.isBuiltin &&
preset[0]?.id &&
preset[0]?.IsMyPreset && (
@@ -373,6 +445,7 @@ const GraphExplorer = () => {
values: props.values,
})
}
+ className="me-2"
>
@@ -394,6 +467,18 @@ const GraphExplorer = () => {
{postResults.data?.Results}
)}
+
{
+ setOCVisible(false)
+ setRandom2((Math.random() + 1).toString(36).substring(7))
+ }}
+ />
>
)
}}
@@ -418,6 +503,7 @@ const GraphExplorer = () => {
placeholder="Enter the Graph Endpoint you'd like to run the custom report for."
/>
+
{
placeholder="Enter the filter string for the Graph query"
/>
-
+
+ {
+ return {
+ name: prop,
+ value: prop,
+ }
+ })
+ : []
+ }
+ allowCreate={true}
+ refreshFunction={() =>
+ setRandom3((Math.random() + 1).toString(36).substring(7))
+ }
+ isLoading={availableProperties.isFetching}
+ />
+
{
{!searchNow && Execute a search to get started.}
+ {graphrequest.isFetching && (
+
+ Loading Data
+
+ )}
{graphrequest.isSuccess && QueryColumns.set && searchNow && (
diff --git a/src/views/tenant/administration/ListAlertsQueue.jsx b/src/views/tenant/administration/ListAlertsQueue.jsx
index b0800dfaa7bf..23513f50a28d 100644
--- a/src/views/tenant/administration/ListAlertsQueue.jsx
+++ b/src/views/tenant/administration/ListAlertsQueue.jsx
@@ -93,7 +93,7 @@ const ListClassicAlerts = () => {
({
label: key,
value:
diff --git a/src/views/tenant/standards/ListAppliedStandards.jsx b/src/views/tenant/standards/ListAppliedStandards.jsx
index 1d0979924189..61c50f1a0d99 100644
--- a/src/views/tenant/standards/ListAppliedStandards.jsx
+++ b/src/views/tenant/standards/ListAppliedStandards.jsx
@@ -207,10 +207,16 @@ const ApplyNewStandard = () => {
(tenant) => tenant.displayName === 'AllTenants',
)
- function getLabel(item) {
+ function getLabel(item, type) {
+ if (!item || !item.name) {
+ return ''
+ }
const keys = item.name.split('.')
let value = keys.reduce((prev, curr) => prev && prev[curr], allTenantsStandard)
- return value ? `* Enabled via All Tenants` : ''
+ if (!value || !value[type]) {
+ return ''
+ }
+ return `* Enabled via All Tenants`
}
const groupedStandards = allStandardsList.reduce((acc, obj) => {
@@ -437,7 +443,7 @@ const ApplyNewStandard = () => {
name={`${obj.name}.report`}
disabled={obj.disabledFeatures?.report}
helpText="Report stores the data in the database to use in custom BPA reports."
- sublabel={getLabel(obj)}
+ sublabel={getLabel(obj, 'report')}
/>
@@ -446,7 +452,7 @@ const ApplyNewStandard = () => {
name={`${obj.name}.alert`}
disabled={obj.disabledFeatures?.warn}
helpText="Alert Generates an alert in the log, if remediate is enabled the log entry will also say if the remediation was successful."
- sublabel={getLabel(obj)}
+ sublabel={getLabel(obj, 'alert')}
/>
@@ -455,7 +461,7 @@ const ApplyNewStandard = () => {
name={`${obj.name}.remediate`}
disabled={obj.disabledFeatures?.remediate}
helpText={'Remediate executes the fix for standard.'}
- sublabel={getLabel(obj)}
+ sublabel={getLabel(obj, 'remediate')}
/>
diff --git a/version_latest.txt b/version_latest.txt
index 3bff059174b8..804440660c71 100644
--- a/version_latest.txt
+++ b/version_latest.txt
@@ -1 +1 @@
-5.1.1
\ No newline at end of file
+5.2.1
\ No newline at end of file