Skip to content

Commit b5722a9

Browse files
author
epriestley
committed
Use EditEngine stacked comments in Diffusion
Summary: Ref T10978. Ref T8739. Fixes T10446. Converts Diffusion to modern comment/preview code, like Differential. Test Plan: {F2342933} Reviewers: chad Reviewed By: chad Maniphest Tasks: T10978, T10446, T8739 Differential Revision: https://secure.phabricator.com/D17183
1 parent 82c891f commit b5722a9

File tree

15 files changed

+144
-404
lines changed

15 files changed

+144
-404
lines changed

resources/celerity/map.php

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'core.pkg.js' => 'a2ead3fe',
1414
'darkconsole.pkg.js' => 'e7393ebb',
1515
'differential.pkg.css' => '9535a7e6',
16-
'differential.pkg.js' => '40b18f35',
16+
'differential.pkg.js' => 'ddfeb49b',
1717
'diffusion.pkg.css' => '91c5d3a6',
1818
'diffusion.pkg.js' => '84c8f8fd',
1919
'favicon.ico' => '30672e08',
@@ -399,13 +399,12 @@
399399
'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
400400
'rsrc/js/application/differential/ChangesetViewManager.js' => 'a2828756',
401401
'rsrc/js/application/differential/DifferentialInlineCommentEditor.js' => '2e3f9738',
402-
'rsrc/js/application/differential/behavior-add-reviewers-and-ccs.js' => 'e10f8e18',
403402
'rsrc/js/application/differential/behavior-comment-jump.js' => '4fdb476d',
404403
'rsrc/js/application/differential/behavior-comment-preview.js' => 'b064af76',
405404
'rsrc/js/application/differential/behavior-diff-radios.js' => 'e1ff79b1',
406405
'rsrc/js/application/differential/behavior-dropdown-menus.js' => '9a6b9324',
407406
'rsrc/js/application/differential/behavior-edit-inline-comments.js' => '4fbbc3e9',
408-
'rsrc/js/application/differential/behavior-keyboard-nav.js' => '2c426492',
407+
'rsrc/js/application/differential/behavior-keyboard-nav.js' => '92904457',
409408
'rsrc/js/application/differential/behavior-populate.js' => '8694b1df',
410409
'rsrc/js/application/differential/behavior-toggle-files.js' => 'ca3f91eb',
411410
'rsrc/js/application/differential/behavior-user-select.js' => 'a8d8459d',
@@ -627,13 +626,12 @@
627626
'javelin-behavior-detect-timezone' => '4c193c96',
628627
'javelin-behavior-device' => 'bb1dd507',
629628
'javelin-behavior-diff-preview-link' => '051c7832',
630-
'javelin-behavior-differential-add-reviewers-and-ccs' => 'e10f8e18',
631629
'javelin-behavior-differential-comment-jump' => '4fdb476d',
632630
'javelin-behavior-differential-diff-radios' => 'e1ff79b1',
633631
'javelin-behavior-differential-dropdown-menus' => '9a6b9324',
634632
'javelin-behavior-differential-edit-inline-comments' => '4fbbc3e9',
635633
'javelin-behavior-differential-feedback-preview' => 'b064af76',
636-
'javelin-behavior-differential-keyboard-navigation' => '2c426492',
634+
'javelin-behavior-differential-keyboard-navigation' => '92904457',
637635
'javelin-behavior-differential-populate' => '8694b1df',
638636
'javelin-behavior-differential-toggle-files' => 'ca3f91eb',
639637
'javelin-behavior-differential-user-select' => 'a8d8459d',
@@ -1144,12 +1142,6 @@
11441142
'javelin-install',
11451143
'javelin-util',
11461144
),
1147-
'2c426492' => array(
1148-
'javelin-behavior',
1149-
'javelin-dom',
1150-
'javelin-stratcom',
1151-
'phabricator-keyboard-shortcut',
1152-
),
11531145
'2caa8fb8' => array(
11541146
'javelin-install',
11551147
'javelin-event',
@@ -1651,6 +1643,12 @@
16511643
'javelin-dom',
16521644
'javelin-request',
16531645
),
1646+
92904457 => array(
1647+
'javelin-behavior',
1648+
'javelin-dom',
1649+
'javelin-stratcom',
1650+
'phabricator-keyboard-shortcut',
1651+
),
16541652
'92b9ec77' => array(
16551653
'javelin-behavior',
16561654
'javelin-stratcom',
@@ -2086,11 +2084,6 @@
20862084
'javelin-request',
20872085
'javelin-util',
20882086
),
2089-
'e10f8e18' => array(
2090-
'javelin-behavior',
2091-
'javelin-dom',
2092-
'phabricator-prefab',
2093-
),
20942087
'e1621fd5' => array(
20952088
'phui-inline-comment-view-css',
20962089
),
@@ -2463,7 +2456,6 @@
24632456
'javelin-behavior-differential-populate',
24642457
'javelin-behavior-differential-diff-radios',
24652458
'javelin-behavior-differential-comment-jump',
2466-
'javelin-behavior-differential-add-reviewers-and-ccs',
24672459
'javelin-behavior-differential-keyboard-navigation',
24682460
'javelin-behavior-aphront-drag-and-drop-textarea',
24692461
'javelin-behavior-phabricator-object-selector',

