From cea633f698daad27d5e2b781124198d9f0767878 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 26 Oct 2015 21:27:04 +0000
Subject: [PATCH] Don't show error operations after a successful land operation

Summary:
Ref T182. When viewing a revision, if there are several error operations and then a success operation, we currently show the last error. This is misleading.

Instead, don't show anything if there's a success (this may require tuning eventually if you can land multiple times onto different branches or whatever, but should be reasonable for now).

Also make the table a little nicer, particularly for merge failure output.

Test Plan: {F910385}

Reviewers: chad, Mnkras

Reviewed By: Mnkras

Maniphest Tasks: T182

Differential Revision: https://secure.phabricator.com/D14348
---
 resources/celerity/map.php                           |  6 +++---
 .../DifferentialRevisionViewController.php           | 12 ++++++------
 .../view/DrydockRepositoryOperationStatusView.php    |  2 +-
 webroot/rsrc/css/aphront/table-view.css              |  1 +
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 930d8faf27..ee959fa58a 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'c65b251d',
+    'core.pkg.css' => 'd80f5c3e',
     'core.pkg.js' => '47dc9ebb',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '2de124c9',
@@ -25,7 +25,7 @@ return array(
     'rsrc/css/aphront/notification.css' => '9c279160',
     'rsrc/css/aphront/panel-view.css' => '8427b78d',
     'rsrc/css/aphront/phabricator-nav-view.css' => 'a24cb589',
-    'rsrc/css/aphront/table-view.css' => '63985f5b',
+    'rsrc/css/aphront/table-view.css' => '61543e7a',
     'rsrc/css/aphront/tokenizer.css' => '04875312',
     'rsrc/css/aphront/tooltip.css' => '7672b60f',
     'rsrc/css/aphront/typeahead-browse.css' => 'd8581d2c',
@@ -493,7 +493,7 @@ return array(
     'aphront-list-filter-view-css' => '5d6f0526',
     'aphront-multi-column-view-css' => 'fd18389d',
     'aphront-panel-view-css' => '8427b78d',
-    'aphront-table-view-css' => '63985f5b',
+    'aphront-table-view-css' => '61543e7a',
     'aphront-tokenizer-control-css' => '04875312',
     'aphront-tooltip-css' => '7672b60f',
     'aphront-typeahead-control-css' => '0e403212',
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index f05b6ab97d..621464cc9b 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -1051,12 +1051,6 @@ final class DifferentialRevisionViewController extends DifferentialController {
         array(
           DrydockLandRepositoryOperation::OPCONST,
         ))
-      ->withOperationStates(
-        array(
-          DrydockRepositoryOperation::STATE_WAIT,
-          DrydockRepositoryOperation::STATE_WORK,
-          DrydockRepositoryOperation::STATE_FAIL,
-        ))
       ->execute();
     if (!$operations) {
       return null;
@@ -1073,6 +1067,12 @@ final class DifferentialRevisionViewController extends DifferentialController {
       }
     }
 
+    // If we found a completed operation, don't render anything. We don't want
+    // to show an older error after the thing worked properly.
+    if ($operation->isDone()) {
+      return null;
+    }
+
     $box_view = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Active Operations'));
 
diff --git a/src/applications/drydock/view/DrydockRepositoryOperationStatusView.php b/src/applications/drydock/view/DrydockRepositoryOperationStatusView.php
index 2638926816..bf1040afe6 100644
--- a/src/applications/drydock/view/DrydockRepositoryOperationStatusView.php
+++ b/src/applications/drydock/view/DrydockRepositoryOperationStatusView.php
@@ -115,7 +115,7 @@ final class DrydockRepositoryOperationStatusView
       ->setColumnClasses(
         array(
           'header',
-          'wide',
+          'wide prewrap',
         ));
 
     return $table;
diff --git a/webroot/rsrc/css/aphront/table-view.css b/webroot/rsrc/css/aphront/table-view.css
index e0e06317c8..254599625f 100644
--- a/webroot/rsrc/css/aphront/table-view.css
+++ b/webroot/rsrc/css/aphront/table-view.css
@@ -61,6 +61,7 @@ th.aphront-table-view-sortable-selected {
   text-align: right;
   color: {$bluetext};
   font-weight: bold;
+  vertical-align: top;
 }
 
 .aphront-table-view td {