New UI for fulltext message search

Summary: Basically all here, but still probably needs some polish (links to jump? full dates?). Looks much better, still duplicates messages though sometimes. Needs to debug that more.

Test Plan:
Revisit search UI inside Conpherence, outside Conpherence, and normal room searches in Conpherence.

{F1870748}

{F1870749}

{F1870750}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

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

Author: Chad Little

resources/celerity/map.php

@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'conpherence.pkg.css' => '823b1104',
+    'conpherence.pkg.css' => 'f934296b',
     'conpherence.pkg.js' => 'cbe4d9be',
     'core.pkg.css' => 'b99bbf5e',
     'core.pkg.js' => '30185d95',
@@ -49,10 +49,10 @@
     'rsrc/css/application/conpherence/durable-column.css' => '44bcaa19',
     'rsrc/css/application/conpherence/header-pane.css' => 'e8acbd37',
     'rsrc/css/application/conpherence/menu.css' => '4f51db5a',
-    'rsrc/css/application/conpherence/message-pane.css' => '4db388a6',
+    'rsrc/css/application/conpherence/message-pane.css' => '7a94bf5e',
     'rsrc/css/application/conpherence/notification.css' => '965db05b',
     'rsrc/css/application/conpherence/participant-pane.css' => '7bba0b56',
-    'rsrc/css/application/conpherence/transaction.css' => '46253e19',
+    'rsrc/css/application/conpherence/transaction.css' => '85129c68',
     'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
     'rsrc/css/application/countdown/timer.css' => '16c52f5c',
     'rsrc/css/application/daemon/bulk-job.css' => 'df9c1d4a',
@@ -619,11 +619,11 @@
     'conpherence-durable-column-view' => '44bcaa19',
     'conpherence-header-pane-css' => 'e8acbd37',
     'conpherence-menu-css' => '4f51db5a',
-    'conpherence-message-pane-css' => '4db388a6',
+    'conpherence-message-pane-css' => '7a94bf5e',
     'conpherence-notification-css' => '965db05b',
     'conpherence-participant-pane-css' => '7bba0b56',
     'conpherence-thread-manager' => '01774ab2',
-    'conpherence-transaction-css' => '46253e19',
+    'conpherence-transaction-css' => '85129c68',
     'd3' => 'a11a5ff2',
     'differential-changeset-view-css' => '9ef7d354',
     'differential-core-view-css' => '5b7b8ff4',

src/applications/conpherence/controller/ConpherenceThreadSearchController.php

@@ -36,6 +36,6 @@ public function handleRequest(AphrontRequest $request) {
     $view = $engine->renderResults($results, $saved);
 
     return id(new AphrontAjaxResponse())
-      ->setContent($view->getObjectList());
+      ->setContent($view->getContent());
   }
 }

src/applications/conpherence/query/ConpherenceThreadSearchEngine.php

