From d13010b2894b22cfd9da8fad8f77a80e25714571 Mon Sep 17 00:00:00 2001 From: Michael Ly Date: Thu, 23 Apr 2020 14:29:18 -0500 Subject: [PATCH] Don't refresh when toggling record types during record set search (#937) * Don't refresh when toggling record types during record set search. * Update unit test. --- modules/portal/app/views/recordsets/recordSets.scala.html | 1 + modules/portal/public/lib/controllers/controller.records.js | 5 ++--- .../portal/public/lib/controllers/controller.records.spec.js | 1 + modules/portal/public/lib/recordset/recordsets.controller.js | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/portal/app/views/recordsets/recordSets.scala.html b/modules/portal/app/views/recordsets/recordSets.scala.html index e9e670beb..b309670d8 100644 --- a/modules/portal/app/views/recordsets/recordSets.scala.html +++ b/modules/portal/app/views/recordsets/recordSets.scala.html @@ -39,6 +39,7 @@

The search is based on the fully qualified domain name (FQDN) of a record. You can do an exact match search or fuzzy match to lookup records.

+

A minimum of two alphanumeric characters for the record name is required for searching.

Examples:

  • test.example.com. -> test.example.com.
  • diff --git a/modules/portal/public/lib/controllers/controller.records.js b/modules/portal/public/lib/controllers/controller.records.js index b5f857498..d9867a39d 100644 --- a/modules/portal/public/lib/controllers/controller.records.js +++ b/modules/portal/public/lib/controllers/controller.records.js @@ -533,7 +533,7 @@ angular.module('controller.records', []) var recordSets = response.data.recordSets; recordsPaging = pagingService.nextPageUpdate(recordSets, response.data.nextId, recordsPaging); - if(recordSets.length > 0 ){ + if (recordSets.length > 0){ updateRecordDisplay(recordSets); } }) @@ -555,11 +555,10 @@ angular.module('controller.records', []) $scope.toggleCheckedRecordType = function(recordType) { if($scope.selectedRecordTypes.includes(recordType)) { - $scope.selectedRecordTypes.splice($scope.selectedRecordTypes.indexOf(recordType),1) + $scope.selectedRecordTypes.splice($scope.selectedRecordTypes.indexOf(recordType), 1); } else { $scope.selectedRecordTypes.push(recordType); } - return $scope.refreshRecords(); }; /** diff --git a/modules/portal/public/lib/controllers/controller.records.spec.js b/modules/portal/public/lib/controllers/controller.records.spec.js index ef821bcee..ec0d99cab 100644 --- a/modules/portal/public/lib/controllers/controller.records.spec.js +++ b/modules/portal/public/lib/controllers/controller.records.spec.js @@ -389,6 +389,7 @@ describe('Controller: RecordsController', function () { var expectedSort = "asc"; this.scope.toggleCheckedRecordType("A"); + this.scope.refreshRecords(); expect(listRecordSetsByZone.calls.count()).toBe(1); expect(listRecordSetsByZone.calls.mostRecent().args).toEqual( diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js index 2b2d4d866..431f77fa8 100644 --- a/modules/portal/public/lib/recordset/recordsets.controller.js +++ b/modules/portal/public/lib/recordset/recordsets.controller.js @@ -80,7 +80,6 @@ } else { $scope.selectedRecordTypes.push(recordType); } - return $scope.refreshRecords(); }; function updateRecordDisplay(records) {