Implement ApplicationSearch in People

Summary:
Ref T2625. Fixes T2812. Implement ApplicationSearch in People.

{F44788}

Test Plan: Made People queries. Used Conduit. Used `@mentions`.

Reviewers: btrahan, chad

Reviewed By: chad

CC: aran

Maniphest Tasks: T2625, T2812

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

Author: epriestley

src/__phutil_library_map__.php

@@ -1255,7 +1255,8 @@
     'PhabricatorPeopleListController' => 'applications/people/controller/PhabricatorPeopleListController.php',
     'PhabricatorPeopleLogsController' => 'applications/people/controller/PhabricatorPeopleLogsController.php',
     'PhabricatorPeopleProfileController' => 'applications/people/controller/PhabricatorPeopleProfileController.php',
-    'PhabricatorPeopleQuery' => 'applications/people/PhabricatorPeopleQuery.php',
+    'PhabricatorPeopleQuery' => 'applications/people/query/PhabricatorPeopleQuery.php',
+    'PhabricatorPeopleSearchEngine' => 'applications/people/query/PhabricatorPeopleSearchEngine.php',
     'PhabricatorPeopleTestDataGenerator' => 'applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php',
     'PhabricatorPhabricatorOAuthConfigOptions' => 'applications/config/option/PhabricatorPhabricatorOAuthConfigOptions.php',
     'PhabricatorPhameConfigOptions' => 'applications/phame/config/PhabricatorPhameConfigOptions.php',
@@ -3052,10 +3053,15 @@
     'PhabricatorPeopleEditController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleHovercardEventListener' => 'PhutilEventListener',
     'PhabricatorPeopleLdapController' => 'PhabricatorPeopleController',
-    'PhabricatorPeopleListController' => 'PhabricatorPeopleController',
+    'PhabricatorPeopleListController' =>
+    array(
+      0 => 'PhabricatorPeopleController',
+      1 => 'PhabricatorApplicationSearchResultsControllerInterface',
+    ),
     'PhabricatorPeopleLogsController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
-    'PhabricatorPeopleQuery' => 'PhabricatorOffsetPagedQuery',
+    'PhabricatorPeopleQuery' => 'PhabricatorPolicyAwareCursorPagedQuery',
+    'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorPeopleTestDataGenerator' => 'PhabricatorTestDataGenerator',
     'PhabricatorPhabricatorOAuthConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPhameConfigOptions' => 'PhabricatorApplicationConfigOptions',
@@ -3307,6 +3313,7 @@
     array(
       0 => 'PhabricatorUserDAO',
       1 => 'PhutilPerson',
+      2 => 'PhabricatorPolicyInterface',
     ),
     'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
     'PhabricatorUserEditor' => 'PhabricatorEditor',

src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php

@@ -285,9 +285,10 @@ protected function getDefaultPrivateReplyHandlerEmailAddress(
       return null;
     }
 
-    $user = head(id(new PhabricatorPeopleQuery())
-      ->withPhids(array($handle->getPHID()))
-      ->execute());
+    $user = id(new PhabricatorPeopleQuery())
+      ->setViewer(PhabricatorUser::getOmnipotentUser())
+      ->withPHIDs(array($handle->getPHID()))
+      ->executeOne();
 
     $receiver = $this->getMailReceiver();
     $receiver_id = $receiver->getID();

src/applications/people/application/PhabricatorApplicationPeople.php

