Page MenuHomePhabricator
Files F15430686

D16449.id39565.diff
No OneTemporary
Actions

D16449.id39565.diff
View Options

diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -7,7 +7,6 @@
private $revisions;
private $handles;
- private $highlightAge;
private $header;
private $noDataString;
private $noBox;
@@ -39,11 +38,6 @@
return $this;
}
- public function setHighlightAge($bool) {
- $this->highlightAge = $bool;
- return $this;
- }
-
public function setNoBox($box) {
$this->noBox = $box;
return $this;
diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
--- a/src/applications/home/controller/PhabricatorHomeMainController.php
+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
@@ -2,8 +2,6 @@
final class PhabricatorHomeMainController extends PhabricatorHomeController {
- private $minipanels = array();
-
public function shouldAllowPublic() {
return true;
}
@@ -13,32 +11,27 @@
}
public function handleRequest(AphrontRequest $request) {
- $user = $request->getUser();
+ $viewer = $request->getViewer();
$dashboard = PhabricatorDashboardInstall::getDashboard(
- $user,
- $user->getPHID(),
+ $viewer,
+ $viewer->getPHID(),
get_class($this->getCurrentApplication()));
if (!$dashboard) {
$dashboard = PhabricatorDashboardInstall::getDashboard(
- $user,
+ $viewer,
PhabricatorHomeApplication::DASHBOARD_DEFAULT,
get_class($this->getCurrentApplication()));
}
if ($dashboard) {
$content = id(new PhabricatorDashboardRenderingEngine())
- ->setViewer($user)
+ ->setViewer($viewer)
->setDashboard($dashboard)
->renderDashboard();
} else {
- $project_query = new PhabricatorProjectQuery();
- $project_query->setViewer($user);
- $project_query->withMemberPHIDs(array($user->getPHID()));
- $projects = $project_query->execute();
-
- $content = $this->buildMainResponse($projects);
+ $content = $this->buildMainResponse();
}
if (!$request->getURIData('only')) {
@@ -46,7 +39,7 @@
$nav->appendChild(
array(
$content,
- id(new PhabricatorGlobalUploadTargetView())->setUser($user),
+ id(new PhabricatorGlobalUploadTargetView())->setUser($viewer),
));
$content = $nav;
}
@@ -58,40 +51,22 @@
}
- private function buildMainResponse(array $projects) {
- assert_instances_of($projects, 'PhabricatorProject');
- $viewer = $this->getRequest()->getUser();
+ private function buildMainResponse() {
+ require_celerity_resource('phabricator-dashboard-css');
+ $viewer = $this->getViewer();
$has_maniphest = PhabricatorApplication::isClassInstalledForViewer(
'PhabricatorManiphestApplication',
$viewer);
- $has_audit = PhabricatorApplication::isClassInstalledForViewer(
- 'PhabricatorAuditApplication',
+ $has_diffusion = PhabricatorApplication::isClassInstalledForViewer(
+ 'PhabricatorDiffusionApplication',
$viewer);
$has_differential = PhabricatorApplication::isClassInstalledForViewer(
'PhabricatorDifferentialApplication',
$viewer);
- if ($has_maniphest) {
- $unbreak_panel = $this->buildUnbreakNowPanel();
- $triage_panel = $this->buildNeedsTriagePanel($projects);
- $tasks_panel = $this->buildTasksPanel();
- } else {
- $unbreak_panel = null;
- $triage_panel = null;
- $tasks_panel = null;
- }
-
- if ($has_audit) {
- $audit_panel = $this->buildAuditPanel();
- $commit_panel = $this->buildCommitPanel();
- } else {
- $audit_panel = null;
- $commit_panel = null;
- }
-
if (PhabricatorEnv::getEnvConfig('welcome.html') !== null) {
$welcome_panel = $this->buildWelcomePanel();
} else {
@@ -104,141 +79,87 @@
$revision_panel = null;
}
- $home = phutil_tag(
+ if ($has_maniphest) {
+ $tasks_panel = $this->buildTasksPanel();
+ } else {
+ $tasks_panel = null;
+ }
+
+ if ($has_diffusion) {
+ $repository_panel = $this->buildRepositoryPanel();
+ } else {
+ $repository_panel = null;
+ }
+
+ $feed_panel = $this->buildFeedPanel();
+
+ $dashboard = id(new AphrontMultiColumnView())
+ ->setFluidlayout(true)
+ ->setGutter(AphrontMultiColumnView::GUTTER_LARGE);
+
+ $main_panel = phutil_tag(
'div',
array(
'class' => 'homepage-panel',
),
array(
$welcome_panel,
- $unbreak_panel,
- $triage_panel,
$revision_panel,
$tasks_panel,
- $audit_panel,
- $commit_panel,
- $this->minipanels,
+ $repository_panel,
));
- return $home;
- }
-
- private function buildUnbreakNowPanel() {
- $unbreak_now = PhabricatorEnv::getEnvConfig(
- 'maniphest.priorities.unbreak-now');
- if (!$unbreak_now) {
- return null;
- }
+ $dashboard->addColumn($main_panel, 'thirds');
- $user = $this->getRequest()->getUser();
-
- $task_query = id(new ManiphestTaskQuery())
- ->setViewer($user)
- ->withStatuses(ManiphestTaskStatus::getOpenStatusConstants())
- ->withPriorities(array($unbreak_now))
- ->needProjectPHIDs(true)
- ->setLimit(10);
-
- $tasks = $task_query->execute();
-
- if (!$tasks) {
- return $this->renderMiniPanel(
- pht('No "Unbreak Now!" Tasks'),
- pht('Nothing appears to be critically broken right now.'));
- }
-
- $href = urisprintf(
- '/maniphest/?statuses=open()&priorities=%s#R',
- $unbreak_now);
- $title = pht('Unbreak Now!');
- $panel = new PHUIObjectBoxView();
- $panel->setHeader($this->renderSectionHeader($title, $href));
- $panel->setObjectList($this->buildTaskListView($tasks));
-
- return $panel;
- }
-
- private function buildNeedsTriagePanel(array $projects) {
- assert_instances_of($projects, 'PhabricatorProject');
-
- $needs_triage = PhabricatorEnv::getEnvConfig(
- 'maniphest.priorities.needs-triage');
- if (!$needs_triage) {
- return null;
- }
-
- $user = $this->getRequest()->getUser();
- if (!$user->isLoggedIn()) {
- return null;
- }
-
- if ($projects) {
- $task_query = id(new ManiphestTaskQuery())
- ->setViewer($user)
- ->withStatuses(ManiphestTaskStatus::getOpenStatusConstants())
- ->withPriorities(array($needs_triage))
- ->withEdgeLogicPHIDs(
- PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
- PhabricatorQueryConstraint::OPERATOR_OR,
- mpull($projects, 'getPHID'))
- ->needProjectPHIDs(true)
- ->setLimit(10);
- $tasks = $task_query->execute();
- } else {
- $tasks = array();
- }
-
- if (!$tasks) {
- return $this->renderMiniPanel(
- pht('No "Needs Triage" Tasks'),
- pht('No tasks tagged with projects you are a member of need triage.'));
- }
+ $side_panel = phutil_tag(
+ 'div',
+ array(
+ 'class' => 'homepage-side-panel',
+ ),
+ array(
+ $feed_panel,
+ ));
+ $dashboard->addColumn($side_panel, 'third');
- $title = pht('Needs Triage');
- $href = urisprintf(
- '/maniphest/?statuses=open()&priorities=%s&projects=projects(%s)#R',
- $needs_triage,
- $user->getPHID());
- $panel = new PHUIObjectBoxView();
- $panel->setHeader($this->renderSectionHeader($title, $href));
- $panel->setObjectList($this->buildTaskListView($tasks));
+ $view = id(new PHUIBoxView())
+ ->addClass('dashboard-view')
+ ->appendChild($dashboard);
- return $panel;
+ return $view;
}
private function buildRevisionPanel() {
$viewer = $this->getViewer();
- $revisions = PhabricatorDifferentialApplication::loadNeedAttentionRevisions(
- $viewer);
-
- if (!$revisions) {
- return $this->renderMiniPanel(
- pht('No Waiting Revisions'),
- pht('No revisions are waiting on you.'));
- }
-
- $title = pht('Revisions Waiting on You');
+ // TODO::Seems not really possible to set this here.
+ $bucket_key = DifferentialRevisionRequiredActionResultBucket::BUCKETKEY;
+
+ $revisions = id(new DifferentialRevisionQuery())
+ ->setViewer($viewer)
+ ->needFlags(true)
+ ->needDrafts(true)
+ ->needRelationships(true)
+ ->needReviewerStatus(true)
+ ->withResponsibleUsers(array($viewer->getPHID()))
+ ->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
+ ->setLimit(10)
+ ->execute();
+
+ $title = pht('Active Revisions');
$href = '/differential/';
- $panel = new PHUIObjectBoxView();
- $panel->setHeader($this->renderSectionHeader($title, $href));
-
- $revision_view = id(new DifferentialRevisionListView())
- ->setHighlightAge(true)
+ $panel = id(new DifferentialRevisionListView())
+ ->setViewer($viewer)
+ ->setHeader($this->renderSectionHeader($title, $href))
->setRevisions($revisions)
- ->setUser($viewer);
+ ->setNoDataString(pht('No revisions are waiting on you.'));
$phids = array_merge(
array($viewer->getPHID()),
- $revision_view->getRequiredHandlePHIDs());
- $handles = $this->loadViewerHandles($phids);
-
- $revision_view->setHandles($handles);
+ $panel->getRequiredHandlePHIDs());
- $list_view = $revision_view->render();
-
- $panel->setObjectList($list_view);
+ $handles = $this->loadViewerHandles($phids);
+ $panel->setHandles($handles);
- return $panel;
+ return $panel->render();
}
private function buildWelcomePanel() {
@@ -252,53 +173,39 @@
}
private function buildTasksPanel() {
- $user = $this->getRequest()->getUser();
- $user_phid = $user->getPHID();
+ $viewer = $this->getViewer();
+ $viewer_phid = $viewer->getPHID();
- $task_query = id(new ManiphestTaskQuery())
- ->setViewer($user)
+ $tasks = id(new ManiphestTaskQuery())
+ ->setViewer($viewer)
->withStatuses(ManiphestTaskStatus::getOpenStatusConstants())
->setGroupBy(ManiphestTaskQuery::GROUP_PRIORITY)
- ->withOwners(array($user_phid))
+ ->withOwners(array($viewer_phid))
->needProjectPHIDs(true)
- ->setLimit(10);
+ ->setLimit(10)
+ ->execute();
- $tasks = $task_query->execute();
+ $phids = array_merge(
+ array_filter(mpull($tasks, 'getOwnerPHID')),
+ array_mergev(mpull($tasks, 'getProjectPHIDs')));
+ $handles = $this->loadViewerHandles($phids);
- if (!$tasks) {
- return $this->renderMiniPanel(
- pht('No Assigned Tasks'),
- pht('You have no assigned tasks.'));
- }
+ $task_list = id(new ManiphestTaskListView())
+ ->setTasks($tasks)
+ ->setUser($viewer)
+ ->setHandles($handles)
+ ->setNoDataString(pht('You have no assigned tasks.'));
$title = pht('Assigned Tasks');
$href = '/maniphest/query/assigned/';
$panel = new PHUIObjectBoxView();
$panel->setHeader($this->renderSectionHeader($title, $href));
- $panel->setObjectList($this->buildTaskListView($tasks));
+ $panel->setObjectList($task_list);
return $panel;
}
- private function buildTaskListView(array $tasks) {
- assert_instances_of($tasks, 'ManiphestTask');
- $user = $this->getRequest()->getUser();
-
- $phids = array_merge(
- array_filter(mpull($tasks, 'getOwnerPHID')),
- array_mergev(mpull($tasks, 'getProjectPHIDs')));
-
- $handles = $this->loadViewerHandles($phids);
-
- $view = new ManiphestTaskListView();
- $view->setTasks($tasks);
- $view->setUser($user);
- $view->setHandles($handles);
-
- return $view;
- }
-
private function renderSectionHeader($title, $href) {
$title = phutil_tag(
'a',
@@ -315,95 +222,76 @@
return $header;
}
- private function renderMiniPanel($title, $body) {
- $panel = new PHUIInfoView();
- $panel->setSeverity(PHUIInfoView::SEVERITY_NODATA);
- $panel->appendChild(
- phutil_tag(
- 'p',
- array(
- ),
- array(
- phutil_tag('strong', array(), $title.': '),
- $body,
- )));
- $this->minipanels[] = $panel;
- }
-
- public function buildAuditPanel() {
- $request = $this->getRequest();
- $user = $request->getUser();
-
- $phids = PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);
-
- $query = id(new DiffusionCommitQuery())
- ->setViewer($user)
- ->withNeedsAuditByPHIDs($phids)
- ->withAuditStatus(DiffusionCommitQuery::AUDIT_STATUS_OPEN)
- ->needAuditRequests(true)
- ->needCommitData(true)
- ->setLimit(10);
-
- $commits = $query->execute();
-
- if (!$commits) {
- return $this->renderMinipanel(
- pht('No Audits'),
- pht('No commits are waiting for you to audit them.'));
- }
+ public function buildFeedPanel() {
+ $viewer = $this->getViewer();
+ $stories = id(new PhabricatorFeedQuery())
+ ->setViewer($viewer)
+ ->setLimit(25)
+ ->execute();
- $view = id(new PhabricatorAuditListView())
- ->setCommits($commits)
- ->setUser($user);
+ $builder = id(new PhabricatorFeedBuilder($stories))
+ ->setUser($viewer)
+ ->setShowHovercards(false)
+ ->buildView();
- $phids = $view->getRequiredHandlePHIDs();
- $handles = $this->loadViewerHandles($phids);
- $view->setHandles($handles);
+ $feed = phutil_tag_div('phabricator-feed-frame', $builder);
- $title = pht('Audits');
- $href = '/audit/';
+ $title = pht('Recent Activity');
+ $href = '/feed/';
$panel = new PHUIObjectBoxView();
$panel->setHeader($this->renderSectionHeader($title, $href));
- $panel->setObjectList($view);
+ $panel->setObjectList($feed);
return $panel;
}
- public function buildCommitPanel() {
- $request = $this->getRequest();
- $user = $request->getUser();
-
- $phids = array($user->getPHID());
-
- $query = id(new DiffusionCommitQuery())
- ->setViewer($user)
- ->withAuthorPHIDs($phids)
- ->withAuditStatus(DiffusionCommitQuery::AUDIT_STATUS_CONCERN)
- ->needCommitData(true)
- ->needAuditRequests(true)
- ->setLimit(10);
-
- $commits = $query->execute();
+ public function buildRepositoryPanel() {
+ $viewer = $this->getViewer();
- if (!$commits) {
- return $this->renderMinipanel(
- pht('No Problem Commits'),
- pht('No one has raised concerns with your commits.'));
+ $repositories = id(new PhabricatorRepositoryQuery())
+ ->setViewer($viewer)
+ ->needMostRecentCommits(true)
+ ->withStatus(PhabricatorRepositoryQuery::STATUS_OPEN)
+ ->setLimit(5)
+ ->execute();
+
+ $list = new PHUIObjectItemListView();
+ $list->setNoDataString(pht('No repositories found.'));
+ foreach ($repositories as $repository) {
+ $id = $repository->getID();
+
+ $item = id(new PHUIObjectItemView())
+ ->setUser($viewer)
+ ->setObject($repository)
+ ->setHeader($repository->getName())
+ ->setObjectName($repository->getMonogram())
+ ->setHref($repository->getURI());
+
+ $commit = $repository->getMostRecentCommit();
+ if ($commit) {
+ $commit_link = phutil_tag(
+ 'a',
+ array(
+ 'href' => $commit->getURI(),
+ ),
+ pht(
+ '%s: %s',
+ $commit->getLocalName(),
+ $commit->getSummary()));
+
+ $item->setSubhead($commit_link);
+ $item->setEpoch($commit->getEpoch());
+ } else {
+ $item->setSubhead(pht('No commits found.'));
+ }
+ $list->addItem($item);
}
- $view = id(new PhabricatorAuditListView())
- ->setCommits($commits)
- ->setUser($user);
-
- $phids = $view->getRequiredHandlePHIDs();
- $handles = $this->loadViewerHandles($phids);
- $view->setHandles($handles);
-
- $title = pht('Problem Commits');
- $href = '/audit/';
+ $title = pht('Repositories');
+ $href = '/diffusion/';
$panel = new PHUIObjectBoxView();
$panel->setHeader($this->renderSectionHeader($title, $href));
- $panel->setObjectList($view);
+ $panel->setObjectList($list);
return $panel;
}

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 25, 8:34 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7721784
Default Alt Text
D16449.id39565.diff (16 KB)

Event Timeline

Phabricator · Built by Phacility