Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1868151: fix invalidly nested help text #6303

Merged
merged 1 commit into from Aug 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -623,7 +623,7 @@ export const ClusterServiceVersionList = connect(clusterServiceVersionStateToPro
export const ClusterServiceVersionsPage: React.FC<ClusterServiceVersionsPageProps> = (props) => {
const title = 'Installed Operators';
const helpText = (
<p className="co-help-text">
<>
Installed Operators are represented by Cluster Service Versions within this namespace. For
more information, see the{' '}
<ExternalLink
Expand All @@ -633,7 +633,7 @@ export const ClusterServiceVersionsPage: React.FC<ClusterServiceVersionsPageProp
. Or create an Operator and Cluster Service Version using the{' '}
<ExternalLink href="https://github.com/operator-framework/operator-sdk" text="Operator SDK" />
.
</p>
</>
);

const flatten = ({ clusterServiceVersions, subscriptions }) =>
Expand Down
Expand Up @@ -213,11 +213,11 @@ export const PackageManifestsPage: React.SFC<PackageManifestsPageProps> = (props
type Flatten = (resources: { [kind: string]: { data: K8sResourceKind[] } }) => K8sResourceKind[];
const flatten: Flatten = (resources) => _.get(resources.packageManifest, 'data', []);
const helpText = (
<p className="co-help-text">
<>
Catalogs are groups of Operators you can make available on the cluster. Use{' '}
<Link to="/operatorhub">OperatorHub</Link> to subscribe and grant namespaces access to use
installed Operators.
</p>
</>
);

return (
Expand Down
4 changes: 1 addition & 3 deletions frontend/public/components/user.tsx
Expand Up @@ -128,9 +128,7 @@ export const UserPage: React.FC<UserPageProps> = (props) => (
<ListPage
{...props}
title="Users"
helpText={
<p className="co-help-text">Users are automatically added the first time they log&nbsp;in.</p>
}
helpText={<>Users are automatically added the first time they log&nbsp;in.</>}
kind={referenceForModel(UserModel)}
ListComponent={UserList}
canCreate={false}
Expand Down