Conpherence - continue the load less quest

Summary: basically makes it so we only really load what we need from the server for any particular update action. the javascript thus then has some things deleted from it. made a spot or two ready for when the pertinent UI won't be there as well. also added a feature in javascript -- updating the document title to the current conpherence title. Ref T2867 T2399 Test Plan: played with conpherence for quite a bit. Reviewers: epriestley, chad Reviewed By: epriestley CC: aran, Korvin Maniphest Tasks: T2867 Differential Revision: https://secure.phabricator.com/D5625
2013-04-10 11:37:04 -07:00
parent 7e93e9fbe9
commit 8ede9dc061
8 changed files with 111 additions and 102 deletions
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -1282,7 +1282,7 @@ celerity_register_resource_map(array(
  ),
  'javelin-behavior-conpherence-menu' =>
  array(
-    'uri' => '/res/257f200d/rsrc/js/application/conpherence/behavior-menu.js',
+    'uri' => '/res/7021ec83/rsrc/js/application/conpherence/behavior-menu.js',
    'type' => 'js',
    'requires' =>
    array(
@@ -1299,7 +1299,7 @@ celerity_register_resource_map(array(
  ),
  'javelin-behavior-conpherence-pontificate' =>
  array(
-    'uri' => '/res/91d6418d/rsrc/js/application/conpherence/behavior-pontificate.js',
+    'uri' => '/res/b45269fc/rsrc/js/application/conpherence/behavior-pontificate.js',
    'type' => 'js',
    'requires' =>
    array(
@@ -1313,7 +1313,7 @@ celerity_register_resource_map(array(
  ),
  'javelin-behavior-conpherence-widget-pane' =>
  array(
-    'uri' => '/res/0c0fc5ef/rsrc/js/application/conpherence/behavior-widget-pane.js',
+    'uri' => '/res/32f4bf14/rsrc/js/application/conpherence/behavior-widget-pane.js',
    'type' => 'js',
    'requires' =>
    array(
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -252,6 +252,7 @@ phutil_register_library_map(array(
    'ConpherenceTransactionQuery' => 'applications/conpherence/query/ConpherenceTransactionQuery.php',
    'ConpherenceTransactionType' => 'applications/conpherence/constants/ConpherenceTransactionType.php',
    'ConpherenceTransactionView' => 'applications/conpherence/view/ConpherenceTransactionView.php',
+    'ConpherenceUpdateActions' => 'applications/conpherence/constants/ConpherenceUpdateActions.php',
    'ConpherenceUpdateController' => 'applications/conpherence/controller/ConpherenceUpdateController.php',
    'ConpherenceViewController' => 'applications/conpherence/controller/ConpherenceViewController.php',
    'ConpherenceWidgetController' => 'applications/conpherence/controller/ConpherenceWidgetController.php',
@@ -1983,6 +1984,7 @@ phutil_register_library_map(array(
    'ConpherenceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
    'ConpherenceTransactionType' => 'ConpherenceConstants',
    'ConpherenceTransactionView' => 'AphrontView',
+    'ConpherenceUpdateActions' => 'ConpherenceConstants',
    'ConpherenceUpdateController' => 'ConpherenceController',
    'ConpherenceViewController' => 'ConpherenceController',
    'ConpherenceWidgetController' => 'ConpherenceController',
--- a/src/applications/conpherence/constants/ConpherenceUpdateActions.php
+++ b/src/applications/conpherence/constants/ConpherenceUpdateActions.php
@@ -0,0 +1,10 @@
+<?php
+
+final class ConpherenceUpdateActions extends ConpherenceConstants {
+
+  const METADATA = 'metadata';
+  const MESSAGE = 'message';
+  const ADD_PERSON = 'add_person';
+  const REMOVE_PERSON = 'remove_person';
+  const NOTIFICATIONS = 'notifications';
+}
--- a/src/applications/conpherence/controller/ConpherenceUpdateController.php
+++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php
@@ -36,7 +36,7 @@ final class ConpherenceUpdateController
      ->executeOne();
    $supported_formats = PhabricatorFile::getTransformableImageFormats();

-    $action = $request->getStr('action', 'metadata');
+    $action = $request->getStr('action', ConpherenceUpdateActions::METADATA);
    $latest_transaction_id = null;
    $response_mode = 'ajax';
    $error_view = null;
@@ -54,13 +54,13 @@ final class ConpherenceUpdateController
        ->setActor($user);

      switch ($action) {
-        case 'message':
+        case ConpherenceUpdateActions::MESSAGE:
          $message = $request->getStr('text');
          $xactions = $editor->generateTransactionsFromText(
            $conpherence,
            $message);
          break;
-        case 'add_person':
+        case ConpherenceUpdateActions::ADD_PERSON:
          $xactions = array();
          $person_tokenizer = $request->getArr('add_person');
          $person_phid = reset($person_tokenizer);
@@ -71,7 +71,7 @@ final class ConpherenceUpdateController
              ->setNewValue(array('+' => array($person_phid)));
          }
          break;
-        case 'remove_person':
+        case ConpherenceUpdateActions::REMOVE_PERSON:
          $xactions = array();
          if (!$request->isContinueRequest()) {
            // do nothing; we'll display a confirmation dialogue instead
@@ -86,7 +86,7 @@ final class ConpherenceUpdateController
            $response_mode = 'go-home';
          }
          break;
-        case 'notifications':
+        case ConpherenceUpdateActions::NOTIFICATIONS:
          $notifications = $request->getStr('notifications');
          $participant = $conpherence->getParticipant($user->getPHID());
          $participant->setSettings(array('notifications' => $notifications));
@@ -97,7 +97,7 @@ final class ConpherenceUpdateController
          return id(new AphrontAjaxResponse())
            ->setContent($result);
          break;
-        case 'metadata':
+        case ConpherenceUpdateActions::METADATA:
          $xactions = array();
          $top = $request->getInt('image_y');
          $left = $request->getInt('image_x');
@@ -193,6 +193,7 @@ final class ConpherenceUpdateController
          case 'ajax':
            $latest_transaction_id = $request->getInt('latest_transaction_id');
            $content = $this->loadAndRenderUpdates(
+              $action,
              $conpherence_id,
              $latest_transaction_id);
            return id(new AphrontAjaxResponse())
@@ -219,10 +220,10 @@ final class ConpherenceUpdateController
    }

    switch ($action) {
-      case 'remove_person':
+      case ConpherenceUpdateActions::REMOVE_PERSON:
        $dialogue = $this->renderRemovePersonDialogue($conpherence);
        break;
-      case 'metadata':
+      case ConpherenceUpdateActions::METADATA:
      default:
        $dialogue = $this->renderMetadataDialogue($conpherence, $error_view);
        break;
@@ -318,39 +319,77 @@ final class ConpherenceUpdateController
  }

  private function loadAndRenderUpdates(
+    $action,
    $conpherence_id,
    $latest_transaction_id) {

+    $need_header_pics = false;
+    $need_widget_data = false;
+    $need_transactions = false;
+    switch ($action) {
+      case ConpherenceUpdateActions::METADATA:
+        $need_header_pics = true;
+        $need_transactions = true;
+        break;
+      case ConpherenceUpdateActions::MESSAGE:
+      case ConpherenceUpdateActions::ADD_PERSON:
+        $need_transactions = true;
+        $need_widget_data = true;
+        break;
+      case ConpherenceUpdateActions::REMOVE_PERSON:
+      case ConpherenceUpdateActions::NOTIFICATIONS:
+      default:
+        break;
+
+    }
    $user = $this->getRequest()->getUser();
    $conpherence = id(new ConpherenceThreadQuery())
      ->setViewer($user)
      ->setAfterMessageID($latest_transaction_id)
-      ->needHeaderPics(true)
-      ->needWidgetData(true)
-      ->needTransactions(true)
+      ->needHeaderPics($need_header_pics)
+      ->needWidgetData($need_widget_data)
+      ->needTransactions($need_transactions)
      ->withIDs(array($conpherence_id))
      ->executeOne();

-    $data = $this->renderConpherenceTransactions($conpherence);
-    $rendered_transactions = $data['transactions'];
-    $new_latest_transaction_id = $data['latest_transaction_id'];
-
-    $nav_item = id(new ConpherenceThreadListView())
-      ->setUser($user)
-      ->setBaseURI($this->getApplicationURI())
-      ->renderSingleThread($conpherence);
-
-    $header = $this->buildHeaderPaneContent($conpherence);
+    if ($need_transactions) {
+      $data = $this->renderConpherenceTransactions($conpherence);
+    } else {
+      $data = array();
+    }
+    $rendered_transactions = idx($data, 'transactions');
+    $new_latest_transaction_id = idx($data, 'latest_transaction_id');

    $widget_uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
-    $file_widget = id(new ConpherenceFileWidgetView())
-      ->setUser($this->getRequest()->getUser())
-      ->setConpherence($conpherence)
-      ->setUpdateURI($widget_uri);
-    $people_widget = id(new ConpherencePeopleWidgetView())
-      ->setUser($user)
-      ->setConpherence($conpherence)
-      ->setUpdateURI($widget_uri);
+    $nav_item = null;
+    $header = null;
+    $people_widget = null;
+    $file_widget = null;
+    switch ($action) {
+      case ConpherenceUpdateActions::METADATA:
+        $header = $this->buildHeaderPaneContent($conpherence);
+        $nav_item = id(new ConpherenceThreadListView())
+          ->setUser($user)
+          ->setBaseURI($this->getApplicationURI())
+          ->renderSingleThread($conpherence);
+        break;
+      case ConpherenceUpdateActions::MESSAGE:
+        $file_widget = id(new ConpherenceFileWidgetView())
+          ->setUser($this->getRequest()->getUser())
+          ->setConpherence($conpherence)
+          ->setUpdateURI($widget_uri);
+        break;
+      case ConpherenceUpdateActions::ADD_PERSON:
+        $people_widget = id(new ConpherencePeopleWidgetView())
+          ->setUser($user)
+          ->setConpherence($conpherence)
+          ->setUpdateURI($widget_uri);
+        break;
+      case ConpherenceUpdateActions::REMOVE_PERSON:
+      case ConpherenceUpdateActions::NOTIFICATIONS:
+      default:
+        break;
+    }

    $content = array(
      'transactions' => $rendered_transactions,
@@ -358,9 +397,10 @@ final class ConpherenceUpdateController
      'nav_item' => hsprintf('%s', $nav_item),
      'conpherence_phid' => $conpherence->getPHID(),
      'header' => hsprintf('%s', $header),
-      'file_widget' => $file_widget->render(),
-      'people_widget' => $people_widget->render()
+      'file_widget' => $file_widget ? $file_widget->render() : null,
+      'people_widget' => $people_widget ? $people_widget->render() : null,
    );
+
    return $content;
  }

--- a/src/applications/conpherence/view/ConpherenceThreadListView.php
+++ b/src/applications/conpherence/view/ConpherenceThreadListView.php
@@ -79,6 +79,7 @@ final class ConpherenceThreadListView extends AphrontView {
      ->addSigil('conpherence-menu-click')
      ->setMetadata(
        array(
+          'title' => $title,
          'id' => $thread->getID(),
          ));
  }