[Redesign] PhabricatorApplicationSearchResultView

Summary: Ref T8099. This adds a new class which all search engines return for layout. I thought about this a number of ways, and I think this is the cleanest path. Each Engine can return whatever UI bits they needs, and AppSearch or Dashboard picks and lays the bits out as needed. In the AppSearch case, interfaces like Notifications, Calendar, Legalpad all need more custom layouts. I think this also leaves a resonable path forward for NUX as well. Also, not sure I implemented the class correctly, but assume thats easy to fix?

Test Plan: Review and do a search in each application changed. Grep for all call sites.

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T8099

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

resources/celerity/map.php

@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'df3a0e9c',
+    'core.pkg.css' => '96a7378c',
     'core.pkg.js' => '41f5edc5',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => 'fe951924',
@@ -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' => '0ecd30a1',
-    'rsrc/css/aphront/table-view.css' => '4f2ed0bf',
+    'rsrc/css/aphront/table-view.css' => 'e3632cc9',
     'rsrc/css/aphront/tokenizer.css' => '04875312',
     'rsrc/css/aphront/tooltip.css' => '7672b60f',
     'rsrc/css/aphront/two-column.css' => '16ab3ad2',
@@ -34,7 +34,7 @@ return array(
     'rsrc/css/application/almanac/almanac.css' => 'dbb9b3af',
     'rsrc/css/application/auth/auth.css' => '44975d4b',
     'rsrc/css/application/base/main-menu-view.css' => '44b4a289',
-    'rsrc/css/application/base/notification-menu.css' => '713df25a',
+    'rsrc/css/application/base/notification-menu.css' => 'f31c0bde',
     'rsrc/css/application/base/phabricator-application-launch-view.css' => '9a233ed6',
     'rsrc/css/application/base/phui-theme.css' => '1ccdcc84',
     'rsrc/css/application/base/standard-page-view.css' => '43045fb4',
@@ -488,7 +488,7 @@ return array(
     'aphront-list-filter-view-css' => 'aa5ffcb9',
     'aphront-multi-column-view-css' => 'fd18389d',
     'aphront-panel-view-css' => '8427b78d',
-    'aphront-table-view-css' => '4f2ed0bf',
+    'aphront-table-view-css' => 'e3632cc9',
     'aphront-tokenizer-control-css' => '04875312',
     'aphront-tooltip-css' => '7672b60f',
     'aphront-two-column-view-css' => '16ab3ad2',
@@ -726,7 +726,7 @@ return array(
     'phabricator-nav-view-css' => '0ecd30a1',
     'phabricator-notification' => '0c6946e7',
     'phabricator-notification-css' => '9c279160',
-    'phabricator-notification-menu-css' => '713df25a',
+    'phabricator-notification-menu-css' => 'f31c0bde',
     'phabricator-object-selector-css' => '029a133d',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '6920d200',

src/__phutil_library_map__.php

@@ -1340,6 +1340,7 @@ phutil_register_library_map(array(
     'PhabricatorApplicationSearchController' => 'applications/search/controller/PhabricatorApplicationSearchController.php',
     'PhabricatorApplicationSearchEngine' => 'applications/search/engine/PhabricatorApplicationSearchEngine.php',
     'PhabricatorApplicationSearchEngineTestCase' => 'applications/search/engine/__tests__/PhabricatorApplicationSearchEngineTestCase.php',
+    'PhabricatorApplicationSearchResultView' => 'applications/search/view/PhabricatorApplicationSearchResultView.php',
     'PhabricatorApplicationSearchResultsControllerInterface' => 'applications/search/interface/PhabricatorApplicationSearchResultsControllerInterface.php',
     'PhabricatorApplicationStatusView' => 'applications/meta/view/PhabricatorApplicationStatusView.php',
     'PhabricatorApplicationTestCase' => 'applications/base/__tests__/PhabricatorApplicationTestCase.php',
@@ -4845,6 +4846,7 @@ phutil_register_library_map(array(
     'PhabricatorApplicationSearchController' => 'PhabricatorSearchBaseController',
     'PhabricatorApplicationSearchEngine' => 'Phobject',
     'PhabricatorApplicationSearchEngineTestCase' => 'PhabricatorTestCase',
+    'PhabricatorApplicationSearchResultView' => 'Phobject',
     'PhabricatorApplicationStatusView' => 'AphrontView',
     'PhabricatorApplicationTestCase' => 'PhabricatorTestCase',
     'PhabricatorApplicationTransaction' => array(

src/applications/almanac/query/AlmanacDeviceSearchEngine.php

@@ -78,7 +78,11 @@ final class AlmanacDeviceSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No Almanac Devices found.'));
+
+    return $result;
   }
 
 }

src/applications/almanac/query/AlmanacNetworkSearchEngine.php

@@ -80,6 +80,10 @@ final class AlmanacNetworkSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No Almanac Networks found.'));
+
+    return $result;
   }
 }

src/applications/almanac/query/AlmanacServiceSearchEngine.php

@@ -90,6 +90,10 @@ final class AlmanacServiceSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No Almanac Services found.'));
+
+    return $result;
   }
 }

src/applications/audit/query/PhabricatorCommitSearchEngine.php

@@ -206,8 +206,12 @@ final class PhabricatorCommitSearchEngine
     }
 
     $view->setHandles($handles);
+    $list = $view->buildList();
 
-    return $view->buildList();
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($list);
+
+    return $result;
   }
 
 }

