From 4d5278af1148f211d52244e3fb61712ed24b9d1f Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Mon, 5 Oct 2015 15:59:35 -0700
Subject: [PATCH] Put Drydock build steps into their own group in Harbormaster

Summary: Ref T9252. Move these into a new "Drydock" group.

Test Plan: Clicked "Add Build Step", saw Drydock steps in a Drydock group.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9252

Differential Revision: https://secure.phabricator.com/D14237
---
 src/__phutil_library_map__.php                |  2 ++
 .../HarbormasterPlanEditController.php        |  2 +-
 ...rDrydockCommandBuildStepImplementation.php |  2 +-
 ...easeWorkingCopyBuildStepImplementation.php |  2 +-
 .../HarbormasterDrydockBuildStepGroup.php     | 25 +++++++++++++++++++
 5 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 61b4d1f390..184a484929 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1011,6 +1011,7 @@ phutil_register_library_map(array(
     'HarbormasterController' => 'applications/harbormaster/controller/HarbormasterController.php',
     'HarbormasterCreateArtifactConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterCreateArtifactConduitAPIMethod.php',
     'HarbormasterDAO' => 'applications/harbormaster/storage/HarbormasterDAO.php',
+    'HarbormasterDrydockBuildStepGroup' => 'applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php',
     'HarbormasterDrydockCommandBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterDrydockCommandBuildStepImplementation.php',
     'HarbormasterDrydockLeaseArtifact' => 'applications/harbormaster/artifact/HarbormasterDrydockLeaseArtifact.php',
     'HarbormasterExecFuture' => 'applications/harbormaster/future/HarbormasterExecFuture.php',
@@ -4813,6 +4814,7 @@ phutil_register_library_map(array(
     'HarbormasterController' => 'PhabricatorController',
     'HarbormasterCreateArtifactConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
     'HarbormasterDAO' => 'PhabricatorLiskDAO',
+    'HarbormasterDrydockBuildStepGroup' => 'HarbormasterBuildStepGroup',
     'HarbormasterDrydockCommandBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterDrydockLeaseArtifact' => 'HarbormasterArtifact',
     'HarbormasterExecFuture' => 'Future',
diff --git a/src/applications/harbormaster/controller/HarbormasterPlanEditController.php b/src/applications/harbormaster/controller/HarbormasterPlanEditController.php
index dd43aa0bee..98494d881d 100644
--- a/src/applications/harbormaster/controller/HarbormasterPlanEditController.php
+++ b/src/applications/harbormaster/controller/HarbormasterPlanEditController.php
@@ -61,7 +61,7 @@ final class HarbormasterPlanEditController extends HarbormasterPlanController {
     $is_new = (!$plan->getID());
     if ($is_new) {
       $title = pht('New Build Plan');
-      $cancel_uri = $this->getApplicationURI();
+      $cancel_uri = $this->getApplicationURI('plan/');
       $save_button = pht('Create Build Plan');
     } else {
       $id = $plan->getID();
diff --git a/src/applications/harbormaster/step/HarbormasterDrydockCommandBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterDrydockCommandBuildStepImplementation.php
index 0b19704197..6eb63bb39c 100644
--- a/src/applications/harbormaster/step/HarbormasterDrydockCommandBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterDrydockCommandBuildStepImplementation.php
@@ -12,7 +12,7 @@ final class HarbormasterDrydockCommandBuildStepImplementation
   }
 
   public function getBuildStepGroupKey() {
-    return HarbormasterPrototypeBuildStepGroup::GROUPKEY;
+    return HarbormasterDrydockBuildStepGroup::GROUPKEY;
   }
 
   public function getDescription() {
diff --git a/src/applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php
index 91c6eb0517..73ea19bd7a 100644
--- a/src/applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php
@@ -12,7 +12,7 @@ final class HarbormasterLeaseWorkingCopyBuildStepImplementation
   }
 
   public function getBuildStepGroupKey() {
-    return HarbormasterPrototypeBuildStepGroup::GROUPKEY;
+    return HarbormasterDrydockBuildStepGroup::GROUPKEY;
   }
 
   public function execute(
diff --git a/src/applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php b/src/applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php
new file mode 100644
index 0000000000..606a47a114
--- /dev/null
+++ b/src/applications/harbormaster/stepgroup/HarbormasterDrydockBuildStepGroup.php
@@ -0,0 +1,25 @@
+<?php
+
+final class HarbormasterDrydockBuildStepGroup
+  extends HarbormasterBuildStepGroup {
+
+  const GROUPKEY = 'harbormaster.drydock';
+
+  public function getGroupName() {
+    return pht('Drydock');
+  }
+
+  public function getGroupOrder() {
+    return 3000;
+  }
+
+  public function isEnabled() {
+    $drydock_class = 'PhabricatorDrydockApplication';
+    return PhabricatorApplication::isClassInstalled($drydock_class);
+  }
+
+  public function shouldShowIfEmpty() {
+    return false;
+  }
+
+}
-- 
2.51.2