Page MenuHomePhabricator
Files F14784873

D19217.diff
No OneTemporary
Actions

D19217.diff
View Options

diff --git a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
--- a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
+++ b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
@@ -71,7 +71,8 @@
),
'build/' => array(
$this->getQueryRoutePattern() => 'HarbormasterBuildListController',
- '(?P<id>\d+)/' => 'HarbormasterBuildViewController',
+ '(?P<id>\d+)/(?:(?P<generation>\d+)/)?'
+ => 'HarbormasterBuildViewController',
'(?P<action>pause|resume|restart|abort)/'.
'(?P<id>\d+)/(?:(?P<via>[^/]+)/)?'
=> 'HarbormasterBuildActionController',
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
--- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php
@@ -8,7 +8,6 @@
$viewer = $request->getUser();
$id = $request->getURIData('id');
- $generation = $request->getInt('g');
$build = id(new HarbormasterBuildQuery())
->setViewer($viewer)
@@ -21,6 +20,7 @@
require_celerity_resource('harbormaster-css');
$title = pht('Build %d', $id);
+ $warnings = array();
$page_header = id(new PHUIHeaderView())
->setHeader($title)
@@ -28,7 +28,9 @@
->setPolicyObject($build)
->setHeaderIcon('fa-cubes');
- if ($build->isRestarting()) {
+ $is_restarting = $build->isRestarting();
+
+ if ($is_restarting) {
$page_header->setStatus(
'fa-exclamation-triangle', 'red', pht('Restarting'));
} else if ($build->isPausing()) {
@@ -42,19 +44,53 @@
'fa-exclamation-triangle', 'red', pht('Aborting'));
}
+ $max_generation = (int)$build->getBuildGeneration();
+ if ($max_generation === 0) {
+ $min_generation = 0;
+ } else {
+ $min_generation = 1;
+ }
+
+ if ($is_restarting) {
+ $max_generation = $max_generation + 1;
+ }
+
+ $generation = $request->getURIData('generation');
+ if ($generation === null) {
+ $generation = $max_generation;
+ } else {
+ $generation = (int)$generation;
+ }
+
+ if ($generation < $min_generation || $generation > $max_generation) {
+ return new Aphront404Response();
+ }
+
+ if ($generation < $max_generation) {
+ $warnings[] = pht(
+ 'You are viewing an older run of this build. %s',
+ phutil_tag(
+ 'a',
+ array(
+ 'href' => $build->getURI(),
+ ),
+ pht('View Current Build')));
+ }
+
+
$curtain = $this->buildCurtainView($build);
$properties = $this->buildPropertyList($build);
+ $history = $this->buildHistoryTable(
+ $build,
+ $generation,
+ $min_generation,
+ $max_generation);
$crumbs = $this->buildApplicationCrumbs();
$this->addBuildableCrumb($crumbs, $build->getBuildable());
$crumbs->addTextCrumb($title);
$crumbs->setBorder(true);
- if ($generation === null || $generation > $build->getBuildGeneration() ||
- $generation < 0) {
- $generation = $build->getBuildGeneration();
- }
-
$build_targets = id(new HarbormasterBuildTargetQuery())
->setViewer($viewer)
->needBuildSteps(true)
@@ -264,14 +300,25 @@
new HarbormasterBuildTransactionQuery());
$timeline->setShouldTerminate(true);
+ if ($warnings) {
+ $warnings = id(new PHUIInfoView())
+ ->setErrors($warnings)
+ ->setSeverity(PHUIInfoView::SEVERITY_WARNING);
+ } else {
+ $warnings = null;
+ }
+
$view = id(new PHUITwoColumnView())
->setHeader($page_header)
->setCurtain($curtain)
- ->setMainColumn(array(
- $properties,
- $targets,
- $timeline,
- ));
+ ->setMainColumn(
+ array(
+ $warnings,
+ $properties,
+ $history,
+ $targets,
+ $timeline,
+ ));
return $this->newPage()
->setTitle($title)
@@ -561,10 +608,6 @@
pht('Build Plan'),
$handles[$build->getBuildPlanPHID()]->renderLink());
- $properties->addProperty(
- pht('Restarts'),
- $build->getBuildGeneration());
-
$properties->addProperty(
pht('Status'),
$this->getStatus($build));
@@ -576,6 +619,53 @@
}
+ private function buildHistoryTable(
+ HarbormasterBuild $build,
+ $generation,
+ $min_generation,
+ $max_generation) {
+
+ if ($max_generation === $min_generation) {
+ return null;
+ }
+
+ $viewer = $this->getViewer();
+
+ $uri = $build->getURI();
+
+ $rows = array();
+ $rowc = array();
+ for ($ii = $max_generation; $ii >= $min_generation; $ii--) {
+ if ($generation == $ii) {
+ $rowc[] = 'highlighted';
+ } else {
+ $rowc[] = null;
+ }
+
+ $rows[] = array(
+ phutil_tag(
+ 'a',
+ array(
+ 'href' => $uri.$ii.'/',
+ ),
+ pht('Run %d', $ii)),
+ );
+ }
+
+ $table = id(new AphrontTableView($rows))
+ ->setColumnClasses(
+ array(
+ 'pri wide',
+ ))
+ ->setRowClasses($rowc);
+
+ return id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('History'))
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+ ->setTable($table);
+ }
+
+
private function getStatus(HarbormasterBuild $build) {
$status_view = new PHUIStatusListView();
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
--- a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
@@ -147,7 +147,7 @@
// If it is different, they will automatically stop what they're doing
// and abort.
- // Previously we used to delete targets, logs and artifacts here. Instead
+ // Previously we used to delete targets, logs and artifacts here. Instead,
// leave them around so users can view previous generations of this build.
}

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 25, 11:49 AM (11 h, 27 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7050309
Default Alt Text
D19217.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility