Adds a backfill badge to timeseries executions (#149)

criteo · Aug 22, 2017 · 9f82dd1 · 9f82dd1
1 parent bb2264d
commit 9f82dd1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/core/src/main/javascript/app/pages/Execution.js b/core/src/main/javascript/app/pages/Execution.js
@@ -18,6 +18,7 @@ import Spinner from "../components/Spinner";
 import Clock from "../components/Clock";
 import Link from "../components/Link";
 import JobStatus from "../components/JobStatus";
+import { Badge } from "../components/Badge";
 import { listenEvents } from "../../Utils";
 import type { ExecutionLog } from "../../datamodel";
 import { highlightURLs } from "../utils/URLHighlighter";
@@ -237,7 +238,14 @@ class Execution extends React.Component {
                 <dt key="context">Context:</dt>
                 <dd key="context_"><Context context={data.context} /></dd>
                 <dt key="status">Status:</dt>
-                <dd key="status_"><JobStatus status={data.status} /></dd>
+                <dd key="status_"><JobStatus status={data.status} />{ 
+                  data.context.backfill ? 
+                    <span style={{ marginLeft : "10px" }}>
+                      <Link href={`/timeseries/backfills/${data.context.backfill.id}`}>
+                        <Badge label="BACKFILL" kind="alt" />
+                      </Link>
+                    </span> : null}
+                </dd>
                 {data.startTime
                   ? [
                       <dt key="startTime">Start time:</dt>,

diff --git a/core/src/main/javascript/app/pages/TimeSeriesExecutions.js b/core/src/main/javascript/app/pages/TimeSeriesExecutions.js
@@ -16,6 +16,7 @@ import Spinner from "../components/Spinner";
 import Link from "../components/Link";
 import Clock from "../components/Clock";
 import JobStatus from "../components/JobStatus";
+import { Badge } from "../components/Badge";
 import { listenEvents } from "../../Utils";
 import type { ExecutionLog, Job } from "../../datamodel";
 
@@ -188,10 +189,19 @@ class TimeSeriesExecutions extends React.Component {
                   onSortBy={this.sortBy.bind(this)}
                   sort={sort}
                   data={sortedData}
-                  render={(column, { id, startTime, endTime, status }) => {
+                  render={(
+                    column,
+                    { id, startTime, endTime, status, context }
+                  ) => {
                     switch (column) {
                       case "backfill":
-                        return <span className={classes.missing}>no</span>;
+                        return context.backfill
+                          ? <Link
+                              href={`/timeseries/backfills/${context.backfill.id}`}
+                            >
+                              <Badge label="BACKFILL" kind="alt" width={75} />
+                            </Link>
+                          : <span className={classes.missing}>no</span>;
                       case "startTime":
                         return startTime
                           ? <Clock