src/applications/auth/query/PhabricatorAuthInviteSearchEngine.php

@@ -102,8 +102,9 @@ final class PhabricatorAuthInviteSearchEngine
           'right',
         ));
 
-    return id(new PHUIObjectBoxView())
+    $result = new PhabricatorApplicationSearchResultView();
-      ->setHeaderText(pht('Email Invitations'))
+    $result->setTable($table);
-      ->setTable($table);
+
+    return $result;
   }
 }

src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php

@@ -328,7 +328,11 @@ final class PhabricatorCalendarEventSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No events found.'));
+
+    return $result;
   }
 
   private function buildCalendarView(
@@ -385,7 +389,11 @@ final class PhabricatorCalendarEventSearchEngine
     $month_view->setBrowseURI(
       $this->getURI('query/'.$query->getQueryKey().'/'));
 
-    return $month_view;
+    // TODO redesign-2015 : Move buttons out of PHUICalendarView?
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($month_view);
+
+    return $result;
   }
 
   private function buildCalendarDayView(
@@ -436,7 +444,10 @@ final class PhabricatorCalendarEventSearchEngine
     $day_view->setBrowseURI(
       $this->getURI('query/'.$query->getQueryKey().'/'));
 
-    return $day_view;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($day_view);
+
+    return $result;
   }
 
   private function getDisplayYearAndMonthAndDay(

src/applications/conduit/query/PhabricatorConduitSearchEngine.php

@@ -196,7 +196,10 @@ final class PhabricatorConduitSearchEngine
       $out[] = $list;
     }
 
-    return $out;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($out);
+
+    return $result;
   }
 
 }

src/applications/conpherence/query/ConpherenceThreadSearchEngine.php

@@ -253,7 +253,11 @@ final class ConpherenceThreadSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No threads found.'));
+
+    return $result;
   }
 
   private function getTypeOptions() {

src/applications/countdown/query/PhabricatorCountdownSearchEngine.php

@@ -140,7 +140,11 @@ final class PhabricatorCountdownSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No countdowns found.'));
+
+    return $result;
   }
 
 }

src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php

@@ -185,9 +185,25 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
     if (!$id) {
       $id = celerity_generate_unique_node_id();
     }
-    $box = id(new PHUIObjectBoxView())
+
-      ->setHeader($header)
+    $box = new PHUIObjectBoxView();
-      ->appendChild($content)
+
+    $interface = 'PhabricatorApplicationSearchResultView';
+    if ($content instanceof $interface) {
+      if ($content->getObjectList()) {
+        $box->setObjectList($content->getObjectList());
+      }
+      if ($content->getTable()) {
+        $box->setTable($content->getTable());
+      }
+      if ($content->getContent()) {
+        $box->appendChild($content->getContent());
+      }
+    } else {
+      $box->appendChild($content);
+    }
+
+    $box->setHeader($header)
       ->setID($id)
       ->addSigil('dashboard-panel')
       ->setMetadata(array('objectPHID' => $panel->getPHID()));

src/applications/dashboard/query/PhabricatorDashboardPanelSearchEngine.php

@@ -132,7 +132,11 @@ final class PhabricatorDashboardPanelSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No panels found.'));
+
+    return $result;
   }
 
 }

src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php

@@ -104,7 +104,12 @@ final class PhabricatorDashboardSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No dashboards found.'));
+
+    return $result;
+
   }
 
 }

src/applications/differential/query/DifferentialRevisionSearchEngine.php

@@ -323,10 +323,15 @@ final class DifferentialRevisionSearchEngine
     if (count($views) == 1) {
       // Reduce this to a PHUIObjectItemListView so we can get the free
       // support from ApplicationSearch.
-      return head($views)->render();
+      $list = head($views)->render();
     } else {
-      return $views;
+      $list = $views;
     }
+
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($list);
+
+    return $result;
   }
 
 }

src/applications/diviner/query/DivinerAtomSearchEngine.php

@@ -116,7 +116,11 @@ final class DivinerAtomSearchEngine extends PhabricatorApplicationSearchEngine {
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No books found.'));
+
+    return $result;
   }
 
 }

src/applications/drydock/query/DrydockBlueprintSearchEngine.php

@@ -69,7 +69,11 @@ final class DrydockBlueprintSearchEngine
       $view->addItem($item);
     }
 
-    return $view;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($view);
+    $result->setNoDataString(pht('No blueprints found.'));
+
+    return $result;
   }
 
 }

src/applications/drydock/query/DrydockLeaseSearchEngine.php

@@ -89,10 +89,14 @@ final class DrydockLeaseSearchEngine
     PhabricatorSavedQuery $saved,
     array $handles) {
 
-    return id(new DrydockLeaseListView())
+    $list = id(new DrydockLeaseListView())
       ->setUser($this->requireViewer())
-      ->setLeases($leases)
+      ->setLeases($leases);
-      ->render();
+
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setTable($list);
+
+    return $result;
   }
 
 }

src/applications/drydock/query/DrydockLogSearchEngine.php

@@ -49,10 +49,14 @@ final class DrydockLogSearchEngine extends PhabricatorApplicationSearchEngine {
     PhabricatorSavedQuery $query,
     array $handles) {
 
-    return id(new DrydockLogListView())
+    $list = id(new DrydockLogListView())
       ->setUser($this->requireViewer())
-      ->setLogs($logs)
+      ->setLogs($logs);
-      ->render();
+
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setTable($list);
+
+    return $result;
   }
 
 }

src/applications/drydock/query/DrydockResourceSearchEngine.php

@@ -87,10 +87,14 @@ final class DrydockResourceSearchEngine
     PhabricatorSavedQuery $query,
     array $handles) {
 
-    return id(new DrydockResourceListView())
+    $list = id(new DrydockResourceListView())
       ->setUser($this->requireViewer())
-      ->setResources($resources)
+      ->setResources($resources);
-      ->render();
+
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setTable($list);
+
+    return $result;
   }
 
 }

src/applications/feed/query/PhabricatorFeedSearchEngine.php

@@ -139,7 +139,12 @@ final class PhabricatorFeedSearchEngine
     $builder->setUser($this->requireViewer());
     $view = $builder->buildView();
 
-    return phutil_tag_div('phabricator-feed-frame', $view);
+    $list = phutil_tag_div('phabricator-feed-frame', $view);
+
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($list);
+
+    return $result;
   }
 
 }

src/applications/files/query/PhabricatorFileSearchEngine.php

@@ -171,7 +171,11 @@ final class PhabricatorFileSearchEngine
     $list_view->appendChild(id(new PhabricatorGlobalUploadTargetView())
       ->setUser($viewer));
 
-    return $list_view;
+
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($list_view);
+
+    return $result;
   }
 
 }

src/applications/flag/query/PhabricatorFlagSearchEngine.php

@@ -180,7 +180,12 @@ final class PhabricatorFlagSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No flags found.'));
+
+    return $result;
+
   }
 
 

src/applications/fund/query/FundBackerSearchEngine.php

@@ -141,7 +141,10 @@ final class FundBackerSearchEngine
           'right',
         ));
 
-    return $table;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setTable($table);
+
+    return $result;
   }
 
 }

src/applications/fund/query/FundInitiativeSearchEngine.php

