Display bullet next to request with errors in DarkConsole.

vrana · vrana · commit 0c85a8de87b2 · 2013-04-25T18:30:13.000-07:00
Summary: I always put a `phlog()` somewhere or something fails and I have hard times figuring out which request it was. Also fix safe HTML in panel. Test Plan: Looked at DarkConsole with error on main page, AJAX request and both. Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D5784
diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
@@ -1348,7 +1348,7 @@
   ),
   'javelin-behavior-dark-console' =>
   array(
-    'uri' => '/res/635a9422/rsrc/js/core/behavior-dark-console.js',
+    'uri' => '/res/1e2c7a5e/rsrc/js/core/behavior-dark-console.js',
     'type' => 'js',
     'requires' =>
     array(
@@ -4050,15 +4050,15 @@
       'uri' => '/res/pkg/26980a1c/core.pkg.js',
       'type' => 'js',
     ),
-    '6d1d1e99' =>
+    '4ccfeb47' =>
     array(
       'name' => 'darkconsole.pkg.js',
       'symbols' =>
       array(
         0 => 'javelin-behavior-dark-console',
         1 => 'javelin-behavior-error-log',
       ),
-      'uri' => '/res/pkg/6d1d1e99/darkconsole.pkg.js',
+      'uri' => '/res/pkg/4ccfeb47/darkconsole.pkg.js',
       'type' => 'js',
     ),
     '8aaacd1b' =>
@@ -4228,7 +4228,7 @@
     'javelin-behavior-aphront-drag-and-drop-textarea' => '27c55b30',
     'javelin-behavior-aphront-form-disable-on-submit' => '26980a1c',
     'javelin-behavior-audit-preview' => 'f96657b8',
-    'javelin-behavior-dark-console' => '6d1d1e99',
+    'javelin-behavior-dark-console' => '4ccfeb47',
     'javelin-behavior-device' => '26980a1c',
     'javelin-behavior-differential-accept-with-errors' => '27c55b30',
     'javelin-behavior-differential-add-reviewers-and-ccs' => '27c55b30',
@@ -4244,7 +4244,7 @@
     'javelin-behavior-differential-user-select' => '27c55b30',
     'javelin-behavior-diffusion-commit-graph' => 'f96657b8',
     'javelin-behavior-diffusion-pull-lastmodified' => 'f96657b8',
-    'javelin-behavior-error-log' => '6d1d1e99',
+    'javelin-behavior-error-log' => '4ccfeb47',
     'javelin-behavior-global-drag-and-drop' => '26980a1c',
     'javelin-behavior-history-install' => '26980a1c',
     'javelin-behavior-konami' => '26980a1c',
diff --git a/src/aphront/console/DarkConsoleCore.php b/src/aphront/console/DarkConsoleCore.php
@@ -83,6 +83,14 @@ public function getKey(AphrontRequest $request) {
     return $key;
   }
 
+  public function getColor() {
+    foreach ($this->getPlugins() as $plugin) {
+      if ($plugin->getColor()) {
+        return $plugin->getColor();
+      }
+    }
+  }
+
   public function render(AphrontRequest $request) {
     $user = $request->getUser();
     $visible = $user ? $user->getConsoleVisible() : true;
@@ -94,6 +102,7 @@ public function render(AphrontRequest $request) {
         'class' => 'dark-console',
         'style' => $visible ? '' : 'display: none;',
         'data-console-key' => $this->getKey($request),
+        'data-console-color' => $this->getColor(),
       ),
       '');
   }
diff --git a/src/aphront/console/DarkConsoleDataController.php b/src/aphront/console/DarkConsoleDataController.php
@@ -51,7 +51,8 @@ public function processRequest() {
         $panel = $obj->renderPanel();
 
         if (!empty($_COOKIE['phsid'])) {
-          $panel = str_replace(
+          $panel = PhutilSafeHTML::applyFunction(
+            'str_replace',
             $_COOKIE['phsid'],
             '(session-key)',
             $panel);
diff --git a/src/aphront/response/AphrontAjaxResponse.php b/src/aphront/response/AphrontAjaxResponse.php
@@ -42,6 +42,7 @@ public function buildResponseString() {
         array(
           'uri'     => (string)$this->getRequest()->getRequestURI(),
           'key'     => $console->getKey($this->getRequest()),
+          'color'   => $console->getColor(),
         ));
     }
 
diff --git a/webroot/rsrc/js/core/behavior-dark-console.js b/webroot/rsrc/js/core/behavior-dark-console.js
@@ -12,6 +12,11 @@ JX.behavior('dark-console', function(config, statics) {
   var root = statics.root || setup_console();
 
   config.key = config.key || root.getAttribute('data-console-key');
+
+  if (!('color' in config)) {
+    config.color = root.getAttribute('data-console-color');
+  }
+
   add_request(config);
 
   // Do first-time setup.
@@ -71,7 +76,7 @@ JX.behavior('dark-console', function(config, statics) {
       href: '#'
     };
 
-    var link = JX.$N('a', attr, config.uri);
+    var link = JX.$N('a', attr, [get_bullet(config.color), ' ', config.uri]);
     statics.el.reqs.appendChild(link);
     statics.req.all[config.key] = link;
 
@@ -81,6 +86,14 @@ JX.behavior('dark-console', function(config, statics) {
   }
 
 
+  function get_bullet(color) {
+    if (!color) {
+      return null;
+    }
+    return JX.$N('span', {style: {color: color}}, "\u2022");
+  }
+
+
   // Select a request (on load, or when the user clicks one).
   function select_request(key) {
     var req = statics.req;
@@ -155,12 +168,7 @@ JX.behavior('dark-console', function(config, statics) {
         href: '#'
       };
 
-      var bullet = null;
-      if (tab.color) {
-        bullet = JX.$N('span', {style: {color: tab.color}}, "\u2022");
-      }
-
-      var link = JX.$N('a', attr, [bullet, ' ', tab.name]);
+      var link = JX.$N('a', attr, [get_bullet(tab.color), ' ', tab.name]);
       links.push(link);
       statics.tab.all[tab['class']] = link;
       first = first || tab['class'];

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public function buildResponseString() {`
`42`	`42`	`array(`
`43`	`43`	`'uri' => (string)$this->getRequest()->getRequestURI(),`
`44`	`44`	`'key' => $console->getKey($this->getRequest()),`
	`45`	`+ 'color' => $console->getColor(),`
`45`	`46`	`));`
`46`	`47`	`}`
`47`	`48`