Skip to content

Commit ac8e113

Browse files
author
Chad Little
committed
Remove 'full-display' setting from Conpherence, spruce up search results
Summary: This removes 'full-display', 'minimal-display' from Conpherence, which I recall was because we had 2 UIs for column and regular chat. I'm also tossing in slightly nicer search results, with a link to the actual message and the full date shown for context. Test Plan: Post a message in mobile, tablet, full conpherence, and in durable column. Clean up UI in durable column. Do a search in Full UI, click on result date, get taken to the message... usually. My test data is a little wonky, but I think this works most of the time. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D16710
1 parent dd25b2b commit ac8e113

File tree

12 files changed

+124
-179
lines changed

12 files changed

+124
-179
lines changed

resources/celerity/map.php

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
*/
88
return array(
99
'names' => array(
10-
'conpherence.pkg.css' => 'f934296b',
10+
'conpherence.pkg.css' => '49b8aaac',
1111
'conpherence.pkg.js' => 'cbe4d9be',
1212
'core.pkg.css' => 'b99bbf5e',
13-
'core.pkg.js' => '30185d95',
13+
'core.pkg.js' => '3eb7abf7',
1414
'darkconsole.pkg.js' => 'e7393ebb',
1515
'differential.pkg.css' => 'e1d704ce',
1616
'differential.pkg.js' => '634399e9',
@@ -46,10 +46,10 @@
4646
'rsrc/css/application/config/config-template.css' => '8f18fa41',
4747
'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
4848
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
49-
'rsrc/css/application/conpherence/durable-column.css' => '44bcaa19',
49+
'rsrc/css/application/conpherence/durable-column.css' => 'd82e130c',
5050
'rsrc/css/application/conpherence/header-pane.css' => 'e8acbd37',
5151
'rsrc/css/application/conpherence/menu.css' => '4f51db5a',
52-
'rsrc/css/application/conpherence/message-pane.css' => '7a94bf5e',
52+
'rsrc/css/application/conpherence/message-pane.css' => 'b80f1675',
5353
'rsrc/css/application/conpherence/notification.css' => '965db05b',
5454
'rsrc/css/application/conpherence/participant-pane.css' => '7bba0b56',
5555
'rsrc/css/application/conpherence/transaction.css' => '85129c68',
@@ -435,9 +435,9 @@
435435
'rsrc/js/application/calendar/behavior-month-view.js' => 'fe33e256',
436436
'rsrc/js/application/calendar/behavior-recurring-edit.js' => '5f1c4d5f',
437437
'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408',
438-
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2',
439-
'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '3e137827',
440-
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c5238acb',
438+
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '358c717b',
439+
'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '9bbf3762',
440+
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'aa3bd034',
441441
'rsrc/js/application/conpherence/behavior-menu.js' => '07928ca3',
442442
'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8',
443443
'rsrc/js/application/conpherence/behavior-pontificate.js' => 'f2e58483',
@@ -616,13 +616,13 @@
616616
'conduit-api-css' => '7bc725c4',
617617
'config-options-css' => '0ede4c9b',
618618
'config-page-css' => '8798e14f',
619-
'conpherence-durable-column-view' => '44bcaa19',
619+
'conpherence-durable-column-view' => 'd82e130c',
620620
'conpherence-header-pane-css' => 'e8acbd37',
621621
'conpherence-menu-css' => '4f51db5a',
622-
'conpherence-message-pane-css' => '7a94bf5e',
622+
'conpherence-message-pane-css' => 'b80f1675',
623623
'conpherence-notification-css' => '965db05b',
624624
'conpherence-participant-pane-css' => '7bba0b56',
625-
'conpherence-thread-manager' => '01774ab2',
625+
'conpherence-thread-manager' => '358c717b',
626626
'conpherence-transaction-css' => '85129c68',
627627
'd3' => 'a11a5ff2',
628628
'differential-changeset-view-css' => '9ef7d354',
@@ -666,7 +666,7 @@
666666
'javelin-behavior-conpherence-menu' => '07928ca3',
667667
'javelin-behavior-conpherence-participant-pane' => '8604caa8',
668668
'javelin-behavior-conpherence-pontificate' => 'f2e58483',
669-
'javelin-behavior-conpherence-search' => '3e137827',
669+
'javelin-behavior-conpherence-search' => '9bbf3762',
670670
'javelin-behavior-countdown-timer' => 'e4cc26b3',
671671
'javelin-behavior-dark-console' => 'f411b6ae',
672672
'javelin-behavior-dashboard-async-panel' => '469c0d9e',
@@ -695,7 +695,7 @@
695695
'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
696696
'javelin-behavior-doorkeeper-tag' => 'e5822781',
697697
'javelin-behavior-drydock-live-operation-status' => '901935ef',
698-
'javelin-behavior-durable-column' => 'c5238acb',
698+
'javelin-behavior-durable-column' => 'aa3bd034',
699699
'javelin-behavior-editengine-reorder-configs' => 'd7a74243',
700700
'javelin-behavior-editengine-reorder-fields' => 'b59e1e96',
701701
'javelin-behavior-error-log' => '6882e80a',
@@ -974,17 +974,6 @@
974974
'javelin-request',
975975
'javelin-typeahead-source',
976976
),
977-
'01774ab2' => array(
978-
'javelin-dom',
979-
'javelin-util',
980-
'javelin-stratcom',
981-
'javelin-install',
982-
'javelin-aphlict',
983-
'javelin-workflow',
984-
'javelin-router',
985-
'javelin-behavior-device',
986-
'javelin-vector',
987-
),
988977
'019f36c4' => array(
989978
'javelin-behavior',
990979
'javelin-dom',
@@ -1211,6 +1200,17 @@
12111200
'javelin-dom',
12121201
'javelin-workflow',
12131202
),
1203+
'358c717b' => array(
1204+
'javelin-dom',
1205+
'javelin-util',
1206+
'javelin-stratcom',
1207+
'javelin-install',
1208+
'javelin-aphlict',
1209+
'javelin-workflow',
1210+
'javelin-router',
1211+
'javelin-behavior-device',
1212+
'javelin-vector',
1213+
),
12141214
'3ab51e2c' => array(
12151215
'javelin-behavior',
12161216
'javelin-behavior-device',
@@ -1227,13 +1227,6 @@
12271227
'javelin-util',
12281228
'javelin-uri',
12291229
),
1230-
'3e137827' => array(
1231-
'javelin-behavior',
1232-
'javelin-dom',
1233-
'javelin-util',
1234-
'javelin-workflow',
1235-
'javelin-stratcom',
1236-
),
12371230
'3f5d6dbf' => array(
12381231
'javelin-behavior',
12391232
'javelin-dom',
@@ -1759,6 +1752,13 @@
17591752
'phabricator-phtize',
17601753
'changeset-view-manager',
17611754
),
1755+
'9bbf3762' => array(
1756+
'javelin-behavior',
1757+
'javelin-dom',
1758+
'javelin-util',
1759+
'javelin-workflow',
1760+
'javelin-stratcom',
1761+
),
17621762
'9bdbbab0' => array(
17631763
'javelin-behavior',
17641764
'javelin-dom',
@@ -1839,6 +1839,16 @@
18391839
'javelin-util',
18401840
'phabricator-prefab',
18411841
),
1842+
'aa3bd034' => array(
1843+
'javelin-behavior',
1844+
'javelin-dom',
1845+
'javelin-stratcom',
1846+
'javelin-behavior-device',
1847+
'javelin-scrollbar',
1848+
'javelin-quicksand',
1849+
'phabricator-keyboard-shortcut',
1850+
'conpherence-thread-manager',
1851+
),
18421852
'ab2f381b' => array(
18431853
'javelin-request',
18441854
'javelin-behavior',
@@ -1966,16 +1976,6 @@
19661976
'javelin-install',
19671977
'javelin-dom',
19681978
),
1969-
'c5238acb' => array(
1970-
'javelin-behavior',
1971-
'javelin-dom',
1972-
'javelin-stratcom',
1973-
'javelin-behavior-device',
1974-
'javelin-scrollbar',
1975-
'javelin-quicksand',
1976-
'phabricator-keyboard-shortcut',
1977-
'conpherence-thread-manager',
1978-
),
19791979
'c587b80f' => array(
19801980
'javelin-install',
19811981
),

src/applications/conpherence/ConpherenceTransactionRenderer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ final class ConpherenceTransactionRenderer extends Phobject {
55
public static function renderTransactions(
66
PhabricatorUser $user,
77
ConpherenceThread $conpherence,
8-
$full_display = true,
98
$marker_type = 'older') {
109

1110
$transactions = $conpherence->getTransactions();
@@ -74,8 +73,7 @@ public static function renderTransactions(
7473
->setUser($user)
7574
->setConpherenceThread($conpherence)
7675
->setHandles($handles)
77-
->setMarkupEngine($engine)
78-
->setFullDisplay($full_display);
76+
->setMarkupEngine($engine);
7977

8078
foreach ($transactions as $transaction) {
8179
$collapsed = false;

src/applications/conpherence/controller/ConpherenceUpdateController.php

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,6 @@ private function renderAddPersonDialog(
335335
$request->getInt('latest_transaction_id'))
336336
->appendForm($form);
337337

338-
if ($request->getExists('minimal_display')) {
339-
$view->addHiddenInput('minimal_display', true);
340-
}
341338
return $view;
342339
}
343340

@@ -477,9 +474,6 @@ private function renderMetadataDialog(
477474
->addHiddenInput('__continue__', true)
478475
->appendChild($form);
479476

480-
if ($request->getExists('minimal_display')) {
481-
$view->addHiddenInput('minimal_display', true);
482-
}
483477
if ($request->getExists('force_ajax')) {
484478
$view->addHiddenInput('force_ajax', true);
485479
}
@@ -492,7 +486,6 @@ private function loadAndRenderUpdates(
492486
$conpherence_id,
493487
$latest_transaction_id) {
494488

495-
$minimal_display = $this->getRequest()->getExists('minimal_display');
496489
$need_transactions = false;
497490
$need_participant_cache = true;
498491
switch ($action) {
@@ -525,8 +518,7 @@ private function loadAndRenderUpdates(
525518
if ($need_transactions && $conpherence->getTransactions()) {
526519
$data = ConpherenceTransactionRenderer::renderTransactions(
527520
$user,
528-
$conpherence,
529-
!$minimal_display);
521+
$conpherence);
530522
$key = PhabricatorConpherenceColumnMinimizeSetting::SETTINGKEY;
531523
$minimized = $user->getUserSetting($key);
532524
if (!$minimized) {
@@ -547,35 +539,33 @@ private function loadAndRenderUpdates(
547539
$nav_item = null;
548540
$header = null;
549541
$people_widget = null;
550-
if (!$minimal_display) {
551-
switch ($action) {
552-
case ConpherenceUpdateActions::METADATA:
553-
$policy_objects = id(new PhabricatorPolicyQuery())
554-
->setViewer($user)
555-
->setObject($conpherence)
556-
->execute();
557-
$header = $this->buildHeaderPaneContent(
558-
$conpherence,
559-
$policy_objects);
560-
$header = hsprintf('%s', $header);
561-
$nav_item = id(new ConpherenceThreadListView())
562-
->setUser($user)
563-
->setBaseURI($this->getApplicationURI())
564-
->renderSingleThread($conpherence, $policy_objects);
565-
$nav_item = hsprintf('%s', $nav_item);
566-
break;
567-
case ConpherenceUpdateActions::ADD_PERSON:
568-
$people_widget = id(new ConpherenceParticipantView())
569-
->setUser($user)
570-
->setConpherence($conpherence)
571-
->setUpdateURI($update_uri);
572-
$people_widget = hsprintf('%s', $people_widget->render());
573-
break;
574-
case ConpherenceUpdateActions::REMOVE_PERSON:
575-
case ConpherenceUpdateActions::NOTIFICATIONS:
576-
default:
577-
break;
578-
}
542+
switch ($action) {
543+
case ConpherenceUpdateActions::METADATA:
544+
$policy_objects = id(new PhabricatorPolicyQuery())
545+
->setViewer($user)
546+
->setObject($conpherence)
547+
->execute();
548+
$header = $this->buildHeaderPaneContent(
549+
$conpherence,
550+
$policy_objects);
551+
$header = hsprintf('%s', $header);
552+
$nav_item = id(new ConpherenceThreadListView())
553+
->setUser($user)
554+
->setBaseURI($this->getApplicationURI())
555+
->renderSingleThread($conpherence, $policy_objects);
556+
$nav_item = hsprintf('%s', $nav_item);
557+
break;
558+
case ConpherenceUpdateActions::ADD_PERSON:
559+
$people_widget = id(new ConpherenceParticipantView())
560+
->setUser($user)
561+
->setConpherence($conpherence)
562+
->setUpdateURI($update_uri);
563+
$people_widget = hsprintf('%s', $people_widget->render());
564+
break;
565+
case ConpherenceUpdateActions::REMOVE_PERSON:
566+
case ConpherenceUpdateActions::NOTIFICATIONS:
567+
default:
568+
break;
579569
}
580570
$data = $conpherence->getDisplayData($user);
581571
$dropdown_query = id(new AphlictDropdownDataQuery())

src/applications/conpherence/controller/ConpherenceViewController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public function handleRequest(AphrontRequest $request) {
7373
$data = ConpherenceTransactionRenderer::renderTransactions(
7474
$user,
7575
$conpherence,
76-
$full_display = true,
7776
$marker_type);
7877
$messages = ConpherenceTransactionRenderer::renderMessagePaneContent(
7978
$data['transactions'],

src/applications/conpherence/query/ConpherenceThreadSearchEngine.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ protected function renderResultList(
199199
->setMarkupEngine($engines[$conpherence_phid])
200200
->setConpherenceThread($conpherence)
201201
->setConpherenceTransaction($xaction)
202-
->setFullDisplay(true)
202+
->setSearchResult(true)
203203
->addClass('conpherence-fulltext-result');
204204

205205
if ($message['match']) {

src/applications/conpherence/view/ConpherenceDurableColumnView.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,8 +413,7 @@ private function buildTransactions() {
413413

414414
$data = ConpherenceTransactionRenderer::renderTransactions(
415415
$this->getUser(),
416-
$conpherence,
417-
$full_display = false);
416+
$conpherence);
418417
$messages = ConpherenceTransactionRenderer::renderMessagePaneContent(
419418
$data['transactions'],
420419
$data['oldest_transaction_id'],

0 commit comments

Comments
 (0)