@@ -163,6 +163,12 @@ final class FundInitiativeSearchEngine
       $list->addItem($item);
     }
 
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No initiatives found.'));
+
+    return $result;
+
 
     return $list;
   }

src/applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php

@@ -93,7 +93,12 @@ final class HarbormasterBuildPlanSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No build plans found.'));
+
+    return $result;
+
   }
 
 }

src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php

@@ -216,7 +216,11 @@ final class HarbormasterBuildableSearchEngine
 
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No buildables found.'));
+
+    return $result;
   }
 
 }

src/applications/herald/query/HeraldRuleSearchEngine.php

@@ -209,7 +209,12 @@ final class HeraldRuleSearchEngine extends PhabricatorApplicationSearchEngine {
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No rules found.'));
+
+    return $result;
+
   }
 
 }

src/applications/herald/query/HeraldTranscriptSearchEngine.php

@@ -133,7 +133,11 @@ final class HeraldTranscriptSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No transcripts found.'));
+
+    return $result;
   }
 
 }

src/applications/legalpad/query/LegalpadDocumentSearchEngine.php

@@ -209,7 +209,11 @@ final class LegalpadDocumentSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No documents found.'));
+
+    return $result;
   }
 
 }

src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php

@@ -267,18 +267,17 @@ final class LegalpadDocumentSignatureSearchEngine
           'right',
         ));
 
-    // TODO redesign-2015 : Talk to epriestley about 'correct' way to implelment
+    $button = null;
-    /* if ($this->document) {
+    if ($this->document) {
       $document_id = $this->document->getID();
 
-      $header->addActionLink(
+      $button = id(new PHUIButtonView())
-        id(new PHUIButtonView())
+          ->setText(pht('Add Exemption'))
-          ->setText(pht('Add Signature Exemption'))
           ->setTag('a')
           ->setHref($this->getApplicationURI('addsignature/'.$document_id.'/'))
           ->setWorkflow(true)
-          ->setIcon(id(new PHUIIconView())->setIconFont('fa-pencil')));
+          ->setIcon(id(new PHUIIconView())->setIconFont('fa-pencil'));
-    }*/
+    }
 
     if (!$this->document) {
       $table->setNotice(
@@ -286,7 +285,14 @@ final class LegalpadDocumentSignatureSearchEngine
             'documents you have permission to edit.'));
     }
 
-    return $table;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setTable($table);
+    if ($button) {
+      $result->addAction($button);
+    }
+
+    return $result;
+
   }
 
   private function renderIcon($icon, $color, $title) {

src/applications/macro/query/PhabricatorMacroSearchEngine.php

@@ -181,7 +181,10 @@ final class PhabricatorMacroSearchEngine
       $pinboard->addItem($item);
     }
 
-    return $pinboard;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($pinboard);
+
+    return $result;
   }
 
 }

src/applications/maniphest/query/ManiphestTaskSearchEngine.php

@@ -316,13 +316,18 @@ final class ManiphestTaskSearchEngine
         ManiphestBulkEditCapability::CAPABILITY);
     }
 
-    return id(new ManiphestTaskResultListView())
+    $list = id(new ManiphestTaskResultListView())
       ->setUser($viewer)
       ->setTasks($tasks)
       ->setSavedQuery($saved)
       ->setCanEditPriority($can_edit_priority)
       ->setCanBatchEdit($can_bulk_edit)
       ->setShowBatchControls($this->showBatchControls);
+
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($list);
+
+    return $result;
   }
 
   protected function willUseSavedQuery(PhabricatorSavedQuery $saved) {

src/applications/meta/query/PhabricatorAppSearchEngine.php

@@ -267,7 +267,10 @@ final class PhabricatorAppSearchEngine
       $results[] = $list;
     }
 
-    return $results;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($results);
+
+    return $result;
   }
 
 }

src/applications/notification/query/PhabricatorNotificationSearchEngine.php

@@ -127,13 +127,11 @@ final class PhabricatorNotificationSearchEngine
       ->addClass('phabricator-notification-list')
       ->appendChild($view);
 
-    $notif_header = id(new PHUIHeaderView())
+    $result = new PhabricatorApplicationSearchResultView();
-      ->setHeader($header)
+    $result->addAction($button);
-      ->addActionLink($button);
+    $result->setContent($view);
 