resources/celerity/packages.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@
195195
'javelin-behavior-differential-populate',
196196
'javelin-behavior-differential-diff-radios',
197197
'javelin-behavior-differential-comment-jump',
198-
'javelin-behavior-differential-add-reviewers-and-ccs',
199198
'javelin-behavior-differential-keyboard-navigation',
200199
'javelin-behavior-aphront-drag-and-drop-textarea',
201200
'javelin-behavior-phabricator-object-selector',

src/__phutil_library_map__.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,7 +1867,6 @@
18671867
'PhabricatorAsanaSubtaskHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorAsanaSubtaskHasObjectEdgeType.php',
18681868
'PhabricatorAsanaTaskHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorAsanaTaskHasObjectEdgeType.php',
18691869
'PhabricatorAuditActionConstants' => 'applications/audit/constants/PhabricatorAuditActionConstants.php',
1870-
'PhabricatorAuditAddCommentController' => 'applications/audit/controller/PhabricatorAuditAddCommentController.php',
18711870
'PhabricatorAuditApplication' => 'applications/audit/application/PhabricatorAuditApplication.php',
18721871
'PhabricatorAuditCommentEditor' => 'applications/audit/editor/PhabricatorAuditCommentEditor.php',
18731872
'PhabricatorAuditCommitStatusConstants' => 'applications/audit/constants/PhabricatorAuditCommitStatusConstants.php',
@@ -1879,7 +1878,6 @@
18791878
'PhabricatorAuditMailReceiver' => 'applications/audit/mail/PhabricatorAuditMailReceiver.php',
18801879
'PhabricatorAuditManagementDeleteWorkflow' => 'applications/audit/management/PhabricatorAuditManagementDeleteWorkflow.php',
18811880
'PhabricatorAuditManagementWorkflow' => 'applications/audit/management/PhabricatorAuditManagementWorkflow.php',
1882-
'PhabricatorAuditPreviewController' => 'applications/audit/controller/PhabricatorAuditPreviewController.php',
18831881
'PhabricatorAuditReplyHandler' => 'applications/audit/mail/PhabricatorAuditReplyHandler.php',
18841882
'PhabricatorAuditStatusConstants' => 'applications/audit/constants/PhabricatorAuditStatusConstants.php',
18851883
'PhabricatorAuditTransaction' => 'applications/audit/storage/PhabricatorAuditTransaction.php',
@@ -6757,7 +6755,6 @@
67576755
'PhabricatorAsanaSubtaskHasObjectEdgeType' => 'PhabricatorEdgeType',
67586756
'PhabricatorAsanaTaskHasObjectEdgeType' => 'PhabricatorEdgeType',
67596757
'PhabricatorAuditActionConstants' => 'Phobject',
6760-
'PhabricatorAuditAddCommentController' => 'PhabricatorAuditController',
67616758
'PhabricatorAuditApplication' => 'PhabricatorApplication',
67626759
'PhabricatorAuditCommentEditor' => 'PhabricatorEditor',
67636760
'PhabricatorAuditCommitStatusConstants' => 'Phobject',
@@ -6772,7 +6769,6 @@
67726769
'PhabricatorAuditMailReceiver' => 'PhabricatorObjectMailReceiver',
67736770
'PhabricatorAuditManagementDeleteWorkflow' => 'PhabricatorAuditManagementWorkflow',
67746771
'PhabricatorAuditManagementWorkflow' => 'PhabricatorManagementWorkflow',
6775-
'PhabricatorAuditPreviewController' => 'PhabricatorAuditController',
67766772
'PhabricatorAuditReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
67776773
'PhabricatorAuditStatusConstants' => 'Phobject',
67786774
'PhabricatorAuditTransaction' => 'PhabricatorModularTransaction',

