mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-09-01 14:55:22 +00:00
Code Issues Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Jay07GIT
2023-08-22 23:58:33 +05:30
parent 6a8e588417 f191c298dd
commit b65fc23bdc
24 changed files with 282 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/docker/api/application.conf
View File

@@ -161,6 +161,17 @@ vinyldns {
port=${?API_SERVICE_PORT} port=${?API_SERVICE_PORT}
} }
api {
limits {
batchchange-routing-max-items-limit = 100
membership-routing-default-max-items = 100
membership-routing-max-items-limit = 1000
membership-routing-max-groups-list-limit = 3000
recordset-routing-default-max-items= 100
zone-routing-default-max-items = 100
zone-routing-max-items-limit = 100
}
}
approved-name-servers = [ approved-name-servers = [
"172.17.42.1.", "172.17.42.1.",

12
build/docker/portal/application.conf
View File

@@ -76,6 +76,18 @@ crypto {
secret = ${?CRYPTO_SECRET} secret = ${?CRYPTO_SECRET}
} }
api {
limits {
batchchange-routing-max-items-limit = 100
membership-routing-default-max-items = 100
membership-routing-max-items-limit = 1000
membership-routing-max-groups-list-limit = 3000
recordset-routing-default-max-items= 100
zone-routing-default-max-items = 100
zone-routing-max-items-limit = 100
}
}
http.port = 9001 http.port = 9001
http.port = ${?PORTAL_PORT} http.port = ${?PORTAL_PORT}

11
modules/api/src/main/resources/application.conf
View File

@@ -164,6 +164,17 @@ vinyldns {
port=${?API_SERVICE_PORT} port=${?API_SERVICE_PORT}
} }
api {
limits {
batchchange-routing-max-items-limit = 100
membership-routing-default-max-items = 100
membership-routing-max-items-limit = 1000
membership-routing-max-groups-list-limit = 3000
recordset-routing-default-max-items= 100
zone-routing-default-max-items = 100
zone-routing-max-items-limit = 100
}
}
approved-name-servers = [ approved-name-servers = [
"172.17.42.1.", "172.17.42.1.",

5
modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetService.scala
View File

@@ -611,12 +611,13 @@ class RecordSetService(
def listFailedRecordSetChanges( def listFailedRecordSetChanges(
authPrincipal: AuthPrincipal, authPrincipal: AuthPrincipal,
zoneId: Option[String] = None,
startFrom: Int= 0, startFrom: Int= 0,
maxItems: Int = 100, maxItems: Int = 100
): Result[ListFailedRecordSetChangesResponse] = ): Result[ListFailedRecordSetChangesResponse] =
for { for {
recordSetChangesFailedResults <- recordChangeRepository recordSetChangesFailedResults <- recordChangeRepository
.listFailedRecordSetChanges(maxItems, startFrom) .listFailedRecordSetChanges(zoneId, maxItems, startFrom)
.toResult[ListFailedRecordSetChangesResults] .toResult[ListFailedRecordSetChangesResults]
_ <- zoneAccess(recordSetChangesFailedResults.items, authPrincipal).toResult _ <- zoneAccess(recordSetChangesFailedResults.items, authPrincipal).toResult
} yield } yield

1
modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetServiceAlgebra.scala
View File

@@ -120,6 +120,7 @@ trait RecordSetServiceAlgebra {
def listFailedRecordSetChanges( def listFailedRecordSetChanges(
authPrincipal: AuthPrincipal, authPrincipal: AuthPrincipal,
zoneId: Option[String],
startFrom: Int, startFrom: Int,
maxItems: Int maxItems: Int
): Result[ListFailedRecordSetChangesResponse] ): Result[ListFailedRecordSetChangesResponse]

4
modules/api/src/main/scala/vinyldns/api/route/RecordSetRouting.scala
View File

@@ -269,7 +269,7 @@ class RecordSetRoute(
} }
} }
} ~ } ~
path("metrics" / "health" / "recordsetchangesfailure") { path("metrics" / "health" / "zones" / Segment / "recordsetchangesfailure") {zoneId =>
(get & monitor("Endpoint.listFailedRecordSetChanges")) { (get & monitor("Endpoint.listFailedRecordSetChanges")) {
parameters("startFrom".as[Int].?(0), "maxItems".as[Int].?(DEFAULT_MAX_ITEMS)) { parameters("startFrom".as[Int].?(0), "maxItems".as[Int].?(DEFAULT_MAX_ITEMS)) {
(startFrom: Int, maxItems: Int) => (startFrom: Int, maxItems: Int) =>
@@ -279,7 +279,7 @@ class RecordSetRoute(
errorMsg = s"maxItems was $maxItems, maxItems must be between 0 exclusive " + errorMsg = s"maxItems was $maxItems, maxItems must be between 0 exclusive " +
s"and $DEFAULT_MAX_ITEMS inclusive" s"and $DEFAULT_MAX_ITEMS inclusive"
){ ){
authenticateAndExecute(recordSetService.listFailedRecordSetChanges(_, startFrom, maxItems)) { authenticateAndExecute(recordSetService.listFailedRecordSetChanges(_, Some(zoneId), startFrom, maxItems)) {
changes => changes =>
complete(StatusCodes.OK, changes) complete(StatusCodes.OK, changes)
} }

8
modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
View File

@@ -2017,11 +2017,11 @@ class RecordSetServiceSpec
doReturn(IO.pure(ListFailedRecordSetChangesResults(completeRecordSetChanges))) doReturn(IO.pure(ListFailedRecordSetChangesResults(completeRecordSetChanges)))
.when(mockRecordChangeRepo) .when(mockRecordChangeRepo)
.listFailedRecordSetChanges(100,0) .listFailedRecordSetChanges(Some(okZone.id),100,0)
val result: ListFailedRecordSetChangesResponse = val result: ListFailedRecordSetChangesResponse =
underTest.listFailedRecordSetChanges(authPrincipal = okAuth).value.unsafeRunSync().toOption.get underTest.listFailedRecordSetChanges(authPrincipal = okAuth,Some(okZone.id)).value.unsafeRunSync().toOption.get
val changesWithName = val changesWithName =
ListFailedRecordSetChangesResponse( ListFailedRecordSetChangesResponse(
@@ -2042,11 +2042,11 @@ class RecordSetServiceSpec
doReturn(IO.pure(ListFailedRecordSetChangesResults(completeRecordSetChanges))) doReturn(IO.pure(ListFailedRecordSetChangesResults(completeRecordSetChanges)))
.when(mockRecordChangeRepo) .when(mockRecordChangeRepo)
.listFailedRecordSetChanges(3,2) .listFailedRecordSetChanges(Some(okZone.id),3,2)
val result: ListFailedRecordSetChangesResponse = val result: ListFailedRecordSetChangesResponse =
underTest.listFailedRecordSetChanges(authPrincipal = okAuth,2,3).value.unsafeRunSync().toOption.get underTest.listFailedRecordSetChanges(authPrincipal = okAuth,Some(okZone.id),2,3).value.unsafeRunSync().toOption.get
val changesWithName = val changesWithName =
ListFailedRecordSetChangesResponse( ListFailedRecordSetChangesResponse(

18
modules/api/src/test/scala/vinyldns/api/route/RecordSetRoutingSpec.scala
View File

@@ -421,9 +421,6 @@ class RecordSetRoutingSpec
private val failedChangesWithUserName = private val failedChangesWithUserName =
List(rsChange1.copy(status = RecordSetChangeStatus.Failed) , rsChange2.copy(status = RecordSetChangeStatus.Failed)) List(rsChange1.copy(status = RecordSetChangeStatus.Failed) , rsChange2.copy(status = RecordSetChangeStatus.Failed))
private val listFailedRecordSetChangeResponse = ListFailedRecordSetChangesResponse(
failedChangesWithUserName,0,0,100
)
class TestService extends RecordSetServiceAlgebra { class TestService extends RecordSetServiceAlgebra {
@@ -585,14 +582,17 @@ class RecordSetRoutingSpec
def listFailedRecordSetChanges( def listFailedRecordSetChanges(
authPrincipal: AuthPrincipal, authPrincipal: AuthPrincipal,
zoneId:Option[String],
startFrom: Int, startFrom: Int,
maxItems: Int maxItems: Int
): Result[ListFailedRecordSetChangesResponse] = { ): Result[ListFailedRecordSetChangesResponse] = {
val outcome = authPrincipal match { zoneId match {
case _ => Right(listFailedRecordSetChangeResponse) case Some(zoneNotFound.id) => Left(ZoneNotFoundError(s"$zoneId"))
} case Some(notAuthorizedZone.id) => Left(NotAuthorizedError("no way"))
outcome.toResult case _ => authPrincipal match {
} case _ => Right(ListFailedRecordSetChangesResponse(failedChangesWithUserName,0,startFrom,maxItems))
}
}}.toResult
def searchRecordSets( def searchRecordSets(
startFrom: Option[String], startFrom: Option[String],
@@ -942,7 +942,7 @@ class RecordSetRoutingSpec
val rsChangeFailed1 = rsChange1.copy(status = RecordSetChangeStatus.Failed) val rsChangeFailed1 = rsChange1.copy(status = RecordSetChangeStatus.Failed)
val rsChangeFailed2 = rsChange2.copy(status = RecordSetChangeStatus.Failed) val rsChangeFailed2 = rsChange2.copy(status = RecordSetChangeStatus.Failed)
Get(s"/metrics/health/recordsetchangesfailure") ~> recordSetRoute ~> check { Get(s"/metrics/health/zones/${okZone.id}/recordsetchangesfailure") ~> recordSetRoute ~> check {
val changes = responseAs[ListFailedRecordSetChangesResponse] val changes = responseAs[ListFailedRecordSetChangesResponse]
changes.failedRecordSetChanges.map(_.id) shouldBe List(rsChangeFailed1.id, rsChangeFailed2.id) changes.failedRecordSetChanges.map(_.id) shouldBe List(rsChangeFailed1.id, rsChangeFailed2.id)

12
modules/api/src/universal/conf/application.conf
View File

@@ -161,6 +161,18 @@ vinyldns {
port=${?API_SERVICE_PORT} port=${?API_SERVICE_PORT}
} }
api {
limits {
batchchange-routing-max-items-limit = 100
membership-routing-default-max-items = 100
membership-routing-max-items-limit = 1000
membership-routing-max-groups-list-limit = 3000
recordset-routing-default-max-items= 100
zone-routing-default-max-items = 100
zone-routing-max-items-limit = 100
}
}
approved-name-servers = [ approved-name-servers = [
"172.17.42.1.", "172.17.42.1.",

3
modules/core/src/main/scala/vinyldns/core/domain/record/RecordChangeRepository.scala
View File

@@ -35,7 +35,8 @@ trait RecordChangeRepository extends Repository {
def getRecordSetChange(zoneId: String, changeId: String): IO[Option[RecordSetChange]] def getRecordSetChange(zoneId: String, changeId: String): IO[Option[RecordSetChange]]
def listFailedRecordSetChanges(maxItems: Int = 100, def listFailedRecordSetChanges(zoneId: Option[String],
maxItems: Int = 100,
startFrom: Int = 0 startFrom: Int = 0
): IO[ListFailedRecordSetChangesResults] ): IO[ListFailedRecordSetChangesResults]

20
modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlRecordChangeRepositoryIntegrationSpec.scala
View File

@@ -183,19 +183,19 @@ class MySqlRecordChangeRepositoryIntegrationSpec
repo.save(db, ChangeSet(inserts)) repo.save(db, ChangeSet(inserts))
} }
saveRecChange.attempt.unsafeRunSync() shouldBe right saveRecChange.attempt.unsafeRunSync() shouldBe right
val result = repo.listFailedRecordSetChanges(10, 0).unsafeRunSync() val result = repo.listFailedRecordSetChanges(Some(okZone.id),10, 0).unsafeRunSync()
(result.items should have).length(10) (result.items should have).length(10)
result.maxItems shouldBe 10 result.maxItems shouldBe 10
result.items should contain theSameElementsAs(inserts) result.items should contain theSameElementsAs(inserts)
} }
"return empty for success record changes" in { "return empty for success record changes" in {
val inserts = generateInserts(okZone, 10) val inserts = generateInserts(okZone, 10)
val saveRecChange = executeWithinTransaction { db: DB => val saveRecChange = executeWithinTransaction { db: DB =>
repo.save(db, ChangeSet(inserts)) repo.save(db, ChangeSet(inserts))
} }
saveRecChange.attempt.unsafeRunSync() shouldBe right saveRecChange.attempt.unsafeRunSync() shouldBe right
val result = repo.listFailedRecordSetChanges(5, 0).unsafeRunSync() val result = repo.listFailedRecordSetChanges(Some(okZone.id),5, 0).unsafeRunSync()
(result.items should have).length(0) (result.items should have).length(0)
result.items shouldBe List() result.items shouldBe List()
result.nextId shouldBe 0 result.nextId shouldBe 0
@@ -215,17 +215,19 @@ class MySqlRecordChangeRepositoryIntegrationSpec
repo.save(db, ChangeSet(timeSpaced)) repo.save(db, ChangeSet(timeSpaced))
} }
saveRecChange.attempt.unsafeRunSync() shouldBe right saveRecChange.attempt.unsafeRunSync() shouldBe right
val page1 = repo.listFailedRecordSetChanges(2, 0).unsafeRunSync() val page1 = repo.listFailedRecordSetChanges(Some(okZone.id), 2, 0).unsafeRunSync()
page1.nextId shouldBe 2 println(page1.items)
page1.nextId shouldBe 3
page1.maxItems shouldBe 2 page1.maxItems shouldBe 2
(page1.items should contain).theSameElementsInOrderAs(expectedOrder.take(2)) (page1.items should contain).theSameElementsInOrderAs(expectedOrder.take(2))
val page2 = repo.listFailedRecordSetChanges(2, page1.nextId).unsafeRunSync() val page2 = repo.listFailedRecordSetChanges(Some(okZone.id), 2, page1.nextId).unsafeRunSync()
page2.nextId shouldBe 4 println(page2.items)
page2.nextId shouldBe 6
page2.maxItems shouldBe 2 page2.maxItems shouldBe 2
(page2.items should contain).theSameElementsInOrderAs(expectedOrder.slice(2, 4)) (page2.items should contain).theSameElementsInOrderAs(expectedOrder.slice(3, 5))
val page3 = repo.listFailedRecordSetChanges(2, page2.nextId).unsafeRunSync() val page3 = repo.listFailedRecordSetChanges(Some(okZone.id), 2, 4).unsafeRunSync()
page3.nextId shouldBe 0 page3.nextId shouldBe 0
page3.maxItems shouldBe 2 page3.maxItems shouldBe 2
page3.items should contain theSameElementsAs expectedOrder.slice(4, 5) page3.items should contain theSameElementsAs expectedOrder.slice(4, 5)

6
modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordChangeRepository.scala
View File

@@ -63,6 +63,7 @@ class MySqlRecordChangeRepository
sql""" sql"""
|SELECT data |SELECT data
| FROM record_change | FROM record_change
| WHERE zone_id = {zoneId}
| ORDER BY created DESC | ORDER BY created DESC
""".stripMargin """.stripMargin
@@ -170,16 +171,17 @@ class MySqlRecordChangeRepository
} }
} }
def listFailedRecordSetChanges(maxItems: Int, startFrom: Int): IO[ListFailedRecordSetChangesResults] = def listFailedRecordSetChanges(zoneId: Option[String], maxItems: Int, startFrom: Int): IO[ListFailedRecordSetChangesResults] =
monitor("repo.RecordChange.listFailedRecordSetChanges") { monitor("repo.RecordChange.listFailedRecordSetChanges") {
IO { IO {
DB.readOnly { implicit s => DB.readOnly { implicit s =>
val queryResult = LIST_RECORD_CHANGES val queryResult = LIST_RECORD_CHANGES
.bindByName('zoneId -> zoneId.get)
.map(toRecordSetChange) .map(toRecordSetChange)
.list() .list()
.apply() .apply()
val failedRecordSetChanges = queryResult.filter(rc => rc.status == RecordSetChangeStatus.Failed).drop(startFrom).take(maxItems) val failedRecordSetChanges = queryResult.filter(rc => rc.status == RecordSetChangeStatus.Failed).drop(startFrom).take(maxItems)
val nextId = if (failedRecordSetChanges.size < maxItems) 0 else startFrom + maxItems val nextId = if (failedRecordSetChanges.size < maxItems) 0 else startFrom + maxItems + 1
ListFailedRecordSetChangesResults(failedRecordSetChanges,nextId,startFrom,maxItems) ListFailedRecordSetChangesResults(failedRecordSetChanges,nextId,startFrom,maxItems)
} }
} }

6
modules/portal/app/models/Meta.scala
View File

@@ -24,7 +24,8 @@ case class Meta(
defaultTtl: Long, defaultTtl: Long,
manualBatchChangeReviewEnabled: Boolean, manualBatchChangeReviewEnabled: Boolean,
scheduledBatchChangesEnabled: Boolean, scheduledBatchChangesEnabled: Boolean,
portalUrl: String portalUrl: String,
maxGroupItemsDisplay: Int
) )
object Meta { object Meta {
def apply(config: Configuration): Meta = def apply(config: Configuration): Meta =
@@ -35,6 +36,7 @@ object Meta {
config.getOptional[Long]("default-ttl").getOrElse(7200L), config.getOptional[Long]("default-ttl").getOrElse(7200L),
config.getOptional[Boolean]("manual-batch-review-enabled").getOrElse(false), config.getOptional[Boolean]("manual-batch-review-enabled").getOrElse(false),
config.getOptional[Boolean]("scheduled-changes-enabled").getOrElse(false), config.getOptional[Boolean]("scheduled-changes-enabled").getOrElse(false),
config.getOptional[String]("portal.vinyldns.url").getOrElse("http://localhost:9001") config.getOptional[String]("portal.vinyldns.url").getOrElse("http://localhost:9001"),
config.getOptional[Int]("api.limits.membership-routing-max-groups-list-limit").getOrElse(3000)
) )
} }

5
modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
View File

@@ -3,7 +3,7 @@
@content = { @content = {
<!-- PAGE CONTENT --> <!-- PAGE CONTENT -->
<div class="right_col" role="main" ng-init="batchChangeLimit = @meta.batchChangeLimit; defaultTtl = @meta.defaultTtl; <div class="right_col" role="main" ng-init="batchChangeLimit = @meta.batchChangeLimit; defaultTtl = @meta.defaultTtl;
manualReviewEnabled = @meta.manualBatchChangeReviewEnabled"> manualReviewEnabled = @meta.manualBatchChangeReviewEnabled; maxGroupItemsDisplay = @meta.maxGroupItemsDisplay">
<!-- BREADCRUMB --> <!-- BREADCRUMB -->
<ul class="breadcrumb"> <ul class="breadcrumb">
@@ -336,7 +336,8 @@
<button type="button" id="create-batch-changes-button" class="btn btn-primary" ng-click="submitChange(manualReviewEnabled)">Submit</button> <button type="button" id="create-batch-changes-button" class="btn btn-primary" ng-click="submitChange(manualReviewEnabled)">Submit</button>
</div> </div>
<div ng-if="formStatus=='pendingConfirm'" class="pull-right"> <div ng-if="formStatus=='pendingConfirm'" class="pull-right">
<span>{{ confirmationPrompt }}</span> <span ng-if="!batchChangeErrors">{{ confirmationPrompt }}</span>
<span ng-if="batchChangeErrors" class="batch-change-error-help">There were errors, please review the highlighted rows and then proceed.</span>
<button class="btn btn-default" ng-click="cancelSubmit()">Cancel</button> <button class="btn btn-default" ng-click="cancelSubmit()">Cancel</button>
<button class="btn btn-success" type="submit" ng-click="confirmSubmit(createBatchChangeForm)">Confirm</button> <button class="btn btn-success" type="submit" ng-click="confirmSubmit(createBatchChangeForm)">Confirm</button>
</div> </div>

86
modules/portal/app/views/recordsets/recordSets.scala.html
View File

@@ -70,53 +70,56 @@
</div> </div>
</div> </div>
<!-- START RECORD TABLE --> <!-- START RECORD TABLE -->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Records {{ getRecordPageTitle() }}</h3> <div class="row">
</div> <div class="col-md-10">
<span class="panel-title bolder-font-weight">Records</span>
<div class="panel-body"> </div>
<div class="vinyldns-panel-top"> <div class="col-md-2 pull-right">
<div class="btn-group"> <form class="input-group remove-bottom-margin" ng-submit="refreshRecords()">
<button id="refresh-records-button" class="btn btn-default" ng-click="refreshRecords()"><span class="fa fa-refresh"></span> Refresh</button> <div class="input-group remove-bottom-margin">
<button id="create-record-button" class="btn btn-default" ng-if="canCreateRecords" ng-click="createRecord(defaultTtl)"><span class="fa fa-plus"></span> Create Record Set</button> <span class="input-group-btn">
</div> <button id="record-search-button" type="submit" class="btn btn-primary"><span class="fa fa-search"></span></button>
</span>
<div> <input id="record-search-text" ng-model="query" type="text" class="form-control" placeholder="Record Name">
<form class="input-group" ng-submit="refreshRecords()"> </div>
<div class="input-group"> </form>
<span class="input-group-btn"> <div class="dropdown">
<button id="record-search-button" type="submit" class="btn btn-primary"><span class="fa fa-search"></span></button> <a class="record-type-filter-heading force-cursor dropdown-toggle" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">Filters<i class="fa fa-chevron-down"></i></a>
</span> <div class="dropdown-menu" aria-labelledby="dropdownMenu1">
<input id="record-search-text" ng-model="query" type="text" class="form-control" placeholder="Record Name"> Record Types
<div>
<ul class="record-type-filters">
<li ng-repeat="recordType in readRecordTypes" style="list-style-type:none;"><input type="checkbox" ng-checked="selectedRecordTypes.indexOf(recordType) != -1" ng-click="toggleCheckedRecordType(recordType)"> {{recordType}}</li>
</ul>
</div> </div>
<div class="dropdown"> <div>
<a class="record-type-filter-heading force-cursor dropdown-toggle" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">Filters<i class="fa fa-chevron-down"></i></a> Record Owner Group
<div class="dropdown-menu" aria-labelledby="dropdownMenu1"> <div>
Record Types <select class="form-control" id="recordOwnerGroup" ng-model="ownerGroupFilter" ng-options="group.id as group.name for group in groups | orderBy: 'name'" ng-click="$event.stopPropagation();">
<div> <option value=""></option>
<ul class="record-type-filters"> </select>
<li ng-repeat="recordType in readRecordTypes" style="list-style-type:none;"><input type="checkbox" ng-checked="selectedRecordTypes.indexOf(recordType) != -1" ng-click="toggleCheckedRecordType(recordType)"> {{recordType}}</li>
</ul>
</div>
<div>
Record Owner Group
<div>
<select class="form-control" id="recordOwnerGroup" ng-model="ownerGroupFilter" ng-options="group.id as group.name for group in groups | orderBy: 'name'" ng-click="$event.stopPropagation();">
<option value=""></option>
</select>
</div>
</div>
</div> </div>
</div> </div>
</div>
</form>
</div> </div>
</div> </div>
</div>
</div>
<div class="panel-body">
<div class="vinyldns-panel-top">
<div class="btn-group">
<button id="refresh-records-button" class="btn btn-default" ng-click="refreshRecords()"><span class="fa fa-refresh"></span> Refresh</button>
<button id="create-record-button" class="btn btn-default" ng-if="canCreateRecords" ng-click="createRecord(defaultTtl)"><span class="fa fa-plus"></span> Create Record Set</button>
</div>
</div>
<!-- PAGINATION --> <!-- PAGINATION -->
<div class="dataTables_paginate"> <div class="dataTables_paginate vinyldns_paginate">
<span class="vinyldns_page_number">{{ getRecordPageTitle() }}</span>
<ul class="pagination"> <ul class="pagination">
<li class="paginate_button previous"> <li class="paginate_button previous">
<a ng-if="prevPageEnabled()" ng-click="prevPage()">Previous</a> <a ng-if="prevPageEnabled()" ng-click="prevPage()">Previous</a>
@@ -383,7 +386,8 @@
<!-- PAGINATION --> <!-- PAGINATION -->
<div class="dataTables_paginate"> <div class="dataTables_paginate vinyldns_paginate">
<span class="vinyldns_page_number">{{ getRecordPageTitle() }}</span>
<ul class="pagination"> <ul class="pagination">
<li class="paginate_button previous"> <li class="paginate_button previous">
<a ng-if="prevPageEnabled()" ng-click="prevPage()">Previous</a> <a ng-if="prevPageEnabled()" ng-click="prevPage()">Previous</a>

73
modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
View File

@@ -59,37 +59,41 @@
<!-- START RECORD TABLE --> <!-- START RECORD TABLE -->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">Records {{ getRecordPageTitle() }}</h3> <div class="row">
</div> <div class="col-md-10">
<span class="panel-title bolder-font-weight">Records</span>
<div class="panel-body"> </div>
<div class="vinyldns-panel-top"> <div class="col-md-2 pull-right">
<div class="btn-group"> <form class="input-group remove-bottom-margin" ng-submit="refreshRecords()">
<button id="refresh-records-button" class="btn btn-default" ng-click="refreshRecords()"><span class="fa fa-refresh"></span> Refresh</button> <div class="input-group remove-bottom-margin">
<button id="create-record-button" class="btn btn-default" ng-if="canReadZone && (zoneInfo.accessLevel == 'Delete' || canCreateRecordsViaAcl())" ng-click="createRecord(defaultTtl)"><span class="fa fa-plus"></span> Create Record Set</button> <span class="input-group-btn">
<button id="zone-sync-button" class="btn btn-default mb-control" ng-if="zoneInfo.accessLevel=='Delete'" data-toggle="modal" data-target="#mb-sync"><span class="fa fa-exchange"></span> Sync Zone</button> <button id="record-search-button" type="submit" class="btn btn-primary"><span class="fa fa-search"></span></button>
</div> </span>
<input id="record-search-text" ng-model="query" type="text" class="form-control" placeholder="Record Name">
<div> </div>
<form class="input-group" ng-submit="refreshRecords()"> </form>
<div class="input-group">
<span class="input-group-btn">
<button id="record-search-button" type="submit" class="btn btn-primary"><span class="fa fa-search"></span></button>
</span>
<input id="record-search-text" ng-model="query" type="text" class="form-control" placeholder="Record Name">
</div>
<div class="dropdown"> <div class="dropdown">
<a class="record-type-filter-heading force-cursor dropdown-toggle" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">Filter By Record Type <i class="fa fa-chevron-down"></i></a> <a class="record-type-filter-heading force-cursor dropdown-toggle" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">Filter By Record Type <i class="fa fa-chevron-down"></i></a>
<ul class="dropdown-menu record-type-filters" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu record-type-filters" aria-labelledby="dropdownMenu1">
<li ng-repeat="recordType in readRecordTypes"><input type="checkbox" ng-checked="selectedRecordTypes.indexOf(recordType) != -1" ng-click="toggleCheckedRecordType(recordType)"> {{recordType}}</li> <li ng-repeat="recordType in readRecordTypes"><input type="checkbox" ng-checked="selectedRecordTypes.indexOf(recordType) != -1" ng-click="toggleCheckedRecordType(recordType)"> {{recordType}}</li>
</ul> </ul>
</div> </div>
</form> </div>
</div>
</div>
<div class="panel-body">
<div class="vinyldns-panel-top">
<div class="btn-group">
<button id="refresh-records-button" class="btn btn-default" ng-click="refreshRecords()"><span class="fa fa-refresh"></span> Refresh</button>
<button id="create-record-button" class="btn btn-default" ng-if="canReadZone && (zoneInfo.accessLevel == 'Delete' || canCreateRecordsViaAcl())" ng-click="createRecord(defaultTtl)"><span class="fa fa-plus"></span> Create Record Set</button>
<button id="zone-sync-button" class="btn btn-default mb-control" ng-if="zoneInfo.accessLevel=='Delete'" data-toggle="modal" data-target="#mb-sync"><span class="fa fa-exchange"></span> Sync Zone</button>
</div>
</div> </div>
</div>
<!-- PAGINATION --> <!-- PAGINATION -->
<div class="dataTables_paginate"> <div class="dataTables_paginate vinyldns_paginate">
<span class="vinyldns_page_number">{{ getRecordPageTitle() }}</span>
<ul class="pagination"> <ul class="pagination">
<li class="paginate_button previous"> <li class="paginate_button previous">
<a ng-if="prevPageEnabled()" ng-click="prevPage()">Previous</a> <a ng-if="prevPageEnabled()" ng-click="prevPage()">Previous</a>
@@ -345,18 +349,19 @@
</tbody> </tbody>
</table> </table>
<!-- PAGINATION --> <!-- PAGINATION -->
<div class="dataTables_paginate"> <div class="dataTables_paginate vinyldns_paginate">
<ul class="pagination"> <span class="vinyldns_page_number">{{ getRecordPageTitle() }}</span>
<li class="paginate_button previous"> <ul class="pagination">
<a ng-if="prevPageEnabled()" ng-click="prevPage()">Previous</a> <li class="paginate_button previous">
</li> <a ng-if="prevPageEnabled()" ng-click="prevPage()">Previous</a>
<li class="paginate_button next"> </li>
<a ng-if="nextPageEnabled()" ng-click="nextPage()">Next</a> <li class="paginate_button next">
</li> <a ng-if="nextPageEnabled()" ng-click="nextPage()">Next</a>
</ul> </li>
</div> </ul>
<!-- END PAGINATION --> </div>
<!-- END PAGINATION -->
</div> </div>
<div class="panel-footer"></div> <div class="panel-footer"></div>

2
modules/portal/app/views/zones/zoneTabs/manageZone.scala.html
View File

@@ -13,7 +13,7 @@
</h3> </h3>
<!-- START ZONE INFO FORM --> <!-- START ZONE INFO FORM -->
<div> <div ng-init="maxGroupItemsDisplay = @meta.maxGroupItemsDisplay">
<form class="form-horizontal"> <form class="form-horizontal">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">

129
modules/portal/app/views/zones/zones.scala.html
View File

@@ -40,48 +40,42 @@
<!-- SIMPLE DATATABLE --> <!-- SIMPLE DATATABLE -->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<div class="btn-group"> <div class="row flex">
<button class="btn btn-default" ng-click="resetCurrentZone()" data-toggle="modal" <div class="btn-group col-md-9 flex-1">
data-target="#zone_connection_modal" id="open-zone-modal-button"> <button class="btn btn-default" ng-click="resetCurrentZone()" data-toggle="modal" data-target="#zone_connection_modal" id="open-zone-modal-button">
<span class="fa fa-arrow-right"></span> Connect <span class="fa fa-arrow-right"></span> Connect
</button> </button>
<button id="zone-refresh-button" class="btn btn-default" ng-click="refreshZones()"> <button id="zone-refresh-button" class="btn btn-default" ng-click="refreshZones()">
<span class="fa fa-refresh"></span> Refresh <span class="fa fa-refresh"></span> Refresh
</button> </button>
</div> </div>
<!-- SEARCH BOX --> <div class="col-md-3 pull-right">
<div class="pull-right"> <!-- SEARCH BOX -->
<form class="input-group" ng-submit="refreshZones()"> <form class="input-group remove-bottom-margin full-width" ng-submit="refreshZones()">
<div class="input-group"> <div class="input-group remove-bottom-margin">
<span class="input-group-btn"> <span class="input-group-btn">
<button id="zone-search-button" type="submit" class="btn btn-primary btn-left-round"> <button id="zone-search-button" type="submit" class="btn btn-primary btn-left-round">
<span class="fa fa-search"></span> <span class="fa fa-search"></span>
</button> </button>
</span> </span>
<input ng-model="query" type="text" class="form-control zone-search-text" placeholder="{{!searchByAdminGroup ? 'Zone Name' : 'Admin Group Name'}}"/> <input ng-model="query" type="text" class="form-control zone-search-text" placeholder="{{!searchByAdminGroup ? 'Zone Name' : 'Admin Group Name'}}"/>
</div> </div>
<div class="checkbox pull-right"> </form>
<label> <!-- END SEARCH BOX -->
<div class="flex">
<label class="reduce-font-weight remove-bottom-margin flex-1">
<input class="isGroupSearch" type="checkbox" ng-model="searchByAdminGroup" ng-change="refreshZones()"> Search by admin group <input class="isGroupSearch" type="checkbox" ng-model="searchByAdminGroup" ng-change="refreshZones()"> Search by admin group
</label> </label>
</div> <form action="" class="pull-right flex-1">
<div class="pull-right"> <div>
<div class="input-group" style="padding-right: 10px;"> <label class="reduce-font-weight remove-bottom-margin">
<div class="ptr-zone-filter"> <input type="checkbox" ng-model="includeReverse" ng-true-value="false" ng-false-value="true" ng-change="refreshZones()"> Hide PTR Zones
<form action=""> </label>
<div class="checkbox pull-right">
<label>
<input type="checkbox" ng-model="includeReverse" ng-true-value="false" ng-false-value="true" ng-change="refreshZones()"> Hide PTR Zones
</label>
</div>
</form>
</div> </div>
</div> </form>
</div> </div>
</form> </div>
</div> </div>
<!-- END SEARCH BOX -->
</div> </div>
<div id="zone-list-table" class="panel-body"> <div id="zone-list-table" class="panel-body">
<p ng-if="!zonesLoaded">Loading zones...</p> <p ng-if="!zonesLoaded">Loading zones...</p>
@@ -171,44 +165,39 @@
<!-- SIMPLE DATATABLE --> <!-- SIMPLE DATATABLE -->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<div class="row flex">
<button id="zone-refresh-button" class="btn btn-default" ng-click="refreshZones()"> <div class="btn-group col-md-9 flex-1">
<span class="fa fa-refresh"></span> Refresh <button id="zone-refresh-button" class="btn btn-default" ng-click="refreshZones()">
</button> <span class="fa fa-refresh"></span> Refresh
</button>
<!-- SEARCH BOX --> </div>
<div class="pull-right"> <div class="col-md-3 pull-right">
<form class="input-group" ng-submit="refreshZones()"> <!-- SEARCH BOX -->
<div class="input-group"> <form class="input-group remove-bottom-margin full-width" ng-submit="refreshZones()">
<span class="input-group-btn"> <div class="input-group remove-bottom-margin">
<button id="all-zones-search-button" type="submit" class="btn btn-primary btn-left-round"> <span class="input-group-btn">
<span class="fa fa-search"></span> <button id="all-zones-search-button" type="submit" class="btn btn-primary btn-left-round">
</button> <span class="fa fa-search"></span>
</span> </button>
<input ng-model="query" type="text" class="form-control zone-search-text" placeholder="{{!searchByAdminGroup ? 'Zone Name' : 'Admin Group Name'}}"/> </span>
</div> <input ng-model="query" type="text" class="form-control zone-search-text" placeholder="{{!searchByAdminGroup ? 'Zone Name' : 'Admin Group Name'}}"/>
<div class="checkbox pull-right"> </div>
<label> </form>
<!-- END SEARCH BOX -->
<div class="flex">
<label class="reduce-font-weight remove-bottom-margin flex-1">
<input class="isGroupSearch" type="checkbox" ng-model="searchByAdminGroup" ng-change="refreshZones()"> Search by admin group <input class="isGroupSearch" type="checkbox" ng-model="searchByAdminGroup" ng-change="refreshZones()"> Search by admin group
</label> </label>
</div> <form action="" class="pull-right flex-1">
<div class="pull-right"> <div>
<div class="input-group" style="padding-right: 10px;"> <label class="reduce-font-weight remove-bottom-margin">
<div class="ptr-zone-filter"> <input type="checkbox" ng-model="includeReverse" ng-true-value="false" ng-false-value="true" ng-change="refreshZones()"> Hide PTR Zones
<form action=""> </label>
<div class="checkbox pull-right">
<label>
<input type="checkbox" ng-model="includeReverse" ng-true-value="false" ng-false-value="true" ng-change="refreshZones()"> Hide PTR Zones
</label>
</div>
</form>
</div> </div>
</div> </form>
</div> </div>
</form> </div>
</div> </div>
<!-- END SEARCH BOX -->
</div> </div>
<div id="zone-list-table" class="panel-body"> <div id="zone-list-table" class="panel-body">
<p ng-if="!allZonesLoaded">Loading zones...</p> <p ng-if="!allZonesLoaded">Loading zones...</p>

12
modules/portal/conf/application.conf
View File

@@ -76,6 +76,18 @@ crypto {
secret = ${?CRYPTO_SECRET} secret = ${?CRYPTO_SECRET}
} }
api {
limits {
batchchange-routing-max-items-limit = 100
membership-routing-default-max-items = 100
membership-routing-max-items-limit = 1000
membership-routing-max-groups-list-limit = 3000
recordset-routing-default-max-items= 100
zone-routing-default-max-items = 100
zone-routing-max-items-limit = 100
}
}
http.port = 9001 http.port = 9001
http.port = ${?PORTAL_PORT} http.port = ${?PORTAL_PORT}

28
modules/portal/public/css/vinyldns.css
View File

@@ -458,10 +458,6 @@ input[type="file"] {
align-items: center; align-items: center;
} }
.paginate_left {
float: left;
}
.vinyldns_page_number { .vinyldns_page_number {
margin-right: 10px; margin-right: 10px;
} }
@@ -570,3 +566,27 @@ input[type="file"] {
#set-dropdown-width { #set-dropdown-width {
width: 4em; width: 4em;
} }
.full-width {
width: 100%;
}
.remove-bottom-margin {
margin-bottom: 0px;
}
.reduce-font-weight {
font-weight: 400;
}
.bolder-font-weight{
font-weight: 500;
}
.flex {
display: flex;
}
.flex-1{
flex: 1;
}

3
modules/portal/public/lib/controllers/controller.groups.js
View File

@@ -29,6 +29,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
$scope.hasGroups = false; $scope.hasGroups = false;
$scope.query = ""; $scope.query = "";
$scope.validEmailDomains= []; $scope.validEmailDomains= [];
$scope.maxGroupItemsDisplay = 3000;
// Paging status for group sets // Paging status for group sets
var groupsPaging = pagingService.getNewPagingParams(100); var groupsPaging = pagingService.getNewPagingParams(100);
@@ -203,7 +204,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
} }
return groupsService return groupsService
.getGroups($scope.ignoreAccess, $scope.query) .getGroups($scope.ignoreAccess, $scope.query, $scope.maxGroupItemsDisplay)
.then(success) .then(success)
.catch(function (error) { .catch(function (error) {
handleError(error, 'groupsService::getGroups-failure'); handleError(error, 'groupsService::getGroups-failure');

2
modules/portal/public/lib/recordset/recordsets.controller.js
View File

@@ -85,7 +85,7 @@
$.ajax({ $.ajax({
url: "/api/recordsets?maxItems=100", url: "/api/recordsets?maxItems=100",
dataType: "json", dataType: "json",
data: "recordNameFilter="+request.term+"%25&nameSort=asc", data: {recordNameFilter: request.term, nameSort: $scope.nameSort},
success: function( data ) { success: function( data ) {
const recordSearch = JSON.parse(JSON.stringify(data)); const recordSearch = JSON.parse(JSON.stringify(data));
response($.map(recordSearch.recordSets, function(item) { response($.map(recordSearch.recordSets, function(item) {

4
modules/portal/public/lib/services/groups/service.groups.js
View File

@@ -74,12 +74,12 @@ angular.module('service.groups', [])
return $http.delete(url, {headers: utilityService.getCsrfHeader()}); return $http.delete(url, {headers: utilityService.getCsrfHeader()});
}; };
this.getGroups = function (ignoreAccess, query) { this.getGroups = function (ignoreAccess, query, maxItems) {
if (query == "") { if (query == "") {
query = null; query = null;
} }
var params = { var params = {
"maxItems": 3000, "maxItems": maxItems,
"groupNameFilter": query, "groupNameFilter": query,
"ignoreAccess": ignoreAccess "ignoreAccess": ignoreAccess
}; };

8
modules/portal/test/models/MetaSpec.scala
View File

@@ -65,5 +65,13 @@ class MetaSpec extends Specification with Mockito {
val config = Map("scheduled-changes-enabled" -> true) val config = Map("scheduled-changes-enabled" -> true)
Meta(Configuration.from(config)).scheduledBatchChangesEnabled must beTrue Meta(Configuration.from(config)).scheduledBatchChangesEnabled must beTrue
} }
"default to 3000 if membership-routing-max-groups-list-limit is not found" in {
val config = Map("vinyldns.version" -> "foo-bar")
Meta(Configuration.from(config)).maxGroupItemsDisplay must beEqualTo(3000)
}
"get the membership-routing-max-groups-list-limit value in config" in {
val config = Map("api.limits.membership-routing-max-groups-list-limit" -> 3100)
Meta(Configuration.from(config)).maxGroupItemsDisplay must beEqualTo(3100)
}
} }
} }