-    return id(new PHUIObjectBoxView())
+    return $result;
-      ->setHeader($notif_header)
-      ->appendChild($view);
   }
 
   public function shouldUseOffsetPaging() {

src/applications/nuance/query/NuanceQueueSearchEngine.php

@@ -69,7 +69,11 @@ final class NuanceQueueSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No queues found.'));
+
+    return $result;
   }
 
 }

src/applications/nuance/query/NuanceSourceSearchEngine.php

@@ -72,7 +72,11 @@ final class NuanceSourceSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No sources found.'));
+
+    return $result;
   }
 
 }

src/applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php

@@ -108,7 +108,11 @@ final class PhabricatorOAuthServerClientSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No clients found.'));
+
+    return $result;
   }
 
 }

src/applications/passphrase/query/PassphraseCredentialSearchEngine.php

@@ -123,7 +123,11 @@ final class PassphraseCredentialSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No credentials found.'));
+
+    return $result;
   }
 
 }

src/applications/paste/query/PhabricatorPasteSearchEngine.php

@@ -160,6 +160,10 @@ final class PhabricatorPasteSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No pastes found.'));
+
+    return $result;
   }
 }

src/applications/people/query/PhabricatorPeopleLogSearchEngine.php

@@ -186,6 +186,9 @@ final class PhabricatorPeopleLogSearchEngine
       $table->setSearchBaseURI($this->getApplicationURI('logs/'));
     }
 
-    return $table;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setTable($table);
+
+    return $result;
   }
 }

src/applications/people/query/PhabricatorPeopleSearchEngine.php

@@ -247,7 +247,11 @@ final class PhabricatorPeopleSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No accounts found.'));
+
+    return $result;
   }
 
 }

src/applications/pholio/query/PholioMockSearchEngine.php

@@ -124,7 +124,10 @@ final class PholioMockSearchEngine extends PhabricatorApplicationSearchEngine {
       $board->addItem($item);
     }
 
-    return $board;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setContent($board);
+
+    return $result;
   }
 
 }

src/applications/phortune/controller/PhortuneMerchantViewController.php

@@ -30,7 +30,6 @@ final class PhortuneMerchantViewController
       $merchant->getName());
 
     $header = id(new PHUIHeaderView())
-      ->setObjectName(pht('Merchant %d', $merchant->getID()))
       ->setHeader($merchant->getName())
       ->setUser($viewer)
       ->setPolicyObject($merchant);

src/applications/phortune/query/PhortuneCartSearchEngine.php

@@ -228,6 +228,9 @@ final class PhortuneCartSearchEngine
     }
     $table->setNotice($notice);
 
-    return $table;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setTable($table);
+
+    return $result;
   }
 }

src/applications/phortune/query/PhortuneChargeSearchEngine.php

@@ -127,8 +127,9 @@ final class PhortuneChargeSearchEngine
       ->setCharges($charges)
       ->setHandles($handles);
 
-    return id(new PHUIObjectBoxView())
+    $result = new PhabricatorApplicationSearchResultView();
-      ->setHeaderText(pht('Charges'))
+    $result->setTable($table);
-      ->setTable($table);
+
+    return $table;
   }
 }

src/applications/phortune/query/PhortuneMerchantSearchEngine.php

@@ -78,6 +78,10 @@ final class PhortuneMerchantSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No merchants found.'));
+
+    return $result;
   }
 }

src/applications/phortune/query/PhortuneSubscriptionSearchEngine.php

@@ -158,8 +158,11 @@ final class PhortuneSubscriptionSearchEngine
       $header = pht('Your Subscriptions');
     }
 
-    return id(new PHUIObjectBoxView())
+    $table->setNotice($header);
-      ->setHeaderText($header)
+
-      ->setTable($table);
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setTable($table);
+
+    return $result;
   }
 }

src/applications/phortune/view/PhortuneSubscriptionTableView.php