@@ -13,7 +13,8 @@ public function getApplicationClassName() {
 
   public function newQuery() {
     return id(new ConpherenceThreadQuery())
-      ->needParticipantCache(true);
+      ->needParticipantCache(true)
+      ->needProfileImage(true);
   }
 
   protected function buildCustomSearchFields() {
@@ -147,6 +148,7 @@ protected function renderResultList(
       $context = array();
     }
 
+    $content = array();
     $list = new PHUIObjectItemListView();
     $list->setUser($viewer);
     foreach ($conpherences as $conpherence_phid => $conpherence) {
@@ -157,63 +159,82 @@ protected function renderResultList(
       $icon_name = $conpherence->getPolicyIconName($policy_objects);
       $icon = id(new PHUIIconView())
         ->setIcon($icon_name);
-      $item = id(new PHUIObjectItemView())
-        ->setObjectName($conpherence->getMonogram())
-        ->setHeader($title)
-        ->setHref('/'.$conpherence->getMonogram())
-        ->setObject($conpherence)
-        ->addIcon('none', $created)
-        ->addIcon(
-          'none',
-          pht('Messages: %d', $conpherence->getMessageCount()))
-        ->addAttribute(
-          array(
-            $icon,
-            ' ',
-            pht(
-              'Last updated %s',
-              phabricator_datetime($conpherence->getDateModified(), $viewer)),
-          ));
-
-      $messages = idx($context, $conpherence_phid);
-      if ($messages) {
-        foreach ($messages as $group) {
-          $rows = array();
-          foreach ($group as $message) {
-            $xaction = $message['xaction'];
-            if (!$xaction) {
-              continue;
-            }
 
-            $view = id(new ConpherenceTransactionView())
-              ->setUser($viewer)
-              ->setHandles($handles)
-              ->setMarkupEngine($engines[$conpherence_phid])
-              ->setConpherenceThread($conpherence)
-              ->setConpherenceTransaction($xaction)
-              ->setFullDisplay(false)
-              ->addClass('conpherence-fulltext-result');
-
-            if ($message['match']) {
-              $view->addClass('conpherence-fulltext-match');
+      if (!strlen($fulltext)) {
+        $item = id(new PHUIObjectItemView())
+          ->setObjectName($conpherence->getMonogram())
+          ->setHeader($title)
+          ->setHref('/'.$conpherence->getMonogram())
+          ->setObject($conpherence)
+          ->setImageURI($conpherence->getProfileImageURI())
+          ->addIcon('none', $created)
+          ->addIcon(
+            'none',
+            pht('Messages: %d', $conpherence->getMessageCount()))
+          ->addAttribute(
+            array(
+              $icon,
+              ' ',
+              pht(
+                'Last updated %s',
+                phabricator_datetime($conpherence->getDateModified(), $viewer)),
+            ));
+          $list->addItem($item);
+      } else {
+        $messages = idx($context, $conpherence_phid);
+        $box = array();
+        $list = null;
+        if ($messages) {
+          foreach ($messages as $group) {
+            $rows = array();
+            foreach ($group as $message) {
+              $xaction = $message['xaction'];
+              if (!$xaction) {
+                continue;
+              }
+
+              $view = id(new ConpherenceTransactionView())
+                ->setUser($viewer)
+                ->setHandles($handles)
+                ->setMarkupEngine($engines[$conpherence_phid])
+                ->setConpherenceThread($conpherence)
+                ->setConpherenceTransaction($xaction)
+                ->setFullDisplay(true)
+                ->addClass('conpherence-fulltext-result');
+
+              if ($message['match']) {
+                $view->addClass('conpherence-fulltext-match');
+              }
+
+              $rows[] = $view;
             }
-
-            $rows[] = $view;
+            $box[] = id(new PHUIBoxView())
+              ->appendChild($rows)
+              ->addClass('conpherence-fulltext-results');
           }
-
-          $box = id(new PHUIBoxView())
-            ->appendChild($rows)
-            ->addClass('conpherence-fulltext-results');
-          $item->appendChild($box);
         }
+        $header = id(new PHUIHeaderView())
+          ->setHeader($title)
+          ->setHeaderIcon($icon_name)
+          ->setHref('/'.$monogram);
+
+        $content[] = id(new PHUIObjectBoxView())
+          ->setHeader($header)
+          ->appendChild($box);
       }
+    }
 
-      $list->addItem($item);
+    if ($list) {
+      $content = $list;
+    } else {
+      $content = id(new PHUIBoxView())
+        ->addClass('conpherence-search-room-results')
+        ->appendChild($content);
     }
 
     $result = new PhabricatorApplicationSearchResultView();
-    $result->setObjectList($list);
-    $result->setNoDataString(pht('No threads found.'));
+    $result->setContent($content);
+    $result->setNoDataString(pht('No results found.'));
 
     return $result;
   }

src/applications/conpherence/view/ConpherenceTransactionView.php

@@ -247,17 +247,14 @@ private function renderTransactionContent() {
         break;
     }
 
-    $this->appendChild(
-      phutil_tag(
-        'div',
-        array(
-          'class' => $content_class,
-        ),
-        $content));
+    $view = phutil_tag(
+      'div',
+      array(
+        'class' => $content_class,
+      ),
+      $content);
 
-    return phutil_tag_div(
-      'conpherence-transaction-content',
-      $this->renderChildren());
+    return phutil_tag_div('conpherence-transaction-content', $view);
   }
 
 }