From 16f89b0ae7d5454c78491c4a078c249fba50fb61 Mon Sep 17 00:00:00 2001 From: AsToNlele Date: Wed, 1 Nov 2023 09:58:06 +0100 Subject: [PATCH] xd --- .../PoliciesTable/Columns.js | 21 ++++++++++++++++--- .../CompliancePolicies/CompliancePolicies.js | 11 +++++++++- .../EditPolicy/EditPolicySystemsTab.js | 12 +++++++++-- .../PolicyDetails/PolicyDetails.js | 13 +++++++++++- src/SmartComponents/Reports/Reports.js | 2 ++ 5 files changed, 52 insertions(+), 7 deletions(-) diff --git a/src/PresentationalComponents/PoliciesTable/Columns.js b/src/PresentationalComponents/PoliciesTable/Columns.js index 4a354400e..e8920434a 100644 --- a/src/PresentationalComponents/PoliciesTable/Columns.js +++ b/src/PresentationalComponents/PoliciesTable/Columns.js @@ -1,10 +1,11 @@ -import React from 'react'; +import React, { Fragment } from 'react'; import propTypes from 'prop-types'; -import { TextContent } from '@patternfly/react-core'; +import { TextContent, Tooltip } from '@patternfly/react-core'; import { fitContent } from '@patternfly/react-table'; import { LinkWithPermission as Link } from 'PresentationalComponents'; import { GreySmallText, SystemsCountWarning } from 'PresentationalComponents'; import { renderComponent } from 'Utilities/helpers'; +import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons'; const PolicyNameCell = ({ id, policy, policyType }) => ( @@ -48,7 +49,21 @@ export const OperatingSystem = { }; export const Systems = { - title: 'Systems', + title: ( + + This count only reflects the systems you have permission to access. + + } + > + + Systems   + + + + ), props: { width: 15, }, diff --git a/src/SmartComponents/CompliancePolicies/CompliancePolicies.js b/src/SmartComponents/CompliancePolicies/CompliancePolicies.js index 9283b84aa..e18e7ed3c 100644 --- a/src/SmartComponents/CompliancePolicies/CompliancePolicies.js +++ b/src/SmartComponents/CompliancePolicies/CompliancePolicies.js @@ -2,7 +2,7 @@ import React, { useEffect } from 'react'; import gql from 'graphql-tag'; import { useLocation } from 'react-router-dom'; import { useQuery } from '@apollo/client'; -import { Grid } from '@patternfly/react-core'; +import { Alert, Grid } from '@patternfly/react-core'; import PageHeader, { PageHeaderTitle, } from '@redhat-cloud-services/frontend-components/PageHeader'; @@ -75,6 +75,15 @@ export const CompliancePolicies = () => { +
diff --git a/src/SmartComponents/EditPolicy/EditPolicySystemsTab.js b/src/SmartComponents/EditPolicy/EditPolicySystemsTab.js index ea54d5404..54d76f05d 100644 --- a/src/SmartComponents/EditPolicy/EditPolicySystemsTab.js +++ b/src/SmartComponents/EditPolicy/EditPolicySystemsTab.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Text, TextContent } from '@patternfly/react-core'; +import { Alert, Text, TextContent } from '@patternfly/react-core'; import propTypes from 'prop-types'; import { SystemsTable } from 'SmartComponents'; import * as Columns from '../SystemsTable/Columns'; @@ -24,7 +24,15 @@ EmptyState.propTypes = { const PrependComponent = ({ osMajorVersion }) => ( - + + Select which of your RHEL {osMajorVersion} systems should be included in this policy. diff --git a/src/SmartComponents/PolicyDetails/PolicyDetails.js b/src/SmartComponents/PolicyDetails/PolicyDetails.js index 8625e3906..4d822838e 100644 --- a/src/SmartComponents/PolicyDetails/PolicyDetails.js +++ b/src/SmartComponents/PolicyDetails/PolicyDetails.js @@ -2,6 +2,7 @@ import React, { Fragment, useEffect } from 'react'; import propTypes from 'prop-types'; import { useParams, useLocation } from 'react-router-dom'; import { + Alert, Breadcrumb, BreadcrumbItem, Grid, @@ -76,10 +77,20 @@ export const PolicyDetails = ({ route }) => { {policy.name} - + + + + { showView = profiles && profiles.length > 0; } + console.log("DATA", data) + return ( <>