Add a dedicated HistoryListView for Diffusion
Summary: Going to play a bit with this layout (diffusion sans audit) and see how it feels on profile. Uses a user image, moves the commit hash (easily selectible) and separates commits by date.
Test Plan:
Review profiles with and without commits.
{F4973987}
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D18005
This commit is contained in:
@@ -71,6 +71,7 @@ return array(
|
|||||||
'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
|
'rsrc/css/application/differential/revision-history.css' => '0e8eb855',
|
||||||
'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
|
'rsrc/css/application/differential/revision-list.css' => 'f3c47d33',
|
||||||
'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
|
'rsrc/css/application/differential/table-of-contents.css' => 'ae4b7a55',
|
||||||
|
'rsrc/css/application/diffusion/diffusion-history.css' => 'b4ac65b3',
|
||||||
'rsrc/css/application/diffusion/diffusion-icons.css' => 'a6a1e2ba',
|
'rsrc/css/application/diffusion/diffusion-icons.css' => 'a6a1e2ba',
|
||||||
'rsrc/css/application/diffusion/diffusion-readme.css' => '18bd3910',
|
'rsrc/css/application/diffusion/diffusion-readme.css' => '18bd3910',
|
||||||
'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
|
'rsrc/css/application/diffusion/diffusion-source.css' => '750add59',
|
||||||
@@ -574,6 +575,7 @@ return array(
|
|||||||
'differential-revision-history-css' => '0e8eb855',
|
'differential-revision-history-css' => '0e8eb855',
|
||||||
'differential-revision-list-css' => 'f3c47d33',
|
'differential-revision-list-css' => 'f3c47d33',
|
||||||
'differential-table-of-contents-css' => 'ae4b7a55',
|
'differential-table-of-contents-css' => 'ae4b7a55',
|
||||||
|
'diffusion-history-css' => 'b4ac65b3',
|
||||||
'diffusion-icons-css' => 'a6a1e2ba',
|
'diffusion-icons-css' => 'a6a1e2ba',
|
||||||
'diffusion-readme-css' => '18bd3910',
|
'diffusion-readme-css' => '18bd3910',
|
||||||
'diffusion-source-css' => '750add59',
|
'diffusion-source-css' => '750add59',
|
||||||
|
|||||||
@@ -728,6 +728,7 @@ phutil_register_library_map(array(
|
|||||||
'DiffusionGitSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitSSHWorkflow.php',
|
'DiffusionGitSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitSSHWorkflow.php',
|
||||||
'DiffusionGitUploadPackSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php',
|
'DiffusionGitUploadPackSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php',
|
||||||
'DiffusionHistoryController' => 'applications/diffusion/controller/DiffusionHistoryController.php',
|
'DiffusionHistoryController' => 'applications/diffusion/controller/DiffusionHistoryController.php',
|
||||||
|
'DiffusionHistoryListView' => 'applications/diffusion/view/DiffusionHistoryListView.php',
|
||||||
'DiffusionHistoryQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php',
|
'DiffusionHistoryQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php',
|
||||||
'DiffusionHistoryTableView' => 'applications/diffusion/view/DiffusionHistoryTableView.php',
|
'DiffusionHistoryTableView' => 'applications/diffusion/view/DiffusionHistoryTableView.php',
|
||||||
'DiffusionHovercardEngineExtension' => 'applications/diffusion/engineextension/DiffusionHovercardEngineExtension.php',
|
'DiffusionHovercardEngineExtension' => 'applications/diffusion/engineextension/DiffusionHovercardEngineExtension.php',
|
||||||
@@ -5694,6 +5695,7 @@ phutil_register_library_map(array(
|
|||||||
),
|
),
|
||||||
'DiffusionGitUploadPackSSHWorkflow' => 'DiffusionGitSSHWorkflow',
|
'DiffusionGitUploadPackSSHWorkflow' => 'DiffusionGitSSHWorkflow',
|
||||||
'DiffusionHistoryController' => 'DiffusionController',
|
'DiffusionHistoryController' => 'DiffusionController',
|
||||||
|
'DiffusionHistoryListView' => 'AphrontView',
|
||||||
'DiffusionHistoryQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
|
'DiffusionHistoryQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
|
||||||
'DiffusionHistoryTableView' => 'DiffusionView',
|
'DiffusionHistoryTableView' => 'DiffusionView',
|
||||||
'DiffusionHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
|
'DiffusionHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
|
||||||
|
|||||||
148
src/applications/diffusion/view/DiffusionHistoryListView.php
Normal file
148
src/applications/diffusion/view/DiffusionHistoryListView.php
Normal file
@@ -0,0 +1,148 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
final class DiffusionHistoryListView extends AphrontView {
|
||||||
|
|
||||||
|
private $commits = array();
|
||||||
|
private $noDataString;
|
||||||
|
|
||||||
|
public function setNoDataString($no_data_string) {
|
||||||
|
$this->noDataString = $no_data_string;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setHeader($header) {
|
||||||
|
$this->header = $header;
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCommits(array $commits) {
|
||||||
|
assert_instances_of($commits, 'PhabricatorRepositoryCommit');
|
||||||
|
$this->commits = mpull($commits, null, 'getPHID');
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCommits() {
|
||||||
|
return $this->commits;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getCommitDescription($phid) {
|
||||||
|
if ($this->commits === null) {
|
||||||
|
return pht('(Unknown Commit)');
|
||||||
|
}
|
||||||
|
|
||||||
|
$commit = idx($this->commits, $phid);
|
||||||
|
if (!$commit) {
|
||||||
|
return pht('(Unknown Commit)');
|
||||||
|
}
|
||||||
|
|
||||||
|
$summary = $commit->getCommitData()->getSummary();
|
||||||
|
if (strlen($summary)) {
|
||||||
|
return $summary;
|
||||||
|
}
|
||||||
|
|
||||||
|
// No summary, so either this is still importing or just has an empty
|
||||||
|
// commit message.
|
||||||
|
|
||||||
|
if (!$commit->isImported()) {
|
||||||
|
return pht('(Importing Commit...)');
|
||||||
|
} else {
|
||||||
|
return pht('(Untitled Commit)');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function render() {
|
||||||
|
require_celerity_resource('diffusion-history-css');
|
||||||
|
return $this->buildList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function buildList() {
|
||||||
|
$viewer = $this->getViewer();
|
||||||
|
$rowc = array();
|
||||||
|
|
||||||
|
$phids = array();
|
||||||
|
foreach ($this->getCommits() as $commit) {
|
||||||
|
$phids[] = $commit->getPHID();
|
||||||
|
|
||||||
|
$author_phid = $commit->getAuthorPHID();
|
||||||
|
if ($author_phid) {
|
||||||
|
$phids[] = $author_phid;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$handles = $viewer->loadHandles($phids);
|
||||||
|
|
||||||
|
$cur_date = 0;
|
||||||
|
$list = null;
|
||||||
|
$header = null;
|
||||||
|
$view = array();
|
||||||
|
foreach ($this->commits as $commit) {
|
||||||
|
$new_date = date('Ymd', $commit->getEpoch());
|
||||||
|
if ($cur_date != $new_date) {
|
||||||
|
if ($list) {
|
||||||
|
$view[] = id(new PHUIObjectBoxView())
|
||||||
|
->setHeader($header)
|
||||||
|
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
|
||||||
|
->setObjectList($list);
|
||||||
|
}
|
||||||
|
$date = ucfirst(
|
||||||
|
phabricator_relative_date($commit->getEpoch(), $viewer));
|
||||||
|
$header = id(new PHUIHeaderView())
|
||||||
|
->setHeader($date);
|
||||||
|
$list = id(new PHUIObjectItemListView())
|
||||||
|
->setFlush(true)
|
||||||
|
->addClass('diffusion-history-list');
|
||||||
|
}
|
||||||
|
|
||||||
|
$commit_phid = $commit->getPHID();
|
||||||
|
$commit_handle = $handles[$commit_phid];
|
||||||
|
$committed = null;
|
||||||
|
|
||||||
|
$commit_name = $commit_handle->getName();
|
||||||
|
$commit_link = $commit_handle->getURI();
|
||||||
|
$commit_desc = $this->getCommitDescription($commit_phid);
|
||||||
|
$committed = phabricator_datetime($commit->getEpoch(), $viewer);
|
||||||
|
|
||||||
|
$author_phid = $commit->getAuthorPHID();
|
||||||
|
if ($author_phid) {
|
||||||
|
$author_name = $handles[$author_phid]->renderLink();
|
||||||
|
$author_image_uri = $handles[$author_phid]->getImageURI();
|
||||||
|
} else {
|
||||||
|
$author_name = $commit->getCommitData()->getAuthorName();
|
||||||
|
$author_image_uri =
|
||||||
|
celerity_get_resource_uri('/rsrc/image/people/user0.png');
|
||||||
|
}
|
||||||
|
|
||||||
|
$commit_tag = id(new PHUITagView())
|
||||||
|
->setName($commit_name)
|
||||||
|
->setType(PHUITagView::TYPE_SHADE)
|
||||||
|
->setColor(PHUITagView::COLOR_INDIGO)
|
||||||
|
->setSlimShady(true);
|
||||||
|
|
||||||
|
$item = id(new PHUIObjectItemView())
|
||||||
|
->setHeader($commit_desc)
|
||||||
|
->setHref($commit_link)
|
||||||
|
->setDisabled($commit->isUnreachable())
|
||||||
|
->setImageURI($author_image_uri)
|
||||||
|
->addByline(pht('Author: %s', $author_name))
|
||||||
|
->addIcon('none', $committed)
|
||||||
|
->addAttribute($commit_tag);
|
||||||
|
|
||||||
|
$list->addItem($item);
|
||||||
|
$cur_date = $new_date;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$view) {
|
||||||
|
$list = id(new PHUIObjectItemListView())
|
||||||
|
->setFlush(true)
|
||||||
|
->setNoDataString($this->noDataString);
|
||||||
|
|
||||||
|
$view = id(new PHUIObjectBoxView())
|
||||||
|
->setHeaderText(pht('Recent Commits'))
|
||||||
|
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
|
||||||
|
->setObjectList($list);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $view;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -56,22 +56,15 @@ final class PhabricatorPeopleProfileCommitsController
|
|||||||
$commits = id(new DiffusionCommitQuery())
|
$commits = id(new DiffusionCommitQuery())
|
||||||
->setViewer($viewer)
|
->setViewer($viewer)
|
||||||
->withAuthorPHIDs(array($user->getPHID()))
|
->withAuthorPHIDs(array($user->getPHID()))
|
||||||
->needAuditRequests(true)
|
|
||||||
->needCommitData(true)
|
->needCommitData(true)
|
||||||
->needDrafts(true)
|
|
||||||
->setLimit(100)
|
->setLimit(100)
|
||||||
->execute();
|
->execute();
|
||||||
|
|
||||||
$list = id(new PhabricatorAuditListView())
|
$list = id(new DiffusionHistoryListView())
|
||||||
->setViewer($viewer)
|
->setViewer($viewer)
|
||||||
->setCommits($commits)
|
->setCommits($commits)
|
||||||
->setNoDataString(pht('No recent commits.'));
|
->setNoDataString(pht('No recent commits.'));
|
||||||
|
|
||||||
$view = id(new PHUIObjectBoxView())
|
return $list;
|
||||||
->setHeaderText(pht('Recent Commits'))
|
|
||||||
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
|
|
||||||
->appendChild($list);
|
|
||||||
|
|
||||||
return $view;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
12
webroot/rsrc/css/application/diffusion/diffusion-history.css
Normal file
12
webroot/rsrc/css/application/diffusion/diffusion-history.css
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
/**
|
||||||
|
* @provides diffusion-history-css
|
||||||
|
*/
|
||||||
|
|
||||||
|
.diffusion-history-list .phui-oi-link {
|
||||||
|
color: {$darkbluetext};
|
||||||
|
font-size: {$biggerfontsize};
|
||||||
|
}
|
||||||
|
|
||||||
|
.diffusion-history-list .phui-oi-attribute .phui-tag-core {
|
||||||
|
border-color: transparent;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user