src/applications/audit/application/PhabricatorAuditApplication.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public function getRoutes() {
3535
return array(
3636
'/audit/' => array(
3737
'(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorAuditListController',
38-
'addcomment/' => 'PhabricatorAuditAddCommentController',
39-
'preview/(?P<id>[1-9]\d*)/' => 'PhabricatorAuditPreviewController',
4038
),
4139
);
4240
}

src/applications/audit/controller/PhabricatorAuditAddCommentController.php

Lines changed: 0 additions & 90 deletions
This file was deleted.

src/applications/audit/controller/PhabricatorAuditPreviewController.php

Lines changed: 0 additions & 82 deletions
This file was deleted.

src/applications/audit/editor/PhabricatorAuditEditor.php

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ final class PhabricatorAuditEditor
1010
private $rawPatch;
1111
private $auditorPHIDs = array();
1212

13-
private $didExpandInlineState;
13+
private $didExpandInlineState = false;
1414

1515
public function addAuditReason($phid, $reason) {
1616
if (!isset($this->auditReasonMap[$phid])) {
@@ -67,6 +67,21 @@ public function getTransactionTypes() {
6767
return $types;
6868
}
6969

70+
protected function expandTransactions(
71+
PhabricatorLiskDAO $object,
72+
array $xactions) {
73+
74+
foreach ($xactions as $xaction) {
75+
switch ($xaction->getTransactionType()) {
76+
case PhabricatorTransactions::TYPE_INLINESTATE:
77+
$this->didExpandInlineState = true;
78+
break;
79+
}
80+
}
81+
82+
return parent::expandTransactions($object, $xactions);
83+
}
84+
7085
protected function transactionHasEffect(
7186
PhabricatorLiskDAO $object,
7287
PhabricatorApplicationTransaction $xaction) {

src/applications/audit/storage/PhabricatorAuditInlineComment.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ public static function loadPHID($phid) {
6868

6969
public static function loadDraftComments(
7070
PhabricatorUser $viewer,
71-
$commit_phid) {
71+
$commit_phid,
72+
$raw = false) {
7273

7374
$inlines = id(new DiffusionDiffInlineCommentQuery())
7475
->setViewer($viewer)
@@ -80,6 +81,10 @@ public static function loadDraftComments(
8081
->needReplyToComments(true)
8182
->execute();
8283

84+
if ($raw) {
85+
return $inlines;
86+
}
87+
8388
return self::buildProxies($inlines);
8489
}
8590

src/applications/audit/view/PhabricatorAuditTransactionView.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
final class PhabricatorAuditTransactionView
44
extends PhabricatorApplicationTransactionView {
55

6-
private $pathMap;
6+
private $pathMap = array();
77

88
public function setPathMap(array $path_map) {
99
$this->pathMap = $path_map;
@@ -55,12 +55,17 @@ protected function renderTransactionContent(
5555
$type_inline = PhabricatorAuditActionConstants::INLINE;
5656

5757
$group = $xaction->getTransactionGroup();
58+
5859
if ($xaction->getTransactionType() == $type_inline) {
5960
array_unshift($group, $xaction);
6061
} else {
6162
$out[] = parent::renderTransactionContent($xaction);
6263
}
6364

65+
if ($this->getIsPreview()) {
66+
return $out;
67+
}
68+
6469
if (!$group) {
6570
return $out;
6671
}

0 commit comments

Comments
 (0)