@@ -5,6 +5,7 @@ final class PhortuneSubscriptionTableView extends AphrontView {
   private $subscriptions;
   private $handles;
   private $isMerchantView;
+  private $notice;
 
   public function setHandles(array $handles) {
     $this->handles = $handles;
@@ -33,6 +34,11 @@ final class PhortuneSubscriptionTableView extends AphrontView {
     return $this->isMerchantView;
   }
 
+  public function setNotice($notice) {
+    $this->notice = $notice;
+    return $this;
+  }
+
   public function render() {
     $subscriptions = $this->getSubscriptions();
     $handles = $this->getHandles();
@@ -61,6 +67,7 @@ final class PhortuneSubscriptionTableView extends AphrontView {
     }
 
     $table = id(new AphrontTableView($rows))
+      ->setNotice($this->notice)
       ->setHeaders(
         array(
           pht('ID'),

src/applications/phrequent/query/PhrequentSearchEngine.php

@@ -189,7 +189,10 @@ final class PhrequentSearchEngine extends PhabricatorApplicationSearchEngine {
       $view->addItem($item);
     }
 
-    return $view;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($view);
+
+    return $result;
   }
 
 }

src/applications/phriction/query/PhrictionSearchEngine.php

@@ -178,7 +178,11 @@ final class PhrictionSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No documents found.'));
+
+    return $result;
   }
 
 }

src/applications/ponder/query/PonderQuestionSearchEngine.php

@@ -170,7 +170,11 @@ final class PonderQuestionSearchEngine
       $view->addItem($item);
     }
 
-    return $view;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($view);
+    $result->setNoDataString(pht('No questions found.'));
+
+    return $result;
   }
 
 }

src/applications/project/query/PhabricatorProjectSearchEngine.php

@@ -193,7 +193,12 @@ protected function buildQueryFromParameters(array $map) {
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No projects found.'));
+
+    return $result;
+
   }
 
 }

src/applications/releeph/query/ReleephProductSearchEngine.php

@@ -121,7 +121,10 @@ final class ReleephProductSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+
+    return $result;
   }
 
 }

src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php

@@ -108,11 +108,10 @@ final class PhabricatorRepositoryPushLogSearchEngine
       ->setHandles($handles)
       ->setLogs($logs);
 
-    $box = id(new PHUIBoxView())
+    $result = new PhabricatorApplicationSearchResultView();
-      ->addMargin(PHUI::MARGIN_LARGE)
+    $result->setTable($table);
-      ->appendChild($table);
 
-    return $box;
+    return $result;
   }
 
 }

src/applications/repository/query/PhabricatorRepositorySearchEngine.php

@@ -209,7 +209,11 @@ final class PhabricatorRepositorySearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No repositories found for this query.'));
+
+    return $result;
   }
 
   protected function willUseSavedQuery(PhabricatorSavedQuery $saved) {

src/applications/search/controller/PhabricatorApplicationSearchController.php

@@ -185,8 +185,7 @@ final class PhabricatorApplicationSearchController
       $title = pht('Advanced Search');
     }
 
-    $box = id(new PHUIObjectBoxView())
+    $box = new PHUIObjectBoxView();
-      ->setHeaderText($title);
 
     if ($run_query || $named_query) {
       $box->setShowHide(
@@ -228,16 +227,29 @@ final class PhabricatorApplicationSearchController
             $saved_query);
         }
 
-        if ($list instanceof AphrontTableView) {
+        $header = id(new PHUIHeaderView())
-          $box->setTable($list);
+          ->setHeader($title);
-        } else {
+        if ($list->getActions()) {
-          $box->setObjectList($list);
+          foreach ($list->getActions() as $action) {
+            $header->addActionLink($action);
+          }
+        }
+
+        $box->setHeader($header);
+
+        if ($list->getObjectList()) {
+          $box->setObjectList($list->getObjectList());
+        }
+        if ($list->getTable()) {
+          $box->setTable($list->getTable());
+        }
+        if ($list->getInfoView()) {
+          $box->setInfoView($list->getInfoView());
+        }
+        if ($list->getContent()) {
+          $box->appendChild($list->getContent());
         }
 
-        // TODO: This is a bit hacky.
-        if ($list instanceof PHUIObjectItemListView) {
-          $list->setNoDataString(pht('No results found for this query.'));
-        } else {
         if ($pager->willShowPagingControls()) {
           $pager_box = id(new PHUIBoxView())
             ->addPadding(PHUI::PADDING_MEDIUM)
@@ -246,12 +258,14 @@ final class PhabricatorApplicationSearchController
             ->appendChild($pager);
           $nav->appendChild($pager_box);
         }
-        }
+
       } catch (PhabricatorTypeaheadInvalidTokenException $ex) {
         $errors[] = pht(
           'This query specifies an invalid parameter. Review the '.
           'query parameters and correct errors.');
       }
