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.

Sign up for GitHub

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

Jump to bottom

Bug 1883302: Add dev-preview badge to application stages and details page #6762

Merged
merged 1 commit into from Sep 29, 2020
Merged

Bug 1883302: Add dev-preview badge to application stages and details page #6762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions frontend/packages/dev-console/src/components/gitops/GitOpsDetailsPage.tsx
View file
Open in desktop
Expand Up @@ -2,6 +2,8 @@ import * as React from 'react';
import Helmet from 'react-helmet';
import { RouteComponentProps } from 'react-router-dom';
import * as _ from 'lodash';
import { LoadingBox } from '@console/internal/components/utils';
import { DevPreviewBadge } from '@console/shared';
import { GitOpsAppGroupData, GitOpsEnvironment } from './utils/gitops-types';
import {
fetchAppGroups,
Expand All @@ -12,7 +14,6 @@ import {
import useDefaultSecret from './utils/useDefaultSecret';
import GitOpsDetailsPageHeading from './details/GitOpsDetailsPageHeading';
import GitOpsDetailsController from './details/GitOpsDetailsController';
import { LoadingBox } from '@console/internal/components/utils';

type GitOpsDetailsPageProps = RouteComponentProps<{ appName?: string }>;

Expand Down Expand Up @@ -76,7 +77,12 @@ const GitOpsDetailsPage: React.FC<GitOpsDetailsPageProps> = ({ match, location }
<Helmet>
<title>{`${appName} · Details`}</title>
</Helmet>
<GitOpsDetailsPageHeading url={match.url} appName={appName} manifestURL={manifestURL} />
<GitOpsDetailsPageHeading
url={match.url}
appName={appName}
manifestURL={manifestURL}
badge={<DevPreviewBadge />}
/>
{!envsData && !emptyStateMsg ? (
<LoadingBox />
) : (
Expand Down
3 changes: 2 additions & 1 deletion frontend/packages/dev-console/src/components/gitops/GitOpsListPage.tsx
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@ import { PageHeading, LoadingBox } from '@console/internal/components/utils';
import { ProjectModel } from '@console/internal/models';
import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook';
import { K8sResourceKind } from '@console/internal/module/k8s';
import { DevPreviewBadge } from '@console/shared';
import GitOpsList from './list/GitOpsList';
import { fetchAllAppGroups, getManifestURLs, getPipelinesBaseURI } from './utils/gitops-utils';
import useDefaultSecret from './utils/useDefaultSecret';
Expand Down Expand Up @@ -42,7 +43,7 @@ const GitOpsListPage: React.FC = () => {
<Helmet>
<title>Application Stages</title>
</Helmet>
<PageHeading title="Application Stages" />
<PageHeading title="Application Stages" badge={<DevPreviewBadge />} />
{!appGroups && !emptyStateMsg ? (
<LoadingBox />
) : (
Expand Down
4 changes: 4 additions & 0 deletions frontend/packages/dev-console/src/components/gitops/details/GitOpsDetailsPageHeading.scss
View file
Open in desktop
Expand Up @@ -4,4 +4,8 @@
font-weight: bold;
font-size: 12px;
}

h1 {
margin-bottom: var(--pf-global--spacer--sm);
}
}
7 changes: 5 additions & 2 deletions frontend/packages/dev-console/src/components/gitops/details/GitOpsDetailsPageHeading.tsx
View file
Open in desktop
Expand Up @@ -8,12 +8,14 @@ interface GitOpsDetailsPageHeadingProps {
url: string;
appName: string;
manifestURL: string;
badge?: React.ReactNode;
}

const GitOpsDetailsPageHeading: React.FC<GitOpsDetailsPageHeadingProps> = ({
url,
appName,
manifestURL,
badge,
}) => {
const breadcrumbs = [
{
Expand All @@ -27,13 +29,14 @@ const GitOpsDetailsPageHeading: React.FC<GitOpsDetailsPageHeadingProps> = ({
];

return (
<div className="co-m-nav-title co-m-nav-title--breadcrumbs">
<div className="odc-gitops-details-page-heading co-m-nav-title co-m-nav-title--breadcrumbs">
<BreadCrumbs breadcrumbs={breadcrumbs} />
<h1>
<h1 className="co-m-pane__heading">
<div className="co-m-pane__name co-resource-item">
<ResourceIcon kind="application" className="co-m-resource-icon--lg" />
<span className="co-resource-item__resource-name">{appName}</span>
</div>
{badge && <span className="co-m-pane__heading-badge">{badge}</span>}
</h1>
<Split className="odc-gitops-details-page-heading__repo" hasGutter>
<SplitItem>Manifest File Repo:</SplitItem>
Expand Down