Centralize url path building #410
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
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 |
|---|---|---|
|
|
@@ -41,10 +41,11 @@ class BackfillCreateServiceIndexAction @Inject constructor( | |
| ): Response<ResponseBody> { | ||
| if (variantOrBlank.orEmpty().contains(".") || variantOrBlank.orEmpty().toIntOrNull() != null) { | ||
| // This means variant is default and the value provided is the backfill name or backfill ID to clone, redirect accordingly | ||
| val newPath = BackfillCreateAction.path( | ||
| service = service, | ||
| variantOrBackfillNameOrId = variantOrBlank.orEmpty(), | ||
| backfillNameOrId = "" | ||
| ) | ||
| return Response( | ||
| body = "go to $newPath".toResponseBody(), | ||
| statusCode = HttpURLConnection.HTTP_MOVED_TEMP, | ||
|
|
@@ -60,9 +61,7 @@ class BackfillCreateServiceIndexAction @Inject constructor( | |
| Link("Services", ServiceIndexAction.PATH), | ||
| Link( | ||
| label, | ||
| ServiceShowAction.path(service, variantOrBlank), | ||
| ), | ||
| Link( | ||
| "Create", | ||
|
|
@@ -93,10 +92,11 @@ class BackfillCreateServiceIndexAction @Inject constructor( | |
| registeredBackfills.backfills.map { | ||
| a { | ||
| val variantOrBackfillNameOrId = variantOrBlank.orEmpty().ifBlank { it.name } | ||
| href = BackfillCreateAction.path( | ||
| service = service, | ||
| variantOrBackfillNameOrId = variantOrBackfillNameOrId, | ||
| backfillNameOrId = if (variantOrBackfillNameOrId == it.name) "" else it.name | ||
| ) | ||
|
|
||
| [email protected]("registration col-span-1 divide-y divide-gray-200 rounded-lg bg-white shadow") { | ||
| div("flex w-full items-center justify-between space-x-6 p-6") { | ||
|
|
@@ -124,22 +124,10 @@ class BackfillCreateServiceIndexAction @Inject constructor( | |
| return Response(htmlResponseBody) | ||
| } | ||
|
|
||
| companion object { | ||
| private const val PATH = "/backfills/create/{service}/{variantOrBlank}" | ||
| fun path(service: String, variantOrBlank: String?) = PATH | ||
| .replace("{service}", service) | ||
| .replace("{variantOrBlank}", variantOrBlank ?: "") | ||
| } | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ import kotlinx.html.button | |
| import kotlinx.html.div | ||
| import kotlinx.html.h3 | ||
| import kotlinx.html.li | ||
| import kotlinx.html.p | ||
| import kotlinx.html.role | ||
| import kotlinx.html.span | ||
| import kotlinx.html.ul | ||
|
|
@@ -68,7 +69,7 @@ class BackfillIndexAction @Inject constructor( | |
|
|
||
| backfills.map { backfill -> | ||
| a { | ||
| href = BackfillShowAction.path(backfill.id.toString()) | ||
|
|
||
| [email protected]("registration col-span-1 divide-y divide-gray-200 rounded-lg bg-white shadow") { | ||
| div("flex w-full items-center justify-between space-x-6 p-6") { | ||
|
|
@@ -92,53 +93,9 @@ class BackfillIndexAction @Inject constructor( | |
| +backfill.state.name | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Was code copied in from Tailwind but didn't end up using. |
||
| } | ||
| } | ||
| } | ||
|
|
||
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
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.
Was this not used?
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.
Yeah unused