Page MenuHomePhabricator
Files F15488183

D15320.id36950.diff
No OneTemporary
Actions

D15320.id36950.diff
View Options

diff --git a/src/applications/almanac/query/AlmanacInterfaceQuery.php b/src/applications/almanac/query/AlmanacInterfaceQuery.php
--- a/src/applications/almanac/query/AlmanacInterfaceQuery.php
+++ b/src/applications/almanac/query/AlmanacInterfaceQuery.php
@@ -34,19 +34,12 @@
return $this;
}
- protected function loadPage() {
- $table = new AlmanacInterface();
- $conn_r = $table->establishConnection('r');
-
- $data = queryfx_all(
- $conn_r,
- 'SELECT * FROM %T %Q %Q %Q',
- $table->getTableName(),
- $this->buildWhereClause($conn_r),
- $this->buildOrderClause($conn_r),
- $this->buildLimitClause($conn_r));
+ public function newResultObject() {
+ return new AlmanacInterface();
+ }
- return $table->loadAllFromArray($data);
+ protected function loadPage() {
+ return $this->loadStandardPage($this->newResultObject());
}
protected function willFilterPage(array $interfaces) {
@@ -83,34 +76,34 @@
return $interfaces;
}
- protected function buildWhereClause(AphrontDatabaseConnection $conn_r) {
- $where = array();
+ protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
+ $where = parent::buildWhereClauseParts($conn);
if ($this->ids !== null) {
$where[] = qsprintf(
- $conn_r,
- 'id IN (%Ld)',
+ $conn,
+ 'interface.id IN (%Ld)',
$this->ids);
}
if ($this->phids !== null) {
$where[] = qsprintf(
- $conn_r,
- 'phid IN (%Ls)',
+ $conn,
+ 'interface.phid IN (%Ls)',
$this->phids);
}
if ($this->networkPHIDs !== null) {
$where[] = qsprintf(
- $conn_r,
- 'networkPHID IN (%Ls)',
+ $conn,
+ 'interface.networkPHID IN (%Ls)',
$this->networkPHIDs);
}
if ($this->devicePHIDs !== null) {
$where[] = qsprintf(
- $conn_r,
- 'devicePHID IN (%Ls)',
+ $conn,
+ 'interface.devicePHID IN (%Ls)',
$this->devicePHIDs);
}
@@ -118,8 +111,10 @@
$parts = array();
foreach ($this->addresses as $address) {
$parts[] = qsprintf(
- $conn_r,
- '(networkPHID = %s AND address = %s AND port = %d)',
+ $conn,
+ '(interface.networkPHID = %s '.
+ 'AND interface.address = %s '.
+ 'AND interface.port = %d)',
$address->getNetworkPHID(),
$address->getAddress(),
$address->getPort());
@@ -127,13 +122,77 @@
$where[] = implode(' OR ', $parts);
}
- $where[] = $this->buildPagingClause($conn_r);
+ return $where;
+ }
+
+ protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
+ $joins = parent::buildJoinClauseParts($conn);
+
+ if ($this->shouldJoinDeviceTable()) {
+ $joins[] = qsprintf(
+ $conn,
+ 'JOIN %T device ON device.phid = interface.devicePHID',
+ id(new AlmanacDevice())->getTableName());
+ }
+
+ return $joins;
+ }
- return $this->formatWhereClause($where);
+ protected function shouldGroupQueryResultRows() {
+ if ($this->shouldJoinDeviceTable()) {
+ return true;
+ }
+
+ return parent::shouldGroupQueryResultRows();
+ }
+
+ private function shouldJoinDeviceTable() {
+ $vector = $this->getOrderVector();
+
+ if ($vector->containsKey('name')) {
+ return true;
+ }
+
+ return false;
+ }
+
+ protected function getPrimaryTableAlias() {
+ return 'interface';
}
public function getQueryApplicationClass() {
return 'PhabricatorAlmanacApplication';
}
+ public function getBuiltinOrders() {
+ return array(
+ 'name' => array(
+ 'vector' => array('name', 'id'),
+ 'name' => pht('Device Name'),
+ ),
+ ) + parent::getBuiltinOrders();
+ }
+
+ public function getOrderableColumns() {
+ return parent::getOrderableColumns() + array(
+ 'name' => array(
+ 'table' => 'device',
+ 'column' => 'name',
+ 'type' => 'string',
+ 'reverse' => true,
+ ),
+ );
+ }
+
+ protected function getPagingValueMap($cursor, array $keys) {
+ $interface = $this->loadCursorObject($cursor);
+
+ $map = array(
+ 'id' => $interface->getID(),
+ 'name' => $interface->getDevice()->getName(),
+ );
+
+ return $map;
+ }
+
}
diff --git a/src/applications/almanac/typeahead/AlmanacInterfaceDatasource.php b/src/applications/almanac/typeahead/AlmanacInterfaceDatasource.php
--- a/src/applications/almanac/typeahead/AlmanacInterfaceDatasource.php
+++ b/src/applications/almanac/typeahead/AlmanacInterfaceDatasource.php
@@ -3,12 +3,6 @@
final class AlmanacInterfaceDatasource
extends PhabricatorTypeaheadDatasource {
- public function isBrowsable() {
- // TODO: We should make this browsable, but need to make the result set
- // orderable by device name.
- return false;
- }
-
public function getBrowseTitle() {
return pht('Browse Interfaces');
}
@@ -31,10 +25,12 @@
->execute();
if ($devices) {
- $interfaces = id(new AlmanacInterfaceQuery())
+ $interface_query = id(new AlmanacInterfaceQuery())
->setViewer($viewer)
->withDevicePHIDs(mpull($devices, 'getPHID'))
- ->execute();
+ ->setOrder('name');
+
+ $interfaces = $this->executeQuery($interface_query);
} else {
$interfaces = array();
}
diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
@@ -107,6 +107,8 @@
if (($offset + (2 * $limit)) < $hard_limit) {
$next_uri = id(new PhutilURI($request->getRequestURI()))
->setQueryParam('offset', $offset + $limit)
+ ->setQueryParam('q', $query)
+ ->setQueryParam('raw', $raw_query)
->setQueryParam('format', 'html');
$next_link = javelin_tag(

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 11, 8:13 PM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7390553
Default Alt Text
D15320.id36950.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility