Page MenuHomePhabricator
Files F15335673

D9233.diff
No OneTemporary
Actions

D9233.diff
View Options

diff --git a/src/applications/diffusion/controller/DiffusionLastModifiedController.php b/src/applications/diffusion/controller/DiffusionLastModifiedController.php
--- a/src/applications/diffusion/controller/DiffusionLastModifiedController.php
+++ b/src/applications/diffusion/controller/DiffusionLastModifiedController.php
@@ -66,8 +66,12 @@
}
$lint = $lint_query->execute();
+ $trends = PhabricatorFactLintEngine::getTrendsForPaths(
+ $branch,
+ array_keys($lint));
} else {
$lint = array();
+ $trends = array();
}
$output = array();
@@ -75,11 +79,19 @@
$prequest = clone $drequest;
$prequest->setPath($path);
+ $trend_data = idx($trends, $path);
+ if ($trend_data === null && $path[strlen($path) - 1] === '/') {
+ $trend_data = idx($trends, substr($path, 0, strlen($path) - 1));
+ }
+
$output[$path] = $this->renderColumns(
$prequest,
$handles,
$commit,
- idx($lint, $path));
+ idx($lint, $path),
+ $trend_data,
+ $path,
+ $branch->getPHID());
}
return id(new AphrontAjaxResponse())->setContent($output);
@@ -89,7 +101,10 @@
DiffusionRequest $drequest,
array $handles,
PhabricatorRepositoryCommit $commit = null,
- $lint = null) {
+ $lint = null,
+ $trend = null,
+ $trend_path = null,
+ $branch_phid = null) {
assert_instances_of($handles, 'PhabricatorObjectHandle');
$viewer = $this->getRequest()->getUser();
@@ -143,15 +158,50 @@
);
if ($lint !== null) {
- $return['lint'] = phutil_tag(
- 'a',
- array(
- 'href' => $drequest->generateURI(array(
- 'action' => 'lint',
- 'lint' => null,
- )),
- ),
- number_format($lint));
+ $trend_icon = '';
+ $trend_prefix = '';
+ $trend_suffix = '';
+ $trend_suffix_link = '';
+ if ((int)$trend > 0) {
+ $trend_icon = id(new PHUIIconView())
+ ->setIconFont('fa-level-up')
+ ->setStyle('color: red');
+ } else if ((int)$trend < 0) {
+ $trend_icon = id(new PHUIIconView())
+ ->setIconFont('fa-level-down')
+ ->setStyle('color: green');
+ }
+
+ if ((int)$trend !== 0) {
+ $trend_prefix = ' ';
+ $trend_suffix = ' ';
+ $trend_suffix_uri = id(new PhutilURI(''))
+ ->setPath('/fact/chart')
+ ->setQueryParam('y1', 'L:PATH')
+ ->setQueryParam('sa', '/'.trim($trend_path, '/'))
+ ->setQueryParam('op', $branch_phid);
+ $trend_suffix_link = phutil_tag(
+ 'a',
+ array('href' => (string)$trend_suffix_uri),
+ $trend);
+ }
+
+ $return['lint'] =
+ phutil_tag(
+ 'span',
+ array(),
+ array(
+ phutil_tag(
+ 'a',
+ array('href' => $drequest->generateURI(array(
+ 'action' => 'lint',
+ 'lint' => null,
+ )),),
+ number_format($lint)),
+ $trend_prefix,
+ $trend_icon,
+ $trend_suffix,
+ $trend_suffix_link,));
}
return $return;
diff --git a/src/applications/diffusion/fact/PhabricatorFactLintEngine.php b/src/applications/diffusion/fact/PhabricatorFactLintEngine.php
--- a/src/applications/diffusion/fact/PhabricatorFactLintEngine.php
+++ b/src/applications/diffusion/fact/PhabricatorFactLintEngine.php
@@ -141,5 +141,51 @@
return $facts;
}
+ // ---- Utility Query -----------------------------------
+
+ public static function getTrendsForPaths(
+ PhabricatorRepositoryBranch $branch,
+ array $paths) {
+
+
+ $prefixed_paths = array();
+ foreach ($paths as $path) {
+ $prefixed_paths[] = '/'.trim($path, '/');
+ }
+
+ $table = new PhabricatorFactRaw();
+ $table_name = $table->getTableName();
+ $conn = $table->establishConnection('r');
+
+ $raw_trends = queryfx_all(
+ $conn,
+ 'SELECT stringA AS path, SUM(valueX) AS n
+ FROM %T AS x
+ WHERE factType = %s
+ AND objectPHID = %s
+ AND stringA IN (%Ls)
+ AND epoch = (
+ SELECT MAX(epoch)
+ FROM %T AS a
+ WHERE factType = %s
+ AND objectPHID = %s
+ AND a.stringA = x.stringA)
+ GROUP BY path',
+ $table_name,
+ self::TYPE_LINT_COUNT_BY_PATH,
+ $branch->getPHID(),
+ $prefixed_paths,
+ $table_name,
+ self::TYPE_LINT_COUNT_BY_PATH,
+ $branch->getPHID());
+
+ $trends = array();
+ foreach ($raw_trends as $value) {
+ $trends[trim($value['path'], '/')] =
+ $value['n'];
+ }
+
+ return $trends;
+ }
}
diff --git a/src/applications/fact/controller/PhabricatorFactChartController.php b/src/applications/fact/controller/PhabricatorFactChartController.php
--- a/src/applications/fact/controller/PhabricatorFactChartController.php
+++ b/src/applications/fact/controller/PhabricatorFactChartController.php
@@ -12,6 +12,7 @@
$series = $request->getStr('y1');
$filter_a = $request->getStr('sa');
+ $filter_o = $request->getStr('op');
$specs = PhabricatorFactSpec::newSpecsForFactTypes(
PhabricatorFactEngine::loadAllEngines(),
@@ -22,6 +23,9 @@
if ($filter_a !== '') {
$filter .= qsprintf($conn_r, 'AND stringA = %s', $filter_a);
}
+ if ($filter_o !== '') {
+ $filter .= qsprintf($conn_r, 'AND objectPHID = %s', $filter_o);
+ }
$data = queryfx_all(
$conn_r,
@@ -87,6 +91,9 @@
if ($filter_a !== '') {
$filter_name = pht(' (filtered by %s)', $filter_a);
}
+ if ($filter_o !== '') {
+ $filter_name = pht(' (filtered by %s)', $filter_o);
+ }
$panel = new AphrontPanelView();
$panel->setHeader('Count of '.$spec->getName().$filter_name);
diff --git a/src/applications/fact/controller/PhabricatorFactHomeController.php b/src/applications/fact/controller/PhabricatorFactHomeController.php
--- a/src/applications/fact/controller/PhabricatorFactHomeController.php
+++ b/src/applications/fact/controller/PhabricatorFactHomeController.php
@@ -14,6 +14,7 @@
$uri = new PhutilURI('/fact/chart/');
$uri->setQueryParam('y1', $request->getStr('y1'));
$uri->setQueryParam('sa', $request->getStr('sa'));
+ $uri->setQueryParam('op', $request->getStr('op'));
return id(new AphrontRedirectResponse())->setURI($uri);
}
@@ -124,6 +125,13 @@
'This is an optional filtering '.
'string that some facts use.')))
->appendChild(
+ id(new AphrontFormTextControl())
+ ->setLabel('Optional Object PHID')
+ ->setName('op')
+ ->setCaption(pht(
+ 'This is an optional filtering '.
+ 'object PHID that some facts use.')))
+ ->appendChild(
id(new AphrontFormSubmitControl())
->setValue('Plot Chart'));

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 9, 5:18 PM (4 w, 30 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7390015
Default Alt Text
D9233.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility