+
+
+
+ ))
+ );
+}
+CommitSummary.propTypes = {
+ buildId: PropTypes.number.isRequired,
+ build: PropTypes.shape({
+ isLoading: PropTypes.bool,
+ data: PropTypes.objectOf(BUILD),
+ }),
+};
+
+CommitSummary.defaultProps = {
+ build: null,
+};
+
+const mapStateToProps = ({ build }) => ({ build });
+
+export { CommitSummary };
+export default connect(mapStateToProps)(CommitSummary);
diff --git a/frontend/components/site/SideNav.jsx b/frontend/components/site/SideNav.jsx
index 7b235f5fe..570033bda 100644
--- a/frontend/components/site/SideNav.jsx
+++ b/frontend/components/site/SideNav.jsx
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom';
import * as icons from '../icons';
const SideNav = ({ config, siteId }) => (
-
+
+ + {buildShaLink( + buildDetails.site.owner, + buildDetails.site.repository, + buildDetails.clonedCommitSha + )} + by + {buildDetails.username} + + + { timeFrom(buildDetails.createdAt) } + +
+
+
-
{
config.map((conf) => {
diff --git a/frontend/components/site/siteBuildLogs.jsx b/frontend/components/site/siteBuildLogs.jsx
index 17dd10be6..7aac84458 100644
--- a/frontend/components/site/siteBuildLogs.jsx
+++ b/frontend/components/site/siteBuildLogs.jsx
@@ -1,11 +1,12 @@
/* eslint-disable react/forbid-prop-types */
import React from 'react';
-import { useParams } from 'react-router-dom';
+import { Link, useParams } from 'react-router-dom';
import { useBuildLogs } from '../../hooks';
import SiteBuildLogTable from './siteBuildLogTable';
import DownloadBuildLogsButton from './downloadBuildLogsButton';
+import CommitSummary from './CommitSummary';
export const REFRESH_INTERVAL = 15 * 1000;
@@ -14,22 +15,25 @@ const SiteBuildLogs = () => {
const buildId = parseInt(buildIdStr, 10);
const { logs, state } = useBuildLogs(buildId);
- if (!logs || logs?.length === 0) {
- return (
-
- View scan results + )}
- + + View build logs + + +
-
+ { summary }
+
+
+ {task.status === 'success' && task.artifact && task.artifact.url && (
+ - + + Download scan results + + + ({ prettyBytes(task.artifact.size) }) + + + )} +
- + { buildLogsLink(build) } + + {' '} + ( + { duration(build.startedAt, build.completedAt) } + ) + + + { process.env.FEATURE_BUILD_TASKS && build.BuildTasks && ( +
- + { summarizeTaskResults(build) } + + )} +
-
- );
- }
-
return (
+
);
};
diff --git a/frontend/components/site/siteBuildTasks.jsx b/frontend/components/site/siteBuildTasks.jsx
new file mode 100644
index 000000000..b39d6494f
--- /dev/null
+++ b/frontend/components/site/siteBuildTasks.jsx
@@ -0,0 +1,175 @@
+/* eslint-disable react/jsx-one-expression-per-line */
+/* eslint-disable react/forbid-prop-types */
+
+import React, { useEffect, useState } from 'react';
+import { Link, useParams } from 'react-router-dom';
+import prettyBytes from 'pretty-bytes';
+import {
+ IconCheckCircle, IconClock, IconExclamationCircle, IconSpinner,
+} from '../icons';
+import CommitSummary from './CommitSummary';
+import api from '../../util/federalistApi';
+
+export const REFRESH_INTERVAL = 15 * 10000;
+
+const taskSummaryIcon = ({ status, count }) => {
+ let summary;
+ let icon;
+ switch (status) {
+ case 'error':
+ summary = 'Scan canceled';
+ icon = IconExclamationCircle;
+ break;
+ case 'processing':
+ summary = 'Scan in progress';
+ icon = IconSpinner;
+ break;
+ case 'skipped':
+ summary = 'Scan skipped';
+ icon = null;
+ break;
+ case 'queued':
+ case 'created':
+ summary = 'Scan queued';
+ icon = IconClock;
+ break;
+ case 'success':
+ if (count === 1) {
+ summary = '1 issue found';
+ } else if (count > 1) {
+ summary = `${count} issues found`;
+ } else {
+ summary = 'No issues found';
+ }
+ icon = IconCheckCircle;
+ break;
+ default:
+ summary = status;
+ icon = null;
+ }
+ return { summary, icon };
+};
+
+const SiteBuildTasks = () => {
+ const { buildId: buildIdStr } = useParams();
+ const buildId = parseInt(buildIdStr, 10);
+ const [buildTasks, setBuildTasks] = useState([]);
+
+ let intervalHandle;
+ useEffect(() => {
+ function fetchTasks(thisBuildId) {
+ return api.fetchTasks(thisBuildId).then((tasks) => {
+ setBuildTasks([...tasks]);
+ return tasks;
+ });
+ }
+ fetchTasks(buildId);
+ // Really need to stop interval if all tasks are complete
+ intervalHandle = setInterval(() => {
+ fetchTasks(buildId);
+ }, REFRESH_INTERVAL);
+
+ return () => {
+ clearInterval(intervalHandle);
+ };
+ }, []);
+
+ return (
+ -
+ {(process.env.FEATURE_BUILD_TASKS) && (
+
+
+ )}
+ {(logs && logs?.length > 0) && (
+
+ );
+};
+
+export default React.memo(SiteBuildTasks);
diff --git a/frontend/components/site/siteBuilds.jsx b/frontend/components/site/siteBuilds.jsx
index bb2ce72d3..8e2324ff6 100644
--- a/frontend/components/site/siteBuilds.jsx
+++ b/frontend/components/site/siteBuilds.jsx
@@ -7,7 +7,7 @@ import buildActions from '../../actions/buildActions';
import { currentSite } from '../../selectors/site';
import LoadingIndicator from '../LoadingIndicator';
import RefreshBuildsButton from './refreshBuildsButton';
-import { duration, timeFrom } from '../../util/datetime';
+import { duration, timeFrom, dateAndTime } from '../../util/datetime';
import AlertBanner from '../alertBanner';
import CreateBuildLink from '../CreateBuildLink';
import BranchViewLink from '../branchViewLink';
@@ -35,6 +35,7 @@ const buildStateData = ({ state, error }) => {
messageIcon = { message: 'Skipped', icon: null };
break;
case 'queued':
+ case 'created':
messageIcon = { message: 'Queued', icon: IconClock };
break;
case 'success':
@@ -47,23 +48,82 @@ const buildStateData = ({ state, error }) => {
};
function buildLogsLink(build) {
- return View logs;
+ return View build logs;
+}
+function resultLink(build) {
+ return View scan results;
+}
+
+function shaLink(build) {
+ const { owner, repository } = build.site;
+ const sha = build.clonedCommitSha || build.requestedCommitSha;
+ if (sha) {
+ return (
+
+
+ {(!buildTasks || buildTasks?.length === 0) && (
+ -
+
+ This build does not have any scans queued.
+
+ )}
+ {(buildTasks && buildTasks?.length > 0) && (
+ <>
+
+
+
+
+
+ | Scan | +Results | +
|---|---|
|
+
+
+
+ { icon && React.createElement(icon) }
+
+
+
+ { task.BuildTaskType.name }++ {task.BuildTaskType.description} + {' '} + For more information, check out the + documentation + . + + |
+
+
|
+
+
+
+
+ )}
+ + We welcome your feedback on this experimental feature. Email + {' '} + pages-support@cloud.gov + {' '} + with the subject line “Build scans feedback” to let us know what you think! +
+
-
+
+
+
+
+
+
+
+
+
{ icon && React.createElement(icon) }
- { commitLink(build) }
-
-
+
+
- { previewBuilds[build.branch] === build.id && build.state === 'success'
+
+
+
+ { message }
++ Build + + # + { build.id } + +
+
+ { branchLink(build) }
+
+
+ { shaLink(build) }
+
+ { build.username }
+
+
+ { timeFrom(build.createdAt) }
+
+
+ -
+
+ { previewBuilds[build.branch] === build.id && build.state === 'success'
&& (
-
-
-
- { message }
- { buildLogsLink(build) }
+
", () => {
+ const wrapper = mountRouter(", () => {
+ const wrapper = mountRouter(