+    } else {
+      $box->setHeaderText($title);
     }
 
     if ($errors) {

src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php

@@ -241,7 +241,7 @@ final class PhabricatorSearchApplicationSearchEngine
 
     $viewer = $this->requireViewer();
     $list = new PHUIObjectItemListView();
-    $list->setNoDataString(pht('No results returned for that query.'));
+    $list->setNoDataString(pht('No results found.'));
 
     if ($results) {
       $objects = id(new PhabricatorObjectQuery())
@@ -259,7 +259,10 @@ final class PhabricatorSearchApplicationSearchEngine
       }
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+
+    return $result;
   }
 
   private function readOwnerPHIDs(PhabricatorSavedQuery $saved) {

src/applications/search/view/PhabricatorApplicationSearchResultView.php

@@ -0,0 +1,86 @@
+<?php
+
+final class PhabricatorApplicationSearchResultView extends Phobject {
+
+/**
+ * Holds bits and pieces of UI information for Search Engine
+ * and Dashboard Panel rendering, describing the results and
+ * controls for presentation.
+ *
+ */
+
+  private $objectList = null;
+  private $table = null;
+  private $content = null;
+  private $infoView = null;
+  private $actions = array();
+  private $collapsed = null;
+  private $noDataString;
+
+  public function setObjectList(PHUIObjectItemListView $list) {
+    $this->objectList = $list;
+    return $this;
+  }
+
+  public function getObjectList() {
+    $list = $this->objectList;
+    if ($list) {
+      if ($this->noDataString) {
+        $list->setNoDataString($this->noDataString);
+      } else {
+        $list->setNoDataString(pht('No results found for this query.'));
+      }
+    }
+    return $list;
+  }
+
+  public function setTable(AphrontTableView $table) {
+    $this->table = $table;
+    return $this;
+  }
+
+  public function getTable() {
+    return $this->table;
+  }
+
+  public function setInfoView(PHUIInfoView $infoview) {
+    $this->infoView = $infoview;
+    return $this;
+  }
+
+  public function getInfoView() {
+    return $this->infoView;
+  }
+
+  public function setContent($content) {
+    $this->content = $content;
+  }
+
+  public function getContent() {
+    return $this->content;
+  }
+
+  public function addAction(PHUIButtonView $button) {
+    $this->actions[] = $button;
+    return $this;
+  }
+
+  public function getActions() {
+    return $this->actions;
+  }
+
+  public function setCollapsed($collapsed) {
+    $this->collapsed = $collapsed;
+    return $this;
+  }
+
+  public function getCollapsed() {
+    return $this->collapsed;
+  }
+
+  public function setNoDataString($nodata) {
+    $this->noDataString = $nodata;
+    return $this;
+  }
+
+}

src/applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php

@@ -167,7 +167,11 @@ final class PhabricatorSlowvoteSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No polls found.'));
+
+    return $result;
   }
 
 }

src/applications/spaces/query/PhabricatorSpacesNamespaceSearchEngine.php

@@ -91,7 +91,11 @@ final class PhabricatorSpacesNamespaceSearchEngine
       $list->addItem($item);
     }
 
-    return $list;
+    $result = new PhabricatorApplicationSearchResultView();
+    $result->setObjectList($list);
+    $result->setNoDataString(pht('No spaces found.'));
+
+    return $result;
   }
 
 }

webroot/rsrc/css/aphront/table-view.css

@@ -275,11 +275,6 @@ span.single-display-line-content {
   display: none;
 }
 
-.aphront-table-view-device-ready {
-  width: 99%;
-  margin: 8px auto;
-}
-
 .aphront-table-view td.link {
   padding: 0;
 }

webroot/rsrc/css/application/base/notification-menu.css

@@ -40,6 +40,14 @@
 
 }
 
+.phabricator-notification-list.pm {
+  padding: 0;
+}
+
+.phabricator-notification-list .phabricator-notification {
+  padding: 10px 4px;
+}
+
 .phabricator-notification {
   padding: 6px 8px;
 }