Add pagintion to backfills index and service show pages #422
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ build/ | |
| *.iml | ||
| *.swp | ||
| service/web/**/lib/ | ||
| **/.kotlin | ||
|
|
||
| **/site/ | ||
| docs/0.x/* | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,11 @@ | ||
| GROUP=app.cash.backfila | ||
|
|
||
| org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=5g -Dfile.encoding=UTF-8 | ||
|
|
||
| org.gradle.caching=true | ||
| org.gradle.configuration-cache=true | ||
| org.gradle.vfs.watch=true | ||
| org.gradle.configureondemand=true | ||
| org.gradle.parallel=true | ||
|
|
||
| misk.test.logging=false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package app.cash.backfila.ui.components | ||
|
|
||
| import kotlinx.html.TagConsumer | ||
| import kotlinx.html.a | ||
| import kotlinx.html.div | ||
| import kotlinx.html.nav | ||
| import misk.tailwind.icons.Heroicons | ||
| import misk.tailwind.icons.heroicon | ||
|
|
||
| fun TagConsumer<*>.Pagination( | ||
| nextOffset: String?, | ||
| offset: String?, | ||
| lastOffset: String?, | ||
| basePath: String, | ||
| ) { | ||
| nav("mt-12 flex items-center justify-between border-t border-gray-200 px-4 sm:px-0") { | ||
| lastOffset?.let { | ||
| div("-mt-px flex w-0 flex-1") { | ||
| a(classes = "inline-flex items-center border-t-2 border-transparent pt-4 pr-1 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700") { | ||
| href = basePath.appendOffsets(lastOffset) | ||
| heroicon(Heroicons.MINI_ARROW_LONG_LEFT) | ||
| +"""Previous""" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (nextOffset != null) { | ||
| div("-mt-px flex w-0 flex-1 justify-end") { | ||
| a(classes = "inline-flex items-center border-t-2 border-transparent pt-4 pl-1 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700") { | ||
| href = basePath.appendOffsets(nextOffset, offset ?: "") | ||
| +"""Next""" | ||
| heroicon(Heroicons.MINI_ARROW_LONG_RIGHT) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun String.appendOffsets(nextOffset: String? = null, lastOffset: String? = null): String { | ||
| val pathBuilder = StringBuilder(this) | ||
| if (nextOffset?.isNotBlank() == true) { | ||
| pathBuilder.append("?offset=").append(nextOffset) | ||
| } | ||
|
|
||
| if (lastOffset != null) { | ||
| if (pathBuilder.contains("?")) { | ||
| pathBuilder.append("&") | ||
| } else { | ||
| pathBuilder.append("?") | ||
| } | ||
| pathBuilder.append("lastOffset=").append(lastOffset) | ||
| } | ||
| return pathBuilder.toString() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package app.cash.backfila | ||
|
|
||
| import app.cash.backfila.api.ConfigureServiceAction | ||
| import app.cash.backfila.api.ConfigureServiceAction.Companion.RESERVED_VARIANT | ||
| import app.cash.backfila.client.Connectors | ||
| import app.cash.backfila.dashboard.CreateBackfillAction | ||
| import app.cash.backfila.protos.service.ConfigureServiceRequest | ||
| import app.cash.backfila.protos.service.CreateBackfillRequest | ||
| import app.cash.backfila.service.persistence.BackfilaDb | ||
| import app.cash.backfila.service.persistence.BackfillRunQuery | ||
| import jakarta.inject.Inject | ||
| import misk.hibernate.Query | ||
| import misk.hibernate.Transacter | ||
| import misk.hibernate.newQuery | ||
| import misk.hibernate.pagination.idDescPaginator | ||
| import misk.hibernate.pagination.newPager | ||
| import misk.scope.ActionScope | ||
| import misk.testing.MiskTest | ||
| import misk.testing.MiskTestModule | ||
| import org.junit.jupiter.api.Test | ||
|
|
||
| @MiskTest(startService = true) | ||
| class PaginationTest { | ||
| @MiskTestModule | ||
| private val module = BackfilaTestingModule() | ||
|
|
||
| @Inject @BackfilaDb | ||
| private lateinit var transacter: Transacter | ||
|
|
||
| @Inject private lateinit var queryFactory: Query.Factory | ||
|
|
||
| @Inject private lateinit var configureServiceAction: ConfigureServiceAction | ||
|
|
||
| @Inject private lateinit var createBackfillAction: CreateBackfillAction | ||
|
|
||
| @Inject private lateinit var scope: ActionScope | ||
|
|
||
| @Test | ||
| fun happyPath() { | ||
|
There was a problem hiding this comment. Should we inject the There was a problem hiding this comment. Ah I'll go ahead and delete this test class, I was just using it to play with the Paginator and have a debugger. |
||
| // Seed rows | ||
| seedData() | ||
|
|
||
| // Test pagination | ||
| val allRows = transacter.transaction { session -> | ||
| queryFactory.newQuery<BackfillRunQuery>() | ||
| .list(session) | ||
| } | ||
| val rows = transacter.transaction { session -> | ||
| val pager = queryFactory.newQuery<BackfillRunQuery>() | ||
| .orderByUpdatedAtDesc() | ||
| .newPager(idDescPaginator(), pageSize = 10) | ||
| pager.nextPage(session) | ||
| ?.contents | ||
| } | ||
|
|
||
| val a = "a" | ||
|
|
||
| } | ||
|
|
||
| fun seedData() { | ||
| scope.fakeCaller(service = "deep-fryer") { | ||
| configureServiceAction.configureService( | ||
| ConfigureServiceRequest.Builder() | ||
| .backfills( | ||
| listOf( | ||
| ConfigureServiceRequest.BackfillData( | ||
| "ChickenSandwich", "Description", listOf(), null, | ||
| null, false, null, | ||
| ), | ||
| ), | ||
| ) | ||
| .connector_type(Connectors.ENVOY) | ||
| .build(), | ||
| ) | ||
| } | ||
|
|
||
| for (i in 0..100) { | ||
| scope.fakeCaller(user = "molly") { | ||
| val response = createBackfillAction.create( | ||
| "deep-fryer", | ||
| RESERVED_VARIANT, | ||
| CreateBackfillRequest.Builder() | ||
| .backfill_name("ChickenSandwich") | ||
| .build(), | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit -
readOnly(). Could also usereplicaReadsince the replication lag should be acceptable for querying live statusThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mpawliszyn does Backfila have read replicas in staging/production?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think for now the simplicity is worth more than the performance.