From 26e8a77e46eb63b3182f70e35c929629228c052f Mon Sep 17 00:00:00 2001
From: Michael Ly <michaeltrulyng@gmail.com>
Date: Fri, 30 Nov 2018 12:03:36 -0500
Subject: [PATCH] Wait for zone and record set promises in portal before
 displaying record sets (#359)

* Add wait for promise.

* Replace event.preventDefault with button type in HTML since buttons default to submit type.
---
 .../batchChanges/batchChangeNew.scala.html    |  6 ++--
 .../batch-change-new.controller.js            |  3 --
 .../lib/controllers/controller.records.js     | 35 +++++++++++--------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/modules/portal/app/views/batchChanges/batchChangeNew.scala.html b/modules/portal/app/views/batchChanges/batchChangeNew.scala.html
index 4294c5eb4..13881480d 100644
--- a/modules/portal/app/views/batchChanges/batchChangeNew.scala.html
+++ b/modules/portal/app/views/batchChanges/batchChangeNew.scala.html
@@ -150,16 +150,16 @@
                                             {{batchError}}
                                         </p>
                                     </td>
-                                    <td><button class="btn btn-danger batch-change-delete" ng-click="deleteSingleChange($index)">Delete</button></td>
+                                    <td><button type="button" class="btn btn-danger batch-change-delete" ng-click="deleteSingleChange($index)">Delete</button></td>
                                 </tr>
                                 </tbody>
                             </table>
-                            <button id="addChange" class="btn btn-default" ng-click="addSingleChange()" ng-disabled="newBatch.changes.length == batchChangeLimit"><span class="fa fa-plus"></span> Add a Change</button>
+                            <button type="button" id="addChange" class="btn btn-default" ng-click="addSingleChange()" ng-disabled="newBatch.changes.length == batchChangeLimit"><span class="fa fa-plus"></span> Add a Change</button>
                             <span ng-if="newBatch.changes.length == batchChangeLimit">Limit reached. Cannot add more than {{batchChangeLimit}} records per batch change.</span>
                         </div>
                         <div class="panel-footer clearfix">
                             <div ng-if="formStatus=='pendingSubmit'" class="pull-right">
-                                <button id="create-batch-changes-button" class="btn btn-primary" ng-click="submitChange()">Submit</button>
+                                <button type="button" id="create-batch-changes-button" class="btn btn-primary" ng-click="submitChange()">Submit</button>
                             </div>
                             <div ng-if="formStatus=='pendingConfirm'" class="pull-right">
                                 <span>Are you sure you want to submit this batch change request?</span>
diff --git a/modules/portal/public/lib/batch-change/batch-change-new.controller.js b/modules/portal/public/lib/batch-change/batch-change-new.controller.js
index fb7508a48..e9598d6b4 100644
--- a/modules/portal/public/lib/batch-change/batch-change-new.controller.js
+++ b/modules/portal/public/lib/batch-change/batch-change-new.controller.js
@@ -28,7 +28,6 @@
             $scope.formStatus = "pendingSubmit";
 
             $scope.addSingleChange = function() {
-                event.preventDefault();
                 $scope.newBatch.changes.push({changeType: "Add", type: "A", ttl: 200});
                 var changesLength =$scope.newBatch.changes.length;
                 $timeout(function() {document.getElementsByClassName("changeType")[changesLength - 1].focus()});
@@ -75,13 +74,11 @@
             };
 
             $scope.deleteSingleChange = function(changeNumber) {
-                event.preventDefault();
                 $('.batch-change-delete').blur();
                 $scope.newBatch.changes.splice(changeNumber, 1);
             };
 
             $scope.submitChange = function() {
-                event.preventDefault();
                 $scope.formStatus = "pendingConfirm";
             }
 
diff --git a/modules/portal/public/lib/controllers/controller.records.js b/modules/portal/public/lib/controllers/controller.records.js
index 74071e4f7..f9ceea6af 100644
--- a/modules/portal/public/lib/controllers/controller.records.js
+++ b/modules/portal/public/lib/controllers/controller.records.js
@@ -15,7 +15,7 @@
  */
 
 angular.module('controller.records', [])
-    .controller('RecordsController', function ($scope, $timeout, $log, recordsService, groupsService, pagingService, utilityService) {
+    .controller('RecordsController', function ($scope, $timeout, $log, recordsService, groupsService, pagingService, utilityService, $q) {
 
     /**
       * Scope data initial setup
@@ -35,6 +35,9 @@ angular.module('controller.records', [])
     $scope.currentRecord = {};
     $scope.zoneInfo = {};
 
+    var loadZonesPromise;
+    var loadRecordsPromise;
+
     $scope.recordModalState = {
         CREATE: 0,
         UPDATE: 1,
@@ -391,17 +394,20 @@ angular.module('controller.records', [])
     };
 
     function updateRecordDisplay(records) {
-        var newRecords = [];
-        angular.forEach(records, function(record) {
-            newRecords.push(recordsService.toDisplayRecord(record, $scope.zoneInfo.name));
-        });
-        $scope.records = newRecords;
-        if($scope.records.length > 0) {
-          $("td.dataTables_empty").hide();
-        } else {
-          $("td.dataTables_empty").show();
-        }
-    }
+        $q.all([loadZonesPromise, loadRecordsPromise])
+            .then(function(){
+                var newRecords = [];
+                angular.forEach(records, function(record) {
+                    newRecords.push(recordsService.toDisplayRecord(record, $scope.zoneInfo.name));
+                });
+                $scope.records = newRecords;
+                if($scope.records.length > 0) {
+                  $("td.dataTables_empty").hide();
+                } else {
+                  $("td.dataTables_empty").show();
+                }
+            });
+    };
 
     /**
      * Recordset paging
@@ -447,7 +453,6 @@ angular.module('controller.records', [])
             });
     };
 
-
     /**
      * Record change paging
      */
@@ -492,8 +497,8 @@ angular.module('controller.records', [])
             });
     };
 
-    $timeout($scope.refreshZone, 0);
-    $timeout($scope.refreshRecords, 0);
+    loadZonesPromise = $timeout($scope.refreshZone, 0);
+    loadRecordsPromise = $timeout($scope.refreshRecords, 0);
     $timeout($scope.refreshRecordChangesPreview, 0);
     $timeout($scope.refreshRecordChanges, 0);