Remove "Primary Contacts" from Contact Tab LHS

Regarding removing "Primary Contacts" from RHS: I'd like to take a bit of time to double-check the database interactions and can either push in new PR or merge here.

To keep things simple at first, this creates a new hydrateDataRecords which defaults to true. I suspect we may want the interface to default to false, but looking for thoughts on that before I make any changes.

#5084

tests/e2e/sms-gateway.js

@@ -317,7 +317,7 @@ describe('sms-gateway api', () => {
             done();
           });
         })
-        .catch(done);
+        .catch(done.fail);
     });
 
     afterEach(done => {

webapp/src/js/controllers/contacts.js

@@ -477,10 +477,7 @@ var _ = require('underscore'),
           limit,
           withIds,
           silent: true,
-
-          // The logic for updating Primary Contact changes is complex
-          // So redraw everything when a person changes
-          reuseExistingDom: change.doc && change.doc.type !== 'person',
+          reuseExistingDom: true,
         });
       },
       filter: function(change) {

webapp/src/js/controllers/reports.js

@@ -197,9 +197,8 @@ angular
         });
     };
 
-    var query = function(options) {
-      options = options || {};
-      options.limit = options.limit || 50;
+    var query = function(opts) {
+      const options = _.extend({ limit: 50, hydrateContactNames: true }, opts);
       if (!options.silent) {
         $scope.error = false;
         $scope.errorSyntax = false;
@@ -442,7 +441,7 @@ angular
 
     $scope.$on('SelectAll', function() {
       $scope.setLoadingContent(true);
-      Search('reports', $scope.filters, { limit: 500 })
+      Search('reports', $scope.filters, { limit: 500, hydrateContactNames: true })
         .then(function(summaries) {
           $scope.selected = summaries.map(function(summary) {
             return {
@@ -508,7 +507,7 @@ angular
           $scope.hasReports = liveList.count() > 0;
           setActionBarData();
         } else {
-          query({ silent: true, limit: liveList.count() });
+          query({ silent: true, limit: Math.max(50, liveList.count()) });
         }
       },
       filter: function(change) {

webapp/src/js/services/get-data-records.js

@@ -36,13 +36,17 @@ angular.module('inboxServices').factory('GetDataRecords',
         });
     };
 
-    var getSummaries = function(ids) {
+    const getSummaries = function(ids, options) {
       return GetSummaries(ids)
-        .then(HydrateContactNames)
-        .then(GetSubjectSummaries);
+        .then(summaries => {
+          const promiseToSummary = options.hydrateContactNames ? HydrateContactNames(summaries) : Promise.resolve(summaries);
+          return promiseToSummary.then(GetSubjectSummaries);
+        });
     };
 
     return function(ids, options) {
+      const opts = _.extend({ hydrateContactNames: false, include_docs: false }, options);
+
       if (!ids) {
         return $q.resolve([]);
       }
@@ -53,7 +57,7 @@ angular.module('inboxServices').factory('GetDataRecords',
       if (!ids.length) {
         return $q.resolve([]);
       }
-      var getFn = options && options.include_docs ? getDocs : getSummaries;
+      const getFn = opts.include_docs ? getDocs : ids => getSummaries(ids, opts);
       return getFn(ids)
         .then(function(response) {
           if (!arrayGiven) {

webapp/src/js/services/get-subject-summaries.js

@@ -150,6 +150,11 @@ angular.module('inboxServices').factory('GetSubjectSummaries',
 
     return function(summaries, hydratedLineage) {
       var containsReports = false;
+
+      if (!summaries) {
+        return [];
+      }
+
       summaries.forEach(function (summary) {
         if (summary.form) {
           containsReports = true;

webapp/src/js/services/live-list.js

@@ -102,8 +102,6 @@ angular.module('inboxServices').factory('LiveListConfig',
                   scope.visits.status = 'done';
                 }
               }
-            } else {
-              scope.summary = $translate.instant('contact.primary_contact_name', { name: contact.contact });
             }
           }
           return renderTemplate(scope);

webapp/src/js/services/select2-search.js

@@ -75,9 +75,10 @@ angular.module('inboxServices').factory('Select2Search',
           types: { selected: types },
           search: params.data.q
         };
-        var options = {
+        const options = {
           limit: pageSize,
-          skip: skip
+          skip,
+          hydrateContactNames: true,
         };
 
         Search('contacts', filters, options)

webapp/tests/karma/unit/controllers/contacts.js

@@ -1157,7 +1157,7 @@ describe('Contacts controller', () => {
                     assert.deepEqual(searchService.args[i], [
                       'contacts',
                       { types: { selected: ['childType'] } },
-                      { limit: 5, withIds: false, silent: true, reuseExistingDom: i !== 5 },
+                      { limit: 5, withIds: false, silent: true, reuseExistingDom: true },
                       { displayLastVisitedDate: true, visitCountSettings: {} },
                       undefined,
                     ]);
@@ -1200,7 +1200,7 @@ describe('Contacts controller', () => {
                     assert.deepEqual(searchService.args[i], [
                       'contacts',
                       { types: { selected: ['childType'] } },
-                      { limit: 5, withIds: false, silent: true, reuseExistingDom: i !== 5 },
+                      { limit: 5, withIds: false, silent: true, reuseExistingDom: true },
                       {
                         displayLastVisitedDate: true,
                         visitCountSettings: {},
@@ -1243,7 +1243,7 @@ describe('Contacts controller', () => {
                     assert.deepEqual(searchService.args[i], [
                       'contacts',
                       { types: { selected: ['childType'] } },
-                      { limit: 5, withIds: false, silent: true, reuseExistingDom: i !== 5 },
+                      { limit: 5, withIds: false, silent: true, reuseExistingDom: true },
                       { displayLastVisitedDate: true, visitCountSettings: {} },
                       undefined,
                     ]);
@@ -1285,7 +1285,7 @@ describe('Contacts controller', () => {
                     assert.deepEqual(searchService.args[i], [
                       'contacts',
                       { types: { selected: ['childType'] } },
-                      { limit: 5, withIds: false, silent: true, reuseExistingDom: i !== 5 },
+                      { limit: 5, withIds: false, silent: true, reuseExistingDom: true },
                       {
                         displayLastVisitedDate: true,
                         visitCountSettings: {},
@@ -1328,7 +1328,7 @@ describe('Contacts controller', () => {
                     assert.deepEqual(searchService.args[i], [
                       'contacts',
                       { types: { selected: ['childType'] } },
-                      { limit: 5, withIds: false, silent: true, reuseExistingDom: i !== 5 },
+                      { limit: 5, withIds: false, silent: true, reuseExistingDom: true },
                       {},
                       undefined,
                     ]);

webapp/tests/karma/unit/services/get-data-records.js

@@ -55,7 +55,7 @@ describe('GetDataRecords service', () => {
       });
     });
 
-    it('single result', () => {
+    it('single hydrated result', () => {
       const expected = {
         _id: '5',
         name: 'five',
@@ -71,7 +71,7 @@ describe('GetDataRecords service', () => {
         }
       ]));
       HydrateContactNames.returns(Promise.resolve([ expected ]));
-      return service('5').then(actual => {
+      return service('5', { hydrateContactNames: true }).then(actual => {
         chai.expect(actual).to.deep.equal(expected);
         chai.expect(GetSummaries.callCount).to.equal(1);
         chai.expect(allDocs.callCount).to.equal(0);
@@ -97,7 +97,7 @@ describe('GetDataRecords service', () => {
         { _id: '7', name: 'seven' }
       ]));
       HydrateContactNames.returns(Promise.resolve(expected));
-      return service([ '5', '6', '7' ]).then(actual => {
+      return service([ '5', '6', '7' ], { hydrateContactNames: true }).then(actual => {
         chai.expect(actual).to.deep.equal(expected);
         chai.expect(GetSummaries.callCount).to.equal(1);
         chai.expect(GetSummaries.args[0][0]).to.deep.equal([ '5', '6', '7' ]);