Page MenuHomePhabricator
Files F15414565

D8297.id19738.diff
No OneTemporary
Actions

D8297.id19738.diff
View Options

Index: src/__phutil_library_map__.php
===================================================================
--- src/__phutil_library_map__.php
+++ src/__phutil_library_map__.php
@@ -836,6 +836,7 @@
'HeraldTranscriptGarbageCollector' => 'applications/herald/garbagecollector/HeraldTranscriptGarbageCollector.php',
'HeraldTranscriptListController' => 'applications/herald/controller/HeraldTranscriptListController.php',
'HeraldTranscriptQuery' => 'applications/herald/query/HeraldTranscriptQuery.php',
+ 'HeraldTranscriptSearchEngine' => 'applications/herald/query/HeraldTranscriptSearchEngine.php',
'HeraldTranscriptTestCase' => 'applications/herald/storage/__tests__/HeraldTranscriptTestCase.php',
'Javelin' => 'infrastructure/javelin/Javelin.php',
'JavelinReactorExample' => 'applications/uiexample/examples/JavelinReactorExample.php',
@@ -3455,8 +3456,13 @@
),
'HeraldTranscriptController' => 'HeraldController',
'HeraldTranscriptGarbageCollector' => 'PhabricatorGarbageCollector',
- 'HeraldTranscriptListController' => 'HeraldController',
+ 'HeraldTranscriptListController' =>
+ array(
+ 0 => 'HeraldController',
+ 1 => 'PhabricatorApplicationSearchResultsControllerInterface',
+ ),
'HeraldTranscriptQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+ 'HeraldTranscriptSearchEngine' => 'PhabricatorApplicationSearchEngine',
'HeraldTranscriptTestCase' => 'PhabricatorTestCase',
'JavelinReactorExample' => 'PhabricatorUIExample',
'JavelinUIExample' => 'PhabricatorUIExample',
Index: src/applications/herald/application/PhabricatorApplicationHerald.php
===================================================================
--- src/applications/herald/application/PhabricatorApplicationHerald.php
+++ src/applications/herald/application/PhabricatorApplicationHerald.php
@@ -47,10 +47,13 @@
'HeraldDisableController',
'history/(?:(?P<id>[1-9]\d*)/)?' => 'HeraldRuleEditHistoryController',
'test/' => 'HeraldTestConsoleController',
- 'transcript/' => 'HeraldTranscriptListController',
- 'transcript/(?P<id>[1-9]\d*)/(?:(?P<filter>\w+)/)?'
+ 'transcript/' => array(
+ '' => 'HeraldTranscriptListController',
+ '(?:query/(?P<queryKey>[^/]+)/)?' => 'HeraldTranscriptListController',
+ '(?P<id>[1-9]\d*)/(?:(?P<filter>\w+)/)?'
=> 'HeraldTranscriptController',
- ),
+ )
+ )
);
}
Index: src/applications/herald/controller/HeraldTestConsoleController.php
===================================================================
--- src/applications/herald/controller/HeraldTestConsoleController.php
+++ src/applications/herald/controller/HeraldTestConsoleController.php
@@ -96,14 +96,16 @@
->setFormErrors($errors)
->setForm($form);
+ $nav = $this->buildSideNavView();
+ $nav->selectFilter('test');
+ $nav->appendChild($box);
+
$crumbs = id($this->buildApplicationCrumbs())
- ->addTextCrumb(
- pht('Transcripts'),
- $this->getApplicationURI('/transcript/'))
->addTextCrumb(pht('Test Console'));
+ $nav->setCrumbs($crumbs);
return $this->buildApplicationPage(
- $box,
+ $nav,
array(
'title' => pht('Test Console'),
'device' => true,
Index: src/applications/herald/controller/HeraldTranscriptListController.php
===================================================================
--- src/applications/herald/controller/HeraldTranscriptListController.php
+++ src/applications/herald/controller/HeraldTranscriptListController.php
@@ -1,19 +1,59 @@
<?php
-final class HeraldTranscriptListController extends HeraldController {
+final class HeraldTranscriptListController extends HeraldController
+ implements PhabricatorApplicationSearchResultsControllerInterface {
- public function processRequest() {
+ private $queryKey;
- $request = $this->getRequest();
- $user = $request->getUser();
+ public function buildSideNavView($for_app = false) {
+ $user = $this->getRequest()->getUser();
+
+ $nav = new AphrontSideNavFilterView();
+ $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
- $pager = new AphrontCursorPagerView();
- $pager->readFromRequest($request);
+ if ($for_app) {
+ $nav->addFilter('new', pht('Create Rule'));
+ }
- $transcripts = id(new HeraldTranscriptQuery())
+ id(new HeraldTranscriptSearchEngine())
->setViewer($user)
- ->needPartialRecords(true)
- ->executeWithCursorPager($pager);
+ ->addNavigationItems($nav->getMenu());
+
+ $nav->selectFilter(null);
+
+ return $nav;
+ }
+
+ public function buildApplicationCrumbs() {
+ $crumbs = parent::buildApplicationCrumbs();
+
+ $crumbs->addTextCrumb(
+ pht('Transcripts'),
+ $this->getApplicationURI('transcript/'));
+ return $crumbs;
+ }
+
+ public function willProcessRequest(array $data) {
+ $this->queryKey = idx($data, 'queryKey');
+ }
+
+ public function processRequest() {
+ $request = $this->getRequest();
+ $controller = id(new PhabricatorApplicationSearchController($request))
+ ->setQueryKey($this->queryKey)
+ ->setSearchEngine(new HeraldTranscriptSearchEngine())
+ ->setNavigation($this->buildSideNavView());
+
+ return $this->delegateToController($controller);
+ }
+
+
+ public function renderResultsList(
+ array $transcripts,
+ PhabricatorSavedQuery $query) {
+ assert_instances_of($transcripts, 'HeraldTranscript');
+
+ $viewer = $this->getRequest()->getUser();
// Render the table.
$handles = array();
@@ -25,8 +65,8 @@
$rows = array();
foreach ($transcripts as $xscript) {
$rows[] = array(
- phabricator_date($xscript->getTime(), $user),
- phabricator_time($xscript->getTime(), $user),
+ phabricator_date($xscript->getTime(), $viewer),
+ phabricator_time($xscript->getTime(), $viewer),
$handles[$xscript->getObjectPHID()]->renderLink(),
$xscript->getDryRun() ? pht('Yes') : '',
number_format((int)(1000 * $xscript->getDuration())).' ms',
@@ -64,23 +104,10 @@
$panel = new AphrontPanelView();
$panel->setHeader(pht('Herald Transcripts'));
$panel->appendChild($table);
- $panel->appendChild($pager);
$panel->setNoBackground();
- $nav = $this->buildSideNavView();
- $nav->selectFilter('transcript');
- $nav->appendChild($panel);
-
- $crumbs = id($this->buildApplicationCrumbs())
- ->addTextCrumb(pht('Transcripts'));
- $nav->setCrumbs($crumbs);
+ return $panel;
- return $this->buildApplicationPage(
- $nav,
- array(
- 'title' => pht('Herald Transcripts'),
- 'device' => true,
- ));
}
}
Index: src/applications/herald/query/HeraldTranscriptQuery.php
===================================================================
--- src/applications/herald/query/HeraldTranscriptQuery.php
+++ src/applications/herald/query/HeraldTranscriptQuery.php
@@ -4,6 +4,7 @@
extends PhabricatorCursorPagedPolicyAwareQuery {
private $ids;
+ private $objectPHIDs;
private $needPartialRecords;
public function withIDs(array $ids) {
@@ -11,6 +12,11 @@
return $this;
}
+ public function withObjectPHIDs(array $phids) {
+ $this->objectPHIDs = $phids;
+ return $this;
+ }
+
public function needPartialRecords($need_partial) {
$this->needPartialRecords = $need_partial;
return $this;
@@ -89,6 +95,13 @@
$this->ids);
}
+ if ($this->objectPHIDs) {
+ $where[] = qsprintf(
+ $conn_r,
+ 'objectPHID in (%Ls)',
+ $this->objectPHIDs);
+ }
+
$where[] = $this->buildPagingClause($conn_r);
return $this->formatWhereClause($where);
Index: src/applications/herald/query/HeraldTranscriptSearchEngine.php
===================================================================
--- /dev/null
+++ src/applications/herald/query/HeraldTranscriptSearchEngine.php
@@ -0,0 +1,92 @@
+<?php
+
+final class HeraldTranscriptSearchEngine
+ extends PhabricatorApplicationSearchEngine {
+
+ public function buildSavedQueryFromRequest(AphrontRequest $request) {
+ $saved = new PhabricatorSavedQuery();
+
+ $object_monograms = $request->getStrList('objectMonograms');
+ $saved->setParameter('objectMonograms', $object_monograms);
+
+ $ids = $request->getStrList('ids');
+ foreach ($ids as $key => $id) {
+ if (!$id || !is_numeric($id)) {
+ unset($ids[$key]);
+ } else {
+ $ids[$key] = $id;
+ }
+ }
+ $saved->setParameter('ids', $ids);
+
+ return $saved;
+ }
+
+ public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
+ $query = id(new HeraldTranscriptQuery());
+
+ $object_monograms = $saved->getParameter('objectMonograms');
+ if ($object_monograms) {
+ $objects = id(new PhabricatorObjectQuery())
+ ->setViewer($this->requireViewer())
+ ->withNames($object_monograms)
+ ->execute();
+ $query->withObjectPHIDs(mpull($objects, 'getPHID'));
+ }
+
+ $ids = $saved->getParameter('ids');
+ if ($ids) {
+ $query->withIDs($ids);
+ }
+
+ return $query;
+ }
+
+ public function buildSearchForm(
+ AphrontFormView $form,
+ PhabricatorSavedQuery $saved) {
+
+ $object_monograms = $saved->getParameter('objectMonograms', array());
+ $ids = $saved->getParameter('ids', array());
+
+ $form
+ ->appendChild(
+ id(new AphrontFormTextControl())
+ ->setName('objectMonograms')
+ ->setLabel(pht('Object Monograms'))
+ ->setValue(implode(', ', $object_monograms)))
+ ->appendChild(
+ id(new AphrontFormTextControl())
+ ->setName('ids')
+ ->setLabel(pht('Transcript IDs'))
+ ->setValue(implode(', ', $ids)));
+ }
+
+ protected function getURI($path) {
+ return '/herald/transcript/'.$path;
+ }
+
+ public function getBuiltinQueryNames() {
+ $names = array();
+
+ $names['all'] = pht('All');
+
+ return $names;
+ }
+
+ public function buildSavedQueryFromBuiltin($query_key) {
+
+ $query = $this->newSavedQuery();
+ $query->setQueryKey($query_key);
+
+ $viewer_phid = $this->requireViewer()->getPHID();
+
+ switch ($query_key) {
+ case 'all':
+ return $query;
+ }
+
+ return parent::buildSavedQueryFromBuiltin($query_key);
+ }
+
+}
Index: src/applications/search/controller/PhabricatorApplicationSearchController.php
===================================================================
--- src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -281,7 +281,7 @@
$crumbs = $parent
->buildApplicationCrumbs()
- ->addTextCrumb(pht("Search"));
+ ->addTextCrumb($title);
$nav->setCrumbs($crumbs);

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 21, 1:13 AM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7701080
Default Alt Text
D8297.id19738.diff (10 KB)

Event Timeline

Phabricator · Built by Phacility