Skip to content

Commit

Permalink
xd
Browse files Browse the repository at this point in the history
  • Loading branch information
AsToNlele authored and gkarat committed Dec 20, 2023
1 parent 8d505fb commit 16f89b0
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 7 deletions.
21 changes: 18 additions & 3 deletions src/PresentationalComponents/PoliciesTable/Columns.js
Original file line number Diff line number Diff line change
@@ -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 }) => (
<TextContent>
Expand Down Expand Up @@ -48,7 +49,21 @@ export const OperatingSystem = {
};

export const Systems = {
title: 'Systems',
title: (
<Tooltip
position="top"
content={
<Fragment>
This count only reflects the systems you have permission to access.
</Fragment>
}
>
<span className="pf-c-table__text">
Systems &nbsp;
<OutlinedQuestionCircleIcon className="grey-icon" />
</span>
</Tooltip>
),
props: {
width: 15,
},
Expand Down
11 changes: 10 additions & 1 deletion src/SmartComponents/CompliancePolicies/CompliancePolicies.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -75,6 +75,15 @@ export const CompliancePolicies = () => {
<React.Fragment>
<PageHeader className="page-header">
<PageHeaderTitle title="SCAP policies" />
<Alert
isInline
variant="info"
ouiaId="SystemsListIsDifferentAlert"
title={
'These policies only reflect the systems you have permission to access.'
}
className="pf-u-mt-md"
/>
</PageHeader>
<section className="pf-c-page__main-section">
<StateView stateValues={{ error, data, loading }}>
Expand Down
12 changes: 10 additions & 2 deletions src/SmartComponents/EditPolicy/EditPolicySystemsTab.js
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -24,7 +24,15 @@ EmptyState.propTypes = {

const PrependComponent = ({ osMajorVersion }) => (
<React.Fragment>
<TextContent className="pf-u-mb-md">
<Alert
isInline
variant="info"
ouiaId="SystemsListIsDifferentAlert"
title={
'These policy details only reflect the systems you have permission to access.'
}
/>
<TextContent className="pf-u-mb-md pf-u-mt-md">
<Text>
Select which of your <b>RHEL {osMajorVersion}</b> systems should be
included in this policy.
Expand Down
13 changes: 12 additions & 1 deletion src/SmartComponents/PolicyDetails/PolicyDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -76,10 +77,20 @@ export const PolicyDetails = ({ route }) => {
</BreadcrumbLinkItem>
<BreadcrumbItem isActive>{policy.name}</BreadcrumbItem>
</Breadcrumb>
<Grid gutter="lg">
<Grid gutter="lg" hasGutter>
<GridItem xl2={11} xl={10} lg={12} md={12} sm={12}>
<PageHeaderTitle title={policy.name} />
</GridItem>
<GridItem>
<Alert
isInline
variant="info"
ouiaId="SystemsListIsDifferentAlert"
title={
'These policy details only reflect the systems you have permission to access.'
}
/>
</GridItem>
</Grid>
<RoutedTabs
aria-label="Policy Tabs"
Expand Down
2 changes: 2 additions & 0 deletions src/SmartComponents/Reports/Reports.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ export const Reports = () => {
showView = profiles && profiles.length > 0;
}

console.log("DATA", data)

return (
<>
<ReportsHeader />
Expand Down

0 comments on commit 16f89b0

Please sign in to comment.