Formalize "manual" buildables in Harbormaster

Summary:
Ref T1049. Generally, it's useful to separate test/trial/manual runs from production/automatic runs.

For example, you don't want to email a bunch of people that the build is broken just because you messed something up when writing a new build plan. You'd rather try it first, then promote it into production once you have some good runs.

Similarly, test runs generally should not affect the outside world, etc. Finally, some build steps (like "wait for other buildables") may want to behave differently when run in production/automation than when run in a testing environment (where they should probably continue immediately).

So, formalize the distinction between automatic buildables (those created passively by the system in response to events) and manual buildables (those created explicitly by users). Add filtering, and stop the automated parts of the system from interacting with the manual parts (for example, we won't show manual results on revisions).

This also moves the "Apply Build Plan" to a third, new home: instead of the sidebar or Buildables, it's now on plans. I think this generally makes more sense given how things have developed. Broadly, this improves isolation of test environments.

Test Plan: Created some builds, browsed around, used filters, etc.

Reviewers: btrahan

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T1049

Differential Revision: https://secure.phabricator.com/D7824

Author: epriestley

resources/sql/patches/20131224.harbormanual.sql

@@ -0,0 +1,6 @@
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildable
+  ADD isManualBuildable BOOL NOT NULL;
+
+ALTER TABLE {$NAMESPACE}_harbormaster.harbormaster_buildable
+  ADD KEY `key_manual` (isManualBuildable);
+

src/__phutil_library_map__.php

@@ -707,8 +707,6 @@
     'HarbormasterBuildViewController' => 'applications/harbormaster/controller/HarbormasterBuildViewController.php',
     'HarbormasterBuildWorker' => 'applications/harbormaster/worker/HarbormasterBuildWorker.php',
     'HarbormasterBuildable' => 'applications/harbormaster/storage/HarbormasterBuildable.php',
-    'HarbormasterBuildableApplyController' => 'applications/harbormaster/controller/HarbormasterBuildableApplyController.php',
-    'HarbormasterBuildableEditController' => 'applications/harbormaster/controller/HarbormasterBuildableEditController.php',
     'HarbormasterBuildableListController' => 'applications/harbormaster/controller/HarbormasterBuildableListController.php',
     'HarbormasterBuildableQuery' => 'applications/harbormaster/query/HarbormasterBuildableQuery.php',
     'HarbormasterBuildableSearchEngine' => 'applications/harbormaster/query/HarbormasterBuildableSearchEngine.php',
@@ -730,6 +728,7 @@
     'HarbormasterPlanEditController' => 'applications/harbormaster/controller/HarbormasterPlanEditController.php',
     'HarbormasterPlanListController' => 'applications/harbormaster/controller/HarbormasterPlanListController.php',
     'HarbormasterPlanOrderController' => 'applications/harbormaster/controller/HarbormasterPlanOrderController.php',
+    'HarbormasterPlanRunController' => 'applications/harbormaster/controller/HarbormasterPlanRunController.php',
     'HarbormasterPlanViewController' => 'applications/harbormaster/controller/HarbormasterPlanViewController.php',
     'HarbormasterRemarkupRule' => 'applications/harbormaster/remarkup/HarbormasterRemarkupRule.php',
     'HarbormasterScratchTable' => 'applications/harbormaster/storage/HarbormasterScratchTable.php',
@@ -3133,8 +3132,6 @@
       0 => 'HarbormasterDAO',
       1 => 'PhabricatorPolicyInterface',
     ),
-    'HarbormasterBuildableApplyController' => 'HarbormasterController',
-    'HarbormasterBuildableEditController' => 'HarbormasterController',
     'HarbormasterBuildableListController' =>
     array(
       0 => 'HarbormasterController',
@@ -3164,6 +3161,7 @@
       1 => 'PhabricatorApplicationSearchResultsControllerInterface',
     ),
     'HarbormasterPlanOrderController' => 'HarbormasterController',
+    'HarbormasterPlanRunController' => 'HarbormasterController',
     'HarbormasterPlanViewController' => 'HarbormasterPlanController',
     'HarbormasterRemarkupRule' => 'PhabricatorRemarkupRuleObject',
     'HarbormasterScratchTable' => 'HarbormasterDAO',

src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php

@@ -48,10 +48,6 @@ public function getRoutes() {
       '/harbormaster/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'HarbormasterBuildableListController',
-        'buildable/' => array(
-          'edit/(?:(?P<id>\d+)/)?' => 'HarbormasterBuildableEditController',
-          'apply/(?:(?P<id>\d+)/)?' => 'HarbormasterBuildableApplyController',
-        ),
         'step/' => array(
           'add/(?:(?P<id>\d+)/)?' => 'HarbormasterStepAddController',
           'edit/(?:(?P<id>\d+)/)?' => 'HarbormasterStepEditController',
@@ -67,6 +63,7 @@ public function getRoutes() {
           'edit/(?:(?P<id>\d+)/)?' => 'HarbormasterPlanEditController',
           'order/(?:(?P<id>\d+)/)?' => 'HarbormasterPlanOrderController',
           'disable/(?P<id>\d+)/' => 'HarbormasterPlanDisableController',
+          'run/(?P<id>\d+)/' => 'HarbormasterPlanRunController',
           '(?P<id>\d+)/' => 'HarbormasterPlanViewController',
         ),
       ),

src/applications/harbormaster/controller/HarbormasterBuildableApplyController.php

@@ -44,8 +44,14 @@ public function renderResultsList(
         $item->setHref("/B{$id}");
       }
 
+      if ($buildable->getIsManualBuildable()) {
+        $item->addIcon('wrench-grey', pht('Manual'));
+      }
+
       $list->addItem($item);
 
+
+
       // TODO: This is proof-of-concept for getting meaningful status
       // information into this list, and should get an improvement pass
       // once we're a little farther along.
@@ -86,8 +92,7 @@ public function buildSideNavView($for_app = false) {
       $nav->addFilter('new/', pht('New Build Plan'));
     }
 
-    $nav->addLabel('Utilities');
-    $nav->addFilter('buildable/edit/', pht('New Manual Build'));
+    $nav->addLabel(pht('Build Plans'));
     $nav->addFilter('plan/', pht('Manage Build Plans'));
 
     $nav->selectFilter(null);

src/applications/harbormaster/controller/HarbormasterBuildableEditController.php

@@ -118,15 +118,6 @@ private function buildActionList(HarbormasterBuildable $buildable) {
       ->setObject($buildable)
       ->setObjectURI("/B{$id}");
 
-    $apply_uri = $this->getApplicationURI('/buildable/apply/'.$id.'/');
-
-    $list->addAction(
-      id(new PhabricatorActionView())
-        ->setName(pht('Apply Build Plan'))
-        ->setIcon('edit')
-        ->setHref($apply_uri)
-        ->setWorkflow(true));
-
     return $list;
   }
 
@@ -153,6 +144,12 @@ private function buildPropertyLists(
         $buildable->getContainerHandle()->renderLink());
     }
 
+    $properties->addProperty(
+      pht('Origin'),
+      $buildable->getIsManualBuildable()
+        ? pht('Manual Buildable')
+        : pht('Automatic Buildable'));
+
   }
 
 }