Skip to content

Commit 114ed6c

Browse files
author
epriestley
committedJan 29, 2013
DarkConsole: fix rendering, move request log, load over ajax
Summary: This accomplishes three major goals: # Fixes phutil_render_tag -> phutil_tag callsites in DarkConsole. # Moves the Ajax request log to a new panel on the left. This panel (and the tabs panel) get scrollbars when they get large, instead of making the page constantly scroll down. # Loads the panel content over ajax, instead of dumping it into the page body / ajax response body. I've been planning to do this for about 3 years, which is why the plugins are architected the way they are. This should make debugging easier by making response bodies not be 50%+ darkconsole stuff. Additionally, load the plugins dynamically (the old method predates library maps and PhutilSymbolLoader). Test Plan: {F30675} - Switched between requests and tabs, reloaded page, saw same tab. - Used "analyze queries", "profile page", triggered errors. - Verified page does not load anything by default if dark console is closed with Charles. - Generally banged on it a bit. Reviewers: vrana, btrahan, chad Reviewed By: vrana CC: aran Maniphest Tasks: T2432 Differential Revision: https://secure.phabricator.com/D4692
1 parent 9a0ae63 commit 114ed6c

18 files changed

+559
-480
lines changed
 

‎scripts/celerity_mapper.php

-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
'javelin-behavior-maniphest-subpriority-editor',
167167
),
168168
'darkconsole.pkg.js' => array(
169-
'javelin-behavior-dark-console-ajax',
170169
'javelin-behavior-dark-console',
171170
'javelin-behavior-error-log',
172171
),

‎src/__celerity_resource_map__.php

