Migrate view empty bill run page #783
Merged
Conversation
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
https://eaflood.atlassian.net/browse/WATER-4396 This change migrates the handling of viewing an empty bill run from the legacy [water-abstraction-ui](https://github.com/DEFRA/water-abstraction-ui) to this project. Because we've migrated the cancelling of a bill run to this project (WATER-4387) we need to update the legacy pages which have a cancel button to point to it. Or, as we're choosing to do, we straight up replace them with our own! This change deals with when the bill run has a status of empty and the page that gets shown.
If we pressed straight ahead with an empty bill run presenter we'd be repeating a number of the functions for the 3rd time. So, abiding by the rule of 3 it is time to refactor them into something that can be reused. So, we move the functions into our base presenter ready for us to update the presenters that use them.
Found we are also going to need to generate the title in multiple presenters going forward. So, we move that functionality into the base presenter.
Now the service has to manage which presenter to use depending on the status of the bill run. We also need something to determine which view to use and decide this should also be done by the service rather than the controller.
On reflection these are just re-testing the capitalize() function in the base presenter.
Cruikshanks
added a commit
that referenced
this pull request
Mar 2, 2024
https://eaflood.atlassian.net/browse/WATER-4396 Unfortunately, we only spotted after [migrating the view empty bill run page](#783) from the legacy service to this one that the status badge was wrong. It should be styled as a grey badge (inactive) but we were displaying it as blue (info). Fixing it required adding an if/else check into 2 views which made us re-think how we were doing the bill run status badges. So, in this change we fix the badge for `empty` and along the way we add a new `statusBadge()` macro that moves the logic of converting bill run status into badge type to one place.
Cruikshanks
added a commit
that referenced
this pull request
Mar 2, 2024
https://eaflood.atlassian.net/browse/WATER-4396 Unfortunately, we only spotted after [migrating the view empty bill run page](#783) from the legacy service to this one that the status badge was wrong. It should be styled as a grey badge (inactive) but we were displaying it as blue (info). Fixing it required adding an if/else check into 2 views which made us re-think how we were doing the bill run status badges. So, in this change we fix the badge for `empty` and along the way, we add a new `statusBadge()` macro that moves the logic of converting bill run status into badge type to one place.
Cruikshanks
added a commit
that referenced
this pull request
Mar 16, 2024
https://eaflood.atlassian.net/browse/WATER-4410 > Part of a series of changes to add support for removing a bill licence back into the billing views We're not ready to implement removing a bill licence from a bill run as it depends on sending requests to the [Charging Module API](https://github.com/DEFRA/sroc-charging-module-api) and running the legacy refresh job to update everything on our side. But we can migrate the confirmation page a user sees when removing a licence. Not only is that one less thing in the legacy code but we can also update the view to be consistent with others we've done like - [Migrate view errored bill run page](#785) - [Migrate view empty bill run page](#783) - [Add cancel bill run page](#780) With this in place we can then fix our billing views and make the [Remove licence button](#824) visible again!
Cruikshanks
added a commit
that referenced
this pull request
Mar 17, 2024
https://eaflood.atlassian.net/browse/WATER-4410 > Part of a series of changes to add support for removing a bill licence back into the billing views We're not ready to implement removing a bill licence from a bill run as it depends on sending requests to the [Charging Module API](https://github.com/DEFRA/sroc-charging-module-api) and running the legacy refresh job to update everything on our side. But we can migrate the confirmation page a user sees when removing a licence. Not only is that one less thing in the legacy code but we can also update the view to be consistent with others we've done like - [Migrate view errored bill run page](#785) - [Migrate view empty bill run page](#783) - [Add cancel bill run page](#780) With this in place, we can then fix our billing views and make the [Remove licence button](#824) visible again!
Cruikshanks
added a commit
that referenced
this pull request
Mar 20, 2024
https://eaflood.atlassian.net/browse/WATER-4416 We'd recently spotted that the new billing views we'd developed had dropped a 'Remove licence' button. So, we used that opportunity to [Migrate confirm remove licence from bill run page](#828) and [added the button back in](#824). But then our conscientious QA team started testing it and found it didn't do what it claimed to do. That was to flag the removed licence for the next supplementary bill run. We display the same message on the confirm remove bill from bill run so now doubtful they tested that as well with the same result. We've [fixed the remove licence issue](DEFRA/water-abstraction-service#2464). But whilst we fix the legacy code for remove bill run this is a great opportunity to also migrate the confirm remove bill from bill run page. Not only is it one less thing in the legacy code but we can also update the view to be consistent with others we've done like - [Migrate confirm remove licence from bill run page](#828) - [Migrate view errored bill run page](#785) - [Migrate view empty bill run page](#783) - [Add cancel bill run page](#780)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://eaflood.atlassian.net/browse/WATER-4396
This change migrates the handling of viewing an empty bill run from the legacy water-abstraction-ui to this project.
Because we've migrated the cancelling of a bill run to this project (WATER-4387) we need to update the legacy pages with a cancel button to point to it.
Or, as we choose to do, we replace them with our own!
This change deals with when the bill run has a status of empty and the page that gets shown.
This change was the tipping point of several bill-run-related presenters duplicating the same functions 3 times. As per the rule of three we refactor them to the
base.presenter.jsto make them reusable.