From eaa43629793f311f657e18ad2d34226fad855258 Mon Sep 17 00:00:00 2001 From: Gareth Evans Date: Mon, 29 Apr 2013 11:59:16 -0700 Subject: [PATCH] Updates to phrequent's landing page Summary: https://secure.phabricator.com/D5554#comment-4 Implemented the changes outlined above. Test Plan: Go to the page, click the new nav links, try the user filter Reviewers: epriestley, hach-que CC: hach-que, aran, Korvin Differential Revision: https://secure.phabricator.com/D5789 --- .../PhabricatorApplicationPhrequent.php | 1 + .../controller/PhrequentController.php | 9 +- .../controller/PhrequentListController.php | 153 ++++++++++++++---- 3 files changed, 127 insertions(+), 36 deletions(-) diff --git a/src/applications/phrequent/application/PhabricatorApplicationPhrequent.php b/src/applications/phrequent/application/PhabricatorApplicationPhrequent.php index 648c5dd1f5..b1227f2662 100644 --- a/src/applications/phrequent/application/PhabricatorApplicationPhrequent.php +++ b/src/applications/phrequent/application/PhabricatorApplicationPhrequent.php @@ -36,6 +36,7 @@ final class PhabricatorApplicationPhrequent extends PhabricatorApplication { return array( '/phrequent/' => array( '' => 'PhrequentListController', + 'view/(?P\w+)/' => 'PhrequentListController', 'track/(?P[a-z]+)/(?P[^/]+)/' => 'PhrequentTrackController' ), diff --git a/src/applications/phrequent/controller/PhrequentController.php b/src/applications/phrequent/controller/PhrequentController.php index 88b11bd61c..0a71ffc9af 100644 --- a/src/applications/phrequent/controller/PhrequentController.php +++ b/src/applications/phrequent/controller/PhrequentController.php @@ -4,9 +4,14 @@ abstract class PhrequentController extends PhabricatorController { protected function buildNav($view) { $nav = new AphrontSideNavFilterView(); - $nav->setBaseURI(new PhutilURI('/phrequent/')); + $nav->setBaseURI(new PhutilURI('/phrequent/view/')); - $nav->addFilter('usertime', 'Time Tracked'); + $nav->addLabel(pht('User Times')); + $nav->addFilter('current', pht('Currently Tracking')); + $nav->addFilter('recent', pht('Recent Activity')); + $nav->addLabel('All Times'); + $nav->addFilter('allcurrent', pht('Currently Tracking')); + $nav->addFilter('allrecent', pht('Recent Activity')); $nav->selectFilter($view); diff --git a/src/applications/phrequent/controller/PhrequentListController.php b/src/applications/phrequent/controller/PhrequentListController.php index 6cfd8755dc..cdce5310ea 100644 --- a/src/applications/phrequent/controller/PhrequentListController.php +++ b/src/applications/phrequent/controller/PhrequentListController.php @@ -2,48 +2,69 @@ final class PhrequentListController extends PhrequentController { + private $view; + + public function willProcessRequest(array $data) { + $this->view = idx($data, 'view', "current"); + } + + private function getArrToStrList($key) { + $arr = $this->getRequest()->getArr($key); + $arr = implode(',', $arr); + return nonempty($arr, null); + } + public function processRequest() { $request = $this->getRequest(); $user = $request->getUser(); - $nav = $this->buildNav('usertime'); + if ($request->isFormPost()) { + // Redirect to GET so URIs can be copy/pasted. - $form = id(new AphrontFormView()) - ->setUser($user) - ->setNoShading(true); + $order = $request->getStr('o'); + $order = nonempty($order, null); - $form->appendChild( - id(new AphrontFormToggleButtonsControl()) - ->setName('o') - ->setLabel(pht('Sort Order')) - ->setBaseURI($request->getRequestURI(), 'o') - ->setValue($request->getStr('o', 's')) - ->setButtons( - array( - 's' => pht('Started'), - 'e' => pht('Ended'), - 'd' => pht('Duration'), - ))); + $ended = $request->getStr('e'); + $ended = nonempty($ended, null); - $form->appendChild( - id(new AphrontFormToggleButtonsControl()) - ->setName('e') - ->setLabel(pht('Ended')) - ->setBaseURI($request->getRequestURI(), 'e') - ->setValue($request->getStr('e', 'a')) - ->setButtons( - array( - 'y' => pht('Yes'), - 'n' => pht('No'), - 'a' => pht('All'), - ))); + $uri = $request->getRequestURI() + ->alter('users', $this->getArrToStrList('set_users')) + ->alter('o', $order) + ->alter('e', $ended); - $filter = new AphrontListFilterView(); - $filter->appendChild($form); + return id(new AphrontRedirectResponse())->setURI($uri); + } - $query = new PhrequentUserTimeQuery(); + $nav = $this->buildNav($this->view); - switch ($request->getStr('o', 's')) { + $has_user_filter = array( + "current" => true, + "recent" => true, + ); + + $user_phids = $request->getStrList('users', array()); + if (isset($has_user_filter[$this->view])) { + $user_phids = array($user->getPHID()); + } + + switch ($this->view) { + case "current": + case "allcurrent": + $order_key_default = "s"; + $ended_key_default = "n"; + break; + case "recent": + case "allrecent": + $order_key_default = "s"; + $ended_key_default = "y"; + break; + default: + $order_key_default = "s"; + $ended_key_default = "a"; + break; + } + + switch ($request->getStr('o', $order_key_default)) { case 's': $order = PhrequentUserTimeQuery::ORDER_STARTED; break; @@ -56,9 +77,8 @@ final class PhrequentListController extends PhrequentController { default: throw new Exception("Unknown order!"); } - $query->setOrder($order); - switch ($request->getStr('e', 'a')) { + switch ($request->getStr('e', $ended_key_default)) { case 'a': $ended = PhrequentUserTimeQuery::ENDED_ALL; break; @@ -71,7 +91,15 @@ final class PhrequentListController extends PhrequentController { default: throw new Exception("Unknown ended!"); } + + $filter = new AphrontListFilterView(); + $filter->appendChild( + $this->buildForm($user_phids, $order_key_default, $ended_key_default)); + + $query = new PhrequentUserTimeQuery(); + $query->setOrder($order); $query->setEnded($ended); + $query->setUsers($user_phids); $pager = new AphrontPagerView(); $pager->setPageSize(500); @@ -97,6 +125,7 @@ final class PhrequentListController extends PhrequentController { id(new PhabricatorCrumbView()) ->setName($title) ->setHref($this->getApplicationURI('/'))); + $nav->setCrumbs($crumbs); return $this->buildApplicationPage( @@ -108,6 +137,62 @@ final class PhrequentListController extends PhrequentController { } + protected function buildForm(array $user_phids, $order_key_default, + $ended_key_default) { + $request = $this->getRequest(); + $user = $request->getUser(); + + $form = id(new AphrontFormView()) + ->setUser($user) + ->setNoShading(true) + ->setAction($this->getApplicationURI("/view/custom/")); + + $user_handles = id(new PhabricatorObjectHandleData($user_phids)) + ->setViewer($user) + ->loadHandles(); + $tokens = array(); + foreach ($user_phids as $phid) { + $tokens[$phid] = $user_handles[$phid]->getFullName(); + } + $form->appendChild( + id(new AphrontFormTokenizerControl()) + ->setDatasource('/typeahead/common/searchowner/') + ->setName('set_users') + ->setLabel(pht('Users')) + ->setValue($tokens)); + + $form->appendChild( + id(new AphrontFormToggleButtonsControl()) + ->setName('o') + ->setLabel(pht('Sort Order')) + ->setBaseURI($request->getRequestURI(), 'o') + ->setValue($request->getStr('o', $order_key_default)) + ->setButtons( + array( + 's' => pht('Started'), + 'e' => pht('Ended'), + 'd' => pht('Duration'), + ))); + + $form->appendChild( + id(new AphrontFormToggleButtonsControl()) + ->setName('e') + ->setLabel(pht('Ended')) + ->setBaseURI($request->getRequestURI(), 'e') + ->setValue($request->getStr('e', $ended_key_default)) + ->setButtons( + array( + 'y' => pht('Yes'), + 'n' => pht('No'), + 'a' => pht('All'), + ))); + + $form->appendChild( + id(new AphrontFormSubmitControl())->setValue(pht('Filter Objects'))); + + return $form; + } + protected function buildTableView(array $usertimes) { assert_instances_of($usertimes, 'PhrequentUserTime');