Skip to content

Commit d6bce34

Browse files
author
Chad Little
committed
Update Conpherence to use EditEngine
Summary: Moves Conpherence to use EditEngine. This removes the "First Message" field, but I think that's ok until we have direct messaging of some sort, then maybe have built-ins cover that case. Test Plan: - Visit /new/ and /edit/ for creating new rooms. - Edit a room in full conpherence - Edit a room in durable column - grep for METADATA calls Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Maniphest Tasks: T11729 Differential Revision: https://secure.phabricator.com/D16677
1 parent d2baa88 commit d6bce34

12 files changed

+157
-241
lines changed

resources/celerity/map.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
'conpherence.pkg.css' => 'ff161f2d',
1111
'conpherence.pkg.js' => 'b5b51108',
1212
'core.pkg.css' => '84ce260a',
13-
'core.pkg.js' => 'fffe0122',
13+
'core.pkg.js' => '2ff7879f',
1414
'darkconsole.pkg.js' => '1f9a31bc',
1515
'differential.pkg.css' => '90b30783',
1616
'differential.pkg.js' => 'ddfeb49b',
@@ -378,7 +378,7 @@
378378
'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408',
379379
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '4d863052',
380380
'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '9bbf3762',
381-
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'aa3bd034',
381+
'rsrc/js/application/conpherence/behavior-durable-column.js' => '2ae077e1',
382382
'rsrc/js/application/conpherence/behavior-menu.js' => 'c9b99b77',
383383
'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8',
384384
'rsrc/js/application/conpherence/behavior-pontificate.js' => '55616e04',
@@ -639,7 +639,7 @@
639639
'javelin-behavior-diffusion-pull-lastmodified' => 'f01586dc',
640640
'javelin-behavior-doorkeeper-tag' => 'e5822781',
641641
'javelin-behavior-drydock-live-operation-status' => '901935ef',
642-
'javelin-behavior-durable-column' => 'aa3bd034',
642+
'javelin-behavior-durable-column' => '2ae077e1',
643643
'javelin-behavior-editengine-reorder-configs' => 'd7a74243',
644644
'javelin-behavior-editengine-reorder-fields' => 'b59e1e96',
645645
'javelin-behavior-error-log' => '6882e80a',
@@ -1095,6 +1095,16 @@
10951095
'javelin-install',
10961096
'javelin-util',
10971097
),
1098+
'2ae077e1' => array(
1099+
'javelin-behavior',
1100+
'javelin-dom',
1101+
'javelin-stratcom',
1102+
'javelin-behavior-device',
1103+
'javelin-scrollbar',
1104+
'javelin-quicksand',
1105+
'phabricator-keyboard-shortcut',
1106+
'conpherence-thread-manager',
1107+
),
10981108
'2b8de964' => array(
10991109
'javelin-install',
11001110
'javelin-util',
@@ -1793,16 +1803,6 @@
17931803
'javelin-util',
17941804
'phabricator-prefab',
17951805
),
1796-
'aa3bd034' => array(
1797-
'javelin-behavior',
1798-
'javelin-dom',
1799-
'javelin-stratcom',
1800-
'javelin-behavior-device',
1801-
'javelin-scrollbar',
1802-
'javelin-quicksand',
1803-
'phabricator-keyboard-shortcut',
1804-
'conpherence-thread-manager',
1805-
),
18061806
'ab2f381b' => array(
18071807
'javelin-request',
18081808
'javelin-behavior',

src/__phutil_library_map__.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,13 +292,13 @@
292292
'ConpherenceCreateThreadConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceCreateThreadConduitAPIMethod.php',
293293
'ConpherenceDAO' => 'applications/conpherence/storage/ConpherenceDAO.php',
294294
'ConpherenceDurableColumnView' => 'applications/conpherence/view/ConpherenceDurableColumnView.php',
295+
'ConpherenceEditEngine' => 'applications/conpherence/editor/ConpherenceEditEngine.php',
295296
'ConpherenceEditor' => 'applications/conpherence/editor/ConpherenceEditor.php',
296297
'ConpherenceFulltextQuery' => 'applications/conpherence/query/ConpherenceFulltextQuery.php',
297298
'ConpherenceIndex' => 'applications/conpherence/storage/ConpherenceIndex.php',
298299
'ConpherenceLayoutView' => 'applications/conpherence/view/ConpherenceLayoutView.php',
299300
'ConpherenceListController' => 'applications/conpherence/controller/ConpherenceListController.php',
300301
'ConpherenceMenuItemView' => 'applications/conpherence/view/ConpherenceMenuItemView.php',
301-
'ConpherenceNewRoomController' => 'applications/conpherence/controller/ConpherenceNewRoomController.php',
302302
'ConpherenceNotificationPanelController' => 'applications/conpherence/controller/ConpherenceNotificationPanelController.php',
303303
'ConpherenceParticipant' => 'applications/conpherence/storage/ConpherenceParticipant.php',
304304
'ConpherenceParticipantController' => 'applications/conpherence/controller/ConpherenceParticipantController.php',
@@ -308,6 +308,7 @@
308308
'ConpherenceQueryThreadConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php',
309309
'ConpherenceQueryTransactionConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php',
310310
'ConpherenceReplyHandler' => 'applications/conpherence/mail/ConpherenceReplyHandler.php',
311+
'ConpherenceRoomEditController' => 'applications/conpherence/controller/ConpherenceRoomEditController.php',
311312
'ConpherenceRoomListController' => 'applications/conpherence/controller/ConpherenceRoomListController.php',
312313
'ConpherenceRoomPictureController' => 'applications/conpherence/controller/ConpherenceRoomPictureController.php',
313314
'ConpherenceRoomPreferencesController' => 'applications/conpherence/controller/ConpherenceRoomPreferencesController.php',
@@ -5074,13 +5075,13 @@
50745075
'ConpherenceCreateThreadConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
50755076
'ConpherenceDAO' => 'PhabricatorLiskDAO',
50765077
'ConpherenceDurableColumnView' => 'AphrontTagView',
5078+
'ConpherenceEditEngine' => 'PhabricatorEditEngine',
50775079
'ConpherenceEditor' => 'PhabricatorApplicationTransactionEditor',
50785080
'ConpherenceFulltextQuery' => 'PhabricatorOffsetPagedQuery',
50795081
'ConpherenceIndex' => 'ConpherenceDAO',
50805082
'ConpherenceLayoutView' => 'AphrontTagView',
50815083
'ConpherenceListController' => 'ConpherenceController',
50825084
'ConpherenceMenuItemView' => 'AphrontTagView',
5083-
'ConpherenceNewRoomController' => 'ConpherenceController',
50845085
'ConpherenceNotificationPanelController' => 'ConpherenceController',
50855086
'ConpherenceParticipant' => 'ConpherenceDAO',
50865087
'ConpherenceParticipantController' => 'ConpherenceController',
@@ -5090,6 +5091,7 @@
50905091
'ConpherenceQueryThreadConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
50915092
'ConpherenceQueryTransactionConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
50925093
'ConpherenceReplyHandler' => 'PhabricatorMailReplyHandler',
5094+
'ConpherenceRoomEditController' => 'ConpherenceController',
50935095
'ConpherenceRoomListController' => 'ConpherenceController',
50945096
'ConpherenceRoomPictureController' => 'ConpherenceController',
50955097
'ConpherenceRoomPreferencesController' => 'ConpherenceController',

src/applications/conpherence/application/PhabricatorConpherenceApplication.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ public function getRoutes() {
4545
=> 'ConpherenceViewController',
4646
'columnview/'
4747
=> 'ConpherenceColumnViewController',
48-
'new/'
49-
=> 'ConpherenceNewRoomController',
48+
$this->getEditRoutePattern('new/')
49+
=> 'ConpherenceRoomEditController',
50+
$this->getEditRoutePattern('edit/')
51+
=> 'ConpherenceRoomEditController',
5052
'picture/(?P<id>[1-9]\d*)/'
5153
=> 'ConpherenceRoomPictureController',
5254
'search/(?:query/(?P<queryKey>[^/]+)/)?'

src/applications/conpherence/constants/ConpherenceUpdateActions.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
final class ConpherenceUpdateActions extends ConpherenceConstants {
44

5-
const METADATA = 'metadata';
65
const MESSAGE = 'message';
76
const DRAFT = 'draft';
87
const JOIN_ROOM = 'join_room';

src/applications/conpherence/controller/ConpherenceController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ protected function buildHeaderPaneContent(
9191

9292
$header->addActionItem(
9393
id(new PHUIIconCircleView())
94-
->setHref($this->getApplicationURI("update/{$id}/"))
94+
->setHref(
95+
$this->getApplicationURI('edit/'.$conpherence->getID()).'/')
9596
->setIcon('fa-pencil')
9697
->addClass('hide-on-device')
9798
->setColor('violet')

src/applications/conpherence/controller/ConpherenceNewRoomController.php

Lines changed: 0 additions & 117 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
final class ConpherenceRoomEditController
4+
extends ConpherenceController {
5+
6+
public function handleRequest(AphrontRequest $request) {
7+
return id(new ConpherenceEditEngine())
8+
->setController($this)
9+
->buildResponse();
10+
}
11+
}

0 commit comments

Comments
 (0)