@@ -23,7 +23,7 @@ public function getFlavorText() {
   }
 
   public function getApplicationGroup() {
-    return self::GROUP_ADMIN;
+    return self::GROUP_ORGANIZATION;
   }
 
   public function canUninstall() {
@@ -39,7 +39,7 @@ public function getEventListeners() {
   public function getRoutes() {
     return array(
       '/people/' => array(
-        '' => 'PhabricatorPeopleListController',
+        '(query/(?P<key>[^/]+)/)?' => 'PhabricatorPeopleListController',
         'logs/' => 'PhabricatorPeopleLogsController',
         'edit/(?:(?P<id>[1-9]\d*)/(?:(?P<view>\w+)/)?)?'
           => 'PhabricatorPeopleEditController',

src/applications/people/conduit/ConduitAPI_user_query_Method.php

@@ -44,6 +44,8 @@ protected function execute(ConduitAPIRequest $request) {
     $limit       = $request->getValue('limit',     100);
 
     $query = new PhabricatorPeopleQuery();
+    $query->setViewer($request->getUser());
+
     if ($usernames) {
       $query->withUsernames($usernames);
     }

src/applications/people/controller/PhabricatorPeopleController.php

@@ -10,17 +10,20 @@ public function buildSideNavView() {
     $nav = new AphrontSideNavFilterView();
     $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
 
-    $nav->addLabel(pht('User Administration'));
-    $nav->addFilter('edit', pht('Create New User'));
-    if (PhabricatorEnv::getEnvConfig('ldap.auth-enabled') === true) {
-      $nav->addFilter('ldap', pht('Import from LDAP'));
-    }
+    $viewer = $this->getRequest()->getUser();
+
+    id(new PhabricatorPeopleSearchEngine())
+      ->setViewer($viewer)
+      ->addNavigationItems($nav->getMenu());
 
-    $nav->addFilter('people',
-      pht('User Directory'),
-      $this->getApplicationURI());
+    if ($viewer->getIsAdmin()) {
+      $nav->addLabel(pht('User Administration'));
+      if (PhabricatorEnv::getEnvConfig('ldap.auth-enabled') === true) {
+        $nav->addFilter('ldap', pht('Import from LDAP'));
+      }
 
-    $nav->addFilter('logs', pht('Activity Logs'));
+      $nav->addFilter('logs', pht('Activity Logs'));
+    }
 
     return $nav;
   }
@@ -32,11 +35,15 @@ public function buildApplicationMenu() {
   public function buildApplicationCrumbs() {
     $crumbs = parent::buildApplicationCrumbs();
 
-    $crumbs->addAction(
-      id(new PhabricatorMenuItemView())
-        ->setName(pht('Create New User'))
-        ->setHref($this->getApplicationURI('edit'))
-        ->setIcon('create'));
+    $viewer = $this->getRequest()->getUser();
+
+    if ($viewer->getIsAdmin()) {
+      $crumbs->addAction(
+        id(new PhabricatorMenuItemView())
+          ->setName(pht('Create New User'))
+          ->setHref($this->getApplicationURI('edit'))
+          ->setIcon('create'));
+    }
 
     return $crumbs;
   }

src/applications/people/controller/PhabricatorPeopleListController.php

@@ -1,29 +1,37 @@
 <?php
 
-final class PhabricatorPeopleListController
-  extends PhabricatorPeopleController {
+final class PhabricatorPeopleListController extends PhabricatorPeopleController
+  implements PhabricatorApplicationSearchResultsControllerInterface {
+
+  private $key;
+
+  public function shouldAllowPublic() {
+    return true;
+  }
+
+  public function shouldRequireAdmin() {
+    return false;
+  }
+
+  public function willProcessRequest(array $data) {
+    $this->key = idx($data, 'key', 'all');
+  }
 
   public function processRequest() {
     $request = $this->getRequest();
-    $viewer = $request->getUser();
-    $is_admin = $viewer->getIsAdmin();
-
-    $user = new PhabricatorUser();
+    $controller = id(new PhabricatorApplicationSearchController($request))
+      ->setQueryKey($this->key)
+      ->setSearchEngine(new PhabricatorPeopleSearchEngine())
+      ->setNavigation($this->buildSideNavView());
 
-    $count = queryfx_one(
-      $user->establishConnection('r'),
-      'SELECT COUNT(*) N FROM %T',
-      $user->getTableName());
-    $count = idx($count, 'N', 0);
+    return $this->delegateToController($controller);
+  }
 
-    $pager = new AphrontPagerView();
-    $pager->setOffset($request->getInt('page', 0));
-    $pager->setCount($count);
-    $pager->setURI($request->getRequestURI(), 'page');
+  public function renderResultsList(array $users) {
+    assert_instances_of($users, 'PhabricatorUser');
 
-    $users = id(new PhabricatorPeopleQuery())
-      ->needPrimaryEmail(true)
-      ->executeWithOffsetPager($pager);
+    $request = $this->getRequest();
+    $viewer = $request->getUser();
 
     $list = new PhabricatorObjectItemListView();
 
@@ -40,7 +48,7 @@ public function processRequest() {
 
       $item = new PhabricatorObjectItemView();
       $item->setHeader($user->getFullName())
-        ->setHref('/people/edit/'.$user->getID().'/')
+        ->setHref('/p/'.$user->getUsername().'/')
         ->addAttribute(hsprintf('%s %s',
             phabricator_date($user->getDateCreated(), $viewer),
             phabricator_time($user->getDateCreated(), $viewer)))
@@ -58,31 +66,17 @@ public function processRequest() {
         $item->addIcon('computer', pht('System Agent'));
       }
 
+      if ($viewer->getIsAdmin()) {
+        $uid = $user->getID();
+        $item->addAction(
+          id(new PhabricatorMenuItemView())
+            ->setIcon('edit')
+            ->setHref($this->getApplicationURI('edit/'.$uid.'/')));
+      }
+
       $list->addItem($item);
     }
 
-    $header = new PhabricatorHeaderView();
-    $header->setHeader(pht('People (%d)', number_format($count)));
-
-    $crumbs = $this->buildApplicationCrumbs();
-    $crumbs->addCrumb(
-        id(new PhabricatorCrumbView())
-          ->setName(pht('User Directory'))
-          ->setHref('/people/'));
-
-    $nav = $this->buildSideNavView();
-    $nav->selectFilter('people');
-    $nav->appendChild($header);
-    $nav->appendChild($list);
-    $nav->appendChild($pager);
-    $nav->setCrumbs($crumbs);
-
-    return $this->buildApplicationPage(
-      $nav,
-      array(
-        'title'  => pht('People'),
-        'device' => true,
-        'dust'   => true,
-      ));
+    return $list;
   }
 }