+74-81
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@
4242
'disk' => '/rsrc/image/credit_cards.png',
4343
'type' => 'png',
4444
),
45+
'/rsrc/image/darkload.gif' =>
46+
array(
47+
'hash' => '3a52cb7145d6e70f461fed21273117f2',
48+
'uri' => '/res/3a52cb71/rsrc/image/darkload.gif',
49+
'disk' => '/rsrc/image/darkload.gif',
50+
'type' => 'gif',
51+
),
4552
'/rsrc/image/divot.png' =>
4653
array(
4754
'hash' => '3be267bd11ea375bf68e808893718e0e',
@@ -598,7 +605,7 @@
598605
),
599606
'aphront-dark-console-css' =>
600607
array(
601-
'uri' => '/res/1e1f78d4/rsrc/css/aphront/dark-console.css',
608+
'uri' => '/res/63841304/rsrc/css/aphront/dark-console.css',
602609
'type' => 'css',
603610
'requires' =>
604611
array(
@@ -1057,7 +1064,7 @@
10571064
),
10581065
'javelin-behavior-aphront-form-disable-on-submit' =>
10591066
array(
1060-
'uri' => '/res/ca54e8b9/rsrc/js/application/core/behavior-form.js',
1067+
'uri' => '/res/70fd43fd/rsrc/js/application/core/behavior-form.js',
10611068
'type' => 'js',
10621069
'requires' =>
10631070
array(
@@ -1145,7 +1152,7 @@
11451152
),
11461153
'javelin-behavior-dark-console' =>
11471154
array(
1148-
'uri' => '/res/aa6f8a71/rsrc/js/application/core/behavior-dark-console.js',
1155+
'uri' => '/res/c3e8a3d8/rsrc/js/application/core/behavior-dark-console.js',
11491156
'type' => 'js',
11501157
'requires' =>
11511158
array(
@@ -1155,21 +1162,9 @@
11551162
3 => 'javelin-dom',
11561163
4 => 'javelin-request',
11571164
5 => 'phabricator-keyboard-shortcut',
1158-
6 => 'javelin-behavior-dark-console-ajax',
11591165
),
11601166
'disk' => '/rsrc/js/application/core/behavior-dark-console.js',
11611167
),
1162-
'javelin-behavior-dark-console-ajax' =>
1163-
array(
1164-
'uri' => '/res/ac3ab63a/rsrc/js/application/core/behavior-dark-console-ajax.js',
1165-
'type' => 'js',
1166-
'requires' =>
1167-
array(
1168-
0 => 'javelin-behavior',
1169-
1 => 'javelin-dom',
1170-
),
1171-
'disk' => '/rsrc/js/application/core/behavior-dark-console-ajax.js',
1172-
),
11731168
'javelin-behavior-device' =>
11741169
array(
11751170
'uri' => '/res/a10b851b/rsrc/js/application/core/behavior-device.js',
@@ -1493,7 +1488,7 @@
14931488
),
14941489
'javelin-behavior-lightbox-attachments' =>
14951490
array(
1496-
'uri' => '/res/5efba371/rsrc/js/application/core/behavior-lightbox-attachments.js',
1491+
'uri' => '/res/08f5e202/rsrc/js/application/core/behavior-lightbox-attachments.js',
14971492
'type' => 'js',
14981493
'requires' =>
14991494
array(
@@ -1986,7 +1981,7 @@
19861981
),
19871982
'javelin-dom' =>
19881983
array(
1989-
'uri' => '/res/2826c532/rsrc/js/javelin/lib/DOM.js',
1984+
'uri' => '/res/459f3c08/rsrc/js/javelin/lib/DOM.js',
19901985
'type' => 'js',
19911986
'requires' =>
19921987
array(
@@ -3393,7 +3388,7 @@
33933388
'uri' => '/res/pkg/023adc14/core.pkg.css',
33943389
'type' => 'css',
33953390
),
3396-
'66dca903' =>
3391+
'b3c1b6e7' =>
33973392
array(
33983393
'name' => 'core.pkg.js',
33993394
'symbols' =>
@@ -3432,19 +3427,18 @@
34323427
31 => 'javelin-behavior-global-drag-and-drop',
34333428
32 => 'javelin-behavior-phabricator-home-reveal-tiles',
34343429
),
3435-
'uri' => '/res/pkg/66dca903/core.pkg.js',
3430+
'uri' => '/res/pkg/b3c1b6e7/core.pkg.js',
34363431
'type' => 'js',
34373432
),
3438-
'8edbada5' =>
3433+
'032118cf' =>
34393434
array(
34403435
'name' => 'darkconsole.pkg.js',
34413436
'symbols' =>
34423437
array(
3443-
0 => 'javelin-behavior-dark-console-ajax',
3444-
1 => 'javelin-behavior-dark-console',
3445-
2 => 'javelin-behavior-error-log',
3438+
0 => 'javelin-behavior-dark-console',
3439+
1 => 'javelin-behavior-error-log',
34463440
),
3447-
'uri' => '/res/pkg/8edbada5/darkconsole.pkg.js',
3441+
'uri' => '/res/pkg/032118cf/darkconsole.pkg.js',
34483442
'type' => 'js',
34493443
),
34503444
'ec01d039' =>
@@ -3521,7 +3515,7 @@
35213515
'uri' => '/res/pkg/f96657b8/diffusion.pkg.js',
35223516
'type' => 'js',
35233517
),
3524-
'fbeded59' =>
3518+
'1c6f020b' =>
35253519
array(
35263520
'name' => 'javelin.pkg.js',
35273521
'symbols' =>
@@ -3546,7 +3540,7 @@
35463540
17 => 'javelin-typeahead-ondemand-source',
35473541
18 => 'javelin-tokenizer',
35483542
),
3549-
'uri' => '/res/pkg/fbeded59/javelin.pkg.js',
3543+
'uri' => '/res/pkg/1c6f020b/javelin.pkg.js',
35503544
'type' => 'js',
35513545
),
35523546
'e30a3fa8' =>
@@ -3608,18 +3602,17 @@
36083602
'diffusion-icons-css' => 'c8ce2d88',
36093603
'global-drag-and-drop-css' => '023adc14',
36103604
'inline-comment-summary-css' => 'ec01d039',
3611-
'javelin-aphlict' => '66dca903',
3612-
'javelin-behavior' => 'fbeded59',
3613-
'javelin-behavior-aphlict-dropdown' => '66dca903',
3614-
'javelin-behavior-aphlict-listen' => '66dca903',
3615-
'javelin-behavior-aphront-basic-tokenizer' => '66dca903',
3605+
'javelin-aphlict' => 'b3c1b6e7',
3606+
'javelin-behavior' => '1c6f020b',
3607+
'javelin-behavior-aphlict-dropdown' => 'b3c1b6e7',
3608+
'javelin-behavior-aphlict-listen' => 'b3c1b6e7',
3609+
'javelin-behavior-aphront-basic-tokenizer' => 'b3c1b6e7',
36163610
'javelin-behavior-aphront-drag-and-drop' => '310cd201',
36173611
'javelin-behavior-aphront-drag-and-drop-textarea' => '310cd201',
3618-
'javelin-behavior-aphront-form-disable-on-submit' => '66dca903',
3612+
'javelin-behavior-aphront-form-disable-on-submit' => 'b3c1b6e7',
36193613
'javelin-behavior-audit-preview' => 'f96657b8',
3620-
'javelin-behavior-dark-console' => '8edbada5',
3621-
'javelin-behavior-dark-console-ajax' => '8edbada5',
3622-
'javelin-behavior-device' => '66dca903',
3614+
'javelin-behavior-dark-console' => '032118cf',
3615+
'javelin-behavior-device' => 'b3c1b6e7',
36233616
'javelin-behavior-differential-accept-with-errors' => '310cd201',
36243617
'javelin-behavior-differential-add-reviewers-and-ccs' => '310cd201',
36253618
'javelin-behavior-differential-comment-jump' => '310cd201',
@@ -3634,84 +3627,84 @@
36343627
'javelin-behavior-differential-user-select' => '310cd201',
36353628
'javelin-behavior-diffusion-commit-graph' => 'f96657b8',
36363629
'javelin-behavior-diffusion-pull-lastmodified' => 'f96657b8',
3637-
'javelin-behavior-error-log' => '8edbada5',
3638-
'javelin-behavior-global-drag-and-drop' => '66dca903',
3639-
'javelin-behavior-konami' => '66dca903',
3640-
'javelin-behavior-lightbox-attachments' => '66dca903',
3630+
'javelin-behavior-error-log' => '032118cf',
3631+
'javelin-behavior-global-drag-and-drop' => 'b3c1b6e7',
3632+
'javelin-behavior-konami' => 'b3c1b6e7',
3633+
'javelin-behavior-lightbox-attachments' => 'b3c1b6e7',
36413634
'javelin-behavior-maniphest-batch-selector' => '7707de41',
36423635
'javelin-behavior-maniphest-subpriority-editor' => '7707de41',
36433636
'javelin-behavior-maniphest-transaction-controls' => '7707de41',
36443637
'javelin-behavior-maniphest-transaction-expand' => '7707de41',
36453638
'javelin-behavior-maniphest-transaction-preview' => '7707de41',
3646-
'javelin-behavior-phabricator-active-nav' => '66dca903',
3647-
'javelin-behavior-phabricator-autofocus' => '66dca903',
3648-
'javelin-behavior-phabricator-home-reveal-tiles' => '66dca903',
3649-
'javelin-behavior-phabricator-keyboard-shortcuts' => '66dca903',
3650-
'javelin-behavior-phabricator-nav' => '66dca903',
3639+
'javelin-behavior-phabricator-active-nav' => 'b3c1b6e7',
3640+
'javelin-behavior-phabricator-autofocus' => 'b3c1b6e7',
3641+
'javelin-behavior-phabricator-home-reveal-tiles' => 'b3c1b6e7',
3642+
'javelin-behavior-phabricator-keyboard-shortcuts' => 'b3c1b6e7',
3643+
'javelin-behavior-phabricator-nav' => 'b3c1b6e7',
36513644
'javelin-behavior-phabricator-object-selector' => '310cd201',
3652-
'javelin-behavior-phabricator-oncopy' => '66dca903',
3653-
'javelin-behavior-phabricator-remarkup-assist' => '66dca903',
3654-
'javelin-behavior-phabricator-search-typeahead' => '66dca903',
3655-
'javelin-behavior-phabricator-tooltips' => '66dca903',
3656-
'javelin-behavior-phabricator-watch-anchor' => '66dca903',
3657-
'javelin-behavior-refresh-csrf' => '66dca903',
3645+
'javelin-behavior-phabricator-oncopy' => 'b3c1b6e7',
3646+
'javelin-behavior-phabricator-remarkup-assist' => 'b3c1b6e7',
3647+
'javelin-behavior-phabricator-search-typeahead' => 'b3c1b6e7',
3648+
'javelin-behavior-phabricator-tooltips' => 'b3c1b6e7',
3649+
'javelin-behavior-phabricator-watch-anchor' => 'b3c1b6e7',
3650+
'javelin-behavior-refresh-csrf' => 'b3c1b6e7',
36583651
'javelin-behavior-repository-crossreference' => '310cd201',
3659-
'javelin-behavior-toggle-class' => '66dca903',
3660-
'javelin-behavior-workflow' => '66dca903',
3661-
'javelin-dom' => 'fbeded59',
3662-
'javelin-event' => 'fbeded59',
3663-
'javelin-install' => 'fbeded59',
3664-
'javelin-json' => 'fbeded59',
3665-
'javelin-mask' => 'fbeded59',
3666-
'javelin-request' => 'fbeded59',
3667-
'javelin-resource' => 'fbeded59',
3668-
'javelin-stratcom' => 'fbeded59',
3669-
'javelin-tokenizer' => 'fbeded59',
3670-
'javelin-typeahead' => 'fbeded59',
3671-
'javelin-typeahead-normalizer' => 'fbeded59',
3672-
'javelin-typeahead-ondemand-source' => 'fbeded59',
3673-
'javelin-typeahead-preloaded-source' => 'fbeded59',
3674-
'javelin-typeahead-source' => 'fbeded59',
3675-
'javelin-uri' => 'fbeded59',
3676-
'javelin-util' => 'fbeded59',
3677-
'javelin-vector' => 'fbeded59',
3678-
'javelin-workflow' => 'fbeded59',
3652+
'javelin-behavior-toggle-class' => 'b3c1b6e7',
3653+
'javelin-behavior-workflow' => 'b3c1b6e7',
3654+
'javelin-dom' => '1c6f020b',
3655+
'javelin-event' => '1c6f020b',
3656+
'javelin-install' => '1c6f020b',
3657+
'javelin-json' => '1c6f020b',
3658+
'javelin-mask' => '1c6f020b',
3659+
'javelin-request' => '1c6f020b',
3660+
'javelin-resource' => '1c6f020b',
3661+
'javelin-stratcom' => '1c6f020b',
3662+
'javelin-tokenizer' => '1c6f020b',
3663+
'javelin-typeahead' => '1c6f020b',
3664+
'javelin-typeahead-normalizer' => '1c6f020b',
3665+
'javelin-typeahead-ondemand-source' => '1c6f020b',
3666+
'javelin-typeahead-preloaded-source' => '1c6f020b',
3667+
'javelin-typeahead-source' => '1c6f020b',
3668+
'javelin-uri' => '1c6f020b',
3669+
'javelin-util' => '1c6f020b',
3670+
'javelin-vector' => '1c6f020b',
3671+
'javelin-workflow' => '1c6f020b',
36793672
'lightbox-attachment-css' => '023adc14',
36803673
'maniphest-task-summary-css' => 'e30a3fa8',
36813674
'maniphest-transaction-detail-css' => 'e30a3fa8',
3682-
'phabricator-busy' => '66dca903',
3675+
'phabricator-busy' => 'b3c1b6e7',
36833676
'phabricator-content-source-view-css' => 'ec01d039',
36843677
'phabricator-core-buttons-css' => '023adc14',
36853678
'phabricator-core-css' => '023adc14',
36863679
'phabricator-crumbs-view-css' => '023adc14',
36873680
'phabricator-directory-css' => '023adc14',
36883681
'phabricator-drag-and-drop-file-upload' => '310cd201',
3689-
'phabricator-dropdown-menu' => '66dca903',
3690-
'phabricator-file-upload' => '66dca903',
3682+
'phabricator-dropdown-menu' => 'b3c1b6e7',
3683+
'phabricator-file-upload' => 'b3c1b6e7',
36913684
'phabricator-filetree-view-css' => '023adc14',
36923685
'phabricator-flag-css' => '023adc14',
36933686
'phabricator-form-view-css' => '023adc14',
36943687
'phabricator-header-view-css' => '023adc14',
36953688
'phabricator-jump-nav' => '023adc14',
3696-
'phabricator-keyboard-shortcut' => '66dca903',
3697-
'phabricator-keyboard-shortcut-manager' => '66dca903',
3689+
'phabricator-keyboard-shortcut' => 'b3c1b6e7',
3690+
'phabricator-keyboard-shortcut-manager' => 'b3c1b6e7',
36983691
'phabricator-main-menu-view' => '023adc14',
3699-
'phabricator-menu-item' => '66dca903',
3692+
'phabricator-menu-item' => 'b3c1b6e7',
37003693
'phabricator-nav-view-css' => '023adc14',
3701-
'phabricator-notification' => '66dca903',
3694+
'phabricator-notification' => 'b3c1b6e7',
37023695
'phabricator-notification-css' => '023adc14',
37033696
'phabricator-notification-menu-css' => '023adc14',
37043697
'phabricator-object-item-list-view-css' => '023adc14',
37053698
'phabricator-object-selector-css' => 'ec01d039',
3706-
'phabricator-paste-file-upload' => '66dca903',
3707-
'phabricator-prefab' => '66dca903',
3699+
'phabricator-paste-file-upload' => 'b3c1b6e7',
3700+
'phabricator-prefab' => 'b3c1b6e7',
37083701
'phabricator-project-tag-css' => 'e30a3fa8',
37093702
'phabricator-remarkup-css' => '023adc14',
37103703
'phabricator-shaped-request' => '310cd201',
37113704
'phabricator-side-menu-view-css' => '023adc14',
37123705
'phabricator-standard-page-view' => '023adc14',
3713-
'phabricator-textareautils' => '66dca903',
3714-
'phabricator-tooltip' => '66dca903',
3706+
'phabricator-textareautils' => 'b3c1b6e7',
3707+
'phabricator-tooltip' => 'b3c1b6e7',
37153708
'phabricator-transaction-view-css' => '023adc14',
37163709
'phabricator-zindex-css' => '023adc14',
37173710
'sprite-apps-large-css' => '023adc14',

‎src/__phutil_library_map__.php

+2
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@
218218
'ConpherenceViewController' => 'applications/conpherence/controller/ConpherenceViewController.php',
219219
'DarkConsoleController' => 'aphront/console/DarkConsoleController.php',
220220
'DarkConsoleCore' => 'aphront/console/DarkConsoleCore.php',
221+
'DarkConsoleDataController' => 'aphront/console/DarkConsoleDataController.php',
221222
'DarkConsoleErrorLogPlugin' => 'aphront/console/plugin/DarkConsoleErrorLogPlugin.php',
222223
'DarkConsoleErrorLogPluginAPI' => 'aphront/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php',
223224
'DarkConsoleEventPlugin' => 'aphront/console/plugin/DarkConsoleEventPlugin.php',
@@ -1693,6 +1694,7 @@
16931694
'ConpherenceUpdateController' => 'ConpherenceController',
16941695
'ConpherenceViewController' => 'ConpherenceController',
16951696
'DarkConsoleController' => 'PhabricatorController',
1697+
'DarkConsoleDataController' => 'PhabricatorController',
16961698
'DarkConsoleErrorLogPlugin' => 'DarkConsolePlugin',
16971699
'DarkConsoleEventPlugin' => 'DarkConsolePlugin',
16981700
'DarkConsoleEventPluginAPI' => 'PhutilEventListener',

‎src/aphront/configuration/AphrontDefaultApplicationConfiguration.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ public function getURIMap() {
7373
'profile/(?P<phid>[^/]+)/' => 'PhabricatorXHProfProfileController',
7474
),
7575

76-
'/~/' => 'DarkConsoleController',
76+
'/~/' => array(
77+
'' => 'DarkConsoleController',
78+
'data/(?P<key>[^/]+)/' => 'DarkConsoleDataController',
79+
),
7780

7881
'/search/' => array(
7982
'' => 'PhabricatorSearchController',

0 commit comments

Comments
 (0)
Failed to load comments.